From 9a3a924b9f1a979c7b8c42f60f88b0c25eff688d Mon Sep 17 00:00:00 2001 From: Pascale Noyret Date: Mon, 7 Apr 2008 07:50:41 +0000 Subject: [PATCH] *** empty log message *** --- Ui/OptionsEditeur.py | 119 ++++++---- Ui/OptionsEditeur.ui | 317 +++++++++++++------------ Ui/OptionsPdf.py | 59 +++++ Ui/OptionsPdf.ui | 106 +++++++++ Ui/desCommande.py | 18 +- Ui/desCommande.ui | 38 ++- Ui/desCommentaire.py | 10 +- Ui/desCommentaire.ui | 10 + Ui/desFormule.py | 13 +- Ui/desFormule.ui | 13 + Ui/desInclude.py | 14 +- Ui/desInclude.ui | 14 ++ Ui/desMacro.py | 12 +- Ui/desMacro.ui | 12 + Ui/desParam.py | 20 +- Ui/desParam.ui | 55 +++-- Ui/desPlusieursBase.py | 39 ++- Ui/desPlusieursBase.ui | 60 +++-- Ui/desPlusieursInto.py | 8 +- Ui/desPlusieursInto.ui | 8 + Ui/desPoursuite.py | 13 +- Ui/desPoursuite.ui | 13 + Ui/desRacine.py | 49 ++-- Ui/desRacine.ui | 63 ++--- Ui/desUniqueBase.py | 56 ++++- Ui/desUniqueBase.ui | 508 +++++++++++++++++++--------------------- Ui/desUniqueComp.py | 11 +- Ui/desUniqueComp.ui | 11 + Ui/desUniqueSDCO.py | 7 +- Ui/desUniqueSDCO.ui | 7 + Ui/desUniqueSDCOInto.py | 8 +- Ui/desUniqueSDCOInto.ui | 8 + Ui/makefile | 2 +- Ui/myMain.py | 10 +- Ui/myMain.ui | 19 ++ 35 files changed, 1118 insertions(+), 612 deletions(-) create mode 100644 Ui/OptionsPdf.py create mode 100644 Ui/OptionsPdf.ui diff --git a/Ui/OptionsEditeur.py b/Ui/OptionsEditeur.py index 990f6505..3e0b43da 100644 --- a/Ui/OptionsEditeur.py +++ b/Ui/OptionsEditeur.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'OptionsEditeur.ui' # -# Created: jeu mar 27 11:26:38 2008 +# Created: ven avr 4 11:27:10 2008 # by: The PyQt User Interface Compiler (pyuic) 3.13 # # WARNING! All changes made in this file will be lost! @@ -20,90 +20,105 @@ class desOptions(QDialog): - self.groupBox1 = QGroupBox(self,"groupBox1") - self.groupBox1.setGeometry(QRect(10,0,578,191)) + self.groupBox3 = QGroupBox(self,"groupBox3") + self.groupBox3.setGeometry(QRect(10,320,550,100)) + + self.textLabel1 = QLabel(self.groupBox3,"textLabel1") + self.textLabel1.setGeometry(QRect(20,20,280,20)) + + self.LERepDoc = QLineEdit(self.groupBox3,"LERepDoc") + self.LERepDoc.setGeometry(QRect(20,40,520,31)) - self.comboBox2 = QComboBox(0,self.groupBox1,"comboBox2") - self.comboBox2.setGeometry(QRect(30,20,90,30)) + self.groupBox1 = QGroupBox(self,"groupBox1") + self.groupBox1.setGeometry(QRect(10,0,550,191)) self.textLabel1_3 = QLabel(self.groupBox1,"textLabel1_3") self.textLabel1_3.setGeometry(QRect(30,60,280,20)) - self.lineEdit1_3 = QLineEdit(self.groupBox1,"lineEdit1_3") - self.lineEdit1_3.setGeometry(QRect(30,80,501,31)) - self.textLabel1_2_2 = QLabel(self.groupBox1,"textLabel1_2_2") self.textLabel1_2_2.setGeometry(QRect(30,120,280,20)) - self.lineEdit1_2_2 = QLineEdit(self.groupBox1,"lineEdit1_2_2") - self.lineEdit1_2_2.setGeometry(QRect(30,140,501,31)) + self.CBVersions = QComboBox(0,self.groupBox1,"CBVersions") + self.CBVersions.setGeometry(QRect(30,20,90,30)) - self.groupBox2 = QGroupBox(self,"groupBox2") - self.groupBox2.setGeometry(QRect(10,200,578,50)) + self.LERepCata = QLineEdit(self.groupBox1,"LERepCata") + self.LERepCata.setGeometry(QRect(30,80,501,31)) - self.textLabel3 = QLabel(self.groupBox2,"textLabel3") - self.textLabel3.setGeometry(QRect(19,19,141,21)) + self.LERepMat = QLineEdit(self.groupBox1,"LERepMat") + self.LERepMat.setGeometry(QRect(30,140,501,31)) - self.lineEdit7 = QLineEdit(self.groupBox2,"lineEdit7") - self.lineEdit7.setGeometry(QRect(170,20,101,21)) + self.Bok = QPushButton(self.groupBox1,"Bok") + self.Bok.setGeometry(QRect(440,20,90,31)) - self.textLabel3_2 = QLabel(self.groupBox2,"textLabel3_2") - self.textLabel3_2.setGeometry(QRect(289,19,110,21)) - - self.lineEdit7_3 = QLineEdit(self.groupBox2,"lineEdit7_3") - self.lineEdit7_3.setGeometry(QRect(410,20,101,21)) - - self.groupBox3 = QGroupBox(self,"groupBox3") - self.groupBox3.setGeometry(QRect(10,260,578,161)) + self.groupBox2 = QGroupBox(self,"groupBox2") + self.groupBox2.setGeometry(QRect(10,210,550,100)) - self.textLabel1 = QLabel(self.groupBox3,"textLabel1") - self.textLabel1.setGeometry(QRect(20,20,280,20)) + self.textLabel1_2_3 = QLabel(self.groupBox2,"textLabel1_2_3") + self.textLabel1_2_3.setGeometry(QRect(20,60,180,21)) - self.lineEdit1 = QLineEdit(self.groupBox3,"lineEdit1") - self.lineEdit1.setGeometry(QRect(20,40,501,31)) + self.textLabel3 = QLabel(self.groupBox2,"textLabel3") + self.textLabel3.setGeometry(QRect(19,19,141,21)) - self.lineEdit1_2 = QLineEdit(self.groupBox3,"lineEdit1_2") - self.lineEdit1_2.setGeometry(QRect(20,110,501,31)) + self.textLabel3_2 = QLabel(self.groupBox2,"textLabel3_2") + self.textLabel3_2.setGeometry(QRect(300,20,130,21)) - self.textLabel1_2 = QLabel(self.groupBox3,"textLabel1_2") - self.textLabel1_2.setGeometry(QRect(20,80,280,20)) + self.Bdefaut = QCheckBox(self.groupBox2,"Bdefaut") + self.Bdefaut.setGeometry(QRect(210,60,20,20)) - self.Bok = QPushButton(self,"Bok") - self.Bok.setGeometry(QRect(400,430,70,31)) + self.LEVersionAjout = QLineEdit(self.groupBox2,"LEVersionAjout") + self.LEVersionAjout.setGeometry(QRect(140,20,101,21)) - self.BCancel = QPushButton(self,"BCancel") - self.BCancel.setGeometry(QRect(490,430,70,31)) + self.LEVersionSup = QLineEdit(self.groupBox2,"LEVersionSup") + self.LEVersionSup.setGeometry(QRect(420,20,101,21)) self.languageChange() - self.resize(QSize(600,480).expandedTo(self.minimumSizeHint())) + self.resize(QSize(570,434).expandedTo(self.minimumSizeHint())) self.clearWState(Qt.WState_Polished) - self.connect(self.BCancel,SIGNAL("clicked()"),self.reject) + self.connect(self.CBVersions,SIGNAL("activated(int)"),self.VersionChoisie) + self.connect(self.Bdefaut,SIGNAL("clicked()"),self.BdefautChecked) + self.connect(self.LEVersionAjout,SIGNAL("returnPressed()"),self.AjoutVersion) + self.connect(self.LEVersionSup,SIGNAL("returnPressed()"),self.SupVersion) + self.connect(self.LERepCata,SIGNAL("returnPressed()"),self.ChangePathDoc) def languageChange(self): - self.setCaption(self.__tr("Form1")) + self.setCaption(self.__tr("Options Aster")) + self.groupBox3.setTitle(self.__tr("Doc")) + self.textLabel1.setText(self.__trUtf8("\x52\x65\x70\x65\x72\x74\x6f\x69\x72\x65\x20\x64\x27\x61\x63\x63\x65\x73\x20\xc3\xa0\x20\x6c\x61\x20\x64\x6f\x63\x75\x6d\x65\x6e\x74\x61\x74\x69\x6f\x6e\x20\x3a")) + self.LERepDoc.setText(self.__tr("/home/noyret/doc/asterv9")) self.groupBox1.setTitle(self.__tr("Configurer une Version")) - self.comboBox2.clear() - self.comboBox2.insertItem(self.__tr("V9.1")) - self.comboBox2.insertItem(self.__tr("V8.4")) - self.comboBox2.insertItem(self.__tr("V7.8")) self.textLabel1_3.setText(self.__trUtf8("\x52\xc3\xa9\x70\x65\x72\x74\x6f\x69\x72\x65\x20\x64\x27\x61\x63\x63\xc3\xa8\x73\x20\x61\x75\x20\x63\x61\x74\x61\x6c\x6f\x67\x75\x65\x20\x3a")) - self.lineEdit1_3.setText(self.__tr("/home/noyret/Cata/V91")) self.textLabel1_2_2.setText(self.__trUtf8("\x52\xc3\xa9\x70\x65\x72\x74\x6f\x69\x72\x65\x20\x64\x27\x61\x63\x63\xc3\xa8\x73\x20\x61\x75\x78\x20\x6d\x61\x74\xc3\xa9\x72\x69\x61\x75\x78\x20\x3a")) - self.lineEdit1_2_2.setText(self.__tr("/home/noyret/Mater/V91")) + self.CBVersions.clear() + self.CBVersions.insertItem(self.__tr("V9.1")) + self.CBVersions.insertItem(self.__tr("V8.4")) + self.CBVersions.insertItem(self.__tr("V7.8")) + self.LERepCata.setText(self.__tr("/home/noyret/Cata/V91")) + self.LERepMat.setText(self.__tr("/home/noyret/Mater/V91")) + self.Bok.setText(self.__tr("Ok")) self.groupBox2.setTitle(self.__trUtf8("\x47\xc3\xa9\x72\x65\x72\x20\x6c\x65\x73\x20\x76\x65\x72\x73\x69\x6f\x6e\x73")) + self.textLabel1_2_3.setText(self.__trUtf8("\x52\x65\x69\x6e\x69\x74\x69\x61\x6c\x69\x73\x65\x72\x20\x61\x76\x65\x63\x20\x6c\x65\x73\x20\x76\x61\x6c\x65\x75\x72\x73\x20\x70\x61\x72\x20\x64\xc3\xa9\x66\x61\x75\x74")) self.textLabel3.setText(self.__tr("Ajouter une version")) self.textLabel3_2.setText(self.__tr("Supprimer une version")) - self.groupBox3.setTitle(self.__trUtf8("\x47\xc3\xa9\x6e\xc3\xa9\x72\x61\x6c\x69\x74\xc3\xa9\x73")) - self.textLabel1.setText(self.__trUtf8("\x52\x65\x70\x65\x72\x74\x6f\x69\x72\x65\x20\x64\x27\x61\x63\x63\x65\x73\x20\xc3\xa0\x20\x6c\x61\x20\x64\x6f\x63\x75\x6d\x65\x6e\x74\x61\x74\x69\x6f\x6e\x20\x3a")) - self.lineEdit1.setText(self.__tr("/home/noyret/doc/asterv9")) - self.lineEdit1_2.setText(self.__tr("acroread")) - self.textLabel1_2.setText(self.__tr("Lecteur Pdf")) - self.Bok.setText(self.__tr("Ok")) - self.BCancel.setText(self.__tr("Cancel")) + self.Bdefaut.setText(QString.null) + + + def VersionChoisie(self): + print "desOptions.VersionChoisie(): Not implemented yet" + + def BdefautChecked(self): + print "desOptions.BdefautChecked(): Not implemented yet" + + def AjoutVersion(self): + print "desOptions.AjoutVersion(): Not implemented yet" + + def SupVersion(self): + print "desOptions.SupVersion(): Not implemented yet" + def ChangePathDoc(self): + print "desOptions.ChangePathDoc(): Not implemented yet" def __tr(self,s,c = None): return qApp.translate("desOptions",s,c) diff --git a/Ui/OptionsEditeur.ui b/Ui/OptionsEditeur.ui index 81baa590..2caa3765 100644 --- a/Ui/OptionsEditeur.ui +++ b/Ui/OptionsEditeur.ui @@ -8,13 +8,61 @@ 0 0 - 600 - 480 + 570 + 434 - Form1 + Options Aster + + + groupBox3 + + + + 10 + 320 + 550 + 100 + + + + Doc + + + + textLabel1 + + + + 20 + 20 + 280 + 20 + + + + Repertoire d'acces à la documentation : + + + + + LERepDoc + + + + 20 + 40 + 520 + 31 + + + + /home/noyret/doc/asterv9 + + + groupBox1 @@ -23,13 +71,45 @@ 10 0 - 578 + 550 191 Configurer une Version + + + textLabel1_3 + + + + 30 + 60 + 280 + 20 + + + + Répertoire d'accès au catalogue : + + + + + textLabel1_2_2 + + + + 30 + 120 + 280 + 20 + + + + Répertoire d'accès aux matériaux : + + @@ -47,7 +127,7 @@ - comboBox2 + CBVersions @@ -58,25 +138,9 @@ - - - textLabel1_3 - - - - 30 - 60 - 280 - 20 - - - - Répertoire d'accès au catalogue : - - - lineEdit1_3 + LERepCata @@ -90,36 +154,36 @@ /home/noyret/Cata/V91 - + - textLabel1_2_2 + LERepMat 30 - 120 - 280 - 20 + 140 + 501 + 31 - Répertoire d'accès aux matériaux : + /home/noyret/Mater/V91 - + - lineEdit1_2_2 + Bok - 30 - 140 - 501 + 440 + 20 + 90 31 - /home/noyret/Mater/V91 + Ok @@ -130,9 +194,9 @@ 10 - 200 - 578 - 50 + 210 + 550 + 100 @@ -140,183 +204,134 @@ - textLabel3 + textLabel1_2_3 - 19 - 19 - 141 + 20 + 60 + 180 21 - Ajouter une version - - - - - lineEdit7 - - - - 170 - 20 - 101 - 21 - + Reinitialiser avec les valeurs par défaut - textLabel3_2 + textLabel3 - 289 + 19 19 - 110 + 141 21 - Supprimer une version - - - - - lineEdit7_3 - - - - 410 - 20 - 101 - 21 - + Ajouter une version - - - - groupBox3 - - - - 10 - 260 - 578 - 161 - - - - Généralités - - textLabel1 + textLabel3_2 - 20 + 300 20 - 280 - 20 + 130 + 21 - Repertoire d'acces à la documentation : + Supprimer une version - + - lineEdit1 + Bdefaut - 20 - 40 - 501 - 31 + 210 + 60 + 20 + 20 - /home/noyret/doc/asterv9 + - lineEdit1_2 + LEVersionAjout - 20 - 110 - 501 - 31 + 140 + 20 + 101 + 21 - - acroread - - + - textLabel1_2 + LEVersionSup - 20 - 80 - 280 - 20 + 420 + 20 + 101 + 21 - - Lecteur Pdf - - - - Bok - - - - 400 - 430 - 70 - 31 - - - - Ok - - - - - BCancel - - - - 490 - 430 - 70 - 31 - - - - Cancel - - - BCancel + CBVersions + activated(int) + desOptions + VersionChoisie() + + + Bdefaut clicked() desOptions - reject() + BdefautChecked() + + + LEVersionAjout + returnPressed() + desOptions + AjoutVersion() + + + LEVersionSup + returnPressed() + desOptions + SupVersion() + + + LERepCata + returnPressed() + desOptions + ChangePathDoc() + + VersionChoisie() + BdefautChecked() + AjoutVersion() + SupVersion() + ChangePathDoc() + diff --git a/Ui/OptionsPdf.py b/Ui/OptionsPdf.py new file mode 100644 index 00000000..835cac87 --- /dev/null +++ b/Ui/OptionsPdf.py @@ -0,0 +1,59 @@ +# -*- coding: utf-8 -*- + +# Form implementation generated from reading ui file 'OptionsPdf.ui' +# +# Created: lun avr 7 08:50:14 2008 +# by: The PyQt User Interface Compiler (pyuic) 3.13 +# +# WARNING! All changes made in this file will be lost! + + +from qt import * + + +class desPdf(QDialog): + def __init__(self,parent = None,name = None,modal = 0,fl = 0): + QDialog.__init__(self,parent,name,modal,fl) + + if not name: + self.setName("desPdf") + + + + self.textLabel1_2 = QLabel(self,"textLabel1_2") + self.textLabel1_2.setGeometry(QRect(20,10,280,20)) + + self.Bok = QPushButton(self,"Bok") + self.Bok.setGeometry(QRect(350,90,70,31)) + + self.BCancel = QPushButton(self,"BCancel") + self.BCancel.setGeometry(QRect(450,90,70,31)) + + self.LERepPdf = QLineEdit(self,"LERepPdf") + self.LERepPdf.setGeometry(QRect(20,40,501,31)) + + self.languageChange() + + self.resize(QSize(538,142).expandedTo(self.minimumSizeHint())) + self.clearWState(Qt.WState_Polished) + + self.connect(self.BCancel,SIGNAL("clicked()"),self.reject) + self.connect(self.LERepPdf,SIGNAL("returnPressed()"),self.LeRepPdfPressed) + + self.setTabOrder(self.LERepPdf,self.Bok) + self.setTabOrder(self.Bok,self.BCancel) + + + def languageChange(self): + self.setCaption(QString.null) + self.textLabel1_2.setText(self.__tr("Lecteur Pdf")) + self.Bok.setText(self.__tr("Ok")) + self.BCancel.setText(self.__tr("Cancel")) + self.LERepPdf.setText(self.__tr("acroread")) + + + def LeRepPdfPressed(self): + print "desPdf.LeRepPdfPressed(): Not implemented yet" + + def __tr(self,s,c = None): + return qApp.translate("desPdf",s,c) diff --git a/Ui/OptionsPdf.ui b/Ui/OptionsPdf.ui new file mode 100644 index 00000000..c24997c0 --- /dev/null +++ b/Ui/OptionsPdf.ui @@ -0,0 +1,106 @@ + +desPdf + + + desPdf + + + + 0 + 0 + 538 + 142 + + + + + + + + textLabel1_2 + + + + 20 + 10 + 280 + 20 + + + + Lecteur Pdf + + + + + Bok + + + + 350 + 90 + 70 + 31 + + + + Ok + + + + + BCancel + + + + 450 + 90 + 70 + 31 + + + + Cancel + + + + + LERepPdf + + + + 20 + 40 + 501 + 31 + + + + acroread + + + + + + BCancel + clicked() + desPdf + reject() + + + LERepPdf + returnPressed() + desPdf + LeRepPdfPressed() + + + + LERepPdf + Bok + BCancel + + + LeRepPdfPressed() + + + diff --git a/Ui/desCommande.py b/Ui/desCommande.py index 9d036b20..830dd66b 100644 --- a/Ui/desCommande.py +++ b/Ui/desCommande.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'desCommande.ui' # -# Created: mar mar 25 10:05:07 2008 +# Created: ven avr 4 11:27:08 2008 # by: The PyQt User Interface Compiler (pyuic) 3.13 # # WARNING! All changes made in this file will be lost! @@ -88,12 +88,12 @@ class DComm(QWidget): self.textLabel6 = QLabel(self.Commande,"textLabel6") self.textLabel6.setGeometry(QRect(11,70,23,21)) - self.LEFiltre = QLineEdit(self.Commande,"LEFiltre") - self.LEFiltre.setGeometry(QRect(40,60,200,30)) - self.BNext = QToolButton(self.Commande,"BNext") self.BNext.setGeometry(QRect(257,61,41,30)) self.BNext.setIconSet(QIconSet()) + + self.LEFiltre = QLineEdit(self.Commande,"LEFiltre") + self.LEFiltre.setGeometry(QRect(40,60,200,30)) self.TWChoix.insertTab(self.Commande,QString("")) DCommLayout.addMultiCellWidget(self.TWChoix,0,0,0,2) @@ -136,6 +136,16 @@ class DComm(QWidget): self.connect(self.bHelp,SIGNAL("clicked()"),self.ViewDoc) self.connect(self.BNext,SIGNAL("pressed()"),self.BNextPressed) + self.setTabOrder(self.LEFiltre,self.LBRegles) + self.setTabOrder(self.LBRegles,self.LENomConcept) + self.setTabOrder(self.LENomConcept,self.TWChoix) + self.setTabOrder(self.TWChoix,self.LBMCPermis) + self.setTabOrder(self.LBMCPermis,self.RBalpha) + self.setTabOrder(self.RBalpha,self.LBNouvCommande) + self.setTabOrder(self.LBNouvCommande,self.bOk) + self.setTabOrder(self.bOk,self.bSup) + self.setTabOrder(self.bSup,self.bHelp) + def languageChange(self): self.setCaption(self.__tr("DComm")) diff --git a/Ui/desCommande.ui b/Ui/desCommande.ui index 859cbebc..45010fcb 100644 --- a/Ui/desCommande.ui +++ b/Ui/desCommande.ui @@ -324,19 +324,6 @@ Filtre - - - LEFiltre - - - - 40 - 60 - 200 - 30 - - - BNext @@ -359,6 +346,19 @@ affiche la prochaine occurence + + + LEFiltre + + + + 40 + 60 + 200 + 30 + + + @@ -493,6 +493,18 @@ BNextPressed() + + LEFiltre + LBRegles + LENomConcept + TWChoix + LBMCPermis + RBalpha + LBNouvCommande + bOk + bSup + bHelp + LBNouvCommandeClicked() LEFiltreTextChanged() diff --git a/Ui/desCommentaire.py b/Ui/desCommentaire.py index f42f9de9..2c73e681 100644 --- a/Ui/desCommentaire.py +++ b/Ui/desCommentaire.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'desCommentaire.ui' # -# Created: mar mar 25 10:05:08 2008 +# Created: ven avr 4 11:27:09 2008 # by: The PyQt User Interface Compiler (pyuic) 3.13 # # WARNING! All changes made in this file will be lost! @@ -110,6 +110,14 @@ class DComment(QWidget): self.connect(self.bHelp,SIGNAL("clicked()"),self.ViewDoc) self.connect(self.BNext,SIGNAL("pressed()"),self.BNextPressed) + self.setTabOrder(self.LEFiltre,self.TWChoix) + self.setTabOrder(self.TWChoix,self.textCommentaire) + self.setTabOrder(self.textCommentaire,self.LBNouvCommande) + self.setTabOrder(self.LBNouvCommande,self.RBalpha) + self.setTabOrder(self.RBalpha,self.bOk) + self.setTabOrder(self.bOk,self.bSup) + self.setTabOrder(self.bSup,self.bHelp) + def languageChange(self): self.setCaption(self.__tr("DComm")) diff --git a/Ui/desCommentaire.ui b/Ui/desCommentaire.ui index 55b0c3b9..45f3e23b 100644 --- a/Ui/desCommentaire.ui +++ b/Ui/desCommentaire.ui @@ -287,6 +287,16 @@ BNextPressed() + + LEFiltre + TWChoix + textCommentaire + LBNouvCommande + RBalpha + bOk + bSup + bHelp + LBNouvCommandeClicked() LEFiltreTextChanged() diff --git a/Ui/desFormule.py b/Ui/desFormule.py index 02aa977f..bf1a33fc 100644 --- a/Ui/desFormule.py +++ b/Ui/desFormule.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'desFormule.ui' # -# Created: mar mar 25 10:05:08 2008 +# Created: ven avr 4 11:27:09 2008 # by: The PyQt User Interface Compiler (pyuic) 3.13 # # WARNING! All changes made in this file will be lost! @@ -173,6 +173,17 @@ class DFormule(QWidget): self.connect(self.LECorpsFormule,SIGNAL("returnPressed()"),self.FormuleSaisie) self.connect(self.bHelp,SIGNAL("clicked()"),self.ViewDoc) + self.setTabOrder(self.LEFiltre,self.LENomFormule) + self.setTabOrder(self.LENomFormule,self.LENomsArgs) + self.setTabOrder(self.LENomsArgs,self.LECorpsFormule) + self.setTabOrder(self.LECorpsFormule,self.bSup) + self.setTabOrder(self.bSup,self.bOk) + self.setTabOrder(self.bOk,self.bHelp) + self.setTabOrder(self.bHelp,self.TWChoix) + self.setTabOrder(self.TWChoix,self.RBalpha) + self.setTabOrder(self.RBalpha,self.RBGroupe) + self.setTabOrder(self.RBGroupe,self.LBNouvCommande) + def languageChange(self): self.setCaption(self.__tr("DMacro")) diff --git a/Ui/desFormule.ui b/Ui/desFormule.ui index 68d19b44..daffdd5a 100644 --- a/Ui/desFormule.ui +++ b/Ui/desFormule.ui @@ -460,6 +460,19 @@ valeurs seront effectivement prises en compte ViewDoc() + + LEFiltre + LENomFormule + LENomsArgs + LECorpsFormule + bSup + bOk + bHelp + TWChoix + RBalpha + RBGroupe + LBNouvCommande + LBNouvCommandeClicked() LEFiltreTextChanged() diff --git a/Ui/desInclude.py b/Ui/desInclude.py index 312fc6bd..4a9917f8 100644 --- a/Ui/desInclude.py +++ b/Ui/desInclude.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'desInclude.ui' # -# Created: mar mar 25 10:05:08 2008 +# Created: ven avr 4 11:27:09 2008 # by: The PyQt User Interface Compiler (pyuic) 3.13 # # WARNING! All changes made in this file will be lost! @@ -153,6 +153,18 @@ class DInc1(QWidget): self.connect(self.LENomFichier,SIGNAL("returnPressed()"),self.LENomFichReturnPressed) self.connect(self.bHelp,SIGNAL("clicked()"),self.ViewDoc) + self.setTabOrder(self.LEFiltre,self.LENomFichier) + self.setTabOrder(self.LENomFichier,self.bHelp) + self.setTabOrder(self.bHelp,self.bSup) + self.setTabOrder(self.bSup,self.bOk) + self.setTabOrder(self.bOk,self.TWChoix) + self.setTabOrder(self.TWChoix,self.LBMCPermis) + self.setTabOrder(self.LBMCPermis,self.LBRegles) + self.setTabOrder(self.LBRegles,self.LBNouvCommande) + self.setTabOrder(self.LBNouvCommande,self.RBalpha) + self.setTabOrder(self.RBalpha,self.BBrowse) + self.setTabOrder(self.BBrowse,self.BChangeFile) + def languageChange(self): self.setCaption(self.__tr("DMacro")) diff --git a/Ui/desInclude.ui b/Ui/desInclude.ui index dae1e127..02883fc4 100644 --- a/Ui/desInclude.ui +++ b/Ui/desInclude.ui @@ -444,6 +444,20 @@ Il faut d'abord choisir un numéro d'unité</p></font> ViewDoc() + + LEFiltre + LENomFichier + bHelp + bSup + bOk + TWChoix + LBMCPermis + LBRegles + LBNouvCommande + RBalpha + BBrowse + BChangeFile + LBNouvCommandeClicked() LEFiltreTextChanged() diff --git a/Ui/desMacro.py b/Ui/desMacro.py index b1d20aab..03217686 100644 --- a/Ui/desMacro.py +++ b/Ui/desMacro.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'desMacro.ui' # -# Created: mar mar 25 10:05:08 2008 +# Created: ven avr 4 11:27:09 2008 # by: The PyQt User Interface Compiler (pyuic) 3.13 # # WARNING! All changes made in this file will be lost! @@ -146,6 +146,16 @@ class DMacro(QWidget): self.connect(self.LENomConcept,SIGNAL("returnPressed()"),self.LENomConceptReturnPressed) self.connect(self.bHelp,SIGNAL("clicked()"),self.ViewDoc) + self.setTabOrder(self.LEFiltre,self.LENomConcept) + self.setTabOrder(self.LENomConcept,self.TWChoix) + self.setTabOrder(self.TWChoix,self.LBMCPermis) + self.setTabOrder(self.LBMCPermis,self.LBRegles) + self.setTabOrder(self.LBRegles,self.LBNouvCommande) + self.setTabOrder(self.LBNouvCommande,self.RBalpha) + self.setTabOrder(self.RBalpha,self.bSup) + self.setTabOrder(self.bSup,self.bHelp) + self.setTabOrder(self.bHelp,self.bOk) + def languageChange(self): self.setCaption(self.__tr("DMacro")) diff --git a/Ui/desMacro.ui b/Ui/desMacro.ui index 40a9d39f..3be939ed 100644 --- a/Ui/desMacro.ui +++ b/Ui/desMacro.ui @@ -418,6 +418,18 @@ ViewDoc() + + LEFiltre + LENomConcept + TWChoix + LBMCPermis + LBRegles + LBNouvCommande + RBalpha + bSup + bHelp + bOk + LBNouvCommandeClicked() LEFiltreTextChanged() diff --git a/Ui/desParam.py b/Ui/desParam.py index c72fd1f6..16c6bbd0 100644 --- a/Ui/desParam.py +++ b/Ui/desParam.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'desParam.ui' # -# Created: mar mar 25 10:05:08 2008 +# Created: ven avr 4 11:27:09 2008 # by: The PyQt User Interface Compiler (pyuic) 3.13 # # WARNING! All changes made in this file will be lost! @@ -38,10 +38,6 @@ class DParam(QWidget): self.Commentaire_2 = QLabel(self.Valeur_Parametre,"Commentaire_2") self.Commentaire_2.setGeometry(QRect(11,275,459,89)) - self.lineEditVal = QLineEdit(self.Valeur_Parametre,"lineEditVal") - self.lineEditVal.setGeometry(QRect(80,143,231,31)) - self.lineEditVal.setMinimumSize(QSize(231,31)) - self.lineEditNom = QLineEdit(self.Valeur_Parametre,"lineEditNom") self.lineEditNom.setGeometry(QRect(80,106,231,31)) self.lineEditNom.setMinimumSize(QSize(231,31)) @@ -54,6 +50,10 @@ class DParam(QWidget): self.Commentaire2 = QLabel(self.Valeur_Parametre,"Commentaire2") self.Commentaire2.setGeometry(QRect(11,180,459,89)) + + self.lineEditVal = QLineEdit(self.Valeur_Parametre,"lineEditVal") + self.lineEditVal.setGeometry(QRect(80,143,231,31)) + self.lineEditVal.setMinimumSize(QSize(231,31)) self.TWChoix.insertTab(self.Valeur_Parametre,QString("")) self.Commande = QWidget(self.TWChoix,"Commande") @@ -129,6 +129,16 @@ class DParam(QWidget): self.connect(self.RBalpha,SIGNAL("clicked()"),self.BuildTabCommand) self.connect(self.bHelp,SIGNAL("clicked()"),self.ViewDoc) self.connect(self.BNext,SIGNAL("pressed()"),self.BNextPressed) + self.connect(self.lineEditVal,SIGNAL("returnPressed()"),self.BOkPressed) + + self.setTabOrder(self.LEFiltre,self.TWChoix) + self.setTabOrder(self.TWChoix,self.lineEditNom) + self.setTabOrder(self.lineEditNom,self.lineEditVal) + self.setTabOrder(self.lineEditVal,self.LBNouvCommande) + self.setTabOrder(self.LBNouvCommande,self.RBalpha) + self.setTabOrder(self.RBalpha,self.bOk) + self.setTabOrder(self.bOk,self.bSup) + self.setTabOrder(self.bSup,self.bHelp) def languageChange(self): diff --git a/Ui/desParam.ui b/Ui/desParam.ui index 416165ec..aeb6e692 100644 --- a/Ui/desParam.ui +++ b/Ui/desParam.ui @@ -82,25 +82,6 @@ - - - lineEditVal - - - - 80 - 143 - 231 - 31 - - - - - 231 - 31 - - - lineEditNom @@ -222,6 +203,25 @@ Les nouvelles valeurs ne seront prises en compte qu'après avoir appuyé sur le bouton Valider. + + + lineEditVal + + + + 80 + 143 + 231 + 31 + + + + + 231 + 31 + + + @@ -445,7 +445,24 @@ appuyé sur le bouton Valider. DParam BNextPressed() + + lineEditVal + returnPressed() + DParam + BOkPressed() + + + LEFiltre + TWChoix + lineEditNom + lineEditVal + LBNouvCommande + RBalpha + bOk + bSup + bHelp + LBNouvCommandeClicked() LEFiltreTextChanged() diff --git a/Ui/desPlusieursBase.py b/Ui/desPlusieursBase.py index 7fa5bc6b..8f34236b 100644 --- a/Ui/desPlusieursBase.py +++ b/Ui/desPlusieursBase.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'desPlusieursBase.ui' # -# Created: mar mar 25 10:05:08 2008 +# Created: ven avr 4 11:27:09 2008 # by: The PyQt User Interface Compiler (pyuic) 3.13 # # WARNING! All changes made in this file will be lost! @@ -120,7 +120,7 @@ class DPlusBase(QWidget): self.bHelp.setAutoDefault(1) layout6.addWidget(self.bHelp) - Widget8Layout.addMultiCellLayout(layout6,7,7,0,3) + Widget8Layout.addMultiCellLayout(layout6,7,7,0,4) layout7 = QVBoxLayout(None,0,6,"layout7") @@ -134,15 +134,15 @@ class DPlusBase(QWidget): self.bImport.setAutoDefault(1) layout7.addWidget(self.bImport) - Widget8Layout.addLayout(layout7,6,3) - spacer3 = QSpacerItem(31,90,QSizePolicy.Minimum,QSizePolicy.Expanding) - Widget8Layout.addItem(spacer3,5,3) + Widget8Layout.addLayout(layout7,6,4) + spacer3 = QSpacerItem(31,106,QSizePolicy.Minimum,QSizePolicy.Expanding) + Widget8Layout.addItem(spacer3,5,4) + spacer5 = QSpacerItem(186,20,QSizePolicy.Expanding,QSizePolicy.Minimum) + Widget8Layout.addMultiCell(spacer5,6,6,2,3) self.LBValeurs = QListBox(self.Widget8,"LBValeurs") Widget8Layout.addMultiCellWidget(self.LBValeurs,1,6,0,0) - spacer5 = QSpacerItem(130,20,QSizePolicy.Expanding,QSizePolicy.Minimum) - Widget8Layout.addItem(spacer5,6,2) layout8 = QVBoxLayout(None,0,6,"layout8") spacer5_2 = QSpacerItem(20,31,QSizePolicy.Minimum,QSizePolicy.Expanding) @@ -167,7 +167,7 @@ class DPlusBase(QWidget): self.Commentaire = QLabel(self.Widget8,"Commentaire") self.Commentaire.setMinimumSize(QSize(0,60)) - Widget8Layout.addMultiCellWidget(self.Commentaire,4,4,2,3) + Widget8Layout.addMultiCellWidget(self.Commentaire,4,4,2,4) self.BSalome = QToolButton(self.Widget8,"BSalome") self.BSalome.setSizePolicy(QSizePolicy(0,0,0,0,self.BSalome.sizePolicy().hasHeightForWidth())) @@ -183,13 +183,18 @@ class DPlusBase(QWidget): spacer6 = QSpacerItem(111,20,QSizePolicy.Expanding,QSizePolicy.Minimum) layout12.addItem(spacer6) - Widget8Layout.addMultiCellLayout(layout12,1,1,2,3) + Widget8Layout.addMultiCellLayout(layout12,1,1,2,4) self.LEValeur = QLineEdit(self.Widget8,"LEValeur") self.LEValeur.setSizePolicy(QSizePolicy(1,1,0,0,self.LEValeur.sizePolicy().hasHeightForWidth())) self.LEValeur.setMinimumSize(QSize(220,30)) - Widget8Layout.addMultiCellWidget(self.LEValeur,2,2,2,3) + Widget8Layout.addMultiCellWidget(self.LEValeur,2,2,2,4) + + self.BView2D = QPushButton(self.Widget8,"BView2D") + self.BView2D.setMinimumSize(QSize(120,30)) + + Widget8Layout.addMultiCellWidget(self.BView2D,3,3,3,4) self.tabuniqueinto.insertTab(self.Widget8,QString("")) DPlusBaseLayout.addWidget(self.tabuniqueinto,0,0) @@ -208,6 +213,16 @@ class DPlusBase(QWidget): self.connect(self.BSup1Val,SIGNAL("clicked()"),self.Sup1Valeur) self.connect(self.LEValeur,SIGNAL("returnPressed()"),self.LEValeurPressed) self.connect(self.BSalome,SIGNAL("clicked()"),self.BSalomePressed) + self.connect(self.BView2D,SIGNAL("clicked()"),self.BView2DPressed) + + self.setTabOrder(self.LEValeur,self.tabuniqueinto) + self.setTabOrder(self.tabuniqueinto,self.bSup) + self.setTabOrder(self.bSup,self.bOk) + self.setTabOrder(self.bOk,self.bHelp) + self.setTabOrder(self.bHelp,self.bParam) + self.setTabOrder(self.bParam,self.bImport) + self.setTabOrder(self.bImport,self.LBValeurs) + self.setTabOrder(self.LBValeurs,self.BView2D) def languageChange(self): @@ -236,6 +251,7 @@ class DPlusBase(QWidget): self.BSalome.setText(QString.null) QToolTip.add(self.BSalome,self.__trUtf8("\x61\x6a\x6f\x75\x74\x65\x20\x6c\x61\x20\x76\x61\x6c\x65\x75\x72\x20\x73\x61\x69\x73\x69\x65\x20\x73\x6f\x75\x73\x20\x6c\x20\x6f\x63\x63\x75\x72\x65\x6e\x63\x65\x20\x73\x65\x6c\x65\x63\x74\x69\x6f\x6e\x6e\xc3\xa9\x65\x20\x28\x65\x6e\x20\x66\x69\x6e\x20\x64\x65\x20\x6c\x69\x73\x74\x65\x20\x73\x69\x20\x69\x6c\x20\x6e\x20\x79\x20\x61\x20\x70\x61\x73\x20\x64\x65\x20\x73\x65\x6c\x65\x63\x74\x69\x6f\x6e\x29")) self.textLabel1_2.setText(self.__tr("Valeur")) + self.BView2D.setText(self.__tr("Visualiser")) self.tabuniqueinto.changeTab(self.Widget8,self.__tr("Saisir Valeur")) @@ -266,6 +282,9 @@ class DPlusBase(QWidget): def BSalomePressed(self): print "DPlusBase.BSalomePressed(): Not implemented yet" + def BView2DPressed(self): + print "DPlusBase.BView2DPressed(): Not implemented yet" + def __tr(self,s,c = None): return qApp.translate("DPlusBase",s,c) diff --git a/Ui/desPlusieursBase.ui b/Ui/desPlusieursBase.ui index b7617f78..dbe400b3 100644 --- a/Ui/desPlusieursBase.ui +++ b/Ui/desPlusieursBase.ui @@ -51,7 +51,7 @@ <u><font size="+1">Valeur(s) actuelle(s)</font></u> - + layout6 @@ -133,7 +133,7 @@ - + layout7 @@ -189,7 +189,7 @@ - + spacer3 @@ -202,16 +202,11 @@ 31 - 90 + 106 - - - LBValeurs - - - + spacer5 @@ -223,11 +218,16 @@ - 130 + 186 20 + + + LBValeurs + + layout8 @@ -328,7 +328,7 @@ - + Commentaire @@ -370,7 +370,7 @@ ajoute la valeur saisie sous l occurence selectionnée (en fin de liste si il n y a pas de selection) - + layout12 @@ -405,7 +405,7 @@ - + LEValeur @@ -424,6 +424,20 @@ + + + BView2D + + + + 120 + 30 + + + + Visualiser + + @@ -495,7 +509,24 @@ DPlusBase BSalomePressed() + + BView2D + clicked() + DPlusBase + BView2DPressed() + + + LEValeur + tabuniqueinto + bSup + bOk + bHelp + bParam + bImport + LBValeurs + BView2D + BSupPressed() ViewDoc() @@ -506,6 +537,7 @@ Sup1Valeur() BImportPressed() BSalomePressed() + BView2DPressed() diff --git a/Ui/desPlusieursInto.py b/Ui/desPlusieursInto.py index fad74366..224aa87c 100644 --- a/Ui/desPlusieursInto.py +++ b/Ui/desPlusieursInto.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'desPlusieursInto.ui' # -# Created: mar mar 25 10:05:08 2008 +# Created: ven avr 4 11:27:09 2008 # by: The PyQt User Interface Compiler (pyuic) 3.13 # # WARNING! All changes made in this file will be lost! @@ -157,6 +157,12 @@ class DPlusInto(QWidget): self.connect(self.BAjout1Val,SIGNAL("clicked()"),self.Ajout1Valeur) self.connect(self.BSup1Val,SIGNAL("clicked()"),self.Sup1Valeur) + self.setTabOrder(self.listBoxVal,self.tabuniqueinto) + self.setTabOrder(self.tabuniqueinto,self.bSup) + self.setTabOrder(self.bSup,self.bOk) + self.setTabOrder(self.bOk,self.bHelp) + self.setTabOrder(self.bHelp,self.LBValeurs) + def languageChange(self): self.setCaption(self.__tr("DUnIn")) diff --git a/Ui/desPlusieursInto.ui b/Ui/desPlusieursInto.ui index 18a95743..f53e25e1 100644 --- a/Ui/desPlusieursInto.ui +++ b/Ui/desPlusieursInto.ui @@ -327,6 +327,14 @@ Sup1Valeur() + + listBoxVal + tabuniqueinto + bSup + bOk + bHelp + LBValeurs + BSupPressed() ViewDoc() diff --git a/Ui/desPoursuite.py b/Ui/desPoursuite.py index 9a3605aa..2ce61ed2 100644 --- a/Ui/desPoursuite.py +++ b/Ui/desPoursuite.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'desPoursuite.ui' # -# Created: mar mar 25 10:05:09 2008 +# Created: ven avr 4 11:27:09 2008 # by: The PyQt User Interface Compiler (pyuic) 3.13 # # WARNING! All changes made in this file will be lost! @@ -156,6 +156,17 @@ class DPour(QWidget): self.connect(self.BBrowse,SIGNAL("clicked()"),self.BBrowsePressed) self.connect(self.LENomFichier,SIGNAL("returnPressed()"),self.LENomFichReturnPressed) + self.setTabOrder(self.LEFiltre,self.LENomFichier) + self.setTabOrder(self.LENomFichier,self.TWChoix) + self.setTabOrder(self.TWChoix,self.LBMCPermis) + self.setTabOrder(self.LBMCPermis,self.LBRegles) + self.setTabOrder(self.LBRegles,self.LBNouvCommande) + self.setTabOrder(self.LBNouvCommande,self.RBalpha) + self.setTabOrder(self.RBalpha,self.BBrowse) + self.setTabOrder(self.BBrowse,self.bSup) + self.setTabOrder(self.bSup,self.bOk) + self.setTabOrder(self.bOk,self.bHelp) + def languageChange(self): self.setCaption(self.__tr("DMacro")) diff --git a/Ui/desPoursuite.ui b/Ui/desPoursuite.ui index ace3995d..6414067a 100644 --- a/Ui/desPoursuite.ui +++ b/Ui/desPoursuite.ui @@ -446,6 +446,19 @@ LENomFichReturnPressed() + + LEFiltre + LENomFichier + TWChoix + LBMCPermis + LBRegles + LBNouvCommande + RBalpha + BBrowse + bSup + bOk + bHelp + LBNouvCommandeClicked() LEFiltreTextChanged() diff --git a/Ui/desRacine.py b/Ui/desRacine.py index 41518411..51705bb2 100644 --- a/Ui/desRacine.py +++ b/Ui/desRacine.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'desRacine.ui' # -# Created: mar mar 25 10:05:09 2008 +# Created: ven avr 4 11:27:09 2008 # by: The PyQt User Interface Compiler (pyuic) 3.13 # # WARNING! All changes made in this file will be lost! @@ -24,20 +24,12 @@ class DRac(QWidget): self.LBNouvCommande = QListBox(self,"LBNouvCommande") - DRacLayout.addMultiCellWidget(self.LBNouvCommande,3,3,0,2) + DRacLayout.addMultiCellWidget(self.LBNouvCommande,4,4,0,3) self.BNext = QToolButton(self,"BNext") self.BNext.setIconSet(QIconSet()) - DRacLayout.addWidget(self.BNext,2,2) - - self.LEFiltre = QLineEdit(self,"LEFiltre") - - DRacLayout.addWidget(self.LEFiltre,2,1) - - self.textLabel6 = QLabel(self,"textLabel6") - - DRacLayout.addWidget(self.textLabel6,2,0) + DRacLayout.addMultiCellWidget(self.BNext,2,3,3,3) self.buttonGroup1 = QButtonGroup(self,"buttonGroup1") @@ -48,11 +40,7 @@ class DRac(QWidget): self.RBGroupe = QRadioButton(self.buttonGroup1,"RBGroupe") self.RBGroupe.setGeometry(QRect(10,20,90,20)) - DRacLayout.addMultiCellWidget(self.buttonGroup1,1,1,0,2) - - self.textLabel1_4_2 = QLabel(self,"textLabel1_4_2") - - DRacLayout.addWidget(self.textLabel1_4_2,0,3) + DRacLayout.addMultiCellWidget(self.buttonGroup1,1,1,0,3) layout2 = QHBoxLayout(None,0,6,"layout2") @@ -69,16 +57,28 @@ class DRac(QWidget): self.bHelp.setAutoDefault(1) layout2.addWidget(self.bHelp) - DRacLayout.addMultiCellLayout(layout2,4,4,0,3) + DRacLayout.addMultiCellLayout(layout2,5,5,0,4) self.textLabel1_4 = QLabel(self,"textLabel1_4") - DRacLayout.addWidget(self.textLabel1_4,0,1) + DRacLayout.addMultiCellWidget(self.textLabel1_4,0,0,1,2) + + self.textLabel6 = QLabel(self,"textLabel6") + + DRacLayout.addMultiCellWidget(self.textLabel6,2,3,0,1) + + self.LEFiltre = QLineEdit(self,"LEFiltre") + + DRacLayout.addMultiCellWidget(self.LEFiltre,2,3,2,2) self.LBRegles = QListBox(self,"LBRegles") self.LBRegles.setMinimumSize(QSize(250,400)) - DRacLayout.addMultiCellWidget(self.LBRegles,1,3,3,3) + DRacLayout.addMultiCellWidget(self.LBRegles,1,4,4,4) + + self.textLabel1_4_2 = QLabel(self,"textLabel1_4_2") + + DRacLayout.addWidget(self.textLabel1_4_2,0,4) self.languageChange() @@ -95,16 +95,21 @@ class DRac(QWidget): self.connect(self.BNext,SIGNAL("clicked()"),self.BNextPressed) self.connect(self.bHelp,SIGNAL("clicked()"),self.ViewDoc) + self.setTabOrder(self.LEFiltre,self.LBNouvCommande) + self.setTabOrder(self.LBNouvCommande,self.RBalpha) + self.setTabOrder(self.RBalpha,self.bSup) + self.setTabOrder(self.bSup,self.bOk) + self.setTabOrder(self.bOk,self.bHelp) + self.setTabOrder(self.bHelp,self.LBRegles) + def languageChange(self): self.setCaption(self.__tr("DMacro")) self.BNext.setText(self.__tr("Suivant")) QToolTip.add(self.BNext,self.__tr("affiche la prochaine occurence")) - self.textLabel6.setText(self.__tr("Filtre")) 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_2.setText(self.__trUtf8("\x3c\x62\x3e\x3c\x75\x3e\x52\xc3\xa9\x67\x6c\x65\x73\x20\x3a\x3c\x2f\x75\x3e\x3c\x2f\x62\x3e")) self.bSup.setText(self.__tr("&Supprimer")) self.bSup.setAccel(self.__tr("Alt+S")) QToolTip.add(self.bSup,self.__tr("suppression du mot clef")) @@ -115,6 +120,8 @@ class DRac(QWidget): self.bHelp.setAccel(self.__tr("Alt+D")) QToolTip.add(self.bHelp,self.__tr("affichage documentation aster")) self.textLabel1_4.setText(self.__tr("Commandes :")) + self.textLabel6.setText(self.__tr("Filtre")) + self.textLabel1_4_2.setText(self.__trUtf8("\x3c\x62\x3e\x3c\x75\x3e\x52\xc3\xa9\x67\x6c\x65\x73\x20\x3a\x3c\x2f\x75\x3e\x3c\x2f\x62\x3e")) def LBNouvCommandeClicked(self): diff --git a/Ui/desRacine.ui b/Ui/desRacine.ui index be702ef2..e62a5cdf 100644 --- a/Ui/desRacine.ui +++ b/Ui/desRacine.ui @@ -25,12 +25,12 @@ unnamed - + LBNouvCommande - + BNext @@ -44,20 +44,7 @@ affiche la prochaine occurence - - - LEFiltre - - - - - textLabel6 - - - Filtre - - - + buttonGroup1 @@ -100,15 +87,7 @@ - - - textLabel1_4_2 - - - <b><u>Régles :</u></b> - - - + layout2 @@ -172,7 +151,7 @@ - + textLabel1_4 @@ -180,7 +159,20 @@ <b><u>Commandes :</u></b> - + + + textLabel6 + + + Filtre + + + + + LEFiltre + + + LBRegles @@ -191,6 +183,14 @@ + + + textLabel1_4_2 + + + <b><u>Régles :</u></b> + + @@ -249,6 +249,15 @@ ViewDoc() + + LEFiltre + LBNouvCommande + RBalpha + bSup + bOk + bHelp + LBRegles + LBNouvCommandeClicked() LEFiltreTextChanged() diff --git a/Ui/desUniqueBase.py b/Ui/desUniqueBase.py index bb6eb81d..ec1c5161 100644 --- a/Ui/desUniqueBase.py +++ b/Ui/desUniqueBase.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'desUniqueBase.ui' # -# Created: mar mar 25 10:05:09 2008 +# Created: ven avr 4 11:27:09 2008 # by: The PyQt User Interface Compiler (pyuic) 3.13 # # WARNING! All changes made in this file will be lost! @@ -45,46 +45,65 @@ class DUnBase(QWidget): self.tabuniqueinto = QTabWidget(self,"tabuniqueinto") self.Widget8 = QWidget(self.tabuniqueinto,"Widget8") + Widget8Layout = QGridLayout(self.Widget8,1,1,11,6,"Widget8Layout") - LayoutWidget = QWidget(self.Widget8,"layout2") - LayoutWidget.setGeometry(QRect(11,47,434,52)) - layout2 = QHBoxLayout(LayoutWidget,11,6,"layout2") + layout2 = QHBoxLayout(None,0,6,"layout2") - self.textLabel2 = QLabel(LayoutWidget,"textLabel2") + self.textLabel2 = QLabel(self.Widget8,"textLabel2") layout2.addWidget(self.textLabel2) - self.lineEditVal = QLineEdit(LayoutWidget,"lineEditVal") + self.lineEditVal = QLineEdit(self.Widget8,"lineEditVal") self.lineEditVal.setMinimumSize(QSize(290,50)) layout2.addWidget(self.lineEditVal) + Widget8Layout.addMultiCellLayout(layout2,1,1,0,2) + spacer1 = QSpacerItem(288,21,QSizePolicy.Expanding,QSizePolicy.Minimum) + Widget8Layout.addMultiCell(spacer1,0,0,0,1) + self.bParametres = QPushButton(self.Widget8,"bParametres") - self.bParametres.setGeometry(QRect(305,11,140,30)) self.bParametres.setSizePolicy(QSizePolicy(0,0,0,0,self.bParametres.sizePolicy().hasHeightForWidth())) self.bParametres.setMinimumSize(QSize(140,30)) + Widget8Layout.addWidget(self.bParametres,0,2) + self.bSup = QPushButton(self.Widget8,"bSup") - self.bSup.setGeometry(QRect(11,389,141,30)) self.bSup.setMinimumSize(QSize(0,30)) self.bSup.setAutoDefault(1) + Widget8Layout.addWidget(self.bSup,5,0) + self.bOk = QPushButton(self.Widget8,"bOk") - self.bOk.setGeometry(QRect(158,389,141,30)) self.bOk.setMinimumSize(QSize(0,30)) self.bOk.setAutoDefault(1) self.bOk.setDefault(1) + Widget8Layout.addWidget(self.bOk,5,1) + self.bHelp = QPushButton(self.Widget8,"bHelp") - self.bHelp.setGeometry(QRect(305,389,140,30)) self.bHelp.setMinimumSize(QSize(0,30)) self.bHelp.setAutoDefault(1) + Widget8Layout.addWidget(self.bHelp,5,2) + spacer4 = QSpacerItem(41,112,QSizePolicy.Minimum,QSizePolicy.Expanding) + Widget8Layout.addItem(spacer4,2,1) + spacer3 = QSpacerItem(21,112,QSizePolicy.Minimum,QSizePolicy.Expanding) + Widget8Layout.addItem(spacer3,4,1) + self.Commentaire = QLabel(self.Widget8,"Commentaire") - self.Commentaire.setGeometry(QRect(12,224,432,40)) self.Commentaire.setMinimumSize(QSize(430,40)) + Widget8Layout.addMultiCellWidget(self.Commentaire,3,3,0,2) + + self.BView2D = QPushButton(self.Widget8,"BView2D") + self.BView2D.setMinimumSize(QSize(110,40)) + + Widget8Layout.addWidget(self.BView2D,2,2) + self.BSalome = QPushButton(self.Widget8,"BSalome") - self.BSalome.setGeometry(QRect(17,115,51,41)) + self.BSalome.setMinimumSize(QSize(50,40)) self.BSalome.setIconSet(QIconSet(self.image0)) + + Widget8Layout.addWidget(self.BSalome,2,0) self.tabuniqueinto.insertTab(self.Widget8,QString("")) DUnBaseLayout.addWidget(self.tabuniqueinto,0,0) @@ -100,6 +119,15 @@ class DUnBase(QWidget): self.connect(self.lineEditVal,SIGNAL("returnPressed()"),self.LEValeurPressed) self.connect(self.bParametres,SIGNAL("pressed()"),self.BParametresPressed) self.connect(self.BSalome,SIGNAL("pressed()"),self.BSalomePressed) + self.connect(self.BView2D,SIGNAL("clicked()"),self.BView2DPressed) + + self.setTabOrder(self.lineEditVal,self.tabuniqueinto) + self.setTabOrder(self.tabuniqueinto,self.bParametres) + self.setTabOrder(self.bParametres,self.bSup) + self.setTabOrder(self.bSup,self.bOk) + self.setTabOrder(self.bOk,self.bHelp) + self.setTabOrder(self.bHelp,self.BView2D) + self.setTabOrder(self.BView2D,self.BSalome) def languageChange(self): @@ -116,6 +144,7 @@ class DUnBase(QWidget): self.bHelp.setAccel(self.__tr("Alt+D")) QToolTip.add(self.bHelp,self.__tr("affichage documentation aster")) self.Commentaire.setText(QString.null) + self.BView2D.setText(self.__tr("Visualiser")) self.BSalome.setText(QString.null) self.tabuniqueinto.changeTab(self.Widget8,self.__tr("Saisir Valeur")) @@ -138,5 +167,8 @@ class DUnBase(QWidget): def BSalomePressed(self): print "DUnBase.BSalomePressed(): Not implemented yet" + def BView2DPressed(self): + print "DUnBase.BView2DPressed(): Not implemented yet" + def __tr(self,s,c = None): return qApp.translate("DUnBase",s,c) diff --git a/Ui/desUniqueBase.ui b/Ui/desUniqueBase.ui index 9aff6dc3..30eeab83 100644 --- a/Ui/desUniqueBase.ui +++ b/Ui/desUniqueBase.ui @@ -36,285 +36,230 @@ Saisir Valeur - + - layout2 + unnamed - - - 11 - 47 - 434 - 52 - - - + - unnamed + layout2 - - - textLabel2 - - - <b><u><p align="center">Valeur: </p></u></b> - - - + - lineEditVal + unnamed - - - 290 - 50 - - - - - - - - spacer1 - - - Horizontal - - - Expanding - - - - 286 - 21 - - - - - 11 - 15 - 288 - 21 - - - - - - bParametres - - - - 305 - 11 - 140 - 30 - - - - - 0 - 0 - 0 - 0 - - - - - 140 - 30 - - - - Parametres - - - - - bSup - - - - 11 - 389 - 141 - 30 - - - - - 0 - 30 - - - - &Supprimer - - - Alt+S - - - true - - - suppression du mot clef - - - - - bOk - - - - 158 - 389 - 141 - 30 - - - - - 0 - 30 - - - - &Valider - - - Shift+A, Alt+A, Alt+A, Alt+A - - - true - - - true - - - validation de la saisie - - - - - bHelp - - - - 305 - 389 - 140 - 30 - - - - - 0 - 30 - - - - &Documentation - - - Alt+D - - - true - - - affichage documentation aster - - - - - spacer4 - - - Vertical - - - Expanding - - - - 41 - 112 - - - - - 207 - 106 - 41 - 112 - - - - - - Commentaire - - - - 12 - 224 - 432 - 40 - - - - - 430 - 40 - - - - - - - - - spacer3 - - - Vertical - - - Expanding - - - - 21 - 112 - - - - - 217 - 270 - 21 - 112 - - - - - - BSalome - - - - 17 - 115 - 51 - 41 - - - - - - - image0 - - + + + textLabel2 + + + <b><u><p align="center">Valeur: </p></u></b> + + + + + lineEditVal + + + + 290 + 50 + + + + + + + + spacer1 + + + Horizontal + + + Expanding + + + + 288 + 21 + + + + + + bParametres + + + + 0 + 0 + 0 + 0 + + + + + 140 + 30 + + + + Parametres + + + + + bSup + + + + 0 + 30 + + + + &Supprimer + + + Alt+S + + + true + + + suppression du mot clef + + + + + bOk + + + + 0 + 30 + + + + &Valider + + + Shift+A, Alt+A, Alt+A, Alt+A + + + true + + + true + + + validation de la saisie + + + + + bHelp + + + + 0 + 30 + + + + &Documentation + + + Alt+D + + + true + + + affichage documentation aster + + + + + spacer4 + + + Vertical + + + Expanding + + + + 41 + 112 + + + + + + spacer3 + + + Vertical + + + Expanding + + + + 21 + 112 + + + + + + Commentaire + + + + 430 + 40 + + + + + + + + + BView2D + + + + 110 + 40 + + + + Visualiser + + + + + BSalome + + + + 50 + 40 + + + + + + + image0 + + + @@ -361,7 +306,23 @@ DUnBase BSalomePressed() + + BView2D + clicked() + DUnBase + BView2DPressed() + + + lineEditVal + tabuniqueinto + bParametres + bSup + bOk + bHelp + BView2D + BSalome + BSupPressed() ViewDoc() @@ -369,6 +330,7 @@ BParametresPressed() LEValeurPressed() BSalomePressed() + BView2DPressed() diff --git a/Ui/desUniqueComp.py b/Ui/desUniqueComp.py index 29e67337..7b9af9dd 100644 --- a/Ui/desUniqueComp.py +++ b/Ui/desUniqueComp.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'desUniqueComp.ui' # -# Created: mar mar 25 10:05:09 2008 +# Created: ven avr 4 11:27:09 2008 # by: The PyQt User Interface Compiler (pyuic) 3.13 # # WARNING! All changes made in this file will be lost! @@ -98,6 +98,15 @@ class DUnComp(QWidget): self.connect(self.LEReel,SIGNAL("returnPressed()"),self.LEReelRPressed) self.connect(self.LEcomp,SIGNAL("returnPressed()"),self.LEcompRPressed) + self.setTabOrder(self.LEcomp,self.LEReel) + self.setTabOrder(self.LEReel,self.LEImag) + self.setTabOrder(self.LEImag,self.tabuniqueinto) + self.setTabOrder(self.tabuniqueinto,self.RBRI) + self.setTabOrder(self.RBRI,self.RBMP) + self.setTabOrder(self.RBMP,self.bSup) + self.setTabOrder(self.bSup,self.bOk) + self.setTabOrder(self.bOk,self.bHelp) + def languageChange(self): self.setCaption(self.__tr("DUnComp")) diff --git a/Ui/desUniqueComp.ui b/Ui/desUniqueComp.ui index c89080e4..ae0361d6 100644 --- a/Ui/desUniqueComp.ui +++ b/Ui/desUniqueComp.ui @@ -280,6 +280,17 @@ LEcompRPressed() + + LEcomp + LEReel + LEImag + tabuniqueinto + RBRI + RBMP + bSup + bOk + bHelp + BSupPressed() ViewDoc() diff --git a/Ui/desUniqueSDCO.py b/Ui/desUniqueSDCO.py index b9ac1dba..bd94a1db 100644 --- a/Ui/desUniqueSDCO.py +++ b/Ui/desUniqueSDCO.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'desUniqueSDCO.ui' # -# Created: mar mar 25 15:11:17 2008 +# Created: ven avr 4 11:27:09 2008 # by: The PyQt User Interface Compiler (pyuic) 3.13 # # WARNING! All changes made in this file will be lost! @@ -77,6 +77,11 @@ class DUnSDCO(QWidget): self.connect(self.bSup,SIGNAL("clicked()"),self.BSupPressed) self.connect(self.LESDCO,SIGNAL("returnPressed()"),self.LESDCOReturnPressed) + self.setTabOrder(self.LESDCO,self.tabuniqueinto) + self.setTabOrder(self.tabuniqueinto,self.bSup) + self.setTabOrder(self.bSup,self.bOk) + self.setTabOrder(self.bOk,self.bHelp) + def languageChange(self): self.setCaption(self.__tr("DUnIn")) diff --git a/Ui/desUniqueSDCO.ui b/Ui/desUniqueSDCO.ui index 2356cc4e..f847c8b5 100644 --- a/Ui/desUniqueSDCO.ui +++ b/Ui/desUniqueSDCO.ui @@ -184,6 +184,13 @@ LESDCOReturnPressed() + + LESDCO + tabuniqueinto + bSup + bOk + bHelp + BSupPressed() ViewDoc() diff --git a/Ui/desUniqueSDCOInto.py b/Ui/desUniqueSDCOInto.py index d74acfdb..4a7a9d24 100644 --- a/Ui/desUniqueSDCOInto.py +++ b/Ui/desUniqueSDCOInto.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'desUniqueSDCOInto.ui' # -# Created: mar mar 25 15:11:07 2008 +# Created: ven avr 4 11:27:09 2008 # by: The PyQt User Interface Compiler (pyuic) 3.13 # # WARNING! All changes made in this file will be lost! @@ -98,6 +98,12 @@ class DUnSDCOInto(QWidget): self.connect(self.LBSDCO,SIGNAL("clicked(QListBoxItem*)"),self.LBSDCOReturnPressed) self.connect(self.LESDCO,SIGNAL("returnPressed()"),self.LESDCOReturnPressed) + self.setTabOrder(self.LESDCO,self.LBSDCO) + self.setTabOrder(self.LBSDCO,self.tabuniqueinto) + self.setTabOrder(self.tabuniqueinto,self.bSup) + self.setTabOrder(self.bSup,self.bOk) + self.setTabOrder(self.bOk,self.bHelp) + def languageChange(self): self.setCaption(self.__tr("DUnIn")) diff --git a/Ui/desUniqueSDCOInto.ui b/Ui/desUniqueSDCOInto.ui index 4b35835e..3849072f 100644 --- a/Ui/desUniqueSDCOInto.ui +++ b/Ui/desUniqueSDCOInto.ui @@ -248,6 +248,14 @@ LESDCOReturnPressed() + + LESDCO + LBSDCO + tabuniqueinto + bSup + bOk + bHelp + BSupPressed() ViewDoc() diff --git a/Ui/makefile b/Ui/makefile index 4ae7de1a..430af331 100644 --- a/Ui/makefile +++ b/Ui/makefile @@ -7,7 +7,7 @@ PY_FILES = desChoixCata.py desCommande.py desCommentaire.py desError.py desFormu desInclude.py desListeParam.py desMacro.py desMCFact.py desMCListAjout.py desParam.py \ desPlusieursBase.py desPlusieursInto.py desPoursuite.py desRacine.py desSelectVal.py \ desUniqueASSD.py desUniqueBase.py desUniqueComp.py desUniqueInto.py desUniqueSDCOInto.py \ - desUniqueSDCO.py desVisu.py myMain.py aideQT.py OptionsEditeur.py + desUniqueSDCO.py desVisu.py myMain.py aideQT.py OptionsEditeur.py OptionsPdf.py %.py:%.ui ${PYUIC} -o $@ $< diff --git a/Ui/myMain.py b/Ui/myMain.py index 1276f2ab..7f22fd99 100644 --- a/Ui/myMain.py +++ b/Ui/myMain.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'myMain.ui' # -# Created: mer mar 26 10:05:29 2008 +# Created: lun avr 7 08:16:42 2008 # by: The PyQt User Interface Compiler (pyuic) 3.13 # # WARNING! All changes made in this file will be lost! @@ -297,6 +297,7 @@ class Eficas(QMainWindow): self.aidenew_itemAction = QAction(self,"aidenew_itemAction") self.fileNewInclude = QAction(self,"fileNewInclude") self.optionEditeurAction = QAction(self,"optionEditeurAction") + self.optionPdfAction = QAction(self,"optionPdfAction") self.toolBar = QToolBar(QString(""),self,Qt.DockTop) @@ -350,6 +351,7 @@ class Eficas(QMainWindow): self.Options = QPopupMenu(self) self.optionEditeurAction.addTo(self.Options) + self.optionPdfAction.addTo(self.Options) self.MenuBar.insertItem(QString(""),self.Options,6) self.Traduction = QPopupMenu(self) @@ -388,6 +390,7 @@ class Eficas(QMainWindow): self.connect(self.aidenew_itemAction,SIGNAL("activated()"),self.helpAbout) self.connect(self.fileNewInclude,SIGNAL("activated()"),self.NewInclude) self.connect(self.optionEditeurAction,SIGNAL("activated()"),self.optionEditeur) + self.connect(self.optionPdfAction,SIGNAL("activated()"),self.optionPdf) def languageChange(self): @@ -455,6 +458,8 @@ class Eficas(QMainWindow): self.fileNewInclude.setMenuText(self.__tr("Nouvel Include")) self.optionEditeurAction.setText(self.__tr("Parametres Eficas")) self.optionEditeurAction.setMenuText(self.__tr("Parametres Eficas")) + self.optionPdfAction.setText(self.__tr("Lecteur Pdf")) + self.optionPdfAction.setMenuText(self.__tr("Lecteur Pdf")) self.toolBar.setLabel(self.__tr("Tools")) if self.MenuBar.findItem(2): self.MenuBar.findItem(2).setText(self.__tr("&Fichier")) @@ -541,5 +546,8 @@ class Eficas(QMainWindow): def optionEditeur(self): print "Eficas.optionEditeur(): Not implemented yet" + def optionPdf(self): + print "Eficas.optionPdf(): 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 70b6ec12..73a5906b 100644 --- a/Ui/myMain.ui +++ b/Ui/myMain.ui @@ -97,6 +97,7 @@ + @@ -481,6 +482,17 @@ Parametres Eficas + + + optionPdfAction + + + Lecteur Pdf + + + Lecteur Pdf + + @@ -650,6 +662,12 @@ Eficas optionEditeur() + + optionPdfAction + activated() + Eficas + optionPdf() + fileNew() @@ -675,6 +693,7 @@ traductionV7V8() NewInclude() optionEditeur() + optionPdf() -- 2.39.2