From: Pascale Noyret Date: Thu, 4 Dec 2008 16:01:34 +0000 (+0000) Subject: *** empty log message *** X-Git-Tag: V0_a1_SEPQT4~51 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=bd28229b4d61adf04c5e41d0d36d180172336b4a;p=modules%2Feficas.git *** empty log message *** --- diff --git a/Ihm/I_MACRO_ETAPE.py b/Ihm/I_MACRO_ETAPE.py index 7e58aa03..e4474bd8 100644 --- a/Ihm/I_MACRO_ETAPE.py +++ b/Ihm/I_MACRO_ETAPE.py @@ -111,7 +111,7 @@ class MACRO_ETAPE(I_ETAPE.ETAPE): self.text_error="" if self.nom != "INCLUDE_MATERIAU": if self.parent.appli.ihm == "QT" : - format=self.jdc.appli.format_fichier + format=self.parent.appli.appliEficas.format_fichier else : format=self.jdc.appli.format_fichier.get() if convert.plugins.has_key(format): @@ -127,6 +127,7 @@ class MACRO_ETAPE(I_ETAPE.ETAPE): else: self.text_converted=1 + j=self.JdC_aux( procedure=text, nom=fichier, appli=self.jdc.appli, cata=self.jdc.cata, @@ -758,6 +759,91 @@ class MACRO_ETAPE(I_ETAPE.ETAPE): f,text=None,None return f,text + + def make_include2(self,fichier=None): + # gestion de l unicite SVP + unite=999 + if hasattr(self,'fichier_ini') : return + #print "je passe le if" + if fichier == None : + fichier=str(self.jdc.appli.get_file_variable()) + #print fichier + if fichier == str("") : + self.fichier_ini="badfile" + self.fichier_text="" + self.fichier_err="Le fichier INCLUDE n est pas defini" + self.parent.record_unit(999,self) + try : + MCFils=self.get_child('FICHIER') + MCFils.set_valeur(None) + except : + pass + raise Exception(self.fichier_err) + + # On memorise le fichier retourne + self.fichier_ini = fichier + self.fichier_text = "" + self.contexte_fichier_init={} + self.fichier_unite=999 + self.fichier_err=None + try : + from openturns import WrapperFile + monWrapper=WrapperFile(fichier) + data=monWrapper.getWrapperData() + maVariableListe=data.getVariableList() + nbVariables=maVariableListe.getSize() + for i in range(nbVariables) : + nom=maVariableListe[i].id_ + type=maVariableListe[i].type_ + if type : + ligneTexte=nom+"=VARI(type='IN',);\n" + else : + ligneTexte=nom+"=VARI(type='OUT',);\n" + self.fichier_text = self.fichier_text + ligneTexte + except: + self.make_incl2_except() + raise + + try: + import Extensions.jdc_include + except: + traceback.print_exc() + self.make_incl2_except() + raise + self.JdC_aux=Extensions.jdc_include.JdC_include + + try: + self.make_contexte_include(self.fichier_ini ,self.fichier_text) + self.parent.record_unit(unite,self) + try : + MCFils=self.get_child('FICHIER') + MCFils.set_valeur(fichier) + except : + pass + except: + self.make_incl2_except() + raise + + def make_incl2_except(self): + #print "make_incl2_except" + l=traceback.format_exception_only("Fichier invalide",sys.exc_info()[1]) + if self.jdc.appli: + self.jdc.appli.affiche_alerte("Erreur lors de l'evaluation du fichier inclus", + message="Le contenu de ce fichier ne sera pas pris en compte\n"+string.join(l) + ) + self.parent.record_unit(unite,self) + self.g_context={} + self.etapes=[] + self.jdc_aux=None + self.fichier_err = string.join(l) + self.contexte_fichier_init={} + try : + MCFils=self.get_child('FICHIER') + MCFils.set_valeur(None) + except : + pass + + #ATTENTION SURCHARGE : cette methode surcharge celle de Noyau (a garder en synchro) def make_include(self,unite=None): """ @@ -796,9 +882,9 @@ class MACRO_ETAPE(I_ETAPE.ETAPE): raise Exception(self.fichier_err) try: + print self.make_contexte_include self.make_contexte_include(self.fichier_ini ,self.fichier_text) self.parent.record_unit(unite,self) - #print "make_include.context_ini",self.jdc_aux.context_ini except: l=traceback.format_exception_only("Fichier invalide",sys.exc_info()[1]) if self.jdc.appli: diff --git a/InterfaceQT/monRacinePanel.py b/InterfaceQT/monRacinePanel.py index bf8f3a8e..678fc089 100644 --- a/InterfaceQT/monRacinePanel.py +++ b/InterfaceQT/monRacinePanel.py @@ -40,6 +40,7 @@ class MonRacinePanel(DRac,QTPanelTBW2): DRac.__init__(self,parent,name,fl) QTPanel.__init__(self,node,parent) QTPanelTBW2.__init__(self,node,parent,racine=1) + self.setMinimumSize(0,0) def BSupPressed(self): QTPanel.BSupPressed(self) diff --git a/InterfaceQT4/editor.py b/InterfaceQT4/editor.py index de0c31dd..450b703f 100644 --- a/InterfaceQT4/editor.py +++ b/InterfaceQT4/editor.py @@ -61,8 +61,10 @@ class JDCEditor(QSplitter): VERSION_CODE = session.d_env.cata if appli != None : self.salome = self.appliEficas.salome + self.format = self.appliEficas.format_fichier else : self.salome=0 + print "dans JDC pas d appli ????????" self.code = self.appliEficas.CONFIGURATION.code self.version_code = VERSION_CODE @@ -436,6 +438,7 @@ class JDCEditor(QSplitter): self.appliEficas.trUtf8('Ouvrir Fichier'), self.appliEficas.CONFIGURATION.savedir, self.appliEficas.trUtf8('Wrapper Files (*.xml);;''All Files (*)')) + print fichier return fichier #----------------------------------# diff --git a/InterfaceQT4/monIncludePanel.py b/InterfaceQT4/monIncludePanel.py index 934908b2..4d78b8d6 100644 --- a/InterfaceQT4/monIncludePanel.py +++ b/InterfaceQT4/monIncludePanel.py @@ -68,19 +68,14 @@ class MonIncludePanel(DInc,QTPanelTBW1,QTPanelTBW2,QTPanelTBW3): self.node=node if not hasattr(self.node.item.object,'fichier_unite'): -#PNPN pour OT - # self.pageBad() - self.pageOk() + self.pageBad() else: self.pageOk() def pageOk(self): self.TWChoix.removeTab(3) self.TWChoix.setCurrentIndex(2) - self.node.item.object.fichier_ini="/home/noyret/Eficas_Openturns/v1.comm" self.LENomFichier.setText(self.node.item.object.fichier_ini) - print self.node.item.__class__ - print self.node.item.object.__class__ def pageBad(self) : @@ -127,7 +122,7 @@ class MonIncludePanel(DInc,QTPanelTBW1,QTPanelTBW2,QTPanelTBW3): """ Methode pour convertir le fichier file dans le format courant """ - format=self.editor.format_fichier + format=self.editor.format text=None if convert.plugins.has_key(format): # Le convertisseur existe on l'utilise @@ -142,9 +137,10 @@ class MonIncludePanel(DInc,QTPanelTBW1,QTPanelTBW2,QTPanelTBW3): def BChangeFilePressed(self): - userDir=self.node.appliEficas.CONFIGURATION.initialdir + userDir=self.node.appliEficas.CONFIGURATION.savedir fn = QFileDialog.getOpenFileName(self.node.appliEficas, self.node.appliEficas.trUtf8('Fichier Include'), + userDir, self.node.appliEficas.trUtf8('All Files (*);;''JDC Files (*.comm);;')) if fn.isNull(): diff --git a/InterfaceQT4/monPlusieursBasePanel.py b/InterfaceQT4/monPlusieursBasePanel.py index 9fa93e46..6dd3588a 100644 --- a/InterfaceQT4/monPlusieursBasePanel.py +++ b/InterfaceQT4/monPlusieursBasePanel.py @@ -156,7 +156,7 @@ class MonPlusieursBasePanel(DPlusBase,QTPanel,SaisieValeur): self.editor.affiche_infos("Valeurs Ajoutées") def BImportPressed(self): - init=QString( self.editor.CONFIGURATION.initialdir) + init=QString( self.editor.CONFIGURATION.savedir) fn = QFileDialog.getOpenFileName(self.node.appliEficas, self.node.appliEficas.trUtf8('Fichier de données'), init, diff --git a/InterfaceQT4/monUniqueBasePanel.py b/InterfaceQT4/monUniqueBasePanel.py index 3261a771..b53c79cb 100644 --- a/InterfaceQT4/monUniqueBasePanel.py +++ b/InterfaceQT4/monUniqueBasePanel.py @@ -112,12 +112,18 @@ class MonUniqueBasePanel(DUnBase,QTPanel,SaisieValeur): def BOk2Pressed(self): SaisieValeur.BOk2Pressed(self) + if self.node.item.parent.nom == "FICXML" : + self.node.item.parent.change_fichier="1" + self.node.item.parent.build_include(None,"") def BSupPressed(self): QTPanel.BSupPressed(self) def LEValeurPressed(self): SaisieValeur.LEValeurPressed(self) + if self.node.item.parent.nom == "FICXML" : + self.node.item.parent.change_fichier="1" + self.node.item.parent.build_include(None,"") def BParametresPressed(self): QTPanel.BParametresPressed(self) diff --git a/InterfaceQT4/qtSaisie.py b/InterfaceQT4/qtSaisie.py index 53144721..c0fd8a43 100644 --- a/InterfaceQT4/qtSaisie.py +++ b/InterfaceQT4/qtSaisie.py @@ -44,7 +44,7 @@ class SaisieValeur: if (min == 1 and min == max and len(listeNomsSD)==1 and (l==[] or l==None)): if ('R' not in self.node.item.get_type()) : - self.listBoxASSD.setCurrentItem(0) + self.listBoxASSD.setCurrentRow(0) def BuildLBValeurs(self): diff --git a/InterfaceQT4/readercata.py b/InterfaceQT4/readercata.py index 3feba937..3e24478c 100644 --- a/InterfaceQT4/readercata.py +++ b/InterfaceQT4/readercata.py @@ -43,7 +43,7 @@ from PyQt4 import * from PyQt4.QtGui import * from PyQt4.QtCore import * -version="14" +version="15" class READERCATA: @@ -136,7 +136,7 @@ class READERCATA: # self.traite_clefs_documentaires() self.cata=(self.cata,) - titre="Eficas V1.14 avec le catalogue " + os.path.basename(self.fic_cata) + titre="Eficas V1.15 avec le catalogue " + os.path.basename(self.fic_cata) if self.appliEficas.top: self.appliEficas.setWindowTitle(titre) self.appliEficas.titre=titre diff --git a/InterfaceQT4/viewManager.py b/InterfaceQT4/viewManager.py index ae835182..12a9f825 100644 --- a/InterfaceQT4/viewManager.py +++ b/InterfaceQT4/viewManager.py @@ -44,7 +44,7 @@ class MyTabview: if fichier is None: fichier = QFileDialog.getOpenFileName(self.appliEficas, self.appliEficas.trUtf8('Ouvrir Fichier'), - self.appliEficas.CONFIGURATION.initialdir, + self.appliEficas.CONFIGURATION.savedir, self.appliEficas.trUtf8('JDC Files (*.comm);;''All Files (*)')) if fichier.isNull(): return fichier = os.path.abspath(unicode(fichier)) diff --git a/Noyau/context.py b/Noyau/context.py index 676e6b8d..7ce9db7d 100644 --- a/Noyau/context.py +++ b/Noyau/context.py @@ -32,7 +32,7 @@ def set_current_step(step): global _root if _root : raise "Impossible d'affecter _root. Il devrait valoir None" _root=step - print "dans set_current_step", step + #print "dans set_current_step", step def get_current_step(): """ diff --git a/Openturns_Study/OpenTURNS_Cata_Study_V1.py b/Openturns_Study/OpenTURNS_Cata_Study_V1.py index c306319f..2ce3bf41 100644 --- a/Openturns_Study/OpenTURNS_Cata_Study_V1.py +++ b/Openturns_Study/OpenTURNS_Cata_Study_V1.py @@ -1431,7 +1431,6 @@ FICXML=MACRO(nom="FICXML", UIinfo={"groupes":("Gestion du travail",)}, fr="Débranchement vers un fichier de commandes secondaires", sd_prod=ops.INCLUDE,op_init=ops.INCLUDE_context,fichier_ini=1, - #UNITE = SIMP(statut='o',typ='I'), - FICHIER = SIMP(statut='f',typ='TXM',), + FICHIER = SIMP(statut='o',typ='TXM',), ); diff --git a/Ui/OptionsEditeur.py b/Ui/OptionsEditeur.py index f828bdfc..6a978086 100644 --- a/Ui/OptionsEditeur.py +++ b/Ui/OptionsEditeur.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'OptionsEditeur.ui' # -# Created: Tue Jun 10 18:23:53 2008 +# Created: Mon Dec 1 10:32:43 2008 # by: The PyQt User Interface Compiler (pyuic) 3.16 # # WARNING! All changes made in this file will be lost! diff --git a/Ui/OptionsPdf.py b/Ui/OptionsPdf.py index c5c3c891..17c90a85 100644 --- a/Ui/OptionsPdf.py +++ b/Ui/OptionsPdf.py @@ -2,8 +2,8 @@ # Form implementation generated from reading ui file 'OptionsPdf.ui' # -# Created: lun avr 7 09:36:07 2008 -# by: The PyQt User Interface Compiler (pyuic) 3.13 +# Created: Mon Dec 1 10:32:43 2008 +# by: The PyQt User Interface Compiler (pyuic) 3.16 # # WARNING! All changes made in this file will be lost! diff --git a/Ui/aideQT.py b/Ui/aideQT.py index a60c7609..1aac5f8b 100644 --- a/Ui/aideQT.py +++ b/Ui/aideQT.py @@ -2,8 +2,8 @@ # Form implementation generated from reading ui file 'aideQT.ui' # -# Created: mar mar 25 10:05:07 2008 -# by: The PyQt User Interface Compiler (pyuic) 3.13 +# Created: Mon Dec 1 10:32:43 2008 +# by: The PyQt User Interface Compiler (pyuic) 3.16 # # WARNING! All changes made in this file will be lost! diff --git a/Ui/desChoixCata.py b/Ui/desChoixCata.py index 22e37b83..a650bb19 100644 --- a/Ui/desChoixCata.py +++ b/Ui/desChoixCata.py @@ -2,8 +2,8 @@ # Form implementation generated from reading ui file 'desChoixCata.ui' # -# Created: mar mar 25 10:05:07 2008 -# by: The PyQt User Interface Compiler (pyuic) 3.13 +# Created: Mon Dec 1 12:10:18 2008 +# by: The PyQt User Interface Compiler (pyuic) 3.16 # # WARNING! All changes made in this file will be lost! @@ -42,19 +42,21 @@ class DChoixCata(QDialog): DChoixCataLayout.addWidget(self.TLNb,0,0) + self.textLabel1_2 = QLabel(self,"textLabel1_2") + self.textLabel1_2.setSizePolicy(QSizePolicy(QSizePolicy.Ignored,QSizePolicy.Preferred,0,0,self.textLabel1_2.sizePolicy().hasHeightForWidth())) + self.textLabel1_2.setMinimumSize(QSize(30,60)) + + DChoixCataLayout.addWidget(self.textLabel1_2,1,0) + self.CBChoixCata = QComboBox(0,self,"CBChoixCata") self.CBChoixCata.setEnabled(1) + self.CBChoixCata.setSizePolicy(QSizePolicy(QSizePolicy.Fixed,QSizePolicy.Fixed,0,0,self.CBChoixCata.sizePolicy().hasHeightForWidth())) DChoixCataLayout.addWidget(self.CBChoixCata,1,1) - self.textLabel1_2 = QLabel(self,"textLabel1_2") - self.textLabel1_2.setMinimumSize(QSize(380,60)) - - DChoixCataLayout.addWidget(self.textLabel1_2,1,0) - self.languageChange() - self.resize(QSize(547,172).expandedTo(self.minimumSizeHint())) + self.resize(QSize(523,172).expandedTo(self.minimumSizeHint())) self.clearWState(Qt.WState_Polished) self.connect(self.buttonOk,SIGNAL("clicked()"),self.BOkPressed) @@ -65,9 +67,9 @@ class DChoixCata(QDialog): def languageChange(self): self.setCaption(self.__tr("Choix d'une version du code Aster")) self.buttonCancel.setText(self.__tr("&Cancel")) - self.buttonCancel.setAccel(QString.null) + self.buttonCancel.setAccel(QKeySequence(QString.null)) self.buttonOk.setText(self.__tr("&OK")) - self.buttonOk.setAccel(QString.null) + self.buttonOk.setAccel(QKeySequence(QString.null)) self.TLNb.setText(self.__tr("2")) self.textLabel1_2.setText(self.__tr("Veuillez choisir celle avec laquelle vous souhaitez travailler")) diff --git a/Ui/desChoixCata.ui b/Ui/desChoixCata.ui index 8f6eff55..62392866 100644 --- a/Ui/desChoixCata.ui +++ b/Ui/desChoixCata.ui @@ -8,7 +8,7 @@ 0 0 - 547 + 523 172 @@ -94,21 +94,21 @@ 2 - - - CBChoixCata - - - true - - textLabel1_2 + + + 2 + 5 + 0 + 0 + + - 380 + 30 60 @@ -116,6 +116,22 @@ <font size="+1">Veuillez choisir celle avec laquelle vous souhaitez travailler</font> + + + CBChoixCata + + + true + + + + 0 + 0 + 0 + 0 + + + diff --git a/Ui/desCommande.py b/Ui/desCommande.py index 2a4cc274..a9f53a82 100644 --- a/Ui/desCommande.py +++ b/Ui/desCommande.py @@ -2,8 +2,8 @@ # Form implementation generated from reading ui file 'desCommande.ui' # -# Created: ven mai 16 13:30:38 2008 -# by: The PyQt User Interface Compiler (pyuic) 3.13 +# Created: Mon Dec 1 12:10:18 2008 +# by: The PyQt User Interface Compiler (pyuic) 3.16 # # WARNING! All changes made in this file will be lost! @@ -18,58 +18,63 @@ class DComm(QWidget): if not name: self.setName("DComm") - self.setMinimumSize(QSize(505,0)) + self.setSizePolicy(QSizePolicy(QSizePolicy.MinimumExpanding,QSizePolicy.MinimumExpanding,0,0,self.sizePolicy().hasHeightForWidth())) + self.setMinimumSize(QSize(0,0)) DCommLayout = QGridLayout(self,1,1,11,6,"DCommLayout") - self.Commentaire = QLabel(self,"Commentaire") - self.Commentaire.setFrameShape(QLabel.NoFrame) - self.Commentaire.setFrameShadow(QLabel.Plain) + layout1 = QHBoxLayout(None,0,6,"layout1") - DCommLayout.addMultiCellWidget(self.Commentaire,1,1,0,2) + self.bSup = QPushButton(self,"bSup") + self.bSup.setSizePolicy(QSizePolicy(QSizePolicy.Ignored,QSizePolicy.Fixed,0,0,self.bSup.sizePolicy().hasHeightForWidth())) + self.bSup.setMinimumSize(QSize(0,30)) + self.bSup.setAutoDefault(1) + layout1.addWidget(self.bSup) self.bOk = QPushButton(self,"bOk") + self.bOk.setSizePolicy(QSizePolicy(QSizePolicy.Ignored,QSizePolicy.Fixed,0,0,self.bOk.sizePolicy().hasHeightForWidth())) self.bOk.setMinimumSize(QSize(0,30)) self.bOk.setAutoDefault(1) self.bOk.setDefault(1) - - DCommLayout.addWidget(self.bOk,2,1) - - self.bSup = QPushButton(self,"bSup") - self.bSup.setMinimumSize(QSize(0,30)) - self.bSup.setAutoDefault(1) - - DCommLayout.addWidget(self.bSup,2,0) + layout1.addWidget(self.bOk) self.bHelp = QPushButton(self,"bHelp") + self.bHelp.setSizePolicy(QSizePolicy(QSizePolicy.Ignored,QSizePolicy.Fixed,0,0,self.bHelp.sizePolicy().hasHeightForWidth())) self.bHelp.setMinimumSize(QSize(0,30)) self.bHelp.setAutoDefault(1) + layout1.addWidget(self.bHelp) + + DCommLayout.addLayout(layout1,2,0) + + self.Commentaire = QLabel(self,"Commentaire") + self.Commentaire.setFrameShape(QLabel.NoFrame) + self.Commentaire.setFrameShadow(QLabel.Plain) - DCommLayout.addWidget(self.bHelp,2,2) + DCommLayout.addWidget(self.Commentaire,1,0) self.TWChoix = QTabWidget(self,"TWChoix") self.MotClef = QWidget(self.TWChoix,"MotClef") self.textLabel1 = QLabel(self.MotClef,"textLabel1") - self.textLabel1.setGeometry(QRect(11,11,226,18)) + self.textLabel1.setGeometry(QRect(11,11,226,23)) self.textLabel1.setMinimumSize(QSize(0,0)) - self.LBMCPermis = QListBox(self.MotClef,"LBMCPermis") - self.LBMCPermis.setGeometry(QRect(11,35,226,342)) - self.LBMCPermis.setMinimumSize(QSize(0,0)) - self.textLabel1_2 = QLabel(self.MotClef,"textLabel1_2") - self.textLabel1_2.setGeometry(QRect(243,11,225,18)) + self.textLabel1_2.setGeometry(QRect(243,11,225,23)) self.LBRegles = QListBox(self.MotClef,"LBRegles") - self.LBRegles.setGeometry(QRect(243,35,225,342)) - self.TWChoix.insertTab(self.MotClef,QString("")) + self.LBRegles.setGeometry(QRect(243,40,230,318)) + + self.LBMCPermis = QListBox(self.MotClef,"LBMCPermis") + self.LBMCPermis.setGeometry(QRect(11,40,220,318)) + self.LBMCPermis.setMinimumSize(QSize(0,0)) + self.TWChoix.insertTab(self.MotClef,QString.fromLatin1("")) self.Concept = QWidget(self.TWChoix,"Concept") - ConceptLayout = QGridLayout(self.Concept,1,1,11,6,"ConceptLayout") self.groupBox1 = QGroupBox(self.Concept,"groupBox1") + self.groupBox1.setGeometry(QRect(11,11,460,340)) self.textLabel1_3 = QLabel(self.groupBox1,"textLabel1_3") self.textLabel1_3.setGeometry(QRect(80,50,130,31)) @@ -77,17 +82,16 @@ class DComm(QWidget): self.textLabel1_3_2 = QLabel(self.groupBox1,"textLabel1_3_2") self.textLabel1_3_2.setGeometry(QRect(80,170,150,31)) - self.LENomConcept = QLineEdit(self.groupBox1,"LENomConcept") - self.LENomConcept.setGeometry(QRect(80,110,310,30)) + self.typeConcept = QLabel(self.groupBox1,"typeConcept") + self.typeConcept.setGeometry(QRect(310,200,130,31)) self.textLabel3 = QLabel(self.groupBox1,"textLabel3") self.textLabel3.setGeometry(QRect(10,200,290,31)) + self.textLabel3.setSizePolicy(QSizePolicy(QSizePolicy.Ignored,QSizePolicy.Preferred,0,0,self.textLabel3.sizePolicy().hasHeightForWidth())) - self.typeConcept = QLabel(self.groupBox1,"typeConcept") - self.typeConcept.setGeometry(QRect(310,200,130,31)) - - ConceptLayout.addWidget(self.groupBox1,0,0) - self.TWChoix.insertTab(self.Concept,QString("")) + self.LENomConcept = QLineEdit(self.groupBox1,"LENomConcept") + self.LENomConcept.setGeometry(QRect(80,110,310,30)) + self.TWChoix.insertTab(self.Concept,QString.fromLatin1("")) self.Commande = QWidget(self.TWChoix,"Commande") CommandeLayout = QGridLayout(self.Commande,1,1,11,6,"CommandeLayout") @@ -113,6 +117,7 @@ class DComm(QWidget): CommandeLayout.addMultiCellWidget(self.textLabel1_4,0,0,0,2) self.textLabel4 = QLabel(self.Commande,"textLabel4") + self.textLabel4.setSizePolicy(QSizePolicy(QSizePolicy.Ignored,QSizePolicy.Preferred,0,0,self.textLabel4.sizePolicy().hasHeightForWidth())) CommandeLayout.addMultiCellWidget(self.textLabel4,3,3,0,3) @@ -131,13 +136,13 @@ class DComm(QWidget): self.BNext.setIconSet(QIconSet()) CommandeLayout.addWidget(self.BNext,1,2) - self.TWChoix.insertTab(self.Commande,QString("")) + self.TWChoix.insertTab(self.Commande,QString.fromLatin1("")) - DCommLayout.addMultiCellWidget(self.TWChoix,0,0,0,2) + DCommLayout.addWidget(self.TWChoix,0,0) self.languageChange() - self.resize(QSize(505,483).expandedTo(self.minimumSizeHint())) + self.resize(QSize(506,483).expandedTo(self.minimumSizeHint())) self.clearWState(Qt.WState_Polished) self.connect(self.LBNouvCommande,SIGNAL("doubleClicked(QListBoxItem*)"),self.LBNouvCommandeClicked) @@ -164,24 +169,24 @@ class DComm(QWidget): def languageChange(self): self.setCaption(self.__tr("DComm")) - self.Commentaire.setText(QString.null) - self.bOk.setText(self.__tr("&Valider")) - self.bOk.setAccel(self.__tr("Shift+A, Alt+A, Alt+A, Alt+A")) - QToolTip.add(self.bOk,self.__tr("validation de la saisie")) self.bSup.setText(self.__tr("&Supprimer")) - self.bSup.setAccel(self.__tr("Alt+S")) + self.bSup.setAccel(QKeySequence(self.__tr("Alt+S"))) QToolTip.add(self.bSup,self.__tr("suppression du mot clef")) + self.bOk.setText(self.__tr("&Valider")) + self.bOk.setAccel(QKeySequence(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")) + self.bHelp.setAccel(QKeySequence(self.__tr("Alt+D"))) QToolTip.add(self.bHelp,self.__tr("affichage documentation aster")) + 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\xa8\x67\x6c\x65\x73\x3c\x2f\x62\x3e\x3c\x2f\x75\x3e\x3c\x2f\x70\x3e\x3c\x2f\x68\x33\x3e")) self.TWChoix.changeTab(self.MotClef,self.__tr("Ajouter Mot-Clef")) self.groupBox1.setTitle(self.__tr("Concept")) self.textLabel1_3.setText(self.__tr("Nom du concept :")) self.textLabel1_3_2.setText(self.__tr("Type du concept :")) - self.textLabel3.setText(self.__trUtf8("\x4c\x27\x6f\x70\xc3\xa9\x72\x61\x74\x65\x75\x72\x20\x72\x65\x74\x6f\x75\x72\x6e\x65\x20\x75\x6e\x20\x63\x6f\x6e\x63\x65\x70\x74\x20\x64\x65\x20\x74\x79\x70\x65\x20\x3a")) self.typeConcept.setText(self.__tr("TypeDuConcept")) + self.textLabel3.setText(self.__trUtf8("\x4c\x27\x6f\x70\xc3\xa9\x72\x61\x74\x65\x75\x72\x20\x72\x65\x74\x6f\x75\x72\x6e\x65\x20\x75\x6e\x20\x63\x6f\x6e\x63\x65\x70\x74\x20\x64\x65\x20\x74\x79\x70\x65\x20\x3a")) self.TWChoix.changeTab(self.Concept,self.__tr("Nommer Concept")) self.buttonGroup1.setTitle(self.__tr("Affichage")) self.RBalpha.setText(self.__trUtf8("\x61\x6c\x70\x68\x61\x62\xc3\xa9\x74\x69\x71\x75\x65")) diff --git a/Ui/desCommande.ui b/Ui/desCommande.ui index 1ebda2c3..204e76ea 100644 --- a/Ui/desCommande.ui +++ b/Ui/desCommande.ui @@ -8,13 +8,21 @@ 0 0 - 505 + 506 483 + + + 3 + 3 + 0 + 0 + + - 505 + 0 0 @@ -25,7 +33,113 @@ unnamed - + + + layout1 + + + + unnamed + + + + bSup + + + + 2 + 0 + 0 + 0 + + + + + 0 + 30 + + + + &Supprimer + + + Alt+S + + + true + + + suppression du mot clef + + + + + bOk + + + + 2 + 0 + 0 + 0 + + + + + 0 + 30 + + + + &Valider + + + Shift+A, Alt+A, Alt+A, Alt+A + + + true + + + true + + + validation de la saisie + + + + + bHelp + + + + 2 + 0 + 0 + 0 + + + + + 0 + 30 + + + + &Documentation + + + Alt+D + + + true + + + affichage documentation aster + + + + + Commentaire @@ -39,79 +153,7 @@ - - - bOk - - - - 0 - 30 - - - - &Valider - - - Shift+A, Alt+A, Alt+A, Alt+A - - - true - - - true - - - validation de la saisie - - - - - bSup - - - - 0 - 30 - - - - &Supprimer - - - Alt+S - - - true - - - suppression du mot clef - - - - - bHelp - - - - 0 - 30 - - - - &Documentation - - - Alt+D - - - true - - - affichage documentation aster - - - + TWChoix @@ -122,147 +164,185 @@ Ajouter Mot-Clef - + - unnamed + textLabel1 - + + + 11 + 11 + 226 + 23 + + + + + 0 + 0 + + + + <h3><p align="center"><u><b>Mots Clefs Permis</b></u></p></h3> + + + + + textLabel1_2 + + + + 243 + 11 + 225 + 23 + + + + <h3><p align="center"><u><b>Règles</b></u></p></h3> + + + + + LBRegles + + + + 243 + 40 + 230 + 318 + + + + + + LBMCPermis + + + + 11 + 40 + 220 + 318 + + + + + 0 + 0 + + + + + + + Concept + + + Nommer Concept + + + + groupBox1 + + + + 11 + 11 + 460 + 340 + + + + Concept + + - textLabel1 + textLabel1_3 - - - 0 - 0 - + + + 80 + 50 + 130 + 31 + - <h3><p align="center"><u><b>Mots Clefs Permis</b></u></p></h3> + <u>Nom du concept :</u> - + - LBRegles + textLabel1_3_2 + + + + 80 + 170 + 150 + 31 + + + + <u>Type du concept :</u> - + - LBMCPermis + typeConcept - - - 0 - 0 - + + + 310 + 200 + 130 + 31 + + + + TypeDuConcept - + - textLabel1_2 + textLabel3 + + + + 10 + 200 + 290 + 31 + + + + + 2 + 5 + 0 + 0 + - <h3><p align="center"><u><b>Règles</b></u></p></h3> + L'opérateur retourne un concept de type : - - - - - Concept - - - Nommer Concept - - - - unnamed - - + - groupBox1 + LENomConcept - - Concept + + + 80 + 110 + 310 + 30 + - - - textLabel1_3 - - - - 80 - 50 - 130 - 31 - - - - <u>Nom du concept :</u> - - - - - textLabel1_3_2 - - - - 80 - 170 - 150 - 31 - - - - <u>Type du concept :</u> - - - - - LENomConcept - - - - 80 - 110 - 310 - 30 - - - - - - textLabel3 - - - - 10 - 200 - 290 - 31 - - - - L'opérateur retourne un concept de type : - - - - - typeConcept - - - - 310 - 200 - 130 - 31 - - - - TypeDuConcept - - - + @@ -341,6 +421,14 @@ textLabel4 + + + 2 + 5 + 0 + 0 + + La commande choisie sera ajoutée APRES la commande courante diff --git a/Ui/desCommentaire.py b/Ui/desCommentaire.py index 2ad37170..f4b246a8 100644 --- a/Ui/desCommentaire.py +++ b/Ui/desCommentaire.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'desCommentaire.ui' # -# Created: Thu Jun 19 16:49:50 2008 +# Created: Mon Dec 1 12:10:18 2008 # by: The PyQt User Interface Compiler (pyuic) 3.16 # # WARNING! All changes made in this file will be lost! @@ -18,91 +18,105 @@ class DComment(QWidget): if not name: self.setName("DComment") - self.setMinimumSize(QSize(505,0)) + self.setMinimumSize(QSize(0,0)) DCommentLayout = QGridLayout(self,1,1,11,6,"DCommentLayout") + layout3 = QHBoxLayout(None,0,6,"layout3") + + self.bSup = QPushButton(self,"bSup") + self.bSup.setSizePolicy(QSizePolicy(QSizePolicy.MinimumExpanding,QSizePolicy.Fixed,0,0,self.bSup.sizePolicy().hasHeightForWidth())) + self.bSup.setMinimumSize(QSize(0,30)) + self.bSup.setAutoDefault(1) + layout3.addWidget(self.bSup) + + self.bOk = QPushButton(self,"bOk") + self.bOk.setSizePolicy(QSizePolicy(QSizePolicy.MinimumExpanding,QSizePolicy.Fixed,0,0,self.bOk.sizePolicy().hasHeightForWidth())) + self.bOk.setMinimumSize(QSize(0,30)) + self.bOk.setAutoDefault(1) + self.bOk.setDefault(1) + layout3.addWidget(self.bOk) + + self.bHelp = QPushButton(self,"bHelp") + self.bHelp.setSizePolicy(QSizePolicy(QSizePolicy.MinimumExpanding,QSizePolicy.Fixed,0,0,self.bHelp.sizePolicy().hasHeightForWidth())) + self.bHelp.setMinimumSize(QSize(0,30)) + self.bHelp.setAutoDefault(1) + layout3.addWidget(self.bHelp) + + DCommentLayout.addLayout(layout3,2,0) + + self.Commentaire = QLabel(self,"Commentaire") + self.Commentaire.setFrameShape(QLabel.NoFrame) + self.Commentaire.setFrameShadow(QLabel.Plain) + + DCommentLayout.addWidget(self.Commentaire,1,0) + self.TWChoix = QTabWidget(self,"TWChoix") self.Valeur_Parametre = QWidget(self.TWChoix,"Valeur_Parametre") self.textCommentaire = QTextEdit(self.Valeur_Parametre,"textCommentaire") - self.textCommentaire.setGeometry(QRect(0,0,480,390)) + self.textCommentaire.setGeometry(QRect(11,11,425,347)) + self.textCommentaire.setSizePolicy(QSizePolicy(QSizePolicy.MinimumExpanding,QSizePolicy.MinimumExpanding,0,0,self.textCommentaire.sizePolicy().hasHeightForWidth())) self.TWChoix.insertTab(self.Valeur_Parametre,QString.fromLatin1("")) self.Commande = QWidget(self.TWChoix,"Commande") - CommandeLayout = QGridLayout(self.Commande,1,1,11,6,"CommandeLayout") + CommandeLayout = QVBoxLayout(self.Commande,11,6,"CommandeLayout") - self.LBNouvCommande = QListBox(self.Commande,"LBNouvCommande") + layout2 = QHBoxLayout(None,0,6,"layout2") - 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) + layout1 = QGridLayout(None,1,1,0,6,"layout1") self.textLabel1_4 = QLabel(self.Commande,"textLabel1_4") + self.textLabel1_4.setSizePolicy(QSizePolicy(QSizePolicy.MinimumExpanding,QSizePolicy.Preferred,0,0,self.textLabel1_4.sizePolicy().hasHeightForWidth())) - CommandeLayout.addMultiCellWidget(self.textLabel1_4,0,0,0,2) + layout1.addMultiCellWidget(self.textLabel1_4,0,0,0,2) - self.textLabel4 = QLabel(self.Commande,"textLabel4") + self.textLabel6 = QLabel(self.Commande,"textLabel6") + self.textLabel6.setSizePolicy(QSizePolicy(QSizePolicy.Preferred,QSizePolicy.Preferred,0,0,self.textLabel6.sizePolicy().hasHeightForWidth())) + self.textLabel6.setMinimumSize(QSize(50,30)) - CommandeLayout.addMultiCellWidget(self.textLabel4,3,3,0,3) + layout1.addWidget(self.textLabel6,1,0) self.LEFiltre = QLineEdit(self.Commande,"LEFiltre") - self.LEFiltre.setMinimumSize(QSize(160,30)) + self.LEFiltre.setSizePolicy(QSizePolicy(QSizePolicy.MinimumExpanding,QSizePolicy.Fixed,0,0,self.LEFiltre.sizePolicy().hasHeightForWidth())) + self.LEFiltre.setMinimumSize(QSize(30,30)) - CommandeLayout.addWidget(self.LEFiltre,1,1) + layout1.addWidget(self.LEFiltre,1,1) self.BNext = QToolButton(self.Commande,"BNext") - self.BNext.setMinimumSize(QSize(60,30)) + self.BNext.setSizePolicy(QSizePolicy(QSizePolicy.MinimumExpanding,QSizePolicy.Minimum,0,0,self.BNext.sizePolicy().hasHeightForWidth())) + self.BNext.setMinimumSize(QSize(20,30)) self.BNext.setIconSet(QIconSet()) - CommandeLayout.addWidget(self.BNext,1,2) - - self.textLabel6 = QLabel(self.Commande,"textLabel6") - self.textLabel6.setMinimumSize(QSize(50,30)) - - CommandeLayout.addWidget(self.textLabel6,1,0) - self.TWChoix.insertTab(self.Commande,QString.fromLatin1("")) - - DCommentLayout.addMultiCellWidget(self.TWChoix,0,0,0,2) - - self.bOk = QPushButton(self,"bOk") - self.bOk.setMinimumSize(QSize(0,30)) - self.bOk.setAutoDefault(1) - self.bOk.setDefault(1) - - DCommentLayout.addWidget(self.bOk,2,1) + layout1.addWidget(self.BNext,1,2) + layout2.addLayout(layout1) - self.bSup = QPushButton(self,"bSup") - self.bSup.setMinimumSize(QSize(0,30)) - self.bSup.setAutoDefault(1) + self.buttonGroup1 = QButtonGroup(self.Commande,"buttonGroup1") - DCommentLayout.addWidget(self.bSup,2,0) + self.RBalpha = QRadioButton(self.buttonGroup1,"RBalpha") + self.RBalpha.setGeometry(QRect(20,20,110,20)) + self.RBalpha.setSizePolicy(QSizePolicy(QSizePolicy.MinimumExpanding,QSizePolicy.Fixed,0,0,self.RBalpha.sizePolicy().hasHeightForWidth())) + self.RBalpha.setChecked(1) - self.bHelp = QPushButton(self,"bHelp") - self.bHelp.setMinimumSize(QSize(0,30)) - self.bHelp.setAutoDefault(1) + self.RBGroupe = QRadioButton(self.buttonGroup1,"RBGroupe") + self.RBGroupe.setGeometry(QRect(20,40,101,20)) + layout2.addWidget(self.buttonGroup1) + CommandeLayout.addLayout(layout2) - DCommentLayout.addWidget(self.bHelp,2,2) + self.LBNouvCommande = QListBox(self.Commande,"LBNouvCommande") + CommandeLayout.addWidget(self.LBNouvCommande) - self.Commentaire = QLabel(self,"Commentaire") - self.Commentaire.setFrameShape(QLabel.NoFrame) - self.Commentaire.setFrameShadow(QLabel.Plain) + self.textLabel4 = QLabel(self.Commande,"textLabel4") + self.textLabel4.setSizePolicy(QSizePolicy(QSizePolicy.Ignored,QSizePolicy.Preferred,0,0,self.textLabel4.sizePolicy().hasHeightForWidth())) + CommandeLayout.addWidget(self.textLabel4) + self.TWChoix.insertTab(self.Commande,QString.fromLatin1("")) - DCommentLayout.addMultiCellWidget(self.Commentaire,1,1,0,2) + DCommentLayout.addWidget(self.TWChoix,0,0) self.languageChange() - self.resize(QSize(505,483).expandedTo(self.minimumSizeHint())) + self.resize(QSize(478,483).expandedTo(self.minimumSizeHint())) self.clearWState(Qt.WState_Polished) self.connect(self.LBNouvCommande,SIGNAL("doubleClicked(QListBoxItem*)"),self.LBNouvCommandeClicked) @@ -114,7 +128,6 @@ class DComment(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.textCommentaire,SIGNAL("textChanged()"),self.TexteCommentaireEntre) self.setTabOrder(self.LEFiltre,self.TWChoix) self.setTabOrder(self.TWChoix,self.textCommentaire) @@ -127,26 +140,26 @@ class DComment(QWidget): def languageChange(self): self.setCaption(self.__tr("DComm")) - self.TWChoix.changeTab(self.Valeur_Parametre,self.__tr("Commentaire")) - 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(self.__tr("Suivant")) - QToolTip.add(self.BNext,self.__tr("affiche la prochaine occurence")) - self.textLabel6.setText(self.__tr("Filtre")) - self.TWChoix.changeTab(self.Commande,self.__tr("Nouvelle Commande")) + self.bSup.setText(self.__tr("&Supprimer")) + self.bSup.setAccel(QKeySequence(self.__tr("Alt+S"))) + QToolTip.add(self.bSup,self.__tr("suppression du mot cle30")) self.bOk.setText(self.__tr("&Valider")) self.bOk.setAccel(QKeySequence(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(QKeySequence(self.__tr("Alt+S"))) - QToolTip.add(self.bSup,self.__tr("suppression du mot clef")) self.bHelp.setText(self.__tr("&Documentation")) self.bHelp.setAccel(QKeySequence(self.__tr("Alt+D"))) QToolTip.add(self.bHelp,self.__tr("affichage documentation aster")) self.Commentaire.setText(QString.null) + self.TWChoix.changeTab(self.Valeur_Parametre,self.__tr("Commentaire")) + self.textLabel1_4.setText(self.__tr("Commandes :")) + self.textLabel6.setText(self.__tr("Filtre")) + self.BNext.setText(self.__tr("Suivant")) + QToolTip.add(self.BNext,self.__tr("affiche la prochaine occurence")) + self.buttonGroup1.setTitle(self.__tr("Affichage")) + self.RBalpha.setText(self.__trUtf8("\x61\x6c\x70\x68\x61\x62\xc3\xa9\x74\x69\x71\x75\x65")) + self.RBGroupe.setText(self.__tr("par groupe")) + self.textLabel4.setText(self.__trUtf8("\x4c\x61\x20\x63\x6f\x6d\x6d\x61\x6e\x64\x65\x20\x63\x68\x6f\x69\x73\x69\x65\x20\x73\x65\x72\x61\x20\x61\x6a\x6f\x75\x74\xc3\xa9\x65\x20\x41\x50\x52\x45\x53\x20\x6c\x61\x20\x63\x6f\x6d\x6d\x61\x6e\x64\x65\x20\x63\x6f\x75\x72\x61\x6e\x74\x65")) + self.TWChoix.changeTab(self.Commande,self.__tr("Nouvelle Commande")) def LBNouvCommandeClicked(self): diff --git a/Ui/desCommentaire.ui b/Ui/desCommentaire.ui index 63210082..5c1f0ea9 100644 --- a/Ui/desCommentaire.ui +++ b/Ui/desCommentaire.ui @@ -8,13 +8,13 @@ 0 0 - 505 + 478 483 - 505 + 0 0 @@ -25,7 +25,127 @@ unnamed - + + + layout3 + + + + unnamed + + + + bSup + + + + 3 + 0 + 0 + 0 + + + + + 0 + 30 + + + + &Supprimer + + + Alt+S + + + true + + + suppression du mot cle30 + + + + + bOk + + + + 3 + 0 + 0 + 0 + + + + + 0 + 30 + + + + &Valider + + + Shift+A, Alt+A, Alt+A, Alt+A + + + true + + + true + + + validation de la saisie + + + + + bHelp + + + + 3 + 0 + 0 + 0 + + + + + 0 + 30 + + + + &Documentation + + + Alt+D + + + true + + + affichage documentation aster + + + + + + + Commentaire + + + NoFrame + + + Plain + + + + + + TWChoix @@ -42,12 +162,20 @@ - 0 - 0 - 480 - 390 + 11 + 11 + 425 + 347 + + + 3 + 3 + 0 + 0 + + @@ -57,208 +185,190 @@ Nouvelle Commande - + unnamed - + - LBNouvCommande + layout2 - - - - buttonGroup1 - - - Affichage - - - - RBGroupe - - - - 20 - 40 - 101 - 20 - - - - par groupe - - - + - RBalpha + unnamed - - - 20 - 20 - 120 - 20 - - - - alphabétique - - - true - - + + + layout1 + + + + unnamed + + + + textLabel1_4 + + + + 3 + 5 + 0 + 0 + + + + <b><u>Commandes :</u></b> + + + + + textLabel6 + + + + 5 + 5 + 0 + 0 + + + + + 50 + 30 + + + + Filtre + + + + + LEFiltre + + + + 3 + 0 + 0 + 0 + + + + + 30 + 30 + + + + + + BNext + + + + 3 + 1 + 0 + 0 + + + + + 20 + 30 + + + + Suivant + + + + + + affiche la prochaine occurence + + + + + + + buttonGroup1 + + + Affichage + + + + RBalpha + + + + 20 + 20 + 110 + 20 + + + + + 3 + 0 + 0 + 0 + + + + alphabétique + + + true + + + + + RBGroupe + + + + 20 + 40 + 101 + 20 + + + + par groupe + + + + - + - textLabel1_4 - - - <b><u>Commandes :</u></b> + LBNouvCommande - + textLabel4 - - La commande choisie sera ajoutée APRES la commande courante - - - - - LEFiltre - - - - 160 - 30 - - - - - - BNext - - - - 60 - 30 - + + + 2 + 5 + 0 + 0 + - Suivant - - - - - - affiche la prochaine occurence - - - - - textLabel6 - - - - 50 - 30 - - - - Filtre + La commande choisie sera ajoutée APRES la commande courante - + - - - bOk - - - - 0 - 30 - - - - &Valider - - - Shift+A, Alt+A, Alt+A, Alt+A - - - true - - - true - - - validation de la saisie - - - - - bSup - - - - 0 - 30 - - - - &Supprimer - - - Alt+S - - - true - - - suppression du mot clef - - - - - bHelp - - - - 0 - 30 - - - - &Documentation - - - Alt+D - - - true - - - affichage documentation aster - - - - - Commentaire - - - NoFrame - - - Plain - - - - - @@ -316,12 +426,6 @@ DComment BNextPressed() - - textCommentaire - textChanged() - DComment - TexteCommentaireEntre() - LEFiltre diff --git a/Ui/desError.py b/Ui/desError.py index b9c59795..33f9a048 100644 --- a/Ui/desError.py +++ b/Ui/desError.py @@ -2,8 +2,8 @@ # Form implementation generated from reading ui file 'desError.ui' # -# Created: mar mar 25 10:05:08 2008 -# by: The PyQt User Interface Compiler (pyuic) 3.13 +# Created: Mon Dec 1 12:10:18 2008 +# by: The PyQt User Interface Compiler (pyuic) 3.16 # # WARNING! All changes made in this file will be lost! @@ -23,6 +23,7 @@ class DError(QWidget): DErrorLayout = QGridLayout(self,1,1,11,6,"DErrorLayout") self.textLabel1_3 = QLabel(self,"textLabel1_3") + self.textLabel1_3.setSizePolicy(QSizePolicy(QSizePolicy.Ignored,QSizePolicy.Preferred,0,0,self.textLabel1_3.sizePolicy().hasHeightForWidth())) DErrorLayout.addWidget(self.textLabel1_3,0,0) @@ -40,7 +41,7 @@ class DError(QWidget): self.languageChange() - self.resize(QSize(482,480).expandedTo(self.minimumSizeHint())) + self.resize(QSize(538,480).expandedTo(self.minimumSizeHint())) self.clearWState(Qt.WState_Polished) self.connect(self.bSup,SIGNAL("clicked()"),self.BSupPressed) @@ -50,7 +51,7 @@ class DError(QWidget): self.setCaption(self.__tr("DInactif")) self.textLabel1_3.setText(self.__trUtf8("\x3c\x66\x6f\x6e\x74\x20\x73\x69\x7a\x65\x3d\x22\x2b\x34\x22\x3e\x3c\x70\x20\x61\x6c\x69\x67\x6e\x3d\x22\x63\x65\x6e\x74\x65\x72\x22\x3e\x4c\x65\x20\x6e\x6f\x65\x75\x64\x20\x73\xc3\xa9\x6c\x65\x63\x74\x69\x6f\x6e\x6e\xc3\xa9\x20\x6e\x65\x20\x63\x6f\x72\x72\x65\x73\x70\x6f\x6e\x64\x20\x70\x61\x73\x20\xc3\xa0\x20\x75\x6e\x20\x6f\x62\x6a\x65\x74\x20\x61\x63\x74\x69\x66\x2e\x3c\x2f\x70\x3e\x3c\x2f\x66\x6f\x6e\x74\x3e")) self.bSup.setText(self.__tr("&Supprimer")) - self.bSup.setAccel(self.__tr("Alt+S")) + self.bSup.setAccel(QKeySequence(self.__tr("Alt+S"))) QToolTip.add(self.bSup,self.__tr("suppression du mot clef")) diff --git a/Ui/desError.ui b/Ui/desError.ui index 9dd94bbd..0d524928 100644 --- a/Ui/desError.ui +++ b/Ui/desError.ui @@ -8,7 +8,7 @@ 0 0 - 482 + 538 480 @@ -29,6 +29,14 @@ textLabel1_3 + + + 2 + 5 + 0 + 0 + + <font size="+4"><p align="center">Le noeud sélectionné ne correspond pas à un objet actif.</p></font> diff --git a/Ui/desFormule.py b/Ui/desFormule.py index 6d7b72c2..e000561a 100644 --- a/Ui/desFormule.py +++ b/Ui/desFormule.py @@ -2,8 +2,8 @@ # Form implementation generated from reading ui file 'desFormule.ui' # -# Created: ven mai 16 13:30:38 2008 -# by: The PyQt User Interface Compiler (pyuic) 3.13 +# Created: Mon Dec 1 12:10:18 2008 +# by: The PyQt User Interface Compiler (pyuic) 3.16 # # WARNING! All changes made in this file will be lost! @@ -49,117 +49,110 @@ class DFormule(QWidget): self.TWChoix = QTabWidget(self,"TWChoix") self.Formule = QWidget(self.TWChoix,"Formule") - FormuleLayout = QGridLayout(self.Formule,1,1,11,6,"FormuleLayout") self.textLabel1 = QLabel(self.Formule,"textLabel1") + self.textLabel1.setGeometry(QRect(11,11,242,40)) self.textLabel1.setMinimumSize(QSize(0,0)) - FormuleLayout.addWidget(self.textLabel1,0,0) + LayoutWidget = QWidget(self.Formule,"layout6") + LayoutWidget.setGeometry(QRect(11,103,489,44)) + layout6 = QHBoxLayout(LayoutWidget,11,6,"layout6") - self.textLabel1_3 = QLabel(self.Formule,"textLabel1_3") - - FormuleLayout.addMultiCellWidget(self.textLabel1_3,6,6,0,1) - - layout6 = QHBoxLayout(None,0,6,"layout6") - - self.LENomFormule = QLineEdit(self.Formule,"LENomFormule") + self.LENomFormule = QLineEdit(LayoutWidget,"LENomFormule") self.LENomFormule.setMinimumSize(QSize(0,40)) layout6.addWidget(self.LENomFormule) layout4_2 = QHBoxLayout(None,0,6,"layout4_2") - self.textLabel1_6 = QLabel(self.Formule,"textLabel1_6") + self.textLabel1_6 = QLabel(LayoutWidget,"textLabel1_6") layout4_2.addWidget(self.textLabel1_6) - self.LENomsArgs = QLineEdit(self.Formule,"LENomsArgs") + self.LENomsArgs = QLineEdit(LayoutWidget,"LENomsArgs") self.LENomsArgs.setMinimumSize(QSize(230,40)) layout4_2.addWidget(self.LENomsArgs) - self.textLabel1_6_2 = QLabel(self.Formule,"textLabel1_6_2") + self.textLabel1_6_2 = QLabel(LayoutWidget,"textLabel1_6_2") layout4_2.addWidget(self.textLabel1_6_2) layout6.addLayout(layout4_2) - FormuleLayout.addMultiCellLayout(layout6,2,2,0,1) - self.textLabel2 = QLabel(self.Formule,"textLabel2") - - FormuleLayout.addWidget(self.textLabel2,1,1) - - self.textLabel1_3_2 = QLabel(self.Formule,"textLabel1_3_2") - - FormuleLayout.addMultiCellWidget(self.textLabel1_3_2,7,7,0,1) + self.textLabel2.setGeometry(QRect(259,57,241,40)) self.textLabel2_2 = QLabel(self.Formule,"textLabel2_2") - - FormuleLayout.addMultiCellWidget(self.textLabel2_2,3,3,0,1) + self.textLabel2_2.setGeometry(QRect(11,153,489,39)) self.textLabel1_5 = QLabel(self.Formule,"textLabel1_5") + self.textLabel1_5.setGeometry(QRect(11,198,489,40)) self.textLabel1_5.setMinimumSize(QSize(0,0)) - FormuleLayout.addMultiCellWidget(self.textLabel1_5,4,4,0,1) - self.LECorpsFormule = QLineEdit(self.Formule,"LECorpsFormule") + self.LECorpsFormule.setGeometry(QRect(11,244,489,30)) self.LECorpsFormule.setMinimumSize(QSize(0,30)) - FormuleLayout.addMultiCellWidget(self.LECorpsFormule,5,5,0,1) - self.textLabel1_2 = QLabel(self.Formule,"textLabel1_2") + self.textLabel1_2.setGeometry(QRect(259,11,241,40)) - FormuleLayout.addWidget(self.textLabel1_2,0,1) - self.TWChoix.insertTab(self.Formule,QString("")) - - self.Commande = QWidget(self.TWChoix,"Commande") - CommandeLayout = QGridLayout(self.Commande,1,1,11,6,"CommandeLayout") - - self.textLabel4 = QLabel(self.Commande,"textLabel4") - - CommandeLayout.addMultiCellWidget(self.textLabel4,3,3,0,3) - - self.buttonGroup1 = QButtonGroup(self.Commande,"buttonGroup1") + self.textLabel1_3_2 = QLabel(self.Formule,"textLabel1_3_2") + self.textLabel1_3_2.setGeometry(QRect(11,326,470,40)) + self.textLabel1_3_2.setSizePolicy(QSizePolicy(QSizePolicy.MinimumExpanding,QSizePolicy.Preferred,0,0,self.textLabel1_3_2.sizePolicy().hasHeightForWidth())) - LayoutWidget = QWidget(self.buttonGroup1,"layout1") - LayoutWidget.setGeometry(QRect(20,20,113,48)) - layout1 = QVBoxLayout(LayoutWidget,11,6,"layout1") + self.textLabel1_3 = QLabel(self.Formule,"textLabel1_3") + self.textLabel1_3.setGeometry(QRect(11,280,460,40)) + self.textLabel1_3.setSizePolicy(QSizePolicy(QSizePolicy.Ignored,QSizePolicy.Preferred,0,0,self.textLabel1_3.sizePolicy().hasHeightForWidth())) + self.TWChoix.insertTab(self.Formule,QString.fromLatin1("")) - self.RBalpha = QRadioButton(LayoutWidget,"RBalpha") - self.RBalpha.setChecked(1) - layout1.addWidget(self.RBalpha) + self.Commande = QWidget(self.TWChoix,"Commande") - self.RBGroupe = QRadioButton(LayoutWidget,"RBGroupe") - layout1.addWidget(self.RBGroupe) + self.textLabel6 = QLabel(self.Commande,"textLabel6") + self.textLabel6.setGeometry(QRect(11,59,40,40)) + self.textLabel6.setMinimumSize(QSize(40,0)) - CommandeLayout.addMultiCellWidget(self.buttonGroup1,0,1,3,3) + self.BNext = QToolButton(self.Commande,"BNext") + self.BNext.setGeometry(QRect(249,59,60,40)) + self.BNext.setMinimumSize(QSize(60,40)) + self.BNext.setIconSet(QIconSet()) self.LBNouvCommande = QListBox(self.Commande,"LBNouvCommande") + self.LBNouvCommande.setGeometry(QRect(11,105,490,234)) - CommandeLayout.addMultiCellWidget(self.LBNouvCommande,2,2,0,3) + self.LEFiltre = QLineEdit(self.Commande,"LEFiltre") + self.LEFiltre.setGeometry(QRect(57,59,180,40)) + self.LEFiltre.setMinimumSize(QSize(20,40)) self.textLabel1_4 = QLabel(self.Commande,"textLabel1_4") + self.textLabel1_4.setGeometry(QRect(11,11,260,42)) + self.textLabel1_4.setSizePolicy(QSizePolicy(QSizePolicy.Ignored,QSizePolicy.Ignored,0,0,self.textLabel1_4.sizePolicy().hasHeightForWidth())) - CommandeLayout.addMultiCellWidget(self.textLabel1_4,0,0,0,2) - - self.textLabel6 = QLabel(self.Commande,"textLabel6") - self.textLabel6.setMinimumSize(QSize(40,0)) + self.buttonGroup1 = QButtonGroup(self.Commande,"buttonGroup1") + self.buttonGroup1.setGeometry(QRect(315,11,180,86)) + self.buttonGroup1.setSizePolicy(QSizePolicy(QSizePolicy.MinimumExpanding,QSizePolicy.Preferred,0,0,self.buttonGroup1.sizePolicy().hasHeightForWidth())) + self.buttonGroup1.setColumnLayout(0,Qt.Vertical) + self.buttonGroup1.layout().setSpacing(6) + self.buttonGroup1.layout().setMargin(11) + buttonGroup1Layout = QGridLayout(self.buttonGroup1.layout()) + buttonGroup1Layout.setAlignment(Qt.AlignTop) - CommandeLayout.addWidget(self.textLabel6,1,0) + layout1 = QVBoxLayout(None,0,6,"layout1") - self.LEFiltre = QLineEdit(self.Commande,"LEFiltre") - self.LEFiltre.setMinimumSize(QSize(160,40)) + self.RBalpha = QRadioButton(self.buttonGroup1,"RBalpha") + self.RBalpha.setChecked(1) + layout1.addWidget(self.RBalpha) - CommandeLayout.addWidget(self.LEFiltre,1,1) + self.RBGroupe = QRadioButton(self.buttonGroup1,"RBGroupe") + layout1.addWidget(self.RBGroupe) - self.BNext = QToolButton(self.Commande,"BNext") - self.BNext.setMinimumSize(QSize(60,40)) - self.BNext.setIconSet(QIconSet()) + buttonGroup1Layout.addLayout(layout1,0,0) - CommandeLayout.addWidget(self.BNext,1,2) - self.TWChoix.insertTab(self.Commande,QString("")) + self.textLabel4 = QLabel(self.Commande,"textLabel4") + self.textLabel4.setGeometry(QRect(10,340,480,21)) + self.textLabel4.setSizePolicy(QSizePolicy(QSizePolicy.MinimumExpanding,QSizePolicy.Preferred,0,0,self.textLabel4.sizePolicy().hasHeightForWidth())) + self.TWChoix.insertTab(self.Commande,QString.fromLatin1("")) DFormuleLayout.addWidget(self.TWChoix,0,0) self.languageChange() - self.resize(QSize(529,493).expandedTo(self.minimumSizeHint())) + self.resize(QSize(537,493).expandedTo(self.minimumSizeHint())) self.clearWState(Qt.WState_Polished) self.connect(self.LBNouvCommande,SIGNAL("doubleClicked(QListBoxItem*)"),self.LBNouvCommandeClicked) @@ -190,33 +183,33 @@ class DFormule(QWidget): def languageChange(self): self.setCaption(self.__tr("DMacro")) self.bSup.setText(self.__tr("&Supprimer")) - self.bSup.setAccel(self.__tr("Alt+S")) + self.bSup.setAccel(QKeySequence(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")) + self.bOk.setAccel(QKeySequence(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")) + self.bHelp.setAccel(QKeySequence(self.__tr("Alt+D"))) QToolTip.add(self.bHelp,self.__tr("affichage documentation aster")) self.Commentaire.setText(QString.null) self.textLabel1.setText(self.__tr("

Nom de la formule

")) - self.textLabel1_3.setText(self.__trUtf8("\x52\x65\x74\x6f\x75\x72\x2d\x43\x68\x61\x72\x69\x6f\x74\x20\x70\x65\x72\x6d\x65\x74\x20\x64\x65\x20\x76\xc3\xa9\x72\x69\x66\x69\x65\x72\x20\x71\x75\x65\x20\x6c\x27\x65\x78\x70\x72\x65\x73\x73\x69\x6f\x6e\x20\x65\x73\x74\x20\x76\x61\x6c\x69\x64\x65\x2e")) self.textLabel1_6.setText(self.__tr("

(

")) self.textLabel1_6_2.setText(self.__tr("

)

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

Expression

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

Arguments

")) + self.textLabel1_3_2.setText(self.__trUtf8("\x43\x65\x20\x6e\x27\x65\x73\x74\x20\x71\x75\x27\x61\x70\x72\xc3\xa8\x73\x20\x61\x76\x6f\x69\x72\x20\x61\x70\x70\x75\x79\xc3\xa9\x20\x73\x75\x72\x20\x6c\x65\x20\x62\x6f\x75\x74\x6f\x6e\x20\x56\x61\x6c\x69\x64\x65\x72\x20\x71\x75\x65\x20\x6c\x65\x73\x20\x6e\x6f\x75\x76\x65\x6c\x6c\x65\x73\x0a\x76\x61\x6c\x65\x75\x72\x73\x20\x73\x65\x72\x6f\x6e\x74\x20\x65\x66\x66\x65\x63\x74\x69\x76\x65\x6d\x65\x6e\x74\x20\x70\x72\x69\x73\x65\x73\x20\x65\x6e\x20\x63\x6f\x6d\x70\x74\x65")) + self.textLabel1_3.setText(self.__trUtf8("\x52\x65\x74\x6f\x75\x72\x2d\x43\x68\x61\x72\x69\x6f\x74\x20\x70\x65\x72\x6d\x65\x74\x20\x64\x65\x20\x76\xc3\xa9\x72\x69\x66\x69\x65\x72\x20\x71\x75\x65\x20\x6c\x27\x65\x78\x70\x72\x65\x73\x73\x69\x6f\x6e\x20\x65\x73\x74\x20\x76\x61\x6c\x69\x64\x65\x2e")) self.TWChoix.changeTab(self.Formule,self.__trUtf8("\x44\xc3\xa9\x66\x69\x6e\x69\x74\x69\x6f\x6e\x20\x46\x6f\x72\x6d\x75\x6c\x65")) - self.textLabel4.setText(self.__trUtf8("\x3c\x70\x20\x61\x6c\x69\x67\x6e\x3d\x22\x6c\x65\x66\x74\x22\x3e\x4c\x61\x20\x63\x6f\x6d\x6d\x61\x6e\x64\x65\x20\x63\x68\x6f\x69\x73\x69\x65\x20\x73\x65\x72\x61\x20\x61\x6a\x6f\x75\x74\xc3\xa9\x65\x20\x41\x50\x52\x45\x53\x20\x6c\x61\x20\x63\x6f\x6d\x6d\x61\x6e\x64\x65\x20\x63\x6f\x75\x72\x61\x6e\x74\x65\x3c\x2f\x70\x3e")) - self.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.textLabel6.setText(self.__tr("Filtre")) self.BNext.setText(self.__tr("Suivant")) QToolTip.add(self.BNext,self.__tr("affiche la prochaine occurence")) + self.textLabel1_4.setText(self.__tr("Commandes :")) + self.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.textLabel4.setText(self.__trUtf8("\x3c\x70\x20\x61\x6c\x69\x67\x6e\x3d\x22\x6c\x65\x66\x74\x22\x3e\x4c\x61\x20\x63\x6f\x6d\x6d\x61\x6e\x64\x65\x20\x63\x68\x6f\x69\x73\x69\x65\x20\x73\x65\x72\x61\x20\x61\x6a\x6f\x75\x74\xc3\xa9\x65\x20\x41\x50\x52\x45\x53\x20\x6c\x61\x20\x63\x6f\x6d\x6d\x61\x6e\x64\x65\x20\x63\x6f\x75\x72\x61\x6e\x74\x65\x3c\x2f\x70\x3e")) self.TWChoix.changeTab(self.Commande,self.__tr("Nouvelle Commande")) diff --git a/Ui/desFormule.ui b/Ui/desFormule.ui index 37d5e0a2..e9041bf1 100644 --- a/Ui/desFormule.ui +++ b/Ui/desFormule.ui @@ -8,7 +8,7 @@ 0 0 - 529 + 537 493 @@ -126,150 +126,233 @@ Définition Formule - + - unnamed + textLabel1 - - - textLabel1 - - - - 0 - 0 - - - - <h3><p align="center"><u><b>Nom de la formule</b></u></p></h3> - - - - - textLabel1_3 - - - Retour-Chariot permet de vérifier que l'expression est valide. - - - + + + 11 + 11 + 242 + 40 + + + + + 0 + 0 + + + + <h3><p align="center"><u><b>Nom de la formule</b></u></p></h3> + + + + + layout6 + + + + 11 + 103 + 489 + 44 + + + - layout6 + unnamed - + - unnamed + LENomFormule - - - LENomFormule - - - - 0 - 40 - - - - + + + 0 + 40 + + + + + + layout4 + + - layout4 + unnamed - + - unnamed + textLabel1_6 - - - textLabel1_6 - - - <h1><b>(</b></h1> - - - - - LENomsArgs - - - - 230 - 40 - - - - - - textLabel1_6_2 - - - <h1><b>)</b></h1> - - - - - - - - - textLabel2 - - - variables séparées par des "," + + <h1><b>(</b></h1> + + + + + LENomsArgs + + + + 230 + 40 + + + + + + textLabel1_6_2 + + + <h1><b>)</b></h1> + + + + + + + + + textLabel2 + + + + 259 + 57 + 241 + 40 + + + + variables séparées par des "," par ex. : x,y,z - - - - - textLabel1_3_2 - - - Ce n'est qu'après avoir appuyé sur le bouton Valider que les nouvelles + + + + + textLabel2_2 + + + + 11 + 153 + 489 + 39 + + + + <font size="+4" face="Helvetica"><b>=</b></font> + + + + + textLabel1_5 + + + + 11 + 198 + 489 + 40 + + + + + 0 + 0 + + + + <h3><p align="center"><u><b>Expression</b></u></p></h3> + + + + + LECorpsFormule + + + + 11 + 244 + 489 + 30 + + + + + 0 + 30 + + + + + + textLabel1_2 + + + + 259 + 11 + 241 + 40 + + + + <h3><p align="center"><u><b>Arguments</b></u></p></h3> + + + + + textLabel1_3_2 + + + + 11 + 326 + 470 + 40 + + + + + 3 + 5 + 0 + 0 + + + + Ce n'est qu'après avoir appuyé sur le bouton Valider que les nouvelles valeurs seront effectivement prises en compte - - - - - textLabel2_2 - - - <font size="+4" face="Helvetica"><b>=</b></font> - - - - - textLabel1_5 - - - - 0 - 0 - - - - <h3><p align="center"><u><b>Expression</b></u></p></h3> - - - - - LECorpsFormule - - - - 0 - 30 - - - - - - textLabel1_2 - - - <h3><p align="center"><u><b>Arguments</b></u></p></h3> - - - + + + + + textLabel1_3 + + + + 11 + 280 + 460 + 40 + + + + + 2 + 5 + 0 + 0 + + + + Retour-Chariot permet de vérifier que l'expression est valide. + + @@ -278,37 +361,143 @@ valeurs seront effectivement prises en compte Nouvelle Commande - + - unnamed + textLabel6 - - - textLabel4 - - - <p align="left">La commande choisie sera ajoutée APRES la commande courante</p> - - - + + + 11 + 59 + 40 + 40 + + + + + 40 + 0 + + + + Filtre + + + + + BNext + + + + 249 + 59 + 60 + 40 + + + + + 60 + 40 + + + + Suivant + + + + + + affiche la prochaine occurence + + + + + LBNouvCommande + + + + 11 + 105 + 490 + 234 + + + + + + LEFiltre + + + + 57 + 59 + 180 + 40 + + + + + 20 + 40 + + + + + + textLabel1_4 + + + + 11 + 11 + 260 + 42 + + + + + 2 + 2 + 0 + 0 + + + + <b><u>Commandes :</u></b> + + + + + buttonGroup1 + + + + 315 + 11 + 180 + 86 + + + + + 3 + 5 + 0 + 0 + + + + Affichage + + - buttonGroup1 - - - Affichage + unnamed - + layout1 - - - 20 - 20 - 113 - 48 - - unnamed @@ -334,66 +523,32 @@ valeurs seront effectivement prises en compte - - - - LBNouvCommande - - - - - textLabel1_4 - - - <b><u>Commandes :</u></b> - - - - - textLabel6 - - - - 40 - 0 - - - - Filtre - - - - - LEFiltre - - - - 160 - 40 - - - - - - BNext - - - - 60 - 40 - - - - Suivant - - - - - - affiche la prochaine occurence - - - + + + + + textLabel4 + + + + 10 + 340 + 480 + 21 + + + + + 3 + 5 + 0 + 0 + + + + <p align="left">La commande choisie sera ajoutée APRES la commande courante</p> + + diff --git a/Ui/desInactif.py b/Ui/desInactif.py index 39e7cce7..2cebe337 100644 --- a/Ui/desInactif.py +++ b/Ui/desInactif.py @@ -2,8 +2,8 @@ # Form implementation generated from reading ui file 'desInactif.ui' # -# Created: mar mar 25 10:05:08 2008 -# by: The PyQt User Interface Compiler (pyuic) 3.13 +# Created: Mon Dec 1 12:10:18 2008 +# by: The PyQt User Interface Compiler (pyuic) 3.16 # # WARNING! All changes made in this file will be lost! @@ -23,10 +23,12 @@ class DInactif(QWidget): DInactifLayout = QGridLayout(self,1,1,11,6,"DInactifLayout") self.textLabel1_3 = QLabel(self,"textLabel1_3") + self.textLabel1_3.setSizePolicy(QSizePolicy(QSizePolicy.Ignored,QSizePolicy.Preferred,0,0,self.textLabel1_3.sizePolicy().hasHeightForWidth())) DInactifLayout.addWidget(self.textLabel1_3,0,0) self.textLabel1 = QLabel(self,"textLabel1") + self.textLabel1.setSizePolicy(QSizePolicy(QSizePolicy.Ignored,QSizePolicy.Preferred,0,0,self.textLabel1.sizePolicy().hasHeightForWidth())) DInactifLayout.addWidget(self.textLabel1,1,0) @@ -44,7 +46,7 @@ class DInactif(QWidget): self.languageChange() - self.resize(QSize(482,480).expandedTo(self.minimumSizeHint())) + self.resize(QSize(635,480).expandedTo(self.minimumSizeHint())) self.clearWState(Qt.WState_Polished) self.connect(self.bSup,SIGNAL("clicked()"),self.BSupPressed) @@ -55,7 +57,7 @@ class DInactif(QWidget): self.textLabel1_3.setText(self.__trUtf8("\x3c\x66\x6f\x6e\x74\x20\x73\x69\x7a\x65\x3d\x22\x2b\x32\x22\x3e\x3c\x70\x20\x61\x6c\x69\x67\x6e\x3d\x22\x63\x65\x6e\x74\x65\x72\x22\x3e\x4c\x65\x20\x6e\x6f\x65\x75\x64\x20\x73\xc3\xa9\x6c\x65\x63\x74\x69\x6f\x6e\x6e\xc3\xa9\x20\x6e\x65\x20\x63\x6f\x72\x72\x65\x73\x70\x6f\x6e\x64\x20\x70\x61\x73\x20\xc3\xa0\x20\x75\x6e\x20\x6f\x62\x6a\x65\x74\x20\x61\x63\x74\x69\x66\x2e\x3c\x2f\x70\x3e\x3c\x2f\x66\x6f\x6e\x74\x3e")) self.textLabel1.setText(self.__trUtf8("\x3c\x66\x6f\x6e\x74\x20\x73\x69\x7a\x65\x3d\x22\x2b\x32\x22\x3e\x3c\x70\x20\x61\x6c\x69\x67\x6e\x3d\x22\x63\x65\x6e\x74\x65\x72\x22\x3e\x0a\x53\x65\x75\x6c\x65\x73\x20\x6c\x65\x73\x20\x63\x6f\x6d\x6d\x61\x6e\x64\x65\x73\x20\x70\x6c\x61\x63\xc3\xa9\x65\x73\x20\x65\x6e\x74\x72\x65\x20\x3a\x0a\x0a\x44\x45\x42\x55\x54\x20\x2f\x20\x46\x49\x4e\x0a\x0a\x73\x6f\x6e\x74\x20\x61\x63\x74\x69\x76\x65\x73\x0a\x3c\x2f\x70\x3e\x3c\x2f\x66\x6f\x6e\x74\x3e")) self.bSup.setText(self.__tr("&Supprimer")) - self.bSup.setAccel(self.__tr("Alt+S")) + self.bSup.setAccel(QKeySequence(self.__tr("Alt+S"))) QToolTip.add(self.bSup,self.__tr("suppression du mot clef")) diff --git a/Ui/desInactif.ui b/Ui/desInactif.ui index 1b8f7f32..e9731e9a 100644 --- a/Ui/desInactif.ui +++ b/Ui/desInactif.ui @@ -8,7 +8,7 @@ 0 0 - 482 + 635 480 @@ -29,6 +29,14 @@ textLabel1_3 + + + 2 + 5 + 0 + 0 + + <font size="+2"><p align="center">Le noeud sélectionné ne correspond pas à un objet actif.</p></font> @@ -37,6 +45,14 @@ textLabel1 + + + 2 + 5 + 0 + 0 + + <font size="+2"><p align="center"> Seules les commandes placées entre : diff --git a/Ui/desInclude.py b/Ui/desInclude.py index dfe0d625..8e1fd103 100644 --- a/Ui/desInclude.py +++ b/Ui/desInclude.py @@ -2,8 +2,8 @@ # Form implementation generated from reading ui file 'desInclude.ui' # -# Created: ven mai 16 13:30:38 2008 -# by: The PyQt User Interface Compiler (pyuic) 3.13 +# Created: Mon Dec 1 12:10:18 2008 +# by: The PyQt User Interface Compiler (pyuic) 3.16 # # WARNING! All changes made in this file will be lost! @@ -20,63 +20,71 @@ class DInc1(QWidget): self.setMinimumSize(QSize(505,0)) - DInc1Layout = QGridLayout(self,1,1,11,6,"DInc1Layout") - self.bOk = QPushButton(self,"bOk") - self.bOk.setMinimumSize(QSize(0,30)) - self.bOk.setAutoDefault(1) - self.bOk.setDefault(1) - - DInc1Layout.addWidget(self.bOk,2,1) + LayoutWidget = QWidget(self,"layout1") + LayoutWidget.setGeometry(QRect(11,447,550,55)) + layout1 = QGridLayout(LayoutWidget,1,1,11,6,"layout1") - self.bHelp = QPushButton(self,"bHelp") - self.bHelp.setMinimumSize(QSize(0,30)) - self.bHelp.setAutoDefault(1) + self.Commentaire = QLabel(LayoutWidget,"Commentaire") - DInc1Layout.addWidget(self.bHelp,2,2) + layout1.addMultiCellWidget(self.Commentaire,0,0,0,2) - self.bSup = QPushButton(self,"bSup") + self.bSup = QPushButton(LayoutWidget,"bSup") self.bSup.setMinimumSize(QSize(0,30)) self.bSup.setAutoDefault(1) - DInc1Layout.addWidget(self.bSup,2,0) + layout1.addWidget(self.bSup,1,0) + + self.bHelp = QPushButton(LayoutWidget,"bHelp") + self.bHelp.setMinimumSize(QSize(0,30)) + self.bHelp.setAutoDefault(1) + + layout1.addWidget(self.bHelp,1,2) - self.Commentaire = QLabel(self,"Commentaire") + self.bOk = QPushButton(LayoutWidget,"bOk") + self.bOk.setMinimumSize(QSize(0,30)) + self.bOk.setAutoDefault(1) + self.bOk.setDefault(1) - DInc1Layout.addMultiCellWidget(self.Commentaire,1,1,0,2) + layout1.addWidget(self.bOk,1,1) self.TWChoix = QTabWidget(self,"TWChoix") + self.TWChoix.setGeometry(QRect(10,10,550,430)) self.MotClef = QWidget(self.TWChoix,"MotClef") - MotClefLayout = QGridLayout(self.MotClef,1,1,11,6,"MotClefLayout") - self.LBMCPermis = QListBox(self.MotClef,"LBMCPermis") - self.LBMCPermis.setMinimumSize(QSize(0,0)) + LayoutWidget_2 = QWidget(self.MotClef,"layout2") + LayoutWidget_2.setGeometry(QRect(11,11,520,380)) + layout2 = QGridLayout(LayoutWidget_2,1,1,11,6,"layout2") - MotClefLayout.addWidget(self.LBMCPermis,1,0) + self.textLabel1_2 = QLabel(LayoutWidget_2,"textLabel1_2") - self.textLabel1 = QLabel(self.MotClef,"textLabel1") + layout2.addWidget(self.textLabel1_2,0,1) + + self.textLabel1 = QLabel(LayoutWidget_2,"textLabel1") self.textLabel1.setMinimumSize(QSize(0,0)) - MotClefLayout.addWidget(self.textLabel1,0,0) + layout2.addWidget(self.textLabel1,0,0) - self.LBRegles = QListBox(self.MotClef,"LBRegles") + self.LBMCPermis = QListBox(LayoutWidget_2,"LBMCPermis") + self.LBMCPermis.setMinimumSize(QSize(0,0)) - MotClefLayout.addWidget(self.LBRegles,1,1) + layout2.addWidget(self.LBMCPermis,1,0) - self.textLabel1_2 = QLabel(self.MotClef,"textLabel1_2") + self.LBRegles = QListBox(LayoutWidget_2,"LBRegles") + self.LBRegles.setSizePolicy(QSizePolicy(QSizePolicy.MinimumExpanding,QSizePolicy.MinimumExpanding,0,0,self.LBRegles.sizePolicy().hasHeightForWidth())) - MotClefLayout.addWidget(self.textLabel1_2,0,1) - self.TWChoix.insertTab(self.MotClef,QString("")) + layout2.addWidget(self.LBRegles,1,1) + self.TWChoix.insertTab(self.MotClef,QString.fromLatin1("")) self.Commande = QWidget(self.TWChoix,"Commande") - CommandeLayout = QGridLayout(self.Commande,1,1,11,6,"CommandeLayout") self.LBNouvCommande = QListBox(self.Commande,"LBNouvCommande") - - CommandeLayout.addMultiCellWidget(self.LBNouvCommande,2,2,0,3) + self.LBNouvCommande.setGeometry(QRect(11,97,524,266)) + self.LBNouvCommande.setSizePolicy(QSizePolicy(QSizePolicy.MinimumExpanding,QSizePolicy.Expanding,0,0,self.LBNouvCommande.sizePolicy().hasHeightForWidth())) self.buttonGroup1 = QButtonGroup(self.Commande,"buttonGroup1") + self.buttonGroup1.setGeometry(QRect(375,11,160,80)) self.RBGroupe = QRadioButton(self.buttonGroup1,"RBGroupe") self.RBGroupe.setGeometry(QRect(20,40,101,20)) @@ -85,65 +93,60 @@ class DInc1(QWidget): self.RBalpha.setGeometry(QRect(20,20,120,20)) self.RBalpha.setChecked(1) - CommandeLayout.addMultiCellWidget(self.buttonGroup1,0,1,3,3) - self.textLabel4 = QLabel(self.Commande,"textLabel4") - - CommandeLayout.addMultiCellWidget(self.textLabel4,3,3,0,3) - - self.textLabel1_4 = QLabel(self.Commande,"textLabel1_4") - - CommandeLayout.addMultiCellWidget(self.textLabel1_4,0,0,0,2) - - self.textLabel6 = QLabel(self.Commande,"textLabel6") - self.textLabel6.setMinimumSize(QSize(40,0)) - - CommandeLayout.addWidget(self.textLabel6,1,0) - - self.LEFiltre = QLineEdit(self.Commande,"LEFiltre") - self.LEFiltre.setMinimumSize(QSize(160,40)) - - CommandeLayout.addWidget(self.LEFiltre,1,1) + self.textLabel4.setGeometry(QRect(11,369,524,17)) + self.textLabel4.setSizePolicy(QSizePolicy(QSizePolicy.Ignored,QSizePolicy.Preferred,0,0,self.textLabel4.sizePolicy().hasHeightForWidth())) self.BNext = QToolButton(self.Commande,"BNext") + self.BNext.setGeometry(QRect(309,51,60,40)) self.BNext.setMinimumSize(QSize(60,0)) self.BNext.setIconSet(QIconSet()) - CommandeLayout.addWidget(self.BNext,1,2) - self.TWChoix.insertTab(self.Commande,QString("")) + self.LEFiltre = QLineEdit(self.Commande,"LEFiltre") + self.LEFiltre.setGeometry(QRect(57,51,240,40)) + self.LEFiltre.setSizePolicy(QSizePolicy(QSizePolicy.MinimumExpanding,QSizePolicy.Fixed,0,0,self.LEFiltre.sizePolicy().hasHeightForWidth())) + self.LEFiltre.setMinimumSize(QSize(20,40)) - self.TabPage = QWidget(self.TWChoix,"TabPage") + self.textLabel6 = QLabel(self.Commande,"textLabel6") + self.textLabel6.setGeometry(QRect(11,51,40,40)) + self.textLabel6.setMinimumSize(QSize(40,0)) - self.textLabel1_3 = QLabel(self.TabPage,"textLabel1_3") - self.textLabel1_3.setGeometry(QRect(30,40,440,41)) + self.textLabel1_4 = QLabel(self.Commande,"textLabel1_4") + self.textLabel1_4.setGeometry(QRect(11,11,358,34)) + self.TWChoix.insertTab(self.Commande,QString.fromLatin1("")) - self.LENomFichier = QLineEdit(self.TabPage,"LENomFichier") - self.LENomFichier.setGeometry(QRect(18,117,450,40)) - self.LENomFichier.setSizePolicy(QSizePolicy(0,0,0,0,self.LENomFichier.sizePolicy().hasHeightForWidth())) - self.LENomFichier.setMinimumSize(QSize(450,40)) + self.TabPage = QWidget(self.TWChoix,"TabPage") self.BBrowse = QPushButton(self.TabPage,"BBrowse") self.BBrowse.setGeometry(QRect(288,306,161,41)) - self.BBrowse.setSizePolicy(QSizePolicy(0,0,0,0,self.BBrowse.sizePolicy().hasHeightForWidth())) + self.BBrowse.setSizePolicy(QSizePolicy(QSizePolicy.Fixed,QSizePolicy.Fixed,0,0,self.BBrowse.sizePolicy().hasHeightForWidth())) self.BChangeFile = QPushButton(self.TabPage,"BChangeFile") self.BChangeFile.setGeometry(QRect(290,350,161,41)) - self.BChangeFile.setSizePolicy(QSizePolicy(0,0,0,0,self.BChangeFile.sizePolicy().hasHeightForWidth())) - self.TWChoix.insertTab(self.TabPage,QString("")) + self.BChangeFile.setSizePolicy(QSizePolicy(QSizePolicy.Fixed,QSizePolicy.Fixed,0,0,self.BChangeFile.sizePolicy().hasHeightForWidth())) + + self.textLabel1_3 = QLabel(self.TabPage,"textLabel1_3") + self.textLabel1_3.setGeometry(QRect(30,40,440,41)) + self.textLabel1_3.setSizePolicy(QSizePolicy(QSizePolicy.Preferred,QSizePolicy.Ignored,0,0,self.textLabel1_3.sizePolicy().hasHeightForWidth())) + + self.LENomFichier = QLineEdit(self.TabPage,"LENomFichier") + self.LENomFichier.setGeometry(QRect(18,117,500,40)) + self.LENomFichier.setSizePolicy(QSizePolicy(QSizePolicy.MinimumExpanding,QSizePolicy.Fixed,0,0,self.LENomFichier.sizePolicy().hasHeightForWidth())) + self.LENomFichier.setMinimumSize(QSize(40,40)) + self.TWChoix.insertTab(self.TabPage,QString.fromLatin1("")) self.TabPage_2 = QWidget(self.TWChoix,"TabPage_2") TabPageLayout = QGridLayout(self.TabPage_2,1,1,11,6,"TabPageLayout") self.textLabel1_5 = QLabel(self.TabPage_2,"textLabel1_5") + self.textLabel1_5.setSizePolicy(QSizePolicy(QSizePolicy.MinimumExpanding,QSizePolicy.Preferred,0,0,self.textLabel1_5.sizePolicy().hasHeightForWidth())) TabPageLayout.addWidget(self.textLabel1_5,0,0) - self.TWChoix.insertTab(self.TabPage_2,QString("")) - - DInc1Layout.addMultiCellWidget(self.TWChoix,0,0,0,2) + self.TWChoix.insertTab(self.TabPage_2,QString.fromLatin1("")) self.languageChange() - self.resize(QSize(521,511).expandedTo(self.minimumSizeHint())) + self.resize(QSize(570,511).expandedTo(self.minimumSizeHint())) self.clearWState(Qt.WState_Polished) self.connect(self.LBNouvCommande,SIGNAL("doubleClicked(QListBoxItem*)"),self.LBNouvCommandeClicked) @@ -173,31 +176,31 @@ class DInc1(QWidget): def languageChange(self): self.setCaption(self.__tr("DMacro")) - 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.bSup.setText(self.__tr("&Supprimer")) - self.bSup.setAccel(self.__tr("Alt+S")) + self.bSup.setAccel(QKeySequence(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.bHelp.setText(self.__tr("&Documentation")) + self.bHelp.setAccel(QKeySequence(self.__tr("Alt+D"))) + QToolTip.add(self.bHelp,self.__tr("affichage documentation aster")) + self.bOk.setText(self.__tr("&Valider")) + self.bOk.setAccel(QKeySequence(self.__tr("Shift+A, Alt+A, Alt+A, Alt+A"))) + QToolTip.add(self.bOk,self.__tr("validation de la saisie")) self.textLabel1_2.setText(self.__trUtf8("\x3c\x68\x33\x3e\x3c\x70\x20\x61\x6c\x69\x67\x6e\x3d\x22\x63\x65\x6e\x74\x65\x72\x22\x3e\x3c\x75\x3e\x3c\x62\x3e\x52\xc3\xa9\x67\x6c\x65\x73\x3c\x2f\x62\x3e\x3c\x2f\x75\x3e\x3c\x2f\x70\x3e\x3c\x2f\x68\x33\x3e")) + self.textLabel1.setText(self.__tr("

Mots Clefs Permis

")) self.TWChoix.changeTab(self.MotClef,self.__tr("Ajouter Mot-Clef")) self.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.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.textLabel1_4.setText(self.__tr("Commandes :")) - self.textLabel6.setText(self.__tr("Filtre")) self.BNext.setText(self.__tr("Suivant")) QToolTip.add(self.BNext,self.__tr("affiche la prochaine occurence")) + self.textLabel6.setText(self.__tr("Filtre")) + self.textLabel1_4.setText(self.__tr("Commandes :")) self.TWChoix.changeTab(self.Commande,self.__tr("Nouvelle Commande")) - self.textLabel1_3.setText(self.__tr("La commande INCLUDE requiert un nom de Fichier :")) self.BBrowse.setText(self.__tr("Edit")) self.BChangeFile.setText(self.__tr("Autre Fichier")) + self.textLabel1_3.setText(self.__tr("La commande INCLUDE requiert un nom de Fichier :")) self.TWChoix.changeTab(self.TabPage,self.__tr("Fichier Include")) self.textLabel1_5.setText(self.__trUtf8("\x3c\x66\x6f\x6e\x74\x20\x73\x69\x7a\x65\x3d\x22\x2b\x31\x22\x3e\x3c\x70\x20\x61\x6c\x69\x67\x6e\x3d\x22\x63\x65\x6e\x74\x65\x72\x22\x3e\x4c\x61\x20\x63\x6f\x6d\x6d\x61\x6e\x64\x65\x20\x49\x4e\x43\x4c\x55\x44\x45\x20\x6e\x27\x61\x20\x70\x61\x73\x20\x64\x65\x20\x66\x69\x63\x68\x69\x65\x72\x20\x61\x73\x73\x6f\x63\x69\xc3\xa9\x2e\x0a\x49\x6c\x20\x66\x61\x75\x74\x20\x64\x27\x61\x62\x6f\x72\x64\x20\x63\x68\x6f\x69\x73\x69\x72\x20\x75\x6e\x20\x6e\x75\x6d\xc3\xa9\x72\x6f\x20\x64\x27\x75\x6e\x69\x74\xc3\xa9\x3c\x2f\x70\x3e\x3c\x2f\x66\x6f\x6e\x74\x3e")) self.TWChoix.changeTab(self.TabPage_2,self.__tr("Fichier Inc")) diff --git a/Ui/desInclude.ui b/Ui/desInclude.ui index 9edfc3e7..13a459b4 100644 --- a/Ui/desInclude.ui +++ b/Ui/desInclude.ui @@ -8,7 +8,7 @@ 0 0 - 521 + 570 511 @@ -21,114 +21,145 @@ DMacro - + - unnamed + layout1 - - - 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 - - - - - bSup - - - - 0 - 30 - - - - &Supprimer - - - Alt+S - - - true - - - suppression du mot clef - - - + + + 11 + 447 + 550 + 55 + + + - Commentaire + unnamed - - - - - + + + Commentaire + + + + + + + + bSup + + + + 0 + 30 + + + + &Supprimer + + + Alt+S + + + true + + + suppression du mot clef + + + + + bHelp + + + + 0 + 30 + + + + &Documentation + + + Alt+D + + + true + + + affichage documentation aster + + + + + bOk + + + + 0 + 30 + + + + &Valider + + + Shift+A, Alt+A, Alt+A, Alt+A + + + true + + + true + + + validation de la saisie + + + + + + + TWChoix + + + + 10 + 10 + 550 + 430 + + + - TWChoix + MotClef - + + Ajouter Mot-Clef + + - MotClef + layout2 + + + + 11 + 11 + 520 + 380 + - - Ajouter Mot-Clef - unnamed - + - LBMCPermis + textLabel1_2 - - - 0 - 0 - + + <h3><p align="center"><u><b>Régles</b></u></p></h3> @@ -145,266 +176,368 @@ <h3><p align="center"><u><b>Mots Clefs Permis</b></u></p></h3> - - - LBRegles - - - - - textLabel1_2 - - - <h3><p align="center"><u><b>Régles</b></u></p></h3> - - - - - - - Commande - - - Nouvelle Commande - - - - unnamed - - - - LBNouvCommande - - - - - buttonGroup1 - - - Affichage - - - - RBGroupe - - - - 20 - 40 - 101 - 20 - - - - par groupe - - - - - RBalpha - - - - 20 - 20 - 120 - 20 - - - - alphabétique - - - true - - - - - - textLabel4 - - - La commande choisie sera ajoutée APRES la commande courante - - - - - textLabel1_4 - - - <b><u>Commandes :</u></b> - - - + - textLabel6 + LBMCPermis - 40 + 0 0 - - Filtre - - - - LEFiltre - - - - 160 - 40 - - - - + - BNext - - - - 60 - 0 - - - - Suivant - - - + LBRegles - - affiche la prochaine occurence + + + 3 + 3 + 0 + 0 + - + + + + Commande + + + Nouvelle Commande + + + + LBNouvCommande + + + + 11 + 97 + 524 + 266 + + + + + 3 + 7 + 0 + 0 + + + + - TabPage + buttonGroup1 - - Fichier Include - - + + + 375 + 11 + 160 + 80 + + + + Affichage + + - textLabel1_3 + RBGroupe - 30 + 20 40 - 440 - 41 + 101 + 20 - <font size="+1">La commande INCLUDE requiert un nom de Fichier :</font> - - - - - LENomFichier - - - - 18 - 117 - 450 - 40 - - - - - 0 - 0 - 0 - 0 - - - - - 450 - 40 - + par groupe - + - BBrowse + RBalpha - 288 - 306 - 161 - 41 + 20 + 20 + 120 + 20 - - - 0 - 0 - 0 - 0 - - - Edit + alphabétique + + + true - + + + + textLabel4 + + + + 11 + 369 + 524 + 17 + + + + + 2 + 5 + 0 + 0 + + + + La commande choisie sera ajoutée APRES la commande courante + + + + + BNext + + + + 309 + 51 + 60 + 40 + + + + + 60 + 0 + + + + Suivant + + + + + + affiche la prochaine occurence + + + + + LEFiltre + + + + 57 + 51 + 240 + 40 + + + + + 3 + 0 + 0 + 0 + + + + + 20 + 40 + + + + + + textLabel6 + + + + 11 + 51 + 40 + 40 + + + + + 40 + 0 + + + + Filtre + + + + + textLabel1_4 + + + + 11 + 11 + 358 + 34 + + + + <b><u>Commandes :</u></b> + + + + + + TabPage + + + Fichier Include + + + + BBrowse + + + + 288 + 306 + 161 + 41 + + + + + 0 + 0 + 0 + 0 + + + + Edit + + + + + BChangeFile + + + + 290 + 350 + 161 + 41 + + + + + 0 + 0 + 0 + 0 + + + + Autre Fichier + + + + + textLabel1_3 + + + + 30 + 40 + 440 + 41 + + + + + 5 + 2 + 0 + 0 + + + + <font size="+1">La commande INCLUDE requiert un nom de Fichier :</font> + + + + + LENomFichier + + + + 18 + 117 + 500 + 40 + + + + + 3 + 0 + 0 + 0 + + + + + 40 + 40 + + + + + + + TabPage + + + Fichier Inc + + + + unnamed + + - BChangeFile - - - - 290 - 350 - 161 - 41 - + textLabel1_5 - 0 - 0 + 3 + 5 0 0 - Autre Fichier + <font size="+1"><p align="center">La commande INCLUDE n'a pas de fichier associé. +Il faut d'abord choisir un numéro d'unité</p></font> - - - - TabPage - - - Fichier Inc - - - - unnamed - - - - textLabel1_5 - - - <font size="+1"><p align="center">La commande INCLUDE n'a pas de fichier associé. -Il faut d'abord choisir un numéro d'unité</p></font> - - - - + - + diff --git a/Ui/desListeParam.py b/Ui/desListeParam.py index d8326749..3d244d9f 100644 --- a/Ui/desListeParam.py +++ b/Ui/desListeParam.py @@ -2,8 +2,8 @@ # Form implementation generated from reading ui file 'desListeParam.ui' # -# Created: mar mar 25 10:05:08 2008 -# by: The PyQt User Interface Compiler (pyuic) 3.13 +# Created: Mon Dec 1 10:32:43 2008 +# by: The PyQt User Interface Compiler (pyuic) 3.16 # # WARNING! All changes made in this file will be lost! @@ -22,6 +22,7 @@ class DLisParam(QWidget): DLisParamLayout = QGridLayout(self,1,1,11,6,"DLisParamLayout") self.LBParam = QListBox(self,"LBParam") + self.LBParam.setSelectionMode(QListBox.Single) DLisParamLayout.addWidget(self.LBParam,0,0) diff --git a/Ui/desMCFact.py b/Ui/desMCFact.py index 50c7de55..9aba929c 100644 --- a/Ui/desMCFact.py +++ b/Ui/desMCFact.py @@ -2,8 +2,8 @@ # Form implementation generated from reading ui file 'desMCFact.ui' # -# Created: mar mar 25 10:05:08 2008 -# by: The PyQt User Interface Compiler (pyuic) 3.13 +# Created: Mon Dec 1 12:10:19 2008 +# by: The PyQt User Interface Compiler (pyuic) 3.16 # # WARNING! All changes made in this file will be lost! @@ -23,32 +23,40 @@ class DMCFact(QWidget): DMCFactLayout = QGridLayout(self,1,1,11,6,"DMCFactLayout") self.TWChoix = QTabWidget(self,"TWChoix") + self.TWChoix.setSizePolicy(QSizePolicy(QSizePolicy.MinimumExpanding,QSizePolicy.Expanding,0,0,self.TWChoix.sizePolicy().hasHeightForWidth())) self.MotClef = QWidget(self.TWChoix,"MotClef") - MotClefLayout = QGridLayout(self.MotClef,1,1,11,6,"MotClefLayout") - self.textLabel1 = QLabel(self.MotClef,"textLabel1") - self.textLabel1.setMinimumSize(QSize(0,0)) - - MotClefLayout.addWidget(self.textLabel1,0,0) + LayoutWidget = QWidget(self.MotClef,"layout1") + LayoutWidget.setGeometry(QRect(10,40,550,330)) + layout1 = QHBoxLayout(LayoutWidget,11,6,"layout1") - self.LBMCPermis = QListBox(self.MotClef,"LBMCPermis") + self.LBMCPermis = QListBox(LayoutWidget,"LBMCPermis") + self.LBMCPermis.setSizePolicy(QSizePolicy(QSizePolicy.MinimumExpanding,QSizePolicy.Expanding,0,0,self.LBMCPermis.sizePolicy().hasHeightForWidth())) self.LBMCPermis.setMinimumSize(QSize(0,0)) + layout1.addWidget(self.LBMCPermis) - MotClefLayout.addWidget(self.LBMCPermis,1,0) + self.LBRegles = QListBox(LayoutWidget,"LBRegles") + layout1.addWidget(self.LBRegles) - self.LBRegles = QListBox(self.MotClef,"LBRegles") + LayoutWidget_2 = QWidget(self.MotClef,"layout2") + LayoutWidget_2.setGeometry(QRect(11,-4,560,40)) + layout2 = QHBoxLayout(LayoutWidget_2,11,6,"layout2") - MotClefLayout.addWidget(self.LBRegles,1,1) - - self.textLabel1_2 = QLabel(self.MotClef,"textLabel1_2") + self.textLabel1 = QLabel(LayoutWidget_2,"textLabel1") + self.textLabel1.setSizePolicy(QSizePolicy(QSizePolicy.MinimumExpanding,QSizePolicy.Preferred,0,0,self.textLabel1.sizePolicy().hasHeightForWidth())) + self.textLabel1.setMinimumSize(QSize(0,0)) + layout2.addWidget(self.textLabel1) - MotClefLayout.addWidget(self.textLabel1_2,0,1) - self.TWChoix.insertTab(self.MotClef,QString("")) + self.textLabel1_2 = QLabel(LayoutWidget_2,"textLabel1_2") + self.textLabel1_2.setSizePolicy(QSizePolicy(QSizePolicy.MinimumExpanding,QSizePolicy.Preferred,0,0,self.textLabel1_2.sizePolicy().hasHeightForWidth())) + layout2.addWidget(self.textLabel1_2) + self.TWChoix.insertTab(self.MotClef,QString.fromLatin1("")) DMCFactLayout.addMultiCellWidget(self.TWChoix,0,0,0,2) self.bSup = QPushButton(self,"bSup") + self.bSup.setSizePolicy(QSizePolicy(QSizePolicy.MinimumExpanding,QSizePolicy.Fixed,0,0,self.bSup.sizePolicy().hasHeightForWidth())) self.bSup.setAutoDefault(1) DMCFactLayout.addWidget(self.bSup,2,0) @@ -58,11 +66,13 @@ class DMCFact(QWidget): DMCFactLayout.addMultiCellWidget(self.Commentaire,1,1,0,2) self.bHelp = QPushButton(self,"bHelp") + self.bHelp.setSizePolicy(QSizePolicy(QSizePolicy.MinimumExpanding,QSizePolicy.Fixed,0,0,self.bHelp.sizePolicy().hasHeightForWidth())) self.bHelp.setAutoDefault(1) DMCFactLayout.addWidget(self.bHelp,2,2) self.bOk = QPushButton(self,"bOk") + self.bOk.setSizePolicy(QSizePolicy(QSizePolicy.MinimumExpanding,QSizePolicy.Fixed,0,0,self.bOk.sizePolicy().hasHeightForWidth())) self.bOk.setAutoDefault(1) self.bOk.setDefault(1) @@ -70,7 +80,7 @@ class DMCFact(QWidget): self.languageChange() - self.resize(QSize(511,499).expandedTo(self.minimumSizeHint())) + self.resize(QSize(592,499).expandedTo(self.minimumSizeHint())) self.clearWState(Qt.WState_Polished) self.connect(self.bSup,SIGNAL("pressed()"),self.BSupPressed) @@ -84,14 +94,14 @@ class DMCFact(QWidget): 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")) + self.bSup.setAccel(QKeySequence(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")) + self.bHelp.setAccel(QKeySequence(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")) + self.bOk.setAccel(QKeySequence(self.__tr("Shift+A, Alt+A, Alt+A, Alt+A"))) QToolTip.add(self.bOk,self.__tr("validation de la saisie")) diff --git a/Ui/desMCFact.ui b/Ui/desMCFact.ui index 433df5f9..06563625 100644 --- a/Ui/desMCFact.ui +++ b/Ui/desMCFact.ui @@ -8,7 +8,7 @@ 0 0 - 511 + 592 499 @@ -29,6 +29,14 @@ TWChoix + + + 3 + 7 + 0 + 0 + + MotClef @@ -36,55 +44,118 @@ Ajouter Mot-Clef - + - unnamed + layout1 - - - textLabel1 - - - - 0 - 0 - - - - <h3><p align="center"><u><b>Mots Clefs Permis</b></u></p></h3> - - - - - LBMCPermis - - - - 0 - 0 - - - - + + + 10 + 40 + 550 + 330 + + + - LBRegles + unnamed - - + + + LBMCPermis + + + + 3 + 7 + 0 + 0 + + + + + 0 + 0 + + + + + + LBRegles + + + + + + + layout2 + + + + 11 + -4 + 560 + 40 + + + - textLabel1_2 + unnamed - - <h3><p align="center"><u><b>Régles</b></u></p></h3> - - - + + + textLabel1 + + + + 3 + 5 + 0 + 0 + + + + + 0 + 0 + + + + <h3><p align="center"><u><b>Mots Clefs Permis</b></u></p></h3> + + + + + textLabel1_2 + + + + 3 + 5 + 0 + 0 + + + + <h3><p align="center"><u><b>Régles</b></u></p></h3> + + + + bSup + + + 3 + 0 + 0 + 0 + + &Supprimer @@ -110,6 +181,14 @@ bHelp + + + 3 + 0 + 0 + 0 + + &Documentation @@ -127,6 +206,14 @@ bOk + + + 3 + 0 + 0 + 0 + + &Valider diff --git a/Ui/desMCListAjout.py b/Ui/desMCListAjout.py index bb0d5986..eca1d98f 100644 --- a/Ui/desMCListAjout.py +++ b/Ui/desMCListAjout.py @@ -2,8 +2,8 @@ # Form implementation generated from reading ui file 'desMCListAjout.ui' # -# Created: mar mar 25 10:05:08 2008 -# by: The PyQt User Interface Compiler (pyuic) 3.13 +# Created: Mon Dec 1 12:10:19 2008 +# by: The PyQt User Interface Compiler (pyuic) 3.16 # # WARNING! All changes made in this file will be lost! @@ -18,7 +18,8 @@ class DMCListAjout(QWidget): if not name: self.setName("DMCListAjout") - self.setMinimumSize(QSize(350,0)) + self.setSizePolicy(QSizePolicy(QSizePolicy.MinimumExpanding,QSizePolicy.Preferred,0,0,self.sizePolicy().hasHeightForWidth())) + self.setMinimumSize(QSize(50,0)) DMCListAjoutLayout = QGridLayout(self,1,1,11,6,"DMCListAjoutLayout") @@ -79,7 +80,7 @@ class DMCListAjout(QWidget): self.languageChange() - self.resize(QSize(459,472).expandedTo(self.minimumSizeHint())) + self.resize(QSize(509,472).expandedTo(self.minimumSizeHint())) self.clearWState(Qt.WState_Polished) self.connect(self.bOk,SIGNAL("clicked()"),self.BAjoutClicked) @@ -93,18 +94,18 @@ class DMCListAjout(QWidget): self.textLabel1.setText(self.__tr("

Pour ajouter une autre occurrence

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

du mot clef-facteur

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

cliquez ci-dessous

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

AFFE

")) self.bSup.setText(self.__tr("&Supprimer")) - self.bSup.setAccel(self.__tr("Alt+S")) + self.bSup.setAccel(QKeySequence(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")) + self.bOk.setAccel(QKeySequence(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")) + self.bHelp.setAccel(QKeySequence(self.__tr("Alt+D"))) QToolTip.add(self.bHelp,self.__tr("affichage documentation aster")) diff --git a/Ui/desMCListAjout.ui b/Ui/desMCListAjout.ui index ff58dbcd..6458e905 100644 --- a/Ui/desMCListAjout.ui +++ b/Ui/desMCListAjout.ui @@ -8,13 +8,21 @@ 0 0 - 459 + 509 472 + + + 3 + 5 + 0 + 0 + + - 350 + 50 0 diff --git a/Ui/desMacro.py b/Ui/desMacro.py index 4850e072..715403c0 100644 --- a/Ui/desMacro.py +++ b/Ui/desMacro.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'desMacro.ui' # -# Created: Mon Jun 2 15:35:12 2008 +# Created: Mon Dec 1 12:10:18 2008 # by: The PyQt User Interface Compiler (pyuic) 3.16 # # WARNING! All changes made in this file will be lost! @@ -18,7 +18,8 @@ class DMacro(QWidget): if not name: self.setName("DMacro") - self.setMinimumSize(QSize(505,0)) + self.setSizePolicy(QSizePolicy(QSizePolicy.MinimumExpanding,QSizePolicy.Preferred,0,0,self.sizePolicy().hasHeightForWidth())) + self.setMinimumSize(QSize(50,0)) DMacroLayout = QGridLayout(self,1,1,11,6,"DMacroLayout") @@ -137,7 +138,7 @@ class DMacro(QWidget): self.languageChange() - self.resize(QSize(521,499).expandedTo(self.minimumSizeHint())) + self.resize(QSize(529,499).expandedTo(self.minimumSizeHint())) self.clearWState(Qt.WState_Polished) self.connect(self.LBNouvCommande,SIGNAL("doubleClicked(QListBoxItem*)"),self.LBNouvCommandeClicked) diff --git a/Ui/desMacro.ui b/Ui/desMacro.ui index d451544b..1390f4f5 100644 --- a/Ui/desMacro.ui +++ b/Ui/desMacro.ui @@ -8,13 +8,21 @@ 0 0 - 521 + 529 499 + + + 3 + 5 + 0 + 0 + + - 505 + 50 0 diff --git a/Ui/desParam.py b/Ui/desParam.py index bd886581..2f50e328 100644 --- a/Ui/desParam.py +++ b/Ui/desParam.py @@ -2,8 +2,8 @@ # Form implementation generated from reading ui file 'desParam.ui' # -# Created: ven mai 16 13:30:38 2008 -# by: The PyQt User Interface Compiler (pyuic) 3.13 +# Created: Mon Dec 1 12:10:19 2008 +# by: The PyQt User Interface Compiler (pyuic) 3.16 # # WARNING! All changes made in this file will be lost! @@ -18,7 +18,8 @@ class DParam(QWidget): if not name: self.setName("DParam") - self.setMinimumSize(QSize(505,0)) + self.setSizePolicy(QSizePolicy(QSizePolicy.MinimumExpanding,QSizePolicy.Preferred,0,0,self.sizePolicy().hasHeightForWidth())) + self.setMinimumSize(QSize(50,0)) DParamLayout = QGridLayout(self,1,1,11,6,"DParamLayout") @@ -54,7 +55,7 @@ class DParam(QWidget): 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.TWChoix.insertTab(self.Valeur_Parametre,QString.fromLatin1("")) self.Commande = QWidget(self.TWChoix,"Commande") CommandeLayout = QGridLayout(self.Commande,1,1,11,6,"CommandeLayout") @@ -97,7 +98,7 @@ class DParam(QWidget): self.LEFiltre.setMinimumSize(QSize(160,30)) CommandeLayout.addWidget(self.LEFiltre,1,1) - self.TWChoix.insertTab(self.Commande,QString("")) + self.TWChoix.insertTab(self.Commande,QString.fromLatin1("")) DParamLayout.addMultiCellWidget(self.TWChoix,0,0,0,2) @@ -122,7 +123,7 @@ class DParam(QWidget): self.languageChange() - self.resize(QSize(505,483).expandedTo(self.minimumSizeHint())) + self.resize(QSize(517,483).expandedTo(self.minimumSizeHint())) self.clearWState(Qt.WState_Polished) self.connect(self.LBNouvCommande,SIGNAL("doubleClicked(QListBoxItem*)"),self.LBNouvCommandeClicked) @@ -165,13 +166,13 @@ class DParam(QWidget): 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")) + self.bOk.setAccel(QKeySequence(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")) + self.bSup.setAccel(QKeySequence(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")) + self.bHelp.setAccel(QKeySequence(self.__tr("Alt+D"))) QToolTip.add(self.bHelp,self.__tr("affichage documentation aster")) diff --git a/Ui/desParam.ui b/Ui/desParam.ui index 7aa81f89..ccf3316b 100644 --- a/Ui/desParam.ui +++ b/Ui/desParam.ui @@ -8,13 +8,21 @@ 0 0 - 505 + 517 483 + + + 3 + 5 + 0 + 0 + + - 505 + 50 0 diff --git a/Ui/desPlusieursBase.py b/Ui/desPlusieursBase.py index dc7ca0f1..7f7318ce 100644 --- a/Ui/desPlusieursBase.py +++ b/Ui/desPlusieursBase.py @@ -2,8 +2,8 @@ # Form implementation generated from reading ui file 'desPlusieursBase.ui' # -# Created: lun mai 5 17:43:44 2008 -# by: The PyQt User Interface Compiler (pyuic) 3.13 +# Created: Mon Dec 1 12:10:19 2008 +# by: The PyQt User Interface Compiler (pyuic) 3.16 # # WARNING! All changes made in this file will be lost! @@ -88,7 +88,7 @@ class DPlusBase(QWidget): if not name: self.setName("DPlusBase") - self.setMinimumSize(QSize(350,0)) + self.setMinimumSize(QSize(50,0)) self.setIcon(self.image0) DPlusBaseLayout = QGridLayout(self,1,1,11,6,"DPlusBaseLayout") @@ -112,7 +112,7 @@ class DPlusBase(QWidget): Widget8Layout.addMultiCell(spacer3_3,0,0,1,2) self.BAjout1Val = QToolButton(self.Widget8,"BAjout1Val") - self.BAjout1Val.setSizePolicy(QSizePolicy(0,0,0,0,self.BAjout1Val.sizePolicy().hasHeightForWidth())) + self.BAjout1Val.setSizePolicy(QSizePolicy(QSizePolicy.Fixed,QSizePolicy.Fixed,0,0,self.BAjout1Val.sizePolicy().hasHeightForWidth())) self.BAjout1Val.setMinimumSize(QSize(40,30)) self.BAjout1Val.setIconSet(QIconSet(self.image1)) @@ -139,7 +139,7 @@ class DPlusBase(QWidget): Widget8Layout.addItem(spacer3_2,9,5) self.BSalome = QToolButton(self.Widget8,"BSalome") - self.BSalome.setSizePolicy(QSizePolicy(0,0,0,0,self.BSalome.sizePolicy().hasHeightForWidth())) + self.BSalome.setSizePolicy(QSizePolicy(QSizePolicy.Fixed,QSizePolicy.Fixed,0,0,self.BSalome.sizePolicy().hasHeightForWidth())) self.BSalome.setMinimumSize(QSize(40,30)) self.BSalome.setIconSet(QIconSet(self.image0)) @@ -160,13 +160,13 @@ class DPlusBase(QWidget): Widget8Layout.addMultiCellLayout(layout12,0,1,3,5) self.LEValeur = QLineEdit(self.Widget8,"LEValeur") - self.LEValeur.setSizePolicy(QSizePolicy(1,1,0,0,self.LEValeur.sizePolicy().hasHeightForWidth())) + self.LEValeur.setSizePolicy(QSizePolicy(QSizePolicy.Minimum,QSizePolicy.Minimum,0,0,self.LEValeur.sizePolicy().hasHeightForWidth())) self.LEValeur.setMinimumSize(QSize(220,30)) Widget8Layout.addMultiCellWidget(self.LEValeur,2,3,3,5) self.BSup1Val = QToolButton(self.Widget8,"BSup1Val") - self.BSup1Val.setSizePolicy(QSizePolicy(0,0,0,0,self.BSup1Val.sizePolicy().hasHeightForWidth())) + self.BSup1Val.setSizePolicy(QSizePolicy(QSizePolicy.Fixed,QSizePolicy.Fixed,0,0,self.BSup1Val.sizePolicy().hasHeightForWidth())) self.BSup1Val.setMinimumSize(QSize(40,30)) self.BSup1Val.setIconSet(QIconSet(self.image2)) @@ -196,13 +196,13 @@ class DPlusBase(QWidget): layout6.addWidget(self.bHelp) Widget8Layout.addMultiCellLayout(layout6,10,10,0,5) - self.tabuniqueinto.insertTab(self.Widget8,QString("")) + self.tabuniqueinto.insertTab(self.Widget8,QString.fromLatin1("")) DPlusBaseLayout.addWidget(self.tabuniqueinto,0,0) self.languageChange() - self.resize(QSize(552,480).expandedTo(self.minimumSizeHint())) + self.resize(QSize(581,480).expandedTo(self.minimumSizeHint())) self.clearWState(Qt.WState_Polished) self.connect(self.bHelp,SIGNAL("clicked()"),self.ViewDoc) @@ -232,10 +232,10 @@ class DPlusBase(QWidget): 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.bParam.setText(self.__tr("&Parametres")) - self.bParam.setAccel(self.__tr("Alt+P")) + self.bParam.setAccel(QKeySequence(self.__tr("Alt+P"))) QToolTip.add(self.bParam,self.__tr("suppression du mot clef")) self.bImport.setText(self.__tr("&Importer")) - self.bImport.setAccel(self.__tr("Alt+I")) + self.bImport.setAccel(QKeySequence(self.__tr("Alt+I"))) QToolTip.add(self.bImport,self.__tr("suppression du mot clef")) 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")) @@ -245,13 +245,13 @@ class DPlusBase(QWidget): 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")) + self.bSup.setAccel(QKeySequence(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")) + self.bOk.setAccel(QKeySequence(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")) + self.bHelp.setAccel(QKeySequence(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 a6a4eb0c..5a97e371 100644 --- a/Ui/desPlusieursBase.ui +++ b/Ui/desPlusieursBase.ui @@ -8,13 +8,13 @@ 0 0 - 552 + 581 480 - 350 + 50 0 diff --git a/Ui/desPlusieursInto.py b/Ui/desPlusieursInto.py index 224aa87c..908a613c 100644 --- a/Ui/desPlusieursInto.py +++ b/Ui/desPlusieursInto.py @@ -2,8 +2,8 @@ # Form implementation generated from reading ui file 'desPlusieursInto.ui' # -# Created: ven avr 4 11:27:09 2008 -# by: The PyQt User Interface Compiler (pyuic) 3.13 +# Created: Mon Dec 1 14:43:05 2008 +# by: The PyQt User Interface Compiler (pyuic) 3.16 # # 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" \ - "\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" -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 = \ "\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" \ + "\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 DPlusInto(QWidget): def __init__(self,parent = None,name = None,fl = 0): @@ -68,86 +68,65 @@ class DPlusInto(QWidget): if not name: self.setName("DPlusInto") - self.setMinimumSize(QSize(350,0)) + self.setMinimumSize(QSize(50,0)) DPlusIntoLayout = QGridLayout(self,1,1,11,6,"DPlusIntoLayout") self.tabuniqueinto = QTabWidget(self,"tabuniqueinto") self.Widget8 = QWidget(self.tabuniqueinto,"Widget8") - Widget8Layout = QGridLayout(self.Widget8,1,1,11,6,"Widget8Layout") self.textLabel1 = QLabel(self.Widget8,"textLabel1") - - Widget8Layout.addMultiCellWidget(self.textLabel1,0,0,0,1) + self.textLabel1.setGeometry(QRect(11,11,198,23)) self.bSup = QPushButton(self.Widget8,"bSup") + self.bSup.setGeometry(QRect(11,384,130,30)) self.bSup.setMinimumSize(QSize(130,30)) self.bSup.setAutoDefault(1) - Widget8Layout.addWidget(self.bSup,3,0) - self.bOk = QPushButton(self.Widget8,"bOk") + self.bOk.setGeometry(QRect(147,384,130,30)) self.bOk.setMinimumSize(QSize(130,30)) self.bOk.setAutoDefault(1) self.bOk.setDefault(1) - Widget8Layout.addMultiCellWidget(self.bOk,3,3,1,2) - self.bHelp = QPushButton(self.Widget8,"bHelp") - self.bHelp.setSizePolicy(QSizePolicy(1,0,150,0,self.bHelp.sizePolicy().hasHeightForWidth())) + self.bHelp.setGeometry(QRect(283,384,208,30)) + self.bHelp.setSizePolicy(QSizePolicy(QSizePolicy.Minimum,QSizePolicy.Fixed,150,0,self.bHelp.sizePolicy().hasHeightForWidth())) self.bHelp.setMinimumSize(QSize(130,30)) self.bHelp.setAutoDefault(1) - Widget8Layout.addWidget(self.bHelp,3,3) - self.Commentaire = QLabel(self.Widget8,"Commentaire") + self.Commentaire.setGeometry(QRect(11,338,480,40)) self.Commentaire.setMinimumSize(QSize(0,40)) - Widget8Layout.addMultiCellWidget(self.Commentaire,2,2,0,3) - - layout8 = QHBoxLayout(None,0,6,"layout8") + self.textLabel1_2 = QLabel(self.Widget8,"textLabel1_2") + self.textLabel1_2.setGeometry(QRect(215,11,276,23)) self.LBValeurs = QListBox(self.Widget8,"LBValeurs") - layout8.addWidget(self.LBValeurs) - - layout5 = QVBoxLayout(None,0,6,"layout5") - spacer2 = QSpacerItem(21,44,QSizePolicy.Minimum,QSizePolicy.Expanding) - layout5.addItem(spacer2) - - layout2 = QVBoxLayout(None,0,6,"layout2") + self.LBValeurs.setGeometry(QRect(12,41,211,290)) - self.BSup1Val = QToolButton(self.Widget8,"BSup1Val") - self.BSup1Val.setMinimumSize(QSize(40,31)) - self.BSup1Val.setMaximumSize(QSize(40,31)) - self.BSup1Val.setIconSet(QIconSet(self.image0)) - layout2.addWidget(self.BSup1Val) + self.listBoxVal = QListBox(self.Widget8,"listBoxVal") + self.listBoxVal.setGeometry(QRect(279,41,211,290)) self.BAjout1Val = QToolButton(self.Widget8,"BAjout1Val") + self.BAjout1Val.setGeometry(QRect(230,50,40,31)) self.BAjout1Val.setMinimumSize(QSize(40,31)) self.BAjout1Val.setMaximumSize(QSize(40,31)) - self.BAjout1Val.setIconSet(QIconSet(self.image1)) - layout2.addWidget(self.BAjout1Val) - spacer3 = QSpacerItem(21,176,QSizePolicy.Minimum,QSizePolicy.Expanding) - layout2.addItem(spacer3) - layout5.addLayout(layout2) - layout8.addLayout(layout5) - - self.listBoxVal = QListBox(self.Widget8,"listBoxVal") - layout8.addWidget(self.listBoxVal) - - Widget8Layout.addMultiCellLayout(layout8,1,1,0,3) - - self.textLabel1_2 = QLabel(self.Widget8,"textLabel1_2") + self.BAjout1Val.setIconSet(QIconSet(self.image0)) - Widget8Layout.addMultiCellWidget(self.textLabel1_2,0,0,2,3) - self.tabuniqueinto.insertTab(self.Widget8,QString("")) + self.BSup1Val = QToolButton(self.Widget8,"BSup1Val") + self.BSup1Val.setGeometry(QRect(230,90,40,31)) + self.BSup1Val.setMinimumSize(QSize(40,31)) + self.BSup1Val.setMaximumSize(QSize(40,31)) + self.BSup1Val.setIconSet(QIconSet(self.image1)) + self.tabuniqueinto.insertTab(self.Widget8,QString.fromLatin1("")) DPlusIntoLayout.addWidget(self.tabuniqueinto,0,0) self.languageChange() - self.resize(QSize(482,480).expandedTo(self.minimumSizeHint())) + self.resize(QSize(528,480).expandedTo(self.minimumSizeHint())) self.clearWState(Qt.WState_Polished) self.connect(self.bHelp,SIGNAL("clicked()"),self.ViewDoc) @@ -168,20 +147,20 @@ class DPlusInto(QWidget): self.setCaption(self.__tr("DUnIn")) self.textLabel1.setText(self.__tr("Valeur(s) actuelle(s)")) self.bSup.setText(self.__tr("&Supprimer")) - self.bSup.setAccel(self.__tr("Alt+S")) + self.bSup.setAccel(QKeySequence(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")) + self.bOk.setAccel(QKeySequence(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")) + self.bHelp.setAccel(QKeySequence(self.__tr("Alt+D"))) QToolTip.add(self.bHelp,self.__tr("affichage documentation aster")) self.Commentaire.setText(QString.null) - self.BSup1Val.setText(QString.null) - QToolTip.add(self.BSup1Val,self.__tr("enleve l occurence selectionnee")) + self.textLabel1_2.setText(self.__tr("Valeur(s) possibles(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.tabuniqueinto.changeTab(self.Widget8,self.__tr("Saisir Valeur")) diff --git a/Ui/desPlusieursInto.ui b/Ui/desPlusieursInto.ui index f53e25e1..efbf3c32 100644 --- a/Ui/desPlusieursInto.ui +++ b/Ui/desPlusieursInto.ui @@ -8,13 +8,13 @@ 0 0 - 482 + 528 480 - 350 + 50 0 @@ -36,257 +36,318 @@ Saisir Valeur - + - unnamed - - - - textLabel1 - - - <u><font size="+1">Valeur(s) actuelle(s)</font></u> - - - - - bSup - - - - 130 - 30 - - - - &Supprimer - - - Alt+S - - - true - - - suppression du mot clef - - - - - bOk - - - - 130 - 30 - - - - &Valider - - - Shift+A, Alt+A, Alt+A, Alt+A - - - true - - - true - - - validation de la saisie - - - - - bHelp - - - - 1 - 0 - 150 - 0 - - - - - 130 - 30 - - - - &Documentation - - - Alt+D - - - true - - - affichage documentation aster - - - - - Commentaire - - - - 0 - 40 - - - - - - - - - layout8 - - - - unnamed - - - - LBValeurs - - - - - layout5 - - - - unnamed - - - - spacer2 - - - Vertical - - - Expanding - - - - 21 - 44 - - - - - - layout2 - - - - unnamed - - - - BSup1Val - - - - 40 - 31 - - - - - 40 - 31 - - - - - - - image0 - - - enleve l occurence selectionnee - - - - - BAjout1Val - - - - 40 - 31 - - - - - 40 - 31 - - - - - - - image1 - - - ajoute la valeur saisie sous l occurence selectionnée (en fin de liste si il n y a pas de selection) - - - - - spacer3 - - - Vertical - - - Expanding - - - - 21 - 176 - - - - - - - - - - listBoxVal - - - - - - - textLabel1_2 - - - <u><font size="+1">Valeur(s) possibles(s)</font></u> - - - + textLabel1 + + + + 11 + 11 + 198 + 23 + + + + <u><font size="+1">Valeur(s) actuelle(s)</font></u> + + + + + bSup + + + + 11 + 384 + 130 + 30 + + + + + 130 + 30 + + + + &Supprimer + + + Alt+S + + + true + + + suppression du mot clef + + + + + bOk + + + + 147 + 384 + 130 + 30 + + + + + 130 + 30 + + + + &Valider + + + Shift+A, Alt+A, Alt+A, Alt+A + + + true + + + true + + + validation de la saisie + + + + + bHelp + + + + 283 + 384 + 208 + 30 + + + + + 1 + 0 + 150 + 0 + + + + + 130 + 30 + + + + &Documentation + + + Alt+D + + + true + + + affichage documentation aster + + + + + Commentaire + + + + 11 + 338 + 480 + 40 + + + + + 0 + 40 + + + + + + + + + textLabel1_2 + + + + 215 + 11 + 276 + 23 + + + + <u><font size="+1">Valeur(s) possibles(s)</font></u> + + + + + LBValeurs + + + + 12 + 41 + 211 + 290 + + + + + + listBoxVal + + + + 279 + 41 + 211 + 290 + + + + + + spacer2 + + + Vertical + + + Expanding + + + + 21 + 37 + + + + + 240 + 42 + 21 + 37 + + + + + + spacer3 + + + Vertical + + + Expanding + + + + 21 + 169 + + + + + 240 + 160 + 21 + 169 + + + + + + BAjout1Val + + + + 230 + 50 + 40 + 31 + + + + + 40 + 31 + + + + + 40 + 31 + + + + + + + image0 + + + ajoute la valeur saisie sous l occurence selectionnée (en fin de liste si il n y a pas de selection) + + + + + BSup1Val + + + + 230 + 90 + 40 + 31 + + + + + 40 + 31 + + + + + 40 + 31 + + + + + + + image1 + + + enleve l occurence selectionnee + + - 89504e470d0a1a0a0000000d49484452000000210000000e0806000000a11e758c000000cf49444154388dd594db0ec3200c43edfdf8d897bb0f345b480845d51eb64888f412e76001c00f046fd6e99bba77200480924a1032c92efbd8c7d5cabcc025400099e957849568fe7f06c0ded1deb32b4a1ec4ea824b9e74097165bd01f85527f78a7201e0a3129f345a017c543bafdc983d0f7109d15a331b471f47072c17494a82338f6178203a8817e67306b1f08b07ba03e602c9b831077e37e0209e67e3386710977b17de80c185ad38695a51d522c82ce77912e2fed8be83762092f52b1820dd11bb10e565b53a5a3bbaff130713d66fa6981857060000000049454e44ae426082 + 89504e470d0a1a0a0000000d49484452000000210000000e0806000000a11e758c000000c749444154388dcd94590ec3200c4471d57bc73df9f407d331b159a228aa254448bc3cc68152fec0e4420ceeceb912e08a0239838848f5df02c99c11f86004300119054ae868c56ac206c06b4b109111c802874f3a52a587757123897e4039c46b50d8865b07f5400a450053330893cf8674a30028d492deef04626b559dfe48ac842b1a6daae6850155033b99c5009f70ceda111aab413b6f6a70d118e008e6fd8bc51d5d00a0f614556d1ff9b9be4952aabc3721f8f8b6f624c557ef8947afedf48c5e60b8dfbeb81d6dab9aff99270000000049454e44ae426082 - 89504e470d0a1a0a0000000d49484452000000210000000e0806000000a11e758c000000c749444154388dcd94590ec3200c4471d57bc73df9f407d331b159a228aa254448bc3cc68152fec0e4420ceeceb912e08a0239838848f5df02c99c11f86004300119054ae868c56ac206c06b4b109111c802874f3a52a587757123897e4039c46b50d8865b07f5400a450053330893cf8674a30028d492deef04626b559dfe48ac842b1a6daae6850155033b99c5009f70ceda111aab413b6f6a70d118e008e6fd8bc51d5d00a0f614556d1ff9b9be4952aabc3721f8f8b6f624c557ef8947afedf48c5e60b8dfbeb81d6dab9aff99270000000049454e44ae426082 + 89504e470d0a1a0a0000000d49484452000000210000000e0806000000a11e758c000000cf49444154388dd594db0ec3200c43edfdf8d897bb0f345b480845d51eb64888f412e76001c00f046fd6e99bba77200480924a1032c92efbd8c7d5cabcc025400099e957849568fe7f06c0ded1deb32b4a1ec4ea824b9e74097165bd01f85527f78a7201e0a3129f345a017c543bafdc983d0f7109d15a331b471f47072c17494a82338f6178203a8817e67306b1f08b07ba03e602c9b831077e37e0209e67e3386710977b17de80c185ad38695a51d522c82ce77912e2fed8be83762092f52b1820dd11bb10e565b53a5a3bbaff130713d66fa6981857060000000049454e44ae426082 diff --git a/Ui/desPoursuite.py b/Ui/desPoursuite.py index 2db030cc..cb378b1b 100644 --- a/Ui/desPoursuite.py +++ b/Ui/desPoursuite.py @@ -2,8 +2,8 @@ # Form implementation generated from reading ui file 'desPoursuite.ui' # -# Created: ven mai 16 13:30:38 2008 -# by: The PyQt User Interface Compiler (pyuic) 3.13 +# Created: Mon Dec 1 12:10:19 2008 +# by: The PyQt User Interface Compiler (pyuic) 3.16 # # WARNING! All changes made in this file will be lost! @@ -18,7 +18,7 @@ class DPour(QWidget): if not name: self.setName("DPour") - self.setMinimumSize(QSize(505,0)) + self.setMinimumSize(QSize(50,0)) DPourLayout = QGridLayout(self,1,1,11,6,"DPourLayout") @@ -48,7 +48,7 @@ class DPour(QWidget): self.textLabel1.setMinimumSize(QSize(0,0)) MotClefLayout.addWidget(self.textLabel1,0,0) - self.TWChoix.insertTab(self.MotClef,QString("")) + self.TWChoix.insertTab(self.MotClef,QString.fromLatin1("")) self.Commande = QWidget(self.TWChoix,"Commande") CommandeLayout = QGridLayout(self.Commande,1,1,11,6,"CommandeLayout") @@ -91,7 +91,7 @@ class DPour(QWidget): self.LEFiltre.setMinimumSize(QSize(160,30)) CommandeLayout.addWidget(self.LEFiltre,1,1) - self.TWChoix.insertTab(self.Commande,QString("")) + self.TWChoix.insertTab(self.Commande,QString.fromLatin1("")) self.TabPage = QWidget(self.TWChoix,"TabPage") @@ -115,14 +115,14 @@ class DPour(QWidget): layout3.addItem(spacer3) self.BBrowse = QPushButton(LayoutWidget_2,"BBrowse") - self.BBrowse.setSizePolicy(QSizePolicy(0,0,0,0,self.BBrowse.sizePolicy().hasHeightForWidth())) + self.BBrowse.setSizePolicy(QSizePolicy(QSizePolicy.Fixed,QSizePolicy.Fixed,0,0,self.BBrowse.sizePolicy().hasHeightForWidth())) self.BBrowse.setMinimumSize(QSize(140,50)) layout3.addWidget(self.BBrowse) layout5.addLayout(layout3,1,0) spacer1 = QSpacerItem(21,190,QSizePolicy.Minimum,QSizePolicy.Expanding) layout5.addItem(spacer1,0,0) - self.TWChoix.insertTab(self.TabPage,QString("")) + self.TWChoix.insertTab(self.TabPage,QString.fromLatin1("")) DPourLayout.addMultiCellWidget(self.TWChoix,0,0,0,2) @@ -147,7 +147,7 @@ class DPour(QWidget): self.languageChange() - self.resize(QSize(521,499).expandedTo(self.minimumSizeHint())) + self.resize(QSize(546,499).expandedTo(self.minimumSizeHint())) self.clearWState(Qt.WState_Polished) self.connect(self.LBNouvCommande,SIGNAL("doubleClicked(QListBoxItem*)"),self.LBNouvCommandeClicked) @@ -192,13 +192,13 @@ class DPour(QWidget): 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")) + self.bSup.setAccel(QKeySequence(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")) + self.bOk.setAccel(QKeySequence(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")) + self.bHelp.setAccel(QKeySequence(self.__tr("Alt+D"))) QToolTip.add(self.bHelp,self.__tr("affichage documentation aster")) diff --git a/Ui/desPoursuite.ui b/Ui/desPoursuite.ui index 17f7d6da..fb9c96bc 100644 --- a/Ui/desPoursuite.ui +++ b/Ui/desPoursuite.ui @@ -8,13 +8,13 @@ 0 0 - 521 + 546 499 - 505 + 50 0 diff --git a/Ui/desRacine.py b/Ui/desRacine.py index 39382eb2..97aa4e81 100644 --- a/Ui/desRacine.py +++ b/Ui/desRacine.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'desRacine.ui' # -# Created: Mon Jun 2 16:02:17 2008 +# Created: Mon Dec 1 12:10:19 2008 # by: The PyQt User Interface Compiler (pyuic) 3.16 # # WARNING! All changes made in this file will be lost! @@ -18,12 +18,10 @@ class DRac(QWidget): if not name: self.setName("DRac") - self.setMinimumSize(QSize(505,0)) DRacLayout = QGridLayout(self,1,1,11,6,"DRacLayout") self.textLabel1_4 = QLabel(self,"textLabel1_4") - self.textLabel1_4.setMinimumSize(QSize(291,21)) DRacLayout.addMultiCellWidget(self.textLabel1_4,0,0,0,1) @@ -32,7 +30,6 @@ class DRac(QWidget): DRacLayout.addMultiCellWidget(self.textLabel1_4_2,0,1,2,3) self.buttonGroup1 = QButtonGroup(self,"buttonGroup1") - self.buttonGroup1.setMinimumSize(QSize(0,60)) self.RBGroupe = QRadioButton(self.buttonGroup1,"RBGroupe") self.RBGroupe.setGeometry(QRect(10,20,90,20)) @@ -44,19 +41,16 @@ class DRac(QWidget): DRacLayout.addMultiCellWidget(self.buttonGroup1,1,1,0,1) self.bHelp = QPushButton(self,"bHelp") - self.bHelp.setMinimumSize(QSize(160,30)) self.bHelp.setAutoDefault(1) DRacLayout.addWidget(self.bHelp,3,3) self.bSup = QPushButton(self,"bSup") - self.bSup.setMinimumSize(QSize(160,30)) self.bSup.setAutoDefault(1) DRacLayout.addWidget(self.bSup,3,0) self.bOk = QPushButton(self,"bOk") - self.bOk.setMinimumSize(QSize(160,30)) self.bOk.setAutoDefault(1) self.bOk.setDefault(1) @@ -65,23 +59,19 @@ class DRac(QWidget): layout2 = QGridLayout(None,1,1,0,6,"layout2") self.BNext = QToolButton(self,"BNext") - self.BNext.setMinimumSize(QSize(60,30)) self.BNext.setIconSet(QIconSet()) layout2.addWidget(self.BNext,0,2) self.LEFiltre = QLineEdit(self,"LEFiltre") - self.LEFiltre.setMinimumSize(QSize(0,30)) layout2.addWidget(self.LEFiltre,0,1) self.LBRegles = QListBox(self,"LBRegles") - self.LBRegles.setMinimumSize(QSize(240,350)) layout2.addMultiCellWidget(self.LBRegles,0,1,3,3) self.textLabel6 = QLabel(self,"textLabel6") - self.textLabel6.setMinimumSize(QSize(40,0)) layout2.addWidget(self.textLabel6,0,0) @@ -93,7 +83,7 @@ class DRac(QWidget): self.languageChange() - self.resize(QSize(509,513).expandedTo(self.minimumSizeHint())) + self.resize(QSize(523,513).expandedTo(self.minimumSizeHint())) self.clearWState(Qt.WState_Polished) self.connect(self.LBNouvCommande,SIGNAL("doubleClicked(QListBoxItem*)"),self.LBNouvCommandeClicked) diff --git a/Ui/desRacine.ui b/Ui/desRacine.ui index b4ee15d2..a6f7a21b 100644 --- a/Ui/desRacine.ui +++ b/Ui/desRacine.ui @@ -8,16 +8,10 @@ 0 0 - 509 + 523 513 - - - 505 - 0 - - DMacro @@ -29,12 +23,6 @@ textLabel1_4 - - - 291 - 21 - - <b><u>Commandes :</u></b> @@ -51,12 +39,6 @@ buttonGroup1 - - - 0 - 60 - - Affichage @@ -100,12 +82,6 @@ bHelp - - - 160 - 30 - - &Documentation @@ -123,12 +99,6 @@ bSup - - - 160 - 30 - - &Supprimer @@ -146,12 +116,6 @@ bOk - - - 160 - 30 - - &Valider @@ -180,12 +144,6 @@ BNext - - - 60 - 30 - - Suivant @@ -200,34 +158,16 @@ LEFiltre - - - 0 - 30 - - LBRegles - - - 240 - 350 - - textLabel6 - - - 40 - 0 - - Filtre diff --git a/Ui/desSelectVal.py b/Ui/desSelectVal.py index f43b5d2c..2aa34506 100644 --- a/Ui/desSelectVal.py +++ b/Ui/desSelectVal.py @@ -2,8 +2,8 @@ # Form implementation generated from reading ui file 'desSelectVal.ui' # -# Created: mar mar 25 10:05:09 2008 -# by: The PyQt User Interface Compiler (pyuic) 3.13 +# Created: Mon Dec 1 12:10:19 2008 +# by: The PyQt User Interface Compiler (pyuic) 3.16 # # WARNING! All changes made in this file will be lost! @@ -25,39 +25,33 @@ class DSelVal(QWidget): DSelValLayout.addMultiCellWidget(self.TBtext,0,0,0,1) - self.BGSeparateur = QButtonGroup(self,"BGSeparateur") - self.BGSeparateur.setMinimumSize(QSize(180,100)) + self.BImportSel = QPushButton(self,"BImportSel") - LayoutWidget = QWidget(self.BGSeparateur,"layout1") - LayoutWidget.setGeometry(QRect(17,20,150,74)) - layout1 = QGridLayout(LayoutWidget,1,1,11,6,"layout1") + DSelValLayout.addWidget(self.BImportSel,1,1) - self.BpointVirgule = QRadioButton(LayoutWidget,"BpointVirgule") + self.BImportTout = QPushButton(self,"BImportTout") - layout1.addWidget(self.BpointVirgule,2,0) + DSelValLayout.addWidget(self.BImportTout,2,1) - self.Bespace = QRadioButton(LayoutWidget,"Bespace") - self.Bespace.setChecked(1) + self.BGSeparateur = QButtonGroup(self,"BGSeparateur") + self.BGSeparateur.setSizePolicy(QSizePolicy(QSizePolicy.MinimumExpanding,QSizePolicy.Preferred,0,0,self.BGSeparateur.sizePolicy().hasHeightForWidth())) + self.BGSeparateur.setMinimumSize(QSize(20,130)) - layout1.addWidget(self.Bespace,0,0) + self.Bvirgule = QRadioButton(self.BGSeparateur,"Bvirgule") + self.Bvirgule.setGeometry(QRect(12,52,104,22)) - self.Bvirgule = QRadioButton(LayoutWidget,"Bvirgule") + self.Bespace = QRadioButton(self.BGSeparateur,"Bespace") + self.Bespace.setGeometry(QRect(12,24,104,22)) + self.Bespace.setChecked(1) - layout1.addWidget(self.Bvirgule,1,0) + self.BpointVirgule = QRadioButton(self.BGSeparateur,"BpointVirgule") + self.BpointVirgule.setGeometry(QRect(12,80,104,22)) DSelValLayout.addMultiCellWidget(self.BGSeparateur,1,2,0,0) - self.BImportTout = QPushButton(self,"BImportTout") - - DSelValLayout.addWidget(self.BImportTout,2,1) - - self.BImportSel = QPushButton(self,"BImportSel") - - DSelValLayout.addWidget(self.BImportSel,1,1) - self.languageChange() - self.resize(QSize(413,497).expandedTo(self.minimumSizeHint())) + self.resize(QSize(429,661).expandedTo(self.minimumSizeHint())) self.clearWState(Qt.WState_Polished) self.connect(self.BGSeparateur,SIGNAL("clicked(int)"),self.SeparateurSelect) @@ -67,12 +61,12 @@ class DSelVal(QWidget): def languageChange(self): self.setCaption(self.__trUtf8("\x53\xc3\xa9\x6c\x65\x63\x74\x69\x6f\x6e\x20\x64\x65\x20\x76\x61\x6c\x65\x75\x72\x73")) + self.BImportSel.setText(self.__tr("Ajouter Selection")) + self.BImportTout.setText(self.__tr("Importer Tout")) self.BGSeparateur.setTitle(self.__trUtf8("\x53\xc3\xa9\x70\x61\x72\x61\x74\x65\x75\x72")) - self.BpointVirgule.setText(self.__tr("point-virgule")) - self.Bespace.setText(self.__tr("espace")) self.Bvirgule.setText(self.__tr("virgule")) - self.BImportTout.setText(self.__tr("Importer Tout")) - self.BImportSel.setText(self.__tr("Ajouter Selection")) + self.Bespace.setText(self.__tr("espace")) + self.BpointVirgule.setText(self.__tr("point-virgule")) def SeparateurSelect(self): diff --git a/Ui/desSelectVal.ui b/Ui/desSelectVal.ui index f77f36c1..ef65ad34 100644 --- a/Ui/desSelectVal.ui +++ b/Ui/desSelectVal.ui @@ -8,7 +8,7 @@ 0 0 - 410 + 429 661 @@ -44,9 +44,17 @@ BGSeparateur + + + 3 + 5 + 0 + 0 + + - 180 + 20 130 diff --git a/Ui/desUniqueASSD.py b/Ui/desUniqueASSD.py index 12a79933..9c87cdf7 100644 --- a/Ui/desUniqueASSD.py +++ b/Ui/desUniqueASSD.py @@ -2,8 +2,8 @@ # Form implementation generated from reading ui file 'desUniqueASSD.ui' # -# Created: mar mar 25 10:05:09 2008 -# by: The PyQt User Interface Compiler (pyuic) 3.13 +# Created: Mon Dec 1 12:10:19 2008 +# by: The PyQt User Interface Compiler (pyuic) 3.16 # # WARNING! All changes made in this file will be lost! @@ -18,7 +18,7 @@ class DUnASSD(QWidget): if not name: self.setName("DUnASSD") - self.setMinimumSize(QSize(350,0)) + self.setMinimumSize(QSize(20,0)) DUnASSDLayout = QGridLayout(self,1,1,11,6,"DUnASSDLayout") @@ -60,13 +60,13 @@ class DUnASSD(QWidget): layout2.addWidget(self.bHelp) Widget8Layout.addLayout(layout2,3,0) - self.tabuniqueinto.insertTab(self.Widget8,QString("")) + self.tabuniqueinto.insertTab(self.Widget8,QString.fromLatin1("")) DUnASSDLayout.addWidget(self.tabuniqueinto,0,0) self.languageChange() - self.resize(QSize(482,480).expandedTo(self.minimumSizeHint())) + self.resize(QSize(502,480).expandedTo(self.minimumSizeHint())) self.clearWState(Qt.WState_Polished) self.connect(self.bHelp,SIGNAL("clicked()"),self.ViewDoc) @@ -79,13 +79,13 @@ class DUnASSD(QWidget): self.textLabel2.setText(self.__trUtf8("\x3c\x66\x6f\x6e\x74\x20\x73\x69\x7a\x65\x3d\x22\x2b\x31\x22\x3e\x3c\x70\x20\x61\x6c\x69\x67\x6e\x3d\x22\x63\x65\x6e\x74\x65\x72\x22\x3e\x53\x74\x72\x75\x63\x74\x75\x72\x65\x73\x20\x64\x65\x20\x64\x6f\x6e\x6e\xc3\xa9\x65\x73\x20\x64\x75\x20\x74\x79\x70\x65\x0a\x72\x65\x71\x75\x69\x73\x20\x70\x61\x72\x20\x6c\x27\x6f\x62\x6a\x65\x74\x20\x63\x6f\x75\x72\x61\x6e\x74\x20\x3a\x3c\x2f\x70\x3e\x3c\x2f\x66\x6f\x6e\x74\x3e")) self.Commentaire.setText(QString.null) self.bSup.setText(self.__tr("&Supprimer")) - self.bSup.setAccel(self.__tr("Alt+S")) + self.bSup.setAccel(QKeySequence(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")) + self.bOk.setAccel(QKeySequence(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")) + self.bHelp.setAccel(QKeySequence(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/desUniqueASSD.ui b/Ui/desUniqueASSD.ui index 819c9294..84426b39 100644 --- a/Ui/desUniqueASSD.ui +++ b/Ui/desUniqueASSD.ui @@ -8,13 +8,13 @@ 0 0 - 482 + 502 480 - 350 + 20 0 diff --git a/Ui/desUniqueBase.py b/Ui/desUniqueBase.py index ec1c5161..e025a1af 100644 --- a/Ui/desUniqueBase.py +++ b/Ui/desUniqueBase.py @@ -2,8 +2,8 @@ # Form implementation generated from reading ui file 'desUniqueBase.ui' # -# Created: ven avr 4 11:27:09 2008 -# by: The PyQt User Interface Compiler (pyuic) 3.13 +# Created: Mon Dec 1 12:10:19 2008 +# by: The PyQt User Interface Compiler (pyuic) 3.16 # # WARNING! All changes made in this file will be lost! @@ -38,7 +38,7 @@ class DUnBase(QWidget): if not name: self.setName("DUnBase") - self.setMinimumSize(QSize(350,0)) + self.setMinimumSize(QSize(20,0)) DUnBaseLayout = QGridLayout(self,1,1,11,6,"DUnBaseLayout") @@ -61,7 +61,7 @@ class DUnBase(QWidget): Widget8Layout.addMultiCell(spacer1,0,0,0,1) self.bParametres = QPushButton(self.Widget8,"bParametres") - self.bParametres.setSizePolicy(QSizePolicy(0,0,0,0,self.bParametres.sizePolicy().hasHeightForWidth())) + self.bParametres.setSizePolicy(QSizePolicy(QSizePolicy.Fixed,QSizePolicy.Fixed,0,0,self.bParametres.sizePolicy().hasHeightForWidth())) self.bParametres.setMinimumSize(QSize(140,30)) Widget8Layout.addWidget(self.bParametres,0,2) @@ -104,13 +104,13 @@ class DUnBase(QWidget): self.BSalome.setIconSet(QIconSet(self.image0)) Widget8Layout.addWidget(self.BSalome,2,0) - self.tabuniqueinto.insertTab(self.Widget8,QString("")) + self.tabuniqueinto.insertTab(self.Widget8,QString.fromLatin1("")) DUnBaseLayout.addWidget(self.tabuniqueinto,0,0) self.languageChange() - self.resize(QSize(482,480).expandedTo(self.minimumSizeHint())) + self.resize(QSize(522,480).expandedTo(self.minimumSizeHint())) self.clearWState(Qt.WState_Polished) self.connect(self.bHelp,SIGNAL("clicked()"),self.ViewDoc) @@ -135,13 +135,13 @@ class DUnBase(QWidget): 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")) + self.bSup.setAccel(QKeySequence(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")) + self.bOk.setAccel(QKeySequence(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")) + self.bHelp.setAccel(QKeySequence(self.__tr("Alt+D"))) QToolTip.add(self.bHelp,self.__tr("affichage documentation aster")) self.Commentaire.setText(QString.null) self.BView2D.setText(self.__tr("Visualiser")) diff --git a/Ui/desUniqueBase.ui b/Ui/desUniqueBase.ui index 30eeab83..25759511 100644 --- a/Ui/desUniqueBase.ui +++ b/Ui/desUniqueBase.ui @@ -8,13 +8,13 @@ 0 0 - 482 + 522 480 - 350 + 20 0 diff --git a/Ui/desUniqueComp.py b/Ui/desUniqueComp.py index 7b9af9dd..2f035424 100644 --- a/Ui/desUniqueComp.py +++ b/Ui/desUniqueComp.py @@ -2,8 +2,8 @@ # Form implementation generated from reading ui file 'desUniqueComp.ui' # -# Created: ven avr 4 11:27:09 2008 -# by: The PyQt User Interface Compiler (pyuic) 3.13 +# Created: Mon Dec 1 12:10:19 2008 +# by: The PyQt User Interface Compiler (pyuic) 3.16 # # WARNING! All changes made in this file will be lost! @@ -18,7 +18,7 @@ class DUnComp(QWidget): if not name: self.setName("DUnComp") - self.setMinimumSize(QSize(350,0)) + self.setMinimumSize(QSize(30,0)) DUnCompLayout = QGridLayout(self,1,1,11,6,"DUnCompLayout") @@ -82,13 +82,13 @@ class DUnComp(QWidget): layout2.addWidget(self.bHelp) Widget8Layout.addMultiCellLayout(layout2,6,6,0,1) - self.tabuniqueinto.insertTab(self.Widget8,QString("")) + self.tabuniqueinto.insertTab(self.Widget8,QString.fromLatin1("")) DUnCompLayout.addWidget(self.tabuniqueinto,0,0) self.languageChange() - self.resize(QSize(484,480).expandedTo(self.minimumSizeHint())) + self.resize(QSize(511,480).expandedTo(self.minimumSizeHint())) self.clearWState(Qt.WState_Polished) self.connect(self.bHelp,SIGNAL("clicked()"),self.ViewDoc) @@ -116,13 +116,13 @@ class DUnComp(QWidget): 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")) + self.bSup.setAccel(QKeySequence(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")) + self.bOk.setAccel(QKeySequence(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")) + self.bHelp.setAccel(QKeySequence(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/desUniqueComp.ui b/Ui/desUniqueComp.ui index ae0361d6..d31d50c9 100644 --- a/Ui/desUniqueComp.ui +++ b/Ui/desUniqueComp.ui @@ -8,13 +8,13 @@ 0 0 - 484 + 511 480 - 350 + 30 0 diff --git a/Ui/desUniqueInto.py b/Ui/desUniqueInto.py index 914a3d2e..244f6a40 100644 --- a/Ui/desUniqueInto.py +++ b/Ui/desUniqueInto.py @@ -2,8 +2,8 @@ # Form implementation generated from reading ui file 'desUniqueInto.ui' # -# Created: mar mar 25 10:05:09 2008 -# by: The PyQt User Interface Compiler (pyuic) 3.13 +# Created: Mon Dec 1 12:10:19 2008 +# by: The PyQt User Interface Compiler (pyuic) 3.16 # # WARNING! All changes made in this file will be lost! @@ -18,7 +18,7 @@ class DUnIn(QWidget): if not name: self.setName("DUnIn") - self.setMinimumSize(QSize(350,0)) + self.setMinimumSize(QSize(30,0)) DUnInLayout = QGridLayout(self,1,1,11,6,"DUnInLayout") @@ -59,13 +59,13 @@ class DUnIn(QWidget): self.textLabel2 = QLabel(self.Widget8,"textLabel2") Widget8Layout.addWidget(self.textLabel2,0,0) - self.tabuniqueinto.insertTab(self.Widget8,QString("")) + self.tabuniqueinto.insertTab(self.Widget8,QString.fromLatin1("")) DUnInLayout.addWidget(self.tabuniqueinto,0,0) self.languageChange() - self.resize(QSize(482,480).expandedTo(self.minimumSizeHint())) + self.resize(QSize(502,480).expandedTo(self.minimumSizeHint())) self.clearWState(Qt.WState_Polished) self.connect(self.bHelp,SIGNAL("clicked()"),self.ViewDoc) @@ -77,13 +77,13 @@ class DUnIn(QWidget): self.setCaption(self.__tr("DUnIn")) self.Commentaire.setText(QString.null) self.bSup.setText(self.__tr("&Supprimer")) - self.bSup.setAccel(self.__tr("Alt+S")) + self.bSup.setAccel(QKeySequence(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")) + self.bOk.setAccel(QKeySequence(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")) + self.bHelp.setAccel(QKeySequence(self.__tr("Alt+D"))) QToolTip.add(self.bHelp,self.__tr("affichage documentation aster")) self.textLabel2.setText(self.__tr("

Valeurs possibles

")) self.tabuniqueinto.changeTab(self.Widget8,self.__tr("Saisir Valeur")) diff --git a/Ui/desUniqueInto.ui b/Ui/desUniqueInto.ui index 67f99a98..45b7e841 100644 --- a/Ui/desUniqueInto.ui +++ b/Ui/desUniqueInto.ui @@ -8,13 +8,13 @@ 0 0 - 482 + 502 480 - 350 + 30 0 diff --git a/Ui/desUniqueSDCO.py b/Ui/desUniqueSDCO.py index bd94a1db..c393af3e 100644 --- a/Ui/desUniqueSDCO.py +++ b/Ui/desUniqueSDCO.py @@ -2,8 +2,8 @@ # Form implementation generated from reading ui file 'desUniqueSDCO.ui' # -# Created: ven avr 4 11:27:09 2008 -# by: The PyQt User Interface Compiler (pyuic) 3.13 +# Created: Mon Dec 1 12:10:19 2008 +# by: The PyQt User Interface Compiler (pyuic) 3.16 # # WARNING! All changes made in this file will be lost! @@ -18,7 +18,7 @@ class DUnSDCO(QWidget): if not name: self.setName("DUnSDCO") - self.setMinimumSize(QSize(350,0)) + self.setMinimumSize(QSize(20,0)) DUnSDCOLayout = QGridLayout(self,1,1,11,6,"DUnSDCOLayout") @@ -63,13 +63,13 @@ class DUnSDCO(QWidget): self.textLabel2 = QLabel(self.Widget8,"textLabel2") Widget8Layout.addMultiCellWidget(self.textLabel2,2,2,0,2) - self.tabuniqueinto.insertTab(self.Widget8,QString("")) + self.tabuniqueinto.insertTab(self.Widget8,QString.fromLatin1("")) DUnSDCOLayout.addWidget(self.tabuniqueinto,0,0) self.languageChange() - self.resize(QSize(461,480).expandedTo(self.minimumSizeHint())) + self.resize(QSize(473,480).expandedTo(self.minimumSizeHint())) self.clearWState(Qt.WState_Polished) self.connect(self.bHelp,SIGNAL("clicked()"),self.ViewDoc) @@ -86,13 +86,13 @@ class DUnSDCO(QWidget): def languageChange(self): self.setCaption(self.__tr("DUnIn")) self.bSup.setText(self.__tr("&Supprimer")) - self.bSup.setAccel(self.__tr("Alt+S")) + self.bSup.setAccel(QKeySequence(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")) + self.bOk.setAccel(QKeySequence(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")) + self.bHelp.setAccel(QKeySequence(self.__tr("Alt+D"))) QToolTip.add(self.bHelp,self.__tr("affichage documentation aster")) self.Commentaire.setText(QString.null) self.textLabel2_2.setText(self.__tr("

Nom du nouveau concept :

")) diff --git a/Ui/desUniqueSDCO.ui b/Ui/desUniqueSDCO.ui index f847c8b5..e623d784 100644 --- a/Ui/desUniqueSDCO.ui +++ b/Ui/desUniqueSDCO.ui @@ -8,13 +8,13 @@ 0 0 - 461 + 473 480 - 350 + 20 0 diff --git a/Ui/desUniqueSDCOInto.py b/Ui/desUniqueSDCOInto.py index 4a7a9d24..84b4dc15 100644 --- a/Ui/desUniqueSDCOInto.py +++ b/Ui/desUniqueSDCOInto.py @@ -2,8 +2,8 @@ # Form implementation generated from reading ui file 'desUniqueSDCOInto.ui' # -# Created: ven avr 4 11:27:09 2008 -# by: The PyQt User Interface Compiler (pyuic) 3.13 +# Created: Mon Dec 1 12:10:19 2008 +# by: The PyQt User Interface Compiler (pyuic) 3.16 # # WARNING! All changes made in this file will be lost! @@ -18,7 +18,7 @@ class DUnSDCOInto(QWidget): if not name: self.setName("DUnSDCOInto") - self.setMinimumSize(QSize(350,0)) + self.setMinimumSize(QSize(30,0)) DUnSDCOIntoLayout = QGridLayout(self,1,1,11,6,"DUnSDCOIntoLayout") @@ -83,13 +83,13 @@ class DUnSDCOInto(QWidget): self.bHelp.setAutoDefault(1) Widget8Layout.addWidget(self.bHelp,6,2) - self.tabuniqueinto.insertTab(self.Widget8,QString("")) + self.tabuniqueinto.insertTab(self.Widget8,QString.fromLatin1("")) DUnSDCOIntoLayout.addWidget(self.tabuniqueinto,0,0) self.languageChange() - self.resize(QSize(482,480).expandedTo(self.minimumSizeHint())) + self.resize(QSize(541,480).expandedTo(self.minimumSizeHint())) self.clearWState(Qt.WState_Polished) self.connect(self.bHelp,SIGNAL("clicked()"),self.ViewDoc) @@ -112,13 +112,13 @@ class DUnSDCOInto(QWidget): self.Commentaire.setText(QString.null) self.textLabel2_2.setText(self.__tr(" Nom concept : ")) self.bSup.setText(self.__tr("&Supprimer")) - self.bSup.setAccel(self.__tr("Alt+S")) + self.bSup.setAccel(QKeySequence(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")) + self.bOk.setAccel(QKeySequence(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")) + self.bHelp.setAccel(QKeySequence(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 3849072f..b52780aa 100644 --- a/Ui/desUniqueSDCOInto.ui +++ b/Ui/desUniqueSDCOInto.ui @@ -8,13 +8,13 @@ 0 0 - 482 + 541 480 - 350 + 30 0 diff --git a/Ui/desVisu.py b/Ui/desVisu.py index 09571531..17e1441e 100644 --- a/Ui/desVisu.py +++ b/Ui/desVisu.py @@ -2,8 +2,8 @@ # Form implementation generated from reading ui file 'desVisu.ui' # -# Created: mar mar 25 10:05:09 2008 -# by: The PyQt User Interface Compiler (pyuic) 3.13 +# Created: Mon Dec 1 10:32:43 2008 +# by: The PyQt User Interface Compiler (pyuic) 3.16 # # WARNING! All changes made in this file will be lost! diff --git a/Ui/myMain.py b/Ui/myMain.py index c19f1424..d4cbd0b6 100644 --- a/Ui/myMain.py +++ b/Ui/myMain.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'myMain.ui' # -# Created: Thu Jun 19 11:40:51 2008 +# Created: Mon Dec 1 10:32:43 2008 # by: The PyQt User Interface Compiler (pyuic) 3.16 # # WARNING! All changes made in this file will be lost! @@ -245,8 +245,7 @@ class Eficas(QMainWindow): self.setName("Eficas") self.setEnabled(1) - self.setSizePolicy(QSizePolicy(QSizePolicy.Minimum,QSizePolicy.Minimum,0,0,self.sizePolicy().hasHeightForWidth())) - self.setMinimumSize(QSize(21,336)) + self.setMinimumSize(QSize(21,349)) self.setBackgroundOrigin(QMainWindow.WidgetOrigin) f = QFont(self.font()) self.setFont(f) @@ -294,6 +293,7 @@ class Eficas(QMainWindow): self.jdcRapportDeValidationAction = QAction(self,"jdcRapportDeValidationAction") self.jdcFichierSourceAction = QAction(self,"jdcFichierSourceAction") self.traduitV7V8Action = QAction(self,"traduitV7V8Action") + self.traduitV8V9Action = QAction(self,"traduitV8V9Action") self.aidenew_itemAction = QAction(self,"aidenew_itemAction") self.fileNewInclude = QAction(self,"fileNewInclude") self.optionEditeurAction = QAction(self,"optionEditeurAction") @@ -356,6 +356,7 @@ class Eficas(QMainWindow): self.Traduction = QPopupMenu(self) self.traduitV7V8Action.addTo(self.Traduction) + self.traduitV8V9Action.addTo(self.Traduction) self.MenuBar.insertItem(QString(""),self.Traduction,7) self.Patrons = QPopupMenu(self) @@ -387,6 +388,7 @@ 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.traduitV8V9Action,SIGNAL("activated()"),self.traductionV8V9) 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) @@ -402,8 +404,8 @@ class Eficas(QMainWindow): self.fileOpenAction.setMenuText(self.__tr("&Ouvrir")) self.fileOpenAction.setAccel(self.__tr("Ctrl+O")) self.fileSaveAction.setText(self.__tr("Enregistrer")) - self.fileSaveAction.setMenuText(self.__tr("&Enregistrer")) - self.fileSaveAction.setAccel(self.__tr("Ctrl+E")) + self.fileSaveAction.setMenuText(self.__tr("Enregistrer")) + self.fileSaveAction.setAccel(self.__tr("Ctrl+S")) self.fileSaveAsAction.setText(self.__tr("Enregistrer Sous")) self.fileSaveAsAction.setMenuText(self.__tr("Enregistrer Sous")) self.fileSaveAsAction.setAccel(QString.null) @@ -453,6 +455,8 @@ class Eficas(QMainWindow): self.jdcFichierSourceAction.setAccel(self.__tr("Ctrl+B")) self.traduitV7V8Action.setText(self.__tr("traduitV7V8")) self.traduitV7V8Action.setMenuText(self.__tr("traduitV7V8")) + self.traduitV8V9Action.setText(self.__tr("traduitV8V9")) + self.traduitV8V9Action.setMenuText(self.__tr("traduitV8V9")) self.aidenew_itemAction.setText(self.__tr("Eficas")) self.fileNewInclude.setText(self.__tr("Nouvel Include")) self.fileNewInclude.setMenuText(self.__tr("Nouvel Include")) @@ -540,6 +544,9 @@ class Eficas(QMainWindow): def traductionV7V8(self): print "Eficas.traductionV7V8(): Not implemented yet" + def traductionV8V9(self): + print "Eficas.traductionV8V9(): Not implemented yet" + def NewInclude(self): print "Eficas.NewInclude(): Not implemented yet"