From: Pascale Noyret Date: Fri, 9 Nov 2007 14:04:48 +0000 (+0000) Subject: PN : pour pb de taille de caractères X-Git-Tag: V1_13b1~32 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=488d970a5e67611aa285f08ad9fdca40aa6a9457;p=tools%2Feficas.git PN : pour pb de taille de caractères --- diff --git a/Ui/desChoixCata.py b/Ui/desChoixCata.py index 8446d25c..a0b01de5 100644 --- a/Ui/desChoixCata.py +++ b/Ui/desChoixCata.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'desChoixCata.ui' # -# Created: mer mai 23 10:40:48 2007 +# Created: ven nov 9 14:51:34 2007 # by: The PyQt User Interface Compiler (pyuic) 3.13 # # WARNING! All changes made in this file will be lost! @@ -20,31 +20,37 @@ class DChoixCata(QDialog): self.setSizeGripEnabled(1) + DChoixCataLayout = QGridLayout(self,1,1,11,6,"DChoixCataLayout") self.frame3 = QFrame(self,"frame3") - self.frame3.setGeometry(QRect(0,120,540,50)) self.frame3.setFrameShape(QFrame.StyledPanel) self.frame3.setFrameShadow(QFrame.Raised) self.buttonCancel = QPushButton(self.frame3,"buttonCancel") - self.buttonCancel.setGeometry(QRect(370,10,90,30)) + self.buttonCancel.setGeometry(QRect(380,6,90,30)) self.buttonCancel.setAutoDefault(1) self.buttonOk = QPushButton(self.frame3,"buttonOk") - self.buttonOk.setGeometry(QRect(80,10,90,30)) + self.buttonOk.setGeometry(QRect(40,6,90,30)) self.buttonOk.setAutoDefault(1) self.buttonOk.setDefault(1) - self.textLabel1_2 = QLabel(self,"textLabel1_2") - self.textLabel1_2.setGeometry(QRect(40,50,340,20)) + DChoixCataLayout.addMultiCellWidget(self.frame3,2,2,0,1) + + self.TLNb = QLabel(self,"TLNb") + self.TLNb.setMinimumSize(QSize(30,0)) + + DChoixCataLayout.addWidget(self.TLNb,0,0) self.CBChoixCata = QComboBox(0,self,"CBChoixCata") self.CBChoixCata.setEnabled(1) - self.CBChoixCata.setGeometry(QRect(400,41,101,30)) - self.TLNb = QLabel(self,"TLNb") - self.TLNb.setGeometry(QRect(110,30,210,20)) - self.TLNb.setMinimumSize(QSize(30,0)) + DChoixCataLayout.addWidget(self.CBChoixCata,1,1) + + self.textLabel1_2 = QLabel(self,"textLabel1_2") + self.textLabel1_2.setMinimumSize(QSize(380,60)) + + DChoixCataLayout.addWidget(self.textLabel1_2,1,0) self.languageChange() @@ -62,8 +68,8 @@ class DChoixCata(QDialog): self.buttonCancel.setAccel(QString.null) self.buttonOk.setText(self.__tr("&OK")) self.buttonOk.setAccel(QString.null) - self.textLabel1_2.setText(self.__tr("Veuillez choisir celle avec laquelle vous souhaitez travailler")) self.TLNb.setText(self.__tr("2")) + self.textLabel1_2.setText(self.__tr("Veuillez choisir celle avec laquelle vous souhaitez travailler")) def CataChoisi(self): diff --git a/Ui/desChoixCata.ui b/Ui/desChoixCata.ui index 66297798..7ae385b2 100644 --- a/Ui/desChoixCata.ui +++ b/Ui/desChoixCata.ui @@ -18,126 +18,105 @@ true - + - frame3 + unnamed - - - 0 - 120 - 540 - 50 - - - - StyledPanel - - - Raised - - + - buttonCancel + frame3 - - - 370 - 10 - 90 - 30 - + + StyledPanel - - &Cancel - - - - - - true + + Raised + + + buttonCancel + + + + 380 + 6 + 90 + 30 + + + + &Cancel + + + + + + true + + + + + buttonOk + + + + 40 + 6 + 90 + 30 + + + + &OK + + + + + + true + + + true + + - + - buttonOk + TLNb - - - 80 - 10 - 90 - 30 - + + + 30 + 0 + - &OK + 2 - - + + + + CBChoixCata - + true - - true + + + + textLabel1_2 + + + + 380 + 60 + + + + <font size="+1">Veuillez choisir celle avec laquelle vous souhaitez travailler</font> - - - - textLabel1_2 - - - - 40 - 50 - 340 - 20 - - - - <font size="+1">Veuillez choisir celle avec laquelle vous souhaitez travailler</font> - - - - - CBChoixCata - - - true - - - - 400 - 41 - 101 - 30 - - - - - - TLNb - - - - 110 - 30 - 210 - 20 - - - - - 30 - 0 - - - - 2 - - + diff --git a/Ui/desCommande.py b/Ui/desCommande.py index 9ae67ecb..701122b8 100644 --- a/Ui/desCommande.py +++ b/Ui/desCommande.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'desCommande.ui' # -# Created: jeu avr 26 14:25:01 2007 +# Created: ven nov 9 14:51:34 2007 # by: The PyQt User Interface Compiler (pyuic) 3.13 # # WARNING! All changes made in this file will be lost! @@ -45,98 +45,119 @@ class DComm(QWidget): self.setMinimumSize(QSize(505,0)) - - self.Commentaire = QLabel(self,"Commentaire") - self.Commentaire.setGeometry(QRect(10,410,490,20)) - self.Commentaire.setFrameShape(QLabel.NoFrame) - self.Commentaire.setFrameShadow(QLabel.Plain) - - self.bSup = QPushButton(self,"bSup") - self.bSup.setGeometry(QRect(320,440,142,30)) - self.bSup.setAutoDefault(1) - - self.bOk = QPushButton(self,"bOk") - self.bOk.setGeometry(QRect(170,440,142,30)) - self.bOk.setAutoDefault(1) - self.bOk.setDefault(1) - - self.bHelp = QPushButton(self,"bHelp") - self.bHelp.setGeometry(QRect(10,440,142,30)) - self.bHelp.setAutoDefault(1) + DCommLayout = QGridLayout(self,1,1,11,6,"DCommLayout") self.TWChoix = QTabWidget(self,"TWChoix") - self.TWChoix.setGeometry(QRect(0,0,500,400)) self.MotClef = QWidget(self.TWChoix,"MotClef") + MotClefLayout = QGridLayout(self.MotClef,1,1,11,6,"MotClefLayout") + + self.textLabel1 = QLabel(self.MotClef,"textLabel1") + self.textLabel1.setMinimumSize(QSize(0,0)) + + MotClefLayout.addWidget(self.textLabel1,0,0) self.LBMCPermis = QListBox(self.MotClef,"LBMCPermis") - self.LBMCPermis.setGeometry(QRect(10,40,220,290)) self.LBMCPermis.setMinimumSize(QSize(0,0)) - self.LBRegles = QListBox(self.MotClef,"LBRegles") - self.LBRegles.setGeometry(QRect(260,40,230,290)) - - self.textLabel1 = QLabel(self.MotClef,"textLabel1") - self.textLabel1.setGeometry(QRect(50,10,140,20)) - self.textLabel1.setMinimumSize(QSize(0,0)) + MotClefLayout.addWidget(self.LBMCPermis,1,0) self.textLabel1_2 = QLabel(self.MotClef,"textLabel1_2") - self.textLabel1_2.setGeometry(QRect(360,0,50,37)) + + MotClefLayout.addWidget(self.textLabel1_2,0,1) + + self.LBRegles = QListBox(self.MotClef,"LBRegles") + + MotClefLayout.addWidget(self.LBRegles,1,1) self.TWChoix.insertTab(self.MotClef,QString("")) self.Concept = QWidget(self.TWChoix,"Concept") + ConceptLayout = QGridLayout(self.Concept,1,1,11,6,"ConceptLayout") self.groupBox1 = QGroupBox(self.Concept,"groupBox1") - self.groupBox1.setGeometry(QRect(0,10,520,380)) self.textLabel1_3 = QLabel(self.groupBox1,"textLabel1_3") - self.textLabel1_3.setGeometry(QRect(80,50,82,31)) + self.textLabel1_3.setGeometry(QRect(80,50,130,31)) self.textLabel1_3_2 = QLabel(self.groupBox1,"textLabel1_3_2") - self.textLabel1_3_2.setGeometry(QRect(80,170,82,31)) - - self.textLabel3 = QLabel(self.groupBox1,"textLabel3") - self.textLabel3.setGeometry(QRect(80,200,230,31)) + self.textLabel1_3_2.setGeometry(QRect(80,170,150,31)) self.LENomConcept = QLineEdit(self.groupBox1,"LENomConcept") self.LENomConcept.setGeometry(QRect(80,110,310,30)) + self.textLabel3 = QLabel(self.groupBox1,"textLabel3") + self.textLabel3.setGeometry(QRect(10,200,290,31)) + self.typeConcept = QLabel(self.groupBox1,"typeConcept") - self.typeConcept.setGeometry(QRect(320,200,100,31)) + self.typeConcept.setGeometry(QRect(310,200,130,31)) + + ConceptLayout.addWidget(self.groupBox1,0,0) self.TWChoix.insertTab(self.Concept,QString("")) self.Commande = QWidget(self.TWChoix,"Commande") + CommandeLayout = QGridLayout(self.Commande,1,1,11,6,"CommandeLayout") - self.textLabel6 = QLabel(self.Commande,"textLabel6") - self.textLabel6.setGeometry(QRect(10,60,60,30)) + self.buttonGroup1 = QButtonGroup(self.Commande,"buttonGroup1") + + self.RBalpha = QRadioButton(self.buttonGroup1,"RBalpha") + self.RBalpha.setGeometry(QRect(20,20,120,20)) + self.RBalpha.setChecked(1) + + 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.textLabel4 = QLabel(self.Commande,"textLabel4") - self.textLabel4.setGeometry(QRect(90,340,300,30)) - self.LBNouvCommande = QListBox(self.Commande,"LBNouvCommande") - self.LBNouvCommande.setGeometry(QRect(50,100,410,240)) + CommandeLayout.addMultiCellWidget(self.textLabel4,3,3,0,3) - self.buttonGroup1 = QButtonGroup(self.Commande,"buttonGroup1") - self.buttonGroup1.setGeometry(QRect(298,17,151,70)) + self.LBNouvCommande = QListBox(self.Commande,"LBNouvCommande") - self.RBGroupe = QRadioButton(self.buttonGroup1,"RBGroupe") - self.RBGroupe.setGeometry(QRect(20,40,101,20)) + CommandeLayout.addMultiCellWidget(self.LBNouvCommande,2,2,0,3) - self.RBalpha = QRadioButton(self.buttonGroup1,"RBalpha") - self.RBalpha.setGeometry(QRect(20,20,101,20)) - self.RBalpha.setChecked(1) + self.textLabel6 = QLabel(self.Commande,"textLabel6") - self.LEFiltre = QLineEdit(self.Commande,"LEFiltre") - self.LEFiltre.setGeometry(QRect(50,60,160,30)) + CommandeLayout.addWidget(self.textLabel6,1,0) self.BNext = QToolButton(self.Commande,"BNext") - self.BNext.setGeometry(QRect(220,60,30,31)) self.BNext.setIconSet(QIconSet(self.image0)) - self.textLabel1_4 = QLabel(self.Commande,"textLabel1_4") - self.textLabel1_4.setGeometry(QRect(50,20,171,21)) + CommandeLayout.addWidget(self.BNext,1,2) + + self.LEFiltre = QLineEdit(self.Commande,"LEFiltre") + + CommandeLayout.addWidget(self.LEFiltre,1,1) self.TWChoix.insertTab(self.Commande,QString("")) + DCommLayout.addMultiCellWidget(self.TWChoix,0,0,0,2) + + self.bHelp = QPushButton(self,"bHelp") + self.bHelp.setAutoDefault(1) + + DCommLayout.addWidget(self.bHelp,2,0) + + self.bOk = QPushButton(self,"bOk") + self.bOk.setAutoDefault(1) + self.bOk.setDefault(1) + + DCommLayout.addWidget(self.bOk,2,1) + + self.bSup = QPushButton(self,"bSup") + self.bSup.setAutoDefault(1) + + DCommLayout.addWidget(self.bSup,2,2) + + self.Commentaire = QLabel(self,"Commentaire") + self.Commentaire.setFrameShape(QLabel.NoFrame) + self.Commentaire.setFrameShadow(QLabel.Plain) + + DCommLayout.addMultiCellWidget(self.Commentaire,1,1,0,2) + self.languageChange() self.resize(QSize(505,483).expandedTo(self.minimumSizeHint())) @@ -156,34 +177,34 @@ class DComm(QWidget): def languageChange(self): self.setCaption(self.__tr("DComm")) - 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")) - 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.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\xa8\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")) self.groupBox1.setTitle(self.__tr("Concept")) self.textLabel1_3.setText(self.__tr("Nom du concept :")) self.textLabel1_3_2.setText(self.__tr("Type du concept :")) - self.textLabel3.setText(self.__trUtf8("\x4c\x27\x6f\x70\xc3\xa9\x72\x61\x74\x65\x75\x72\x20\x63\x6f\x75\x72\x61\x6e\x74\x20\x72\x65\x74\x6f\x75\x72\x6e\x65\x20\x75\x6e\x20\x63\x6f\x6e\x63\x65\x70\x74\x20\x64\x65\x20\x74\x79\x70\x65\x20\x3a")) + self.textLabel3.setText(self.__trUtf8("\x4c\x27\x6f\x70\xc3\xa9\x72\x61\x74\x65\x75\x72\x20\x72\x65\x74\x6f\x75\x72\x6e\x65\x20\x75\x6e\x20\x63\x6f\x6e\x63\x65\x70\x74\x20\x64\x65\x20\x74\x79\x70\x65\x20\x3a")) self.typeConcept.setText(self.__tr("TypeDuConcept")) self.TWChoix.changeTab(self.Concept,self.__tr("Nommer Concept")) - 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")) self.buttonGroup1.setTitle(self.__tr("Affichage")) - 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.RBGroupe.setText(self.__tr("par groupe")) + 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) QToolTip.add(self.BNext,self.__tr("affiche la prochaine occurence")) - self.textLabel1_4.setText(self.__tr("Commandes :")) self.TWChoix.changeTab(self.Commande,self.__tr("Nouvelle Commande")) + 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.Commentaire.setText(QString.null) def LBNouvCommandeClicked(self): diff --git a/Ui/desCommande.ui b/Ui/desCommande.ui index e8d3037b..8f4578b0 100644 --- a/Ui/desCommande.ui +++ b/Ui/desCommande.ui @@ -21,453 +21,337 @@ DComm - + - Commentaire + unnamed - - - 10 - 410 - 490 - 20 - - - - NoFrame - - - Plain - - - - - - - - bSup - - - - 320 - 440 - 142 - 30 - - - - &Supprimer - - - Alt+S - - - true - - - suppression du mot clef - - - - - bOk - - - - 170 - 440 - 142 - 30 - - - - &Valider - - - Shift+A, Alt+A, Alt+A, Alt+A - - - true - - - true - - - validation de la saisie - - - - - bHelp - - - - 10 - 440 - 142 - 30 - - - - &Documentation - - - Alt+D - - - true - - - affichage documentation aster - - - - - TWChoix - - - - 0 - 0 - 500 - 400 - - - + - MotClef + TWChoix - - Ajouter Mot-Clef - - - - LBMCPermis - - - - 10 - 40 - 220 - 290 - - - - - 0 - 0 - - - - + - LBRegles - - - - 260 - 40 - 230 - 290 - + MotClef + + Ajouter Mot-Clef + + + + unnamed + + + + textLabel1 + + + + 0 + 0 + + + + <h3><p align="center"><u><b>Mots Clefs Permis</b></u></p></h3> + + + + + LBMCPermis + + + + 0 + 0 + + + + + + textLabel1_2 + + + <h3><p align="center"><u><b>Règles</b></u></p></h3> + + + + + LBRegles + + + - + - textLabel1 - - - - 50 - 10 - 140 - 20 - - - - - 0 - 0 - - - - <h3><p align="center"><u><b>Mots Clefs Permis</b></u></p></h3> + Concept + + Nommer Concept + + + + unnamed + + + + groupBox1 + + + Concept + + + + textLabel1_3 + + + + 80 + 50 + 130 + 31 + + + + <u>Nom du concept :</u> + + + + + textLabel1_3_2 + + + + 80 + 170 + 150 + 31 + + + + <u>Type du concept :</u> + + + + + LENomConcept + + + + 80 + 110 + 310 + 30 + + + + + + textLabel3 + + + + 10 + 200 + 290 + 31 + + + + L'opérateur retourne un concept de type : + + + + + typeConcept + + + + 310 + 200 + 130 + 31 + + + + TypeDuConcept + + + + - + - textLabel1_2 - - - - 360 - 0 - 50 - 37 - - - - <h3><p align="center"><u><b>Règles</b></u></p></h3> + Commande + + Nouvelle Commande + + + + unnamed + + + + buttonGroup1 + + + Affichage + + + + RBalpha + + + + 20 + 20 + 120 + 20 + + + + alphabétique + + + true + + + + + RBGroupe + + + + 20 + 40 + 110 + 20 + + + + par groupe + + + + + + textLabel1_4 + + + <b><u>Commandes :</u></b> + + + + + textLabel4 + + + La commande choisie sera ajoutée APRES la commande courante + + + + + LBNouvCommande + + + + + textLabel6 + + + Filtre + + + + + BNext + + + + + + image0 + + + affiche la prochaine occurence + + + + + LEFiltre + + + - + - Concept + bHelp + + + &Documentation + + + Alt+D + + + true + + + affichage documentation aster - - Nommer Concept - - - - groupBox1 - - - - 0 - 10 - 520 - 380 - - - - Concept - - - - textLabel1_3 - - - - 80 - 50 - 82 - 31 - - - - <u>Nom du concept :</u> - - - - - textLabel1_3_2 - - - - 80 - 170 - 82 - 31 - - - - <u>Type du concept :</u> - - - - - textLabel3 - - - - 80 - 200 - 230 - 31 - - - - L'opérateur courant retourne un concept de type : - - - - - LENomConcept - - - - 80 - 110 - 310 - 30 - - - - - - typeConcept - - - - 320 - 200 - 100 - 31 - - - - TypeDuConcept - - - - + - Commande + bOk + + + &Valider + + + Shift+A, Alt+A, Alt+A, Alt+A + + + true + + + true + + + validation de la saisie + + + + + bSup + + + &Supprimer + + + Alt+S + + + true + + + suppression du mot clef + + + + + Commentaire + + + NoFrame + + + Plain + + + - - Nouvelle Commande - - - - textLabel6 - - - - 10 - 60 - 60 - 30 - - - - Filtre - - - - - textLabel4 - - - - 90 - 340 - 300 - 30 - - - - La commande choisie sera ajoutée APRES la commande courante - - - - - LBNouvCommande - - - - 50 - 100 - 410 - 240 - - - - - - buttonGroup1 - - - - 298 - 17 - 151 - 70 - - - - Affichage - - - - RBGroupe - - - - 20 - 40 - 101 - 20 - - - - par groupe - - - - - RBalpha - - - - 20 - 20 - 101 - 20 - - - - alphabétique - - - true - - - - - - LEFiltre - - - - 50 - 60 - 160 - 30 - - - - - - BNext - - - - 220 - 60 - 30 - 31 - - - - - - - image0 - - - affiche la prochaine occurence - - - - - textLabel1_4 - - - - 50 - 20 - 171 - 21 - - - - <b><u>Commandes :</u></b> - - - + diff --git a/Ui/desCommentaire.py b/Ui/desCommentaire.py index 78d4a8a2..dc1f1c37 100644 --- a/Ui/desCommentaire.py +++ b/Ui/desCommentaire.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'desCommentaire.ui' # -# Created: mar oct 30 12:05:11 2007 +# Created: ven nov 9 14:51:34 2007 # by: The PyQt User Interface Compiler (pyuic) 3.13 # # WARNING! All changes made in this file will be lost! @@ -20,25 +20,32 @@ class DComment(QWidget): self.setMinimumSize(QSize(350,0)) + DCommentLayout = QGridLayout(self,1,1,11,6,"DCommentLayout") - self.bSup = QPushButton(self,"bSup") - self.bSup.setGeometry(QRect(310,420,142,30)) - self.bSup.setAutoDefault(1) + layout1 = QHBoxLayout(None,0,6,"layout1") self.bHelp = QPushButton(self,"bHelp") - self.bHelp.setGeometry(QRect(10,420,142,30)) self.bHelp.setAutoDefault(1) + layout1.addWidget(self.bHelp) + + self.bOk = QPushButton(self,"bOk") + self.bOk.setAutoDefault(1) + self.bOk.setDefault(1) + layout1.addWidget(self.bOk) + + self.bSup = QPushButton(self,"bSup") + self.bSup.setAutoDefault(1) + layout1.addWidget(self.bSup) + + DCommentLayout.addLayout(layout1,2,0) self.textLabel1 = QLabel(self,"textLabel1") - self.textLabel1.setGeometry(QRect(160,10,120,21)) + + DCommentLayout.addWidget(self.textLabel1,0,0) self.textCommentaire = QTextEdit(self,"textCommentaire") - self.textCommentaire.setGeometry(QRect(10,40,451,360)) - self.bOk = QPushButton(self,"bOk") - self.bOk.setGeometry(QRect(160,420,142,30)) - self.bOk.setAutoDefault(1) - self.bOk.setDefault(1) + DCommentLayout.addWidget(self.textCommentaire,1,0) self.languageChange() @@ -50,16 +57,16 @@ class DComment(QWidget): def languageChange(self): self.setCaption(self.__tr("Form1")) - self.bSup.setText(self.__tr("&Supprimer")) - self.bSup.setAccel(self.__tr("Alt+S")) - QToolTip.add(self.bSup,self.__tr("suppression du mot clef")) self.bHelp.setText(self.__tr("&Documentation")) self.bHelp.setAccel(self.__tr("Alt+D")) QToolTip.add(self.bHelp,self.__tr("affichage documentation aster")) - self.textLabel1.setText(self.__tr("

Texte du Commentaire

")) 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.textLabel1.setText(self.__tr("

Texte du Commentaire

")) def TexteCommentaireEntre(self): diff --git a/Ui/desCommentaire.ui b/Ui/desCommentaire.ui index 5c0a3b5c..0d6a904a 100644 --- a/Ui/desCommentaire.ui +++ b/Ui/desCommentaire.ui @@ -21,113 +21,88 @@ Form1 - + - bSup - - - - 310 - 420 - 142 - 30 - - - - &Supprimer - - - Alt+S - - - true - - - suppression du mot clef - - - - - bHelp - - - - 10 - 420 - 142 - 30 - - - - &Documentation - - - Alt+D - - - true - - - affichage documentation aster - - - - - textLabel1 - - - - 160 - 10 - 120 - 21 - - - - <p align="center"><b>Texte du Commentaire</b></p> - - - - - textCommentaire - - - - 10 - 40 - 451 - 360 - - - - - - bOk - - - - 160 - 420 - 142 - 30 - - - - &Valider - - - Shift+A, Alt+A, Alt+A, Alt+A - - - true - - - true - - - validation de la saisie - - + unnamed + + + + layout1 + + + + unnamed + + + + bHelp + + + &Documentation + + + Alt+D + + + true + + + affichage documentation aster + + + + + bOk + + + &Valider + + + Shift+A, Alt+A, Alt+A, Alt+A + + + true + + + true + + + validation de la saisie + + + + + bSup + + + &Supprimer + + + Alt+S + + + true + + + suppression du mot clef + + + + + + + textLabel1 + + + <p align="center"><b>Texte du Commentaire</b></p> + + + + + textCommentaire + + + diff --git a/Ui/desError.py b/Ui/desError.py index 816373ef..54ced031 100644 --- a/Ui/desError.py +++ b/Ui/desError.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'desError.ui' # -# Created: lun aoû 20 10:39:18 2007 +# Created: ven nov 9 14:51:34 2007 # by: The PyQt User Interface Compiler (pyuic) 3.13 # # WARNING! All changes made in this file will be lost! @@ -20,13 +20,23 @@ class DError(QWidget): self.setMinimumSize(QSize(350,0)) + DErrorLayout = QGridLayout(self,1,1,11,6,"DErrorLayout") + + self.textLabel1_3 = QLabel(self,"textLabel1_3") + + DErrorLayout.addWidget(self.textLabel1_3,0,0) + + layout1 = QHBoxLayout(None,0,6,"layout1") + spacer1_2 = QSpacerItem(171,20,QSizePolicy.Expanding,QSizePolicy.Minimum) + layout1.addItem(spacer1_2) self.bSup = QPushButton(self,"bSup") - self.bSup.setGeometry(QRect(170,430,142,30)) self.bSup.setAutoDefault(1) + layout1.addWidget(self.bSup) + spacer1 = QSpacerItem(171,20,QSizePolicy.Expanding,QSizePolicy.Minimum) + layout1.addItem(spacer1) - self.textLabel1_3 = QLabel(self,"textLabel1_3") - self.textLabel1_3.setGeometry(QRect(60,110,330,110)) + DErrorLayout.addLayout(layout1,1,0) self.languageChange() @@ -38,10 +48,10 @@ class DError(QWidget): def languageChange(self): self.setCaption(self.__tr("DInactif")) + self.textLabel1_3.setText(self.__trUtf8("\x3c\x66\x6f\x6e\x74\x20\x73\x69\x7a\x65\x3d\x22\x2b\x34\x22\x3e\x3c\x70\x20\x61\x6c\x69\x67\x6e\x3d\x22\x63\x65\x6e\x74\x65\x72\x22\x3e\x4c\x65\x20\x6e\x6f\x65\x75\x64\x20\x73\xc3\xa9\x6c\x65\x63\x74\x69\x6f\x6e\x6e\xc3\xa9\x20\x6e\x65\x20\x63\x6f\x72\x72\x65\x73\x70\x6f\x6e\x64\x20\x70\x61\x73\x20\xc3\xa0\x20\x75\x6e\x20\x6f\x62\x6a\x65\x74\x20\x61\x63\x74\x69\x66\x2e\x3c\x2f\x70\x3e\x3c\x2f\x66\x6f\x6e\x74\x3e")) self.bSup.setText(self.__tr("&Supprimer")) self.bSup.setAccel(self.__tr("Alt+S")) QToolTip.add(self.bSup,self.__tr("suppression du mot clef")) - self.textLabel1_3.setText(self.__trUtf8("\x3c\x66\x6f\x6e\x74\x20\x73\x69\x7a\x65\x3d\x22\x2b\x34\x22\x3e\x3c\x70\x20\x61\x6c\x69\x67\x6e\x3d\x22\x63\x65\x6e\x74\x65\x72\x22\x3e\x4c\x65\x20\x6e\x6f\x65\x75\x64\x20\x73\xc3\xa9\x6c\x65\x63\x74\x69\x6f\x6e\x6e\xc3\xa9\x20\x6e\x65\x20\x63\x6f\x72\x72\x65\x73\x70\x6f\x6e\x64\x20\x70\x61\x73\x20\xc3\xa0\x20\x75\x6e\x20\x6f\x62\x6a\x65\x74\x20\x61\x63\x74\x69\x66\x2e\x3c\x2f\x70\x3e\x3c\x2f\x66\x6f\x6e\x74\x3e")) def BSupPressed(self): diff --git a/Ui/desError.ui b/Ui/desError.ui index 370e1760..9dd94bbd 100644 --- a/Ui/desError.ui +++ b/Ui/desError.ui @@ -21,47 +21,80 @@ DInactif - + - bSup + unnamed - - - 170 - 430 - 142 - 30 - - - - &Supprimer - - - Alt+S - - - true - - - suppression du mot clef - - - - - textLabel1_3 - - - - 60 - 110 - 330 - 110 - - - - <font size="+4"><p align="center">Le noeud sélectionné ne correspond pas à un objet actif.</p></font> - - + + + textLabel1_3 + + + <font size="+4"><p align="center">Le noeud sélectionné ne correspond pas à un objet actif.</p></font> + + + + + layout1 + + + + unnamed + + + + spacer1_2 + + + Horizontal + + + Expanding + + + + 171 + 20 + + + + + + bSup + + + &Supprimer + + + Alt+S + + + true + + + suppression du mot clef + + + + + spacer1 + + + Horizontal + + + Expanding + + + + 171 + 20 + + + + + + diff --git a/Ui/desFormule.py b/Ui/desFormule.py index 5c5aa32e..2142a0ed 100644 --- a/Ui/desFormule.py +++ b/Ui/desFormule.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'desFormule.ui' # -# Created: mar aoû 7 16:45:45 2007 +# Created: ven nov 9 14:51:34 2007 # by: The PyQt User Interface Compiler (pyuic) 3.13 # # WARNING! All changes made in this file will be lost! @@ -45,99 +45,137 @@ class DFormule(QWidget): self.setMinimumSize(QSize(505,0)) + DFormuleLayout = QGridLayout(self,1,1,11,6,"DFormuleLayout") - self.bSup = QPushButton(self,"bSup") - self.bSup.setGeometry(QRect(320,440,142,30)) - self.bSup.setAutoDefault(1) + self.Commentaire = QLabel(self,"Commentaire") + + DFormuleLayout.addWidget(self.Commentaire,1,0) + + layout2 = QHBoxLayout(None,0,6,"layout2") self.bHelp = QPushButton(self,"bHelp") - self.bHelp.setGeometry(QRect(10,440,142,30)) self.bHelp.setAutoDefault(1) - - self.Commentaire = QLabel(self,"Commentaire") - self.Commentaire.setGeometry(QRect(-8,404,490,20)) + layout2.addWidget(self.bHelp) self.bOk = QPushButton(self,"bOk") - self.bOk.setGeometry(QRect(170,440,142,30)) self.bOk.setAutoDefault(1) self.bOk.setDefault(1) + layout2.addWidget(self.bOk) + + self.bSup = QPushButton(self,"bSup") + self.bSup.setAutoDefault(1) + layout2.addWidget(self.bSup) + + DFormuleLayout.addLayout(layout2,2,0) self.TWChoix = QTabWidget(self,"TWChoix") - self.TWChoix.setGeometry(QRect(0,0,500,400)) self.Formule = QWidget(self.TWChoix,"Formule") + FormuleLayout = QGridLayout(self.Formule,1,1,11,6,"FormuleLayout") + + self.textLabel1_5 = QLabel(self.Formule,"textLabel1_5") + self.textLabel1_5.setMinimumSize(QSize(0,0)) + + FormuleLayout.addMultiCellWidget(self.textLabel1_5,4,4,0,1) + + self.LECorpsFormule = QLineEdit(self.Formule,"LECorpsFormule") + + FormuleLayout.addMultiCellWidget(self.LECorpsFormule,5,5,0,1) self.textLabel1_2 = QLabel(self.Formule,"textLabel1_2") - self.textLabel1_2.setGeometry(QRect(290,10,80,20)) + + FormuleLayout.addWidget(self.textLabel1_2,0,1) self.textLabel1 = QLabel(self.Formule,"textLabel1") - self.textLabel1.setGeometry(QRect(30,10,160,30)) self.textLabel1.setMinimumSize(QSize(0,0)) - self.textLabel2 = QLabel(self.Formule,"textLabel2") - self.textLabel2.setGeometry(QRect(220,40,220,20)) - - self.textLabel1_5 = QLabel(self.Formule,"textLabel1_5") - self.textLabel1_5.setGeometry(QRect(30,180,420,20)) - self.textLabel1_5.setMinimumSize(QSize(0,0)) + FormuleLayout.addWidget(self.textLabel1,0,0) self.textLabel1_3_2 = QLabel(self.Formule,"textLabel1_3_2") - self.textLabel1_3_2.setGeometry(QRect(28,306,401,31)) - self.textLabel1_6 = QLabel(self.Formule,"textLabel1_6") - self.textLabel1_6.setGeometry(QRect(210,60,20,50)) + FormuleLayout.addMultiCellWidget(self.textLabel1_3_2,7,7,0,1) - self.textLabel2_2 = QLabel(self.Formule,"textLabel2_2") - self.textLabel2_2.setGeometry(QRect(210,130,49,20)) + self.textLabel1_3 = QLabel(self.Formule,"textLabel1_3") - self.textLabel1_6_2 = QLabel(self.Formule,"textLabel1_6_2") - self.textLabel1_6_2.setGeometry(QRect(450,60,20,50)) + FormuleLayout.addMultiCellWidget(self.textLabel1_3,6,6,0,1) + + self.textLabel2 = QLabel(self.Formule,"textLabel2") + + FormuleLayout.addWidget(self.textLabel2,1,1) + + layout6 = QHBoxLayout(None,0,6,"layout6") self.LENomFormule = QLineEdit(self.Formule,"LENomFormule") - self.LENomFormule.setGeometry(QRect(30,70,171,31)) + self.LENomFormule.setMinimumSize(QSize(0,40)) + layout6.addWidget(self.LENomFormule) + + layout4 = QHBoxLayout(None,0,6,"layout4") + + self.textLabel1_6 = QLabel(self.Formule,"textLabel1_6") + layout4.addWidget(self.textLabel1_6) self.LENomsArgs = QLineEdit(self.Formule,"LENomsArgs") - self.LENomsArgs.setGeometry(QRect(220,70,230,31)) + self.LENomsArgs.setMinimumSize(QSize(230,40)) + layout4.addWidget(self.LENomsArgs) - self.textLabel1_3 = QLabel(self.Formule,"textLabel1_3") - self.textLabel1_3.setGeometry(QRect(90,260,300,20)) + self.textLabel1_6_2 = QLabel(self.Formule,"textLabel1_6_2") + layout4.addWidget(self.textLabel1_6_2) + layout6.addLayout(layout4) - self.LECorpsFormule = QLineEdit(self.Formule,"LECorpsFormule") - self.LECorpsFormule.setGeometry(QRect(20,220,440,31)) + FormuleLayout.addMultiCellLayout(layout6,2,2,0,1) + + self.textLabel2_2 = QLabel(self.Formule,"textLabel2_2") + + FormuleLayout.addWidget(self.textLabel2_2,3,1) self.TWChoix.insertTab(self.Formule,QString("")) self.Commande = QWidget(self.TWChoix,"Commande") - - self.textLabel6 = QLabel(self.Commande,"textLabel6") - self.textLabel6.setGeometry(QRect(10,60,60,30)) + CommandeLayout = QGridLayout(self.Commande,1,1,11,6,"CommandeLayout") self.textLabel4 = QLabel(self.Commande,"textLabel4") - self.textLabel4.setGeometry(QRect(90,340,300,30)) - self.LBNouvCommande = QListBox(self.Commande,"LBNouvCommande") - self.LBNouvCommande.setGeometry(QRect(50,100,410,240)) + CommandeLayout.addMultiCellWidget(self.textLabel4,3,3,0,3) + + self.textLabel1_4 = QLabel(self.Commande,"textLabel1_4") + + CommandeLayout.addMultiCellWidget(self.textLabel1_4,0,0,0,1) self.buttonGroup1 = QButtonGroup(self.Commande,"buttonGroup1") - self.buttonGroup1.setGeometry(QRect(300,20,151,70)) - self.RBGroupe = QRadioButton(self.buttonGroup1,"RBGroupe") - self.RBGroupe.setGeometry(QRect(20,40,101,20)) + LayoutWidget = QWidget(self.buttonGroup1,"layout1") + LayoutWidget.setGeometry(QRect(20,20,113,48)) + layout1 = QVBoxLayout(LayoutWidget,11,6,"layout1") - self.RBalpha = QRadioButton(self.buttonGroup1,"RBalpha") - self.RBalpha.setGeometry(QRect(20,20,101,20)) + self.RBalpha = QRadioButton(LayoutWidget,"RBalpha") self.RBalpha.setChecked(1) + layout1.addWidget(self.RBalpha) + + self.RBGroupe = QRadioButton(LayoutWidget,"RBGroupe") + layout1.addWidget(self.RBGroupe) + + CommandeLayout.addMultiCellWidget(self.buttonGroup1,0,1,3,3) self.LEFiltre = QLineEdit(self.Commande,"LEFiltre") - self.LEFiltre.setGeometry(QRect(50,60,160,30)) + self.LEFiltre.setMinimumSize(QSize(160,30)) - self.textLabel1_4 = QLabel(self.Commande,"textLabel1_4") - self.textLabel1_4.setGeometry(QRect(50,20,171,21)) + CommandeLayout.addWidget(self.LEFiltre,1,1) self.BNext = QToolButton(self.Commande,"BNext") - self.BNext.setGeometry(QRect(220,60,30,31)) self.BNext.setIconSet(QIconSet(self.image0)) + + CommandeLayout.addWidget(self.BNext,1,2) + + self.textLabel6 = QLabel(self.Commande,"textLabel6") + + CommandeLayout.addWidget(self.textLabel6,1,0) + + self.LBNouvCommande = QListBox(self.Commande,"LBNouvCommande") + + CommandeLayout.addMultiCellWidget(self.LBNouvCommande,2,2,0,3) self.TWChoix.insertTab(self.Commande,QString("")) + DFormuleLayout.addWidget(self.TWChoix,0,0) + self.languageChange() self.resize(QSize(529,484).expandedTo(self.minimumSizeHint())) @@ -158,34 +196,34 @@ class DFormule(QWidget): def languageChange(self): self.setCaption(self.__tr("DMacro")) - self.bSup.setText(self.__tr("&Supprimer")) - self.bSup.setAccel(self.__tr("Alt+S")) - QToolTip.add(self.bSup,self.__tr("suppression du mot clef")) + 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.Commentaire.setText(QString.null) 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.textLabel1_5.setText(self.__tr("

Corps de la formule

")) self.textLabel1_2.setText(self.__tr("

Arguments

")) self.textLabel1.setText(self.__tr("

Nom de la formule

")) + self.textLabel1_3_2.setText(self.__trUtf8("\x43\x65\x20\x6e\x27\x65\x73\x74\x20\x71\x75\x27\x61\x70\x72\xc3\xa8\x73\x20\x61\x76\x6f\x69\x72\x20\x61\x70\x70\x75\x79\xc3\xa9\x20\x73\x75\x72\x20\x6c\x65\x20\x62\x6f\x75\x74\x6f\x6e\x20\x56\x61\x6c\x69\x64\x65\x72\x20\x71\x75\x65\x20\x6c\x65\x73\x20\x6e\x6f\x75\x76\x65\x6c\x6c\x65\x73\x0a\x76\x61\x6c\x65\x75\x72\x73\x20\x73\x65\x72\x6f\x6e\x74\x20\x65\x66\x66\x65\x63\x74\x69\x76\x65\x6d\x65\x6e\x74\x20\x70\x72\x69\x73\x65\x73\x20\x65\x6e\x20\x63\x6f\x6d\x70\x74\x65")) + self.textLabel1_3.setText(self.__trUtf8("\x52\x65\x74\x6f\x75\x72\x2d\x43\x68\x61\x72\x69\x6f\x74\x20\x70\x65\x72\x6d\x65\x74\x20\x64\x65\x20\x76\xc3\xa9\x72\x69\x66\x69\x65\x72\x20\x71\x75\x65\x20\x6c\x27\x65\x78\x70\x72\x65\x73\x73\x69\x6f\x6e\x20\x65\x73\x74\x20\x76\x61\x6c\x69\x64\x65\x2e")) self.textLabel2.setText(self.__trUtf8("\x76\x61\x72\x69\x61\x62\x6c\x65\x73\x20\x73\xc3\xa9\x70\x61\x72\xc3\xa9\x65\x73\x20\x70\x61\x72\x20\x64\x65\x73\x20\x22\x2c\x22\x20\x70\x61\x72\x20\x65\x78\x2e\x20\x3a\x20\x78\x2c\x79\x2c\x7a")) - self.textLabel1_5.setText(self.__tr("

Corps de la formule

")) - self.textLabel1_3_2.setText(self.__trUtf8("\x43\x65\x20\x6e\x27\x65\x73\x74\x20\x71\x75\x27\x61\x70\x72\xc3\xa8\x73\x20\x61\x76\x6f\x69\x72\x20\x61\x70\x70\x75\x79\xc3\xa9\x20\x73\x75\x72\x20\x6c\x65\x20\x62\x6f\x75\x74\x6f\x6e\x20\x56\x61\x6c\x69\x64\x65\x72\x20\x71\x75\x65\x20\x6c\x65\x73\x20\x6e\x6f\x75\x76\x65\x6c\x6c\x65\x73\x0a\x76\x61\x65\x6c\x75\x72\x73\x20\x73\x65\x72\x6f\x6e\x74\x20\x65\x66\x66\x65\x63\x74\x69\x76\x65\x6d\x65\x6e\x74\x20\x70\x72\x69\x73\x65\x73\x20\x65\x6e\x20\x63\x6f\x6d\x70\x74\x65")) self.textLabel1_6.setText(self.__tr("

(

")) - self.textLabel2_2.setText(self.__tr("=")) self.textLabel1_6_2.setText(self.__tr("

)

")) - self.textLabel1_3.setText(self.__trUtf8("\x52\x65\x74\x6f\x75\x72\x2d\x43\x68\x61\x72\x69\x6f\x74\x20\x70\x65\x72\x6d\x65\x74\x20\x64\x65\x20\x76\xc3\xa9\x72\x69\x66\x69\x65\x72\x20\x71\x75\x65\x20\x6c\x27\x65\x78\x70\x72\x65\x73\x73\x69\x6f\x6e\x20\x65\x73\x74\x20\x76\x61\x6c\x69\x64\x65\x2e")) + self.textLabel2_2.setText(self.__tr("=")) self.TWChoix.changeTab(self.Formule,self.__trUtf8("\x44\xc3\xa9\x66\x69\x6e\x69\x74\x69\x6f\x6e\x20\x46\x6f\x72\x6d\x75\x6c\x65")) - 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")) + self.textLabel4.setText(self.__trUtf8("\x3c\x70\x20\x61\x6c\x69\x67\x6e\x3d\x22\x6c\x65\x66\x74\x22\x3e\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\x3c\x2f\x70\x3e")) + self.textLabel1_4.setText(self.__tr("Commandes :")) self.buttonGroup1.setTitle(self.__tr("Affichage")) - 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.textLabel1_4.setText(self.__tr("Commandes :")) + self.RBGroupe.setText(self.__tr("par groupe")) self.BNext.setText(QString.null) 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 5afefa16..09f8ba62 100644 --- a/Ui/desFormule.ui +++ b/Ui/desFormule.ui @@ -21,472 +21,345 @@ DMacro - + - bSup + unnamed - - - 320 - 440 - 142 - 30 - - - - &Supprimer - - - Alt+S - - - true - - - suppression du mot clef - - - - - bHelp - - - - 10 - 440 - 142 - 30 - - - - &Documentation - - - Alt+D - - - true - - - affichage documentation aster - - - - - Commentaire - - - - -8 - 404 - 490 - 20 - - - - - - - - - bOk - - - - 170 - 440 - 142 - 30 - - - - &Valider - - - Shift+A, Alt+A, Alt+A, Alt+A - - - true - - - true - - - validation de la saisie - - - - - TWChoix - - - - 0 - 0 - 500 - 400 - - - + - Formule + Commentaire + + + - - Définition Formule - - - - textLabel1_2 - - - - 290 - 10 - 80 - 20 - - - - <h3><p align="center"><u><b>Arguments</b></u></p></h3> - - - - - textLabel1 - - - - 30 - 10 - 160 - 30 - - - - - 0 - 0 - - - - <h3><p align="center"><u><b>Nom de la formule</b></u></p></h3> - - - - - textLabel2 - - - - 220 - 40 - 220 - 20 - - - - variables séparées par des "," par ex. : x,y,z - - - - - textLabel1_5 - - - - 30 - 180 - 420 - 20 - - - - - 0 - 0 - - - - <h3><p align="center"><u><b>Corps de la formule</b></u></p></h3> - - - - - textLabel1_3_2 - - - - 28 - 306 - 401 - 31 - - - - Ce n'est qu'après avoir appuyé sur le bouton Valider que les nouvelles -vaelurs seront effectivement prises en compte - - - - - textLabel1_6 - - - - 210 - 60 - 20 - 50 - - - - <h1><b>(</b></h1> - - - - - textLabel2_2 - - - - 210 - 130 - 49 - 20 - - - - <font size="+4" face="Helvetica"><b>=</b></font> - - - - - textLabel1_6_2 - - - - 450 - 60 - 20 - 50 - - - - <h1><b>)</b></h1> - - - - - LENomFormule - - - - 30 - 70 - 171 - 31 - - - - - - LENomsArgs - - - - 220 - 70 - 230 - 31 - - - - - - textLabel1_3 - - - - 90 - 260 - 300 - 20 - - - - Retour-Chariot permet de vérifier que l'expression est valide. - - - - - LECorpsFormule - - - - 20 - 220 - 440 - 31 - - - - + - Commande + layout2 - - Nouvelle Commande - - + - textLabel6 + unnamed - - - 10 - 60 - 60 - 30 - - - - Filtre - - - - - textLabel4 - - - - 90 - 340 - 300 - 30 - - - - La commande choisie sera ajoutée APRES la commande courante - - - - - LBNouvCommande - - - - 50 - 100 - 410 - 240 - - - - - - buttonGroup1 - - - - 300 - 20 - 151 - 70 - - - - Affichage - - + - RBGroupe - - - - 20 - 40 - 101 - 20 - + bHelp - par groupe + &Documentation + + + Alt+D + + + true + + + affichage documentation aster - + - RBalpha + bOk - - - 20 - 20 - 101 - 20 - + + &Valider + + + Shift+A, Alt+A, Alt+A, Alt+A + + + true + + + true + + + validation de la saisie + + + + + bSup - alphabétique + &Supprimer + + + Alt+S - + true + + suppression du mot clef + - - - - LEFiltre - - - - 50 - 60 - 160 - 30 - - - - + + + + + TWChoix + + - textLabel1_4 - - - - 50 - 20 - 171 - 21 - - - - <b><u>Commandes :</u></b> + Formule + + Définition Formule + + + + unnamed + + + + textLabel1_5 + + + + 0 + 0 + + + + <h3><p align="center"><u><b>Corps de la formule</b></u></p></h3> + + + + + LECorpsFormule + + + + + textLabel1_2 + + + <h3><p align="center"><u><b>Arguments</b></u></p></h3> + + + + + textLabel1 + + + + 0 + 0 + + + + <h3><p align="center"><u><b>Nom de la formule</b></u></p></h3> + + + + + textLabel1_3_2 + + + Ce n'est qu'après avoir appuyé sur le bouton Valider que les nouvelles +valeurs seront effectivement prises en compte + + + + + textLabel1_3 + + + Retour-Chariot permet de vérifier que l'expression est valide. + + + + + textLabel2 + + + variables séparées par des "," par ex. : x,y,z + + + + + layout6 + + + + unnamed + + + + LENomFormule + + + + 0 + 40 + + + + + + layout4 + + + + unnamed + + + + textLabel1_6 + + + <h1><b>(</b></h1> + + + + + LENomsArgs + + + + 230 + 40 + + + + + + textLabel1_6_2 + + + <h1><b>)</b></h1> + + + + + + + + + textLabel2_2 + + + <font size="+4" face="Helvetica"><b>=</b></font> + + + - + - BNext - - - - 220 - 60 - 30 - 31 - - - - - - - image0 - - - affiche la prochaine occurence + Commande + + Nouvelle Commande + + + + unnamed + + + + textLabel4 + + + <p align="left">La commande choisie sera ajoutée APRES la commande courante</p> + + + + + textLabel1_4 + + + <b><u>Commandes :</u></b> + + + + + buttonGroup1 + + + Affichage + + + + layout1 + + + + 20 + 20 + 113 + 48 + + + + + unnamed + + + + RBalpha + + + alphabétique + + + true + + + + + RBGroupe + + + par groupe + + + + + + + + LEFiltre + + + + 160 + 30 + + + + + + BNext + + + + + + image0 + + + affiche la prochaine occurence + + + + + textLabel6 + + + Filtre + + + + + LBNouvCommande + + + - + diff --git a/Ui/desInactif.py b/Ui/desInactif.py index 72b72ff5..1c0a6f89 100644 --- a/Ui/desInactif.py +++ b/Ui/desInactif.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'desInactif.ui' # -# Created: lun mar 5 14:01:29 2007 +# Created: ven nov 9 14:51:34 2007 # by: The PyQt User Interface Compiler (pyuic) 3.13 # # WARNING! All changes made in this file will be lost! @@ -20,22 +20,27 @@ class DInactif(QWidget): self.setMinimumSize(QSize(350,0)) + DInactifLayout = QGridLayout(self,1,1,11,6,"DInactifLayout") - self.textLabel1_4 = QLabel(self,"textLabel1_4") - self.textLabel1_4.setGeometry(QRect(30,240,420,20)) + self.textLabel1_3 = QLabel(self,"textLabel1_3") + + DInactifLayout.addWidget(self.textLabel1_3,0,0) self.textLabel1 = QLabel(self,"textLabel1") - self.textLabel1.setGeometry(QRect(30,220,420,20)) - self.textLabel1_4_2 = QLabel(self,"textLabel1_4_2") - self.textLabel1_4_2.setGeometry(QRect(30,260,420,20)) + DInactifLayout.addWidget(self.textLabel1,1,0) + + layout1 = QHBoxLayout(None,0,6,"layout1") + spacer2 = QSpacerItem(171,20,QSizePolicy.Expanding,QSizePolicy.Minimum) + layout1.addItem(spacer2) self.bSup = QPushButton(self,"bSup") - self.bSup.setGeometry(QRect(170,430,142,30)) self.bSup.setAutoDefault(1) + layout1.addWidget(self.bSup) + spacer1 = QSpacerItem(171,20,QSizePolicy.Expanding,QSizePolicy.Minimum) + layout1.addItem(spacer1) - self.textLabel1_3 = QLabel(self,"textLabel1_3") - self.textLabel1_3.setGeometry(QRect(20,130,420,20)) + DInactifLayout.addLayout(layout1,2,0) self.languageChange() @@ -46,18 +51,12 @@ class DInactif(QWidget): def languageChange(self): - self.setCaption(QString.null) - self.textLabel1_4.setText(self.__tr("

\n" -" DEBUT / POURSUITE et FIN\n" -"

")) - self.textLabel1.setText(self.__trUtf8("\x3c\x66\x6f\x6e\x74\x20\x73\x69\x7a\x65\x3d\x22\x2b\x32\x22\x3e\x3c\x70\x20\x61\x6c\x69\x67\x6e\x3d\x22\x63\x65\x6e\x74\x65\x72\x22\x3e\x0a\x53\x65\x75\x6c\x65\x73\x20\x6c\x65\x73\x20\x63\x6f\x6d\x6d\x61\x6e\x64\x65\x73\x20\x70\x6c\x61\x63\xc3\xa9\x65\x73\x20\x65\x6e\x74\x72\x65\x20\x3a\x0a\x3c\x2f\x70\x3e\x3c\x2f\x66\x6f\x6e\x74\x3e")) - self.textLabel1_4_2.setText(self.__tr("

\n" -"sont actives\n" -"

")) + self.setCaption(self.__tr("DInactif")) + self.textLabel1_3.setText(self.__trUtf8("\x3c\x66\x6f\x6e\x74\x20\x73\x69\x7a\x65\x3d\x22\x2b\x32\x22\x3e\x3c\x70\x20\x61\x6c\x69\x67\x6e\x3d\x22\x63\x65\x6e\x74\x65\x72\x22\x3e\x4c\x65\x20\x6e\x6f\x65\x75\x64\x20\x73\xc3\xa9\x6c\x65\x63\x74\x69\x6f\x6e\x6e\xc3\xa9\x20\x6e\x65\x20\x63\x6f\x72\x72\x65\x73\x70\x6f\x6e\x64\x20\x70\x61\x73\x20\xc3\xa0\x20\x75\x6e\x20\x6f\x62\x6a\x65\x74\x20\x61\x63\x74\x69\x66\x2e\x3c\x2f\x70\x3e\x3c\x2f\x66\x6f\x6e\x74\x3e")) + self.textLabel1.setText(self.__trUtf8("\x3c\x66\x6f\x6e\x74\x20\x73\x69\x7a\x65\x3d\x22\x2b\x32\x22\x3e\x3c\x70\x20\x61\x6c\x69\x67\x6e\x3d\x22\x63\x65\x6e\x74\x65\x72\x22\x3e\x0a\x53\x65\x75\x6c\x65\x73\x20\x6c\x65\x73\x20\x63\x6f\x6d\x6d\x61\x6e\x64\x65\x73\x20\x70\x6c\x61\x63\xc3\xa9\x65\x73\x20\x65\x6e\x74\x72\x65\x20\x3a\x0a\x0a\x44\x45\x42\x55\x54\x20\x2f\x20\x46\x49\x4e\x0a\x0a\x73\x6f\x6e\x74\x20\x61\x63\x74\x69\x76\x65\x73\x0a\x3c\x2f\x70\x3e\x3c\x2f\x66\x6f\x6e\x74\x3e")) self.bSup.setText(self.__tr("&Supprimer")) self.bSup.setAccel(self.__tr("Alt+S")) QToolTip.add(self.bSup,self.__tr("suppression du mot clef")) - self.textLabel1_3.setText(self.__trUtf8("\x3c\x66\x6f\x6e\x74\x20\x73\x69\x7a\x65\x3d\x22\x2b\x32\x22\x3e\x3c\x70\x20\x61\x6c\x69\x67\x6e\x3d\x22\x63\x65\x6e\x74\x65\x72\x22\x3e\x4c\x65\x20\x6e\x6f\x65\x75\x64\x20\x73\xc3\xa9\x6c\x65\x63\x74\x69\x6f\x6e\x6e\xc3\xa9\x20\x6e\x65\x20\x63\x6f\x72\x72\x65\x73\x70\x6f\x6e\x64\x20\x70\x61\x73\x20\xc3\xa0\x20\x75\x6e\x20\x6f\x62\x6a\x65\x74\x20\x61\x63\x74\x69\x66\x2e\x3c\x2f\x70\x3e\x3c\x2f\x66\x6f\x6e\x74\x3e")) def BSupPressed(self): diff --git a/Ui/desInactif.ui b/Ui/desInactif.ui index c5a6b800..1b8f7f32 100644 --- a/Ui/desInactif.ui +++ b/Ui/desInactif.ui @@ -19,103 +19,96 @@ - + DInactif - + - textLabel1_4 - - - - 30 - 240 - 420 - 20 - - - - <font size="+2"><p align="center"> - DEBUT / POURSUITE et FIN -</p></font> - - - - - textLabel1 - - - - 30 - 220 - 420 - 20 - - - - <font size="+2"><p align="center"> + unnamed + + + + textLabel1_3 + + + <font size="+2"><p align="center">Le noeud sélectionné ne correspond pas à un objet actif.</p></font> + + + + + textLabel1 + + + <font size="+2"><p align="center"> Seules les commandes placées entre : -</p></font> - - - - - textLabel1_4_2 - - - - 30 - 260 - 420 - 20 - - - - <font size="+2"><p align="center"> + +DEBUT / FIN + sont actives </p></font> - - - - - bSup - - - - 170 - 430 - 142 - 30 - - - - &Supprimer - - - Alt+S - - - true - - - suppression du mot clef - - - - - textLabel1_3 - - - - 20 - 130 - 420 - 20 - - - - <font size="+2"><p align="center">Le noeud sélectionné ne correspond pas à un objet actif.</p></font> - - + + + + + layout1 + + + + unnamed + + + + spacer2 + + + Horizontal + + + Expanding + + + + 171 + 20 + + + + + + bSup + + + &Supprimer + + + Alt+S + + + true + + + suppression du mot clef + + + + + spacer1 + + + Horizontal + + + Expanding + + + + 171 + 20 + + + + + + diff --git a/Ui/desInclude.py b/Ui/desInclude.py index 00989bb7..fdf345f9 100644 --- a/Ui/desInclude.py +++ b/Ui/desInclude.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'desInclude.ui' # -# Created: mer aoû 29 09:29:35 2007 +# Created: ven nov 9 14:51:34 2007 # by: The PyQt User Interface Compiler (pyuic) 3.13 # # WARNING! All changes made in this file will be lost! @@ -45,93 +45,119 @@ class DInc1(QWidget): self.setMinimumSize(QSize(505,0)) + DInc1Layout = QGridLayout(self,1,1,11,6,"DInc1Layout") self.Commentaire = QLabel(self,"Commentaire") - self.Commentaire.setGeometry(QRect(10,410,490,20)) - self.bSup = QPushButton(self,"bSup") - self.bSup.setGeometry(QRect(320,440,142,30)) - self.bSup.setAutoDefault(1) + DInc1Layout.addWidget(self.Commentaire,1,0) + + layout1 = QHBoxLayout(None,0,6,"layout1") + + self.bHelp = QPushButton(self,"bHelp") + self.bHelp.setAutoDefault(1) + layout1.addWidget(self.bHelp) self.bOk = QPushButton(self,"bOk") - self.bOk.setGeometry(QRect(170,440,142,30)) self.bOk.setAutoDefault(1) self.bOk.setDefault(1) + layout1.addWidget(self.bOk) - self.bHelp = QPushButton(self,"bHelp") - self.bHelp.setGeometry(QRect(10,440,142,30)) - self.bHelp.setAutoDefault(1) + self.bSup = QPushButton(self,"bSup") + self.bSup.setAutoDefault(1) + layout1.addWidget(self.bSup) + + DInc1Layout.addLayout(layout1,2,0) self.TWChoix = QTabWidget(self,"TWChoix") - self.TWChoix.setGeometry(QRect(0,0,500,400)) self.MotClef = QWidget(self.TWChoix,"MotClef") - - self.textLabel1_2 = QLabel(self.MotClef,"textLabel1_2") - self.textLabel1_2.setGeometry(QRect(360,0,50,37)) + MotClefLayout = QGridLayout(self.MotClef,1,1,11,6,"MotClefLayout") self.LBMCPermis = QListBox(self.MotClef,"LBMCPermis") - self.LBMCPermis.setGeometry(QRect(10,40,220,290)) self.LBMCPermis.setMinimumSize(QSize(0,0)) - self.LBRegles = QListBox(self.MotClef,"LBRegles") - self.LBRegles.setGeometry(QRect(260,40,230,290)) + MotClefLayout.addWidget(self.LBMCPermis,1,0) self.textLabel1 = QLabel(self.MotClef,"textLabel1") - self.textLabel1.setGeometry(QRect(50,10,120,20)) self.textLabel1.setMinimumSize(QSize(0,0)) + + MotClefLayout.addWidget(self.textLabel1,0,0) + + self.LBRegles = QListBox(self.MotClef,"LBRegles") + + MotClefLayout.addWidget(self.LBRegles,1,1) + + self.textLabel1_2 = QLabel(self.MotClef,"textLabel1_2") + + MotClefLayout.addWidget(self.textLabel1_2,0,1) self.TWChoix.insertTab(self.MotClef,QString("")) self.Commande = QWidget(self.TWChoix,"Commande") + CommandeLayout = QGridLayout(self.Commande,1,1,11,6,"CommandeLayout") self.textLabel6 = QLabel(self.Commande,"textLabel6") - self.textLabel6.setGeometry(QRect(10,60,60,30)) - self.textLabel4 = QLabel(self.Commande,"textLabel4") - self.textLabel4.setGeometry(QRect(90,340,300,30)) + CommandeLayout.addWidget(self.textLabel6,1,0) self.LBNouvCommande = QListBox(self.Commande,"LBNouvCommande") - self.LBNouvCommande.setGeometry(QRect(50,100,410,240)) + + CommandeLayout.addMultiCellWidget(self.LBNouvCommande,2,2,0,3) self.buttonGroup1 = QButtonGroup(self.Commande,"buttonGroup1") - self.buttonGroup1.setGeometry(QRect(300,20,151,70)) self.RBGroupe = QRadioButton(self.buttonGroup1,"RBGroupe") self.RBGroupe.setGeometry(QRect(20,40,101,20)) self.RBalpha = QRadioButton(self.buttonGroup1,"RBalpha") - self.RBalpha.setGeometry(QRect(20,20,101,20)) + self.RBalpha.setGeometry(QRect(20,20,120,20)) self.RBalpha.setChecked(1) - self.LEFiltre = QLineEdit(self.Commande,"LEFiltre") - self.LEFiltre.setGeometry(QRect(50,60,160,30)) + CommandeLayout.addMultiCellWidget(self.buttonGroup1,0,1,3,3) self.textLabel1_4 = QLabel(self.Commande,"textLabel1_4") - self.textLabel1_4.setGeometry(QRect(50,20,171,21)) + + CommandeLayout.addMultiCellWidget(self.textLabel1_4,0,0,0,1) + + self.textLabel4 = QLabel(self.Commande,"textLabel4") + + CommandeLayout.addMultiCellWidget(self.textLabel4,3,3,0,3) self.BNext = QToolButton(self.Commande,"BNext") - self.BNext.setGeometry(QRect(220,60,30,31)) self.BNext.setIconSet(QIconSet(self.image0)) + + CommandeLayout.addWidget(self.BNext,1,2) + + self.LEFiltre = QLineEdit(self.Commande,"LEFiltre") + self.LEFiltre.setMinimumSize(QSize(160,30)) + + CommandeLayout.addWidget(self.LEFiltre,1,1) self.TWChoix.insertTab(self.Commande,QString("")) 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(70,50,350,41)) + self.textLabel1_3.setGeometry(QRect(30,40,440,41)) self.LENomFichier = QLineEdit(self.TabPage,"LENomFichier") - self.LENomFichier.setGeometry(QRect(18,127,450,30)) - - self.BBrowse = QPushButton(self.TabPage,"BBrowse") - self.BBrowse.setGeometry(QRect(288,306,161,41)) + 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.TWChoix.insertTab(self.TabPage,QString("")) self.TabPage_2 = QWidget(self.TWChoix,"TabPage_2") + TabPageLayout = QGridLayout(self.TabPage_2,1,1,11,6,"TabPageLayout") self.textLabel1_5 = QLabel(self.TabPage_2,"textLabel1_5") - self.textLabel1_5.setGeometry(QRect(88,96,290,131)) + + TabPageLayout.addWidget(self.textLabel1_5,0,0) self.TWChoix.insertTab(self.TabPage_2,QString("")) + DInc1Layout.addWidget(self.TWChoix,0,0) + self.languageChange() self.resize(QSize(521,499).expandedTo(self.minimumSizeHint())) @@ -152,29 +178,29 @@ class DInc1(QWidget): def languageChange(self): self.setCaption(self.__tr("DMacro")) 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")) - 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.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.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.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")) 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")) self.buttonGroup1.setTitle(self.__tr("Affichage")) 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.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) QToolTip.add(self.BNext,self.__tr("affiche la prochaine occurence")) self.TWChoix.changeTab(self.Commande,self.__tr("Nouvelle Commande")) - self.textLabel1_3.setText(self.__tr("La commande INCLUDE requiert un nom de Fichier :")) self.BBrowse.setText(self.__tr("Edit")) + self.textLabel1_3.setText(self.__tr("La commande INCLUDE requiert un nom de 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")) diff --git a/Ui/desInclude.ui b/Ui/desInclude.ui index e37c1499..18c426ac 100644 --- a/Ui/desInclude.ui +++ b/Ui/desInclude.ui @@ -21,424 +21,346 @@ DMacro - + - Commentaire + unnamed - - - 10 - 410 - 490 - 20 - - - - - - - - - bSup - - - - 320 - 440 - 142 - 30 - - - - &Supprimer - - - Alt+S - - - true - - - suppression du mot clef - - - - - bOk - - - - 170 - 440 - 142 - 30 - - - - &Valider - - - Shift+A, Alt+A, Alt+A, Alt+A - - - true - - - true - - - validation de la saisie - - - - - bHelp - - - - 10 - 440 - 142 - 30 - - - - &Documentation - - - Alt+D - - - true - - - affichage documentation aster - - - - - TWChoix - - - - 0 - 0 - 500 - 400 - - - + - MotClef + Commentaire + + + - - Ajouter Mot-Clef - - - - textLabel1_2 - - - - 360 - 0 - 50 - 37 - - - - <h3><p align="center"><u><b>Régles</b></u></p></h3> - - - - - LBMCPermis - - - - 10 - 40 - 220 - 290 - - - - - 0 - 0 - - - - - - LBRegles - - - - 260 - 40 - 230 - 290 - - - - - - textLabel1 - - - - 50 - 10 - 120 - 20 - - - - - 0 - 0 - - - - <h3><p align="center"><u><b>Mots Clefs Permis</b></u></p></h3> - - - + - Commande + layout1 - - Nouvelle Commande - - + - textLabel6 - - - - 10 - 60 - 60 - 30 - - - - Filtre + unnamed - - + + + bHelp + + + &Documentation + + + Alt+D + + + true + + + affichage documentation aster + + + + + bOk + + + &Valider + + + Shift+A, Alt+A, Alt+A, Alt+A + + + true + + + true + + + validation de la saisie + + + + + bSup + + + &Supprimer + + + Alt+S + + + true + + + suppression du mot clef + + + + + + + TWChoix + + - textLabel4 - - - - 90 - 340 - 300 - 30 - - - - La commande choisie sera ajoutée APRES la commande courante + MotClef + + Ajouter Mot-Clef + + + + unnamed + + + + LBMCPermis + + + + 0 + 0 + + + + + + textLabel1 + + + + 0 + 0 + + + + <h3><p align="center"><u><b>Mots Clefs Permis</b></u></p></h3> + + + + + LBRegles + + + + + textLabel1_2 + + + <h3><p align="center"><u><b>Régles</b></u></p></h3> + + + - + - LBNouvCommande - - - - 50 - 100 - 410 - 240 - + Commande + + Nouvelle Commande + + + + unnamed + + + + textLabel6 + + + Filtre + + + + + LBNouvCommande + + + + + buttonGroup1 + + + Affichage + + + + RBGroupe + + + + 20 + 40 + 101 + 20 + + + + par groupe + + + + + RBalpha + + + + 20 + 20 + 120 + 20 + + + + alphabétique + + + true + + + + + + textLabel1_4 + + + <b><u>Commandes :</u></b> + + + + + textLabel4 + + + La commande choisie sera ajoutée APRES la commande courante + + + + + BNext + + + + + + image0 + + + affiche la prochaine occurence + + + + + LEFiltre + + + + 160 + 30 + + + + - + - buttonGroup1 + TabPage - - - 300 - 20 - 151 - 70 - - - - Affichage - - + + Fichier Include + + - RBGroupe + BBrowse - 20 - 40 - 101 - 20 + 288 + 306 + 161 + 41 + + + 0 + 0 + 0 + 0 + + - par groupe + Edit - + - RBalpha + textLabel1_3 - 20 - 20 - 101 - 20 + 30 + 40 + 440 + 41 - alphabétique + <font size="+1">La commande INCLUDE requiert un nom de Fichier :</font> - - true + + + + LENomFichier + + + + 18 + 117 + 450 + 40 + + + + + 0 + 0 + 0 + 0 + + + + + 450 + 40 + - - - LEFiltre - - - - 50 - 60 - 160 - 30 - - - - + - textLabel1_4 + TabPage - - - 50 - 20 - 171 - 21 - - - - <b><u>Commandes :</u></b> - - - - - BNext - - - - 220 - 60 - 30 - 31 - - - - - - - image0 - - - affiche la prochaine occurence - - - - - - TabPage - - - Fichier Include - - - - textLabel1_3 - - - - 70 - 50 - 350 - 41 - - - - <font size="+1">La commande INCLUDE requiert un nom de Fichier :</font> - - - - - LENomFichier - - - - 18 - 127 - 450 - 30 - - - - - - BBrowse - - - - 288 - 306 - 161 - 41 - - - - Edit - - - - - - TabPage - - - Fichier Inc - - - - textLabel1_5 - - - - 88 - 96 - 290 - 131 - - - - <font size="+1"><p align="center">La commande INCLUDE n'a pas de fichier associé. + + Fichier Inc + + + + unnamed + + + + textLabel1_5 + + + <font size="+1"><p align="center">La commande INCLUDE n'a pas de fichier associé. Il faut d'abord choisir un numéro d'unité</p></font> - + + + - + diff --git a/Ui/desListeParam.py b/Ui/desListeParam.py index b2fbb269..8a80b977 100644 --- a/Ui/desListeParam.py +++ b/Ui/desListeParam.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'desListeParam.ui' # -# Created: ven oct 19 10:25:33 2007 +# Created: ven nov 9 14:51:34 2007 # by: The PyQt User Interface Compiler (pyuic) 3.13 # # WARNING! All changes made in this file will be lost! @@ -19,9 +19,11 @@ class DLisParam(QWidget): self.setName("DLisParam") + DLisParamLayout = QGridLayout(self,1,1,11,6,"DLisParamLayout") self.LBParam = QListBox(self,"LBParam") - self.LBParam.setGeometry(QRect(0,0,410,390)) + + DLisParamLayout.addWidget(self.LBParam,0,0) self.languageChange() diff --git a/Ui/desListeParam.ui b/Ui/desListeParam.ui index 092d5ca0..25f30d85 100644 --- a/Ui/desListeParam.ui +++ b/Ui/desListeParam.ui @@ -15,19 +15,16 @@ Sélection de paramétres - + - LBParam + unnamed - - - 0 - 0 - 410 - 390 - - - + + + LBParam + + + diff --git a/Ui/desMCFact.py b/Ui/desMCFact.py index cc10c426..4afda2ab 100644 --- a/Ui/desMCFact.py +++ b/Ui/desMCFact.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'desMCFact.ui' # -# Created: mer mar 21 12:08:55 2007 +# Created: ven nov 9 14:51:34 2007 # by: The PyQt User Interface Compiler (pyuic) 3.13 # # WARNING! All changes made in this file will be lost! @@ -20,46 +20,58 @@ class DMCFact(QWidget): self.setMinimumSize(QSize(505,0)) + DMCFactLayout = QGridLayout(self,1,1,11,6,"DMCFactLayout") - self.Commentaire = QLabel(self,"Commentaire") - self.Commentaire.setGeometry(QRect(10,410,490,20)) + layout1 = QHBoxLayout(None,0,6,"layout1") - self.bSup = QPushButton(self,"bSup") - self.bSup.setGeometry(QRect(320,440,142,30)) - self.bSup.setAutoDefault(1) + self.bHelp = QPushButton(self,"bHelp") + self.bHelp.setAutoDefault(1) + layout1.addWidget(self.bHelp) self.bOk = QPushButton(self,"bOk") - self.bOk.setGeometry(QRect(170,440,142,30)) self.bOk.setAutoDefault(1) self.bOk.setDefault(1) + layout1.addWidget(self.bOk) - self.bHelp = QPushButton(self,"bHelp") - self.bHelp.setGeometry(QRect(10,440,142,30)) - self.bHelp.setAutoDefault(1) + self.bSup = QPushButton(self,"bSup") + self.bSup.setAutoDefault(1) + layout1.addWidget(self.bSup) - self.TWChoix = QTabWidget(self,"TWChoix") - self.TWChoix.setGeometry(QRect(0,0,500,400)) + DMCFactLayout.addLayout(layout1,2,0) - self.MotClef = QWidget(self.TWChoix,"MotClef") + self.Commentaire = QLabel(self,"Commentaire") - self.textLabel1_2 = QLabel(self.MotClef,"textLabel1_2") - self.textLabel1_2.setGeometry(QRect(360,0,50,37)) + DMCFactLayout.addWidget(self.Commentaire,1,0) - self.LBRegles = QListBox(self.MotClef,"LBRegles") - self.LBRegles.setGeometry(QRect(260,40,230,290)) + self.TWChoix = QTabWidget(self,"TWChoix") + + self.MotClef = QWidget(self.TWChoix,"MotClef") + MotClefLayout = QGridLayout(self.MotClef,1,1,11,6,"MotClefLayout") self.textLabel1 = QLabel(self.MotClef,"textLabel1") - self.textLabel1.setGeometry(QRect(50,10,120,20)) self.textLabel1.setMinimumSize(QSize(0,0)) + MotClefLayout.addWidget(self.textLabel1,0,0) + self.LBMCPermis = QListBox(self.MotClef,"LBMCPermis") - self.LBMCPermis.setGeometry(QRect(10,40,220,290)) self.LBMCPermis.setMinimumSize(QSize(0,0)) + + MotClefLayout.addWidget(self.LBMCPermis,1,0) + + self.LBRegles = QListBox(self.MotClef,"LBRegles") + + MotClefLayout.addWidget(self.LBRegles,1,1) + + self.textLabel1_2 = QLabel(self.MotClef,"textLabel1_2") + + MotClefLayout.addWidget(self.textLabel1_2,0,1) self.TWChoix.insertTab(self.MotClef,QString("")) + DMCFactLayout.addWidget(self.TWChoix,0,0) + self.languageChange() - self.resize(QSize(521,499).expandedTo(self.minimumSizeHint())) + self.resize(QSize(511,499).expandedTo(self.minimumSizeHint())) self.clearWState(Qt.WState_Polished) self.connect(self.bSup,SIGNAL("pressed()"),self.BSupPressed) @@ -68,18 +80,18 @@ class DMCFact(QWidget): def languageChange(self): self.setCaption(self.__tr("DMacro")) - 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")) - 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.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.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.Commentaire.setText(QString.null) 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")) diff --git a/Ui/desMCFact.ui b/Ui/desMCFact.ui index 6e7714a6..9cf1a7fe 100644 --- a/Ui/desMCFact.ui +++ b/Ui/desMCFact.ui @@ -8,7 +8,7 @@ 0 0 - 521 + 511 499 @@ -21,191 +21,139 @@ DMacro - + - Commentaire + unnamed - - - 10 - 410 - 490 - 20 - - - - - - - - - bSup - - - - 320 - 440 - 142 - 30 - - - - &Supprimer - - - Alt+S - - - true - - - suppression du mot clef - - - - - bOk - - - - 170 - 440 - 142 - 30 - - - - &Valider - - - Shift+A, Alt+A, Alt+A, Alt+A - - - true - - - true - - - validation de la saisie - - - - - bHelp - - - - 10 - 440 - 142 - 30 - - - - &Documentation - - - Alt+D - - - true - - - affichage documentation aster - - - - - TWChoix - - - - 0 - 0 - 500 - 400 - - - + - MotClef + layout1 - - Ajouter Mot-Clef - - - - textLabel1_2 - - - - 360 - 0 - 50 - 37 - - - - <h3><p align="center"><u><b>Régles</b></u></p></h3> - - - - - LBRegles - - - - 260 - 40 - 230 - 290 - - - - + - LBMCPermis - - - - 10 - 40 - 220 - 290 - + unnamed - - - 0 - 0 - - - - + + + bHelp + + + &Documentation + + + Alt+D + + + true + + + affichage documentation aster + + + + + bOk + + + &Valider + + + Shift+A, Alt+A, Alt+A, Alt+A + + + true + + + true + + + validation de la saisie + + + + + bSup + + + &Supprimer + + + Alt+S + + + true + + + suppression du mot clef + + + + + + + Commentaire + + + + + + + + TWChoix + + - textLabel1 - - - - 50 - 10 - 140 - 20 - - - - - 0 - 0 - - - - <h3><p align="center"><u><b>Mots Clefs Permis</b></u></p></h3> + MotClef + + Ajouter Mot-Clef + + + + unnamed + + + + textLabel1 + + + + 0 + 0 + + + + <h3><p align="center"><u><b>Mots Clefs Permis</b></u></p></h3> + + + + + LBMCPermis + + + + 0 + 0 + + + + + + LBRegles + + + + + textLabel1_2 + + + <h3><p align="center"><u><b>Régles</b></u></p></h3> + + + - + diff --git a/Ui/desMCListAjout.py b/Ui/desMCListAjout.py index 61594a59..53c427ba 100644 --- a/Ui/desMCListAjout.py +++ b/Ui/desMCListAjout.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'desMCListAjout.ui' # -# Created: ven mar 23 12:13:13 2007 +# Created: ven nov 9 14:51:34 2007 # by: The PyQt User Interface Compiler (pyuic) 3.13 # # WARNING! All changes made in this file will be lost! @@ -20,36 +20,63 @@ class DMCListAjout(QWidget): self.setMinimumSize(QSize(350,0)) + DMCListAjoutLayout = QGridLayout(self,1,1,11,6,"DMCListAjoutLayout") - self.bSup = QPushButton(self,"bSup") - self.bSup.setGeometry(QRect(310,420,142,30)) - self.bSup.setAutoDefault(1) + layout1 = QHBoxLayout(None,0,6,"layout1") + + self.bHelp = QPushButton(self,"bHelp") + self.bHelp.setAutoDefault(1) + layout1.addWidget(self.bHelp) self.bOk = QPushButton(self,"bOk") - self.bOk.setGeometry(QRect(160,420,142,30)) self.bOk.setAutoDefault(1) self.bOk.setDefault(1) + layout1.addWidget(self.bOk) - self.bHelp = QPushButton(self,"bHelp") - self.bHelp.setGeometry(QRect(10,420,142,30)) - self.bHelp.setAutoDefault(1) + self.bSup = QPushButton(self,"bSup") + self.bSup.setAutoDefault(1) + layout1.addWidget(self.bSup) + + DMCListAjoutLayout.addLayout(layout1,10,0) + + self.textLabel1 = QLabel(self,"textLabel1") + + DMCListAjoutLayout.addWidget(self.textLabel1,1,0) + + self.textLabel1_2 = QLabel(self,"textLabel1_2") + + DMCListAjoutLayout.addWidget(self.textLabel1_2,2,0) + + layout9 = QHBoxLayout(None,0,6,"layout9") + spacer4 = QSpacerItem(60,21,QSizePolicy.Expanding,QSizePolicy.Minimum) + layout9.addItem(spacer4) self.bAjout = QPushButton(self,"bAjout") - self.bAjout.setGeometry(QRect(160,260,142,30)) self.bAjout.setAutoDefault(1) self.bAjout.setDefault(1) + layout9.addWidget(self.bAjout) + spacer2 = QSpacerItem(80,21,QSizePolicy.Expanding,QSizePolicy.Minimum) + layout9.addItem(spacer2) - self.textLabel1_2_2 = QLabel(self,"textLabel1_2_2") - self.textLabel1_2_2.setGeometry(QRect(180,170,89,33)) + DMCListAjoutLayout.addLayout(layout9,8,0) + spacer1 = QSpacerItem(21,40,QSizePolicy.Minimum,QSizePolicy.Expanding) + DMCListAjoutLayout.addItem(spacer1,9,0) - self.textLabel1 = QLabel(self,"textLabel1") - self.textLabel1.setGeometry(QRect(160,50,140,36)) + self.textLabel1_2_2 = QLabel(self,"textLabel1_2_2") - self.textLabel1_2 = QLabel(self,"textLabel1_2") - self.textLabel1_2.setGeometry(QRect(170,80,120,20)) + DMCListAjoutLayout.addWidget(self.textLabel1_2_2,6,0) + spacer5 = QSpacerItem(20,20,QSizePolicy.Minimum,QSizePolicy.Expanding) + DMCListAjoutLayout.addItem(spacer5,7,0) self.MCFacteur = QLabel(self,"MCFacteur") - self.MCFacteur.setGeometry(QRect(200,120,50,20)) + + DMCListAjoutLayout.addWidget(self.MCFacteur,4,0) + spacer6 = QSpacerItem(21,31,QSizePolicy.Minimum,QSizePolicy.Expanding) + DMCListAjoutLayout.addItem(spacer6,5,0) + spacer7 = QSpacerItem(21,51,QSizePolicy.Minimum,QSizePolicy.Expanding) + DMCListAjoutLayout.addItem(spacer7,3,0) + spacer8 = QSpacerItem(41,51,QSizePolicy.Minimum,QSizePolicy.Expanding) + DMCListAjoutLayout.addItem(spacer8,0,0) self.languageChange() @@ -63,21 +90,21 @@ class DMCListAjout(QWidget): def languageChange(self): self.setCaption(self.__tr("Form1")) - 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.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.textLabel1.setText(self.__tr("

Pour ajouter une autre occurrence

")) + self.textLabel1_2.setText(self.__tr("

du mot clef-facteur

")) self.bAjout.setText(self.__tr("&Ajouter")) self.bAjout.setAccel(self.__tr("Alt+A")) QToolTip.add(self.bAjout,self.__tr("validation de la saisie")) self.textLabel1_2_2.setText(self.__tr("

cliquez ci-dessous

")) - self.textLabel1.setText(self.__tr("

Pour ajouter une autre occurrence

")) - self.textLabel1_2.setText(self.__tr("

du mot clef-facteur

")) self.MCFacteur.setText(self.__tr("

AFFE

")) diff --git a/Ui/desMCListAjout.ui b/Ui/desMCListAjout.ui index 935c7bd7..7f1fadee 100644 --- a/Ui/desMCListAjout.ui +++ b/Ui/desMCListAjout.ui @@ -21,176 +21,256 @@ Form1 - + - bSup - - - - 310 - 420 - 142 - 30 - - - - &Supprimer - - - Alt+S - - - true - - - suppression du mot clef - - - - - bOk - - - - 160 - 420 - 142 - 30 - - - - &Valider - - - Shift+A, Alt+A, Alt+A, Alt+A - - - true - - - true - - - validation de la saisie - - - - - bHelp - - - - 10 - 420 - 142 - 30 - - - - &Documentation - - - Alt+D - - - true - - - affichage documentation aster - - - - - bAjout - - - - 160 - 260 - 142 - 30 - - - - &Ajouter - - - Alt+A - - - true - - - true - - - validation de la saisie - - - - - textLabel1_2_2 - - - - 180 - 170 - 89 - 33 - - - - <p align="center"><font size="+1">cliquez ci-dessous</font> </p> - - - - - textLabel1 - - - - 160 - 50 - 140 - 36 - - - - <p align="center"><font size="+1">Pour ajouter une autre occurrence</font></p> - - - - - textLabel1_2 - - - - 170 - 80 - 120 - 20 - - - - <p align="center"><font size="+1">du mot clef-facteur</font> </p> - - - - - MCFacteur - - - - 200 - 120 - 50 - 20 - - - - <p align="center">AFFE</p> - - + unnamed + + + + layout1 + + + + unnamed + + + + bHelp + + + &Documentation + + + Alt+D + + + true + + + affichage documentation aster + + + + + bOk + + + &Valider + + + Shift+A, Alt+A, Alt+A, Alt+A + + + true + + + true + + + validation de la saisie + + + + + bSup + + + &Supprimer + + + Alt+S + + + true + + + suppression du mot clef + + + + + + + textLabel1 + + + <p align="center"><font size="+1">Pour ajouter une autre occurrence</font></p> + + + + + textLabel1_2 + + + <p align="center"><font size="+1">du mot clef-facteur</font> </p> + + + + + layout9 + + + + unnamed + + + + spacer4 + + + Horizontal + + + Expanding + + + + 60 + 21 + + + + + + bAjout + + + &Ajouter + + + Alt+A + + + true + + + true + + + validation de la saisie + + + + + spacer2 + + + Horizontal + + + Expanding + + + + 80 + 21 + + + + + + + + spacer1 + + + Vertical + + + Expanding + + + + 21 + 40 + + + + + + textLabel1_2_2 + + + <p align="center"><font size="+1">cliquez ci-dessous</font> </p> + + + + + spacer5 + + + Vertical + + + Expanding + + + + 20 + 20 + + + + + + MCFacteur + + + <p align="center">AFFE</p> + + + + + spacer6 + + + Vertical + + + Expanding + + + + 21 + 31 + + + + + + spacer7 + + + Vertical + + + Expanding + + + + 21 + 51 + + + + + + spacer8 + + + Vertical + + + Expanding + + + + 41 + 51 + + + + diff --git a/Ui/desMacro.py b/Ui/desMacro.py index 515791a1..79e74e04 100644 --- a/Ui/desMacro.py +++ b/Ui/desMacro.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'desMacro.ui' # -# Created: mar oct 30 14:42:14 2007 +# Created: ven nov 9 14:51:34 2007 # by: The PyQt User Interface Compiler (pyuic) 3.13 # # WARNING! All changes made in this file will be lost! @@ -45,73 +45,92 @@ class DMacro(QWidget): self.setMinimumSize(QSize(505,0)) + DMacroLayout = QGridLayout(self,1,1,11,6,"DMacroLayout") - self.Commentaire = QLabel(self,"Commentaire") - self.Commentaire.setGeometry(QRect(10,410,490,20)) + layout1 = QHBoxLayout(None,0,6,"layout1") - self.bSup = QPushButton(self,"bSup") - self.bSup.setGeometry(QRect(320,440,142,30)) - self.bSup.setAutoDefault(1) + self.bHelp = QPushButton(self,"bHelp") + self.bHelp.setAutoDefault(1) + layout1.addWidget(self.bHelp) self.bOk = QPushButton(self,"bOk") - self.bOk.setGeometry(QRect(170,440,142,30)) self.bOk.setAutoDefault(1) self.bOk.setDefault(1) + layout1.addWidget(self.bOk) - self.bHelp = QPushButton(self,"bHelp") - self.bHelp.setGeometry(QRect(10,440,142,30)) - self.bHelp.setAutoDefault(1) + self.bSup = QPushButton(self,"bSup") + self.bSup.setAutoDefault(1) + layout1.addWidget(self.bSup) + + DMacroLayout.addLayout(layout1,2,0) + + self.Commentaire = QLabel(self,"Commentaire") + + DMacroLayout.addWidget(self.Commentaire,1,0) self.TWChoix = QTabWidget(self,"TWChoix") - self.TWChoix.setGeometry(QRect(0,0,500,400)) self.MotClef = QWidget(self.TWChoix,"MotClef") - - self.textLabel1_2 = QLabel(self.MotClef,"textLabel1_2") - self.textLabel1_2.setGeometry(QRect(360,0,50,37)) + MotClefLayout = QGridLayout(self.MotClef,1,1,11,6,"MotClefLayout") self.LBMCPermis = QListBox(self.MotClef,"LBMCPermis") - self.LBMCPermis.setGeometry(QRect(10,40,220,290)) self.LBMCPermis.setMinimumSize(QSize(0,0)) + MotClefLayout.addWidget(self.LBMCPermis,1,0) + self.LBRegles = QListBox(self.MotClef,"LBRegles") - self.LBRegles.setGeometry(QRect(260,40,230,290)) + + MotClefLayout.addWidget(self.LBRegles,1,1) + + self.textLabel1_2 = QLabel(self.MotClef,"textLabel1_2") + + MotClefLayout.addWidget(self.textLabel1_2,0,1) self.textLabel1 = QLabel(self.MotClef,"textLabel1") - self.textLabel1.setGeometry(QRect(50,10,120,20)) self.textLabel1.setMinimumSize(QSize(0,0)) + + MotClefLayout.addWidget(self.textLabel1,0,0) self.TWChoix.insertTab(self.MotClef,QString("")) self.Commande = QWidget(self.TWChoix,"Commande") - - self.textLabel6 = QLabel(self.Commande,"textLabel6") - self.textLabel6.setGeometry(QRect(10,60,60,30)) - - self.textLabel4 = QLabel(self.Commande,"textLabel4") - self.textLabel4.setGeometry(QRect(90,340,300,30)) + CommandeLayout = QGridLayout(self.Commande,1,1,11,6,"CommandeLayout") self.LBNouvCommande = QListBox(self.Commande,"LBNouvCommande") - self.LBNouvCommande.setGeometry(QRect(50,100,410,240)) - self.buttonGroup1 = QButtonGroup(self.Commande,"buttonGroup1") - self.buttonGroup1.setGeometry(QRect(300,20,151,70)) + CommandeLayout.addMultiCellWidget(self.LBNouvCommande,2,2,0,3) - self.RBGroupe = QRadioButton(self.buttonGroup1,"RBGroupe") - self.RBGroupe.setGeometry(QRect(20,40,101,20)) + self.buttonGroup1 = QButtonGroup(self.Commande,"buttonGroup1") self.RBalpha = QRadioButton(self.buttonGroup1,"RBalpha") - self.RBalpha.setGeometry(QRect(20,20,101,20)) + self.RBalpha.setGeometry(QRect(20,20,120,20)) self.RBalpha.setChecked(1) - self.LEFiltre = QLineEdit(self.Commande,"LEFiltre") - self.LEFiltre.setGeometry(QRect(50,60,160,30)) + self.RBGroupe = QRadioButton(self.buttonGroup1,"RBGroupe") + self.RBGroupe.setGeometry(QRect(20,40,120,20)) + + CommandeLayout.addMultiCellWidget(self.buttonGroup1,0,1,3,3) self.textLabel1_4 = QLabel(self.Commande,"textLabel1_4") - self.textLabel1_4.setGeometry(QRect(50,20,171,21)) + + CommandeLayout.addMultiCellWidget(self.textLabel1_4,0,0,0,1) self.BNext = QToolButton(self.Commande,"BNext") - self.BNext.setGeometry(QRect(220,60,30,31)) self.BNext.setIconSet(QIconSet(self.image0)) + + CommandeLayout.addWidget(self.BNext,1,2) + + self.textLabel6 = QLabel(self.Commande,"textLabel6") + + CommandeLayout.addWidget(self.textLabel6,1,0) + + self.textLabel4 = QLabel(self.Commande,"textLabel4") + + CommandeLayout.addMultiCellWidget(self.textLabel4,3,3,0,3) + + self.LEFiltre = QLineEdit(self.Commande,"LEFiltre") + self.LEFiltre.setMinimumSize(QSize(160,30)) + + CommandeLayout.addWidget(self.LEFiltre,1,1) self.TWChoix.insertTab(self.Commande,QString("")) self.TabPage = QWidget(self.TWChoix,"TabPage") @@ -119,22 +138,24 @@ class DMacro(QWidget): self.groupBox1_2 = QGroupBox(self.TabPage,"groupBox1_2") self.groupBox1_2.setGeometry(QRect(0,0,520,380)) - self.textLabel1_3_2_3 = QLabel(self.groupBox1_2,"textLabel1_3_2_3") - self.textLabel1_3_2_3.setGeometry(QRect(80,170,82,31)) - self.textLabel3_2 = QLabel(self.groupBox1_2,"textLabel3_2") - self.textLabel3_2.setGeometry(QRect(80,200,230,31)) + self.textLabel3_2.setGeometry(QRect(10,230,320,31)) + + self.typeConcept = QLabel(self.groupBox1_2,"typeConcept") + self.typeConcept.setGeometry(QRect(360,230,130,31)) + + self.textLabel1_3_2_3 = QLabel(self.groupBox1_2,"textLabel1_3_2_3") + self.textLabel1_3_2_3.setGeometry(QRect(20,200,160,31)) self.textLabel1_3_3 = QLabel(self.groupBox1_2,"textLabel1_3_3") - self.textLabel1_3_3.setGeometry(QRect(80,50,82,31)) + self.textLabel1_3_3.setGeometry(QRect(20,50,150,31)) self.LENomConcept = QLineEdit(self.groupBox1_2,"LENomConcept") - self.LENomConcept.setGeometry(QRect(80,110,310,30)) - - self.typeConcept = QLabel(self.groupBox1_2,"typeConcept") - self.typeConcept.setGeometry(QRect(320,200,100,31)) + self.LENomConcept.setGeometry(QRect(20,80,440,30)) self.TWChoix.insertTab(self.TabPage,QString("")) + DMacroLayout.addWidget(self.TWChoix,0,0) + self.languageChange() self.resize(QSize(521,499).expandedTo(self.minimumSizeHint())) @@ -153,33 +174,33 @@ class DMacro(QWidget): def languageChange(self): self.setCaption(self.__tr("DMacro")) - 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")) - 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.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.Commentaire.setText(QString.null) 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.textLabel1.setText(self.__tr("

Mots Clefs Permis

")) self.TWChoix.changeTab(self.MotClef,self.__tr("Ajouter Mot-Clef")) - 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")) self.buttonGroup1.setTitle(self.__tr("Affichage")) - 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.RBGroupe.setText(self.__tr("par groupe")) self.textLabel1_4.setText(self.__tr("Commandes :")) self.BNext.setText(QString.null) 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")) self.TWChoix.changeTab(self.Commande,self.__tr("Nouvelle Commande")) self.groupBox1_2.setTitle(self.__tr("Concept")) - self.textLabel1_3_2_3.setText(self.__tr("Type du concept :")) self.textLabel3_2.setText(self.__trUtf8("\x4c\x27\x6f\x70\xc3\xa9\x72\x61\x74\x65\x75\x72\x20\x63\x6f\x75\x72\x61\x6e\x74\x20\x72\x65\x74\x6f\x75\x72\x6e\x65\x20\x75\x6e\x20\x63\x6f\x6e\x63\x65\x70\x74\x20\x64\x65\x20\x74\x79\x70\x65\x20\x3a")) - self.textLabel1_3_3.setText(self.__tr("Nom du concept :")) self.typeConcept.setText(self.__tr("TypeDuConcept")) + self.textLabel1_3_2_3.setText(self.__tr("Type du concept :")) + self.textLabel1_3_3.setText(self.__tr("Nom du concept :")) self.TWChoix.changeTab(self.TabPage,self.__tr("Nommer Concept")) diff --git a/Ui/desMacro.ui b/Ui/desMacro.ui index d85115c5..8f23269c 100644 --- a/Ui/desMacro.ui +++ b/Ui/desMacro.ui @@ -21,447 +21,350 @@ DMacro - + - Commentaire + unnamed - - - 10 - 410 - 490 - 20 - - - - - - - - - bSup - - - - 320 - 440 - 142 - 30 - - - - &Supprimer - - - Alt+S - - - true - - - suppression du mot clef - - - - - bOk - - - - 170 - 440 - 142 - 30 - - - - &Valider - - - Shift+A, Alt+A, Alt+A, Alt+A - - - true - - - true - - - validation de la saisie - - - - - bHelp - - - - 10 - 440 - 142 - 30 - - - - &Documentation - - - Alt+D - - - true - - - affichage documentation aster - - - - - TWChoix - - - - 0 - 0 - 500 - 400 - - - - - MotClef - - - Ajouter Mot-Clef - - - - textLabel1_2 - - - - 360 - 0 - 50 - 37 - - - - <h3><p align="center"><u><b>Régles</b></u></p></h3> - - - - - LBMCPermis - - - - 10 - 40 - 220 - 290 - - - - - 0 - 0 - - - - - - LBRegles - - - - 260 - 40 - 230 - 290 - - - - - - textLabel1 - - - - 50 - 10 - 120 - 20 - - - - - 0 - 0 - - - - <h3><p align="center"><u><b>Mots Clefs Permis</b></u></p></h3> - - - - + - Commande + layout1 - - Nouvelle Commande - - - - textLabel6 - - - - 10 - 60 - 60 - 30 - - - - Filtre - - - - - textLabel4 - - - - 90 - 340 - 300 - 30 - - - - La commande choisie sera ajoutée APRES la commande courante - - - - - LBNouvCommande - - - - 50 - 100 - 410 - 240 - - - - + - buttonGroup1 - - - - 300 - 20 - 151 - 70 - - - - Affichage + unnamed - + - RBGroupe - - - - 20 - 40 - 101 - 20 - + bHelp - par groupe + &Documentation + + + Alt+D + + + true + + + affichage documentation aster - + - RBalpha - - - - 20 - 20 - 101 - 20 - + bOk - alphabétique + &Valider - - true + + Shift+A, Alt+A, Alt+A, Alt+A - - - - - LEFiltre - - - - 50 - 60 - 160 - 30 - - - - - - textLabel1_4 - - - - 50 - 20 - 171 - 21 - - - - <b><u>Commandes :</u></b> - - - - - BNext - - - - 220 - 60 - 30 - 31 - - - - - - - image0 - - - affiche la prochaine occurence - - - - - - TabPage - - - Nommer Concept - - - - groupBox1_2 - - - - 0 - 0 - 520 - 380 - - - - Concept - - - - textLabel1_3_2_3 + + true - - - 80 - 170 - 82 - 31 - + + true - - <u>Type du concept :</u> + + validation de la saisie - + - textLabel3_2 - - - - 80 - 200 - 230 - 31 - + bSup - L'opérateur courant retourne un concept de type : + &Supprimer - - - - textLabel1_3_3 + + Alt+S - - - 80 - 50 - 82 - 31 - + + true - - <u>Nom du concept :</u> + + suppression du mot clef - + + + + + Commentaire + + + + + + + + TWChoix + + + + MotClef + + + Ajouter Mot-Clef + + - LENomConcept + unnamed - - - 80 - 110 - 310 - 30 - + + + LBMCPermis + + + + 0 + 0 + + + + + + LBRegles + + + + + textLabel1_2 + + + <h3><p align="center"><u><b>Régles</b></u></p></h3> + + + + + textLabel1 + + + + 0 + 0 + + + + <h3><p align="center"><u><b>Mots Clefs Permis</b></u></p></h3> + + + + + + + Commande + + + Nouvelle Commande + + + + unnamed - - + + + LBNouvCommande + + + + + buttonGroup1 + + + Affichage + + + + RBalpha + + + + 20 + 20 + 120 + 20 + + + + alphabétique + + + true + + + + + RBGroupe + + + + 20 + 40 + 120 + 20 + + + + par groupe + + + + + + textLabel1_4 + + + <b><u>Commandes :</u></b> + + + + + BNext + + + + + + image0 + + + affiche la prochaine occurence + + + + + textLabel6 + + + Filtre + + + + + textLabel4 + + + La commande choisie sera ajoutée APRES la commande courante + + + + + LEFiltre + + + + 160 + 30 + + + + + + + + TabPage + + + Nommer Concept + + - typeConcept + groupBox1_2 - 320 - 200 - 100 - 31 + 0 + 0 + 520 + 380 - - TypeDuConcept + + Concept + + + textLabel3_2 + + + + 10 + 230 + 320 + 31 + + + + L'opérateur courant retourne un concept de type : + + + + + typeConcept + + + + 360 + 230 + 130 + 31 + + + + TypeDuConcept + + + + + textLabel1_3_2_3 + + + + 20 + 200 + 160 + 31 + + + + <u>Type du concept :</u> + + + + + textLabel1_3_3 + + + + 20 + 50 + 150 + 31 + + + + <u>Nom du concept :</u> + + + + + LENomConcept + + + + 20 + 80 + 440 + 30 + + + - + diff --git a/Ui/desParam.py b/Ui/desParam.py index 307a8421..d4233a25 100644 --- a/Ui/desParam.py +++ b/Ui/desParam.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Form implementation generated from reading ui file '../Ui/desParam.ui' +# Form implementation generated from reading ui file 'desParam.ui' # -# Created: ven aoû 24 10:19:53 2007 +# Created: ven nov 9 14:51:34 2007 # by: The PyQt User Interface Compiler (pyuic) 3.13 # # WARNING! All changes made in this file will be lost! @@ -45,84 +45,102 @@ class DParam(QWidget): self.setMinimumSize(QSize(505,0)) + DParamLayout = QGridLayout(self,1,1,11,6,"DParamLayout") self.Commentaire = QLabel(self,"Commentaire") - self.Commentaire.setGeometry(QRect(10,410,490,20)) self.Commentaire.setFrameShape(QLabel.NoFrame) self.Commentaire.setFrameShadow(QLabel.Plain) - self.bSup = QPushButton(self,"bSup") - self.bSup.setGeometry(QRect(320,440,142,30)) - self.bSup.setAutoDefault(1) - - self.bOk = QPushButton(self,"bOk") - self.bOk.setGeometry(QRect(170,440,142,30)) - self.bOk.setAutoDefault(1) - self.bOk.setDefault(1) - - self.bHelp = QPushButton(self,"bHelp") - self.bHelp.setGeometry(QRect(10,440,142,30)) - self.bHelp.setAutoDefault(1) + DParamLayout.addWidget(self.Commentaire,1,0) self.TWChoix = QTabWidget(self,"TWChoix") - self.TWChoix.setGeometry(QRect(0,0,500,400)) self.Valeur_Parametre = QWidget(self.TWChoix,"Valeur_Parametre") self.textLabel2_2_2 = QLabel(self.Valeur_Parametre,"textLabel2_2_2") - self.textLabel2_2_2.setGeometry(QRect(180,20,90,21)) + self.textLabel2_2_2.setGeometry(QRect(80,11,231,89)) - self.textLabel2_2 = QLabel(self.Valeur_Parametre,"textLabel2_2") - self.textLabel2_2.setGeometry(QRect(50,60,50,21)) + self.Commentaire_2 = QLabel(self.Valeur_Parametre,"Commentaire_2") + self.Commentaire_2.setGeometry(QRect(11,275,459,89)) + + self.lineEditVal = QLineEdit(self.Valeur_Parametre,"lineEditVal") + self.lineEditVal.setGeometry(QRect(80,143,231,31)) + self.lineEditVal.setMinimumSize(QSize(231,31)) self.lineEditNom = QLineEdit(self.Valeur_Parametre,"lineEditNom") - self.lineEditNom.setGeometry(QRect(120,60,231,31)) + self.lineEditNom.setGeometry(QRect(80,106,231,31)) + self.lineEditNom.setMinimumSize(QSize(231,31)) - self.lineEditVal = QLineEdit(self.Valeur_Parametre,"lineEditVal") - self.lineEditVal.setGeometry(QRect(120,100,231,31)) + self.textLabel2_2 = QLabel(self.Valeur_Parametre,"textLabel2_2") + self.textLabel2_2.setGeometry(QRect(11,106,63,31)) self.textLabel2 = QLabel(self.Valeur_Parametre,"textLabel2") - self.textLabel2.setGeometry(QRect(50,100,50,21)) + self.textLabel2.setGeometry(QRect(11,143,63,31)) self.Commentaire2 = QLabel(self.Valeur_Parametre,"Commentaire2") - self.Commentaire2.setGeometry(QRect(40,160,400,100)) - - self.Commentaire_2 = QLabel(self.Valeur_Parametre,"Commentaire_2") - self.Commentaire_2.setGeometry(QRect(30,280,410,41)) + self.Commentaire2.setGeometry(QRect(11,180,459,89)) self.TWChoix.insertTab(self.Valeur_Parametre,QString("")) self.Commande = QWidget(self.TWChoix,"Commande") + CommandeLayout = QGridLayout(self.Commande,1,1,11,6,"CommandeLayout") self.textLabel6 = QLabel(self.Commande,"textLabel6") - self.textLabel6.setGeometry(QRect(10,60,60,30)) - self.textLabel4 = QLabel(self.Commande,"textLabel4") - self.textLabel4.setGeometry(QRect(90,340,300,30)) + CommandeLayout.addWidget(self.textLabel6,1,0) self.LBNouvCommande = QListBox(self.Commande,"LBNouvCommande") - self.LBNouvCommande.setGeometry(QRect(50,100,410,240)) + + CommandeLayout.addMultiCellWidget(self.LBNouvCommande,2,2,0,3) self.buttonGroup1 = QButtonGroup(self.Commande,"buttonGroup1") - self.buttonGroup1.setGeometry(QRect(298,17,151,70)) self.RBGroupe = QRadioButton(self.buttonGroup1,"RBGroupe") self.RBGroupe.setGeometry(QRect(20,40,101,20)) self.RBalpha = QRadioButton(self.buttonGroup1,"RBalpha") - self.RBalpha.setGeometry(QRect(20,20,101,20)) + self.RBalpha.setGeometry(QRect(20,20,120,20)) self.RBalpha.setChecked(1) - self.LEFiltre = QLineEdit(self.Commande,"LEFiltre") - self.LEFiltre.setGeometry(QRect(50,60,160,30)) + 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.textLabel4 = QLabel(self.Commande,"textLabel4") + + CommandeLayout.addMultiCellWidget(self.textLabel4,3,3,0,3) self.BNext = QToolButton(self.Commande,"BNext") - self.BNext.setGeometry(QRect(220,60,30,31)) self.BNext.setIconSet(QIconSet(self.image0)) - self.textLabel1_4 = QLabel(self.Commande,"textLabel1_4") - self.textLabel1_4.setGeometry(QRect(50,20,171,21)) + CommandeLayout.addWidget(self.BNext,1,2) + + self.LEFiltre = QLineEdit(self.Commande,"LEFiltre") + self.LEFiltre.setMinimumSize(QSize(160,30)) + + CommandeLayout.addWidget(self.LEFiltre,1,1) self.TWChoix.insertTab(self.Commande,QString("")) + DParamLayout.addWidget(self.TWChoix,0,0) + + layout1 = QHBoxLayout(None,0,6,"layout1") + + self.bHelp = QPushButton(self,"bHelp") + self.bHelp.setAutoDefault(1) + layout1.addWidget(self.bHelp) + + self.bOk = QPushButton(self,"bOk") + self.bOk.setAutoDefault(1) + self.bOk.setDefault(1) + layout1.addWidget(self.bOk) + + self.bSup = QPushButton(self,"bSup") + self.bSup.setAutoDefault(1) + layout1.addWidget(self.bSup) + + DParamLayout.addLayout(layout1,2,0) + self.languageChange() self.resize(QSize(505,483).expandedTo(self.minimumSizeHint())) @@ -142,30 +160,30 @@ class DParam(QWidget): def languageChange(self): self.setCaption(self.__tr("DComm")) 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")) - 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.textLabel2_2_2.setText(self.__tr("

Parametre

")) - self.textLabel2_2.setText(self.__tr("

Nom:

")) - self.textLabel2.setText(self.__tr("

Valeur:

")) - self.Commentaire2.setText(self.__trUtf8("\x52\x65\x74\x6f\x75\x72\x20\x43\x68\x61\x72\x69\x6f\x74\x20\x64\x61\x6e\x73\x20\x75\x6e\x65\x20\x73\x6f\x6e\x65\x20\x64\x65\x20\x73\x61\x69\x73\x69\x65\x20\x70\x65\x72\x6d\x65\x74\x20\x64\x65\x20\x76\xc3\xa9\x72\x69\x66\x69\x65\x72\x20\x6c\x61\x20\x76\x61\x6c\x69\x64\x69\x74\xc3\xa9\x20\x64\x65\x20\x6c\x61\x20\x76\x61\x6c\x65\x75\x72\x20\x73\x61\x69\x73\x69\x65\x2e\x0a\x0a\x4c\x65\x73\x20\x6e\x6f\x75\x76\x65\x6c\x6c\x65\x73\x20\x76\x61\x6c\x65\x75\x72\x73\x20\x6e\x65\x20\x73\x65\x72\x6f\x6e\x74\x20\x70\x72\x69\x73\x65\x73\x20\x20\x65\x6e\x20\x63\x6f\x6d\x70\x74\x65\x20\x71\x75\x27\x61\x70\x72\xc3\xa8\x73\x20\x61\x76\x6f\x69\x72\x20\x61\x70\x70\x75\x79\xc3\xa9\x20\x73\x75\x72\x20\x0a\x20\x6c\x65\x20\x62\x6f\x75\x74\x6f\x6e\x20\x56\x61\x6c\x69\x64\x65\x72\x2e")) self.Commentaire_2.setText(QString.null) + self.textLabel2_2.setText(self.__tr(" Nom: ")) + self.textLabel2.setText(self.__tr(" Valeur: ")) + self.Commentaire2.setText(self.__trUtf8("\x52\x65\x74\x6f\x75\x72\x20\x43\x68\x61\x72\x69\x6f\x74\x20\x64\x61\x6e\x73\x20\x75\x6e\x65\x20\x73\x6f\x6e\x65\x20\x64\x65\x20\x73\x61\x69\x73\x69\x65\x20\x70\x65\x72\x6d\x65\x74\x20\x64\x65\x20\x76\xc3\xa9\x72\x69\x66\x69\x65\x72\x20\x6c\x61\x20\x0a\x76\x61\x6c\x69\x64\x69\x74\xc3\xa9\x20\x64\x65\x20\x6c\x61\x20\x76\x61\x6c\x65\x75\x72\x20\x73\x61\x69\x73\x69\x65\x2e\x0a\x0a\x4c\x65\x73\x20\x6e\x6f\x75\x76\x65\x6c\x6c\x65\x73\x20\x76\x61\x6c\x65\x75\x72\x73\x20\x6e\x65\x20\x73\x65\x72\x6f\x6e\x74\x20\x70\x72\x69\x73\x65\x73\x20\x20\x65\x6e\x20\x63\x6f\x6d\x70\x74\x65\x20\x71\x75\x27\x61\x70\x72\xc3\xa8\x73\x20\x61\x76\x6f\x69\x72\x20\x0a\x61\x70\x70\x75\x79\xc3\xa9\x20\x73\x75\x72\x20\x20\x6c\x65\x20\x62\x6f\x75\x74\x6f\x6e\x20\x56\x61\x6c\x69\x64\x65\x72\x2e")) self.TWChoix.changeTab(self.Valeur_Parametre,self.__tr("Valeur Parametre")) 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")) self.buttonGroup1.setTitle(self.__tr("Affichage")) 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.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) QToolTip.add(self.BNext,self.__tr("affiche la prochaine occurence")) - self.textLabel1_4.setText(self.__tr("Commandes :")) self.TWChoix.changeTab(self.Commande,self.__tr("Nouvelle Commande")) + 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")) def LBNouvCommandeClicked(self): diff --git a/Ui/desParam.ui b/Ui/desParam.ui index 756ceeb9..a2ba8081 100644 --- a/Ui/desParam.ui +++ b/Ui/desParam.ui @@ -21,391 +21,384 @@ DComm - + - Commentaire + unnamed - - - 10 - 410 - 490 - 20 - - - - NoFrame - - - Plain - - - - - - - - bSup - - - - 320 - 440 - 142 - 30 - - - - &Supprimer - - - Alt+S - - - true - - - suppression du mot clef - - - - - bOk - - - - 170 - 440 - 142 - 30 - - - - &Valider - - - Shift+A, Alt+A, Alt+A, Alt+A - - - true - - - true - - - validation de la saisie - - - - - bHelp - - - - 10 - 440 - 142 - 30 - - - - &Documentation - - - Alt+D - - - true - - - affichage documentation aster - - - - - TWChoix - - - - 0 - 0 - 500 - 400 - - - + - Valeur_Parametre + Commentaire + + + NoFrame + + + Plain + + + - - Valeur Parametre - - - - textLabel2_2_2 - - - - 180 - 20 - 90 - 21 - - - - <u><b><p align="center">Parametre</p></b></u> - - - - - textLabel2_2 - - - - 50 - 60 - 50 - 21 - - - - <b><p align="center">Nom: </p></b> - - - - - lineEditNom - - - - 120 - 60 - 231 - 31 - - - - - - lineEditVal - - - - 120 - 100 - 231 - 31 - - - - - - textLabel2 - - - - 50 - 100 - 50 - 21 - - - - <b><p align="center">Valeur: </p></b> - - - - - Commentaire2 - - - - 40 - 160 - 400 - 100 - - - - Retour Chariot dans une sone de saisie permet de vérifier la validité de la valeur saisie. - -Les nouvelles valeurs ne seront prises en compte qu'après avoir appuyé sur - le bouton Valider. - - - - - Commentaire_2 - - - - 30 - 280 - 410 - 41 - - - - - - - + - Commande + TWChoix - - Nouvelle Commande - - - - textLabel6 - - - - 10 - 60 - 60 - 30 - - - - Filtre - - - + - textLabel4 + Valeur_Parametre - - - 90 - 340 - 300 - 30 - - - - La commande choisie sera ajoutée APRES la commande courante - - - - - LBNouvCommande - - - - 50 - 100 - 410 - 240 - - - - - - buttonGroup1 - - - - 298 - 17 - 151 - 70 - - - - Affichage - - + + Valeur Parametre + + - RBGroupe + textLabel2_2_2 - 20 - 40 - 101 - 20 + 80 + 11 + 231 + 89 + + + + <u><b><p align="center">Parametre</p></b></u> + + + + + Commentaire_2 + + + + 11 + 275 + 459 + 89 - par groupe + - + - RBalpha + lineEditVal - 20 - 20 + 80 + 143 + 231 + 31 + + + + + 231 + 31 + + + + + + lineEditNom + + + + 80 + 106 + 231 + 31 + + + + + 231 + 31 + + + + + + spacer1 + + + Horizontal + + + Expanding + + + 101 20 + + + + + 317 + 111 + 153 + 20 + + + + + + spacer2 + + + Horizontal + + + Expanding + + + + 101 + 20 + + + + + 317 + 148 + 153 + 20 + + + + + + textLabel2_2 + + + + 11 + 106 + 63 + 31 - alphabétique + <b> Nom: </b> - - true + + + + textLabel2 + + + + 11 + 143 + 63 + 31 + + + + <b> Valeur: </b> + + + + + Commentaire2 + + + + 11 + 180 + 459 + 89 + + + + Retour Chariot dans une sone de saisie permet de vérifier la +validité de la valeur saisie. + +Les nouvelles valeurs ne seront prises en compte qu'après avoir +appuyé sur le bouton Valider. - - - LEFiltre - - - - 50 - 60 - 160 - 30 - - - - + - BNext - - - - 220 - 60 - 30 - 31 - - - - - - - image0 - - - affiche la prochaine occurence + Commande + + Nouvelle Commande + + + + unnamed + + + + textLabel6 + + + Filtre + + + + + LBNouvCommande + + + + + buttonGroup1 + + + Affichage + + + + RBGroupe + + + + 20 + 40 + 101 + 20 + + + + par groupe + + + + + RBalpha + + + + 20 + 20 + 120 + 20 + + + + alphabétique + + + true + + + + + + textLabel1_4 + + + <b><u>Commandes :</u></b> + + + + + textLabel4 + + + La commande choisie sera ajoutée APRES la commande courante + + + + + BNext + + + + + + image0 + + + affiche la prochaine occurence + + + + + LEFiltre + + + + 160 + 30 + + + + - + + + + layout1 + + - textLabel1_4 - - - - 50 - 20 - 171 - 21 - - - - <b><u>Commandes :</u></b> + unnamed - + + + bHelp + + + &Documentation + + + Alt+D + + + true + + + affichage documentation aster + + + + + bOk + + + &Valider + + + Shift+A, Alt+A, Alt+A, Alt+A + + + true + + + true + + + validation de la saisie + + + + + bSup + + + &Supprimer + + + Alt+S + + + true + + + suppression du mot clef + + + - + diff --git a/Ui/desPlusieursBase.py b/Ui/desPlusieursBase.py index b24626fc..f813a08c 100644 --- a/Ui/desPlusieursBase.py +++ b/Ui/desPlusieursBase.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'desPlusieursBase.ui' # -# Created: lun avr 23 09:30:04 2007 +# Created: ven nov 9 14:51:34 2007 # by: The PyQt User Interface Compiler (pyuic) 3.13 # # WARNING! All changes made in this file will be lost! @@ -11,29 +11,6 @@ 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" \ - "\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" -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" \ @@ -56,6 +33,29 @@ image1_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" +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" class DPlusBase(QWidget): def __init__(self,parent = None,name = None,fl = 0): @@ -70,60 +70,97 @@ class DPlusBase(QWidget): self.setMinimumSize(QSize(350,0)) + DPlusBaseLayout = QGridLayout(self,1,1,11,6,"DPlusBaseLayout") self.tabuniqueinto = QTabWidget(self,"tabuniqueinto") - self.tabuniqueinto.setGeometry(QRect(20,20,450,440)) self.Widget8 = QWidget(self.tabuniqueinto,"Widget8") + Widget8Layout = QGridLayout(self.Widget8,1,1,11,6,"Widget8Layout") + + layout3 = QVBoxLayout(None,0,6,"layout3") + + self.Commentaire = QLabel(self.Widget8,"Commentaire") + layout3.addWidget(self.Commentaire) + + layout1 = QHBoxLayout(None,0,6,"layout1") self.bHelp = QPushButton(self.Widget8,"bHelp") - self.bHelp.setGeometry(QRect(0,370,142,30)) self.bHelp.setAutoDefault(1) + layout1.addWidget(self.bHelp) self.bOk = QPushButton(self.Widget8,"bOk") - self.bOk.setGeometry(QRect(150,370,142,30)) self.bOk.setAutoDefault(1) self.bOk.setDefault(1) + layout1.addWidget(self.bOk) self.bSup = QPushButton(self.Widget8,"bSup") - self.bSup.setGeometry(QRect(300,370,142,30)) self.bSup.setAutoDefault(1) + layout1.addWidget(self.bSup) + layout3.addLayout(layout1) + + Widget8Layout.addMultiCellLayout(layout3,4,4,0,3) + + layout8 = QVBoxLayout(None,0,6,"layout8") + + self.BSup1Val = QToolButton(self.Widget8,"BSup1Val") + self.BSup1Val.setSizePolicy(QSizePolicy(0,0,0,0,self.BSup1Val.sizePolicy().hasHeightForWidth())) + self.BSup1Val.setIconSet(QIconSet(self.image0)) + layout8.addWidget(self.BSup1Val) + + self.BAjout1Val = QToolButton(self.Widget8,"BAjout1Val") + self.BAjout1Val.setSizePolicy(QSizePolicy(0,0,0,0,self.BAjout1Val.sizePolicy().hasHeightForWidth())) + self.BAjout1Val.setIconSet(QIconSet(self.image1)) + layout8.addWidget(self.BAjout1Val) + + Widget8Layout.addLayout(layout8,1,1) + + self.textLabel1 = QLabel(self.Widget8,"textLabel1") + + Widget8Layout.addWidget(self.textLabel1,0,0) + + self.LBValeurs = QListBox(self.Widget8,"LBValeurs") + + Widget8Layout.addMultiCellWidget(self.LBValeurs,1,3,0,0) + spacer5 = QSpacerItem(120,20,QSizePolicy.Expanding,QSizePolicy.Minimum) + Widget8Layout.addMultiCell(spacer5,3,3,1,2) + + layout6 = QVBoxLayout(None,0,6,"layout6") self.bParam = QPushButton(self.Widget8,"bParam") - self.bParam.setGeometry(QRect(290,240,142,30)) self.bParam.setAutoDefault(1) + layout6.addWidget(self.bParam) self.bImport = QPushButton(self.Widget8,"bImport") - self.bImport.setGeometry(QRect(290,280,142,30)) self.bImport.setAutoDefault(1) + layout6.addWidget(self.bImport) - self.Commentaire = QLabel(self.Widget8,"Commentaire") - self.Commentaire.setGeometry(QRect(38,337,381,20)) + Widget8Layout.addLayout(layout6,3,3) + spacer3 = QSpacerItem(31,131,QSizePolicy.Minimum,QSizePolicy.Expanding) + Widget8Layout.addItem(spacer3,2,3) - self.textLabel1 = QLabel(self.Widget8,"textLabel1") - self.textLabel1.setGeometry(QRect(40,20,120,21)) + layout19 = QVBoxLayout(None,0,6,"layout19") - self.textLabel1_2 = QLabel(self.Widget8,"textLabel1_2") - self.textLabel1_2.setGeometry(QRect(330,80,45,21)) - - self.BAjout1Val = QToolButton(self.Widget8,"BAjout1Val") - self.BAjout1Val.setGeometry(QRect(230,120,40,31)) - self.BAjout1Val.setIconSet(QIconSet(self.image0)) + layout12 = QHBoxLayout(None,0,6,"layout12") - self.BSup1Val = QToolButton(self.Widget8,"BSup1Val") - self.BSup1Val.setGeometry(QRect(230,80,40,31)) - self.BSup1Val.setIconSet(QIconSet(self.image1)) - - self.LBValeurs = QListBox(self.Widget8,"LBValeurs") - self.LBValeurs.setGeometry(QRect(20,50,180,280)) + 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.LEValeur = QLineEdit(self.Widget8,"LEValeur") - self.LEValeur.setGeometry(QRect(280,110,150,30)) + self.LEValeur.setSizePolicy(QSizePolicy(1,1,0,0,self.LEValeur.sizePolicy().hasHeightForWidth())) + self.LEValeur.setMinimumSize(QSize(220,30)) + layout19.addWidget(self.LEValeur) + + Widget8Layout.addMultiCellLayout(layout19,1,1,2,3) self.tabuniqueinto.insertTab(self.Widget8,QString("")) + DPlusBaseLayout.addWidget(self.tabuniqueinto,0,0) + self.languageChange() - self.resize(QSize(482,480).expandedTo(self.minimumSizeHint())) + self.resize(QSize(564,480).expandedTo(self.minimumSizeHint())) self.clearWState(Qt.WState_Polished) self.connect(self.bHelp,SIGNAL("clicked()"),self.ViewDoc) @@ -138,6 +175,7 @@ class DPlusBase(QWidget): def languageChange(self): self.setCaption(self.__tr("DUnIn")) + 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")) @@ -147,19 +185,18 @@ class DPlusBase(QWidget): self.bSup.setText(self.__tr("&Supprimer")) self.bSup.setAccel(self.__tr("Alt+S")) QToolTip.add(self.bSup,self.__tr("suppression du mot clef")) + 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.setText(self.__tr("Valeur(s) actuelle(s)")) 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.Commentaire.setText(QString.null) - 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.tabuniqueinto.changeTab(self.Widget8,self.__tr("Saisir Valeur")) diff --git a/Ui/desPlusieursBase.ui b/Ui/desPlusieursBase.ui index a54a7d8d..27e6802f 100644 --- a/Ui/desPlusieursBase.ui +++ b/Ui/desPlusieursBase.ui @@ -8,7 +8,7 @@ 0 0 - 482 + 564 480 @@ -21,280 +21,327 @@ DUnIn - + - tabuniqueinto + unnamed - - - 20 - 20 - 450 - 440 - - - + - Widget8 + tabuniqueinto - - Saisir Valeur - - + - bHelp - - - - 0 - 370 - 142 - 30 - - - - &Documentation - - - Alt+D - - - true - - - affichage documentation aster - - - - - bOk - - - - 150 - 370 - 142 - 30 - - - - &Valider - - - Shift+A, Alt+A, Alt+A, Alt+A - - - true - - - true - - - validation de la saisie - - - - - bSup - - - - 300 - 370 - 142 - 30 - - - - &Supprimer - - - Alt+S - - - true - - - suppression du mot clef - - - - - bParam - - - - 290 - 240 - 142 - 30 - - - - &Parametres - - - Alt+P - - - true - - - suppression du mot clef - - - - - bImport - - - - 290 - 280 - 142 - 30 - - - - &Importer - - - Alt+I - - - true - - - suppression du mot clef - - - - - Commentaire - - - - 38 - 337 - 381 - 20 - - - - - - - - - textLabel1 - - - - 40 - 20 - 120 - 21 - - - - <u><font size="+1">Valeur(s) actuelle(s)</font></u> - - - - - textLabel1_2 - - - - 330 - 80 - 45 - 21 - - - - <font size="+1">Valeur</font> - - - - - BAjout1Val - - - - 230 - 120 - 40 - 31 - - - - - - - image0 - - - ajoute la valeur saisie sous l occurence selectionnée (en fin de liste si il n y a pas de selection) - - - - - BSup1Val - - - - 230 - 80 - 40 - 31 - - - - - - - image1 - - - enleve l occurence selectionnee - - - - - LBValeurs - - - - 20 - 50 - 180 - 280 - - - - - - LEValeur - - - - 280 - 110 - 150 - 30 - - + Widget8 + + + Saisir Valeur + + + + unnamed + + + + layout3 + + + + unnamed + + + + Commentaire + + + + + + + + layout1 + + + + unnamed + + + + bHelp + + + &Documentation + + + Alt+D + + + true + + + affichage documentation aster + + + + + bOk + + + &Valider + + + Shift+A, Alt+A, Alt+A, Alt+A + + + true + + + true + + + validation de la saisie + + + + + bSup + + + &Supprimer + + + Alt+S + + + true + + + suppression du mot clef + + + + + + + + + layout8 + + + + unnamed + + + + BSup1Val + + + + 0 + 0 + 0 + 0 + + + + + + + image0 + + + enleve l occurence selectionnee + + + + + BAjout1Val + + + + 0 + 0 + 0 + 0 + + + + + + + image1 + + + ajoute la valeur saisie sous l occurence selectionnée (en fin de liste si il n y a pas de selection) + + + + + + + textLabel1 + + + <u><font size="+1">Valeur(s) actuelle(s)</font></u> + + + + + LBValeurs + + + + + spacer5 + + + Horizontal + + + Expanding + + + + 120 + 20 + + + + + + layout6 + + + + unnamed + + + + bParam + + + &Parametres + + + Alt+P + + + true + + + suppression du mot clef + + + + + bImport + + + &Importer + + + Alt+I + + + true + + + suppression du mot clef + + + + + + + spacer3 + + + Vertical + + + Expanding + + + + 31 + 131 + + + + + + layout19 + + + + unnamed + + + + layout12 + + + + unnamed + + + + textLabel1_2 + + + <font size="+1">Valeur</font> + + + + + spacer6 + + + Horizontal + + + Expanding + + + + 111 + 20 + + + + + + + + LEValeur + + + + 1 + 1 + 0 + 0 + + + + + 220 + 30 + + + + + + - + - 89504e470d0a1a0a0000000d49484452000000210000000e0806000000a11e758c000000c749444154388dcd94590ec3200c4471d57bc73df9f407d331b159a228aa254448bc3cc68152fec0e4420ceeceb912e08a0239838848f5df02c99c11f86004300119054ae868c56ac206c06b4b109111c802874f3a52a587757123897e4039c46b50d8865b07f5400a450053330893cf8674a30028d492deef04626b559dfe48ac842b1a6daae6850155033b99c5009f70ceda111aab413b6f6a70d118e008e6fd8bc51d5d00a0f614556d1ff9b9be4952aabc3721f8f8b6f624c557ef8947afedf48c5e60b8dfbeb81d6dab9aff99270000000049454e44ae426082 + 89504e470d0a1a0a0000000d49484452000000210000000e0806000000a11e758c000000cf49444154388dd594db0ec3200c43edfdf8d897bb0f345b480845d51eb64888f412e76001c00f046fd6e99bba77200480924a1032c92efbd8c7d5cabcc025400099e957849568fe7f06c0ded1deb32b4a1ec4ea824b9e74097165bd01f85527f78a7201e0a3129f345a017c543bafdc983d0f7109d15a331b471f47072c17494a82338f6178203a8817e67306b1f08b07ba03e602c9b831077e37e0209e67e3386710977b17de80c185ad38695a51d522c82ce77912e2fed8be83762092f52b1820dd11bb10e565b53a5a3bbaff130713d66fa6981857060000000049454e44ae426082 - 89504e470d0a1a0a0000000d49484452000000210000000e0806000000a11e758c000000cf49444154388dd594db0ec3200c43edfdf8d897bb0f345b480845d51eb64888f412e76001c00f046fd6e99bba77200480924a1032c92efbd8c7d5cabcc025400099e957849568fe7f06c0ded1deb32b4a1ec4ea824b9e74097165bd01f85527f78a7201e0a3129f345a017c543bafdc983d0f7109d15a331b471f47072c17494a82338f6178203a8817e67306b1f08b07ba03e602c9b831077e37e0209e67e3386710977b17de80c185ad38695a51d522c82ce77912e2fed8be83762092f52b1820dd11bb10e565b53a5a3bbaff130713d66fa6981857060000000049454e44ae426082 + 89504e470d0a1a0a0000000d49484452000000210000000e0806000000a11e758c000000c749444154388dcd94590ec3200c4471d57bc73df9f407d331b159a228aa254448bc3cc68152fec0e4420ceeceb912e08a0239838848f5df02c99c11f86004300119054ae868c56ac206c06b4b109111c802874f3a52a587757123897e4039c46b50d8865b07f5400a450053330893cf8674a30028d492deef04626b559dfe48ac842b1a6daae6850155033b99c5009f70ceda111aab413b6f6a70d118e008e6fd8bc51d5d00a0f614556d1ff9b9be4952aabc3721f8f8b6f624c557ef8947afedf48c5e60b8dfbeb81d6dab9aff99270000000049454e44ae426082 diff --git a/Ui/desPlusieursInto.py b/Ui/desPlusieursInto.py index c5c177bb..04ec74cf 100644 --- a/Ui/desPlusieursInto.py +++ b/Ui/desPlusieursInto.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'desPlusieursInto.ui' # -# Created: mer avr 25 09:04:00 2007 +# Created: ven nov 9 14:51:34 2007 # by: The PyQt User Interface Compiler (pyuic) 3.13 # # WARNING! All changes made in this file will be lost! @@ -70,49 +70,74 @@ class DPlusInto(QWidget): self.setMinimumSize(QSize(350,0)) + DPlusIntoLayout = QGridLayout(self,1,1,11,6,"DPlusIntoLayout") self.tabuniqueinto = QTabWidget(self,"tabuniqueinto") - self.tabuniqueinto.setGeometry(QRect(20,20,450,440)) self.Widget8 = QWidget(self.tabuniqueinto,"Widget8") + Widget8Layout = QGridLayout(self.Widget8,1,1,11,6,"Widget8Layout") + + self.Commentaire = QLabel(self.Widget8,"Commentaire") + + Widget8Layout.addMultiCellWidget(self.Commentaire,2,2,0,1) + + layout1 = QHBoxLayout(None,0,6,"layout1") self.bHelp = QPushButton(self.Widget8,"bHelp") - self.bHelp.setGeometry(QRect(0,370,142,30)) self.bHelp.setAutoDefault(1) + layout1.addWidget(self.bHelp) self.bOk = QPushButton(self.Widget8,"bOk") - self.bOk.setGeometry(QRect(150,370,142,30)) self.bOk.setAutoDefault(1) self.bOk.setDefault(1) + layout1.addWidget(self.bOk) self.bSup = QPushButton(self.Widget8,"bSup") - self.bSup.setGeometry(QRect(300,370,142,30)) self.bSup.setAutoDefault(1) + layout1.addWidget(self.bSup) + + Widget8Layout.addMultiCellLayout(layout1,3,3,0,1) + + self.textLabel1_2 = QLabel(self.Widget8,"textLabel1_2") + + Widget8Layout.addWidget(self.textLabel1_2,0,1) + + self.textLabel1 = QLabel(self.Widget8,"textLabel1") + + Widget8Layout.addWidget(self.textLabel1,0,0) + + layout6 = QHBoxLayout(None,0,6,"layout6") self.LBValeurs = QListBox(self.Widget8,"LBValeurs") - self.LBValeurs.setGeometry(QRect(10,50,180,280)) + layout6.addWidget(self.LBValeurs) + + layout5 = QVBoxLayout(None,0,6,"layout5") + spacer2 = QSpacerItem(21,31,QSizePolicy.Minimum,QSizePolicy.Expanding) + layout5.addItem(spacer2) self.BSup1Val = QToolButton(self.Widget8,"BSup1Val") - self.BSup1Val.setGeometry(QRect(200,70,40,31)) + self.BSup1Val.setMinimumSize(QSize(40,31)) + self.BSup1Val.setMaximumSize(QSize(40,31)) self.BSup1Val.setIconSet(QIconSet(self.image0)) + layout5.addWidget(self.BSup1Val) self.BAjout1Val = QToolButton(self.Widget8,"BAjout1Val") - self.BAjout1Val.setGeometry(QRect(200,110,40,31)) + self.BAjout1Val.setMinimumSize(QSize(40,31)) + self.BAjout1Val.setMaximumSize(QSize(40,31)) self.BAjout1Val.setIconSet(QIconSet(self.image1)) - - self.textLabel1 = QLabel(self.Widget8,"textLabel1") - self.textLabel1.setGeometry(QRect(40,20,120,21)) - - self.textLabel1_2 = QLabel(self.Widget8,"textLabel1_2") - self.textLabel1_2.setGeometry(QRect(278,16,130,21)) - - self.Commentaire = QLabel(self.Widget8,"Commentaire") - self.Commentaire.setGeometry(QRect(30,340,381,20)) + layout5.addWidget(self.BAjout1Val) + spacer3 = QSpacerItem(21,181,QSizePolicy.Minimum,QSizePolicy.Expanding) + layout5.addItem(spacer3) + layout6.addLayout(layout5) self.listBoxVal = QListBox(self.Widget8,"listBoxVal") - self.listBoxVal.setGeometry(QRect(250,50,180,280)) + layout6.addWidget(self.listBoxVal) + + Widget8Layout.addMultiCellLayout(layout6,1,1,0,1) self.tabuniqueinto.insertTab(self.Widget8,QString("")) + DPlusIntoLayout.addWidget(self.tabuniqueinto,0,0) + self.languageChange() self.resize(QSize(482,480).expandedTo(self.minimumSizeHint())) @@ -128,6 +153,7 @@ class DPlusInto(QWidget): def languageChange(self): self.setCaption(self.__tr("DUnIn")) + 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")) @@ -137,13 +163,12 @@ class DPlusInto(QWidget): self.bSup.setText(self.__tr("&Supprimer")) self.bSup.setAccel(self.__tr("Alt+S")) QToolTip.add(self.bSup,self.__tr("suppression du mot clef")) + self.textLabel1_2.setText(self.__tr("Valeur(s) possibles(s)")) + self.textLabel1.setText(self.__tr("Valeur(s) actuelle(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.textLabel1.setText(self.__tr("Valeur(s) actuelle(s)")) - self.textLabel1_2.setText(self.__tr("Valeur(s) possibles(s)")) - self.Commentaire.setText(QString.null) self.tabuniqueinto.changeTab(self.Widget8,self.__tr("Saisir Valeur")) diff --git a/Ui/desPlusieursInto.ui b/Ui/desPlusieursInto.ui index 8ea0dcb9..cbb6940c 100644 --- a/Ui/desPlusieursInto.ui +++ b/Ui/desPlusieursInto.ui @@ -21,223 +21,233 @@ DUnIn - + - tabuniqueinto + unnamed - - - 20 - 20 - 450 - 440 - - - + - Widget8 + tabuniqueinto - - Saisir Valeur - - - - bHelp - - - - 0 - 370 - 142 - 30 - - - - &Documentation - - - Alt+D - - - true - - - affichage documentation aster - - - + - bOk - - - - 150 - 370 - 142 - 30 - - - - &Valider - - - Shift+A, Alt+A, Alt+A, Alt+A - - - true - - - true - - - validation de la saisie - - - - - bSup - - - - 300 - 370 - 142 - 30 - - - - &Supprimer - - - Alt+S - - - true - - - suppression du mot clef - - - - - LBValeurs - - - - 10 - 50 - 180 - 280 - - - - - - BSup1Val - - - - 200 - 70 - 40 - 31 - - - - - - - image0 - - - enleve l occurence selectionnee - - - - - BAjout1Val - - - - 200 - 110 - 40 - 31 - - - - - - - image1 - - - ajoute la valeur saisie sous l occurence selectionnée (en fin de liste si il n y a pas de selection) - - - - - textLabel1 - - - - 40 - 20 - 120 - 21 - - - - <u><font size="+1">Valeur(s) actuelle(s)</font></u> - - - - - textLabel1_2 - - - - 278 - 16 - 130 - 21 - - - - <u><font size="+1">Valeur(s) possibles(s)</font></u> - - - - - Commentaire - - - - 30 - 340 - 381 - 20 - - - - - - - - - listBoxVal - - - - 250 - 50 - 180 - 280 - - + Widget8 + + + Saisir Valeur + + + + unnamed + + + + Commentaire + + + + + + + + layout1 + + + + unnamed + + + + bHelp + + + &Documentation + + + Alt+D + + + true + + + affichage documentation aster + + + + + bOk + + + &Valider + + + Shift+A, Alt+A, Alt+A, Alt+A + + + true + + + true + + + validation de la saisie + + + + + bSup + + + &Supprimer + + + Alt+S + + + true + + + suppression du mot clef + + + + + + + textLabel1_2 + + + <u><font size="+1">Valeur(s) possibles(s)</font></u> + + + + + textLabel1 + + + <u><font size="+1">Valeur(s) actuelle(s)</font></u> + + + + + layout6 + + + + unnamed + + + + LBValeurs + + + + + layout5 + + + + unnamed + + + + spacer2 + + + Vertical + + + Expanding + + + + 21 + 31 + + + + + + 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 + + + + + + + + listBoxVal + + + + + - + diff --git a/Ui/desRacine.py b/Ui/desRacine.py index f82675bb..47953697 100644 --- a/Ui/desRacine.py +++ b/Ui/desRacine.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'desRacine.ui' # -# Created: jeu avr 26 14:24:43 2007 +# Created: ven nov 9 14:51:34 2007 # by: The PyQt User Interface Compiler (pyuic) 3.13 # # WARNING! All changes made in this file will be lost! @@ -45,51 +45,65 @@ class DRac(QWidget): self.setMinimumSize(QSize(505,0)) + DRacLayout = QGridLayout(self,1,1,11,6,"DRacLayout") - self.bHelp = QPushButton(self,"bHelp") - self.bHelp.setGeometry(QRect(10,440,142,30)) - self.bHelp.setAutoDefault(1) + self.LBNouvCommande = QListBox(self,"LBNouvCommande") - self.textLabel6 = QLabel(self,"textLabel6") - self.textLabel6.setGeometry(QRect(10,70,30,30)) + DRacLayout.addMultiCellWidget(self.LBNouvCommande,3,3,0,2) - self.textLabel1_4_2 = QLabel(self,"textLabel1_4_2") - self.textLabel1_4_2.setGeometry(QRect(350,0,50,21)) + self.BNext = QToolButton(self,"BNext") + self.BNext.setIconSet(QIconSet(self.image0)) + + DRacLayout.addWidget(self.BNext,2,2) self.LEFiltre = QLineEdit(self,"LEFiltre") - self.LEFiltre.setGeometry(QRect(50,70,140,30)) - self.BNext = QToolButton(self,"BNext") - self.BNext.setGeometry(QRect(200,70,30,31)) - self.BNext.setIconSet(QIconSet(self.image0)) + DRacLayout.addWidget(self.LEFiltre,2,1) - self.textLabel1_4 = QLabel(self,"textLabel1_4") - self.textLabel1_4.setGeometry(QRect(90,0,75,21)) + self.textLabel6 = QLabel(self,"textLabel6") - self.buttonGroup1 = QButtonGroup(self,"buttonGroup1") - self.buttonGroup1.setGeometry(QRect(10,20,230,40)) + DRacLayout.addWidget(self.textLabel6,2,0) - self.RBGroupe = QRadioButton(self.buttonGroup1,"RBGroupe") - self.RBGroupe.setGeometry(QRect(20,10,101,20)) + self.buttonGroup1 = QButtonGroup(self,"buttonGroup1") self.RBalpha = QRadioButton(self.buttonGroup1,"RBalpha") - self.RBalpha.setGeometry(QRect(140,10,80,20)) + self.RBalpha.setGeometry(QRect(110,20,110,20)) self.RBalpha.setChecked(1) + self.RBGroupe = QRadioButton(self.buttonGroup1,"RBGroupe") + self.RBGroupe.setGeometry(QRect(10,20,101,20)) + + DRacLayout.addMultiCellWidget(self.buttonGroup1,1,1,0,2) + + self.textLabel1_4 = QLabel(self,"textLabel1_4") + + DRacLayout.addWidget(self.textLabel1_4,0,1) + + self.LBRegles = QListBox(self,"LBRegles") + self.LBRegles.setMinimumSize(QSize(250,400)) + + DRacLayout.addMultiCellWidget(self.LBRegles,1,3,3,3) + + self.textLabel1_4_2 = QLabel(self,"textLabel1_4_2") + + DRacLayout.addWidget(self.textLabel1_4_2,0,3) + + layout1 = QHBoxLayout(None,0,6,"layout1") + + self.bHelp = QPushButton(self,"bHelp") + self.bHelp.setAutoDefault(1) + layout1.addWidget(self.bHelp) + self.bOk = QPushButton(self,"bOk") - self.bOk.setGeometry(QRect(180,440,142,30)) self.bOk.setAutoDefault(1) self.bOk.setDefault(1) + layout1.addWidget(self.bOk) self.bSup = QPushButton(self,"bSup") - self.bSup.setGeometry(QRect(350,440,142,30)) self.bSup.setAutoDefault(1) + layout1.addWidget(self.bSup) - self.LBNouvCommande = QListBox(self,"LBNouvCommande") - self.LBNouvCommande.setGeometry(QRect(10,110,230,320)) - - self.LBRegles = QListBox(self,"LBRegles") - self.LBRegles.setGeometry(QRect(260,30,230,400)) + DRacLayout.addMultiCellLayout(layout1,4,4,0,3) self.languageChange() @@ -108,17 +122,17 @@ class DRac(QWidget): def languageChange(self): self.setCaption(self.__tr("DMacro")) - self.bHelp.setText(self.__tr("&Documentation")) - self.bHelp.setAccel(self.__tr("Alt+D")) - QToolTip.add(self.bHelp,self.__tr("affichage documentation aster")) - 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")) self.BNext.setText(QString.null) QToolTip.add(self.BNext,self.__tr("affiche la prochaine occurence")) - self.textLabel1_4.setText(self.__tr("Commandes :")) + self.textLabel6.setText(self.__tr("Filtre")) self.buttonGroup1.setTitle(self.__tr("Affichage")) - 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.RBGroupe.setText(self.__tr("par groupe")) + 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.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")) diff --git a/Ui/desRacine.ui b/Ui/desRacine.ui index e3c46363..8bfcbdb1 100644 --- a/Ui/desRacine.ui +++ b/Ui/desRacine.ui @@ -21,244 +21,177 @@ DMacro - + - bHelp + unnamed - - - 10 - 440 - 142 - 30 - - - - &Documentation - - - Alt+D - - - true - - - affichage documentation aster - - - - - textLabel6 - - - - 10 - 70 - 30 - 30 - - - - Filtre - - - - - textLabel1_4_2 - - - - 350 - 0 - 50 - 21 - - - - <b><u>Régles :</u></b> - - - - - LEFiltre - - - - 50 - 70 - 140 - 30 - - - - - - BNext - - - - 200 - 70 - 30 - 31 - - - - - - - image0 - - - affiche la prochaine occurence - - - - - textLabel1_4 - - - - 90 - 0 - 75 - 21 - - - - <b><u>Commandes :</u></b> - - - - - buttonGroup1 - - - - 10 - 20 - 230 - 40 - - - - Affichage - - + - RBGroupe + LBNouvCommande - - - 20 - 10 - 101 - 20 - + + + + BNext - par groupe + + + + image0 + + + affiche la prochaine occurence - + - RBalpha + LEFiltre - - - 140 - 10 - 80 - 20 - + + + + textLabel6 - alphabétique + Filtre + + + + + buttonGroup1 - - true + + Affichage + + + RBalpha + + + + 110 + 20 + 110 + 20 + + + + alphabétique + + + true + + + + + RBGroupe + + + + 10 + 20 + 101 + 20 + + + + par groupe + + - - - - bOk - - - - 180 - 440 - 142 - 30 - - - - &Valider - - - Shift+A, Alt+A, Alt+A, Alt+A - - - true - - - true - - - validation de la saisie - - - - - bSup - - - - 350 - 440 - 142 - 30 - - - - &Supprimer - - - Alt+S - - - true - - - suppression du mot clef - - - - - LBNouvCommande - - - - 10 - 110 - 230 - 320 - - - - - - LBRegles - - - - 260 - 30 - 230 - 400 - - - + + + textLabel1_4 + + + <b><u>Commandes :</u></b> + + + + + LBRegles + + + + 250 + 400 + + + + + + textLabel1_4_2 + + + <b><u>Régles :</u></b> + + + + + layout1 + + + + unnamed + + + + bHelp + + + &Documentation + + + Alt+D + + + true + + + affichage documentation aster + + + + + bOk + + + &Valider + + + Shift+A, Alt+A, Alt+A, Alt+A + + + true + + + true + + + validation de la saisie + + + + + bSup + + + &Supprimer + + + Alt+S + + + true + + + suppression du mot clef + + + + + diff --git a/Ui/desSelectVal.py b/Ui/desSelectVal.py index c9c0d31d..90fc043f 100644 --- a/Ui/desSelectVal.py +++ b/Ui/desSelectVal.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'desSelectVal.ui' # -# Created: mer oct 10 10:48:18 2007 +# Created: ven nov 9 14:51:34 2007 # by: The PyQt User Interface Compiler (pyuic) 3.13 # # WARNING! All changes made in this file will be lost! @@ -19,32 +19,45 @@ class DSelVal(QWidget): self.setName("DSelVal") + DSelValLayout = QGridLayout(self,1,1,11,6,"DSelValLayout") + + self.TBtext = QTextBrowser(self,"TBtext") + + DSelValLayout.addMultiCellWidget(self.TBtext,0,0,0,1) self.BGSeparateur = QButtonGroup(self,"BGSeparateur") - self.BGSeparateur.setGeometry(QRect(10,390,180,80)) + self.BGSeparateur.setMinimumSize(QSize(180,100)) - self.BpointVirgule = QRadioButton(self.BGSeparateur,"BpointVirgule") - self.BpointVirgule.setGeometry(QRect(50,50,81,21)) + LayoutWidget = QWidget(self.BGSeparateur,"layout1") + LayoutWidget.setGeometry(QRect(17,20,150,74)) + layout1 = QGridLayout(LayoutWidget,1,1,11,6,"layout1") - self.Bvirgule = QRadioButton(self.BGSeparateur,"Bvirgule") - self.Bvirgule.setGeometry(QRect(50,30,81,21)) + self.BpointVirgule = QRadioButton(LayoutWidget,"BpointVirgule") - self.Bespace = QRadioButton(self.BGSeparateur,"Bespace") - self.Bespace.setGeometry(QRect(50,10,81,21)) + layout1.addWidget(self.BpointVirgule,2,0) + + self.Bespace = QRadioButton(LayoutWidget,"Bespace") self.Bespace.setChecked(1) + layout1.addWidget(self.Bespace,0,0) + + self.Bvirgule = QRadioButton(LayoutWidget,"Bvirgule") + + layout1.addWidget(self.Bvirgule,1,0) + + DSelValLayout.addMultiCellWidget(self.BGSeparateur,1,2,0,0) + self.BImportTout = QPushButton(self,"BImportTout") - self.BImportTout.setGeometry(QRect(200,440,210,31)) + + DSelValLayout.addWidget(self.BImportTout,2,1) self.BImportSel = QPushButton(self,"BImportSel") - self.BImportSel.setGeometry(QRect(200,400,210,31)) - self.TBtext = QTextBrowser(self,"TBtext") - self.TBtext.setGeometry(QRect(0,0,411,391)) + DSelValLayout.addWidget(self.BImportSel,1,1) self.languageChange() - self.resize(QSize(413,480).expandedTo(self.minimumSizeHint())) + self.resize(QSize(413,497).expandedTo(self.minimumSizeHint())) self.clearWState(Qt.WState_Polished) self.connect(self.BGSeparateur,SIGNAL("clicked(int)"),self.SeparateurSelect) @@ -56,8 +69,8 @@ class DSelVal(QWidget): self.setCaption(self.__trUtf8("\x53\xc3\xa9\x6c\x65\x63\x74\x69\x6f\x6e\x20\x64\x65\x20\x76\x61\x6c\x65\x75\x72\x73")) self.BGSeparateur.setTitle(self.__trUtf8("\x53\xc3\xa9\x70\x61\x72\x61\x74\x65\x75\x72")) self.BpointVirgule.setText(self.__tr("point-virgule")) - self.Bvirgule.setText(self.__tr("virgule")) self.Bespace.setText(self.__tr("espace")) + self.Bvirgule.setText(self.__tr("virgule")) self.BImportTout.setText(self.__tr("Importer Tout")) self.BImportSel.setText(self.__tr("Ajouter Selection")) diff --git a/Ui/desSelectVal.ui b/Ui/desSelectVal.ui index 75cfb884..ae092f56 100644 --- a/Ui/desSelectVal.ui +++ b/Ui/desSelectVal.ui @@ -9,124 +9,97 @@ 0 0 413 - 480 + 497 Sélection de valeurs - + - BGSeparateur + unnamed - - - 10 - 390 - 180 - 80 - - - - Séparateur - - + - BpointVirgule + TBtext - - - 50 - 50 - 81 - 21 - + + + + BGSeparateur - - point-virgule + + + 180 + 100 + + + Séparateur + + + + layout1 + + + + 17 + 20 + 150 + 74 + + + + + unnamed + + + + BpointVirgule + + + point-virgule + + + + + Bespace + + + espace + + + true + + + + + Bvirgule + + + virgule + + + + - + - Bvirgule - - - - 50 - 30 - 81 - 21 - + BImportTout - virgule + Importer Tout - + - Bespace - - - - 50 - 10 - 81 - 21 - + BImportSel - espace - - - true + Ajouter Selection - - - - BImportTout - - - - 200 - 440 - 210 - 31 - - - - Importer Tout - - - - - BImportSel - - - - 200 - 400 - 210 - 31 - - - - Ajouter Selection - - - - - TBtext - - - - 0 - 0 - 411 - 391 - - - + diff --git a/Ui/desUniqueASSD.py b/Ui/desUniqueASSD.py index 24b38d77..82d543d8 100644 --- a/Ui/desUniqueASSD.py +++ b/Ui/desUniqueASSD.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'desUniqueASSD.ui' # -# Created: mer mar 21 10:41:08 2007 +# Created: ven nov 9 14:51:34 2007 # by: The PyQt User Interface Compiler (pyuic) 3.13 # # WARNING! All changes made in this file will be lost! @@ -20,35 +20,47 @@ class DUnASSD(QWidget): self.setMinimumSize(QSize(350,0)) + DUnASSDLayout = QGridLayout(self,1,1,11,6,"DUnASSDLayout") self.tabuniqueinto = QTabWidget(self,"tabuniqueinto") - self.tabuniqueinto.setGeometry(QRect(10,20,460,440)) self.Widget8 = QWidget(self.tabuniqueinto,"Widget8") + Widget8Layout = QGridLayout(self.Widget8,1,1,11,6,"Widget8Layout") - self.bSup = QPushButton(self.Widget8,"bSup") - self.bSup.setGeometry(QRect(310,370,142,30)) - self.bSup.setAutoDefault(1) + self.Commentaire = QLabel(self.Widget8,"Commentaire") + self.Commentaire.setMinimumSize(QSize(380,30)) - self.bOk = QPushButton(self.Widget8,"bOk") - self.bOk.setGeometry(QRect(160,370,142,30)) - self.bOk.setAutoDefault(1) - self.bOk.setDefault(1) + Widget8Layout.addWidget(self.Commentaire,2,0) + + layout1 = QHBoxLayout(None,0,6,"layout1") self.bHelp = QPushButton(self.Widget8,"bHelp") - self.bHelp.setGeometry(QRect(10,370,142,30)) self.bHelp.setAutoDefault(1) + layout1.addWidget(self.bHelp) - self.textLabel2 = QLabel(self.Widget8,"textLabel2") - self.textLabel2.setGeometry(QRect(140,20,160,60)) + self.bOk = QPushButton(self.Widget8,"bOk") + self.bOk.setAutoDefault(1) + self.bOk.setDefault(1) + layout1.addWidget(self.bOk) - self.Commentaire = QLabel(self.Widget8,"Commentaire") - self.Commentaire.setGeometry(QRect(40,311,381,30)) + self.bSup = QPushButton(self.Widget8,"bSup") + self.bSup.setAutoDefault(1) + layout1.addWidget(self.bSup) + + Widget8Layout.addLayout(layout1,3,0) self.listBoxASSD = QListBox(self.Widget8,"listBoxASSD") - self.listBoxASSD.setGeometry(QRect(40,100,380,180)) + + Widget8Layout.addWidget(self.listBoxASSD,1,0) + + self.textLabel2 = QLabel(self.Widget8,"textLabel2") + self.textLabel2.setMinimumSize(QSize(436,50)) + + Widget8Layout.addWidget(self.textLabel2,0,0) self.tabuniqueinto.insertTab(self.Widget8,QString("")) + DUnASSDLayout.addWidget(self.tabuniqueinto,0,0) + self.languageChange() self.resize(QSize(482,480).expandedTo(self.minimumSizeHint())) @@ -61,17 +73,17 @@ class DUnASSD(QWidget): def languageChange(self): self.setCaption(self.__tr("DUnIn")) - 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.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.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.textLabel2.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\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\x0a\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\x3a\x3c\x2f\x70\x3e\x3c\x2f\x66\x6f\x6e\x74\x3e")) - self.Commentaire.setText(QString.null) self.tabuniqueinto.changeTab(self.Widget8,self.__tr("Saisir Valeur")) diff --git a/Ui/desUniqueASSD.ui b/Ui/desUniqueASSD.ui index a22cbb9e..d45181ad 100644 --- a/Ui/desUniqueASSD.ui +++ b/Ui/desUniqueASSD.ui @@ -21,151 +21,127 @@ DUnIn - + - tabuniqueinto + unnamed - - - 10 - 20 - 460 - 440 - - - + - Widget8 + tabuniqueinto - - Saisir Valeur - - - - bSup - - - - 310 - 370 - 142 - 30 - - - - &Supprimer - - - Alt+S - - - true - - - suppression du mot clef - - - - - bOk - - - - 160 - 370 - 142 - 30 - - - - &Valider - - - Shift+A, Alt+A, Alt+A, Alt+A - - - true - - - true - - - validation de la saisie - - - - - bHelp - - - - 10 - 370 - 142 - 30 - - - - &Documentation - - - Alt+D - - - true - - - affichage documentation aster - - - + - textLabel2 - - - - 140 - 20 - 160 - 60 - - - - <font size="+1"><p align="center">Structures de données du type + Widget8 + + + Saisir Valeur + + + + unnamed + + + + Commentaire + + + + 380 + 30 + + + + + + + + + layout1 + + + + unnamed + + + + bHelp + + + &Documentation + + + Alt+D + + + true + + + affichage documentation aster + + + + + bOk + + + &Valider + + + Shift+A, Alt+A, Alt+A, Alt+A + + + true + + + true + + + validation de la saisie + + + + + bSup + + + &Supprimer + + + Alt+S + + + true + + + suppression du mot clef + + + + + + + listBoxASSD + + + + + textLabel2 + + + + 436 + 50 + + + + <font size="+1"><p align="center">Structures de données du type requis par l'objet courant :</p></font> - - - - - Commentaire - - - - 40 - 311 - 381 - 30 - - - - - - - - - listBoxASSD - - - - 40 - 100 - 380 - 180 - - + + + - + diff --git a/Ui/desUniqueBase.py b/Ui/desUniqueBase.py index 2d756cb6..7d31bca0 100644 --- a/Ui/desUniqueBase.py +++ b/Ui/desUniqueBase.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'desUniqueBase.ui' # -# Created: lun oct 15 14:18:49 2007 +# Created: ven nov 9 14:51:34 2007 # by: The PyQt User Interface Compiler (pyuic) 3.13 # # WARNING! All changes made in this file will be lost! @@ -20,38 +20,64 @@ class DUnBase(QWidget): self.setMinimumSize(QSize(350,0)) + DUnBaseLayout = QGridLayout(self,1,1,11,6,"DUnBaseLayout") self.tabuniqueinto = QTabWidget(self,"tabuniqueinto") - self.tabuniqueinto.setGeometry(QRect(10,20,460,440)) self.Widget8 = QWidget(self.tabuniqueinto,"Widget8") + Widget8Layout = QGridLayout(self.Widget8,1,1,11,6,"Widget8Layout") - self.bSup = QPushButton(self.Widget8,"bSup") - self.bSup.setGeometry(QRect(310,370,142,30)) - self.bSup.setAutoDefault(1) + layout1 = QHBoxLayout(None,0,6,"layout1") + + self.bHelp = QPushButton(self.Widget8,"bHelp") + self.bHelp.setAutoDefault(1) + layout1.addWidget(self.bHelp) self.bOk = QPushButton(self.Widget8,"bOk") - self.bOk.setGeometry(QRect(160,370,142,30)) self.bOk.setAutoDefault(1) self.bOk.setDefault(1) + layout1.addWidget(self.bOk) - self.bHelp = QPushButton(self.Widget8,"bHelp") - self.bHelp.setGeometry(QRect(10,370,142,30)) - self.bHelp.setAutoDefault(1) + self.bSup = QPushButton(self.Widget8,"bSup") + self.bSup.setAutoDefault(1) + layout1.addWidget(self.bSup) + + Widget8Layout.addLayout(layout1,5,0) self.Commentaire = QLabel(self.Widget8,"Commentaire") - self.Commentaire.setGeometry(QRect(38,316,381,41)) + self.Commentaire.setMinimumSize(QSize(430,40)) + + Widget8Layout.addWidget(self.Commentaire,4,0) + + layout2 = QHBoxLayout(None,0,6,"layout2") self.textLabel2 = QLabel(self.Widget8,"textLabel2") - self.textLabel2.setGeometry(QRect(40,160,50,21)) + layout2.addWidget(self.textLabel2) self.lineEditVal = QLineEdit(self.Widget8,"lineEditVal") - self.lineEditVal.setGeometry(QRect(120,150,231,31)) + self.lineEditVal.setMinimumSize(QSize(290,50)) + layout2.addWidget(self.lineEditVal) + + Widget8Layout.addLayout(layout2,2,0) + + layout3 = QHBoxLayout(None,0,6,"layout3") + spacer1 = QSpacerItem(281,21,QSizePolicy.Expanding,QSizePolicy.Minimum) + layout3.addItem(spacer1) self.bParametres = QPushButton(self.Widget8,"bParametres") - self.bParametres.setGeometry(QRect(300,10,140,30)) + self.bParametres.setSizePolicy(QSizePolicy(0,0,0,0,self.bParametres.sizePolicy().hasHeightForWidth())) + self.bParametres.setMinimumSize(QSize(140,30)) + layout3.addWidget(self.bParametres) + + Widget8Layout.addLayout(layout3,0,0) + spacer2 = QSpacerItem(20,81,QSizePolicy.Minimum,QSizePolicy.Expanding) + Widget8Layout.addItem(spacer2,1,0) + spacer3 = QSpacerItem(41,91,QSizePolicy.Minimum,QSizePolicy.Expanding) + Widget8Layout.addItem(spacer3,3,0) self.tabuniqueinto.insertTab(self.Widget8,QString("")) + DUnBaseLayout.addWidget(self.tabuniqueinto,0,0) + self.languageChange() self.resize(QSize(482,480).expandedTo(self.minimumSizeHint())) @@ -66,15 +92,15 @@ class DUnBase(QWidget): def languageChange(self): self.setCaption(self.__tr("DUnIn")) - 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.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.Commentaire.setText(QString.null) self.textLabel2.setText(self.__tr("

Valeur:

")) self.bParametres.setText(self.__tr("Parametres")) diff --git a/Ui/desUniqueBase.ui b/Ui/desUniqueBase.ui index d3bf41d2..62fdacee 100644 --- a/Ui/desUniqueBase.ui +++ b/Ui/desUniqueBase.ui @@ -21,166 +21,219 @@ DUnIn - + - tabuniqueinto + unnamed - - - 10 - 20 - 460 - 440 - - - + - Widget8 + tabuniqueinto - - Saisir Valeur - - - - bSup - - - - 310 - 370 - 142 - 30 - - - - &Supprimer - - - Alt+S - - - true - - - suppression du mot clef - - - - - bOk - - - - 160 - 370 - 142 - 30 - - - - &Valider - - - Shift+A, Alt+A, Alt+A, Alt+A - - - true - - - true - - - validation de la saisie - - - - - bHelp - - - - 10 - 370 - 142 - 30 - - - - &Documentation - - - Alt+D - - - true - - - affichage documentation aster - - - + - Commentaire - - - - 38 - 316 - 381 - 41 - - - - - - - - - textLabel2 - - - - 40 - 160 - 50 - 21 - - - - <b><u><p align="center">Valeur: </p></u></b> - - - - - lineEditVal - - - - 120 - 150 - 231 - 31 - - - - - - bParametres - - - - 300 - 10 - 140 - 30 - - - - Parametres + Widget8 + + Saisir Valeur + + + + unnamed + + + + layout1 + + + + unnamed + + + + bHelp + + + &Documentation + + + Alt+D + + + true + + + affichage documentation aster + + + + + bOk + + + &Valider + + + Shift+A, Alt+A, Alt+A, Alt+A + + + true + + + true + + + validation de la saisie + + + + + bSup + + + &Supprimer + + + Alt+S + + + true + + + suppression du mot clef + + + + + + + Commentaire + + + + 430 + 40 + + + + + + + + + layout2 + + + + unnamed + + + + textLabel2 + + + <b><u><p align="center">Valeur: </p></u></b> + + + + + lineEditVal + + + + 290 + 50 + + + + + + + + layout3 + + + + unnamed + + + + spacer1 + + + Horizontal + + + Expanding + + + + 281 + 21 + + + + + + bParametres + + + + 0 + 0 + 0 + 0 + + + + + 140 + 30 + + + + Parametres + + + + + + + spacer2 + + + Vertical + + + Expanding + + + + 20 + 81 + + + + + + spacer3 + + + Vertical + + + Expanding + + + + 41 + 91 + + + + - + diff --git a/Ui/desUniqueComp.py b/Ui/desUniqueComp.py index e0a470df..1ef60309 100644 --- a/Ui/desUniqueComp.py +++ b/Ui/desUniqueComp.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'desUniqueComp.ui' # -# Created: mar aoû 7 16:45:58 2007 +# Created: ven nov 9 14:51:34 2007 # by: The PyQt User Interface Compiler (pyuic) 3.13 # # WARNING! All changes made in this file will be lost! @@ -20,50 +20,71 @@ class DUnComp(QWidget): self.setMinimumSize(QSize(350,0)) + DUnCompLayout = QGridLayout(self,1,1,11,6,"DUnCompLayout") self.tabuniqueinto = QTabWidget(self,"tabuniqueinto") - self.tabuniqueinto.setGeometry(QRect(10,20,460,440)) self.Widget8 = QWidget(self.tabuniqueinto,"Widget8") + Widget8Layout = QGridLayout(self.Widget8,1,1,11,6,"Widget8Layout") self.bSup = QPushButton(self.Widget8,"bSup") - self.bSup.setGeometry(QRect(310,370,142,30)) self.bSup.setAutoDefault(1) + Widget8Layout.addWidget(self.bSup,6,3) + self.bOk = QPushButton(self.Widget8,"bOk") - self.bOk.setGeometry(QRect(160,370,142,30)) self.bOk.setAutoDefault(1) self.bOk.setDefault(1) + Widget8Layout.addMultiCellWidget(self.bOk,6,6,1,2) + self.bHelp = QPushButton(self.Widget8,"bHelp") - self.bHelp.setGeometry(QRect(10,370,142,30)) self.bHelp.setAutoDefault(1) + Widget8Layout.addWidget(self.bHelp,6,0) + + layout3 = QVBoxLayout(None,0,6,"layout3") + self.textLabel1 = QLabel(self.Widget8,"textLabel1") - self.textLabel1.setGeometry(QRect(60,30,190,20)) + layout3.addWidget(self.textLabel1) + + self.LEcomp = QLineEdit(self.Widget8,"LEcomp") + self.LEcomp.setMinimumSize(QSize(390,40)) + layout3.addWidget(self.LEcomp) + + Widget8Layout.addMultiCellLayout(layout3,0,0,0,3) self.Commentaire = QLabel(self.Widget8,"Commentaire") - self.Commentaire.setGeometry(QRect(140,320,170,30)) - self.LEImag = QLineEdit(self.Widget8,"LEImag") - self.LEImag.setGeometry(QRect(240,250,170,31)) + Widget8Layout.addMultiCellWidget(self.Commentaire,5,5,0,3) self.LEReel = QLineEdit(self.Widget8,"LEReel") - self.LEReel.setGeometry(QRect(50,250,170,31)) + self.LEReel.setMinimumSize(QSize(190,40)) - self.LEcomp = QLineEdit(self.Widget8,"LEcomp") - self.LEcomp.setGeometry(QRect(50,60,360,40)) + Widget8Layout.addMultiCellWidget(self.LEReel,3,3,0,1) + + self.LEImag = QLineEdit(self.Widget8,"LEImag") + self.LEImag.setMinimumSize(QSize(190,40)) + + Widget8Layout.addMultiCellWidget(self.LEImag,3,3,2,3) self.buttonGroup1 = QButtonGroup(self.Widget8,"buttonGroup1") - self.buttonGroup1.setGeometry(QRect(50,160,360,70)) + + self.RBRI = QRadioButton(self.buttonGroup1,"RBRI") + self.RBRI.setGeometry(QRect(20,40,335,20)) self.RBMP = QRadioButton(self.buttonGroup1,"RBMP") - self.RBMP.setGeometry(QRect(10,40,330,21)) + self.RBMP.setGeometry(QRect(20,20,335,20)) - self.RBRI = QRadioButton(self.buttonGroup1,"RBRI") - self.RBRI.setGeometry(QRect(10,20,330,21)) + Widget8Layout.addMultiCellWidget(self.buttonGroup1,2,2,0,3) + spacer3 = QSpacerItem(20,41,QSizePolicy.Minimum,QSizePolicy.Expanding) + Widget8Layout.addItem(spacer3,1,1) + spacer4 = QSpacerItem(20,41,QSizePolicy.Minimum,QSizePolicy.Expanding) + Widget8Layout.addItem(spacer4,4,1) self.tabuniqueinto.insertTab(self.Widget8,QString("")) + DUnCompLayout.addWidget(self.tabuniqueinto,0,0) + self.languageChange() self.resize(QSize(484,480).expandedTo(self.minimumSizeHint())) @@ -91,8 +112,8 @@ class DUnComp(QWidget): self.textLabel1.setText(self.__tr("Complexe de la forme : a+bj")) self.Commentaire.setText(self.__tr("Un complexe est attendu")) self.buttonGroup1.setTitle(self.__tr("OU")) - self.RBMP.setText(self.__tr("MP : Module Phase")) - self.RBRI.setText(self.__trUtf8("\x52\x49\x20\x20\x20\x3a\x20\x52\xc3\xa9\x65\x6c\x09\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x49\x6d\x61\x67\x69\x6e\x61\x69\x72\x65")) + self.RBRI.setText(self.__trUtf8("\x52\x49\x20\x20\x20\x3a\x20\x52\xc3\xa9\x65\x6c\x09\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x49\x6d\x61\x67\x69\x6e\x61\x69\x72\x65")) + self.RBMP.setText(self.__tr("MP : Module Phase")) self.tabuniqueinto.changeTab(self.Widget8,self.__tr("Saisir Valeur")) diff --git a/Ui/desUniqueComp.ui b/Ui/desUniqueComp.ui index 54af7913..92689735 100644 --- a/Ui/desUniqueComp.ui +++ b/Ui/desUniqueComp.ui @@ -21,224 +21,216 @@ DUnComp - + - tabuniqueinto + unnamed - - - 10 - 20 - 460 - 440 - - - + - Widget8 + tabuniqueinto - - Saisir Valeur - - - - bSup - - - - 310 - 370 - 142 - 30 - - - - &Supprimer - - - Alt+S - - - true - - - suppression du mot clef - - - - - bOk - - - - 160 - 370 - 142 - 30 - - - - &Valider - - - Shift+A, Alt+A, Alt+A, Alt+A - - - true - - - true - - - validation de la saisie - - - - - bHelp - - - - 10 - 370 - 142 - 30 - - - - &Documentation - - - Alt+D - - - true - - - affichage documentation aster - - - - - textLabel1 - - - - 60 - 30 - 190 - 20 - - - - <font size="+2">Complexe de la forme : a+bj</font> - - - - - Commentaire - - - - 140 - 320 - 170 - 30 - - - - <font size="+2">Un complexe est attendu</font> - - - - - LEImag - - - - 240 - 250 - 170 - 31 - - - - - - LEReel - - - - 50 - 250 - 170 - 31 - - - - + - LEcomp - - - - 50 - 60 - 360 - 40 - - - - - - buttonGroup1 - - - - 50 - 160 - 360 - 70 - + Widget8 - - OU - - + + Saisir Valeur + + - RBMP - - - - 10 - 40 - 330 - 21 - - - - MP : Module Phase - - - - - RBRI - - - - 10 - 20 - 330 - 21 - - - - RI : Réel Imaginaire + unnamed - + + + 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 + + + + + bHelp + + + &Documentation + + + Alt+D + + + true + + + affichage documentation aster + + + + + layout3 + + + + unnamed + + + + textLabel1 + + + <font size="+2">Complexe de la forme : a+bj</font> + + + + + LEcomp + + + + 390 + 40 + + + + + + + + Commentaire + + + <font size="+2">Un complexe est attendu</font> + + + + + LEReel + + + + 190 + 40 + + + + + + LEImag + + + + 190 + 40 + + + + + + buttonGroup1 + + + OU + + + + RBRI + + + + 20 + 40 + 335 + 20 + + + + RI : Réel Imaginaire + + + + + RBMP + + + + 20 + 20 + 335 + 20 + + + + MP : Module Phase + + + + + + spacer3 + + + Vertical + + + Expanding + + + + 20 + 41 + + + + + + spacer4 + + + Vertical + + + Expanding + + + + 20 + 41 + + + + - + diff --git a/Ui/desUniqueInto.ui b/Ui/desUniqueInto.ui index 6fa50f00..3dc4146b 100644 --- a/Ui/desUniqueInto.ui +++ b/Ui/desUniqueInto.ui @@ -21,166 +21,120 @@ DUnIn - + - tabuniqueinto + unnamed - - - 20 - 20 - 450 - 440 - - - + - Widget8 + tabuniqueinto - - Saisir Valeur - - - - textLabel2 - - - - 170 - 30 - 100 - 21 - - - - <b><u><p align="center">Valeurs possibles</p></u></b> - - - - - textLabel1 - - - - 170 - -10 - 90 - 31 - - - - <p align="center">Choisir une valeur</p> - - - + - Commentaire - - - - 38 - 316 - 381 - 41 - - - - - - - - - bHelp - - - - 0 - 370 - 142 - 30 - - - - &Documentation - - - Alt+D - - - true - - - affichage documentation aster - - - - - listBoxVal - - - - 80 - 60 - 290 - 240 - - - - - - bOk - - - - 150 - 370 - 142 - 30 - - - - &Valider - - - Shift+A, Alt+A, Alt+A, Alt+A - - - true - - - true - - - validation de la saisie - - - - - bSup - - - - 300 - 370 - 142 - 30 - - - - &Supprimer - - - Alt+S - - - true - - - suppression du mot clef - + Widget8 + + + Saisir Valeur + + + + unnamed + + + + layout1 + + + + unnamed + + + + bHelp + + + &Documentation + + + Alt+D + + + true + + + affichage documentation aster + + + + + bOk + + + &Valider + + + Shift+A, Alt+A, Alt+A, Alt+A + + + true + + + true + + + validation de la saisie + + + + + bSup + + + &Supprimer + + + Alt+S + + + true + + + suppression du mot clef + + + + + + + textLabel2 + + + <b><u><p align="center">Valeurs possibles</p></u></b> + + + + + listBoxVal + + + + + Commentaire + + + + 420 + 30 + + + + + + + - + diff --git a/Ui/desUniqueSDCO.py b/Ui/desUniqueSDCO.py index 58efba85..c95da867 100644 --- a/Ui/desUniqueSDCO.py +++ b/Ui/desUniqueSDCO.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'desUniqueSDCO.ui' # -# Created: lun oct 1 12:28:45 2007 +# Created: ven nov 9 14:51:34 2007 # by: The PyQt User Interface Compiler (pyuic) 3.13 # # WARNING! All changes made in this file will be lost! @@ -20,59 +20,87 @@ class DUnSDCO(QWidget): self.setMinimumSize(QSize(350,0)) + DUnSDCOLayout = QGridLayout(self,1,1,11,6,"DUnSDCOLayout") self.tabuniqueinto = QTabWidget(self,"tabuniqueinto") - self.tabuniqueinto.setGeometry(QRect(10,20,460,440)) self.Widget8 = QWidget(self.tabuniqueinto,"Widget8") + Widget8Layout = QGridLayout(self.Widget8,1,1,11,6,"Widget8Layout") - self.bSup = QPushButton(self.Widget8,"bSup") - self.bSup.setGeometry(QRect(310,370,142,30)) - self.bSup.setAutoDefault(1) + layout4 = QHBoxLayout(None,0,6,"layout4") - self.bOk = QPushButton(self.Widget8,"bOk") - self.bOk.setGeometry(QRect(160,370,142,30)) - self.bOk.setAutoDefault(1) - self.bOk.setDefault(1) + self.textLabel1 = QLabel(self.Widget8,"textLabel1") + layout4.addWidget(self.textLabel1) + + layout3 = QVBoxLayout(None,0,6,"layout3") + + self.rbOui = QRadioButton(self.Widget8,"rbOui") + self.rbOui.setEnabled(1) + self.rbOui.setChecked(1) + layout3.addWidget(self.rbOui) + + self.rbNon = QRadioButton(self.Widget8,"rbNon") + self.rbNon.setEnabled(0) + self.rbNon.setChecked(0) + layout3.addWidget(self.rbNon) + layout4.addLayout(layout3) + + Widget8Layout.addLayout(layout4,0,0) + + layout6 = QHBoxLayout(None,0,6,"layout6") self.bHelp = QPushButton(self.Widget8,"bHelp") - self.bHelp.setGeometry(QRect(10,370,142,30)) self.bHelp.setAutoDefault(1) + layout6.addWidget(self.bHelp) + spacer3_3 = QSpacerItem(16,20,QSizePolicy.Expanding,QSizePolicy.Minimum) + layout6.addItem(spacer3_3) - self.Commentaire = QLabel(self.Widget8,"Commentaire") - self.Commentaire.setGeometry(QRect(40,311,381,30)) + self.bOk = QPushButton(self.Widget8,"bOk") + self.bOk.setAutoDefault(1) + self.bOk.setDefault(1) + layout6.addWidget(self.bOk) + spacer3_3_3 = QSpacerItem(16,20,QSizePolicy.Expanding,QSizePolicy.Minimum) + layout6.addItem(spacer3_3_3) - self.textLabel2 = QLabel(self.Widget8,"textLabel2") - self.textLabel2.setGeometry(QRect(110,280,190,30)) + self.bSup = QPushButton(self.Widget8,"bSup") + self.bSup.setAutoDefault(1) + layout6.addWidget(self.bSup) - self.textLabel1 = QLabel(self.Widget8,"textLabel1") - self.textLabel1.setGeometry(QRect(40,10,130,41)) + Widget8Layout.addLayout(layout6,5,0) + + layout5 = QVBoxLayout(None,0,6,"layout5") self.frame3 = QFrame(self.Widget8,"frame3") - self.frame3.setGeometry(QRect(20,70,190,40)) self.frame3.setFrameShape(QFrame.StyledPanel) self.frame3.setFrameShadow(QFrame.Raised) self.textLabel2_2 = QLabel(self.frame3,"textLabel2_2") - self.textLabel2_2.setGeometry(QRect(10,10,170,20)) + self.textLabel2_2.setGeometry(QRect(10,10,280,26)) + layout5.addWidget(self.frame3) self.LESDCO = QLineEdit(self.Widget8,"LESDCO") - self.LESDCO.setGeometry(QRect(220,70,220,40)) + self.LESDCO.setMinimumSize(QSize(300,40)) + layout5.addWidget(self.LESDCO) - self.rbNon = QRadioButton(self.Widget8,"rbNon") - self.rbNon.setEnabled(0) - self.rbNon.setGeometry(QRect(190,30,50,20)) - self.rbNon.setChecked(0) + Widget8Layout.addLayout(layout5,1,0) - self.rbOui = QRadioButton(self.Widget8,"rbOui") - self.rbOui.setEnabled(1) - self.rbOui.setGeometry(QRect(190,10,50,20)) - self.rbOui.setChecked(1) + self.textLabel2 = QLabel(self.Widget8,"textLabel2") + + Widget8Layout.addWidget(self.textLabel2,2,0) + spacer5 = QSpacerItem(31,131,QSizePolicy.Minimum,QSizePolicy.Expanding) + Widget8Layout.addItem(spacer5,3,0) + + self.Commentaire = QLabel(self.Widget8,"Commentaire") + self.Commentaire.setMinimumSize(QSize(311,30)) + + Widget8Layout.addWidget(self.Commentaire,4,0) self.tabuniqueinto.insertTab(self.Widget8,QString("")) + DUnSDCOLayout.addWidget(self.tabuniqueinto,0,0) + self.languageChange() - self.resize(QSize(482,480).expandedTo(self.minimumSizeHint())) + self.resize(QSize(461,480).expandedTo(self.minimumSizeHint())) self.clearWState(Qt.WState_Polished) self.connect(self.bHelp,SIGNAL("clicked()"),self.ViewDoc) @@ -84,21 +112,21 @@ class DUnSDCO(QWidget): def languageChange(self): self.setCaption(self.__tr("DUnIn")) - 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("Nouveau Concept : ")) + self.rbOui.setText(self.__tr("Oui")) + self.rbNon.setText(self.__tr("Non")) 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.setText(self.__tr("Un objet de type CO est attendu")) - self.textLabel1.setText(self.__tr("Nouveau Concept : ")) + 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.textLabel2_2.setText(self.__tr("Nom du nouveau concept : ")) - self.rbNon.setText(self.__tr("Non")) - self.rbOui.setText(self.__tr("Oui")) + self.textLabel2.setText(self.__tr("Un objet de type CO est attendu")) + self.Commentaire.setText(QString.null) self.tabuniqueinto.changeTab(self.Widget8,self.__tr("Saisir Valeur")) diff --git a/Ui/desUniqueSDCO.ui b/Ui/desUniqueSDCO.ui index d018e24a..ddf849f2 100644 --- a/Ui/desUniqueSDCO.ui +++ b/Ui/desUniqueSDCO.ui @@ -8,7 +8,7 @@ 0 0 - 482 + 461 480 @@ -21,245 +21,270 @@ DUnIn - + - tabuniqueinto + unnamed - - - 10 - 20 - 460 - 440 - - - + - Widget8 + tabuniqueinto - - Saisir Valeur - - - - bSup - - - - 310 - 370 - 142 - 30 - - - - &Supprimer - - - Alt+S - - - true - - - suppression du mot clef - - - - - bOk - - - - 160 - 370 - 142 - 30 - - - - &Valider - - - Shift+A, Alt+A, Alt+A, Alt+A - - - true - - - true - - - validation de la saisie - - - - - bHelp - - - - 10 - 370 - 142 - 30 - - - - &Documentation - - - Alt+D - - - true - - - affichage documentation aster - - - - - Commentaire - - - - 40 - 311 - 381 - 30 - - - - - - - - - textLabel2 - - - - 110 - 280 - 190 - 30 - - - - <font size="+1">Un objet de type CO est attendu</font> - - - - - textLabel1 - - - - 40 - 10 - 130 - 41 - - - - <font size="+1">Nouveau Concept : </font> - - - + - frame3 - - - - 20 - 70 - 190 - 40 - - - - StyledPanel - - - Raised + Widget8 - + + Saisir Valeur + + - textLabel2_2 + unnamed - - - 10 - 10 - 170 - 20 - - - - <font size="+2">Nom du nouveau concept : </font> - - - - - - LESDCO - - - - 220 - 70 - 220 - 40 - - - - - - rbNon - - - false - - - - 190 - 30 - 50 - 20 - - - - Non - - - false - - - - - rbOui - - - true - - - - 190 - 10 - 50 - 20 - - - - Oui - - - true - + + + layout4 + + + + unnamed + + + + textLabel1 + + + <font size="+1">Nouveau Concept : </font> + + + + + layout3 + + + + unnamed + + + + rbOui + + + true + + + Oui + + + true + + + + + rbNon + + + false + + + Non + + + false + + + + + + + + + layout6 + + + + unnamed + + + + bHelp + + + &Documentation + + + Alt+D + + + true + + + affichage documentation aster + + + + + spacer3_3 + + + Horizontal + + + Expanding + + + + 16 + 20 + + + + + + bOk + + + &Valider + + + Shift+A, Alt+A, Alt+A, Alt+A + + + true + + + true + + + validation de la saisie + + + + + spacer3_3_3 + + + Horizontal + + + Expanding + + + + 16 + 20 + + + + + + bSup + + + &Supprimer + + + Alt+S + + + true + + + suppression du mot clef + + + + + + + layout5 + + + + unnamed + + + + frame3 + + + StyledPanel + + + Raised + + + + textLabel2_2 + + + + 10 + 10 + 280 + 26 + + + + <font size="+2">Nom du nouveau concept : </font> + + + + + + LESDCO + + + + 300 + 40 + + + + + + + + textLabel2 + + + <font size="+1">Un objet de type CO est attendu</font> + + + + + spacer5 + + + Vertical + + + Expanding + + + + 31 + 131 + + + + + + Commentaire + + + + 311 + 30 + + + + + + + - + diff --git a/Ui/desUniqueSDCOInto.py b/Ui/desUniqueSDCOInto.py index 58e45e2f..c95d1e69 100644 --- a/Ui/desUniqueSDCOInto.py +++ b/Ui/desUniqueSDCOInto.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'desUniqueSDCOInto.ui' # -# Created: lun oct 1 15:39:53 2007 +# Created: ven nov 9 14:51:34 2007 # by: The PyQt User Interface Compiler (pyuic) 3.13 # # WARNING! All changes made in this file will be lost! @@ -20,62 +20,86 @@ class DUnSDCOInto(QWidget): self.setMinimumSize(QSize(350,0)) + DUnSDCOIntoLayout = QGridLayout(self,1,1,11,6,"DUnSDCOIntoLayout") self.tabuniqueinto = QTabWidget(self,"tabuniqueinto") - self.tabuniqueinto.setGeometry(QRect(10,20,460,440)) self.Widget8 = QWidget(self.tabuniqueinto,"Widget8") + Widget8Layout = QGridLayout(self.Widget8,1,1,11,6,"Widget8Layout") - self.bSup = QPushButton(self.Widget8,"bSup") - self.bSup.setGeometry(QRect(310,370,142,30)) - self.bSup.setAutoDefault(1) + self.textLabel2 = QLabel(self.Widget8,"textLabel2") - self.bOk = QPushButton(self.Widget8,"bOk") - self.bOk.setGeometry(QRect(160,370,142,30)) - self.bOk.setAutoDefault(1) - self.bOk.setDefault(1) + Widget8Layout.addWidget(self.textLabel2,0,0) + + self.LBSDCO = QListBox(self.Widget8,"LBSDCO") + + Widget8Layout.addWidget(self.LBSDCO,1,0) + + layout1 = QHBoxLayout(None,0,6,"layout1") self.bHelp = QPushButton(self.Widget8,"bHelp") - self.bHelp.setGeometry(QRect(10,370,142,30)) self.bHelp.setAutoDefault(1) + layout1.addWidget(self.bHelp) - self.textLabel2 = QLabel(self.Widget8,"textLabel2") - self.textLabel2.setGeometry(QRect(60,30,340,30)) + self.bOk = QPushButton(self.Widget8,"bOk") + self.bOk.setAutoDefault(1) + self.bOk.setDefault(1) + layout1.addWidget(self.bOk) - self.LBSDCO = QListBox(self.Widget8,"LBSDCO") - self.LBSDCO.setGeometry(QRect(30,70,400,120)) + self.bSup = QPushButton(self.Widget8,"bSup") + self.bSup.setAutoDefault(1) + layout1.addWidget(self.bSup) + + Widget8Layout.addLayout(layout1,6,0) self.textLabel2_3 = QLabel(self.Widget8,"textLabel2_3") - self.textLabel2_3.setGeometry(QRect(120,340,190,20)) + + Widget8Layout.addWidget(self.textLabel2_3,5,0) + + self.Commentaire = QLabel(self.Widget8,"Commentaire") + self.Commentaire.setMinimumSize(QSize(420,30)) + + Widget8Layout.addWidget(self.Commentaire,4,0) + + 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.setGeometry(QRect(220,230,50,20)) self.rbNon.setChecked(1) - self.rbOui = QRadioButton(self.Widget8,"rbOui") - self.rbOui.setEnabled(1) - self.rbOui.setGeometry(QRect(220,210,50,20)) + layout3.addWidget(self.rbNon,1,1) self.textLabel1 = QLabel(self.Widget8,"textLabel1") - self.textLabel1.setGeometry(QRect(20,210,130,41)) + + layout3.addMultiCellWidget(self.textLabel1,0,1,0,0) + + Widget8Layout.addLayout(layout3,2,0) + + layout6 = QHBoxLayout(None,0,6,"layout6") self.frame3 = QFrame(self.Widget8,"frame3") - self.frame3.setGeometry(QRect(10,260,190,40)) + self.frame3.setMinimumSize(QSize(190,50)) self.frame3.setFrameShape(QFrame.StyledPanel) self.frame3.setFrameShadow(QFrame.Raised) self.textLabel2_2 = QLabel(self.frame3,"textLabel2_2") - self.textLabel2_2.setGeometry(QRect(10,10,170,20)) + self.textLabel2_2.setGeometry(QRect(20,10,150,30)) + layout6.addWidget(self.frame3) - self.LESDCO = QLineEdit(self.Widget8,"LESDCO") - self.LESDCO.setEnabled(0) - self.LESDCO.setGeometry(QRect(210,260,220,40)) + self.LEDSCO = QLineEdit(self.Widget8,"LEDSCO") + self.LEDSCO.setMinimumSize(QSize(220,40)) + layout6.addWidget(self.LEDSCO) - self.Commentaire = QLabel(self.Widget8,"Commentaire") - self.Commentaire.setGeometry(QRect(8,307,421,30)) + Widget8Layout.addLayout(layout6,3,0) self.tabuniqueinto.insertTab(self.Widget8,QString("")) + DUnSDCOIntoLayout.addWidget(self.tabuniqueinto,0,0) + self.languageChange() self.resize(QSize(482,480).expandedTo(self.minimumSizeHint())) @@ -86,28 +110,28 @@ class DUnSDCOInto(QWidget): 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.LESDCO,SIGNAL("returnPressed()"),self.LESDCOReturnPressed) self.connect(self.LBSDCO,SIGNAL("clicked(QListBoxItem*)"),self.LBSDCOReturnPressed) + self.connect(self.LEDSCO,SIGNAL("returnPressed()"),self.LESDCOReturnPressed) def languageChange(self): self.setCaption(self.__tr("DUnIn")) - 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.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.bHelp.setText(self.__tr("&Documentation")) self.bHelp.setAccel(self.__tr("Alt+D")) QToolTip.add(self.bHelp,self.__tr("affichage documentation aster")) - 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.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.textLabel2_3.setText(self.__tr("Un objet de type CO est attendu")) - self.rbNon.setText(self.__tr("Non")) + 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 du nouveau concept : ")) - self.Commentaire.setText(QString.null) + self.textLabel2_2.setText(self.__tr(" Nom concept : ")) self.tabuniqueinto.changeTab(self.Widget8,self.__tr("Saisir Valeur")) diff --git a/Ui/desUniqueSDCOInto.ui b/Ui/desUniqueSDCOInto.ui index c507cd0f..05c66eda 100644 --- a/Ui/desUniqueSDCOInto.ui +++ b/Ui/desUniqueSDCOInto.ui @@ -21,274 +21,225 @@ DUnIn - + - tabuniqueinto + unnamed - - - 10 - 20 - 460 - 440 - - - + - Widget8 + tabuniqueinto - - Saisir Valeur - - - - bSup - - - - 310 - 370 - 142 - 30 - - - - &Supprimer - - - Alt+S - - - true - - - suppression du mot clef - - - - - bOk - - - - 160 - 370 - 142 - 30 - - - - &Valider - - - Shift+A, Alt+A, Alt+A, Alt+A - - - true - - - true - - - validation de la saisie - - - - - bHelp - - - - 10 - 370 - 142 - 30 - - - - &Documentation - - - Alt+D - - - true - - - affichage documentation aster - - - + - textLabel2 - - - - 60 - 30 - 340 - 30 - - - - <font size="+1"><u>Structures de données du type requis par l'objet courant </u></font> - - - - - LBSDCO - - - - 30 - 70 - 400 - 120 - - - - - - textLabel2_3 - - - - 120 - 340 - 190 - 20 - - - - <font size="+1">Un objet de type CO est attendu</font> - - - - - rbNon - - - true - - - - 220 - 230 - 50 - 20 - + Widget8 - - Non - - - true - - - - - rbOui - - - true - - - - 220 - 210 - 50 - 20 - - - - Oui - - - - - textLabel1 - - - - 20 - 210 - 130 - 41 - - - - <font size="+1">Nouveau Concept : </font> - - - - - frame3 - - - - 10 - 260 - 190 - 40 - - - - StyledPanel - - - Raised - - + + Saisir Valeur + + - textLabel2_2 - - - - 10 - 10 - 170 - 20 - - - - <font size="+2">Nom du nouveau concept : </font> + unnamed - - - - - LESDCO - - - false - - - - 210 - 260 - 220 - 40 - - - - - - Commentaire - - - - 8 - 307 - 421 - 30 - - - - - + + + textLabel2 + + + <font size="+1"><u>Structures de données du type requis par l'objet courant </u></font> + + + + + LBSDCO + + + + + layout1 + + + + unnamed + + + + bHelp + + + &Documentation + + + Alt+D + + + true + + + affichage documentation aster + + + + + bOk + + + &Valider + + + Shift+A, Alt+A, Alt+A, Alt+A + + + true + + + true + + + validation de la saisie + + + + + bSup + + + &Supprimer + + + Alt+S + + + true + + + suppression du mot clef + + + + + + + textLabel2_3 + + + <font size="+1">Un objet de type CO est attendu</font> + + + + + Commentaire + + + + 420 + 30 + + + + + + + + + layout3 + + + + unnamed + + + + rbOui + + + true + + + Oui + + + + + rbNon + + + true + + + Non + + + true + + + + + textLabel1 + + + <font size="+1">Nouveau Concept : </font> + + + + + + + layout6 + + + + unnamed + + + + frame3 + + + + 190 + 50 + + + + StyledPanel + + + Raised + + + + textLabel2_2 + + + + 20 + 10 + 150 + 30 + + + + <font size="+1"> Nom concept : </font> + + + + + + LEDSCO + + + + 220 + 40 + + + + + + - + @@ -321,18 +272,18 @@ DUnSDCOInto BOuiPressed() - - LESDCO - returnPressed() - DUnSDCOInto - LESDCOReturnPressed() - LBSDCO clicked(QListBoxItem*) DUnSDCOInto LBSDCOReturnPressed() + + LEDSCO + returnPressed() + DUnSDCOInto + LESDCOReturnPressed() + BSupPressed() diff --git a/Ui/desVisu.py b/Ui/desVisu.py index e1d0a494..3245479e 100644 --- a/Ui/desVisu.py +++ b/Ui/desVisu.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'desVisu.ui' # -# Created: mar oct 30 11:06:17 2007 +# Created: ven nov 9 14:51:34 2007 # by: The PyQt User Interface Compiler (pyuic) 3.13 # # WARNING! All changes made in this file will be lost! @@ -19,13 +19,15 @@ class DVisu(QWidget): self.setName("DVisu") + DVisuLayout = QGridLayout(self,1,1,11,6,"DVisuLayout") self.TB = QTextBrowser(self,"TB") - self.TB.setGeometry(QRect(0,0,740,401)) + + DVisuLayout.addWidget(self.TB,0,0) self.languageChange() - self.resize(QSize(739,394).expandedTo(self.minimumSizeHint())) + self.resize(QSize(501,394).expandedTo(self.minimumSizeHint())) self.clearWState(Qt.WState_Polished) diff --git a/Ui/desVisu.ui b/Ui/desVisu.ui index f6d1373f..3f61d74a 100644 --- a/Ui/desVisu.ui +++ b/Ui/desVisu.ui @@ -8,26 +8,23 @@ 0 0 - 739 + 501 394 Visualisation Include Materiau - + - TB + unnamed - - - 0 - 0 - 740 - 401 - - - + + + TB + + + diff --git a/Ui/myMain.py b/Ui/myMain.py index c4affb46..12c1bf55 100644 --- a/Ui/myMain.py +++ b/Ui/myMain.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'myMain.ui' # -# Created: mar oct 30 14:35:07 2007 +# Created: ven nov 9 14:51:34 2007 # by: The PyQt User Interface Compiler (pyuic) 3.13 # # WARNING! All changes made in this file will be lost!