From fe178d696d624a0b1319d2e35811d7471367054e Mon Sep 17 00:00:00 2001 From: Pascale Noyret Date: Wed, 26 Mar 2008 09:39:43 +0000 Subject: [PATCH] *** empty log message *** --- Ui/aideQT.py | 2 +- Ui/desChoixCata.py | 2 +- Ui/desCommande.py | 57 +---- Ui/desCommande.ui | 220 +++++++++++-------- Ui/desCommentaire.py | 33 +-- Ui/desCommentaire.ui | 11 +- Ui/desError.py | 2 +- Ui/desFormule.py | 33 +-- Ui/desFormule.ui | 11 +- Ui/desInactif.py | 2 +- Ui/desInclude.py | 98 ++++----- Ui/desInclude.ui | 191 ++++++++-------- Ui/desListeParam.py | 2 +- Ui/desMCFact.py | 2 +- Ui/desMCListAjout.py | 2 +- Ui/desMacro.py | 33 +-- Ui/desMacro.ui | 11 +- Ui/desParam.py | 33 +-- Ui/desParam.ui | 11 +- Ui/desPlusieursBase.py | 146 ++++++++----- Ui/desPlusieursBase.ui | 427 +++++++++++++++++++----------------- Ui/desPlusieursInto.py | 99 +++++---- Ui/desPlusieursInto.ui | 288 +++++++++++++----------- Ui/desPoursuite.py | 33 +-- Ui/desPoursuite.ui | 11 +- Ui/desRacine.py | 33 +-- Ui/desRacine.ui | 11 +- Ui/desSelectVal.py | 2 +- Ui/desUniqueASSD.py | 2 +- Ui/desUniqueBase.py | 61 ++++-- Ui/desUniqueBase.ui | 472 ++++++++++++++++++++++++---------------- Ui/desUniqueComp.py | 2 +- Ui/desUniqueInto.py | 2 +- Ui/desUniqueSDCO.py | 61 ++---- Ui/desUniqueSDCO.ui | 132 +++-------- Ui/desUniqueSDCOInto.py | 22 +- Ui/desUniqueSDCOInto.ui | 45 ---- Ui/desVisu.py | 2 +- Ui/makefile | 2 +- Ui/myMain.py | 22 +- Ui/myMain.ui | 23 +- 41 files changed, 1274 insertions(+), 1380 deletions(-) diff --git a/Ui/aideQT.py b/Ui/aideQT.py index 22156da9..a60c7609 100644 --- a/Ui/aideQT.py +++ b/Ui/aideQT.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'aideQT.ui' # -# Created: jeu mar 6 14:02:27 2008 +# Created: mar mar 25 10:05:07 2008 # by: The PyQt User Interface Compiler (pyuic) 3.13 # # WARNING! All changes made in this file will be lost! diff --git a/Ui/desChoixCata.py b/Ui/desChoixCata.py index 19466a40..22e37b83 100644 --- a/Ui/desChoixCata.py +++ b/Ui/desChoixCata.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'desChoixCata.ui' # -# Created: mar mar 4 10:36:38 2008 +# Created: mar mar 25 10:05:07 2008 # by: The PyQt User Interface Compiler (pyuic) 3.13 # # WARNING! All changes made in this file will be lost! diff --git a/Ui/desCommande.py b/Ui/desCommande.py index 4ce860ef..9d036b20 100644 --- a/Ui/desCommande.py +++ b/Ui/desCommande.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'desCommande.ui' # -# Created: mar mar 4 10:36:38 2008 +# Created: mar mar 25 10:05:07 2008 # by: The PyQt User Interface Compiler (pyuic) 3.13 # # WARNING! All changes made in this file will be lost! @@ -10,36 +10,11 @@ from qt import * -image0_data = \ - "\x89\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d" \ - "\x49\x48\x44\x52\x00\x00\x00\x21\x00\x00\x00\x0e" \ - "\x08\x06\x00\x00\x00\xa1\x1e\x75\x8c\x00\x00\x00" \ - "\xcf\x49\x44\x41\x54\x38\x8d\xd5\x94\xdb\x0e\xc3" \ - "\x20\x0c\x43\xed\xfd\xf8\xd8\x97\xbb\x0f\x34\x5b" \ - "\x48\x08\x45\xd5\x1e\xb6\x48\x88\xf4\x12\xe7\x60" \ - "\x01\xc0\x0f\x04\x6f\xd6\xe9\x9b\xba\x77\x20\x04" \ - "\x80\x92\x4a\x10\x32\xc9\x2e\xfb\xd8\xc7\xd5\xca" \ - "\xbc\xc0\x25\x40\x00\x99\xe9\x57\x84\x95\x68\xfe" \ - "\x7f\x06\xc0\xde\xd1\xde\xb3\x2b\x4a\x1e\xc4\xea" \ - "\x82\x4b\x9e\x74\x09\x71\x65\xbd\x01\xf8\x55\x27" \ - "\xf7\x8a\x72\x01\xe0\xa3\x12\x9f\x34\x5a\x01\x7c" \ - "\x54\x3b\xaf\xdc\x98\x3d\x0f\x71\x09\xd1\x5a\x33" \ - "\x1b\x47\x1f\x47\x07\x2c\x17\x49\x4a\x82\x33\x8f" \ - "\x61\x78\x20\x3a\x88\x17\xe6\x73\x06\xb1\xf0\x8b" \ - "\x07\xba\x03\xe6\x02\xc9\xb8\x31\x07\x7e\x37\xe0" \ - "\x20\x9e\x67\xe3\x38\x67\x10\x97\x7b\x17\xde\x80" \ - "\xc1\x85\xad\x38\x69\x5a\x51\xd5\x22\xc8\x2c\xe7" \ - "\x79\x12\xe2\xfe\xd8\xbe\x83\x76\x20\x92\xf5\x2b" \ - "\x18\x20\xdd\x11\xbb\x10\xe5\x65\xb5\x3a\x5a\x3b" \ - "\xba\xff\x13\x07\x13\xd6\x6f\xa6\x98\x18\x57\x06" \ - "\x00\x00\x00\x00\x49\x45\x4e\x44\xae\x42\x60\x82" class DComm(QWidget): def __init__(self,parent = None,name = None,fl = 0): QWidget.__init__(self,parent,name,fl) - self.image0 = QPixmap() - self.image0.loadFromData(image0_data,"PNG") if not name: self.setName("DComm") @@ -90,9 +65,9 @@ class DComm(QWidget): self.TWChoix.insertTab(self.Concept,QString("")) self.Commande = QWidget(self.TWChoix,"Commande") - CommandeLayout = QGridLayout(self.Commande,1,1,11,6,"CommandeLayout") self.buttonGroup1 = QButtonGroup(self.Commande,"buttonGroup1") + self.buttonGroup1.setGeometry(QRect(308,11,160,80)) self.RBalpha = QRadioButton(self.buttonGroup1,"RBalpha") self.RBalpha.setGeometry(QRect(20,20,120,20)) @@ -101,32 +76,24 @@ class DComm(QWidget): self.RBGroupe = QRadioButton(self.buttonGroup1,"RBGroupe") self.RBGroupe.setGeometry(QRect(20,40,110,20)) - CommandeLayout.addMultiCellWidget(self.buttonGroup1,0,1,3,3) - self.textLabel1_4 = QLabel(self.Commande,"textLabel1_4") - - CommandeLayout.addMultiCellWidget(self.textLabel1_4,0,0,0,1) + self.textLabel1_4.setGeometry(QRect(11,11,257,53)) self.textLabel4 = QLabel(self.Commande,"textLabel4") - - CommandeLayout.addMultiCellWidget(self.textLabel4,3,3,0,3) + self.textLabel4.setGeometry(QRect(11,365,457,16)) self.LBNouvCommande = QListBox(self.Commande,"LBNouvCommande") - - CommandeLayout.addMultiCellWidget(self.LBNouvCommande,2,2,0,3) + self.LBNouvCommande.setGeometry(QRect(11,97,457,262)) self.textLabel6 = QLabel(self.Commande,"textLabel6") - - CommandeLayout.addWidget(self.textLabel6,1,0) - - self.BNext = QToolButton(self.Commande,"BNext") - self.BNext.setIconSet(QIconSet(self.image0)) - - CommandeLayout.addWidget(self.BNext,1,2) + self.textLabel6.setGeometry(QRect(11,70,23,21)) self.LEFiltre = QLineEdit(self.Commande,"LEFiltre") + self.LEFiltre.setGeometry(QRect(40,60,200,30)) - CommandeLayout.addWidget(self.LEFiltre,1,1) + self.BNext = QToolButton(self.Commande,"BNext") + self.BNext.setGeometry(QRect(257,61,41,30)) + self.BNext.setIconSet(QIconSet()) self.TWChoix.insertTab(self.Commande,QString("")) DCommLayout.addMultiCellWidget(self.TWChoix,0,0,0,2) @@ -158,7 +125,7 @@ class DComm(QWidget): self.resize(QSize(505,483).expandedTo(self.minimumSizeHint())) self.clearWState(Qt.WState_Polished) - self.connect(self.LBNouvCommande,SIGNAL("clicked(QListBoxItem*)"),self.LBNouvCommandeClicked) + self.connect(self.LBNouvCommande,SIGNAL("doubleClicked(QListBoxItem*)"),self.LBNouvCommandeClicked) self.connect(self.LEFiltre,SIGNAL("textChanged(const QString&)"),self.LEFiltreTextChanged) self.connect(self.LEFiltre,SIGNAL("returnPressed()"),self.LEfiltreReturnPressed) self.connect(self.bSup,SIGNAL("pressed()"),self.BSupPressed) @@ -187,7 +154,7 @@ class DComm(QWidget): self.textLabel1_4.setText(self.__tr("Commandes :")) self.textLabel4.setText(self.__trUtf8("\x4c\x61\x20\x63\x6f\x6d\x6d\x61\x6e\x64\x65\x20\x63\x68\x6f\x69\x73\x69\x65\x20\x73\x65\x72\x61\x20\x61\x6a\x6f\x75\x74\xc3\xa9\x65\x20\x41\x50\x52\x45\x53\x20\x6c\x61\x20\x63\x6f\x6d\x6d\x61\x6e\x64\x65\x20\x63\x6f\x75\x72\x61\x6e\x74\x65")) self.textLabel6.setText(self.__tr("Filtre")) - self.BNext.setText(QString.null) + self.BNext.setText(self.__tr("Suivant")) QToolTip.add(self.BNext,self.__tr("affiche la prochaine occurence")) self.TWChoix.changeTab(self.Commande,self.__tr("Nouvelle Commande")) self.bOk.setText(self.__tr("&Valider")) diff --git a/Ui/desCommande.ui b/Ui/desCommande.ui index 1386c5dc..859cbebc 100644 --- a/Ui/desCommande.ui +++ b/Ui/desCommande.ui @@ -212,102 +212,153 @@ Nouvelle Commande - + - unnamed + buttonGroup1 - - - buttonGroup1 - - - Affichage - - - - RBalpha - - - - 20 - 20 - 120 - 20 - - - - alphabétique - - - true - - - - - RBGroupe - - - - 20 - 40 - 110 - 20 - - - - par groupe - - - - + + + 308 + 11 + 160 + 80 + + + + Affichage + + - textLabel1_4 + RBalpha - - <b><u>Commandes :</u></b> - - - - - textLabel4 + + + 20 + 20 + 120 + 20 + - La commande choisie sera ajoutée APRES la commande courante + alphabétique - - - - LBNouvCommande + + true - + - textLabel6 + RBGroupe - - Filtre - - - - - BNext + + + 20 + 40 + 110 + 20 + - - - - image0 - - - affiche la prochaine occurence + par groupe - - - LEFiltre - - - + + + + textLabel1_4 + + + + 11 + 11 + 257 + 53 + + + + <b><u>Commandes :</u></b> + + + + + textLabel4 + + + + 11 + 365 + 457 + 16 + + + + La commande choisie sera ajoutée APRES la commande courante + + + + + LBNouvCommande + + + + 11 + 97 + 457 + 262 + + + + + + textLabel6 + + + + 11 + 70 + 23 + 21 + + + + Filtre + + + + + LEFiltre + + + + 40 + 60 + 200 + 30 + + + + + + BNext + + + + 257 + 61 + 41 + 30 + + + + Suivant + + + + + + affiche la prochaine occurence + + @@ -380,15 +431,10 @@ - - - 89504e470d0a1a0a0000000d49484452000000210000000e0806000000a11e758c000000cf49444154388dd594db0ec3200c43edfdf8d897bb0f345b480845d51eb64888f412e76001c00f046fd6e99bba77200480924a1032c92efbd8c7d5cabcc025400099e957849568fe7f06c0ded1deb32b4a1ec4ea824b9e74097165bd01f85527f78a7201e0a3129f345a017c543bafdc983d0f7109d15a331b471f47072c17494a82338f6178203a8817e67306b1f08b07ba03e602c9b831077e37e0209e67e3386710977b17de80c185ad38695a51d522c82ce77912e2fed8be83762092f52b1820dd11bb10e565b53a5a3bbaff130713d66fa6981857060000000049454e44ae426082 - - LBNouvCommande - clicked(QListBoxItem*) + doubleClicked(QListBoxItem*) DComm LBNouvCommandeClicked() diff --git a/Ui/desCommentaire.py b/Ui/desCommentaire.py index 78abc877..f42f9de9 100644 --- a/Ui/desCommentaire.py +++ b/Ui/desCommentaire.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'desCommentaire.ui' # -# Created: mar mar 4 10:36:38 2008 +# Created: mar mar 25 10:05:08 2008 # by: The PyQt User Interface Compiler (pyuic) 3.13 # # WARNING! All changes made in this file will be lost! @@ -10,36 +10,11 @@ from qt import * -image0_data = \ - "\x89\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d" \ - "\x49\x48\x44\x52\x00\x00\x00\x21\x00\x00\x00\x0e" \ - "\x08\x06\x00\x00\x00\xa1\x1e\x75\x8c\x00\x00\x00" \ - "\xcf\x49\x44\x41\x54\x38\x8d\xd5\x94\xdb\x0e\xc3" \ - "\x20\x0c\x43\xed\xfd\xf8\xd8\x97\xbb\x0f\x34\x5b" \ - "\x48\x08\x45\xd5\x1e\xb6\x48\x88\xf4\x12\xe7\x60" \ - "\x01\xc0\x0f\x04\x6f\xd6\xe9\x9b\xba\x77\x20\x04" \ - "\x80\x92\x4a\x10\x32\xc9\x2e\xfb\xd8\xc7\xd5\xca" \ - "\xbc\xc0\x25\x40\x00\x99\xe9\x57\x84\x95\x68\xfe" \ - "\x7f\x06\xc0\xde\xd1\xde\xb3\x2b\x4a\x1e\xc4\xea" \ - "\x82\x4b\x9e\x74\x09\x71\x65\xbd\x01\xf8\x55\x27" \ - "\xf7\x8a\x72\x01\xe0\xa3\x12\x9f\x34\x5a\x01\x7c" \ - "\x54\x3b\xaf\xdc\x98\x3d\x0f\x71\x09\xd1\x5a\x33" \ - "\x1b\x47\x1f\x47\x07\x2c\x17\x49\x4a\x82\x33\x8f" \ - "\x61\x78\x20\x3a\x88\x17\xe6\x73\x06\xb1\xf0\x8b" \ - "\x07\xba\x03\xe6\x02\xc9\xb8\x31\x07\x7e\x37\xe0" \ - "\x20\x9e\x67\xe3\x38\x67\x10\x97\x7b\x17\xde\x80" \ - "\xc1\x85\xad\x38\x69\x5a\x51\xd5\x22\xc8\x2c\xe7" \ - "\x79\x12\xe2\xfe\xd8\xbe\x83\x76\x20\x92\xf5\x2b" \ - "\x18\x20\xdd\x11\xbb\x10\xe5\x65\xb5\x3a\x5a\x3b" \ - "\xba\xff\x13\x07\x13\xd6\x6f\xa6\x98\x18\x57\x06" \ - "\x00\x00\x00\x00\x49\x45\x4e\x44\xae\x42\x60\x82" class DComment(QWidget): def __init__(self,parent = None,name = None,fl = 0): QWidget.__init__(self,parent,name,fl) - self.image0 = QPixmap() - self.image0.loadFromData(image0_data,"PNG") if not name: self.setName("DComment") @@ -86,7 +61,7 @@ class DComment(QWidget): CommandeLayout.addMultiCellWidget(self.textLabel4,3,3,0,3) self.BNext = QToolButton(self.Commande,"BNext") - self.BNext.setIconSet(QIconSet(self.image0)) + self.BNext.setIconSet(QIconSet()) CommandeLayout.addWidget(self.BNext,1,2) @@ -125,7 +100,7 @@ class DComment(QWidget): self.resize(QSize(505,483).expandedTo(self.minimumSizeHint())) self.clearWState(Qt.WState_Polished) - self.connect(self.LBNouvCommande,SIGNAL("clicked(QListBoxItem*)"),self.LBNouvCommandeClicked) + self.connect(self.LBNouvCommande,SIGNAL("doubleClicked(QListBoxItem*)"),self.LBNouvCommandeClicked) self.connect(self.LEFiltre,SIGNAL("textChanged(const QString&)"),self.LEFiltreTextChanged) self.connect(self.LEFiltre,SIGNAL("returnPressed()"),self.LEfiltreReturnPressed) self.connect(self.bSup,SIGNAL("pressed()"),self.BSupPressed) @@ -145,7 +120,7 @@ class DComment(QWidget): self.RBalpha.setText(self.__trUtf8("\x61\x6c\x70\x68\x61\x62\xc3\xa9\x74\x69\x71\x75\x65")) self.textLabel1_4.setText(self.__tr("Commandes :")) self.textLabel4.setText(self.__trUtf8("\x4c\x61\x20\x63\x6f\x6d\x6d\x61\x6e\x64\x65\x20\x63\x68\x6f\x69\x73\x69\x65\x20\x73\x65\x72\x61\x20\x61\x6a\x6f\x75\x74\xc3\xa9\x65\x20\x41\x50\x52\x45\x53\x20\x6c\x61\x20\x63\x6f\x6d\x6d\x61\x6e\x64\x65\x20\x63\x6f\x75\x72\x61\x6e\x74\x65")) - self.BNext.setText(QString.null) + self.BNext.setText(self.__tr("Suivant")) QToolTip.add(self.BNext,self.__tr("affiche la prochaine occurence")) self.TWChoix.changeTab(self.Commande,self.__tr("Nouvelle Commande")) self.bOk.setText(self.__tr("&Valider")) diff --git a/Ui/desCommentaire.ui b/Ui/desCommentaire.ui index 8849e859..55b0c3b9 100644 --- a/Ui/desCommentaire.ui +++ b/Ui/desCommentaire.ui @@ -138,10 +138,10 @@ BNext - + Suivant - image0 + affiche la prochaine occurence @@ -231,15 +231,10 @@ - - - 89504e470d0a1a0a0000000d49484452000000210000000e0806000000a11e758c000000cf49444154388dd594db0ec3200c43edfdf8d897bb0f345b480845d51eb64888f412e76001c00f046fd6e99bba77200480924a1032c92efbd8c7d5cabcc025400099e957849568fe7f06c0ded1deb32b4a1ec4ea824b9e74097165bd01f85527f78a7201e0a3129f345a017c543bafdc983d0f7109d15a331b471f47072c17494a82338f6178203a8817e67306b1f08b07ba03e602c9b831077e37e0209e67e3386710977b17de80c185ad38695a51d522c82ce77912e2fed8be83762092f52b1820dd11bb10e565b53a5a3bbaff130713d66fa6981857060000000049454e44ae426082 - - LBNouvCommande - clicked(QListBoxItem*) + doubleClicked(QListBoxItem*) DComment LBNouvCommandeClicked() diff --git a/Ui/desError.py b/Ui/desError.py index 03084ff5..b9c59795 100644 --- a/Ui/desError.py +++ b/Ui/desError.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'desError.ui' # -# Created: mar mar 4 10:36:38 2008 +# Created: mar mar 25 10:05:08 2008 # by: The PyQt User Interface Compiler (pyuic) 3.13 # # WARNING! All changes made in this file will be lost! diff --git a/Ui/desFormule.py b/Ui/desFormule.py index 9d8c7399..02aa977f 100644 --- a/Ui/desFormule.py +++ b/Ui/desFormule.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'desFormule.ui' # -# Created: mar mar 4 16:24:30 2008 +# Created: mar mar 25 10:05:08 2008 # by: The PyQt User Interface Compiler (pyuic) 3.13 # # WARNING! All changes made in this file will be lost! @@ -10,36 +10,11 @@ from qt import * -image0_data = \ - "\x89\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d" \ - "\x49\x48\x44\x52\x00\x00\x00\x21\x00\x00\x00\x0e" \ - "\x08\x06\x00\x00\x00\xa1\x1e\x75\x8c\x00\x00\x00" \ - "\xcf\x49\x44\x41\x54\x38\x8d\xd5\x94\xdb\x0e\xc3" \ - "\x20\x0c\x43\xed\xfd\xf8\xd8\x97\xbb\x0f\x34\x5b" \ - "\x48\x08\x45\xd5\x1e\xb6\x48\x88\xf4\x12\xe7\x60" \ - "\x01\xc0\x0f\x04\x6f\xd6\xe9\x9b\xba\x77\x20\x04" \ - "\x80\x92\x4a\x10\x32\xc9\x2e\xfb\xd8\xc7\xd5\xca" \ - "\xbc\xc0\x25\x40\x00\x99\xe9\x57\x84\x95\x68\xfe" \ - "\x7f\x06\xc0\xde\xd1\xde\xb3\x2b\x4a\x1e\xc4\xea" \ - "\x82\x4b\x9e\x74\x09\x71\x65\xbd\x01\xf8\x55\x27" \ - "\xf7\x8a\x72\x01\xe0\xa3\x12\x9f\x34\x5a\x01\x7c" \ - "\x54\x3b\xaf\xdc\x98\x3d\x0f\x71\x09\xd1\x5a\x33" \ - "\x1b\x47\x1f\x47\x07\x2c\x17\x49\x4a\x82\x33\x8f" \ - "\x61\x78\x20\x3a\x88\x17\xe6\x73\x06\xb1\xf0\x8b" \ - "\x07\xba\x03\xe6\x02\xc9\xb8\x31\x07\x7e\x37\xe0" \ - "\x20\x9e\x67\xe3\x38\x67\x10\x97\x7b\x17\xde\x80" \ - "\xc1\x85\xad\x38\x69\x5a\x51\xd5\x22\xc8\x2c\xe7" \ - "\x79\x12\xe2\xfe\xd8\xbe\x83\x76\x20\x92\xf5\x2b" \ - "\x18\x20\xdd\x11\xbb\x10\xe5\x65\xb5\x3a\x5a\x3b" \ - "\xba\xff\x13\x07\x13\xd6\x6f\xa6\x98\x18\x57\x06" \ - "\x00\x00\x00\x00\x49\x45\x4e\x44\xae\x42\x60\x82" class DFormule(QWidget): def __init__(self,parent = None,name = None,fl = 0): QWidget.__init__(self,parent,name,fl) - self.image0 = QPixmap() - self.image0.loadFromData(image0_data,"PNG") if not name: self.setName("DFormule") @@ -165,7 +140,7 @@ class DFormule(QWidget): CommandeLayout.addWidget(self.LEFiltre,1,1) self.BNext = QToolButton(self.Commande,"BNext") - self.BNext.setIconSet(QIconSet(self.image0)) + self.BNext.setIconSet(QIconSet()) CommandeLayout.addWidget(self.BNext,1,2) @@ -185,7 +160,7 @@ class DFormule(QWidget): self.resize(QSize(529,493).expandedTo(self.minimumSizeHint())) self.clearWState(Qt.WState_Polished) - self.connect(self.LBNouvCommande,SIGNAL("clicked(QListBoxItem*)"),self.LBNouvCommandeClicked) + self.connect(self.LBNouvCommande,SIGNAL("doubleClicked(QListBoxItem*)"),self.LBNouvCommandeClicked) self.connect(self.LEFiltre,SIGNAL("textChanged(const QString&)"),self.LEFiltreTextChanged) self.connect(self.LEFiltre,SIGNAL("returnPressed()"),self.LEfiltreReturnPressed) self.connect(self.bSup,SIGNAL("pressed()"),self.BSupPressed) @@ -226,7 +201,7 @@ class DFormule(QWidget): self.buttonGroup1.setTitle(self.__tr("Affichage")) self.RBalpha.setText(self.__trUtf8("\x61\x6c\x70\x68\x61\x62\xc3\xa9\x74\x69\x71\x75\x65")) self.RBGroupe.setText(self.__tr("par groupe")) - self.BNext.setText(QString.null) + self.BNext.setText(self.__tr("Suivant")) QToolTip.add(self.BNext,self.__tr("affiche la prochaine occurence")) self.textLabel6.setText(self.__tr("Filtre")) self.TWChoix.changeTab(self.Commande,self.__tr("Nouvelle Commande")) diff --git a/Ui/desFormule.ui b/Ui/desFormule.ui index 80b9c9b2..68d19b44 100644 --- a/Ui/desFormule.ui +++ b/Ui/desFormule.ui @@ -359,10 +359,10 @@ valeurs seront effectivement prises en compte BNext - + Suivant - image0 + affiche la prochaine occurence @@ -386,15 +386,10 @@ valeurs seront effectivement prises en compte - - - 89504e470d0a1a0a0000000d49484452000000210000000e0806000000a11e758c000000cf49444154388dd594db0ec3200c43edfdf8d897bb0f345b480845d51eb64888f412e76001c00f046fd6e99bba77200480924a1032c92efbd8c7d5cabcc025400099e957849568fe7f06c0ded1deb32b4a1ec4ea824b9e74097165bd01f85527f78a7201e0a3129f345a017c543bafdc983d0f7109d15a331b471f47072c17494a82338f6178203a8817e67306b1f08b07ba03e602c9b831077e37e0209e67e3386710977b17de80c185ad38695a51d522c82ce77912e2fed8be83762092f52b1820dd11bb10e565b53a5a3bbaff130713d66fa6981857060000000049454e44ae426082 - - LBNouvCommande - clicked(QListBoxItem*) + doubleClicked(QListBoxItem*) DFormule LBNouvCommandeClicked() diff --git a/Ui/desInactif.py b/Ui/desInactif.py index a14fe525..39e7cce7 100644 --- a/Ui/desInactif.py +++ b/Ui/desInactif.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'desInactif.ui' # -# Created: mar mar 4 10:36:38 2008 +# Created: mar mar 25 10:05:08 2008 # by: The PyQt User Interface Compiler (pyuic) 3.13 # # WARNING! All changes made in this file will be lost! diff --git a/Ui/desInclude.py b/Ui/desInclude.py index 57cf503f..312fc6bd 100644 --- a/Ui/desInclude.py +++ b/Ui/desInclude.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'desInclude.ui' # -# Created: mar mar 4 10:36:38 2008 +# Created: mar mar 25 10:05:08 2008 # by: The PyQt User Interface Compiler (pyuic) 3.13 # # WARNING! All changes made in this file will be lost! @@ -10,36 +10,11 @@ from qt import * -image0_data = \ - "\x89\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d" \ - "\x49\x48\x44\x52\x00\x00\x00\x21\x00\x00\x00\x0e" \ - "\x08\x06\x00\x00\x00\xa1\x1e\x75\x8c\x00\x00\x00" \ - "\xcf\x49\x44\x41\x54\x38\x8d\xd5\x94\xdb\x0e\xc3" \ - "\x20\x0c\x43\xed\xfd\xf8\xd8\x97\xbb\x0f\x34\x5b" \ - "\x48\x08\x45\xd5\x1e\xb6\x48\x88\xf4\x12\xe7\x60" \ - "\x01\xc0\x0f\x04\x6f\xd6\xe9\x9b\xba\x77\x20\x04" \ - "\x80\x92\x4a\x10\x32\xc9\x2e\xfb\xd8\xc7\xd5\xca" \ - "\xbc\xc0\x25\x40\x00\x99\xe9\x57\x84\x95\x68\xfe" \ - "\x7f\x06\xc0\xde\xd1\xde\xb3\x2b\x4a\x1e\xc4\xea" \ - "\x82\x4b\x9e\x74\x09\x71\x65\xbd\x01\xf8\x55\x27" \ - "\xf7\x8a\x72\x01\xe0\xa3\x12\x9f\x34\x5a\x01\x7c" \ - "\x54\x3b\xaf\xdc\x98\x3d\x0f\x71\x09\xd1\x5a\x33" \ - "\x1b\x47\x1f\x47\x07\x2c\x17\x49\x4a\x82\x33\x8f" \ - "\x61\x78\x20\x3a\x88\x17\xe6\x73\x06\xb1\xf0\x8b" \ - "\x07\xba\x03\xe6\x02\xc9\xb8\x31\x07\x7e\x37\xe0" \ - "\x20\x9e\x67\xe3\x38\x67\x10\x97\x7b\x17\xde\x80" \ - "\xc1\x85\xad\x38\x69\x5a\x51\xd5\x22\xc8\x2c\xe7" \ - "\x79\x12\xe2\xfe\xd8\xbe\x83\x76\x20\x92\xf5\x2b" \ - "\x18\x20\xdd\x11\xbb\x10\xe5\x65\xb5\x3a\x5a\x3b" \ - "\xba\xff\x13\x07\x13\xd6\x6f\xa6\x98\x18\x57\x06" \ - "\x00\x00\x00\x00\x49\x45\x4e\x44\xae\x42\x60\x82" class DInc1(QWidget): def __init__(self,parent = None,name = None,fl = 0): QWidget.__init__(self,parent,name,fl) - self.image0 = QPixmap() - self.image0.loadFromData(image0_data,"PNG") if not name: self.setName("DInc1") @@ -51,6 +26,22 @@ class DInc1(QWidget): DInc1Layout.addMultiCellWidget(self.Commentaire,1,1,0,2) + self.bHelp = QPushButton(self,"bHelp") + self.bHelp.setAutoDefault(1) + + DInc1Layout.addWidget(self.bHelp,2,2) + + self.bSup = QPushButton(self,"bSup") + self.bSup.setAutoDefault(1) + + DInc1Layout.addWidget(self.bSup,2,0) + + self.bOk = QPushButton(self,"bOk") + self.bOk.setAutoDefault(1) + self.bOk.setDefault(1) + + DInc1Layout.addWidget(self.bOk,2,1) + self.TWChoix = QTabWidget(self,"TWChoix") self.MotClef = QWidget(self.TWChoix,"MotClef") @@ -106,7 +97,7 @@ class DInc1(QWidget): CommandeLayout.addMultiCellWidget(self.textLabel4,3,3,0,3) self.BNext = QToolButton(self.Commande,"BNext") - self.BNext.setIconSet(QIconSet(self.image0)) + self.BNext.setIconSet(QIconSet()) CommandeLayout.addWidget(self.BNext,1,2) @@ -118,10 +109,6 @@ class DInc1(QWidget): self.TabPage = QWidget(self.TWChoix,"TabPage") - self.BBrowse = QPushButton(self.TabPage,"BBrowse") - self.BBrowse.setGeometry(QRect(288,306,161,41)) - self.BBrowse.setSizePolicy(QSizePolicy(0,0,0,0,self.BBrowse.sizePolicy().hasHeightForWidth())) - self.textLabel1_3 = QLabel(self.TabPage,"textLabel1_3") self.textLabel1_3.setGeometry(QRect(30,40,440,41)) @@ -129,6 +116,14 @@ class DInc1(QWidget): self.LENomFichier.setGeometry(QRect(18,117,450,40)) self.LENomFichier.setSizePolicy(QSizePolicy(0,0,0,0,self.LENomFichier.sizePolicy().hasHeightForWidth())) self.LENomFichier.setMinimumSize(QSize(450,40)) + + self.BBrowse = QPushButton(self.TabPage,"BBrowse") + self.BBrowse.setGeometry(QRect(288,306,161,41)) + self.BBrowse.setSizePolicy(QSizePolicy(0,0,0,0,self.BBrowse.sizePolicy().hasHeightForWidth())) + + self.BChangeFile = QPushButton(self.TabPage,"BChangeFile") + self.BChangeFile.setGeometry(QRect(290,350,161,41)) + self.BChangeFile.setSizePolicy(QSizePolicy(0,0,0,0,self.BChangeFile.sizePolicy().hasHeightForWidth())) self.TWChoix.insertTab(self.TabPage,QString("")) self.TabPage_2 = QWidget(self.TWChoix,"TabPage_2") @@ -141,28 +136,12 @@ class DInc1(QWidget): DInc1Layout.addMultiCellWidget(self.TWChoix,0,0,0,2) - self.bHelp = QPushButton(self,"bHelp") - self.bHelp.setAutoDefault(1) - - DInc1Layout.addWidget(self.bHelp,2,2) - - self.bSup = QPushButton(self,"bSup") - self.bSup.setAutoDefault(1) - - DInc1Layout.addWidget(self.bSup,2,0) - - self.bOk = QPushButton(self,"bOk") - self.bOk.setAutoDefault(1) - self.bOk.setDefault(1) - - DInc1Layout.addWidget(self.bOk,2,1) - self.languageChange() self.resize(QSize(521,499).expandedTo(self.minimumSizeHint())) self.clearWState(Qt.WState_Polished) - self.connect(self.LBNouvCommande,SIGNAL("clicked(QListBoxItem*)"),self.LBNouvCommandeClicked) + self.connect(self.LBNouvCommande,SIGNAL("doubleClicked(QListBoxItem*)"),self.LBNouvCommandeClicked) self.connect(self.LEFiltre,SIGNAL("textChanged(const QString&)"),self.LEFiltreTextChanged) self.connect(self.LEFiltre,SIGNAL("returnPressed()"),self.LEfiltreReturnPressed) self.connect(self.bSup,SIGNAL("pressed()"),self.BSupPressed) @@ -178,6 +157,15 @@ class DInc1(QWidget): def languageChange(self): self.setCaption(self.__tr("DMacro")) self.Commentaire.setText(QString.null) + self.bHelp.setText(self.__tr("&Documentation")) + self.bHelp.setAccel(self.__tr("Alt+D")) + QToolTip.add(self.bHelp,self.__tr("affichage documentation aster")) + self.bSup.setText(self.__tr("&Supprimer")) + self.bSup.setAccel(self.__tr("Alt+S")) + QToolTip.add(self.bSup,self.__tr("suppression du mot clef")) + self.bOk.setText(self.__tr("&Valider")) + self.bOk.setAccel(self.__tr("Shift+A, Alt+A, Alt+A, Alt+A")) + QToolTip.add(self.bOk,self.__tr("validation de la saisie")) self.textLabel1.setText(self.__tr("

Mots Clefs Permis

")) self.textLabel1_2.setText(self.__trUtf8("\x3c\x68\x33\x3e\x3c\x70\x20\x61\x6c\x69\x67\x6e\x3d\x22\x63\x65\x6e\x74\x65\x72\x22\x3e\x3c\x75\x3e\x3c\x62\x3e\x52\xc3\xa9\x67\x6c\x65\x73\x3c\x2f\x62\x3e\x3c\x2f\x75\x3e\x3c\x2f\x70\x3e\x3c\x2f\x68\x33\x3e")) self.TWChoix.changeTab(self.MotClef,self.__tr("Ajouter Mot-Clef")) @@ -187,23 +175,15 @@ class DInc1(QWidget): self.RBalpha.setText(self.__trUtf8("\x61\x6c\x70\x68\x61\x62\xc3\xa9\x74\x69\x71\x75\x65")) self.textLabel1_4.setText(self.__tr("Commandes :")) self.textLabel4.setText(self.__trUtf8("\x4c\x61\x20\x63\x6f\x6d\x6d\x61\x6e\x64\x65\x20\x63\x68\x6f\x69\x73\x69\x65\x20\x73\x65\x72\x61\x20\x61\x6a\x6f\x75\x74\xc3\xa9\x65\x20\x41\x50\x52\x45\x53\x20\x6c\x61\x20\x63\x6f\x6d\x6d\x61\x6e\x64\x65\x20\x63\x6f\x75\x72\x61\x6e\x74\x65")) - self.BNext.setText(QString.null) + self.BNext.setText(self.__tr("Suivant")) QToolTip.add(self.BNext,self.__tr("affiche la prochaine occurence")) self.TWChoix.changeTab(self.Commande,self.__tr("Nouvelle Commande")) - self.BBrowse.setText(self.__tr("Edit")) self.textLabel1_3.setText(self.__tr("La commande INCLUDE requiert un nom de Fichier :")) + self.BBrowse.setText(self.__tr("Edit")) + self.BChangeFile.setText(self.__tr("Autre Fichier")) self.TWChoix.changeTab(self.TabPage,self.__tr("Fichier Include")) self.textLabel1_5.setText(self.__trUtf8("\x3c\x66\x6f\x6e\x74\x20\x73\x69\x7a\x65\x3d\x22\x2b\x31\x22\x3e\x3c\x70\x20\x61\x6c\x69\x67\x6e\x3d\x22\x63\x65\x6e\x74\x65\x72\x22\x3e\x4c\x61\x20\x63\x6f\x6d\x6d\x61\x6e\x64\x65\x20\x49\x4e\x43\x4c\x55\x44\x45\x20\x6e\x27\x61\x20\x70\x61\x73\x20\x64\x65\x20\x66\x69\x63\x68\x69\x65\x72\x20\x61\x73\x73\x6f\x63\x69\xc3\xa9\x2e\x0a\x49\x6c\x20\x66\x61\x75\x74\x20\x64\x27\x61\x62\x6f\x72\x64\x20\x63\x68\x6f\x69\x73\x69\x72\x20\x75\x6e\x20\x6e\x75\x6d\xc3\xa9\x72\x6f\x20\x64\x27\x75\x6e\x69\x74\xc3\xa9\x3c\x2f\x70\x3e\x3c\x2f\x66\x6f\x6e\x74\x3e")) self.TWChoix.changeTab(self.TabPage_2,self.__tr("Fichier Inc")) - self.bHelp.setText(self.__tr("&Documentation")) - self.bHelp.setAccel(self.__tr("Alt+D")) - QToolTip.add(self.bHelp,self.__tr("affichage documentation aster")) - self.bSup.setText(self.__tr("&Supprimer")) - self.bSup.setAccel(self.__tr("Alt+S")) - QToolTip.add(self.bSup,self.__tr("suppression du mot clef")) - self.bOk.setText(self.__tr("&Valider")) - self.bOk.setAccel(self.__tr("Shift+A, Alt+A, Alt+A, Alt+A")) - QToolTip.add(self.bOk,self.__tr("validation de la saisie")) def LBNouvCommandeClicked(self): diff --git a/Ui/desInclude.ui b/Ui/desInclude.ui index 91f8d42c..dae1e127 100644 --- a/Ui/desInclude.ui +++ b/Ui/desInclude.ui @@ -33,6 +33,60 @@ + + + bHelp + + + &Documentation + + + Alt+D + + + true + + + affichage documentation aster + + + + + bSup + + + &Supprimer + + + Alt+S + + + true + + + suppression du mot clef + + + + + bOk + + + &Valider + + + Shift+A, Alt+A, Alt+A, Alt+A + + + true + + + true + + + validation de la saisie + + TWChoix @@ -176,10 +230,10 @@ BNext - + Suivant - image0 + affiche la prochaine occurence @@ -205,30 +259,6 @@ Fichier Include - - - BBrowse - - - - 288 - 306 - 161 - 41 - - - - - 0 - 0 - 0 - 0 - - - - Edit - - textLabel1_3 @@ -272,6 +302,54 @@ + + + BBrowse + + + + 288 + 306 + 161 + 41 + + + + + 0 + 0 + 0 + 0 + + + + Edit + + + + + BChangeFile + + + + 290 + 350 + 161 + 41 + + + + + 0 + 0 + 0 + 0 + + + + Autre Fichier + + @@ -296,71 +374,12 @@ Il faut d'abord choisir un numéro d'unité</p></font> - - - bHelp - - - &Documentation - - - Alt+D - - - true - - - affichage documentation aster - - - - - bSup - - - &Supprimer - - - Alt+S - - - true - - - suppression du mot clef - - - - - bOk - - - &Valider - - - Shift+A, Alt+A, Alt+A, Alt+A - - - true - - - true - - - validation de la saisie - - - - - 89504e470d0a1a0a0000000d49484452000000210000000e0806000000a11e758c000000cf49444154388dd594db0ec3200c43edfdf8d897bb0f345b480845d51eb64888f412e76001c00f046fd6e99bba77200480924a1032c92efbd8c7d5cabcc025400099e957849568fe7f06c0ded1deb32b4a1ec4ea824b9e74097165bd01f85527f78a7201e0a3129f345a017c543bafdc983d0f7109d15a331b471f47072c17494a82338f6178203a8817e67306b1f08b07ba03e602c9b831077e37e0209e67e3386710977b17de80c185ad38695a51d522c82ce77912e2fed8be83762092f52b1820dd11bb10e565b53a5a3bbaff130713d66fa6981857060000000049454e44ae426082 - - LBNouvCommande - clicked(QListBoxItem*) + doubleClicked(QListBoxItem*) DInc1 LBNouvCommandeClicked() diff --git a/Ui/desListeParam.py b/Ui/desListeParam.py index 37ffe2c4..d8326749 100644 --- a/Ui/desListeParam.py +++ b/Ui/desListeParam.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'desListeParam.ui' # -# Created: mar mar 4 10:36:38 2008 +# Created: mar mar 25 10:05:08 2008 # by: The PyQt User Interface Compiler (pyuic) 3.13 # # WARNING! All changes made in this file will be lost! diff --git a/Ui/desMCFact.py b/Ui/desMCFact.py index 438fe6b2..50c7de55 100644 --- a/Ui/desMCFact.py +++ b/Ui/desMCFact.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'desMCFact.ui' # -# Created: mar mar 4 10:36:38 2008 +# Created: mar mar 25 10:05:08 2008 # by: The PyQt User Interface Compiler (pyuic) 3.13 # # WARNING! All changes made in this file will be lost! diff --git a/Ui/desMCListAjout.py b/Ui/desMCListAjout.py index 5c86a42a..bb0d5986 100644 --- a/Ui/desMCListAjout.py +++ b/Ui/desMCListAjout.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'desMCListAjout.ui' # -# Created: mar mar 4 10:36:38 2008 +# Created: mar mar 25 10:05:08 2008 # by: The PyQt User Interface Compiler (pyuic) 3.13 # # WARNING! All changes made in this file will be lost! diff --git a/Ui/desMacro.py b/Ui/desMacro.py index ca6ad490..b1d20aab 100644 --- a/Ui/desMacro.py +++ b/Ui/desMacro.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'desMacro.ui' # -# Created: mar mar 4 10:36:38 2008 +# Created: mar mar 25 10:05:08 2008 # by: The PyQt User Interface Compiler (pyuic) 3.13 # # WARNING! All changes made in this file will be lost! @@ -10,36 +10,11 @@ from qt import * -image0_data = \ - "\x89\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d" \ - "\x49\x48\x44\x52\x00\x00\x00\x21\x00\x00\x00\x0e" \ - "\x08\x06\x00\x00\x00\xa1\x1e\x75\x8c\x00\x00\x00" \ - "\xcf\x49\x44\x41\x54\x38\x8d\xd5\x94\xdb\x0e\xc3" \ - "\x20\x0c\x43\xed\xfd\xf8\xd8\x97\xbb\x0f\x34\x5b" \ - "\x48\x08\x45\xd5\x1e\xb6\x48\x88\xf4\x12\xe7\x60" \ - "\x01\xc0\x0f\x04\x6f\xd6\xe9\x9b\xba\x77\x20\x04" \ - "\x80\x92\x4a\x10\x32\xc9\x2e\xfb\xd8\xc7\xd5\xca" \ - "\xbc\xc0\x25\x40\x00\x99\xe9\x57\x84\x95\x68\xfe" \ - "\x7f\x06\xc0\xde\xd1\xde\xb3\x2b\x4a\x1e\xc4\xea" \ - "\x82\x4b\x9e\x74\x09\x71\x65\xbd\x01\xf8\x55\x27" \ - "\xf7\x8a\x72\x01\xe0\xa3\x12\x9f\x34\x5a\x01\x7c" \ - "\x54\x3b\xaf\xdc\x98\x3d\x0f\x71\x09\xd1\x5a\x33" \ - "\x1b\x47\x1f\x47\x07\x2c\x17\x49\x4a\x82\x33\x8f" \ - "\x61\x78\x20\x3a\x88\x17\xe6\x73\x06\xb1\xf0\x8b" \ - "\x07\xba\x03\xe6\x02\xc9\xb8\x31\x07\x7e\x37\xe0" \ - "\x20\x9e\x67\xe3\x38\x67\x10\x97\x7b\x17\xde\x80" \ - "\xc1\x85\xad\x38\x69\x5a\x51\xd5\x22\xc8\x2c\xe7" \ - "\x79\x12\xe2\xfe\xd8\xbe\x83\x76\x20\x92\xf5\x2b" \ - "\x18\x20\xdd\x11\xbb\x10\xe5\x65\xb5\x3a\x5a\x3b" \ - "\xba\xff\x13\x07\x13\xd6\x6f\xa6\x98\x18\x57\x06" \ - "\x00\x00\x00\x00\x49\x45\x4e\x44\xae\x42\x60\x82" class DMacro(QWidget): def __init__(self,parent = None,name = None,fl = 0): QWidget.__init__(self,parent,name,fl) - self.image0 = QPixmap() - self.image0.loadFromData(image0_data,"PNG") if not name: self.setName("DMacro") @@ -98,7 +73,7 @@ class DMacro(QWidget): CommandeLayout.addMultiCellWidget(self.textLabel1_4,0,0,0,1) self.BNext = QToolButton(self.Commande,"BNext") - self.BNext.setIconSet(QIconSet(self.image0)) + self.BNext.setIconSet(QIconSet()) CommandeLayout.addWidget(self.BNext,1,2) @@ -160,7 +135,7 @@ class DMacro(QWidget): self.resize(QSize(521,499).expandedTo(self.minimumSizeHint())) self.clearWState(Qt.WState_Polished) - self.connect(self.LBNouvCommande,SIGNAL("clicked(QListBoxItem*)"),self.LBNouvCommandeClicked) + self.connect(self.LBNouvCommande,SIGNAL("doubleClicked(QListBoxItem*)"),self.LBNouvCommandeClicked) self.connect(self.LEFiltre,SIGNAL("textChanged(const QString&)"),self.LEFiltreTextChanged) self.connect(self.LEFiltre,SIGNAL("returnPressed()"),self.LEfiltreReturnPressed) self.connect(self.bSup,SIGNAL("pressed()"),self.BSupPressed) @@ -182,7 +157,7 @@ class DMacro(QWidget): self.RBalpha.setText(self.__trUtf8("\x61\x6c\x70\x68\x61\x62\xc3\xa9\x74\x69\x71\x75\x65")) self.RBGroupe.setText(self.__tr("par groupe")) self.textLabel1_4.setText(self.__tr("Commandes :")) - self.BNext.setText(QString.null) + self.BNext.setText(self.__tr("Suivant")) QToolTip.add(self.BNext,self.__tr("affiche la prochaine occurence")) self.textLabel6.setText(self.__tr("Filtre")) self.textLabel4.setText(self.__trUtf8("\x4c\x61\x20\x63\x6f\x6d\x6d\x61\x6e\x64\x65\x20\x63\x68\x6f\x69\x73\x69\x65\x20\x73\x65\x72\x61\x20\x61\x6a\x6f\x75\x74\xc3\xa9\x65\x20\x41\x50\x52\x45\x53\x20\x6c\x61\x20\x63\x6f\x6d\x6d\x61\x6e\x64\x65\x20\x63\x6f\x75\x72\x61\x6e\x74\x65")) diff --git a/Ui/desMacro.ui b/Ui/desMacro.ui index 643b18ae..40a9d39f 100644 --- a/Ui/desMacro.ui +++ b/Ui/desMacro.ui @@ -160,10 +160,10 @@ BNext - + Suivant - image0 + affiche la prochaine occurence @@ -356,15 +356,10 @@ - - - 89504e470d0a1a0a0000000d49484452000000210000000e0806000000a11e758c000000cf49444154388dd594db0ec3200c43edfdf8d897bb0f345b480845d51eb64888f412e76001c00f046fd6e99bba77200480924a1032c92efbd8c7d5cabcc025400099e957849568fe7f06c0ded1deb32b4a1ec4ea824b9e74097165bd01f85527f78a7201e0a3129f345a017c543bafdc983d0f7109d15a331b471f47072c17494a82338f6178203a8817e67306b1f08b07ba03e602c9b831077e37e0209e67e3386710977b17de80c185ad38695a51d522c82ce77912e2fed8be83762092f52b1820dd11bb10e565b53a5a3bbaff130713d66fa6981857060000000049454e44ae426082 - - LBNouvCommande - clicked(QListBoxItem*) + doubleClicked(QListBoxItem*) DMacro LBNouvCommandeClicked() diff --git a/Ui/desParam.py b/Ui/desParam.py index 65222a75..c72fd1f6 100644 --- a/Ui/desParam.py +++ b/Ui/desParam.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'desParam.ui' # -# Created: mar mar 4 10:36:38 2008 +# Created: mar mar 25 10:05:08 2008 # by: The PyQt User Interface Compiler (pyuic) 3.13 # # WARNING! All changes made in this file will be lost! @@ -10,36 +10,11 @@ from qt import * -image0_data = \ - "\x89\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d" \ - "\x49\x48\x44\x52\x00\x00\x00\x21\x00\x00\x00\x0e" \ - "\x08\x06\x00\x00\x00\xa1\x1e\x75\x8c\x00\x00\x00" \ - "\xcf\x49\x44\x41\x54\x38\x8d\xd5\x94\xdb\x0e\xc3" \ - "\x20\x0c\x43\xed\xfd\xf8\xd8\x97\xbb\x0f\x34\x5b" \ - "\x48\x08\x45\xd5\x1e\xb6\x48\x88\xf4\x12\xe7\x60" \ - "\x01\xc0\x0f\x04\x6f\xd6\xe9\x9b\xba\x77\x20\x04" \ - "\x80\x92\x4a\x10\x32\xc9\x2e\xfb\xd8\xc7\xd5\xca" \ - "\xbc\xc0\x25\x40\x00\x99\xe9\x57\x84\x95\x68\xfe" \ - "\x7f\x06\xc0\xde\xd1\xde\xb3\x2b\x4a\x1e\xc4\xea" \ - "\x82\x4b\x9e\x74\x09\x71\x65\xbd\x01\xf8\x55\x27" \ - "\xf7\x8a\x72\x01\xe0\xa3\x12\x9f\x34\x5a\x01\x7c" \ - "\x54\x3b\xaf\xdc\x98\x3d\x0f\x71\x09\xd1\x5a\x33" \ - "\x1b\x47\x1f\x47\x07\x2c\x17\x49\x4a\x82\x33\x8f" \ - "\x61\x78\x20\x3a\x88\x17\xe6\x73\x06\xb1\xf0\x8b" \ - "\x07\xba\x03\xe6\x02\xc9\xb8\x31\x07\x7e\x37\xe0" \ - "\x20\x9e\x67\xe3\x38\x67\x10\x97\x7b\x17\xde\x80" \ - "\xc1\x85\xad\x38\x69\x5a\x51\xd5\x22\xc8\x2c\xe7" \ - "\x79\x12\xe2\xfe\xd8\xbe\x83\x76\x20\x92\xf5\x2b" \ - "\x18\x20\xdd\x11\xbb\x10\xe5\x65\xb5\x3a\x5a\x3b" \ - "\xba\xff\x13\x07\x13\xd6\x6f\xa6\x98\x18\x57\x06" \ - "\x00\x00\x00\x00\x49\x45\x4e\x44\xae\x42\x60\x82" class DParam(QWidget): def __init__(self,parent = None,name = None,fl = 0): QWidget.__init__(self,parent,name,fl) - self.image0 = QPixmap() - self.image0.loadFromData(image0_data,"PNG") if not name: self.setName("DParam") @@ -112,7 +87,7 @@ class DParam(QWidget): CommandeLayout.addMultiCellWidget(self.textLabel4,3,3,0,3) self.BNext = QToolButton(self.Commande,"BNext") - self.BNext.setIconSet(QIconSet(self.image0)) + self.BNext.setIconSet(QIconSet()) CommandeLayout.addWidget(self.BNext,1,2) @@ -145,7 +120,7 @@ class DParam(QWidget): self.resize(QSize(505,483).expandedTo(self.minimumSizeHint())) self.clearWState(Qt.WState_Polished) - self.connect(self.LBNouvCommande,SIGNAL("clicked(QListBoxItem*)"),self.LBNouvCommandeClicked) + self.connect(self.LBNouvCommande,SIGNAL("doubleClicked(QListBoxItem*)"),self.LBNouvCommandeClicked) self.connect(self.LEFiltre,SIGNAL("textChanged(const QString&)"),self.LEFiltreTextChanged) self.connect(self.LEFiltre,SIGNAL("returnPressed()"),self.LEfiltreReturnPressed) self.connect(self.bSup,SIGNAL("pressed()"),self.BSupPressed) @@ -171,7 +146,7 @@ class DParam(QWidget): self.RBalpha.setText(self.__trUtf8("\x61\x6c\x70\x68\x61\x62\xc3\xa9\x74\x69\x71\x75\x65")) self.textLabel1_4.setText(self.__tr("Commandes :")) self.textLabel4.setText(self.__trUtf8("\x4c\x61\x20\x63\x6f\x6d\x6d\x61\x6e\x64\x65\x20\x63\x68\x6f\x69\x73\x69\x65\x20\x73\x65\x72\x61\x20\x61\x6a\x6f\x75\x74\xc3\xa9\x65\x20\x41\x50\x52\x45\x53\x20\x6c\x61\x20\x63\x6f\x6d\x6d\x61\x6e\x64\x65\x20\x63\x6f\x75\x72\x61\x6e\x74\x65")) - self.BNext.setText(QString.null) + self.BNext.setText(self.__tr("Suivant")) QToolTip.add(self.BNext,self.__tr("affiche la prochaine occurence")) self.TWChoix.changeTab(self.Commande,self.__tr("Nouvelle Commande")) self.bOk.setText(self.__tr("&Valider")) diff --git a/Ui/desParam.ui b/Ui/desParam.ui index a871fa14..416165ec 100644 --- a/Ui/desParam.ui +++ b/Ui/desParam.ui @@ -311,10 +311,10 @@ appuyé sur le bouton Valider. BNext - + Suivant - image0 + affiche la prochaine occurence @@ -390,15 +390,10 @@ appuyé sur le bouton Valider. - - - 89504e470d0a1a0a0000000d49484452000000210000000e0806000000a11e758c000000cf49444154388dd594db0ec3200c43edfdf8d897bb0f345b480845d51eb64888f412e76001c00f046fd6e99bba77200480924a1032c92efbd8c7d5cabcc025400099e957849568fe7f06c0ded1deb32b4a1ec4ea824b9e74097165bd01f85527f78a7201e0a3129f345a017c543bafdc983d0f7109d15a331b471f47072c17494a82338f6178203a8817e67306b1f08b07ba03e602c9b831077e37e0209e67e3386710977b17de80c185ad38695a51d522c82ce77912e2fed8be83762092f52b1820dd11bb10e565b53a5a3bbaff130713d66fa6981857060000000049454e44ae426082 - - LBNouvCommande - clicked(QListBoxItem*) + doubleClicked(QListBoxItem*) DParam LBNouvCommandeClicked() diff --git a/Ui/desPlusieursBase.py b/Ui/desPlusieursBase.py index c23a084a..7fa5bc6b 100644 --- a/Ui/desPlusieursBase.py +++ b/Ui/desPlusieursBase.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'desPlusieursBase.ui' # -# Created: mar mar 4 17:30:52 2008 +# Created: mar mar 25 10:05:08 2008 # by: The PyQt User Interface Compiler (pyuic) 3.13 # # WARNING! All changes made in this file will be lost! @@ -11,6 +11,24 @@ from qt import * image0_data = \ + "\x89\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d" \ + "\x49\x48\x44\x52\x00\x00\x00\x14\x00\x00\x00\x14" \ + "\x08\x06\x00\x00\x00\x8d\x89\x1d\x0d\x00\x00\x00" \ + "\x8d\x49\x44\x41\x54\x38\x8d\xb5\xd3\xdb\x0d\x80" \ + "\x20\x0c\x05\xd0\x5b\xe3\x3a\x8e\xe2\x4c\x86\x99" \ + "\x18\x85\x81\xea\x87\xc6\xc4\xd2\x56\x28\xd8\x84" \ + "\x0f\x5e\x27\x17\x50\x02\x63\x6a\x2d\x73\xb9\x1f" \ + "\xc0\xb5\x69\x15\x39\x17\xc3\xa0\x7e\xf0\xae\x9c" \ + "\xca\xab\xbf\x1f\x5b\xb5\xa6\xed\xc8\x0c\x02\x83" \ + "\x34\x20\x06\x02\x00\x81\x65\xc2\x38\x28\x30\x2f" \ + "\xa9\x77\xdd\x36\xc6\xa0\x67\xa7\x78\x14\x3f\xa1" \ + "\x85\xf9\x5b\xe6\x61\x76\xc2\x20\xa6\x83\x03\x58" \ + "\x0d\x0e\x62\x7a\xc2\x01\xcc\x04\xa3\xd8\x55\x2c" \ + "\x1a\xc0\x39\x95\xab\x27\xe7\x5a\x9a\x3e\x18\x47" \ + "\xdd\xef\x30\x72\xec\xef\x5f\xaf\xb3\x4e\xcb\x01" \ + "\x65\xf7\x82\x6b\x45\x7b\x00\x00\x00\x00\x49\x45" \ + "\x4e\x44\xae\x42\x60\x82" +image1_data = \ "\x89\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d" \ "\x49\x48\x44\x52\x00\x00\x00\x21\x00\x00\x00\x0e" \ "\x08\x06\x00\x00\x00\xa1\x1e\x75\x8c\x00\x00\x00" \ @@ -33,7 +51,7 @@ image0_data = \ "\xed\xf4\x8c\x5e\x60\xb8\xdf\xbe\xb8\x1d\x6d\xab" \ "\x9a\xff\x99\x27\x00\x00\x00\x00\x49\x45\x4e\x44" \ "\xae\x42\x60\x82" -image1_data = \ +image2_data = \ "\x89\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d" \ "\x49\x48\x44\x52\x00\x00\x00\x21\x00\x00\x00\x0e" \ "\x08\x06\x00\x00\x00\xa1\x1e\x75\x8c\x00\x00\x00" \ @@ -65,10 +83,13 @@ class DPlusBase(QWidget): self.image0.loadFromData(image0_data,"PNG") self.image1 = QPixmap() self.image1.loadFromData(image1_data,"PNG") + self.image2 = QPixmap() + self.image2.loadFromData(image2_data,"PNG") if not name: self.setName("DPlusBase") self.setMinimumSize(QSize(350,0)) + self.setIcon(self.image0) DPlusBaseLayout = QGridLayout(self,1,1,11,6,"DPlusBaseLayout") @@ -79,28 +100,49 @@ class DPlusBase(QWidget): self.textLabel1 = QLabel(self.Widget8,"textLabel1") - Widget8Layout.addWidget(self.textLabel1,0,0) + Widget8Layout.addMultiCellWidget(self.textLabel1,0,0,0,1) - layout19 = QVBoxLayout(None,0,6,"layout19") + layout6 = QHBoxLayout(None,0,6,"layout6") - layout12 = QHBoxLayout(None,0,6,"layout12") + self.bSup = QPushButton(self.Widget8,"bSup") + self.bSup.setMinimumSize(QSize(0,30)) + self.bSup.setAutoDefault(1) + layout6.addWidget(self.bSup) - self.textLabel1_2 = QLabel(self.Widget8,"textLabel1_2") - layout12.addWidget(self.textLabel1_2) - spacer6 = QSpacerItem(111,20,QSizePolicy.Expanding,QSizePolicy.Minimum) - layout12.addItem(spacer6) - layout19.addLayout(layout12) + self.bOk = QPushButton(self.Widget8,"bOk") + self.bOk.setMinimumSize(QSize(0,30)) + self.bOk.setAutoDefault(1) + self.bOk.setDefault(1) + layout6.addWidget(self.bOk) - self.LEValeur = QLineEdit(self.Widget8,"LEValeur") - self.LEValeur.setSizePolicy(QSizePolicy(1,1,0,0,self.LEValeur.sizePolicy().hasHeightForWidth())) - self.LEValeur.setMinimumSize(QSize(220,30)) - layout19.addWidget(self.LEValeur) + self.bHelp = QPushButton(self.Widget8,"bHelp") + self.bHelp.setMinimumSize(QSize(0,30)) + self.bHelp.setAutoDefault(1) + layout6.addWidget(self.bHelp) + + Widget8Layout.addMultiCellLayout(layout6,7,7,0,3) - Widget8Layout.addMultiCellLayout(layout19,1,1,2,3) + layout7 = QVBoxLayout(None,0,6,"layout7") + + self.bParam = QPushButton(self.Widget8,"bParam") + self.bParam.setMinimumSize(QSize(0,30)) + self.bParam.setAutoDefault(1) + layout7.addWidget(self.bParam) + + self.bImport = QPushButton(self.Widget8,"bImport") + self.bImport.setMinimumSize(QSize(0,30)) + self.bImport.setAutoDefault(1) + layout7.addWidget(self.bImport) + + Widget8Layout.addLayout(layout7,6,3) + spacer3 = QSpacerItem(31,90,QSizePolicy.Minimum,QSizePolicy.Expanding) + Widget8Layout.addItem(spacer3,5,3) self.LBValeurs = QListBox(self.Widget8,"LBValeurs") - Widget8Layout.addMultiCellWidget(self.LBValeurs,1,5,0,0) + Widget8Layout.addMultiCellWidget(self.LBValeurs,1,6,0,0) + spacer5 = QSpacerItem(130,20,QSizePolicy.Expanding,QSizePolicy.Minimum) + Widget8Layout.addItem(spacer5,6,2) layout8 = QVBoxLayout(None,0,6,"layout8") spacer5_2 = QSpacerItem(20,31,QSizePolicy.Minimum,QSizePolicy.Expanding) @@ -109,61 +151,45 @@ class DPlusBase(QWidget): self.BAjout1Val = QToolButton(self.Widget8,"BAjout1Val") self.BAjout1Val.setSizePolicy(QSizePolicy(0,0,0,0,self.BAjout1Val.sizePolicy().hasHeightForWidth())) self.BAjout1Val.setMinimumSize(QSize(40,30)) - self.BAjout1Val.setIconSet(QIconSet(self.image0)) + self.BAjout1Val.setIconSet(QIconSet(self.image1)) layout8.addWidget(self.BAjout1Val) self.BSup1Val = QToolButton(self.Widget8,"BSup1Val") self.BSup1Val.setSizePolicy(QSizePolicy(0,0,0,0,self.BSup1Val.sizePolicy().hasHeightForWidth())) self.BSup1Val.setMinimumSize(QSize(40,30)) - self.BSup1Val.setIconSet(QIconSet(self.image1)) + self.BSup1Val.setIconSet(QIconSet(self.image2)) layout8.addWidget(self.BSup1Val) spacer4 = QSpacerItem(21,231,QSizePolicy.Minimum,QSizePolicy.Expanding) layout8.addItem(spacer4) - Widget8Layout.addMultiCellLayout(layout8,0,4,1,1) + Widget8Layout.addMultiCellLayout(layout8,1,6,1,1) self.Commentaire = QLabel(self.Widget8,"Commentaire") self.Commentaire.setMinimumSize(QSize(0,60)) - Widget8Layout.addMultiCellWidget(self.Commentaire,2,2,2,3) - - layout6 = QHBoxLayout(None,0,6,"layout6") - - self.bSup = QPushButton(self.Widget8,"bSup") - self.bSup.setMinimumSize(QSize(0,30)) - self.bSup.setAutoDefault(1) - layout6.addWidget(self.bSup) + Widget8Layout.addMultiCellWidget(self.Commentaire,4,4,2,3) - self.bOk = QPushButton(self.Widget8,"bOk") - self.bOk.setMinimumSize(QSize(0,30)) - self.bOk.setAutoDefault(1) - self.bOk.setDefault(1) - layout6.addWidget(self.bOk) + self.BSalome = QToolButton(self.Widget8,"BSalome") + self.BSalome.setSizePolicy(QSizePolicy(0,0,0,0,self.BSalome.sizePolicy().hasHeightForWidth())) + self.BSalome.setMinimumSize(QSize(40,30)) + self.BSalome.setIconSet(QIconSet(self.image0)) - self.bHelp = QPushButton(self.Widget8,"bHelp") - self.bHelp.setMinimumSize(QSize(0,30)) - self.bHelp.setAutoDefault(1) - layout6.addWidget(self.bHelp) + Widget8Layout.addWidget(self.BSalome,3,2) - Widget8Layout.addMultiCellLayout(layout6,6,6,0,3) - spacer3 = QSpacerItem(31,130,QSizePolicy.Minimum,QSizePolicy.Expanding) - Widget8Layout.addItem(spacer3,3,3) - spacer5 = QSpacerItem(160,20,QSizePolicy.Expanding,QSizePolicy.Minimum) - Widget8Layout.addMultiCell(spacer5,5,5,1,2) + layout12 = QHBoxLayout(None,0,6,"layout12") - layout7 = QVBoxLayout(None,0,6,"layout7") + self.textLabel1_2 = QLabel(self.Widget8,"textLabel1_2") + layout12.addWidget(self.textLabel1_2) + spacer6 = QSpacerItem(111,20,QSizePolicy.Expanding,QSizePolicy.Minimum) + layout12.addItem(spacer6) - self.bParam = QPushButton(self.Widget8,"bParam") - self.bParam.setMinimumSize(QSize(0,30)) - self.bParam.setAutoDefault(1) - layout7.addWidget(self.bParam) + Widget8Layout.addMultiCellLayout(layout12,1,1,2,3) - self.bImport = QPushButton(self.Widget8,"bImport") - self.bImport.setMinimumSize(QSize(0,30)) - self.bImport.setAutoDefault(1) - layout7.addWidget(self.bImport) + self.LEValeur = QLineEdit(self.Widget8,"LEValeur") + self.LEValeur.setSizePolicy(QSizePolicy(1,1,0,0,self.LEValeur.sizePolicy().hasHeightForWidth())) + self.LEValeur.setMinimumSize(QSize(220,30)) - Widget8Layout.addMultiCellLayout(layout7,4,5,3,3) + Widget8Layout.addMultiCellWidget(self.LEValeur,2,2,2,3) self.tabuniqueinto.insertTab(self.Widget8,QString("")) DPlusBaseLayout.addWidget(self.tabuniqueinto,0,0) @@ -181,17 +207,12 @@ class DPlusBase(QWidget): self.connect(self.BAjout1Val,SIGNAL("clicked()"),self.Ajout1Valeur) self.connect(self.BSup1Val,SIGNAL("clicked()"),self.Sup1Valeur) self.connect(self.LEValeur,SIGNAL("returnPressed()"),self.LEValeurPressed) + self.connect(self.BSalome,SIGNAL("clicked()"),self.BSalomePressed) def languageChange(self): self.setCaption(self.__tr("DUnIn")) self.textLabel1.setText(self.__tr("Valeur(s) actuelle(s)")) - self.textLabel1_2.setText(self.__tr("Valeur")) - self.BAjout1Val.setText(QString.null) - QToolTip.add(self.BAjout1Val,self.__trUtf8("\x61\x6a\x6f\x75\x74\x65\x20\x6c\x61\x20\x76\x61\x6c\x65\x75\x72\x20\x73\x61\x69\x73\x69\x65\x20\x73\x6f\x75\x73\x20\x6c\x20\x6f\x63\x63\x75\x72\x65\x6e\x63\x65\x20\x73\x65\x6c\x65\x63\x74\x69\x6f\x6e\x6e\xc3\xa9\x65\x20\x28\x65\x6e\x20\x66\x69\x6e\x20\x64\x65\x20\x6c\x69\x73\x74\x65\x20\x73\x69\x20\x69\x6c\x20\x6e\x20\x79\x20\x61\x20\x70\x61\x73\x20\x64\x65\x20\x73\x65\x6c\x65\x63\x74\x69\x6f\x6e\x29")) - self.BSup1Val.setText(QString.null) - QToolTip.add(self.BSup1Val,self.__tr("enleve l occurence selectionnee")) - self.Commentaire.setText(QString.null) self.bSup.setText(self.__tr("&Supprimer")) self.bSup.setAccel(self.__tr("Alt+S")) QToolTip.add(self.bSup,self.__tr("suppression du mot clef")) @@ -207,6 +228,14 @@ class DPlusBase(QWidget): self.bImport.setText(self.__tr("&Importer")) self.bImport.setAccel(self.__tr("Alt+I")) QToolTip.add(self.bImport,self.__tr("suppression du mot clef")) + self.BAjout1Val.setText(QString.null) + QToolTip.add(self.BAjout1Val,self.__trUtf8("\x61\x6a\x6f\x75\x74\x65\x20\x6c\x61\x20\x76\x61\x6c\x65\x75\x72\x20\x73\x61\x69\x73\x69\x65\x20\x73\x6f\x75\x73\x20\x6c\x20\x6f\x63\x63\x75\x72\x65\x6e\x63\x65\x20\x73\x65\x6c\x65\x63\x74\x69\x6f\x6e\x6e\xc3\xa9\x65\x20\x28\x65\x6e\x20\x66\x69\x6e\x20\x64\x65\x20\x6c\x69\x73\x74\x65\x20\x73\x69\x20\x69\x6c\x20\x6e\x20\x79\x20\x61\x20\x70\x61\x73\x20\x64\x65\x20\x73\x65\x6c\x65\x63\x74\x69\x6f\x6e\x29")) + self.BSup1Val.setText(QString.null) + QToolTip.add(self.BSup1Val,self.__tr("enleve l occurence selectionnee")) + self.Commentaire.setText(QString.null) + self.BSalome.setText(QString.null) + QToolTip.add(self.BSalome,self.__trUtf8("\x61\x6a\x6f\x75\x74\x65\x20\x6c\x61\x20\x76\x61\x6c\x65\x75\x72\x20\x73\x61\x69\x73\x69\x65\x20\x73\x6f\x75\x73\x20\x6c\x20\x6f\x63\x63\x75\x72\x65\x6e\x63\x65\x20\x73\x65\x6c\x65\x63\x74\x69\x6f\x6e\x6e\xc3\xa9\x65\x20\x28\x65\x6e\x20\x66\x69\x6e\x20\x64\x65\x20\x6c\x69\x73\x74\x65\x20\x73\x69\x20\x69\x6c\x20\x6e\x20\x79\x20\x61\x20\x70\x61\x73\x20\x64\x65\x20\x73\x65\x6c\x65\x63\x74\x69\x6f\x6e\x29")) + self.textLabel1_2.setText(self.__tr("Valeur")) self.tabuniqueinto.changeTab(self.Widget8,self.__tr("Saisir Valeur")) @@ -234,6 +263,9 @@ class DPlusBase(QWidget): def BImportPressed(self): print "DPlusBase.BImportPressed(): Not implemented yet" + def BSalomePressed(self): + print "DPlusBase.BSalomePressed(): Not implemented yet" + def __tr(self,s,c = None): return qApp.translate("DPlusBase",s,c) diff --git a/Ui/desPlusieursBase.ui b/Ui/desPlusieursBase.ui index 3a6e13da..b7617f78 100644 --- a/Ui/desPlusieursBase.ui +++ b/Ui/desPlusieursBase.ui @@ -21,6 +21,9 @@ DUnIn + + image0 + unnamed @@ -40,7 +43,7 @@ unnamed - + textLabel1 @@ -48,76 +51,184 @@ <u><font size="+1">Valeur(s) actuelle(s)</font></u> - + - layout19 + layout6 - + unnamed - + - layout12 - - - - unnamed - - - - textLabel1_2 - - - <font size="+1">Valeur</font> - - - - - spacer6 - - - Horizontal - - - Expanding - - - - 111 - 20 - - - - + bSup + + + + 0 + 30 + + + + &Supprimer + + + Alt+S + + + true + + + suppression du mot clef + - + - LEValeur + bOk - - - 1 - 1 - 0 - 0 - + + + 0 + 30 + + + + &Valider + + + Shift+A, Alt+A, Alt+A, Alt+A + + + true + + + true + + + validation de la saisie + + + + + bHelp - 220 + 0 30 + + &Documentation + + + Alt+D + + + true + + + affichage documentation aster + + + + + + + layout7 + + + + unnamed + + + + bParam + + + + 0 + 30 + + + + &Parametres + + + Alt+P + + + true + + + suppression du mot clef + + + + + bImport + + + + 0 + 30 + + + + &Importer + + + Alt+I + + + true + + + suppression du mot clef + - + + + spacer3 + + + Vertical + + + Expanding + + + + 31 + 90 + + + + LBValeurs - + + + spacer5 + + + Horizontal + + + Expanding + + + + 130 + 20 + + + + layout8 @@ -164,7 +275,7 @@ - image0 + image1 ajoute la valeur saisie sous l occurence selectionnée (en fin de liste si il n y a pas de selection) @@ -192,7 +303,7 @@ - image1 + image2 enleve l occurence selectionnee @@ -217,7 +328,7 @@ - + Commentaire @@ -231,177 +342,87 @@ - + - layout6 + BSalome + + + + 0 + 0 + 0 + 0 + + + + + 40 + 30 + + + + + + + image0 + + + ajoute la valeur saisie sous l occurence selectionnée (en fin de liste si il n y a pas de selection) + + + + + layout12 unnamed - + - bSup - - - - 0 - 30 - + textLabel1_2 - &Supprimer - - - Alt+S - - - true - - - suppression du mot clef + <font size="+1">Valeur</font> - + - bOk + spacer6 - - - 0 - 30 - - - - &Valider - - - Shift+A, Alt+A, Alt+A, Alt+A - - - true - - - true - - - validation de la saisie + + Horizontal - - - - bHelp + + Expanding - + - 0 - 30 + 111 + 20 - - &Documentation - - - Alt+D - - - true - - - affichage documentation aster - - + - - - spacer3 - - - Vertical - - - Expanding - - - - 31 - 130 - - - - + - spacer5 + LEValeur - - Horizontal - - - Expanding + + + 1 + 1 + 0 + 0 + - + - 160 - 20 + 220 + 30 - - - - layout7 - - - - unnamed - - - - bParam - - - - 0 - 30 - - - - &Parametres - - - Alt+P - - - true - - - suppression du mot clef - - - - - bImport - - - - 0 - 30 - - - - &Importer - - - Alt+I - - - true - - - suppression du mot clef - - - @@ -410,9 +431,12 @@ - 89504e470d0a1a0a0000000d49484452000000210000000e0806000000a11e758c000000c749444154388dcd94590ec3200c4471d57bc73df9f407d331b159a228aa254448bc3cc68152fec0e4420ceeceb912e08a0239838848f5df02c99c11f86004300119054ae868c56ac206c06b4b109111c802874f3a52a587757123897e4039c46b50d8865b07f5400a450053330893cf8674a30028d492deef04626b559dfe48ac842b1a6daae6850155033b99c5009f70ceda111aab413b6f6a70d118e008e6fd8bc51d5d00a0f614556d1ff9b9be4952aabc3721f8f8b6f624c557ef8947afedf48c5e60b8dfbeb81d6dab9aff99270000000049454e44ae426082 + 89504e470d0a1a0a0000000d49484452000000140000001408060000008d891d0d0000008d49444154388db5d3db0d80200c05d05be33a8ee24c8699188581ea87c6c4d25628d8840f5e27175002636a2d73b91fc0b569153917c3a07ef0ae9ccaabbf1f5bb5a6edc80c028334200602008165c23828302fa977dd36c6a067a778143fa185f95be66176c220a68303580d0e627ac201cc04a3d8552c1ac03995ab27e75a9a3e1847ddef3072ecef5fafb34ecb0165f7826b457b0000000049454e44ae426082 + 89504e470d0a1a0a0000000d49484452000000210000000e0806000000a11e758c000000c749444154388dcd94590ec3200c4471d57bc73df9f407d331b159a228aa254448bc3cc68152fec0e4420ceeceb912e08a0239838848f5df02c99c11f86004300119054ae868c56ac206c06b4b109111c802874f3a52a587757123897e4039c46b50d8865b07f5400a450053330893cf8674a30028d492deef04626b559dfe48ac842b1a6daae6850155033b99c5009f70ceda111aab413b6f6a70d118e008e6fd8bc51d5d00a0f614556d1ff9b9be4952aabc3721f8f8b6f624c557ef8947afedf48c5e60b8dfbeb81d6dab9aff99270000000049454e44ae426082 + + 89504e470d0a1a0a0000000d49484452000000210000000e0806000000a11e758c000000cf49444154388dd594db0ec3200c43edfdf8d897bb0f345b480845d51eb64888f412e76001c00f046fd6e99bba77200480924a1032c92efbd8c7d5cabcc025400099e957849568fe7f06c0ded1deb32b4a1ec4ea824b9e74097165bd01f85527f78a7201e0a3129f345a017c543bafdc983d0f7109d15a331b471f47072c17494a82338f6178203a8817e67306b1f08b07ba03e602c9b831077e37e0209e67e3386710977b17de80c185ad38695a51d522c82ce77912e2fed8be83762092f52b1820dd11bb10e565b53a5a3bbaff130713d66fa6981857060000000049454e44ae426082 @@ -465,6 +489,12 @@ DPlusBase LEValeurPressed() + + BSalome + clicked() + DPlusBase + BSalomePressed() + BSupPressed() @@ -475,6 +505,7 @@ Ajout1Valeur() Sup1Valeur() BImportPressed() + BSalomePressed() diff --git a/Ui/desPlusieursInto.py b/Ui/desPlusieursInto.py index de60fae6..fad74366 100644 --- a/Ui/desPlusieursInto.py +++ b/Ui/desPlusieursInto.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'desPlusieursInto.ui' # -# Created: mar mar 4 16:38:40 2008 +# Created: mar mar 25 10:05:08 2008 # by: The PyQt User Interface Compiler (pyuic) 3.13 # # WARNING! All changes made in this file will be lost! @@ -79,63 +79,68 @@ class DPlusInto(QWidget): self.textLabel1 = QLabel(self.Widget8,"textLabel1") - Widget8Layout.addMultiCellWidget(self.textLabel1,0,0,0,2) + Widget8Layout.addMultiCellWidget(self.textLabel1,0,0,0,1) - self.textLabel1_2 = QLabel(self.Widget8,"textLabel1_2") + self.bSup = QPushButton(self.Widget8,"bSup") + self.bSup.setMinimumSize(QSize(130,30)) + self.bSup.setAutoDefault(1) - Widget8Layout.addMultiCellWidget(self.textLabel1_2,0,0,3,5) + Widget8Layout.addWidget(self.bSup,3,0) - self.listBoxVal = QListBox(self.Widget8,"listBoxVal") + self.bOk = QPushButton(self.Widget8,"bOk") + self.bOk.setMinimumSize(QSize(130,30)) + self.bOk.setAutoDefault(1) + self.bOk.setDefault(1) + + Widget8Layout.addMultiCellWidget(self.bOk,3,3,1,2) + + self.bHelp = QPushButton(self.Widget8,"bHelp") + self.bHelp.setSizePolicy(QSizePolicy(1,0,150,0,self.bHelp.sizePolicy().hasHeightForWidth())) + self.bHelp.setMinimumSize(QSize(130,30)) + self.bHelp.setAutoDefault(1) + + Widget8Layout.addWidget(self.bHelp,3,3) + + self.Commentaire = QLabel(self.Widget8,"Commentaire") + self.Commentaire.setMinimumSize(QSize(0,40)) - Widget8Layout.addMultiCellWidget(self.listBoxVal,1,1,4,5) + Widget8Layout.addMultiCellWidget(self.Commentaire,2,2,0,3) + + layout8 = QHBoxLayout(None,0,6,"layout8") self.LBValeurs = QListBox(self.Widget8,"LBValeurs") + layout8.addWidget(self.LBValeurs) - Widget8Layout.addMultiCellWidget(self.LBValeurs,1,1,0,1) + layout5 = QVBoxLayout(None,0,6,"layout5") + spacer2 = QSpacerItem(21,44,QSizePolicy.Minimum,QSizePolicy.Expanding) + layout5.addItem(spacer2) - layout3 = QVBoxLayout(None,0,6,"layout3") - spacer2 = QSpacerItem(21,50,QSizePolicy.Minimum,QSizePolicy.Expanding) - layout3.addItem(spacer2) + layout2 = QVBoxLayout(None,0,6,"layout2") self.BSup1Val = QToolButton(self.Widget8,"BSup1Val") self.BSup1Val.setMinimumSize(QSize(40,31)) self.BSup1Val.setMaximumSize(QSize(40,31)) self.BSup1Val.setIconSet(QIconSet(self.image0)) - layout3.addWidget(self.BSup1Val) + layout2.addWidget(self.BSup1Val) self.BAjout1Val = QToolButton(self.Widget8,"BAjout1Val") self.BAjout1Val.setMinimumSize(QSize(40,31)) self.BAjout1Val.setMaximumSize(QSize(40,31)) self.BAjout1Val.setIconSet(QIconSet(self.image1)) - layout3.addWidget(self.BAjout1Val) - spacer3 = QSpacerItem(21,181,QSizePolicy.Minimum,QSizePolicy.Expanding) - layout3.addItem(spacer3) - - Widget8Layout.addMultiCellLayout(layout3,1,1,2,3) - - self.bHelp = QPushButton(self.Widget8,"bHelp") - self.bHelp.setMinimumSize(QSize(0,30)) - self.bHelp.setAutoDefault(1) + layout2.addWidget(self.BAjout1Val) + spacer3 = QSpacerItem(21,176,QSizePolicy.Minimum,QSizePolicy.Expanding) + layout2.addItem(spacer3) + layout5.addLayout(layout2) + layout8.addLayout(layout5) - Widget8Layout.addWidget(self.bHelp,3,5) - - self.bOk = QPushButton(self.Widget8,"bOk") - self.bOk.setMinimumSize(QSize(0,30)) - self.bOk.setAutoDefault(1) - self.bOk.setDefault(1) - - Widget8Layout.addMultiCellWidget(self.bOk,3,3,1,4) - - self.bSup = QPushButton(self.Widget8,"bSup") - self.bSup.setMinimumSize(QSize(0,30)) - self.bSup.setAutoDefault(1) + self.listBoxVal = QListBox(self.Widget8,"listBoxVal") + layout8.addWidget(self.listBoxVal) - Widget8Layout.addWidget(self.bSup,3,0) + Widget8Layout.addMultiCellLayout(layout8,1,1,0,3) - self.Commentaire = QLabel(self.Widget8,"Commentaire") - self.Commentaire.setMinimumSize(QSize(0,40)) + self.textLabel1_2 = QLabel(self.Widget8,"textLabel1_2") - Widget8Layout.addMultiCellWidget(self.Commentaire,2,2,0,5) + Widget8Layout.addMultiCellWidget(self.textLabel1_2,0,0,2,3) self.tabuniqueinto.insertTab(self.Widget8,QString("")) DPlusIntoLayout.addWidget(self.tabuniqueinto,0,0) @@ -156,21 +161,21 @@ class DPlusInto(QWidget): def languageChange(self): self.setCaption(self.__tr("DUnIn")) self.textLabel1.setText(self.__tr("Valeur(s) actuelle(s)")) - self.textLabel1_2.setText(self.__tr("Valeur(s) possibles(s)")) - self.BSup1Val.setText(QString.null) - QToolTip.add(self.BSup1Val,self.__tr("enleve l occurence selectionnee")) - self.BAjout1Val.setText(QString.null) - QToolTip.add(self.BAjout1Val,self.__trUtf8("\x61\x6a\x6f\x75\x74\x65\x20\x6c\x61\x20\x76\x61\x6c\x65\x75\x72\x20\x73\x61\x69\x73\x69\x65\x20\x73\x6f\x75\x73\x20\x6c\x20\x6f\x63\x63\x75\x72\x65\x6e\x63\x65\x20\x73\x65\x6c\x65\x63\x74\x69\x6f\x6e\x6e\xc3\xa9\x65\x20\x28\x65\x6e\x20\x66\x69\x6e\x20\x64\x65\x20\x6c\x69\x73\x74\x65\x20\x73\x69\x20\x69\x6c\x20\x6e\x20\x79\x20\x61\x20\x70\x61\x73\x20\x64\x65\x20\x73\x65\x6c\x65\x63\x74\x69\x6f\x6e\x29")) - self.bHelp.setText(self.__tr("&Documentation")) - self.bHelp.setAccel(self.__tr("Alt+D")) - QToolTip.add(self.bHelp,self.__tr("affichage documentation aster")) - self.bOk.setText(self.__tr("&Valider")) - self.bOk.setAccel(self.__tr("Shift+A, Alt+A, Alt+A, Alt+A")) - QToolTip.add(self.bOk,self.__tr("validation de la saisie")) self.bSup.setText(self.__tr("&Supprimer")) self.bSup.setAccel(self.__tr("Alt+S")) QToolTip.add(self.bSup,self.__tr("suppression du mot clef")) + self.bOk.setText(self.__tr("&Valider")) + self.bOk.setAccel(self.__tr("Shift+A, Alt+A, Alt+A, Alt+A")) + QToolTip.add(self.bOk,self.__tr("validation de la saisie")) + self.bHelp.setText(self.__tr("&Documentation")) + self.bHelp.setAccel(self.__tr("Alt+D")) + QToolTip.add(self.bHelp,self.__tr("affichage documentation aster")) self.Commentaire.setText(QString.null) + self.BSup1Val.setText(QString.null) + QToolTip.add(self.BSup1Val,self.__tr("enleve l occurence selectionnee")) + self.BAjout1Val.setText(QString.null) + QToolTip.add(self.BAjout1Val,self.__trUtf8("\x61\x6a\x6f\x75\x74\x65\x20\x6c\x61\x20\x76\x61\x6c\x65\x75\x72\x20\x73\x61\x69\x73\x69\x65\x20\x73\x6f\x75\x73\x20\x6c\x20\x6f\x63\x63\x75\x72\x65\x6e\x63\x65\x20\x73\x65\x6c\x65\x63\x74\x69\x6f\x6e\x6e\xc3\xa9\x65\x20\x28\x65\x6e\x20\x66\x69\x6e\x20\x64\x65\x20\x6c\x69\x73\x74\x65\x20\x73\x69\x20\x69\x6c\x20\x6e\x20\x79\x20\x61\x20\x70\x61\x73\x20\x64\x65\x20\x73\x65\x6c\x65\x63\x74\x69\x6f\x6e\x29")) + self.textLabel1_2.setText(self.__tr("Valeur(s) possibles(s)")) self.tabuniqueinto.changeTab(self.Widget8,self.__tr("Saisir Valeur")) diff --git a/Ui/desPlusieursInto.ui b/Ui/desPlusieursInto.ui index e47a5b5a..18a95743 100644 --- a/Ui/desPlusieursInto.ui +++ b/Ui/desPlusieursInto.ui @@ -40,7 +40,7 @@ unnamed - + textLabel1 @@ -48,150 +48,36 @@ <u><font size="+1">Valeur(s) actuelle(s)</font></u> - - - textLabel1_2 - - - <u><font size="+1">Valeur(s) possibles(s)</font></u> - - - - - listBoxVal - - - - - LBValeurs - - - - - layout3 - - - - unnamed - - - - spacer2 - - - Vertical - - - Expanding - - - - 21 - 50 - - - - - - BSup1Val - - - - 40 - 31 - - - - - 40 - 31 - - - - - - - image0 - - - enleve l occurence selectionnee - - - - - BAjout1Val - - - - 40 - 31 - - - - - 40 - 31 - - - - - - - image1 - - - ajoute la valeur saisie sous l occurence selectionnée (en fin de liste si il n y a pas de selection) - - - - - spacer3 - - - Vertical - - - Expanding - - - - 21 - 181 - - - - - - + - bHelp + bSup - 0 + 130 30 - &Documentation + &Supprimer - Alt+D + Alt+S true - affichage documentation aster + suppression du mot clef - + bOk - 0 + 130 30 @@ -211,30 +97,38 @@ validation de la saisie - + - bSup + bHelp + + + + 1 + 0 + 150 + 0 + - 0 + 130 30 - &Supprimer + &Documentation - Alt+S + Alt+D true - suppression du mot clef + affichage documentation aster - + Commentaire @@ -248,6 +142,140 @@ + + + layout8 + + + + unnamed + + + + LBValeurs + + + + + layout5 + + + + unnamed + + + + spacer2 + + + Vertical + + + Expanding + + + + 21 + 44 + + + + + + layout2 + + + + unnamed + + + + BSup1Val + + + + 40 + 31 + + + + + 40 + 31 + + + + + + + image0 + + + enleve l occurence selectionnee + + + + + BAjout1Val + + + + 40 + 31 + + + + + 40 + 31 + + + + + + + image1 + + + ajoute la valeur saisie sous l occurence selectionnée (en fin de liste si il n y a pas de selection) + + + + + spacer3 + + + Vertical + + + Expanding + + + + 21 + 176 + + + + + + + + + + listBoxVal + + + + + + + textLabel1_2 + + + <u><font size="+1">Valeur(s) possibles(s)</font></u> + + diff --git a/Ui/desPoursuite.py b/Ui/desPoursuite.py index d200e6cb..9a3605aa 100644 --- a/Ui/desPoursuite.py +++ b/Ui/desPoursuite.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'desPoursuite.ui' # -# Created: mar mar 4 10:36:38 2008 +# Created: mar mar 25 10:05:09 2008 # by: The PyQt User Interface Compiler (pyuic) 3.13 # # WARNING! All changes made in this file will be lost! @@ -10,36 +10,11 @@ from qt import * -image0_data = \ - "\x89\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d" \ - "\x49\x48\x44\x52\x00\x00\x00\x21\x00\x00\x00\x0e" \ - "\x08\x06\x00\x00\x00\xa1\x1e\x75\x8c\x00\x00\x00" \ - "\xcf\x49\x44\x41\x54\x38\x8d\xd5\x94\xdb\x0e\xc3" \ - "\x20\x0c\x43\xed\xfd\xf8\xd8\x97\xbb\x0f\x34\x5b" \ - "\x48\x08\x45\xd5\x1e\xb6\x48\x88\xf4\x12\xe7\x60" \ - "\x01\xc0\x0f\x04\x6f\xd6\xe9\x9b\xba\x77\x20\x04" \ - "\x80\x92\x4a\x10\x32\xc9\x2e\xfb\xd8\xc7\xd5\xca" \ - "\xbc\xc0\x25\x40\x00\x99\xe9\x57\x84\x95\x68\xfe" \ - "\x7f\x06\xc0\xde\xd1\xde\xb3\x2b\x4a\x1e\xc4\xea" \ - "\x82\x4b\x9e\x74\x09\x71\x65\xbd\x01\xf8\x55\x27" \ - "\xf7\x8a\x72\x01\xe0\xa3\x12\x9f\x34\x5a\x01\x7c" \ - "\x54\x3b\xaf\xdc\x98\x3d\x0f\x71\x09\xd1\x5a\x33" \ - "\x1b\x47\x1f\x47\x07\x2c\x17\x49\x4a\x82\x33\x8f" \ - "\x61\x78\x20\x3a\x88\x17\xe6\x73\x06\xb1\xf0\x8b" \ - "\x07\xba\x03\xe6\x02\xc9\xb8\x31\x07\x7e\x37\xe0" \ - "\x20\x9e\x67\xe3\x38\x67\x10\x97\x7b\x17\xde\x80" \ - "\xc1\x85\xad\x38\x69\x5a\x51\xd5\x22\xc8\x2c\xe7" \ - "\x79\x12\xe2\xfe\xd8\xbe\x83\x76\x20\x92\xf5\x2b" \ - "\x18\x20\xdd\x11\xbb\x10\xe5\x65\xb5\x3a\x5a\x3b" \ - "\xba\xff\x13\x07\x13\xd6\x6f\xa6\x98\x18\x57\x06" \ - "\x00\x00\x00\x00\x49\x45\x4e\x44\xae\x42\x60\x82" class DPour(QWidget): def __init__(self,parent = None,name = None,fl = 0): QWidget.__init__(self,parent,name,fl) - self.image0 = QPixmap() - self.image0.loadFromData(image0_data,"PNG") if not name: self.setName("DPour") @@ -102,7 +77,7 @@ class DPour(QWidget): CommandeLayout.addMultiCellWidget(self.textLabel4,3,3,0,3) self.BNext = QToolButton(self.Commande,"BNext") - self.BNext.setIconSet(QIconSet(self.image0)) + self.BNext.setIconSet(QIconSet()) CommandeLayout.addWidget(self.BNext,1,2) @@ -170,7 +145,7 @@ class DPour(QWidget): self.resize(QSize(521,499).expandedTo(self.minimumSizeHint())) self.clearWState(Qt.WState_Polished) - self.connect(self.LBNouvCommande,SIGNAL("clicked(QListBoxItem*)"),self.LBNouvCommandeClicked) + self.connect(self.LBNouvCommande,SIGNAL("doubleClicked(QListBoxItem*)"),self.LBNouvCommandeClicked) self.connect(self.LEFiltre,SIGNAL("textChanged(const QString&)"),self.LEFiltreTextChanged) self.connect(self.LEFiltre,SIGNAL("returnPressed()"),self.LEfiltreReturnPressed) self.connect(self.bSup,SIGNAL("pressed()"),self.BSupPressed) @@ -193,7 +168,7 @@ class DPour(QWidget): self.RBGroupe.setText(self.__tr("par groupe")) self.RBalpha.setText(self.__trUtf8("\x61\x6c\x70\x68\x61\x62\xc3\xa9\x74\x69\x71\x75\x65")) self.textLabel4.setText(self.__trUtf8("\x4c\x61\x20\x63\x6f\x6d\x6d\x61\x6e\x64\x65\x20\x63\x68\x6f\x69\x73\x69\x65\x20\x73\x65\x72\x61\x20\x61\x6a\x6f\x75\x74\xc3\xa9\x65\x20\x41\x50\x52\x45\x53\x20\x6c\x61\x20\x63\x6f\x6d\x6d\x61\x6e\x64\x65\x20\x63\x6f\x75\x72\x61\x6e\x74\x65")) - self.BNext.setText(QString.null) + self.BNext.setText(self.__tr("Suivant")) QToolTip.add(self.BNext,self.__tr("affiche la prochaine occurence")) self.textLabel6.setText(self.__tr("Filtre")) self.TWChoix.changeTab(self.Commande,self.__tr("Nouvelle Commande")) diff --git a/Ui/desPoursuite.ui b/Ui/desPoursuite.ui index 58bbbfbc..ace3995d 100644 --- a/Ui/desPoursuite.ui +++ b/Ui/desPoursuite.ui @@ -168,10 +168,10 @@ BNext - + Suivant - image0 + affiche la prochaine occurence @@ -384,15 +384,10 @@ - - - 89504e470d0a1a0a0000000d49484452000000210000000e0806000000a11e758c000000cf49444154388dd594db0ec3200c43edfdf8d897bb0f345b480845d51eb64888f412e76001c00f046fd6e99bba77200480924a1032c92efbd8c7d5cabcc025400099e957849568fe7f06c0ded1deb32b4a1ec4ea824b9e74097165bd01f85527f78a7201e0a3129f345a017c543bafdc983d0f7109d15a331b471f47072c17494a82338f6178203a8817e67306b1f08b07ba03e602c9b831077e37e0209e67e3386710977b17de80c185ad38695a51d522c82ce77912e2fed8be83762092f52b1820dd11bb10e565b53a5a3bbaff130713d66fa6981857060000000049454e44ae426082 - - LBNouvCommande - clicked(QListBoxItem*) + doubleClicked(QListBoxItem*) DPour LBNouvCommandeClicked() diff --git a/Ui/desRacine.py b/Ui/desRacine.py index daf44e33..41518411 100644 --- a/Ui/desRacine.py +++ b/Ui/desRacine.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'desRacine.ui' # -# Created: mar mar 4 10:36:39 2008 +# Created: mar mar 25 10:05:09 2008 # by: The PyQt User Interface Compiler (pyuic) 3.13 # # WARNING! All changes made in this file will be lost! @@ -10,36 +10,11 @@ from qt import * -image0_data = \ - "\x89\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d" \ - "\x49\x48\x44\x52\x00\x00\x00\x21\x00\x00\x00\x0e" \ - "\x08\x06\x00\x00\x00\xa1\x1e\x75\x8c\x00\x00\x00" \ - "\xcf\x49\x44\x41\x54\x38\x8d\xd5\x94\xdb\x0e\xc3" \ - "\x20\x0c\x43\xed\xfd\xf8\xd8\x97\xbb\x0f\x34\x5b" \ - "\x48\x08\x45\xd5\x1e\xb6\x48\x88\xf4\x12\xe7\x60" \ - "\x01\xc0\x0f\x04\x6f\xd6\xe9\x9b\xba\x77\x20\x04" \ - "\x80\x92\x4a\x10\x32\xc9\x2e\xfb\xd8\xc7\xd5\xca" \ - "\xbc\xc0\x25\x40\x00\x99\xe9\x57\x84\x95\x68\xfe" \ - "\x7f\x06\xc0\xde\xd1\xde\xb3\x2b\x4a\x1e\xc4\xea" \ - "\x82\x4b\x9e\x74\x09\x71\x65\xbd\x01\xf8\x55\x27" \ - "\xf7\x8a\x72\x01\xe0\xa3\x12\x9f\x34\x5a\x01\x7c" \ - "\x54\x3b\xaf\xdc\x98\x3d\x0f\x71\x09\xd1\x5a\x33" \ - "\x1b\x47\x1f\x47\x07\x2c\x17\x49\x4a\x82\x33\x8f" \ - "\x61\x78\x20\x3a\x88\x17\xe6\x73\x06\xb1\xf0\x8b" \ - "\x07\xba\x03\xe6\x02\xc9\xb8\x31\x07\x7e\x37\xe0" \ - "\x20\x9e\x67\xe3\x38\x67\x10\x97\x7b\x17\xde\x80" \ - "\xc1\x85\xad\x38\x69\x5a\x51\xd5\x22\xc8\x2c\xe7" \ - "\x79\x12\xe2\xfe\xd8\xbe\x83\x76\x20\x92\xf5\x2b" \ - "\x18\x20\xdd\x11\xbb\x10\xe5\x65\xb5\x3a\x5a\x3b" \ - "\xba\xff\x13\x07\x13\xd6\x6f\xa6\x98\x18\x57\x06" \ - "\x00\x00\x00\x00\x49\x45\x4e\x44\xae\x42\x60\x82" class DRac(QWidget): def __init__(self,parent = None,name = None,fl = 0): QWidget.__init__(self,parent,name,fl) - self.image0 = QPixmap() - self.image0.loadFromData(image0_data,"PNG") if not name: self.setName("DRac") @@ -52,7 +27,7 @@ class DRac(QWidget): DRacLayout.addMultiCellWidget(self.LBNouvCommande,3,3,0,2) self.BNext = QToolButton(self,"BNext") - self.BNext.setIconSet(QIconSet(self.image0)) + self.BNext.setIconSet(QIconSet()) DRacLayout.addWidget(self.BNext,2,2) @@ -110,7 +85,7 @@ class DRac(QWidget): self.resize(QSize(505,499).expandedTo(self.minimumSizeHint())) self.clearWState(Qt.WState_Polished) - self.connect(self.LBNouvCommande,SIGNAL("clicked(QListBoxItem*)"),self.LBNouvCommandeClicked) + self.connect(self.LBNouvCommande,SIGNAL("doubleClicked(QListBoxItem*)"),self.LBNouvCommandeClicked) self.connect(self.LEFiltre,SIGNAL("textChanged(const QString&)"),self.LEFiltreTextChanged) self.connect(self.LEFiltre,SIGNAL("returnPressed()"),self.LEfiltreReturnPressed) self.connect(self.bSup,SIGNAL("pressed()"),self.BSupPressed) @@ -123,7 +98,7 @@ class DRac(QWidget): def languageChange(self): self.setCaption(self.__tr("DMacro")) - self.BNext.setText(QString.null) + self.BNext.setText(self.__tr("Suivant")) QToolTip.add(self.BNext,self.__tr("affiche la prochaine occurence")) self.textLabel6.setText(self.__tr("Filtre")) self.buttonGroup1.setTitle(self.__tr("Affichage")) diff --git a/Ui/desRacine.ui b/Ui/desRacine.ui index 3d1d9632..be702ef2 100644 --- a/Ui/desRacine.ui +++ b/Ui/desRacine.ui @@ -35,10 +35,10 @@ BNext - + Suivant - image0 + affiche la prochaine occurence @@ -193,15 +193,10 @@ - - - 89504e470d0a1a0a0000000d49484452000000210000000e0806000000a11e758c000000cf49444154388dd594db0ec3200c43edfdf8d897bb0f345b480845d51eb64888f412e76001c00f046fd6e99bba77200480924a1032c92efbd8c7d5cabcc025400099e957849568fe7f06c0ded1deb32b4a1ec4ea824b9e74097165bd01f85527f78a7201e0a3129f345a017c543bafdc983d0f7109d15a331b471f47072c17494a82338f6178203a8817e67306b1f08b07ba03e602c9b831077e37e0209e67e3386710977b17de80c185ad38695a51d522c82ce77912e2fed8be83762092f52b1820dd11bb10e565b53a5a3bbaff130713d66fa6981857060000000049454e44ae426082 - - LBNouvCommande - clicked(QListBoxItem*) + doubleClicked(QListBoxItem*) DRac LBNouvCommandeClicked() diff --git a/Ui/desSelectVal.py b/Ui/desSelectVal.py index 69f5e243..f43b5d2c 100644 --- a/Ui/desSelectVal.py +++ b/Ui/desSelectVal.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'desSelectVal.ui' # -# Created: mar mar 4 10:36:39 2008 +# Created: mar mar 25 10:05:09 2008 # by: The PyQt User Interface Compiler (pyuic) 3.13 # # WARNING! All changes made in this file will be lost! diff --git a/Ui/desUniqueASSD.py b/Ui/desUniqueASSD.py index 766f34f4..12a79933 100644 --- a/Ui/desUniqueASSD.py +++ b/Ui/desUniqueASSD.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'desUniqueASSD.ui' # -# Created: mar mar 4 16:27:19 2008 +# Created: mar mar 25 10:05:09 2008 # by: The PyQt User Interface Compiler (pyuic) 3.13 # # WARNING! All changes made in this file will be lost! diff --git a/Ui/desUniqueBase.py b/Ui/desUniqueBase.py index 89e76db5..bb6eb81d 100644 --- a/Ui/desUniqueBase.py +++ b/Ui/desUniqueBase.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'desUniqueBase.ui' # -# Created: mar mar 4 16:20:27 2008 +# Created: mar mar 25 10:05:09 2008 # by: The PyQt User Interface Compiler (pyuic) 3.13 # # WARNING! All changes made in this file will be lost! @@ -10,11 +10,31 @@ from qt import * +image0_data = \ + "\x89\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d" \ + "\x49\x48\x44\x52\x00\x00\x00\x14\x00\x00\x00\x14" \ + "\x08\x06\x00\x00\x00\x8d\x89\x1d\x0d\x00\x00\x00" \ + "\x8d\x49\x44\x41\x54\x38\x8d\xb5\xd3\xdb\x0d\x80" \ + "\x20\x0c\x05\xd0\x5b\xe3\x3a\x8e\xe2\x4c\x86\x99" \ + "\x18\x85\x81\xea\x87\xc6\xc4\xd2\x56\x28\xd8\x84" \ + "\x0f\x5e\x27\x17\x50\x02\x63\x6a\x2d\x73\xb9\x1f" \ + "\xc0\xb5\x69\x15\x39\x17\xc3\xa0\x7e\xf0\xae\x9c" \ + "\xca\xab\xbf\x1f\x5b\xb5\xa6\xed\xc8\x0c\x02\x83" \ + "\x34\x20\x06\x02\x00\x81\x65\xc2\x38\x28\x30\x2f" \ + "\xa9\x77\xdd\x36\xc6\xa0\x67\xa7\x78\x14\x3f\xa1" \ + "\x85\xf9\x5b\xe6\x61\x76\xc2\x20\xa6\x83\x03\x58" \ + "\x0d\x0e\x62\x7a\xc2\x01\xcc\x04\xa3\xd8\x55\x2c" \ + "\x1a\xc0\x39\x95\xab\x27\xe7\x5a\x9a\x3e\x18\x47" \ + "\xdd\xef\x30\x72\xec\xef\x5f\xaf\xb3\x4e\xcb\x01" \ + "\x65\xf7\x82\x6b\x45\x7b\x00\x00\x00\x00\x49\x45" \ + "\x4e\x44\xae\x42\x60\x82" class DUnBase(QWidget): def __init__(self,parent = None,name = None,fl = 0): QWidget.__init__(self,parent,name,fl) + self.image0 = QPixmap() + self.image0.loadFromData(image0_data,"PNG") if not name: self.setName("DUnBase") @@ -25,54 +45,46 @@ class DUnBase(QWidget): self.tabuniqueinto = QTabWidget(self,"tabuniqueinto") self.Widget8 = QWidget(self.tabuniqueinto,"Widget8") - Widget8Layout = QGridLayout(self.Widget8,1,1,11,6,"Widget8Layout") - layout2 = QHBoxLayout(None,0,6,"layout2") + LayoutWidget = QWidget(self.Widget8,"layout2") + LayoutWidget.setGeometry(QRect(11,47,434,52)) + layout2 = QHBoxLayout(LayoutWidget,11,6,"layout2") - self.textLabel2 = QLabel(self.Widget8,"textLabel2") + self.textLabel2 = QLabel(LayoutWidget,"textLabel2") layout2.addWidget(self.textLabel2) - self.lineEditVal = QLineEdit(self.Widget8,"lineEditVal") + self.lineEditVal = QLineEdit(LayoutWidget,"lineEditVal") self.lineEditVal.setMinimumSize(QSize(290,50)) layout2.addWidget(self.lineEditVal) - Widget8Layout.addMultiCellLayout(layout2,1,1,0,2) - spacer1 = QSpacerItem(286,21,QSizePolicy.Expanding,QSizePolicy.Minimum) - Widget8Layout.addMultiCell(spacer1,0,0,0,1) - self.bParametres = QPushButton(self.Widget8,"bParametres") + self.bParametres.setGeometry(QRect(305,11,140,30)) self.bParametres.setSizePolicy(QSizePolicy(0,0,0,0,self.bParametres.sizePolicy().hasHeightForWidth())) self.bParametres.setMinimumSize(QSize(140,30)) - Widget8Layout.addWidget(self.bParametres,0,2) - self.bSup = QPushButton(self.Widget8,"bSup") + self.bSup.setGeometry(QRect(11,389,141,30)) self.bSup.setMinimumSize(QSize(0,30)) self.bSup.setAutoDefault(1) - Widget8Layout.addWidget(self.bSup,5,0) - self.bOk = QPushButton(self.Widget8,"bOk") + self.bOk.setGeometry(QRect(158,389,141,30)) self.bOk.setMinimumSize(QSize(0,30)) self.bOk.setAutoDefault(1) self.bOk.setDefault(1) - Widget8Layout.addWidget(self.bOk,5,1) - self.bHelp = QPushButton(self.Widget8,"bHelp") + self.bHelp.setGeometry(QRect(305,389,140,30)) self.bHelp.setMinimumSize(QSize(0,30)) self.bHelp.setAutoDefault(1) - Widget8Layout.addWidget(self.bHelp,5,2) - spacer4 = QSpacerItem(41,110,QSizePolicy.Minimum,QSizePolicy.Expanding) - Widget8Layout.addItem(spacer4,2,1) - spacer3 = QSpacerItem(21,111,QSizePolicy.Minimum,QSizePolicy.Expanding) - Widget8Layout.addItem(spacer3,4,1) - self.Commentaire = QLabel(self.Widget8,"Commentaire") + self.Commentaire.setGeometry(QRect(12,224,432,40)) self.Commentaire.setMinimumSize(QSize(430,40)) - Widget8Layout.addMultiCellWidget(self.Commentaire,3,3,0,2) + self.BSalome = QPushButton(self.Widget8,"BSalome") + self.BSalome.setGeometry(QRect(17,115,51,41)) + self.BSalome.setIconSet(QIconSet(self.image0)) self.tabuniqueinto.insertTab(self.Widget8,QString("")) DUnBaseLayout.addWidget(self.tabuniqueinto,0,0) @@ -87,6 +99,7 @@ class DUnBase(QWidget): self.connect(self.bSup,SIGNAL("clicked()"),self.BSupPressed) self.connect(self.lineEditVal,SIGNAL("returnPressed()"),self.LEValeurPressed) self.connect(self.bParametres,SIGNAL("pressed()"),self.BParametresPressed) + self.connect(self.BSalome,SIGNAL("pressed()"),self.BSalomePressed) def languageChange(self): @@ -103,6 +116,7 @@ class DUnBase(QWidget): self.bHelp.setAccel(self.__tr("Alt+D")) QToolTip.add(self.bHelp,self.__tr("affichage documentation aster")) self.Commentaire.setText(QString.null) + self.BSalome.setText(QString.null) self.tabuniqueinto.changeTab(self.Widget8,self.__tr("Saisir Valeur")) @@ -121,5 +135,8 @@ class DUnBase(QWidget): def LEValeurPressed(self): print "DUnBase.LEValeurPressed(): Not implemented yet" + def BSalomePressed(self): + print "DUnBase.BSalomePressed(): Not implemented yet" + def __tr(self,s,c = None): return qApp.translate("DUnBase",s,c) diff --git a/Ui/desUniqueBase.ui b/Ui/desUniqueBase.ui index 6c5eb318..9aff6dc3 100644 --- a/Ui/desUniqueBase.ui +++ b/Ui/desUniqueBase.ui @@ -36,203 +36,294 @@ Saisir Valeur - + - unnamed + layout2 - + + + 11 + 47 + 434 + 52 + + + - layout2 + unnamed - + - unnamed + textLabel2 - - - textLabel2 - - - <b><u><p align="center">Valeur: </p></u></b> - - - - - lineEditVal - - - - 290 - 50 - - - - - - - - spacer1 - - - Horizontal - - - Expanding - - - - 286 - 21 - - - - - - bParametres - - - - 0 - 0 - 0 - 0 - - - - - 140 - 30 - - - - Parametres - - - - - bSup - - - - 0 - 30 - - - - &Supprimer - - - Alt+S - - - true - - - suppression du mot clef - - - - - bOk - - - - 0 - 30 - - - - &Valider - - - Shift+A, Alt+A, Alt+A, Alt+A - - - true - - - true - - - validation de la saisie - - - - - bHelp - - - - 0 - 30 - - - - &Documentation - - - Alt+D - - - true - - - affichage documentation aster - - - - - spacer4 - - - Vertical - - - Expanding - - - - 41 - 110 - - - - - - spacer3 - - - Vertical - - - Expanding - - - - 21 - 111 - - - - - - Commentaire - - - - 430 - 40 - - - - - - - + + <b><u><p align="center">Valeur: </p></u></b> + + + + + lineEditVal + + + + 290 + 50 + + + + + + + + spacer1 + + + Horizontal + + + Expanding + + + + 286 + 21 + + + + + 11 + 15 + 288 + 21 + + + + + + bParametres + + + + 305 + 11 + 140 + 30 + + + + + 0 + 0 + 0 + 0 + + + + + 140 + 30 + + + + Parametres + + + + + bSup + + + + 11 + 389 + 141 + 30 + + + + + 0 + 30 + + + + &Supprimer + + + Alt+S + + + true + + + suppression du mot clef + + + + + bOk + + + + 158 + 389 + 141 + 30 + + + + + 0 + 30 + + + + &Valider + + + Shift+A, Alt+A, Alt+A, Alt+A + + + true + + + true + + + validation de la saisie + + + + + bHelp + + + + 305 + 389 + 140 + 30 + + + + + 0 + 30 + + + + &Documentation + + + Alt+D + + + true + + + affichage documentation aster + + + + + spacer4 + + + Vertical + + + Expanding + + + + 41 + 112 + + + + + 207 + 106 + 41 + 112 + + + + + + Commentaire + + + + 12 + 224 + 432 + 40 + + + + + 430 + 40 + + + + + + + + + spacer3 + + + Vertical + + + Expanding + + + + 21 + 112 + + + + + 217 + 270 + 21 + 112 + + + + + + BSalome + + + + 17 + 115 + 51 + 41 + + + + + + + image0 + + + + + 89504e470d0a1a0a0000000d49484452000000140000001408060000008d891d0d0000008d49444154388db5d3db0d80200c05d05be33a8ee24c8699188581ea87c6c4d25628d8840f5e27175002636a2d73b91fc0b569153917c3a07ef0ae9ccaabbf1f5bb5a6edc80c028334200602008165c23828302fa977dd36c6a067a778143fa185f95be66176c220a68303580d0e627ac201cc04a3d8552c1ac03995ab27e75a9a3e1847ddef3072ecef5fafb34ecb0165f7826b457b0000000049454e44ae426082 + + bHelp @@ -264,6 +355,12 @@ DUnBase BParametresPressed() + + BSalome + pressed() + DUnBase + BSalomePressed() + BSupPressed() @@ -271,6 +368,7 @@ BOk2Pressed() BParametresPressed() LEValeurPressed() + BSalomePressed() diff --git a/Ui/desUniqueComp.py b/Ui/desUniqueComp.py index 0816049c..29e67337 100644 --- a/Ui/desUniqueComp.py +++ b/Ui/desUniqueComp.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'desUniqueComp.ui' # -# Created: mar mar 4 10:36:39 2008 +# Created: mar mar 25 10:05:09 2008 # by: The PyQt User Interface Compiler (pyuic) 3.13 # # WARNING! All changes made in this file will be lost! diff --git a/Ui/desUniqueInto.py b/Ui/desUniqueInto.py index 690950be..914a3d2e 100644 --- a/Ui/desUniqueInto.py +++ b/Ui/desUniqueInto.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'desUniqueInto.ui' # -# Created: mar mar 4 16:32:40 2008 +# Created: mar mar 25 10:05:09 2008 # by: The PyQt User Interface Compiler (pyuic) 3.13 # # WARNING! All changes made in this file will be lost! diff --git a/Ui/desUniqueSDCO.py b/Ui/desUniqueSDCO.py index 79cf8fd8..b9ac1dba 100644 --- a/Ui/desUniqueSDCO.py +++ b/Ui/desUniqueSDCO.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'desUniqueSDCO.ui' # -# Created: mar mar 4 17:53:43 2008 +# Created: mar mar 25 15:11:17 2008 # by: The PyQt User Interface Compiler (pyuic) 3.13 # # WARNING! All changes made in this file will be lost! @@ -27,11 +27,6 @@ class DUnSDCO(QWidget): self.Widget8 = QWidget(self.tabuniqueinto,"Widget8") Widget8Layout = QGridLayout(self.Widget8,1,1,11,6,"Widget8Layout") - self.Commentaire = QLabel(self.Widget8,"Commentaire") - self.Commentaire.setMinimumSize(QSize(311,30)) - - Widget8Layout.addMultiCellWidget(self.Commentaire,3,3,0,3) - self.bSup = QPushButton(self.Widget8,"bSup") self.bSup.setMinimumSize(QSize(0,30)) self.bSup.setAutoDefault(1) @@ -43,55 +38,31 @@ class DUnSDCO(QWidget): self.bOk.setAutoDefault(1) self.bOk.setDefault(1) - Widget8Layout.addMultiCellWidget(self.bOk,4,4,1,2) + Widget8Layout.addWidget(self.bOk,4,1) self.bHelp = QPushButton(self.Widget8,"bHelp") self.bHelp.setMinimumSize(QSize(0,30)) self.bHelp.setAutoDefault(1) - Widget8Layout.addWidget(self.bHelp,4,3) + Widget8Layout.addWidget(self.bHelp,4,2) - self.textLabel2 = QLabel(self.Widget8,"textLabel2") + self.Commentaire = QLabel(self.Widget8,"Commentaire") + self.Commentaire.setMinimumSize(QSize(311,30)) - Widget8Layout.addMultiCellWidget(self.textLabel2,2,2,0,3) + Widget8Layout.addMultiCellWidget(self.Commentaire,3,3,0,2) - self.frame3 = QFrame(self.Widget8,"frame3") - self.frame3.setFrameShape(QFrame.StyledPanel) - self.frame3.setFrameShadow(QFrame.Raised) - frame3Layout = QGridLayout(self.frame3,1,1,11,6,"frame3Layout") + self.textLabel2_2 = QLabel(self.Widget8,"textLabel2_2") - layout5 = QGridLayout(None,1,1,0,6,"layout5") + Widget8Layout.addMultiCellWidget(self.textLabel2_2,0,0,0,2) - self.LESDCO = QLineEdit(self.frame3,"LESDCO") + self.LESDCO = QLineEdit(self.Widget8,"LESDCO") self.LESDCO.setMinimumSize(QSize(300,40)) - layout5.addWidget(self.LESDCO,1,0) - - self.textLabel2_2 = QLabel(self.frame3,"textLabel2_2") - - layout5.addWidget(self.textLabel2_2,0,0) + Widget8Layout.addMultiCellWidget(self.LESDCO,1,1,0,2) - frame3Layout.addLayout(layout5,0,0) - - Widget8Layout.addMultiCellWidget(self.frame3,1,1,0,3) - - self.textLabel1 = QLabel(self.Widget8,"textLabel1") - - Widget8Layout.addMultiCellWidget(self.textLabel1,0,0,0,1) - - layout6 = QVBoxLayout(None,0,6,"layout6") - - self.rbOui = QRadioButton(self.Widget8,"rbOui") - self.rbOui.setEnabled(1) - self.rbOui.setChecked(1) - layout6.addWidget(self.rbOui) - - self.rbNon = QRadioButton(self.Widget8,"rbNon") - self.rbNon.setEnabled(0) - self.rbNon.setChecked(0) - layout6.addWidget(self.rbNon) + self.textLabel2 = QLabel(self.Widget8,"textLabel2") - Widget8Layout.addMultiCellLayout(layout6,0,0,2,3) + Widget8Layout.addMultiCellWidget(self.textLabel2,2,2,0,2) self.tabuniqueinto.insertTab(self.Widget8,QString("")) DUnSDCOLayout.addWidget(self.tabuniqueinto,0,0) @@ -104,13 +75,11 @@ class DUnSDCO(QWidget): self.connect(self.bHelp,SIGNAL("clicked()"),self.ViewDoc) self.connect(self.bOk,SIGNAL("clicked()"),self.BOkPressed) self.connect(self.bSup,SIGNAL("clicked()"),self.BSupPressed) - self.connect(self.rbOui,SIGNAL("clicked()"),self.BOuiPressed) self.connect(self.LESDCO,SIGNAL("returnPressed()"),self.LESDCOReturnPressed) def languageChange(self): self.setCaption(self.__tr("DUnIn")) - self.Commentaire.setText(QString.null) self.bSup.setText(self.__tr("&Supprimer")) self.bSup.setAccel(self.__tr("Alt+S")) QToolTip.add(self.bSup,self.__tr("suppression du mot clef")) @@ -120,11 +89,9 @@ class DUnSDCO(QWidget): self.bHelp.setText(self.__tr("&Documentation")) self.bHelp.setAccel(self.__tr("Alt+D")) QToolTip.add(self.bHelp,self.__tr("affichage documentation aster")) + self.Commentaire.setText(QString.null) + self.textLabel2_2.setText(self.__tr("

Nom du nouveau concept :

")) self.textLabel2.setText(self.__tr("Un objet de type CO est attendu")) - self.textLabel2_2.setText(self.__tr("Nom du nouveau concept : ")) - self.textLabel1.setText(self.__tr("Nouveau Concept : ")) - self.rbOui.setText(self.__tr("Oui")) - self.rbNon.setText(self.__tr("Non")) self.tabuniqueinto.changeTab(self.Widget8,self.__tr("Saisir Valeur")) diff --git a/Ui/desUniqueSDCO.ui b/Ui/desUniqueSDCO.ui index 0375abdc..2356cc4e 100644 --- a/Ui/desUniqueSDCO.ui +++ b/Ui/desUniqueSDCO.ui @@ -40,20 +40,6 @@ unnamed - - - Commentaire - - - - 311 - 30 - - - - - - bSup @@ -77,7 +63,7 @@ suppression du mot clef - + bOk @@ -103,7 +89,7 @@ validation de la saisie - + bHelp @@ -126,104 +112,46 @@ affichage documentation aster - + - textLabel2 + Commentaire + + + + 311 + 30 + - <font size="+1">Un objet de type CO est attendu</font> + - + - frame3 - - - StyledPanel + textLabel2_2 - - Raised + + <h1><font size="+2">Nom du nouveau concept : </font></h1> - - - unnamed - - - - layout5 - - - - unnamed - - - - LESDCO - - - - 300 - 40 - - - - - - textLabel2_2 - - - <font size="+2">Nom du nouveau concept : </font> - - - - - - + - textLabel1 + LESDCO - - <font size="+1">Nouveau Concept : </font> + + + 300 + 40 + - + - layout6 + textLabel2 + + + <font size="+1">Un objet de type CO est attendu</font> - - - unnamed - - - - rbOui - - - true - - - Oui - - - true - - - - - rbNon - - - false - - - Non - - - false - - - @@ -249,12 +177,6 @@ DUnSDCO BSupPressed() - - rbOui - clicked() - DUnSDCO - BOuiPressed() - LESDCO returnPressed() diff --git a/Ui/desUniqueSDCOInto.py b/Ui/desUniqueSDCOInto.py index 185c6d43..d74acfdb 100644 --- a/Ui/desUniqueSDCOInto.py +++ b/Ui/desUniqueSDCOInto.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'desUniqueSDCOInto.ui' # -# Created: mar mar 4 17:57:52 2008 +# Created: mar mar 25 15:11:07 2008 # by: The PyQt User Interface Compiler (pyuic) 3.13 # # WARNING! All changes made in this file will be lost! @@ -46,21 +46,6 @@ class DUnSDCOInto(QWidget): layout3 = QGridLayout(None,1,1,0,6,"layout3") - self.rbOui = QRadioButton(self.Widget8,"rbOui") - self.rbOui.setEnabled(1) - - layout3.addWidget(self.rbOui,0,1) - - self.rbNon = QRadioButton(self.Widget8,"rbNon") - self.rbNon.setEnabled(1) - self.rbNon.setChecked(1) - - layout3.addWidget(self.rbNon,1,1) - - self.textLabel1 = QLabel(self.Widget8,"textLabel1") - - layout3.addMultiCellWidget(self.textLabel1,0,1,0,0) - Widget8Layout.addMultiCellLayout(layout3,2,2,0,2) layout6 = QHBoxLayout(None,0,6,"layout6") @@ -110,8 +95,6 @@ class DUnSDCOInto(QWidget): self.connect(self.bHelp,SIGNAL("clicked()"),self.ViewDoc) self.connect(self.bOk,SIGNAL("clicked()"),self.BOkPressed) self.connect(self.bSup,SIGNAL("clicked()"),self.BSupPressed) - self.connect(self.rbNon,SIGNAL("clicked()"),self.BNonPressed) - self.connect(self.rbOui,SIGNAL("clicked()"),self.BOuiPressed) self.connect(self.LBSDCO,SIGNAL("clicked(QListBoxItem*)"),self.LBSDCOReturnPressed) self.connect(self.LESDCO,SIGNAL("returnPressed()"),self.LESDCOReturnPressed) @@ -121,9 +104,6 @@ class DUnSDCOInto(QWidget): self.textLabel2.setText(self.__trUtf8("\x3c\x66\x6f\x6e\x74\x20\x73\x69\x7a\x65\x3d\x22\x2b\x31\x22\x3e\x3c\x75\x3e\x53\x74\x72\x75\x63\x74\x75\x72\x65\x73\x20\x64\x65\x20\x64\x6f\x6e\x6e\xc3\xa9\x65\x73\x20\x64\x75\x20\x74\x79\x70\x65\x20\x72\x65\x71\x75\x69\x73\x20\x70\x61\x72\x20\x6c\x27\x6f\x62\x6a\x65\x74\x20\x63\x6f\x75\x72\x61\x6e\x74\x20\x3c\x2f\x75\x3e\x3c\x2f\x66\x6f\x6e\x74\x3e")) self.textLabel2_3.setText(self.__tr("Un objet de type CO est attendu")) self.Commentaire.setText(QString.null) - self.rbOui.setText(self.__tr("Oui")) - self.rbNon.setText(self.__tr("Non")) - self.textLabel1.setText(self.__tr("Nouveau Concept : ")) self.textLabel2_2.setText(self.__tr(" Nom concept : ")) self.bSup.setText(self.__tr("&Supprimer")) self.bSup.setAccel(self.__tr("Alt+S")) diff --git a/Ui/desUniqueSDCOInto.ui b/Ui/desUniqueSDCOInto.ui index d6bbb36c..4b35835e 100644 --- a/Ui/desUniqueSDCOInto.ui +++ b/Ui/desUniqueSDCOInto.ui @@ -83,39 +83,6 @@ unnamed - - - rbOui - - - true - - - Oui - - - - - rbNon - - - true - - - Non - - - true - - - - - textLabel1 - - - <font size="+1">Nouveau Concept : </font> - - @@ -268,18 +235,6 @@ DUnSDCOInto BSupPressed() - - rbNon - clicked() - DUnSDCOInto - BNonPressed() - - - rbOui - clicked() - DUnSDCOInto - BOuiPressed() - LBSDCO clicked(QListBoxItem*) diff --git a/Ui/desVisu.py b/Ui/desVisu.py index bfeb69fa..09571531 100644 --- a/Ui/desVisu.py +++ b/Ui/desVisu.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'desVisu.ui' # -# Created: mar mar 4 10:36:39 2008 +# Created: mar mar 25 10:05:09 2008 # by: The PyQt User Interface Compiler (pyuic) 3.13 # # WARNING! All changes made in this file will be lost! diff --git a/Ui/makefile b/Ui/makefile index 3cd68adc..4ae7de1a 100644 --- a/Ui/makefile +++ b/Ui/makefile @@ -7,7 +7,7 @@ PY_FILES = desChoixCata.py desCommande.py desCommentaire.py desError.py desFormu desInclude.py desListeParam.py desMacro.py desMCFact.py desMCListAjout.py desParam.py \ desPlusieursBase.py desPlusieursInto.py desPoursuite.py desRacine.py desSelectVal.py \ desUniqueASSD.py desUniqueBase.py desUniqueComp.py desUniqueInto.py desUniqueSDCOInto.py \ - desUniqueSDCO.py desVisu.py myMain.py aideQT.py + desUniqueSDCO.py desVisu.py myMain.py aideQT.py OptionsEditeur.py %.py:%.ui ${PYUIC} -o $@ $< diff --git a/Ui/myMain.py b/Ui/myMain.py index 0565e4b6..1276f2ab 100644 --- a/Ui/myMain.py +++ b/Ui/myMain.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'myMain.ui' # -# Created: mar mar 4 10:36:39 2008 +# Created: mer mar 26 10:05:29 2008 # by: The PyQt User Interface Compiler (pyuic) 3.13 # # WARNING! All changes made in this file will be lost! @@ -296,6 +296,7 @@ class Eficas(QMainWindow): self.traduitV7V8Action = QAction(self,"traduitV7V8Action") self.aidenew_itemAction = QAction(self,"aidenew_itemAction") self.fileNewInclude = QAction(self,"fileNewInclude") + self.optionEditeurAction = QAction(self,"optionEditeurAction") self.toolBar = QToolBar(QString(""),self,Qt.DockTop) @@ -343,12 +344,13 @@ class Eficas(QMainWindow): self.jdcFichierResultatAction.addTo(self.JdC) self.MenuBar.insertItem(QString(""),self.JdC,4) - self.Options = QPopupMenu(self) - self.MenuBar.insertItem(QString(""),self.Options,5) - self.Aide = QPopupMenu(self) self.aidenew_itemAction.addTo(self.Aide) - self.MenuBar.insertItem(QString(""),self.Aide,6) + self.MenuBar.insertItem(QString(""),self.Aide,5) + + self.Options = QPopupMenu(self) + self.optionEditeurAction.addTo(self.Options) + self.MenuBar.insertItem(QString(""),self.Options,6) self.Traduction = QPopupMenu(self) self.traduitV7V8Action.addTo(self.Traduction) @@ -385,6 +387,7 @@ class Eficas(QMainWindow): self.connect(self.traduitV7V8Action,SIGNAL("activated()"),self.traductionV7V8) self.connect(self.aidenew_itemAction,SIGNAL("activated()"),self.helpAbout) self.connect(self.fileNewInclude,SIGNAL("activated()"),self.NewInclude) + self.connect(self.optionEditeurAction,SIGNAL("activated()"),self.optionEditeur) def languageChange(self): @@ -450,6 +453,8 @@ class Eficas(QMainWindow): self.aidenew_itemAction.setText(self.__tr("Eficas")) self.fileNewInclude.setText(self.__tr("Nouvel Include")) self.fileNewInclude.setMenuText(self.__tr("Nouvel Include")) + self.optionEditeurAction.setText(self.__tr("Parametres Eficas")) + self.optionEditeurAction.setMenuText(self.__tr("Parametres Eficas")) self.toolBar.setLabel(self.__tr("Tools")) if self.MenuBar.findItem(2): self.MenuBar.findItem(2).setText(self.__tr("&Fichier")) @@ -458,9 +463,9 @@ class Eficas(QMainWindow): if self.MenuBar.findItem(4): self.MenuBar.findItem(4).setText(self.__tr("JdC")) if self.MenuBar.findItem(5): - self.MenuBar.findItem(5).setText(self.__tr("Options")) + self.MenuBar.findItem(5).setText(self.__tr("&Aide")) if self.MenuBar.findItem(6): - self.MenuBar.findItem(6).setText(self.__tr("&Aide")) + self.MenuBar.findItem(6).setText(self.__tr("Options")) if self.MenuBar.findItem(7): self.MenuBar.findItem(7).setText(self.__tr("Traduction")) if self.MenuBar.findItem(8): @@ -533,5 +538,8 @@ class Eficas(QMainWindow): def NewInclude(self): print "Eficas.NewInclude(): Not implemented yet" + def optionEditeur(self): + print "Eficas.optionEditeur(): Not implemented yet" + def __tr(self,s,c = None): return qApp.translate("Eficas",s,c) diff --git a/Ui/myMain.ui b/Ui/myMain.ui index e05a455a..70b6ec12 100644 --- a/Ui/myMain.ui +++ b/Ui/myMain.ui @@ -92,11 +92,12 @@ - - + + + @@ -469,6 +470,17 @@ Nouvel Include + + + optionEditeurAction + + + Parametres Eficas + + + Parametres Eficas + + @@ -632,6 +644,12 @@ Eficas NewInclude() + + optionEditeurAction + activated() + Eficas + optionEditeur() + fileNew() @@ -656,6 +674,7 @@ editCopy() traductionV7V8() NewInclude() + optionEditeur() -- 2.39.2