From 3959f719ae5dbecc1a525800557f263f1c9c8c0f Mon Sep 17 00:00:00 2001 From: Pascale Noyret Date: Tue, 4 Mar 2008 10:39:19 +0000 Subject: [PATCH] *** empty log message *** --- InterfaceQT/compocomm.py | 3 +- Ui/desChoixCata.py | 2 +- Ui/desCommande.py | 33 ++- Ui/desCommande.ui | 143 +++++++----- Ui/desCommentaire.py | 158 +++++++++++-- Ui/desCommentaire.ui | 311 +++++++++++++++++++------ Ui/desError.py | 2 +- Ui/desFormule.py | 57 +++-- Ui/desFormule.ui | 122 +++++----- Ui/desInactif.py | 2 +- Ui/desInclude.py | 57 +++-- Ui/desInclude.ui | 122 +++++----- Ui/desListeParam.py | 2 +- Ui/desMCFact.py | 59 +++-- Ui/desMCFact.ui | 136 +++++------ Ui/desMCListAjout.py | 75 +++--- Ui/desMCListAjout.ui | 140 ++++++----- Ui/desMacro.py | 57 +++-- Ui/desMacro.ui | 122 +++++----- Ui/desParam.py | 29 ++- Ui/desParam.ui | 116 +++++----- Ui/desPlusieursBase.py | 66 +++--- Ui/desPlusieursBase.ui | 154 ++++++------- Ui/desPlusieursInto.py | 138 +++++------ Ui/desPlusieursInto.ui | 128 +++++----- Ui/desPoursuite.py | 76 +++--- Ui/desPoursuite.ui | 122 +++++----- Ui/desRacine.py | 54 ++--- Ui/desRacine.ui | 58 ++--- Ui/desSelectVal.py | 2 +- Ui/desUniqueASSD.py | 60 +++-- Ui/desUniqueASSD.ui | 223 ++++++++++-------- Ui/desUniqueBase.py | 78 +++---- Ui/desUniqueBase.ui | 405 +++++++++++++++++--------------- Ui/desUniqueComp.py | 59 ++--- Ui/desUniqueComp.ui | 132 ++++++----- Ui/desUniqueInto.py | 60 +++-- Ui/desUniqueInto.ui | 209 +++++++++-------- Ui/desUniqueSDCO.py | 91 ++++---- Ui/desUniqueSDCO.ui | 487 +++++++++++++++++++++------------------ Ui/desUniqueSDCOInto.py | 54 ++--- Ui/desUniqueSDCOInto.ui | 128 +++++----- Ui/desVisu.py | 2 +- Ui/myMain.py | 31 ++- Ui/myMain.ui | 49 +++- 45 files changed, 2511 insertions(+), 2103 deletions(-) diff --git a/InterfaceQT/compocomm.py b/InterfaceQT/compocomm.py index d007b3be..0656c95a 100644 --- a/InterfaceQT/compocomm.py +++ b/InterfaceQT/compocomm.py @@ -36,7 +36,8 @@ class Node(browser.JDCNode,typeNode.PopUpMenuNodePartiel): def createPopUpMenu(self): typeNode.PopUpMenuNodePartiel.createPopUpMenu(self) - self.menu.insertItem( qApp.translate('Browser','Decommenter'), self.unCommentIt ) + if hasattr(self.item,'uncomment'): + self.menu.insertItem( qApp.translate('Browser','Decommenter'), self.unCommentIt ) def update_node_label(self) : """ diff --git a/Ui/desChoixCata.py b/Ui/desChoixCata.py index 3bb5c2b7..19466a40 100644 --- a/Ui/desChoixCata.py +++ b/Ui/desChoixCata.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'desChoixCata.ui' # -# Created: mar fév 19 12:14:31 2008 +# Created: mar mar 4 10:36:38 2008 # by: The PyQt User Interface Compiler (pyuic) 3.13 # # WARNING! All changes made in this file will be lost! diff --git a/Ui/desCommande.py b/Ui/desCommande.py index c9dadb32..4ce860ef 100644 --- a/Ui/desCommande.py +++ b/Ui/desCommande.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'desCommande.ui' # -# Created: lun nov 19 11:09:03 2007 +# Created: mar mar 4 10:36:38 2008 # by: The PyQt User Interface Compiler (pyuic) 3.13 # # WARNING! All changes made in this file will be lost! @@ -50,25 +50,20 @@ class DComm(QWidget): 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(11,11,226,18)) self.textLabel1.setMinimumSize(QSize(0,0)) - MotClefLayout.addWidget(self.textLabel1,0,0) - self.LBMCPermis = QListBox(self.MotClef,"LBMCPermis") + self.LBMCPermis.setGeometry(QRect(11,35,226,342)) self.LBMCPermis.setMinimumSize(QSize(0,0)) - MotClefLayout.addWidget(self.LBMCPermis,1,0) - self.textLabel1_2 = QLabel(self.MotClef,"textLabel1_2") - - MotClefLayout.addWidget(self.textLabel1_2,0,1) + self.textLabel1_2.setGeometry(QRect(243,11,225,18)) self.LBRegles = QListBox(self.MotClef,"LBRegles") - - MotClefLayout.addWidget(self.LBRegles,1,1) + self.LBRegles.setGeometry(QRect(243,35,225,342)) self.TWChoix.insertTab(self.MotClef,QString("")) self.Concept = QWidget(self.TWChoix,"Concept") @@ -136,11 +131,6 @@ class DComm(QWidget): 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) @@ -150,7 +140,12 @@ class DComm(QWidget): self.bSup = QPushButton(self,"bSup") self.bSup.setAutoDefault(1) - DCommLayout.addWidget(self.bSup,2,2) + DCommLayout.addWidget(self.bSup,2,0) + + self.bHelp = QPushButton(self,"bHelp") + self.bHelp.setAutoDefault(1) + + DCommLayout.addWidget(self.bHelp,2,2) self.Commentaire = QLabel(self,"Commentaire") self.Commentaire.setFrameShape(QLabel.NoFrame) @@ -195,15 +190,15 @@ class DComm(QWidget): 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.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.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) diff --git a/Ui/desCommande.ui b/Ui/desCommande.ui index 0f2b7ab1..1386c5dc 100644 --- a/Ui/desCommande.ui +++ b/Ui/desCommande.ui @@ -36,49 +36,76 @@ Ajouter Mot-Clef - + - unnamed + textLabel1 - - - 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 - - - + + + 11 + 11 + 226 + 18 + + + + + 0 + 0 + + + + <h3><p align="center"><u><b>Mots Clefs Permis</b></u></p></h3> + + + + + LBMCPermis + + + + 11 + 35 + 226 + 342 + + + + + 0 + 0 + + + + + + textLabel1_2 + + + + 243 + 11 + 225 + 18 + + + + <h3><p align="center"><u><b>Règles</b></u></p></h3> + + + + + LBRegles + + + + 243 + 35 + 225 + 342 + + + @@ -283,58 +310,58 @@ - + - bHelp + bOk - &Documentation + &Valider - Alt+D + Shift+A, Alt+A, Alt+A, Alt+A true + + true + - affichage documentation aster + validation de la saisie - + - bOk + bSup - &Valider + &Supprimer - Shift+A, Alt+A, Alt+A, Alt+A + Alt+S true - - true - - validation de la saisie + suppression du mot clef - bSup + bHelp - &Supprimer + &Documentation - Alt+S + Alt+D true - suppression du mot clef + affichage documentation aster diff --git a/Ui/desCommentaire.py b/Ui/desCommentaire.py index 55663932..78abc877 100644 --- a/Ui/desCommentaire.py +++ b/Ui/desCommentaire.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'desCommentaire.ui' # -# Created: lun nov 19 11:09:03 2007 +# Created: mar mar 4 10:36:38 2008 # by: The PyQt User Interface Compiler (pyuic) 3.13 # # WARNING! All changes made in this file will be lost! @@ -10,71 +10,185 @@ from qt import * +image0_data = \ + "\x89\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d" \ + "\x49\x48\x44\x52\x00\x00\x00\x21\x00\x00\x00\x0e" \ + "\x08\x06\x00\x00\x00\xa1\x1e\x75\x8c\x00\x00\x00" \ + "\xcf\x49\x44\x41\x54\x38\x8d\xd5\x94\xdb\x0e\xc3" \ + "\x20\x0c\x43\xed\xfd\xf8\xd8\x97\xbb\x0f\x34\x5b" \ + "\x48\x08\x45\xd5\x1e\xb6\x48\x88\xf4\x12\xe7\x60" \ + "\x01\xc0\x0f\x04\x6f\xd6\xe9\x9b\xba\x77\x20\x04" \ + "\x80\x92\x4a\x10\x32\xc9\x2e\xfb\xd8\xc7\xd5\xca" \ + "\xbc\xc0\x25\x40\x00\x99\xe9\x57\x84\x95\x68\xfe" \ + "\x7f\x06\xc0\xde\xd1\xde\xb3\x2b\x4a\x1e\xc4\xea" \ + "\x82\x4b\x9e\x74\x09\x71\x65\xbd\x01\xf8\x55\x27" \ + "\xf7\x8a\x72\x01\xe0\xa3\x12\x9f\x34\x5a\x01\x7c" \ + "\x54\x3b\xaf\xdc\x98\x3d\x0f\x71\x09\xd1\x5a\x33" \ + "\x1b\x47\x1f\x47\x07\x2c\x17\x49\x4a\x82\x33\x8f" \ + "\x61\x78\x20\x3a\x88\x17\xe6\x73\x06\xb1\xf0\x8b" \ + "\x07\xba\x03\xe6\x02\xc9\xb8\x31\x07\x7e\x37\xe0" \ + "\x20\x9e\x67\xe3\x38\x67\x10\x97\x7b\x17\xde\x80" \ + "\xc1\x85\xad\x38\x69\x5a\x51\xd5\x22\xc8\x2c\xe7" \ + "\x79\x12\xe2\xfe\xd8\xbe\x83\x76\x20\x92\xf5\x2b" \ + "\x18\x20\xdd\x11\xbb\x10\xe5\x65\xb5\x3a\x5a\x3b" \ + "\xba\xff\x13\x07\x13\xd6\x6f\xa6\x98\x18\x57\x06" \ + "\x00\x00\x00\x00\x49\x45\x4e\x44\xae\x42\x60\x82" class DComment(QWidget): def __init__(self,parent = None,name = None,fl = 0): QWidget.__init__(self,parent,name,fl) + self.image0 = QPixmap() + self.image0.loadFromData(image0_data,"PNG") if not name: self.setName("DComment") - self.setMinimumSize(QSize(350,0)) + self.setMinimumSize(QSize(505,0)) DCommentLayout = QGridLayout(self,1,1,11,6,"DCommentLayout") - layout1 = QHBoxLayout(None,0,6,"layout1") + self.TWChoix = QTabWidget(self,"TWChoix") - self.bHelp = QPushButton(self,"bHelp") - self.bHelp.setAutoDefault(1) - layout1.addWidget(self.bHelp) + self.Valeur_Parametre = QWidget(self.TWChoix,"Valeur_Parametre") + + self.textCommentaire = QTextEdit(self.Valeur_Parametre,"textCommentaire") + self.textCommentaire.setGeometry(QRect(0,0,480,390)) + 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") + + CommandeLayout.addWidget(self.textLabel6,1,0) + + self.LBNouvCommande = QListBox(self.Commande,"LBNouvCommande") + + CommandeLayout.addMultiCellWidget(self.LBNouvCommande,2,2,0,3) + + self.buttonGroup1 = QButtonGroup(self.Commande,"buttonGroup1") + + 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,120,20)) + self.RBalpha.setChecked(1) + + 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.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("")) + + DCommentLayout.addMultiCellWidget(self.TWChoix,0,0,0,2) self.bOk = QPushButton(self,"bOk") self.bOk.setAutoDefault(1) self.bOk.setDefault(1) - layout1.addWidget(self.bOk) + + DCommentLayout.addWidget(self.bOk,2,1) self.bSup = QPushButton(self,"bSup") self.bSup.setAutoDefault(1) - layout1.addWidget(self.bSup) - DCommentLayout.addLayout(layout1,2,0) + DCommentLayout.addWidget(self.bSup,2,0) - self.textLabel1 = QLabel(self,"textLabel1") + self.bHelp = QPushButton(self,"bHelp") + self.bHelp.setAutoDefault(1) - DCommentLayout.addWidget(self.textLabel1,0,0) + DCommentLayout.addWidget(self.bHelp,2,2) - self.textCommentaire = QTextEdit(self,"textCommentaire") + self.Commentaire = QLabel(self,"Commentaire") + self.Commentaire.setFrameShape(QLabel.NoFrame) + self.Commentaire.setFrameShadow(QLabel.Plain) - DCommentLayout.addWidget(self.textCommentaire,1,0) + DCommentLayout.addMultiCellWidget(self.Commentaire,1,1,0,2) self.languageChange() - self.resize(QSize(475,480).expandedTo(self.minimumSizeHint())) + self.resize(QSize(505,483).expandedTo(self.minimumSizeHint())) self.clearWState(Qt.WState_Polished) - self.connect(self.bOk,SIGNAL("clicked()"),self.TexteCommentaireEntre) + self.connect(self.LBNouvCommande,SIGNAL("clicked(QListBoxItem*)"),self.LBNouvCommandeClicked) + self.connect(self.LEFiltre,SIGNAL("textChanged(const QString&)"),self.LEFiltreTextChanged) + self.connect(self.LEFiltre,SIGNAL("returnPressed()"),self.LEfiltreReturnPressed) + self.connect(self.bSup,SIGNAL("pressed()"),self.BSupPressed) + self.connect(self.bOk,SIGNAL("clicked()"),self.BOkPressed) + self.connect(self.RBGroupe,SIGNAL("clicked()"),self.BuildTabCommand) + self.connect(self.RBalpha,SIGNAL("clicked()"),self.BuildTabCommand) self.connect(self.bHelp,SIGNAL("clicked()"),self.ViewDoc) + self.connect(self.BNext,SIGNAL("pressed()"),self.BNextPressed) def languageChange(self): - self.setCaption(self.__tr("Form1")) - self.bHelp.setText(self.__tr("&Documentation")) - self.bHelp.setAccel(self.__tr("Alt+D")) - QToolTip.add(self.bHelp,self.__tr("affichage documentation aster")) + self.setCaption(self.__tr("DComm")) + self.TWChoix.changeTab(self.Valeur_Parametre,self.__tr("Commentaire")) + 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.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.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

")) + 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) + + + def LBNouvCommandeClicked(self): + print "DComment.LBNouvCommandeClicked(): Not implemented yet" + + def LEFiltreTextChanged(self): + print "DComment.LEFiltreTextChanged(): Not implemented yet" + + def LEfiltreReturnPressed(self): + print "DComment.LEfiltreReturnPressed(): Not implemented yet" + def BSupPressed(self): + print "DComment.BSupPressed(): Not implemented yet" - def TexteCommentaireEntre(self): - print "DComment.TexteCommentaireEntre(): Not implemented yet" + def LENomConceptReturnPressed(self): + print "DComment.LENomConceptReturnPressed(): Not implemented yet" + + def BOkPressed(self): + print "DComment.BOkPressed(): Not implemented yet" + + def BuildTabCommand(self): + print "DComment.BuildTabCommand(): Not implemented yet" def ViewDoc(self): print "DComment.ViewDoc(): Not implemented yet" + def BNextPressed(self): + print "DComment.BNextPressed(): Not implemented yet" + def __tr(self,s,c = None): return qApp.translate("DComment",s,c) + + def __trUtf8(self,s,c = None): + return qApp.translate("DComment",s,c,QApplication.UnicodeUTF8) diff --git a/Ui/desCommentaire.ui b/Ui/desCommentaire.ui index d0e95e84..8849e859 100644 --- a/Ui/desCommentaire.ui +++ b/Ui/desCommentaire.ui @@ -8,108 +8,276 @@ 0 0 - 475 - 480 + 505 + 483 - 350 + 505 0 - Form1 + DComm unnamed - + - layout1 + TWChoix - + - unnamed + Valeur_Parametre - + + Commentaire + + - bHelp + textCommentaire - - &Documentation - - - Alt+D - - - true - - - affichage documentation aster + + + 0 + 0 + 480 + 390 + - - - bOk - - - &Valider - - - Shift+A, Alt+A, Alt+A, Alt+A - - - true - - - true - - - validation de la saisie - - - + + + + Commande + + + Nouvelle Commande + + - bSup - - - &Supprimer - - - Alt+S - - - true - - - suppression du mot clef + 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 + + + + + - + - textLabel1 + bOk - <p align="center"><b>Texte du Commentaire</b></p> + &Valider + + + Shift+A, Alt+A, Alt+A, Alt+A + + + true + + + true + + + validation de la saisie - + - textCommentaire + bSup + + + &Supprimer + + + Alt+S + + + true + + + suppression du mot clef + + + + + bHelp + + + &Documentation + + + Alt+D + + + true + + + affichage documentation aster + + + + + Commentaire + + + NoFrame + + + Plain + + + + + + 89504e470d0a1a0a0000000d49484452000000210000000e0806000000a11e758c000000cf49444154388dd594db0ec3200c43edfdf8d897bb0f345b480845d51eb64888f412e76001c00f046fd6e99bba77200480924a1032c92efbd8c7d5cabcc025400099e957849568fe7f06c0ded1deb32b4a1ec4ea824b9e74097165bd01f85527f78a7201e0a3129f345a017c543bafdc983d0f7109d15a331b471f47072c17494a82338f6178203a8817e67306b1f08b07ba03e602c9b831077e37e0209e67e3386710977b17de80c185ad38695a51d522c82ce77912e2fed8be83762092f52b1820dd11bb10e565b53a5a3bbaff130713d66fa6981857060000000049454e44ae426082 + + + + LBNouvCommande + clicked(QListBoxItem*) + DComment + LBNouvCommandeClicked() + + + LEFiltre + textChanged(const QString&) + DComment + LEFiltreTextChanged() + + + LEFiltre + returnPressed() + DComment + LEfiltreReturnPressed() + + + bSup + pressed() + DComment + BSupPressed() + bOk clicked() DComment - TexteCommentaireEntre() + BOkPressed() + + + RBGroupe + clicked() + DComment + BuildTabCommand() + + + RBalpha + clicked() + DComment + BuildTabCommand() bHelp @@ -117,10 +285,23 @@ DComment ViewDoc() + + BNext + pressed() + DComment + BNextPressed() + - TexteCommentaireEntre() - ViewDoc() + LBNouvCommandeClicked() + LEFiltreTextChanged() + LEfiltreReturnPressed() + BSupPressed() + LENomConceptReturnPressed() + BOkPressed() + BuildTabCommand() + ViewDoc() + BNextPressed() diff --git a/Ui/desError.py b/Ui/desError.py index a9a89173..03084ff5 100644 --- a/Ui/desError.py +++ b/Ui/desError.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'desError.ui' # -# Created: lun nov 19 11:09:03 2007 +# Created: mar mar 4 10:36:38 2008 # by: The PyQt User Interface Compiler (pyuic) 3.13 # # WARNING! All changes made in this file will be lost! diff --git a/Ui/desFormule.py b/Ui/desFormule.py index ff80b3c0..db3fa6bf 100644 --- a/Ui/desFormule.py +++ b/Ui/desFormule.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'desFormule.ui' # -# Created: lun nov 19 11:09:03 2007 +# Created: mar mar 4 10:36:38 2008 # by: The PyQt User Interface Compiler (pyuic) 3.13 # # WARNING! All changes made in this file will be lost! @@ -49,24 +49,7 @@ class DFormule(QWidget): self.Commentaire = QLabel(self,"Commentaire") - DFormuleLayout.addWidget(self.Commentaire,1,0) - - layout2 = QHBoxLayout(None,0,6,"layout2") - - self.bHelp = QPushButton(self,"bHelp") - self.bHelp.setAutoDefault(1) - layout2.addWidget(self.bHelp) - - self.bOk = QPushButton(self,"bOk") - 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) + DFormuleLayout.addMultiCellWidget(self.Commentaire,1,1,0,2) self.TWChoix = QTabWidget(self,"TWChoix") @@ -174,7 +157,23 @@ class DFormule(QWidget): CommandeLayout.addMultiCellWidget(self.LBNouvCommande,2,2,0,3) self.TWChoix.insertTab(self.Commande,QString("")) - DFormuleLayout.addWidget(self.TWChoix,0,0) + DFormuleLayout.addMultiCellWidget(self.TWChoix,0,0,0,2) + + self.bSup = QPushButton(self,"bSup") + self.bSup.setAutoDefault(1) + + DFormuleLayout.addWidget(self.bSup,2,0) + + self.bOk = QPushButton(self,"bOk") + self.bOk.setAutoDefault(1) + self.bOk.setDefault(1) + + DFormuleLayout.addWidget(self.bOk,2,1) + + self.bHelp = QPushButton(self,"bHelp") + self.bHelp.setAutoDefault(1) + + DFormuleLayout.addWidget(self.bHelp,2,2) self.languageChange() @@ -198,15 +197,6 @@ class DFormule(QWidget): def languageChange(self): self.setCaption(self.__tr("DMacro")) self.Commentaire.setText(QString.null) - self.bHelp.setText(self.__tr("&Documentation")) - self.bHelp.setAccel(self.__tr("Alt+D")) - QToolTip.add(self.bHelp,self.__tr("affichage documentation aster")) - self.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

")) @@ -226,6 +216,15 @@ class DFormule(QWidget): 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")) + 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")) def LBNouvCommandeClicked(self): diff --git a/Ui/desFormule.ui b/Ui/desFormule.ui index 5e92c7d8..84f92d56 100644 --- a/Ui/desFormule.ui +++ b/Ui/desFormule.ui @@ -25,7 +25,7 @@ unnamed - + Commentaire @@ -33,71 +33,7 @@ - - - layout2 - - - - 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 @@ -359,6 +295,60 @@ valeurs seront effectivement prises en compte + + + 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 + + diff --git a/Ui/desInactif.py b/Ui/desInactif.py index 02c437bf..a14fe525 100644 --- a/Ui/desInactif.py +++ b/Ui/desInactif.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'desInactif.ui' # -# Created: lun nov 19 11:09:04 2007 +# Created: mar mar 4 10:36:38 2008 # by: The PyQt User Interface Compiler (pyuic) 3.13 # # WARNING! All changes made in this file will be lost! diff --git a/Ui/desInclude.py b/Ui/desInclude.py index fbed12f6..57cf503f 100644 --- a/Ui/desInclude.py +++ b/Ui/desInclude.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'desInclude.ui' # -# Created: lun nov 19 11:09:04 2007 +# Created: mar mar 4 10:36:38 2008 # by: The PyQt User Interface Compiler (pyuic) 3.13 # # WARNING! All changes made in this file will be lost! @@ -49,24 +49,7 @@ class DInc1(QWidget): self.Commentaire = QLabel(self,"Commentaire") - 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.setAutoDefault(1) - self.bOk.setDefault(1) - layout1.addWidget(self.bOk) - - self.bSup = QPushButton(self,"bSup") - self.bSup.setAutoDefault(1) - layout1.addWidget(self.bSup) - - DInc1Layout.addLayout(layout1,2,0) + DInc1Layout.addMultiCellWidget(self.Commentaire,1,1,0,2) self.TWChoix = QTabWidget(self,"TWChoix") @@ -156,7 +139,23 @@ class DInc1(QWidget): TabPageLayout.addWidget(self.textLabel1_5,0,0) self.TWChoix.insertTab(self.TabPage_2,QString("")) - DInc1Layout.addWidget(self.TWChoix,0,0) + DInc1Layout.addMultiCellWidget(self.TWChoix,0,0,0,2) + + self.bHelp = QPushButton(self,"bHelp") + self.bHelp.setAutoDefault(1) + + DInc1Layout.addWidget(self.bHelp,2,2) + + self.bSup = QPushButton(self,"bSup") + self.bSup.setAutoDefault(1) + + DInc1Layout.addWidget(self.bSup,2,0) + + self.bOk = QPushButton(self,"bOk") + self.bOk.setAutoDefault(1) + self.bOk.setDefault(1) + + DInc1Layout.addWidget(self.bOk,2,1) self.languageChange() @@ -179,15 +178,6 @@ class DInc1(QWidget): def languageChange(self): self.setCaption(self.__tr("DMacro")) self.Commentaire.setText(QString.null) - self.bHelp.setText(self.__tr("&Documentation")) - self.bHelp.setAccel(self.__tr("Alt+D")) - QToolTip.add(self.bHelp,self.__tr("affichage documentation aster")) - self.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")) @@ -205,6 +195,15 @@ class DInc1(QWidget): self.TWChoix.changeTab(self.TabPage,self.__tr("Fichier Include")) self.textLabel1_5.setText(self.__trUtf8("\x3c\x66\x6f\x6e\x74\x20\x73\x69\x7a\x65\x3d\x22\x2b\x31\x22\x3e\x3c\x70\x20\x61\x6c\x69\x67\x6e\x3d\x22\x63\x65\x6e\x74\x65\x72\x22\x3e\x4c\x61\x20\x63\x6f\x6d\x6d\x61\x6e\x64\x65\x20\x49\x4e\x43\x4c\x55\x44\x45\x20\x6e\x27\x61\x20\x70\x61\x73\x20\x64\x65\x20\x66\x69\x63\x68\x69\x65\x72\x20\x61\x73\x73\x6f\x63\x69\xc3\xa9\x2e\x0a\x49\x6c\x20\x66\x61\x75\x74\x20\x64\x27\x61\x62\x6f\x72\x64\x20\x63\x68\x6f\x69\x73\x69\x72\x20\x75\x6e\x20\x6e\x75\x6d\xc3\xa9\x72\x6f\x20\x64\x27\x75\x6e\x69\x74\xc3\xa9\x3c\x2f\x70\x3e\x3c\x2f\x66\x6f\x6e\x74\x3e")) self.TWChoix.changeTab(self.TabPage_2,self.__tr("Fichier Inc")) + self.bHelp.setText(self.__tr("&Documentation")) + self.bHelp.setAccel(self.__tr("Alt+D")) + QToolTip.add(self.bHelp,self.__tr("affichage documentation aster")) + self.bSup.setText(self.__tr("&Supprimer")) + self.bSup.setAccel(self.__tr("Alt+S")) + QToolTip.add(self.bSup,self.__tr("suppression du mot clef")) + self.bOk.setText(self.__tr("&Valider")) + self.bOk.setAccel(self.__tr("Shift+A, Alt+A, Alt+A, Alt+A")) + QToolTip.add(self.bOk,self.__tr("validation de la saisie")) def LBNouvCommandeClicked(self): diff --git a/Ui/desInclude.ui b/Ui/desInclude.ui index 82bedc76..91f8d42c 100644 --- a/Ui/desInclude.ui +++ b/Ui/desInclude.ui @@ -25,7 +25,7 @@ unnamed - + Commentaire @@ -33,71 +33,7 @@ - - - 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 - - - - - + TWChoix @@ -360,6 +296,60 @@ Il faut d'abord choisir un numéro d'unité</p></font> + + + bHelp + + + &Documentation + + + Alt+D + + + true + + + affichage documentation aster + + + + + bSup + + + &Supprimer + + + Alt+S + + + true + + + suppression du mot clef + + + + + bOk + + + &Valider + + + Shift+A, Alt+A, Alt+A, Alt+A + + + true + + + true + + + validation de la saisie + + diff --git a/Ui/desListeParam.py b/Ui/desListeParam.py index 3fc31854..37ffe2c4 100644 --- a/Ui/desListeParam.py +++ b/Ui/desListeParam.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'desListeParam.ui' # -# Created: lun nov 19 11:09:04 2007 +# Created: mar mar 4 10:36:38 2008 # by: The PyQt User Interface Compiler (pyuic) 3.13 # # WARNING! All changes made in this file will be lost! diff --git a/Ui/desMCFact.py b/Ui/desMCFact.py index 41050c7e..438fe6b2 100644 --- a/Ui/desMCFact.py +++ b/Ui/desMCFact.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'desMCFact.ui' # -# Created: lun nov 19 11:09:04 2007 +# Created: mar mar 4 10:36:38 2008 # by: The PyQt User Interface Compiler (pyuic) 3.13 # # WARNING! All changes made in this file will be lost! @@ -22,27 +22,6 @@ class DMCFact(QWidget): DMCFactLayout = QGridLayout(self,1,1,11,6,"DMCFactLayout") - 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) - - DMCFactLayout.addLayout(layout1,2,0) - - self.Commentaire = QLabel(self,"Commentaire") - - DMCFactLayout.addWidget(self.Commentaire,1,0) - self.TWChoix = QTabWidget(self,"TWChoix") self.MotClef = QWidget(self.TWChoix,"MotClef") @@ -67,7 +46,27 @@ class DMCFact(QWidget): MotClefLayout.addWidget(self.textLabel1_2,0,1) self.TWChoix.insertTab(self.MotClef,QString("")) - DMCFactLayout.addWidget(self.TWChoix,0,0) + DMCFactLayout.addMultiCellWidget(self.TWChoix,0,0,0,2) + + self.bSup = QPushButton(self,"bSup") + self.bSup.setAutoDefault(1) + + DMCFactLayout.addWidget(self.bSup,2,0) + + self.Commentaire = QLabel(self,"Commentaire") + + DMCFactLayout.addMultiCellWidget(self.Commentaire,1,1,0,2) + + self.bHelp = QPushButton(self,"bHelp") + self.bHelp.setAutoDefault(1) + + DMCFactLayout.addWidget(self.bHelp,2,2) + + self.bOk = QPushButton(self,"bOk") + self.bOk.setAutoDefault(1) + self.bOk.setDefault(1) + + DMCFactLayout.addWidget(self.bOk,2,1) self.languageChange() @@ -81,19 +80,19 @@ class DMCFact(QWidget): def languageChange(self): self.setCaption(self.__tr("DMacro")) + 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.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.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")) def ViewDoc(self): diff --git a/Ui/desMCFact.ui b/Ui/desMCFact.ui index 7eebedb4..433df5f9 100644 --- a/Ui/desMCFact.ui +++ b/Ui/desMCFact.ui @@ -25,79 +25,7 @@ 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 - - - - - - + TWChoix @@ -153,6 +81,68 @@ + + + bSup + + + &Supprimer + + + Alt+S + + + true + + + suppression du mot clef + + + + + Commentaire + + + + + + + + bHelp + + + &Documentation + + + Alt+D + + + true + + + affichage documentation aster + + + + + bOk + + + &Valider + + + Shift+A, Alt+A, Alt+A, Alt+A + + + true + + + true + + + validation de la saisie + + diff --git a/Ui/desMCListAjout.py b/Ui/desMCListAjout.py index b50723a6..5c86a42a 100644 --- a/Ui/desMCListAjout.py +++ b/Ui/desMCListAjout.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'desMCListAjout.ui' # -# Created: lun nov 19 11:09:04 2007 +# Created: mar mar 4 10:36:38 2008 # by: The PyQt User Interface Compiler (pyuic) 3.13 # # WARNING! All changes made in this file will be lost! @@ -22,30 +22,13 @@ class DMCListAjout(QWidget): DMCListAjoutLayout = QGridLayout(self,1,1,11,6,"DMCListAjoutLayout") - 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) - - DMCListAjoutLayout.addLayout(layout1,10,0) - self.textLabel1 = QLabel(self,"textLabel1") - DMCListAjoutLayout.addWidget(self.textLabel1,1,0) + DMCListAjoutLayout.addMultiCellWidget(self.textLabel1,1,1,0,2) self.textLabel1_2 = QLabel(self,"textLabel1_2") - DMCListAjoutLayout.addWidget(self.textLabel1_2,2,0) + DMCListAjoutLayout.addMultiCellWidget(self.textLabel1_2,2,2,0,2) layout9 = QHBoxLayout(None,0,6,"layout9") spacer4 = QSpacerItem(60,21,QSizePolicy.Expanding,QSizePolicy.Minimum) @@ -58,29 +41,45 @@ class DMCListAjout(QWidget): spacer2 = QSpacerItem(80,21,QSizePolicy.Expanding,QSizePolicy.Minimum) layout9.addItem(spacer2) - DMCListAjoutLayout.addLayout(layout9,8,0) + DMCListAjoutLayout.addMultiCellLayout(layout9,8,8,0,2) spacer1 = QSpacerItem(21,40,QSizePolicy.Minimum,QSizePolicy.Expanding) - DMCListAjoutLayout.addItem(spacer1,9,0) + DMCListAjoutLayout.addItem(spacer1,9,1) self.textLabel1_2_2 = QLabel(self,"textLabel1_2_2") - DMCListAjoutLayout.addWidget(self.textLabel1_2_2,6,0) + DMCListAjoutLayout.addMultiCellWidget(self.textLabel1_2_2,6,6,0,2) spacer5 = QSpacerItem(20,20,QSizePolicy.Minimum,QSizePolicy.Expanding) - DMCListAjoutLayout.addItem(spacer5,7,0) + DMCListAjoutLayout.addItem(spacer5,7,1) self.MCFacteur = QLabel(self,"MCFacteur") - DMCListAjoutLayout.addWidget(self.MCFacteur,4,0) + DMCListAjoutLayout.addMultiCellWidget(self.MCFacteur,4,4,0,2) spacer6 = QSpacerItem(21,31,QSizePolicy.Minimum,QSizePolicy.Expanding) - DMCListAjoutLayout.addItem(spacer6,5,0) + DMCListAjoutLayout.addItem(spacer6,5,1) spacer7 = QSpacerItem(21,51,QSizePolicy.Minimum,QSizePolicy.Expanding) - DMCListAjoutLayout.addItem(spacer7,3,0) + DMCListAjoutLayout.addItem(spacer7,3,1) spacer8 = QSpacerItem(41,51,QSizePolicy.Minimum,QSizePolicy.Expanding) - DMCListAjoutLayout.addItem(spacer8,0,0) + DMCListAjoutLayout.addItem(spacer8,0,1) + + self.bSup = QPushButton(self,"bSup") + self.bSup.setAutoDefault(1) + + DMCListAjoutLayout.addWidget(self.bSup,10,0) + + self.bOk = QPushButton(self,"bOk") + self.bOk.setAutoDefault(1) + self.bOk.setDefault(1) + + DMCListAjoutLayout.addWidget(self.bOk,10,1) + + self.bHelp = QPushButton(self,"bHelp") + self.bHelp.setAutoDefault(1) + + DMCListAjoutLayout.addWidget(self.bHelp,10,2) self.languageChange() - self.resize(QSize(459,480).expandedTo(self.minimumSizeHint())) + self.resize(QSize(459,472).expandedTo(self.minimumSizeHint())) self.clearWState(Qt.WState_Polished) self.connect(self.bOk,SIGNAL("clicked()"),self.BAjoutClicked) @@ -91,15 +90,6 @@ class DMCListAjout(QWidget): def languageChange(self): self.setCaption(self.__tr("Form1")) - 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")) @@ -107,6 +97,15 @@ class DMCListAjout(QWidget): QToolTip.add(self.bAjout,self.__tr("validation de la saisie")) self.textLabel1_2_2.setText(self.__tr("

cliquez ci-dessous

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

AFFE

")) + 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")) def BAjoutClicked(self): diff --git a/Ui/desMCListAjout.ui b/Ui/desMCListAjout.ui index 7efbe415..ff58dbcd 100644 --- a/Ui/desMCListAjout.ui +++ b/Ui/desMCListAjout.ui @@ -9,7 +9,7 @@ 0 0 459 - 480 + 472 @@ -25,71 +25,7 @@ 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 @@ -97,7 +33,7 @@ <p align="center"><font size="+1">Pour ajouter une autre occurrence</font></p> - + textLabel1_2 @@ -105,7 +41,7 @@ <p align="center"><font size="+1">du mot clef-facteur</font> </p> - + layout9 @@ -169,7 +105,7 @@ - + spacer1 @@ -186,7 +122,7 @@ - + textLabel1_2_2 @@ -194,7 +130,7 @@ <p align="center"><font size="+1">cliquez ci-dessous</font> </p> - + spacer5 @@ -211,7 +147,7 @@ - + MCFacteur @@ -219,7 +155,7 @@ <p align="center">AFFE</p> - + spacer6 @@ -236,7 +172,7 @@ - + spacer7 @@ -253,7 +189,7 @@ - + spacer8 @@ -270,6 +206,60 @@ + + + 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 + + diff --git a/Ui/desMacro.py b/Ui/desMacro.py index 402ad029..ca6ad490 100644 --- a/Ui/desMacro.py +++ b/Ui/desMacro.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'desMacro.ui' # -# Created: lun nov 19 11:09:04 2007 +# Created: mar mar 4 10:36:38 2008 # by: The PyQt User Interface Compiler (pyuic) 3.13 # # WARNING! All changes made in this file will be lost! @@ -47,26 +47,9 @@ class DMacro(QWidget): DMacroLayout = QGridLayout(self,1,1,11,6,"DMacroLayout") - 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) - - DMacroLayout.addLayout(layout1,2,0) - self.Commentaire = QLabel(self,"Commentaire") - DMacroLayout.addWidget(self.Commentaire,1,0) + DMacroLayout.addMultiCellWidget(self.Commentaire,1,1,0,2) self.TWChoix = QTabWidget(self,"TWChoix") @@ -154,7 +137,23 @@ class DMacro(QWidget): self.LENomConcept.setGeometry(QRect(20,80,440,30)) self.TWChoix.insertTab(self.TabPage,QString("")) - DMacroLayout.addWidget(self.TWChoix,0,0) + DMacroLayout.addMultiCellWidget(self.TWChoix,0,0,0,2) + + self.bSup = QPushButton(self,"bSup") + self.bSup.setAutoDefault(1) + + DMacroLayout.addWidget(self.bSup,2,0) + + self.bHelp = QPushButton(self,"bHelp") + self.bHelp.setAutoDefault(1) + + DMacroLayout.addWidget(self.bHelp,2,2) + + self.bOk = QPushButton(self,"bOk") + self.bOk.setAutoDefault(1) + self.bOk.setDefault(1) + + DMacroLayout.addWidget(self.bOk,2,1) self.languageChange() @@ -175,15 +174,6 @@ class DMacro(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.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

")) @@ -203,6 +193,15 @@ class DMacro(QWidget): 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")) + 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.bOk.setText(self.__tr("&Valider")) + self.bOk.setAccel(self.__tr("Shift+A, Alt+A, Alt+A, Alt+A")) + QToolTip.add(self.bOk,self.__tr("validation de la saisie")) def LBNouvCommandeClicked(self): diff --git a/Ui/desMacro.ui b/Ui/desMacro.ui index 5ebacd0e..643b18ae 100644 --- a/Ui/desMacro.ui +++ b/Ui/desMacro.ui @@ -25,71 +25,7 @@ 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 @@ -97,7 +33,7 @@ - + TWChoix @@ -364,6 +300,60 @@ + + + bSup + + + &Supprimer + + + Alt+S + + + true + + + suppression du mot clef + + + + + bHelp + + + &Documentation + + + Alt+D + + + true + + + affichage documentation aster + + + + + bOk + + + &Valider + + + Shift+A, Alt+A, Alt+A, Alt+A + + + true + + + true + + + validation de la saisie + + diff --git a/Ui/desParam.py b/Ui/desParam.py index 6ff292e3..65222a75 100644 --- a/Ui/desParam.py +++ b/Ui/desParam.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'desParam.ui' # -# Created: lun nov 19 11:09:04 2007 +# Created: mar mar 4 10:36:38 2008 # by: The PyQt User Interface Compiler (pyuic) 3.13 # # WARNING! All changes made in this file will be lost! @@ -51,7 +51,7 @@ class DParam(QWidget): self.Commentaire.setFrameShape(QLabel.NoFrame) self.Commentaire.setFrameShadow(QLabel.Plain) - DParamLayout.addWidget(self.Commentaire,1,0) + DParamLayout.addMultiCellWidget(self.Commentaire,1,1,0,2) self.TWChoix = QTabWidget(self,"TWChoix") @@ -122,24 +122,23 @@ class DParam(QWidget): 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) + DParamLayout.addMultiCellWidget(self.TWChoix,0,0,0,2) self.bOk = QPushButton(self,"bOk") self.bOk.setAutoDefault(1) self.bOk.setDefault(1) - layout1.addWidget(self.bOk) + + DParamLayout.addWidget(self.bOk,2,1) self.bSup = QPushButton(self,"bSup") self.bSup.setAutoDefault(1) - layout1.addWidget(self.bSup) - DParamLayout.addLayout(layout1,2,0) + DParamLayout.addWidget(self.bSup,2,0) + + self.bHelp = QPushButton(self,"bHelp") + self.bHelp.setAutoDefault(1) + + DParamLayout.addWidget(self.bHelp,2,2) self.languageChange() @@ -175,15 +174,15 @@ class DParam(QWidget): 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.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.bHelp.setText(self.__tr("&Documentation")) + self.bHelp.setAccel(self.__tr("Alt+D")) + QToolTip.add(self.bHelp,self.__tr("affichage documentation aster")) def LBNouvCommandeClicked(self): diff --git a/Ui/desParam.ui b/Ui/desParam.ui index ab5a7834..a871fa14 100644 --- a/Ui/desParam.ui +++ b/Ui/desParam.ui @@ -25,7 +25,7 @@ unnamed - + Commentaire @@ -39,7 +39,7 @@ - + TWChoix @@ -334,69 +334,59 @@ appuyé sur le bouton Valider. - + - layout1 + 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 + + + + + bHelp + + + &Documentation + + + Alt+D + + + true + + + affichage documentation aster - - - 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 5e95eacb..3760ba9b 100644 --- a/Ui/desPlusieursBase.py +++ b/Ui/desPlusieursBase.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'desPlusieursBase.ui' # -# Created: lun nov 19 11:31:09 2007 +# Created: mar mar 4 10:36:38 2008 # by: The PyQt User Interface Compiler (pyuic) 3.13 # # WARNING! All changes made in this file will be lost! @@ -77,29 +77,6 @@ class DPlusBase(QWidget): 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.setAutoDefault(1) - layout1.addWidget(self.bHelp) - - self.bOk = QPushButton(self.Widget8,"bOk") - self.bOk.setAutoDefault(1) - self.bOk.setDefault(1) - layout1.addWidget(self.bOk) - - self.bSup = QPushButton(self.Widget8,"bSup") - self.bSup.setAutoDefault(1) - layout1.addWidget(self.bSup) - layout3.addLayout(layout1) - - Widget8Layout.addMultiCellLayout(layout3,5,5,0,3) - self.textLabel1 = QLabel(self.Widget8,"textLabel1") Widget8Layout.addWidget(self.textLabel1,0,0) @@ -160,6 +137,27 @@ class DPlusBase(QWidget): layout8.addItem(spacer4) Widget8Layout.addMultiCellLayout(layout8,0,3,1,1) + + self.Commentaire = QLabel(self.Widget8,"Commentaire") + + Widget8Layout.addMultiCellWidget(self.Commentaire,5,5,0,3) + + layout7 = QHBoxLayout(None,0,6,"layout7") + + self.bSup = QPushButton(self.Widget8,"bSup") + self.bSup.setAutoDefault(1) + layout7.addWidget(self.bSup) + + self.bOk = QPushButton(self.Widget8,"bOk") + self.bOk.setAutoDefault(1) + self.bOk.setDefault(1) + layout7.addWidget(self.bOk) + + self.bHelp = QPushButton(self.Widget8,"bHelp") + self.bHelp.setAutoDefault(1) + layout7.addWidget(self.bHelp) + + Widget8Layout.addMultiCellLayout(layout7,6,6,0,3) self.tabuniqueinto.insertTab(self.Widget8,QString("")) DPlusBaseLayout.addWidget(self.tabuniqueinto,0,0) @@ -181,16 +179,6 @@ 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")) - 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("Valeur(s) actuelle(s)")) self.bParam.setText(self.__tr("&Parametres")) self.bParam.setAccel(self.__tr("Alt+P")) @@ -203,6 +191,16 @@ class DPlusBase(QWidget): QToolTip.add(self.BAjout1Val,self.__trUtf8("\x61\x6a\x6f\x75\x74\x65\x20\x6c\x61\x20\x76\x61\x6c\x65\x75\x72\x20\x73\x61\x69\x73\x69\x65\x20\x73\x6f\x75\x73\x20\x6c\x20\x6f\x63\x63\x75\x72\x65\x6e\x63\x65\x20\x73\x65\x6c\x65\x63\x74\x69\x6f\x6e\x6e\xc3\xa9\x65\x20\x28\x65\x6e\x20\x66\x69\x6e\x20\x64\x65\x20\x6c\x69\x73\x74\x65\x20\x73\x69\x20\x69\x6c\x20\x6e\x20\x79\x20\x61\x20\x70\x61\x73\x20\x64\x65\x20\x73\x65\x6c\x65\x63\x74\x69\x6f\x6e\x29")) self.BSup1Val.setText(QString.null) QToolTip.add(self.BSup1Val,self.__tr("enleve l occurence selectionnee")) + self.Commentaire.setText(QString.null) + self.bSup.setText(self.__tr("&Supprimer")) + self.bSup.setAccel(self.__tr("Alt+S")) + QToolTip.add(self.bSup,self.__tr("suppression du mot clef")) + 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.tabuniqueinto.changeTab(self.Widget8,self.__tr("Saisir Valeur")) diff --git a/Ui/desPlusieursBase.ui b/Ui/desPlusieursBase.ui index 0b5e5992..5c2578d6 100644 --- a/Ui/desPlusieursBase.ui +++ b/Ui/desPlusieursBase.ui @@ -40,88 +40,6 @@ 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 - - - - - - textLabel1 @@ -377,6 +295,78 @@ + + + Commentaire + + + + + + + + layout7 + + + + 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 + + + + diff --git a/Ui/desPlusieursInto.py b/Ui/desPlusieursInto.py index 31cb6b46..c1aa71a6 100644 --- a/Ui/desPlusieursInto.py +++ b/Ui/desPlusieursInto.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'desPlusieursInto.ui' # -# Created: lun nov 19 11:09:04 2007 +# Created: mar mar 4 10:36:38 2008 # 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 DPlusInto(QWidget): def __init__(self,parent = None,name = None,fl = 0): @@ -81,27 +81,6 @@ class DPlusInto(QWidget): Widget8Layout.addMultiCellWidget(self.Commentaire,2,2,0,3) - 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.setAutoDefault(1) - self.bOk.setDefault(1) - layout1.addWidget(self.bOk) - - self.bSup = QPushButton(self.Widget8,"bSup") - self.bSup.setAutoDefault(1) - layout1.addWidget(self.bSup) - - Widget8Layout.addMultiCellLayout(layout1,3,3,0,3) - - self.textLabel1_2 = QLabel(self.Widget8,"textLabel1_2") - - Widget8Layout.addMultiCellWidget(self.textLabel1_2,0,0,2,3) - self.textLabel1 = QLabel(self.Widget8,"textLabel1") Widget8Layout.addMultiCellWidget(self.textLabel1,0,0,0,1) @@ -114,25 +93,46 @@ class DPlusInto(QWidget): Widget8Layout.addWidget(self.listBoxVal,1,3) - layout4 = QVBoxLayout(None,0,6,"layout4") - spacer2 = QSpacerItem(21,72,QSizePolicy.Minimum,QSizePolicy.Expanding) - layout4.addItem(spacer2) + self.textLabel1_2 = QLabel(self.Widget8,"textLabel1_2") - self.BAjout1Val = QToolButton(self.Widget8,"BAjout1Val") - self.BAjout1Val.setMinimumSize(QSize(40,31)) - self.BAjout1Val.setMaximumSize(QSize(40,31)) - self.BAjout1Val.setIconSet(QIconSet(self.image0)) - layout4.addWidget(self.BAjout1Val) + Widget8Layout.addMultiCellWidget(self.textLabel1_2,0,0,2,3) + + layout3 = QVBoxLayout(None,0,6,"layout3") + spacer2 = QSpacerItem(21,50,QSizePolicy.Minimum,QSizePolicy.Expanding) + layout3.addItem(spacer2) self.BSup1Val = QToolButton(self.Widget8,"BSup1Val") self.BSup1Val.setMinimumSize(QSize(40,31)) self.BSup1Val.setMaximumSize(QSize(40,31)) - self.BSup1Val.setIconSet(QIconSet(self.image1)) - layout4.addWidget(self.BSup1Val) + self.BSup1Val.setIconSet(QIconSet(self.image0)) + layout3.addWidget(self.BSup1Val) + + self.BAjout1Val = QToolButton(self.Widget8,"BAjout1Val") + self.BAjout1Val.setMinimumSize(QSize(40,31)) + self.BAjout1Val.setMaximumSize(QSize(40,31)) + self.BAjout1Val.setIconSet(QIconSet(self.image1)) + layout3.addWidget(self.BAjout1Val) spacer3 = QSpacerItem(21,181,QSizePolicy.Minimum,QSizePolicy.Expanding) - layout4.addItem(spacer3) + layout3.addItem(spacer3) + + Widget8Layout.addMultiCellLayout(layout3,1,1,1,2) + + layout3_2 = QHBoxLayout(None,0,6,"layout3_2") + + self.bSup = QPushButton(self.Widget8,"bSup") + self.bSup.setAutoDefault(1) + layout3_2.addWidget(self.bSup) + + self.bOk = QPushButton(self.Widget8,"bOk") + self.bOk.setAutoDefault(1) + self.bOk.setDefault(1) + layout3_2.addWidget(self.bOk) - Widget8Layout.addMultiCellLayout(layout4,1,1,1,2) + self.bHelp = QPushButton(self.Widget8,"bHelp") + self.bHelp.setAutoDefault(1) + layout3_2.addWidget(self.bHelp) + + Widget8Layout.addMultiCellLayout(layout3_2,3,3,0,3) self.tabuniqueinto.insertTab(self.Widget8,QString("")) DPlusIntoLayout.addWidget(self.tabuniqueinto,0,0) @@ -153,21 +153,21 @@ 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")) - 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_2.setText(self.__tr("Valeur(s) possibles(s)")) self.textLabel1.setText(self.__tr("Valeur(s) actuelle(s)")) - self.BAjout1Val.setText(QString.null) - QToolTip.add(self.BAjout1Val,self.__trUtf8("\x61\x6a\x6f\x75\x74\x65\x20\x6c\x61\x20\x76\x61\x6c\x65\x75\x72\x20\x73\x61\x69\x73\x69\x65\x20\x73\x6f\x75\x73\x20\x6c\x20\x6f\x63\x63\x75\x72\x65\x6e\x63\x65\x20\x73\x65\x6c\x65\x63\x74\x69\x6f\x6e\x6e\xc3\xa9\x65\x20\x28\x65\x6e\x20\x66\x69\x6e\x20\x64\x65\x20\x6c\x69\x73\x74\x65\x20\x73\x69\x20\x69\x6c\x20\x6e\x20\x79\x20\x61\x20\x70\x61\x73\x20\x64\x65\x20\x73\x65\x6c\x65\x63\x74\x69\x6f\x6e\x29")) + self.textLabel1_2.setText(self.__tr("Valeur(s) possibles(s)")) self.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.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.tabuniqueinto.changeTab(self.Widget8,self.__tr("Saisir Valeur")) diff --git a/Ui/desPlusieursInto.ui b/Ui/desPlusieursInto.ui index 7fd9c3fc..4aca5cb1 100644 --- a/Ui/desPlusieursInto.ui +++ b/Ui/desPlusieursInto.ui @@ -48,70 +48,6 @@ - - - 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 @@ -234,6 +170,70 @@ + + + layout3 + + + + 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 + + + + diff --git a/Ui/desPoursuite.py b/Ui/desPoursuite.py index cacbc5e8..d200e6cb 100644 --- a/Ui/desPoursuite.py +++ b/Ui/desPoursuite.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'desPoursuite.ui' # -# Created: jeu nov 8 17:36:54 2007 +# Created: mar mar 4 10:36:38 2008 # by: The PyQt User Interface Compiler (pyuic) 3.13 # # WARNING! All changes made in this file will be lost! @@ -45,29 +45,13 @@ class DPour(QWidget): self.setMinimumSize(QSize(505,0)) + DPourLayout = QGridLayout(self,1,1,11,6,"DPourLayout") self.Commentaire = QLabel(self,"Commentaire") - self.Commentaire.setGeometry(QRect(11,437,499,16)) - LayoutWidget = QWidget(self,"layout1") - LayoutWidget.setGeometry(QRect(11,458,499,30)) - layout1 = QHBoxLayout(LayoutWidget,11,6,"layout1") - - self.bHelp = QPushButton(LayoutWidget,"bHelp") - self.bHelp.setAutoDefault(1) - layout1.addWidget(self.bHelp) - - self.bOk = QPushButton(LayoutWidget,"bOk") - self.bOk.setAutoDefault(1) - self.bOk.setDefault(1) - layout1.addWidget(self.bOk) - - self.bSup = QPushButton(LayoutWidget,"bSup") - self.bSup.setAutoDefault(1) - layout1.addWidget(self.bSup) + DPourLayout.addMultiCellWidget(self.Commentaire,1,1,0,2) self.TWChoix = QTabWidget(self,"TWChoix") - self.TWChoix.setGeometry(QRect(10,10,499,420)) self.MotClef = QWidget(self.TWChoix,"MotClef") MotClefLayout = QGridLayout(self.MotClef,1,1,11,6,"MotClefLayout") @@ -134,26 +118,26 @@ class DPour(QWidget): self.TabPage = QWidget(self.TWChoix,"TabPage") - LayoutWidget_2 = QWidget(self.TabPage,"layout4") - LayoutWidget_2.setGeometry(QRect(10,31,472,90)) - layout4 = QVBoxLayout(LayoutWidget_2,11,6,"layout4") + LayoutWidget = QWidget(self.TabPage,"layout4") + LayoutWidget.setGeometry(QRect(10,31,472,90)) + layout4 = QVBoxLayout(LayoutWidget,11,6,"layout4") - self.textLabel1_3 = QLabel(LayoutWidget_2,"textLabel1_3") + self.textLabel1_3 = QLabel(LayoutWidget,"textLabel1_3") layout4.addWidget(self.textLabel1_3) - self.LENomFichier = QLineEdit(LayoutWidget_2,"LENomFichier") + self.LENomFichier = QLineEdit(LayoutWidget,"LENomFichier") self.LENomFichier.setMinimumSize(QSize(470,40)) layout4.addWidget(self.LENomFichier) - LayoutWidget_3 = QWidget(self.TabPage,"layout5") - LayoutWidget_3.setGeometry(QRect(8,131,481,250)) - layout5 = QGridLayout(LayoutWidget_3,1,1,11,6,"layout5") + LayoutWidget_2 = QWidget(self.TabPage,"layout5") + LayoutWidget_2.setGeometry(QRect(8,131,481,250)) + layout5 = QGridLayout(LayoutWidget_2,1,1,11,6,"layout5") layout3 = QHBoxLayout(None,0,6,"layout3") spacer3 = QSpacerItem(331,20,QSizePolicy.Expanding,QSizePolicy.Minimum) layout3.addItem(spacer3) - self.BBrowse = QPushButton(LayoutWidget_3,"BBrowse") + self.BBrowse = QPushButton(LayoutWidget_2,"BBrowse") self.BBrowse.setSizePolicy(QSizePolicy(0,0,0,0,self.BBrowse.sizePolicy().hasHeightForWidth())) self.BBrowse.setMinimumSize(QSize(140,50)) layout3.addWidget(self.BBrowse) @@ -163,6 +147,24 @@ class DPour(QWidget): layout5.addItem(spacer1,0,0) self.TWChoix.insertTab(self.TabPage,QString("")) + DPourLayout.addMultiCellWidget(self.TWChoix,0,0,0,2) + + self.bSup = QPushButton(self,"bSup") + self.bSup.setAutoDefault(1) + + DPourLayout.addWidget(self.bSup,2,0) + + self.bOk = QPushButton(self,"bOk") + self.bOk.setAutoDefault(1) + self.bOk.setDefault(1) + + DPourLayout.addWidget(self.bOk,2,1) + + self.bHelp = QPushButton(self,"bHelp") + self.bHelp.setAutoDefault(1) + + DPourLayout.addWidget(self.bHelp,2,2) + self.languageChange() self.resize(QSize(521,499).expandedTo(self.minimumSizeHint())) @@ -183,15 +185,6 @@ class DPour(QWidget): def languageChange(self): self.setCaption(self.__tr("DMacro")) self.Commentaire.setText(QString.null) - self.bHelp.setText(self.__tr("&Documentation")) - self.bHelp.setAccel(self.__tr("Alt+D")) - QToolTip.add(self.bHelp,self.__tr("affichage documentation aster")) - self.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_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")) @@ -207,6 +200,15 @@ class DPour(QWidget): self.textLabel1_3.setText(self.__tr("La commande POURSUITE requiert un nom de Fichier :")) self.BBrowse.setText(self.__tr("Edit")) self.TWChoix.changeTab(self.TabPage,self.__tr("Fichier Poursuite")) + 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")) def LBNouvCommandeClicked(self): diff --git a/Ui/desPoursuite.ui b/Ui/desPoursuite.ui index 4672e737..58bbbfbc 100644 --- a/Ui/desPoursuite.ui +++ b/Ui/desPoursuite.ui @@ -25,7 +25,7 @@ unnamed - + Commentaire @@ -33,71 +33,7 @@ - - - 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 - - - - - + TWChoix @@ -392,6 +328,60 @@ + + + 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 + + diff --git a/Ui/desRacine.py b/Ui/desRacine.py index e07f042c..daf44e33 100644 --- a/Ui/desRacine.py +++ b/Ui/desRacine.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'desRacine.ui' # -# Created: lun nov 19 11:09:04 2007 +# Created: mar mar 4 10:36:39 2008 # by: The PyQt User Interface Compiler (pyuic) 3.13 # # WARNING! All changes made in this file will be lost! @@ -71,39 +71,39 @@ class DRac(QWidget): self.RBalpha.setChecked(1) self.RBGroupe = QRadioButton(self.buttonGroup1,"RBGroupe") - self.RBGroupe.setGeometry(QRect(10,20,101,20)) + self.RBGroupe.setGeometry(QRect(10,20,90,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") + layout2 = QHBoxLayout(None,0,6,"layout2") - self.bHelp = QPushButton(self,"bHelp") - self.bHelp.setAutoDefault(1) - layout1.addWidget(self.bHelp) + self.bSup = QPushButton(self,"bSup") + self.bSup.setAutoDefault(1) + layout2.addWidget(self.bSup) self.bOk = QPushButton(self,"bOk") self.bOk.setAutoDefault(1) self.bOk.setDefault(1) - layout1.addWidget(self.bOk) + layout2.addWidget(self.bOk) - self.bSup = QPushButton(self,"bSup") - self.bSup.setAutoDefault(1) - layout1.addWidget(self.bSup) + self.bHelp = QPushButton(self,"bHelp") + self.bHelp.setAutoDefault(1) + layout2.addWidget(self.bHelp) + + DRacLayout.addMultiCellLayout(layout2,4,4,0,3) + + self.textLabel1_4 = QLabel(self,"textLabel1_4") - DRacLayout.addMultiCellLayout(layout1,4,4,0,3) + 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.languageChange() @@ -129,17 +129,17 @@ class DRac(QWidget): self.buttonGroup1.setTitle(self.__tr("Affichage")) self.RBalpha.setText(self.__trUtf8("\x61\x6c\x70\x68\x61\x62\xc3\xa9\x74\x69\x71\x75\x65")) self.RBGroupe.setText(self.__tr("par groupe")) - self.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")) 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_4.setText(self.__tr("Commandes :")) def LBNouvCommandeClicked(self): diff --git a/Ui/desRacine.ui b/Ui/desRacine.ui index 6d83242c..3d1d9632 100644 --- a/Ui/desRacine.ui +++ b/Ui/desRacine.ui @@ -91,7 +91,7 @@ 10 20 - 101 + 90 20 @@ -100,25 +100,6 @@ - - - textLabel1_4 - - - <b><u>Commandes :</u></b> - - - - - LBRegles - - - - 250 - 400 - - - textLabel1_4_2 @@ -129,7 +110,7 @@ - layout1 + layout2 @@ -137,19 +118,19 @@ - bHelp + bSup - &Documentation + &Supprimer - Alt+D + Alt+S true - affichage documentation aster + suppression du mot clef @@ -174,23 +155,42 @@ - bSup + bHelp - &Supprimer + &Documentation - Alt+S + Alt+D true - suppression du mot clef + affichage documentation aster + + + textLabel1_4 + + + <b><u>Commandes :</u></b> + + + + + LBRegles + + + + 250 + 400 + + + diff --git a/Ui/desSelectVal.py b/Ui/desSelectVal.py index c28d39d6..69f5e243 100644 --- a/Ui/desSelectVal.py +++ b/Ui/desSelectVal.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'desSelectVal.ui' # -# Created: lun nov 19 11:09:04 2007 +# Created: mar mar 4 10:36:39 2008 # by: The PyQt User Interface Compiler (pyuic) 3.13 # # WARNING! All changes made in this file will be lost! diff --git a/Ui/desUniqueASSD.py b/Ui/desUniqueASSD.py index 831998ab..0aeeac58 100644 --- a/Ui/desUniqueASSD.py +++ b/Ui/desUniqueASSD.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'desUniqueASSD.ui' # -# Created: lun nov 19 11:09:04 2007 +# Created: mar mar 4 10:36:39 2008 # by: The PyQt User Interface Compiler (pyuic) 3.13 # # WARNING! All changes made in this file will be lost! @@ -25,38 +25,34 @@ class DUnASSD(QWidget): self.tabuniqueinto = QTabWidget(self,"tabuniqueinto") self.Widget8 = QWidget(self.tabuniqueinto,"Widget8") - Widget8Layout = QGridLayout(self.Widget8,1,1,11,6,"Widget8Layout") - self.Commentaire = QLabel(self.Widget8,"Commentaire") - self.Commentaire.setMinimumSize(QSize(380,30)) + self.listBoxASSD = QListBox(self.Widget8,"listBoxASSD") + self.listBoxASSD.setGeometry(QRect(11,67,436,287)) - Widget8Layout.addWidget(self.Commentaire,2,0) + self.textLabel2 = QLabel(self.Widget8,"textLabel2") + self.textLabel2.setGeometry(QRect(11,11,436,50)) + self.textLabel2.setMinimumSize(QSize(436,50)) - layout1 = QHBoxLayout(None,0,6,"layout1") + LayoutWidget = QWidget(self.Widget8,"layout2") + LayoutWidget.setGeometry(QRect(10,400,440,23)) + layout2 = QHBoxLayout(LayoutWidget,11,6,"layout2") - self.bHelp = QPushButton(self.Widget8,"bHelp") - self.bHelp.setAutoDefault(1) - layout1.addWidget(self.bHelp) + self.bSup = QPushButton(LayoutWidget,"bSup") + self.bSup.setAutoDefault(1) + layout2.addWidget(self.bSup) - self.bOk = QPushButton(self.Widget8,"bOk") + self.bOk = QPushButton(LayoutWidget,"bOk") self.bOk.setAutoDefault(1) self.bOk.setDefault(1) - layout1.addWidget(self.bOk) - - self.bSup = QPushButton(self.Widget8,"bSup") - self.bSup.setAutoDefault(1) - layout1.addWidget(self.bSup) + layout2.addWidget(self.bOk) - Widget8Layout.addLayout(layout1,3,0) - - self.listBoxASSD = QListBox(self.Widget8,"listBoxASSD") - - Widget8Layout.addWidget(self.listBoxASSD,1,0) - - self.textLabel2 = QLabel(self.Widget8,"textLabel2") - self.textLabel2.setMinimumSize(QSize(436,50)) + self.bHelp = QPushButton(LayoutWidget,"bHelp") + self.bHelp.setAutoDefault(1) + layout2.addWidget(self.bHelp) - Widget8Layout.addWidget(self.textLabel2,0,0) + self.Commentaire = QLabel(self.Widget8,"Commentaire") + self.Commentaire.setGeometry(QRect(11,360,436,30)) + self.Commentaire.setMinimumSize(QSize(380,30)) self.tabuniqueinto.insertTab(self.Widget8,QString("")) DUnASSDLayout.addWidget(self.tabuniqueinto,0,0) @@ -73,17 +69,17 @@ class DUnASSD(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")) - 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\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.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.bOk.setText(self.__tr("&Valider")) + self.bOk.setAccel(self.__tr("Shift+A, Alt+A, Alt+A, Alt+A")) + QToolTip.add(self.bOk,self.__tr("validation de la saisie")) + self.bHelp.setText(self.__tr("&Documentation")) + self.bHelp.setAccel(self.__tr("Alt+D")) + QToolTip.add(self.bHelp,self.__tr("affichage documentation aster")) + self.Commentaire.setText(QString.null) self.tabuniqueinto.changeTab(self.Widget8,self.__tr("Saisir Valeur")) diff --git a/Ui/desUniqueASSD.ui b/Ui/desUniqueASSD.ui index d45181ad..0b186755 100644 --- a/Ui/desUniqueASSD.ui +++ b/Ui/desUniqueASSD.ui @@ -36,109 +36,136 @@ Saisir Valeur - + - unnamed + listBoxASSD - - - Commentaire - - - - 380 - 30 - - - - - - - + + + 11 + 67 + 436 + 287 + + + + + + textLabel2 + + + + 11 + 11 + 436 + 50 + + + + + 436 + 50 + + + + <font size="+1"><p align="center">Structures de données du type +requis par l'objet courant :</p></font> + + + + + layout2 + + + + 10 + 400 + 440 + 23 + + + - layout1 + unnamed - + - 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> - - - + 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 + + + + + + + Commentaire + + + + 11 + 360 + 436 + 30 + + + + + 380 + 30 + + + + + + diff --git a/Ui/desUniqueBase.py b/Ui/desUniqueBase.py index 687530f6..edcb5505 100644 --- a/Ui/desUniqueBase.py +++ b/Ui/desUniqueBase.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'desUniqueBase.ui' # -# Created: lun nov 19 11:09:04 2007 +# Created: mar mar 4 10:36:39 2008 # by: The PyQt User Interface Compiler (pyuic) 3.13 # # WARNING! All changes made in this file will be lost! @@ -25,55 +25,49 @@ class DUnBase(QWidget): self.tabuniqueinto = QTabWidget(self,"tabuniqueinto") self.Widget8 = QWidget(self.tabuniqueinto,"Widget8") - Widget8Layout = QGridLayout(self.Widget8,1,1,11,6,"Widget8Layout") - - 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.setAutoDefault(1) - self.bOk.setDefault(1) - layout1.addWidget(self.bOk) - - 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(11,350,434,40)) self.Commentaire.setMinimumSize(QSize(430,40)) - Widget8Layout.addWidget(self.Commentaire,4,0) + LayoutWidget = QWidget(self.Widget8,"layout2") + LayoutWidget.setGeometry(QRect(11,171,434,52)) + layout2 = QHBoxLayout(LayoutWidget,11,6,"layout2") - layout2 = QHBoxLayout(None,0,6,"layout2") - - self.textLabel2 = QLabel(self.Widget8,"textLabel2") + self.textLabel2 = QLabel(LayoutWidget,"textLabel2") layout2.addWidget(self.textLabel2) - self.lineEditVal = QLineEdit(self.Widget8,"lineEditVal") + self.lineEditVal = QLineEdit(LayoutWidget,"lineEditVal") self.lineEditVal.setMinimumSize(QSize(290,50)) layout2.addWidget(self.lineEditVal) - Widget8Layout.addLayout(layout2,2,0) - - layout3 = QHBoxLayout(None,0,6,"layout3") + LayoutWidget_2 = QWidget(self.Widget8,"layout3") + LayoutWidget_2.setGeometry(QRect(11,11,434,32)) + layout3 = QHBoxLayout(LayoutWidget_2,11,6,"layout3") spacer1 = QSpacerItem(281,21,QSizePolicy.Expanding,QSizePolicy.Minimum) layout3.addItem(spacer1) - self.bParametres = QPushButton(self.Widget8,"bParametres") + self.bParametres = QPushButton(LayoutWidget_2,"bParametres") 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) + LayoutWidget_3 = QWidget(self.Widget8,"layout4") + LayoutWidget_3.setGeometry(QRect(10,400,440,23)) + layout4 = QHBoxLayout(LayoutWidget_3,11,6,"layout4") + + self.bSup = QPushButton(LayoutWidget_3,"bSup") + self.bSup.setAutoDefault(1) + layout4.addWidget(self.bSup) + + self.bOk = QPushButton(LayoutWidget_3,"bOk") + self.bOk.setAutoDefault(1) + self.bOk.setDefault(1) + layout4.addWidget(self.bOk) + + self.bHelp = QPushButton(LayoutWidget_3,"bHelp") + self.bHelp.setAutoDefault(1) + layout4.addWidget(self.bHelp) self.tabuniqueinto.insertTab(self.Widget8,QString("")) DUnBaseLayout.addWidget(self.tabuniqueinto,0,0) @@ -92,18 +86,18 @@ class DUnBase(QWidget): def languageChange(self): self.setCaption(self.__tr("DUnIn")) - 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")) + 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.tabuniqueinto.changeTab(self.Widget8,self.__tr("Saisir Valeur")) diff --git a/Ui/desUniqueBase.ui b/Ui/desUniqueBase.ui index 62fdacee..2188b31b 100644 --- a/Ui/desUniqueBase.ui +++ b/Ui/desUniqueBase.ui @@ -36,201 +36,244 @@ Saisir Valeur - + - unnamed + Commentaire - + + + 11 + 350 + 434 + 40 + + + + + 430 + 40 + + + + + + + + + layout2 + + + + 11 + 171 + 434 + 52 + + + - layout1 + unnamed - + - unnamed + textLabel2 - - - 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 - - + + <b><u><p align="center">Valeur: </p></u></b> + + + - unnamed + lineEditVal - - - textLabel2 - - - <b><u><p align="center">Valeur: </p></u></b> - - - - - lineEditVal - - - - 290 - 50 - - - - - - + + + 290 + 50 + + + + + + + + layout3 + + + + 11 + 11 + 434 + 32 + + + - layout3 + unnamed - + - unnamed + spacer1 - - - spacer1 - - - Horizontal - - - Expanding - - - - 281 - 21 - - - - - - bParametres - - - - 0 - 0 - 0 - 0 - - - - - 140 - 30 - - - - Parametres - - - - - - - spacer2 - - - Vertical - - - Expanding - - - - 20 - 81 - - - - + + Horizontal + + + Expanding + + + + 281 + 21 + + + + + + bParametres + + + + 0 + 0 + 0 + 0 + + + + + 140 + 30 + + + + Parametres + + + + + + + spacer2 + + + Vertical + + + Expanding + + + + 20 + 81 + + + + + 218 + 49 + 20 + 116 + + + + + + spacer3 + + + Vertical + + + Expanding + + + + 41 + 91 + + + + + 207 + 229 + 41 + 115 + + + + + + layout4 + + + + 10 + 400 + 440 + 23 + + + - spacer3 - - - Vertical - - - Expanding + unnamed - - - 41 - 91 - - - - + + + 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 + + + + diff --git a/Ui/desUniqueComp.py b/Ui/desUniqueComp.py index 38100e18..0816049c 100644 --- a/Ui/desUniqueComp.py +++ b/Ui/desUniqueComp.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'desUniqueComp.ui' # -# Created: lun nov 19 11:09:05 2007 +# Created: mar mar 4 10:36:39 2008 # by: The PyQt User Interface Compiler (pyuic) 3.13 # # WARNING! All changes made in this file will be lost! @@ -27,22 +27,6 @@ class DUnComp(QWidget): self.Widget8 = QWidget(self.tabuniqueinto,"Widget8") Widget8Layout = QGridLayout(self.Widget8,1,1,11,6,"Widget8Layout") - self.bSup = QPushButton(self.Widget8,"bSup") - self.bSup.setAutoDefault(1) - - Widget8Layout.addWidget(self.bSup,6,3) - - self.bOk = QPushButton(self.Widget8,"bOk") - self.bOk.setAutoDefault(1) - self.bOk.setDefault(1) - - Widget8Layout.addMultiCellWidget(self.bOk,6,6,1,2) - - self.bHelp = QPushButton(self.Widget8,"bHelp") - self.bHelp.setAutoDefault(1) - - Widget8Layout.addWidget(self.bHelp,6,0) - layout3 = QVBoxLayout(None,0,6,"layout3") self.textLabel1 = QLabel(self.Widget8,"textLabel1") @@ -52,21 +36,21 @@ class DUnComp(QWidget): self.LEcomp.setMinimumSize(QSize(390,40)) layout3.addWidget(self.LEcomp) - Widget8Layout.addMultiCellLayout(layout3,0,0,0,3) + Widget8Layout.addMultiCellLayout(layout3,0,0,0,1) self.Commentaire = QLabel(self.Widget8,"Commentaire") - Widget8Layout.addMultiCellWidget(self.Commentaire,5,5,0,3) + Widget8Layout.addMultiCellWidget(self.Commentaire,5,5,0,1) self.LEReel = QLineEdit(self.Widget8,"LEReel") self.LEReel.setMinimumSize(QSize(190,40)) - Widget8Layout.addMultiCellWidget(self.LEReel,3,3,0,1) + Widget8Layout.addWidget(self.LEReel,3,0) self.LEImag = QLineEdit(self.Widget8,"LEImag") self.LEImag.setMinimumSize(QSize(190,40)) - Widget8Layout.addMultiCellWidget(self.LEImag,3,3,2,3) + Widget8Layout.addWidget(self.LEImag,3,1) self.buttonGroup1 = QButtonGroup(self.Widget8,"buttonGroup1") @@ -76,11 +60,28 @@ class DUnComp(QWidget): self.RBMP = QRadioButton(self.buttonGroup1,"RBMP") self.RBMP.setGeometry(QRect(20,20,335,20)) - Widget8Layout.addMultiCellWidget(self.buttonGroup1,2,2,0,3) + Widget8Layout.addMultiCellWidget(self.buttonGroup1,2,2,0,1) spacer3 = QSpacerItem(20,41,QSizePolicy.Minimum,QSizePolicy.Expanding) - Widget8Layout.addItem(spacer3,1,1) + Widget8Layout.addItem(spacer3,1,0) spacer4 = QSpacerItem(20,41,QSizePolicy.Minimum,QSizePolicy.Expanding) - Widget8Layout.addItem(spacer4,4,1) + Widget8Layout.addItem(spacer4,4,0) + + layout2 = QHBoxLayout(None,0,6,"layout2") + + self.bSup = QPushButton(self.Widget8,"bSup") + self.bSup.setAutoDefault(1) + layout2.addWidget(self.bSup) + + self.bOk = QPushButton(self.Widget8,"bOk") + self.bOk.setAutoDefault(1) + self.bOk.setDefault(1) + layout2.addWidget(self.bOk) + + self.bHelp = QPushButton(self.Widget8,"bHelp") + self.bHelp.setAutoDefault(1) + layout2.addWidget(self.bHelp) + + Widget8Layout.addMultiCellLayout(layout2,6,6,0,1) self.tabuniqueinto.insertTab(self.Widget8,QString("")) DUnCompLayout.addWidget(self.tabuniqueinto,0,0) @@ -100,6 +101,11 @@ class DUnComp(QWidget): def languageChange(self): self.setCaption(self.__tr("DUnComp")) + 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.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.bSup.setText(self.__tr("&Supprimer")) self.bSup.setAccel(self.__tr("Alt+S")) QToolTip.add(self.bSup,self.__tr("suppression du mot clef")) @@ -109,11 +115,6 @@ class DUnComp(QWidget): self.bHelp.setText(self.__tr("&Documentation")) self.bHelp.setAccel(self.__tr("Alt+D")) QToolTip.add(self.bHelp,self.__tr("affichage documentation aster")) - self.textLabel1.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.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 92689735..c89080e4 100644 --- a/Ui/desUniqueComp.ui +++ b/Ui/desUniqueComp.ui @@ -40,61 +40,7 @@ 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 @@ -123,7 +69,7 @@ - + Commentaire @@ -131,7 +77,7 @@ <font size="+2">Un complexe est attendu</font> - + LEReel @@ -142,7 +88,7 @@ - + LEImag @@ -153,7 +99,7 @@ - + buttonGroup1 @@ -193,7 +139,7 @@ - + spacer3 @@ -210,7 +156,7 @@ - + spacer4 @@ -227,6 +173,70 @@ + + + layout2 + + + + 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 + + + + diff --git a/Ui/desUniqueInto.py b/Ui/desUniqueInto.py index e1fc77c7..e5bddc23 100644 --- a/Ui/desUniqueInto.py +++ b/Ui/desUniqueInto.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'desUniqueInto.ui' # -# Created: lun nov 19 11:16:55 2007 +# Created: mar mar 4 10:36:39 2008 # by: The PyQt User Interface Compiler (pyuic) 3.13 # # WARNING! All changes made in this file will be lost! @@ -25,37 +25,33 @@ class DUnIn(QWidget): self.tabuniqueinto = QTabWidget(self,"tabuniqueinto") self.Widget8 = QWidget(self.tabuniqueinto,"Widget8") - Widget8Layout = QGridLayout(self.Widget8,1,1,11,6,"Widget8Layout") - - 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.setAutoDefault(1) - self.bOk.setDefault(1) - layout1.addWidget(self.bOk) - - self.bSup = QPushButton(self.Widget8,"bSup") - self.bSup.setAutoDefault(1) - layout1.addWidget(self.bSup) - - Widget8Layout.addLayout(layout1,3,0) self.textLabel2 = QLabel(self.Widget8,"textLabel2") - - Widget8Layout.addWidget(self.textLabel2,0,0) + self.textLabel2.setGeometry(QRect(11,11,434,16)) self.listBoxVal = QListBox(self.Widget8,"listBoxVal") - - Widget8Layout.addWidget(self.listBoxVal,1,0) + self.listBoxVal.setGeometry(QRect(11,33,434,321)) self.Commentaire = QLabel(self.Widget8,"Commentaire") + self.Commentaire.setGeometry(QRect(11,360,434,30)) self.Commentaire.setMinimumSize(QSize(420,30)) - Widget8Layout.addWidget(self.Commentaire,2,0) + LayoutWidget = QWidget(self.Widget8,"layout2") + LayoutWidget.setGeometry(QRect(10,400,440,23)) + layout2 = QHBoxLayout(LayoutWidget,11,6,"layout2") + + self.bSup = QPushButton(LayoutWidget,"bSup") + self.bSup.setAutoDefault(1) + layout2.addWidget(self.bSup) + + self.bOk = QPushButton(LayoutWidget,"bOk") + self.bOk.setAutoDefault(1) + self.bOk.setDefault(1) + layout2.addWidget(self.bOk) + + self.bHelp = QPushButton(LayoutWidget,"bHelp") + self.bHelp.setAutoDefault(1) + layout2.addWidget(self.bHelp) self.tabuniqueinto.insertTab(self.Widget8,QString("")) DUnInLayout.addWidget(self.tabuniqueinto,0,0) @@ -72,17 +68,17 @@ class DUnIn(QWidget): def languageChange(self): self.setCaption(self.__tr("DUnIn")) - 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.textLabel2.setText(self.__tr("

Valeurs possibles

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

Valeurs possibles

")) - 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.bHelp.setText(self.__tr("&Documentation")) + self.bHelp.setAccel(self.__tr("Alt+D")) + QToolTip.add(self.bHelp,self.__tr("affichage documentation aster")) self.tabuniqueinto.changeTab(self.Widget8,self.__tr("Saisir Valeur")) diff --git a/Ui/desUniqueInto.ui b/Ui/desUniqueInto.ui index 3dc4146b..ffe01801 100644 --- a/Ui/desUniqueInto.ui +++ b/Ui/desUniqueInto.ui @@ -36,102 +36,129 @@ Saisir Valeur - + - unnamed + textLabel2 - + + + 11 + 11 + 434 + 16 + + + + <b><u><p align="center">Valeurs possibles</p></u></b> + + + + + listBoxVal + + + + 11 + 33 + 434 + 321 + + + + + + Commentaire + + + + 11 + 360 + 434 + 30 + + + + + 420 + 30 + + + + + + + + + layout2 + + + + 10 + 400 + 440 + 23 + + + - layout1 + unnamed - + - 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 - - - - - - - + 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 + + + + diff --git a/Ui/desUniqueSDCO.py b/Ui/desUniqueSDCO.py index 5cb47ac1..dbaf4f9d 100644 --- a/Ui/desUniqueSDCO.py +++ b/Ui/desUniqueSDCO.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'desUniqueSDCO.ui' # -# Created: lun nov 19 11:09:05 2007 +# Created: mar mar 4 10:36:39 2008 # by: The PyQt User Interface Compiler (pyuic) 3.13 # # WARNING! All changes made in this file will be lost! @@ -25,52 +25,32 @@ class DUnSDCO(QWidget): self.tabuniqueinto = QTabWidget(self,"tabuniqueinto") self.Widget8 = QWidget(self.tabuniqueinto,"Widget8") - Widget8Layout = QGridLayout(self.Widget8,1,1,11,6,"Widget8Layout") - layout4 = QHBoxLayout(None,0,6,"layout4") + LayoutWidget = QWidget(self.Widget8,"layout4") + LayoutWidget.setGeometry(QRect(11,11,413,44)) + layout4 = QHBoxLayout(LayoutWidget,11,6,"layout4") - self.textLabel1 = QLabel(self.Widget8,"textLabel1") + self.textLabel1 = QLabel(LayoutWidget,"textLabel1") layout4.addWidget(self.textLabel1) layout3 = QVBoxLayout(None,0,6,"layout3") - self.rbOui = QRadioButton(self.Widget8,"rbOui") + self.rbOui = QRadioButton(LayoutWidget,"rbOui") self.rbOui.setEnabled(1) self.rbOui.setChecked(1) layout3.addWidget(self.rbOui) - self.rbNon = QRadioButton(self.Widget8,"rbNon") + self.rbNon = QRadioButton(LayoutWidget,"rbNon") self.rbNon.setEnabled(0) self.rbNon.setChecked(0) layout3.addWidget(self.rbNon) layout4.addLayout(layout3) - Widget8Layout.addLayout(layout4,0,0) + LayoutWidget_2 = QWidget(self.Widget8,"layout5") + LayoutWidget_2.setGeometry(QRect(11,61,413,49)) + layout5 = QVBoxLayout(LayoutWidget_2,11,6,"layout5") - layout6 = QHBoxLayout(None,0,6,"layout6") - - self.bHelp = QPushButton(self.Widget8,"bHelp") - self.bHelp.setAutoDefault(1) - layout6.addWidget(self.bHelp) - spacer3_3 = QSpacerItem(16,20,QSizePolicy.Expanding,QSizePolicy.Minimum) - layout6.addItem(spacer3_3) - - 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.bSup = QPushButton(self.Widget8,"bSup") - self.bSup.setAutoDefault(1) - layout6.addWidget(self.bSup) - - Widget8Layout.addLayout(layout6,5,0) - - layout5 = QVBoxLayout(None,0,6,"layout5") - - self.frame3 = QFrame(self.Widget8,"frame3") + self.frame3 = QFrame(LayoutWidget_2,"frame3") self.frame3.setFrameShape(QFrame.StyledPanel) self.frame3.setFrameShadow(QFrame.Raised) @@ -78,22 +58,37 @@ class DUnSDCO(QWidget): self.textLabel2_2.setGeometry(QRect(10,10,280,26)) layout5.addWidget(self.frame3) - self.LESDCO = QLineEdit(self.Widget8,"LESDCO") + self.LESDCO = QLineEdit(LayoutWidget_2,"LESDCO") self.LESDCO.setMinimumSize(QSize(300,40)) layout5.addWidget(self.LESDCO) - Widget8Layout.addLayout(layout5,1,0) - 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.textLabel2.setGeometry(QRect(11,116,413,18)) self.Commentaire = QLabel(self.Widget8,"Commentaire") + self.Commentaire.setGeometry(QRect(11,360,413,30)) self.Commentaire.setMinimumSize(QSize(311,30)) - Widget8Layout.addWidget(self.Commentaire,4,0) + LayoutWidget_3 = QWidget(self.Widget8,"layout6") + LayoutWidget_3.setGeometry(QRect(17,390,410,23)) + layout6 = QHBoxLayout(LayoutWidget_3,11,6,"layout6") + + self.bSup = QPushButton(LayoutWidget_3,"bSup") + self.bSup.setAutoDefault(1) + layout6.addWidget(self.bSup) + spacer3_3 = QSpacerItem(20,20,QSizePolicy.Expanding,QSizePolicy.Minimum) + layout6.addItem(spacer3_3) + + self.bOk = QPushButton(LayoutWidget_3,"bOk") + self.bOk.setAutoDefault(1) + self.bOk.setDefault(1) + layout6.addWidget(self.bOk) + spacer3_3_3 = QSpacerItem(30,20,QSizePolicy.Expanding,QSizePolicy.Minimum) + layout6.addItem(spacer3_3_3) + + self.bHelp = QPushButton(LayoutWidget_3,"bHelp") + self.bHelp.setAutoDefault(1) + layout6.addWidget(self.bHelp) self.tabuniqueinto.insertTab(self.Widget8,QString("")) DUnSDCOLayout.addWidget(self.tabuniqueinto,0,0) @@ -115,18 +110,18 @@ class DUnSDCO(QWidget): 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.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.textLabel2.setText(self.__tr("Un objet de type CO est attendu")) 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.tabuniqueinto.changeTab(self.Widget8,self.__tr("Saisir Valeur")) diff --git a/Ui/desUniqueSDCO.ui b/Ui/desUniqueSDCO.ui index ddf849f2..9d3e0eae 100644 --- a/Ui/desUniqueSDCO.ui +++ b/Ui/desUniqueSDCO.ui @@ -36,252 +36,295 @@ Saisir Valeur - + - unnamed + layout4 - + + + 11 + 11 + 413 + 44 + + + - layout4 + unnamed - + - unnamed + textLabel1 - - - textLabel1 - - - <font size="+1">Nouveau Concept : </font> - - - + + <font size="+1">Nouveau Concept : </font> + + + + + layout3 + + - layout3 + unnamed - + - unnamed + rbOui - - - rbOui - - - true - - - Oui - - - true - - - - - rbNon - - - false - - - Non - - - false - - - - - - - + + true + + + Oui + + + true + + + + + rbNon + + + false + + + Non + + + false + + + + + + + + + layout5 + + + + 11 + 61 + 413 + 49 + + + - layout6 + unnamed - + - unnamed + frame3 - - - bHelp - - - &Documentation - - - Alt+D - - - true - - - affichage documentation aster - - - + + StyledPanel + + + Raised + + - spacer3_3 - - - Horizontal - - - Expanding + textLabel2_2 - - - 16 - 20 - - - - - - bOk + + + 10 + 10 + 280 + 26 + - &Valider - - - Shift+A, Alt+A, Alt+A, Alt+A - - - true - - - true - - - validation de la saisie + <font size="+2">Nom du nouveau concept : </font> - - - spacer3_3_3 - - - Horizontal - - - Expanding - - - - 16 - 20 - - - - - - bSup - - - &Supprimer - - - Alt+S - - - true - - - suppression du mot clef - - - - - - - layout5 - - + + - unnamed + LESDCO - - - 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 - - - - + + + 300 + 40 + + + + + + + + textLabel2 + + + + 11 + 116 + 413 + 18 + + + + <font size="+1">Un objet de type CO est attendu</font> + + + + + spacer5 + + + Vertical + + + Expanding + + + + 31 + 131 + + + + + 202 + 140 + 31 + 214 + + + + + + Commentaire + + + + 11 + 360 + 413 + 30 + + + + + 311 + 30 + + + + + + + + + layout6 + + + + 17 + 390 + 410 + 23 + + + - Commentaire - - - - 311 - 30 - + unnamed - - - - - + + + bSup + + + &Supprimer + + + Alt+S + + + true + + + suppression du mot clef + + + + + spacer3_3 + + + Horizontal + + + Expanding + + + + 20 + 20 + + + + + + bOk + + + &Valider + + + Shift+A, Alt+A, Alt+A, Alt+A + + + true + + + true + + + validation de la saisie + + + + + spacer3_3_3 + + + Horizontal + + + Expanding + + + + 30 + 20 + + + + + + bHelp + + + &Documentation + + + Alt+D + + + true + + + affichage documentation aster + + + + diff --git a/Ui/desUniqueSDCOInto.py b/Ui/desUniqueSDCOInto.py index 51cdee7c..8d760745 100644 --- a/Ui/desUniqueSDCOInto.py +++ b/Ui/desUniqueSDCOInto.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'desUniqueSDCOInto.ui' # -# Created: lun nov 19 11:09:05 2007 +# Created: mar mar 4 10:36:39 2008 # by: The PyQt User Interface Compiler (pyuic) 3.13 # # WARNING! All changes made in this file will be lost! @@ -35,23 +35,6 @@ class DUnSDCOInto(QWidget): Widget8Layout.addWidget(self.LBSDCO,1,0) - 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.setAutoDefault(1) - self.bOk.setDefault(1) - layout1.addWidget(self.bOk) - - 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") Widget8Layout.addWidget(self.textLabel2_3,5,0) @@ -96,6 +79,23 @@ class DUnSDCOInto(QWidget): layout6.addWidget(self.LEDSCO) Widget8Layout.addLayout(layout6,3,0) + + layout4 = QHBoxLayout(None,0,6,"layout4") + + self.bSup = QPushButton(self.Widget8,"bSup") + self.bSup.setAutoDefault(1) + layout4.addWidget(self.bSup) + + self.bOk = QPushButton(self.Widget8,"bOk") + self.bOk.setAutoDefault(1) + self.bOk.setDefault(1) + layout4.addWidget(self.bOk) + + self.bHelp = QPushButton(self.Widget8,"bHelp") + self.bHelp.setAutoDefault(1) + layout4.addWidget(self.bHelp) + + Widget8Layout.addLayout(layout4,6,0) self.tabuniqueinto.insertTab(self.Widget8,QString("")) DUnSDCOIntoLayout.addWidget(self.tabuniqueinto,0,0) @@ -117,21 +117,21 @@ class DUnSDCOInto(QWidget): def languageChange(self): self.setCaption(self.__tr("DUnIn")) 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.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.Commentaire.setText(QString.null) self.rbOui.setText(self.__tr("Oui")) self.rbNon.setText(self.__tr("Non")) self.textLabel1.setText(self.__tr("Nouveau Concept : ")) self.textLabel2_2.setText(self.__tr(" Nom concept : ")) + self.bSup.setText(self.__tr("&Supprimer")) + self.bSup.setAccel(self.__tr("Alt+S")) + 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.tabuniqueinto.changeTab(self.Widget8,self.__tr("Saisir Valeur")) diff --git a/Ui/desUniqueSDCOInto.ui b/Ui/desUniqueSDCOInto.ui index 05c66eda..fe3fde48 100644 --- a/Ui/desUniqueSDCOInto.ui +++ b/Ui/desUniqueSDCOInto.ui @@ -53,70 +53,6 @@ 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 @@ -236,6 +172,70 @@ + + + layout4 + + + + 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 + + + + diff --git a/Ui/desVisu.py b/Ui/desVisu.py index 17cb44bd..bfeb69fa 100644 --- a/Ui/desVisu.py +++ b/Ui/desVisu.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'desVisu.ui' # -# Created: lun nov 19 11:09:05 2007 +# Created: mar mar 4 10:36:39 2008 # by: The PyQt User Interface Compiler (pyuic) 3.13 # # WARNING! All changes made in this file will be lost! diff --git a/Ui/myMain.py b/Ui/myMain.py index 5a0c5f8b..0565e4b6 100644 --- a/Ui/myMain.py +++ b/Ui/myMain.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Form implementation generated from reading ui file '../Ui/myMain.ui' +# Form implementation generated from reading ui file 'myMain.ui' # -# Created: lun nov 19 16:49:43 2007 +# Created: mar mar 4 10:36:39 2008 # by: The PyQt User Interface Compiler (pyuic) 3.13 # # WARNING! All changes made in this file will be lost! @@ -294,6 +294,8 @@ class Eficas(QMainWindow): self.jdcRapportDeValidationAction = QAction(self,"jdcRapportDeValidationAction") self.jdcFichierSourceAction = QAction(self,"jdcFichierSourceAction") self.traduitV7V8Action = QAction(self,"traduitV7V8Action") + self.aidenew_itemAction = QAction(self,"aidenew_itemAction") + self.fileNewInclude = QAction(self,"fileNewInclude") self.toolBar = QToolBar(QString(""),self,Qt.DockTop) @@ -317,7 +319,7 @@ class Eficas(QMainWindow): self.Fichier = QPopupMenu(self) self.fileNewAction.addTo(self.Fichier) - self.fileNewViewAction.addTo(self.Fichier) + self.fileNewInclude.addTo(self.Fichier) self.fileOpenAction.addTo(self.Fichier) self.fileSaveAction.addTo(self.Fichier) self.fileSaveAsAction.addTo(self.Fichier) @@ -345,6 +347,7 @@ class Eficas(QMainWindow): self.MenuBar.insertItem(QString(""),self.Options,5) self.Aide = QPopupMenu(self) + self.aidenew_itemAction.addTo(self.Aide) self.MenuBar.insertItem(QString(""),self.Aide,6) self.Traduction = QPopupMenu(self) @@ -380,6 +383,8 @@ class Eficas(QMainWindow): self.connect(self.jdcRapportDeValidationAction,SIGNAL("activated()"),self.jdcRapport) self.connect(self.jdcFichierSourceAction,SIGNAL("activated()"),self.jdcFichierSource) self.connect(self.traduitV7V8Action,SIGNAL("activated()"),self.traductionV7V8) + self.connect(self.aidenew_itemAction,SIGNAL("activated()"),self.helpAbout) + self.connect(self.fileNewInclude,SIGNAL("activated()"),self.NewInclude) def languageChange(self): @@ -390,14 +395,14 @@ class Eficas(QMainWindow): self.fileOpenAction.setText(self.__tr("Ouvrir")) self.fileOpenAction.setMenuText(self.__tr("&Ouvrir")) self.fileOpenAction.setAccel(self.__tr("Ctrl+O")) - self.fileSaveAction.setText(self.__tr("Sauver")) - self.fileSaveAction.setMenuText(self.__tr("&Sauver")) - self.fileSaveAction.setAccel(self.__tr("Ctrl+S")) - self.fileSaveAsAction.setText(self.__tr("Sauver Comme")) - self.fileSaveAsAction.setMenuText(self.__tr("Sauver Comme")) + self.fileSaveAction.setText(self.__tr("Enregister")) + self.fileSaveAction.setMenuText(self.__tr("&Enregister")) + self.fileSaveAction.setAccel(self.__tr("Ctrl+E")) + self.fileSaveAsAction.setText(self.__tr("Enregister Sous")) + self.fileSaveAsAction.setMenuText(self.__tr("Enregister Sous")) self.fileSaveAsAction.setAccel(QString.null) - self.fileExitAction.setText(self.__tr("Exit")) - self.fileExitAction.setMenuText(self.__tr("E&xit")) + self.fileExitAction.setText(self.__tr("Quitter")) + self.fileExitAction.setMenuText(self.__tr("Q&uitter")) self.fileExitAction.setAccel(QString.null) self.editUndoAction.setText(self.__tr("Undo")) self.editUndoAction.setMenuText(self.__tr("&Undo")) @@ -442,6 +447,9 @@ class Eficas(QMainWindow): self.jdcFichierSourceAction.setAccel(self.__tr("Ctrl+B")) self.traduitV7V8Action.setText(self.__tr("traduitV7V8")) self.traduitV7V8Action.setMenuText(self.__tr("traduitV7V8")) + self.aidenew_itemAction.setText(self.__tr("Eficas")) + self.fileNewInclude.setText(self.__tr("Nouvel Include")) + self.fileNewInclude.setMenuText(self.__tr("Nouvel Include")) self.toolBar.setLabel(self.__tr("Tools")) if self.MenuBar.findItem(2): self.MenuBar.findItem(2).setText(self.__tr("&Fichier")) @@ -522,5 +530,8 @@ class Eficas(QMainWindow): def traductionV7V8(self): print "Eficas.traductionV7V8(): Not implemented yet" + def NewInclude(self): + print "Eficas.NewInclude(): Not implemented yet" + def __tr(self,s,c = None): return qApp.translate("Eficas",s,c) diff --git a/Ui/myMain.ui b/Ui/myMain.ui index 1450677c..e05a455a 100644 --- a/Ui/myMain.ui +++ b/Ui/myMain.ui @@ -71,7 +71,7 @@ - + @@ -95,6 +95,7 @@ + @@ -170,13 +171,13 @@ image2 - Sauver + Enregister - &Sauver + &Enregister - Ctrl+S + Ctrl+E @@ -184,10 +185,10 @@ fileSaveAsAction - Sauver Comme + Enregister Sous - Sauver Comme + Enregister Sous @@ -198,10 +199,10 @@ fileExitAction - Exit + Quitter - E&xit + Q&uitter @@ -449,6 +450,25 @@ traduitV7V8 + + + aidenew_itemAction + + + Eficas + + + + + fileNewInclude + + + Nouvel Include + + + Nouvel Include + + @@ -600,6 +620,18 @@ Eficas traductionV7V8() + + aidenew_itemAction + activated() + Eficas + helpAbout() + + + fileNewInclude + activated() + Eficas + NewInclude() + fileNew() @@ -623,6 +655,7 @@ editCut() editCopy() traductionV7V8() + NewInclude() -- 2.39.2