From abd47cba63dafcd7efb2990436f9da1390d409c0 Mon Sep 17 00:00:00 2001 From: Pascale Noyret Date: Mon, 5 May 2008 14:10:43 +0000 Subject: [PATCH] *** empty log message *** --- InterfaceQT/monOptionsPdf.py | 22 ++ Ui/OptionsEditeur.py | 41 +-- Ui/OptionsEditeur.ui | 494 +++++++++++++++++------------------ Ui/desPlusieursBase.py | 141 +++++----- Ui/desPlusieursBase.ui | 295 +++++++++++---------- Ui/desRacine.py | 84 +++--- Ui/desRacine.ui | 244 ++++++++--------- 7 files changed, 674 insertions(+), 647 deletions(-) create mode 100644 InterfaceQT/monOptionsPdf.py diff --git a/InterfaceQT/monOptionsPdf.py b/InterfaceQT/monOptionsPdf.py new file mode 100644 index 00000000..a7c81d29 --- /dev/null +++ b/InterfaceQT/monOptionsPdf.py @@ -0,0 +1,22 @@ +from OptionsPdf import desPdf + +class OptionPdf(desPdf): + def __init__(self,parent = None,name = None,modal = 0,fl = 0,configuration=None): + desPdf.__init__(self,parent,name,modal,fl) + self.configuration=configuration + self.initVal() + + def initVal(self): + if hasattr(self.configuration,'exec_acrobat'): + self.LERepPdf.setText(self.configuration.exec_acrobat) + else : + self.LERepPdf.clear() + + def LeRepPdfPressed(self): + nouveau=str(self.LERepPdf.text()) + self.configuration.exec_acrobat=nouveau + self.configuration.save_params() + + def BokClicked(self): + self.LeRepPdfPressed() + self.close() diff --git a/Ui/OptionsEditeur.py b/Ui/OptionsEditeur.py index 3e0b43da..44c98918 100644 --- a/Ui/OptionsEditeur.py +++ b/Ui/OptionsEditeur.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'OptionsEditeur.ui' # -# Created: ven avr 4 11:27:10 2008 +# Created: lun mai 5 12:15:56 2008 # by: The PyQt User Interface Compiler (pyuic) 3.13 # # WARNING! All changes made in this file will be lost! @@ -19,9 +19,9 @@ class desOptions(QDialog): self.setName("desOptions") + desOptionsLayout = QGridLayout(self,1,1,11,6,"desOptionsLayout") self.groupBox3 = QGroupBox(self,"groupBox3") - self.groupBox3.setGeometry(QRect(10,320,550,100)) self.textLabel1 = QLabel(self.groupBox3,"textLabel1") self.textLabel1.setGeometry(QRect(20,20,280,20)) @@ -29,8 +29,9 @@ class desOptions(QDialog): self.LERepDoc = QLineEdit(self.groupBox3,"LERepDoc") self.LERepDoc.setGeometry(QRect(20,40,520,31)) + desOptionsLayout.addWidget(self.groupBox3,2,0) + self.groupBox1 = QGroupBox(self,"groupBox1") - self.groupBox1.setGeometry(QRect(10,0,550,191)) self.textLabel1_3 = QLabel(self.groupBox1,"textLabel1_3") self.textLabel1_3.setGeometry(QRect(30,60,280,20)) @@ -41,17 +42,19 @@ class desOptions(QDialog): self.CBVersions = QComboBox(0,self.groupBox1,"CBVersions") self.CBVersions.setGeometry(QRect(30,20,90,30)) - self.LERepCata = QLineEdit(self.groupBox1,"LERepCata") - self.LERepCata.setGeometry(QRect(30,80,501,31)) - self.LERepMat = QLineEdit(self.groupBox1,"LERepMat") self.LERepMat.setGeometry(QRect(30,140,501,31)) + self.LERepCata = QLineEdit(self.groupBox1,"LERepCata") + self.LERepCata.setGeometry(QRect(30,80,501,31)) + self.Bok = QPushButton(self.groupBox1,"Bok") self.Bok.setGeometry(QRect(440,20,90,31)) + self.Bok.setAutoDefault(0) + + desOptionsLayout.addWidget(self.groupBox1,0,0) self.groupBox2 = QGroupBox(self,"groupBox2") - self.groupBox2.setGeometry(QRect(10,210,550,100)) self.textLabel1_2_3 = QLabel(self.groupBox2,"textLabel1_2_3") self.textLabel1_2_3.setGeometry(QRect(20,60,180,21)) @@ -62,15 +65,17 @@ class desOptions(QDialog): self.textLabel3_2 = QLabel(self.groupBox2,"textLabel3_2") self.textLabel3_2.setGeometry(QRect(300,20,130,21)) - self.Bdefaut = QCheckBox(self.groupBox2,"Bdefaut") - self.Bdefaut.setGeometry(QRect(210,60,20,20)) - self.LEVersionAjout = QLineEdit(self.groupBox2,"LEVersionAjout") self.LEVersionAjout.setGeometry(QRect(140,20,101,21)) self.LEVersionSup = QLineEdit(self.groupBox2,"LEVersionSup") self.LEVersionSup.setGeometry(QRect(420,20,101,21)) + self.Bdefaut = QCheckBox(self.groupBox2,"Bdefaut") + self.Bdefaut.setGeometry(QRect(210,60,20,20)) + + desOptionsLayout.addWidget(self.groupBox2,1,0) + self.languageChange() self.resize(QSize(570,434).expandedTo(self.minimumSizeHint())) @@ -80,23 +85,20 @@ class desOptions(QDialog): self.connect(self.Bdefaut,SIGNAL("clicked()"),self.BdefautChecked) self.connect(self.LEVersionAjout,SIGNAL("returnPressed()"),self.AjoutVersion) self.connect(self.LEVersionSup,SIGNAL("returnPressed()"),self.SupVersion) - self.connect(self.LERepCata,SIGNAL("returnPressed()"),self.ChangePathDoc) + self.connect(self.LERepDoc,SIGNAL("returnPressed()"),self.ChangePathDoc) + self.connect(self.Bok,SIGNAL("clicked()"),self.BokClicked) def languageChange(self): self.setCaption(self.__tr("Options Aster")) self.groupBox3.setTitle(self.__tr("Doc")) self.textLabel1.setText(self.__trUtf8("\x52\x65\x70\x65\x72\x74\x6f\x69\x72\x65\x20\x64\x27\x61\x63\x63\x65\x73\x20\xc3\xa0\x20\x6c\x61\x20\x64\x6f\x63\x75\x6d\x65\x6e\x74\x61\x74\x69\x6f\x6e\x20\x3a")) - self.LERepDoc.setText(self.__tr("/home/noyret/doc/asterv9")) + self.LERepDoc.setText(QString.null) self.groupBox1.setTitle(self.__tr("Configurer une Version")) self.textLabel1_3.setText(self.__trUtf8("\x52\xc3\xa9\x70\x65\x72\x74\x6f\x69\x72\x65\x20\x64\x27\x61\x63\x63\xc3\xa8\x73\x20\x61\x75\x20\x63\x61\x74\x61\x6c\x6f\x67\x75\x65\x20\x3a")) self.textLabel1_2_2.setText(self.__trUtf8("\x52\xc3\xa9\x70\x65\x72\x74\x6f\x69\x72\x65\x20\x64\x27\x61\x63\x63\xc3\xa8\x73\x20\x61\x75\x78\x20\x6d\x61\x74\xc3\xa9\x72\x69\x61\x75\x78\x20\x3a")) - self.CBVersions.clear() - self.CBVersions.insertItem(self.__tr("V9.1")) - self.CBVersions.insertItem(self.__tr("V8.4")) - self.CBVersions.insertItem(self.__tr("V7.8")) - self.LERepCata.setText(self.__tr("/home/noyret/Cata/V91")) - self.LERepMat.setText(self.__tr("/home/noyret/Mater/V91")) + self.LERepMat.setText(QString.null) + self.LERepCata.setText(QString.null) self.Bok.setText(self.__tr("Ok")) self.groupBox2.setTitle(self.__trUtf8("\x47\xc3\xa9\x72\x65\x72\x20\x6c\x65\x73\x20\x76\x65\x72\x73\x69\x6f\x6e\x73")) self.textLabel1_2_3.setText(self.__trUtf8("\x52\x65\x69\x6e\x69\x74\x69\x61\x6c\x69\x73\x65\x72\x20\x61\x76\x65\x63\x20\x6c\x65\x73\x20\x76\x61\x6c\x65\x75\x72\x73\x20\x70\x61\x72\x20\x64\xc3\xa9\x66\x61\x75\x74")) @@ -120,6 +122,9 @@ class desOptions(QDialog): def ChangePathDoc(self): print "desOptions.ChangePathDoc(): Not implemented yet" + def BokClicked(self): + print "desOptions.BokClicked(): Not implemented yet" + def __tr(self,s,c = None): return qApp.translate("desOptions",s,c) diff --git a/Ui/OptionsEditeur.ui b/Ui/OptionsEditeur.ui index 2caa3765..7216be43 100644 --- a/Ui/OptionsEditeur.ui +++ b/Ui/OptionsEditeur.ui @@ -15,284 +15,253 @@ Options Aster - + - groupBox3 + unnamed - - - 10 - 320 - 550 - 100 - - - - Doc - - - - textLabel1 - - - - 20 - 20 - 280 - 20 - - - - Repertoire d'acces à la documentation : - - - + - LERepDoc - - - - 20 - 40 - 520 - 31 - + groupBox3 - - /home/noyret/doc/asterv9 - - - - - - groupBox1 - - - - 10 - 0 - 550 - 191 - - - - Configurer une Version - - - - textLabel1_3 - - - - 30 - 60 - 280 - 20 - - - - Répertoire d'accès au catalogue : + + Doc + + + textLabel1 + + + + 20 + 20 + 280 + 20 + + + + Repertoire d'acces à la documentation : + + + + + LERepDoc + + + + 20 + 40 + 520 + 31 + + + + + + - + - textLabel1_2_2 - - - - 30 - 120 - 280 - 20 - + groupBox1 - - Répertoire d'accès aux matériaux : + + Configurer une Version - - - + + + textLabel1_3 + + + + 30 + 60 + 280 + 20 + + - V9.1 + Répertoire d'accès au catalogue : + + + + + textLabel1_2_2 + + + + 30 + 120 + 280 + 20 + - - - V8.4 + Répertoire d'accès aux matériaux : + + + + + CBVersions + + + + 30 + 20 + 90 + 30 + + + + + + LERepMat + + + + 30 + 140 + 501 + 31 + - - - V7.8 + - - - CBVersions - - - - 30 - 20 - 90 - 30 - - - - - - LERepCata - - - - 30 - 80 - 501 - 31 - - - - /home/noyret/Cata/V91 - - - - - LERepMat - - - - 30 - 140 - 501 - 31 - - - - /home/noyret/Mater/V91 - - - - - Bok - - - - 440 - 20 - 90 - 31 - - - - Ok - - - - - - groupBox2 - - - - 10 - 210 - 550 - 100 - - - - Gérer les versions - - - - textLabel1_2_3 - - - - 20 - 60 - 180 - 21 - - - - Reinitialiser avec les valeurs par défaut - - - - - textLabel3 - - - - 19 - 19 - 141 - 21 - - - - Ajouter une version - - - - - textLabel3_2 - - - - 300 - 20 - 130 - 21 - - - - Supprimer une version - - - - - Bdefaut - - - - 210 - 60 - 20 - 20 - - - - - - - - - LEVersionAjout - - - - 140 - 20 - 101 - 21 - - + + + + LERepCata + + + + 30 + 80 + 501 + 31 + + + + + + + + + Bok + + + + 440 + 20 + 90 + 31 + + + + Ok + + + false + + - + - LEVersionSup + groupBox2 - - - 420 - 20 - 101 - 21 - + + Gérer les versions + + + textLabel1_2_3 + + + + 20 + 60 + 180 + 21 + + + + Reinitialiser avec les valeurs par défaut + + + + + textLabel3 + + + + 19 + 19 + 141 + 21 + + + + Ajouter une version + + + + + textLabel3_2 + + + + 300 + 20 + 130 + 21 + + + + Supprimer une version + + + + + LEVersionAjout + + + + 140 + 20 + 101 + 21 + + + + + + LEVersionSup + + + + 420 + 20 + 101 + 21 + + + + + + Bdefaut + + + + 210 + 60 + 20 + 20 + + + + + + - + @@ -320,11 +289,17 @@ SupVersion() - LERepCata + LERepDoc returnPressed() desOptions ChangePathDoc() + + Bok + clicked() + desOptions + BokClicked() + VersionChoisie() @@ -332,6 +307,7 @@ AjoutVersion() SupVersion() ChangePathDoc() + BokClicked() diff --git a/Ui/desPlusieursBase.py b/Ui/desPlusieursBase.py index 8f34236b..d1044d7e 100644 --- a/Ui/desPlusieursBase.py +++ b/Ui/desPlusieursBase.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'desPlusieursBase.ui' # -# Created: ven avr 4 11:27:09 2008 +# Created: mar avr 15 16:16:00 2008 # by: The PyQt User Interface Compiler (pyuic) 3.13 # # WARNING! All changes made in this file will be lost! @@ -29,29 +29,6 @@ image0_data = \ "\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" \ - "\xc7\x49\x44\x41\x54\x38\x8d\xcd\x94\x59\x0e\xc3" \ - "\x20\x0c\x44\x71\xd5\x7b\xc7\x3d\xf9\xf4\x07\xd3" \ - "\x31\xb1\x59\xa2\x28\xaa\x25\x44\x48\xbc\x3c\xc6" \ - "\x81\x52\xfe\xc0\xe4\x42\x0c\xee\xce\xb9\x12\xe0" \ - "\x8a\x02\x39\x83\x88\x48\xf5\xdf\x02\xc9\x9c\x11" \ - "\xf8\x60\x04\x30\x01\x19\x05\x4a\xe8\x68\xc5\x6a" \ - "\xc2\x06\xc0\x6b\x4b\x10\x91\x11\xc8\x02\x87\x4f" \ - "\x3a\x52\xa5\x87\x75\x71\x23\x89\x7e\x40\x39\xc4" \ - "\x6b\x50\xd8\x86\x5b\x07\xf5\x40\x0a\x45\x00\x53" \ - "\x33\x08\x93\xcf\x86\x74\xa3\x00\x28\xd4\x92\xde" \ - "\xef\x04\x62\x6b\x55\x9d\xfe\x48\xac\x84\x2b\x1a" \ - "\x6d\xaa\xe6\x85\x01\x55\x03\x3b\x99\xc5\x00\x9f" \ - "\x70\xce\xda\x11\x1a\xab\x41\x3b\x6f\x6a\x70\xd1" \ - "\x18\xe0\x08\xe6\xfd\x8b\xc5\x1d\x5d\x00\xa0\xf6" \ - "\x14\x55\x6d\x1f\xf9\xb9\xbe\x49\x52\xaa\xbc\x37" \ - "\x21\xf8\xf8\xb6\xf6\x24\xc5\x57\xef\x89\x47\xaf" \ - "\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" -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" \ @@ -74,6 +51,29 @@ image2_data = \ "\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" +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" \ + "\xc7\x49\x44\x41\x54\x38\x8d\xcd\x94\x59\x0e\xc3" \ + "\x20\x0c\x44\x71\xd5\x7b\xc7\x3d\xf9\xf4\x07\xd3" \ + "\x31\xb1\x59\xa2\x28\xaa\x25\x44\x48\xbc\x3c\xc6" \ + "\x81\x52\xfe\xc0\xe4\x42\x0c\xee\xce\xb9\x12\xe0" \ + "\x8a\x02\x39\x83\x88\x48\xf5\xdf\x02\xc9\x9c\x11" \ + "\xf8\x60\x04\x30\x01\x19\x05\x4a\xe8\x68\xc5\x6a" \ + "\xc2\x06\xc0\x6b\x4b\x10\x91\x11\xc8\x02\x87\x4f" \ + "\x3a\x52\xa5\x87\x75\x71\x23\x89\x7e\x40\x39\xc4" \ + "\x6b\x50\xd8\x86\x5b\x07\xf5\x40\x0a\x45\x00\x53" \ + "\x33\x08\x93\xcf\x86\x74\xa3\x00\x28\xd4\x92\xde" \ + "\xef\x04\x62\x6b\x55\x9d\xfe\x48\xac\x84\x2b\x1a" \ + "\x6d\xaa\xe6\x85\x01\x55\x03\x3b\x99\xc5\x00\x9f" \ + "\x70\xce\xda\x11\x1a\xab\x41\x3b\x6f\x6a\x70\xd1" \ + "\x18\xe0\x08\xe6\xfd\x8b\xc5\x1d\x5d\x00\xa0\xf6" \ + "\x14\x55\x6d\x1f\xf9\xb9\xbe\x49\x52\xaa\xbc\x37" \ + "\x21\xf8\xf8\xb6\xf6\x24\xc5\x57\xef\x89\x47\xaf" \ + "\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" class DPlusBase(QWidget): def __init__(self,parent = None,name = None,fl = 0): @@ -120,7 +120,12 @@ class DPlusBase(QWidget): self.bHelp.setAutoDefault(1) layout6.addWidget(self.bHelp) - Widget8Layout.addMultiCellLayout(layout6,7,7,0,4) + Widget8Layout.addMultiCellLayout(layout6,8,8,0,6) + + self.Commentaire = QLabel(self.Widget8,"Commentaire") + self.Commentaire.setMinimumSize(QSize(0,60)) + + Widget8Layout.addMultiCellWidget(self.Commentaire,4,4,3,6) layout7 = QVBoxLayout(None,0,6,"layout7") @@ -134,47 +139,43 @@ class DPlusBase(QWidget): self.bImport.setAutoDefault(1) layout7.addWidget(self.bImport) - Widget8Layout.addLayout(layout7,6,4) - spacer3 = QSpacerItem(31,106,QSizePolicy.Minimum,QSizePolicy.Expanding) - Widget8Layout.addItem(spacer3,5,4) + Widget8Layout.addLayout(layout7,6,6) spacer5 = QSpacerItem(186,20,QSizePolicy.Expanding,QSizePolicy.Minimum) - Widget8Layout.addMultiCell(spacer5,6,6,2,3) + Widget8Layout.addMultiCell(spacer5,6,6,4,5) + spacer3_2 = QSpacerItem(31,50,QSizePolicy.Minimum,QSizePolicy.Expanding) + Widget8Layout.addItem(spacer3_2,7,6) - self.LBValeurs = QListBox(self.Widget8,"LBValeurs") + 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.addMultiCellWidget(self.LBValeurs,1,6,0,0) + Widget8Layout.addMultiCellWidget(self.LEValeur,2,2,4,6) - layout8 = QVBoxLayout(None,0,6,"layout8") - spacer5_2 = QSpacerItem(20,31,QSizePolicy.Minimum,QSizePolicy.Expanding) - layout8.addItem(spacer5_2) + self.BView2D = QPushButton(self.Widget8,"BView2D") + self.BView2D.setMinimumSize(QSize(120,30)) - 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.image1)) - layout8.addWidget(self.BAjout1Val) + Widget8Layout.addMultiCellWidget(self.BView2D,3,3,5,6) + + 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)) + + Widget8Layout.addWidget(self.BSalome,3,4) 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.image2)) - layout8.addWidget(self.BSup1Val) - spacer4 = QSpacerItem(21,231,QSizePolicy.Minimum,QSizePolicy.Expanding) - layout8.addItem(spacer4) - - Widget8Layout.addMultiCellLayout(layout8,1,6,1,1) - - self.Commentaire = QLabel(self.Widget8,"Commentaire") - self.Commentaire.setMinimumSize(QSize(0,60)) + self.BSup1Val.setIconSet(QIconSet(self.image1)) - Widget8Layout.addMultiCellWidget(self.Commentaire,4,4,2,4) + Widget8Layout.addMultiCellWidget(self.BSup1Val,3,3,1,3) - 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.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.image2)) - Widget8Layout.addWidget(self.BSalome,3,2) + Widget8Layout.addMultiCellWidget(self.BAjout1Val,2,2,1,3) layout12 = QHBoxLayout(None,0,6,"layout12") @@ -183,18 +184,18 @@ class DPlusBase(QWidget): spacer6 = QSpacerItem(111,20,QSizePolicy.Expanding,QSizePolicy.Minimum) layout12.addItem(spacer6) - Widget8Layout.addMultiCellLayout(layout12,1,1,2,4) - - 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.addMultiCellWidget(self.LEValeur,2,2,2,4) + Widget8Layout.addMultiCellLayout(layout12,1,1,4,6) + spacer4 = QSpacerItem(21,231,QSizePolicy.Minimum,QSizePolicy.Expanding) + Widget8Layout.addMultiCell(spacer4,4,7,2,2) + spacer3 = QSpacerItem(31,50,QSizePolicy.Minimum,QSizePolicy.Expanding) + Widget8Layout.addItem(spacer3,5,6) + spacer3_3 = QSpacerItem(31,50,QSizePolicy.Minimum,QSizePolicy.Expanding) + Widget8Layout.addMultiCell(spacer3_3,0,1,2,3) - self.BView2D = QPushButton(self.Widget8,"BView2D") - self.BView2D.setMinimumSize(QSize(120,30)) + self.LBValeurs = QListBox(self.Widget8,"LBValeurs") + self.LBValeurs.setMinimumSize(QSize(200,0)) - Widget8Layout.addMultiCellWidget(self.BView2D,3,3,3,4) + Widget8Layout.addMultiCellWidget(self.LBValeurs,1,7,0,0) self.tabuniqueinto.insertTab(self.Widget8,QString("")) DPlusBaseLayout.addWidget(self.tabuniqueinto,0,0) @@ -237,21 +238,21 @@ class DPlusBase(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.bParam.setText(self.__tr("&Parametres")) self.bParam.setAccel(self.__tr("Alt+P")) QToolTip.add(self.bParam,self.__tr("suppression du mot clef")) 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.BView2D.setText(self.__tr("Visualiser")) 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.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")) - self.BView2D.setText(self.__tr("Visualiser")) self.tabuniqueinto.changeTab(self.Widget8,self.__tr("Saisir Valeur")) diff --git a/Ui/desPlusieursBase.ui b/Ui/desPlusieursBase.ui index dbe400b3..940cfccf 100644 --- a/Ui/desPlusieursBase.ui +++ b/Ui/desPlusieursBase.ui @@ -51,7 +51,7 @@ <u><font size="+1">Valeur(s) actuelle(s)</font></u> - + layout6 @@ -133,7 +133,21 @@ - + + + Commentaire + + + + 0 + 60 + + + + + + + layout7 @@ -189,162 +203,104 @@ - + - spacer3 + spacer5 - Vertical + Horizontal Expanding - 31 - 106 + 186 + 20 - + - spacer5 + spacer3_2 - Horizontal + Vertical Expanding - 186 - 20 + 31 + 50 - + - LBValeurs + LEValeur + + + + 1 + 1 + 0 + 0 + + + + + 220 + 30 + - + - layout8 + BView2D + + + + 120 + 30 + + + + Visualiser - - - unnamed - - - - spacer5_2 - - - Vertical - - - Expanding - - - - 20 - 31 - - - - - - BAjout1Val - - - - 0 - 0 - 0 - 0 - - - - - 40 - 30 - - - - - - - image1 - - - ajoute la valeur saisie sous l occurence selectionnée (en fin de liste si il n y a pas de selection) - - - - - BSup1Val - - - - 0 - 0 - 0 - 0 - - - - - 40 - 30 - - - - - - - image2 - - - enleve l occurence selectionnee - - - - - spacer4 - - - Vertical - - - Expanding - - - - 21 - 231 - - - - - + - Commentaire + BSalome + + + + 0 + 0 + 0 + 0 + - 0 - 60 + 40 + 30 + + image0 + + + ajoute la valeur saisie sous l occurence selectionnée (en fin de liste si il n y a pas de selection) + - + - BSalome + BSup1Val @@ -364,13 +320,41 @@ - image0 + image1 + + + enleve l occurence selectionnee + + + + + BAjout1Val + + + + 0 + 0 + 0 + 0 + + + + + 40 + 30 + + + + + + + image2 ajoute la valeur saisie sous l occurence selectionnée (en fin de liste si il n y a pas de selection) - + layout12 @@ -405,37 +389,66 @@ - + - LEValeur + spacer4 - - - 1 - 1 - 0 - 0 - + + Vertical - + + Expanding + + - 220 - 30 + 21 + 231 - - + + - BView2D + spacer3 - + + Vertical + + + Expanding + + - 120 - 30 + 31 + 50 - - Visualiser + + + + spacer3_3 + + + Vertical + + + Expanding + + + + 31 + 50 + + + + + + LBValeurs + + + + 200 + 0 + @@ -448,10 +461,10 @@ 89504e470d0a1a0a0000000d49484452000000140000001408060000008d891d0d0000008d49444154388db5d3db0d80200c05d05be33a8ee24c8699188581ea87c6c4d25628d8840f5e27175002636a2d73b91fc0b569153917c3a07ef0ae9ccaabbf1f5bb5a6edc80c028334200602008165c23828302fa977dd36c6a067a778143fa185f95be66176c220a68303580d0e627ac201cc04a3d8552c1ac03995ab27e75a9a3e1847ddef3072ecef5fafb34ecb0165f7826b457b0000000049454e44ae426082 - 89504e470d0a1a0a0000000d49484452000000210000000e0806000000a11e758c000000c749444154388dcd94590ec3200c4471d57bc73df9f407d331b159a228aa254448bc3cc68152fec0e4420ceeceb912e08a0239838848f5df02c99c11f86004300119054ae868c56ac206c06b4b109111c802874f3a52a587757123897e4039c46b50d8865b07f5400a450053330893cf8674a30028d492deef04626b559dfe48ac842b1a6daae6850155033b99c5009f70ceda111aab413b6f6a70d118e008e6fd8bc51d5d00a0f614556d1ff9b9be4952aabc3721f8f8b6f624c557ef8947afedf48c5e60b8dfbeb81d6dab9aff99270000000049454e44ae426082 + 89504e470d0a1a0a0000000d49484452000000210000000e0806000000a11e758c000000cf49444154388dd594db0ec3200c43edfdf8d897bb0f345b480845d51eb64888f412e76001c00f046fd6e99bba77200480924a1032c92efbd8c7d5cabcc025400099e957849568fe7f06c0ded1deb32b4a1ec4ea824b9e74097165bd01f85527f78a7201e0a3129f345a017c543bafdc983d0f7109d15a331b471f47072c17494a82338f6178203a8817e67306b1f08b07ba03e602c9b831077e37e0209e67e3386710977b17de80c185ad38695a51d522c82ce77912e2fed8be83762092f52b1820dd11bb10e565b53a5a3bbaff130713d66fa6981857060000000049454e44ae426082 - 89504e470d0a1a0a0000000d49484452000000210000000e0806000000a11e758c000000cf49444154388dd594db0ec3200c43edfdf8d897bb0f345b480845d51eb64888f412e76001c00f046fd6e99bba77200480924a1032c92efbd8c7d5cabcc025400099e957849568fe7f06c0ded1deb32b4a1ec4ea824b9e74097165bd01f85527f78a7201e0a3129f345a017c543bafdc983d0f7109d15a331b471f47072c17494a82338f6178203a8817e67306b1f08b07ba03e602c9b831077e37e0209e67e3386710977b17de80c185ad38695a51d522c82ce77912e2fed8be83762092f52b1820dd11bb10e565b53a5a3bbaff130713d66fa6981857060000000049454e44ae426082 + 89504e470d0a1a0a0000000d49484452000000210000000e0806000000a11e758c000000c749444154388dcd94590ec3200c4471d57bc73df9f407d331b159a228aa254448bc3cc68152fec0e4420ceeceb912e08a0239838848f5df02c99c11f86004300119054ae868c56ac206c06b4b109111c802874f3a52a587757123897e4039c46b50d8865b07f5400a450053330893cf8674a30028d492deef04626b559dfe48ac842b1a6daae6850155033b99c5009f70ceda111aab413b6f6a70d118e008e6fd8bc51d5d00a0f614556d1ff9b9be4952aabc3721f8f8b6f624c557ef8947afedf48c5e60b8dfbeb81d6dab9aff99270000000049454e44ae426082 diff --git a/Ui/desRacine.py b/Ui/desRacine.py index 51705bb2..9658be85 100644 --- a/Ui/desRacine.py +++ b/Ui/desRacine.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'desRacine.ui' # -# Created: ven avr 4 11:27:09 2008 +# Created: lun mai 5 15:47:37 2008 # by: The PyQt User Interface Compiler (pyuic) 3.13 # # WARNING! All changes made in this file will be lost! @@ -22,67 +22,71 @@ class DRac(QWidget): DRacLayout = QGridLayout(self,1,1,11,6,"DRacLayout") - self.LBNouvCommande = QListBox(self,"LBNouvCommande") - - DRacLayout.addMultiCellWidget(self.LBNouvCommande,4,4,0,3) + layout4 = QGridLayout(None,1,1,0,6,"layout4") - self.BNext = QToolButton(self,"BNext") - self.BNext.setIconSet(QIconSet()) + self.LEFiltre = QLineEdit(self,"LEFiltre") + self.LEFiltre.setMinimumSize(QSize(151,30)) - DRacLayout.addMultiCellWidget(self.BNext,2,3,3,3) + layout4.addWidget(self.LEFiltre,2,1) self.buttonGroup1 = QButtonGroup(self,"buttonGroup1") + self.RBGroupe = QRadioButton(self.buttonGroup1,"RBGroupe") + self.RBGroupe.setGeometry(QRect(10,20,90,20)) + self.RBalpha = QRadioButton(self.buttonGroup1,"RBalpha") self.RBalpha.setGeometry(QRect(110,20,110,20)) self.RBalpha.setChecked(1) - self.RBGroupe = QRadioButton(self.buttonGroup1,"RBGroupe") - self.RBGroupe.setGeometry(QRect(10,20,90,20)) + layout4.addMultiCellWidget(self.buttonGroup1,1,1,0,2) - DRacLayout.addMultiCellWidget(self.buttonGroup1,1,1,0,3) + self.textLabel6 = QLabel(self,"textLabel6") - layout2 = QHBoxLayout(None,0,6,"layout2") + layout4.addWidget(self.textLabel6,2,0) - self.bSup = QPushButton(self,"bSup") - self.bSup.setAutoDefault(1) - layout2.addWidget(self.bSup) + self.BNext = QToolButton(self,"BNext") + self.BNext.setIconSet(QIconSet()) - self.bOk = QPushButton(self,"bOk") - self.bOk.setAutoDefault(1) - self.bOk.setDefault(1) - layout2.addWidget(self.bOk) + layout4.addWidget(self.BNext,2,2) - self.bHelp = QPushButton(self,"bHelp") - self.bHelp.setAutoDefault(1) - layout2.addWidget(self.bHelp) + self.textLabel1_4 = QLabel(self,"textLabel1_4") - DRacLayout.addMultiCellLayout(layout2,5,5,0,4) + layout4.addWidget(self.textLabel1_4,0,1) - self.textLabel1_4 = QLabel(self,"textLabel1_4") + DRacLayout.addMultiCellLayout(layout4,0,1,0,1) - DRacLayout.addMultiCellWidget(self.textLabel1_4,0,0,1,2) + self.LBRegles = QListBox(self,"LBRegles") + self.LBRegles.setMinimumSize(QSize(250,400)) - self.textLabel6 = QLabel(self,"textLabel6") + DRacLayout.addMultiCellWidget(self.LBRegles,1,2,2,3) - DRacLayout.addMultiCellWidget(self.textLabel6,2,3,0,1) + self.textLabel1_4_2 = QLabel(self,"textLabel1_4_2") - self.LEFiltre = QLineEdit(self,"LEFiltre") + DRacLayout.addMultiCellWidget(self.textLabel1_4_2,0,0,2,3) - DRacLayout.addMultiCellWidget(self.LEFiltre,2,3,2,2) + self.bSup = QPushButton(self,"bSup") + self.bSup.setAutoDefault(1) - self.LBRegles = QListBox(self,"LBRegles") - self.LBRegles.setMinimumSize(QSize(250,400)) + DRacLayout.addWidget(self.bSup,3,0) - DRacLayout.addMultiCellWidget(self.LBRegles,1,4,4,4) + self.bOk = QPushButton(self,"bOk") + self.bOk.setAutoDefault(1) + self.bOk.setDefault(1) - self.textLabel1_4_2 = QLabel(self,"textLabel1_4_2") + DRacLayout.addMultiCellWidget(self.bOk,3,3,1,2) + + self.bHelp = QPushButton(self,"bHelp") + self.bHelp.setAutoDefault(1) + + DRacLayout.addWidget(self.bHelp,3,3) + + self.LBNouvCommande = QListBox(self,"LBNouvCommande") - DRacLayout.addWidget(self.textLabel1_4_2,0,4) + DRacLayout.addMultiCellWidget(self.LBNouvCommande,2,2,0,1) self.languageChange() - self.resize(QSize(505,499).expandedTo(self.minimumSizeHint())) + self.resize(QSize(505,513).expandedTo(self.minimumSizeHint())) self.clearWState(Qt.WState_Polished) self.connect(self.LBNouvCommande,SIGNAL("doubleClicked(QListBoxItem*)"),self.LBNouvCommandeClicked) @@ -105,11 +109,14 @@ class DRac(QWidget): def languageChange(self): self.setCaption(self.__tr("DMacro")) - self.BNext.setText(self.__tr("Suivant")) - QToolTip.add(self.BNext,self.__tr("affiche la prochaine occurence")) 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.RBalpha.setText(self.__trUtf8("\x61\x6c\x70\x68\x61\x62\xc3\xa9\x74\x69\x71\x75\x65")) + self.textLabel6.setText(self.__tr("Filtre")) + self.BNext.setText(self.__tr("Suivant")) + QToolTip.add(self.BNext,self.__tr("affiche la prochaine occurence")) + self.textLabel1_4.setText(self.__tr("Commandes :")) + self.textLabel1_4_2.setText(self.__trUtf8("\x3c\x62\x3e\x3c\x75\x3e\x52\xc3\xa9\x67\x6c\x65\x73\x20\x3a\x3c\x2f\x75\x3e\x3c\x2f\x62\x3e")) self.bSup.setText(self.__tr("&Supprimer")) self.bSup.setAccel(self.__tr("Alt+S")) QToolTip.add(self.bSup,self.__tr("suppression du mot clef")) @@ -119,9 +126,6 @@ class DRac(QWidget): self.bHelp.setText(self.__tr("&Documentation")) self.bHelp.setAccel(self.__tr("Alt+D")) QToolTip.add(self.bHelp,self.__tr("affichage documentation aster")) - self.textLabel1_4.setText(self.__tr("Commandes :")) - self.textLabel6.setText(self.__tr("Filtre")) - self.textLabel1_4_2.setText(self.__trUtf8("\x3c\x62\x3e\x3c\x75\x3e\x52\xc3\xa9\x67\x6c\x65\x73\x20\x3a\x3c\x2f\x75\x3e\x3c\x2f\x62\x3e")) def LBNouvCommandeClicked(self): diff --git a/Ui/desRacine.ui b/Ui/desRacine.ui index e62a5cdf..54c67215 100644 --- a/Ui/desRacine.ui +++ b/Ui/desRacine.ui @@ -9,7 +9,7 @@ 0 0 505 - 499 + 513 @@ -25,170 +25,176 @@ unnamed - + - LBNouvCommande - - - - - BNext - - - Suivant - - - + layout4 - - affiche la prochaine occurence - - - - - buttonGroup1 - - - Affichage - - - - RBalpha - - - - 110 - 20 - 110 - 20 - - - - alphabétique - - - true - - - - - RBGroupe - - - - 10 - 20 - 90 - 20 - - - - par groupe - - - - - - layout2 - - + unnamed - + - bSup - - - &Supprimer + LEFiltre - - Alt+S + + + 151 + 30 + - - true + + + + buttonGroup1 - - suppression du mot clef + + Affichage + + + RBGroupe + + + + 10 + 20 + 90 + 20 + + + + par groupe + + + + + RBalpha + + + + 110 + 20 + 110 + 20 + + + + alphabétique + + + true + + - + - bOk + textLabel6 - &Valider + Filtre - - Shift+A, Alt+A, Alt+A, Alt+A + + + + BNext - - true + + Suivant - - true + + - validation de la saisie + affiche la prochaine occurence - + - bHelp + textLabel1_4 - &Documentation - - - Alt+D - - - true - - - affichage documentation aster + <b><u>Commandes :</u></b> - + - + - textLabel1_4 + LBRegles - - <b><u>Commandes :</u></b> + + + 250 + 400 + - + - textLabel6 + textLabel1_4_2 - Filtre + <b><u>Régles :</u></b> - + - LEFiltre + bSup + + + &Supprimer + + + Alt+S + + + true + + + suppression du mot clef - + - LBRegles + bOk - - - 250 - 400 - + + &Valider + + + Shift+A, Alt+A, Alt+A, Alt+A + + + true + + + true + + + validation de la saisie - + - textLabel1_4_2 + bHelp - <b><u>Régles :</u></b> + &Documentation + + + Alt+D + + + true + + + affichage documentation aster + + + + + LBNouvCommande -- 2.39.2