From: Pascale Noyret Date: Fri, 16 May 2008 15:04:23 +0000 (+0000) Subject: *** empty log message *** X-Git-Tag: V1_14a4 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=248b721e7968dd5b7649f0c2c1b6f29b4d9d29df;p=modules%2Feficas.git *** empty log message *** --- diff --git a/InterfaceQT/compooper.py b/InterfaceQT/compooper.py index 54f6061e..dd89378e 100644 --- a/InterfaceQT/compooper.py +++ b/InterfaceQT/compooper.py @@ -73,7 +73,7 @@ class EtapeTreeItem(Objecttreeitem.ObjectTreeItem): def GetIconName(self): """ - Retourne le nom de l'icône à afficher dans l'arbre + Retourne le nom de l'icone a afficher dans l'arbre Ce nom dépend de la validité de l'objet """ if not self.object.isactif(): @@ -88,11 +88,18 @@ class EtapeTreeItem(Objecttreeitem.ObjectTreeItem): if valid==0 : return "ast-red-square" else : + try : + # on traite ici le cas d include materiau + # print self.object.definition.nom + if self.object.fichier_ini != self.object.nom_mater : + return "ast-red-square" + except : + pass return "ast-yellow-square" def GetLabelText(self): """ Retourne 3 valeurs : - - le texte à afficher dans le noeud représentant l'item + - le texte a afficher dans le noeud représentant l'item - la fonte dans laquelle afficher ce texte - la couleur du texte """ @@ -229,7 +236,7 @@ class EtapeTreeItem(Objecttreeitem.ObjectTreeItem): format=self.appli.format_fichier g=generator.plugins[format]() texte_commande = g.gener(self.object,format='beautifie') - # Il faut enlever la première ligne vide de texte_commande que + # Il faut enlever la premiere ligne vide de texte_commande que # rajoute le generator rebut,texte_commande = string.split(texte_commande,'\n',1) # on construit l'objet COMMANDE_COMM repésentatif de self mais non diff --git a/InterfaceQT/compoparam.py b/InterfaceQT/compoparam.py index bd9bd069..4c3fb26b 100644 --- a/InterfaceQT/compoparam.py +++ b/InterfaceQT/compoparam.py @@ -68,7 +68,7 @@ class PARAMTreeItem(Objecttreeitem.ObjectTreeItem): Retourne le texte à afficher aprês le nom de la commande (ici apres 'paramêtre') Ce texte est tronqué à 25 caractêres """ - texte=self.object.nom+"="+repr(self.object.valeur) + texte=self.object.nom+"="+str(self.object.valeur) texte = string.split(texte,'\n')[0] if len(texte) < 25 : return texte diff --git a/InterfaceQT/editor.py b/InterfaceQT/editor.py index 1ef3c126..0a9d920b 100644 --- a/InterfaceQT/editor.py +++ b/InterfaceQT/editor.py @@ -449,6 +449,7 @@ class JDCEditor(QSplitter): if jdcNode.item.isactif(): self.panel = jdcNode.getPanel() + #print self.panel.__class__ else: self.panel = panelsQT.PanelInactif(self.node_selected,self) diff --git a/InterfaceQT/monOptionsEditeur.py b/InterfaceQT/monOptionsEditeur.py index 7c0bc684..7432ae37 100644 --- a/InterfaceQT/monOptionsEditeur.py +++ b/InterfaceQT/monOptionsEditeur.py @@ -13,7 +13,6 @@ class Options(desOptions): self.dRepMat={} self.dRepCat={} self.initAll() - self.ajout=0 def initAll(self): @@ -42,13 +41,12 @@ class Options(desOptions): def VersionChoisie(self): version=str(self.CBVersions.currentText()) - self.LERepMat.setText(self.dRepMat[version]) - self.LERepCata.setText(self.dRepCat[version]) + if self.dRepMat.has_key(version): + self.LERepMat.setText(self.dRepMat[version]) + if self.dRepCat.has_key(version): + self.LERepCata.setText(self.dRepCat[version]) def BokClicked(self): - if self.ajout : - self.ajout=0 - return version=str(self.CBVersions.currentText()) if self.LERepCata.text() == "" : QMessageBox.critical( self, "Champ non rempli","Le champs Catalogue doit etre rempli" ) @@ -75,7 +73,6 @@ class Options(desOptions): self.configuration.save_params() def AjoutVersion(self): - self.ajout=1 version=self.LEVersionAjout.text() if str(version) == "" : return self.CBVersions.insertItem(version,0) @@ -84,7 +81,6 @@ class Options(desOptions): self.LEVersionAjout.setText("") def SupVersion(self): - self.ajout=1 version=str(self.LEVersionSup.text()) if version == "" : return i =0 @@ -93,9 +89,13 @@ class Options(desOptions): self.CBVersions.removeItem(i) break i=i+1 - del self.dVersion[version] - del self.dRepMat[version] - del self.dRepCat[version] + try : + del self.dVersion[version] + del self.dRepMat[version] + del self.dRepCat[version] + except : + self.LEVersionSup.setText("") + return codeSansPoint=re.sub("\.","",version) chaine="rep_mat_"+codeSansPoint if hasattr(self.configuration,chaine): @@ -129,8 +129,10 @@ class Options(desOptions): old_fic_ini_util=fic_ini_util+"_old" commande="mv "+fic_ini_util+" "+old_fic_ini_util os.system(commande) - from configuration import CONFIG - self.configuration=CONFIG(appli,rep_ini) + from Editeur import configuration + configNew=configuration.CONFIG(appli,rep_ini) + self.configuration=configNew + appli.CONFIGURATION=configNew self.configuration.save_params() self.dVersion={} self.dRepMat={} diff --git a/InterfaceQT/monParamPanel.py b/InterfaceQT/monParamPanel.py index facf0973..84472fcd 100644 --- a/InterfaceQT/monParamPanel.py +++ b/InterfaceQT/monParamPanel.py @@ -50,7 +50,7 @@ class MonParamPanel(DParam,QTPanelTBW2,QTPanel): valeur=self.node.item.get_valeur() if valeur != None: #str=QString("").setNum(valeur) - self.lineEditVal.setText(repr(valeur)) + self.lineEditVal.setText(str(valeur)) else : self.lineEditVal.clear() @@ -83,7 +83,7 @@ class MonParamPanel(DParam,QTPanelTBW2,QTPanel): pass if boul == 0 : try : - val,boul=QString.toFloat(qtVal) + val,boul=QString.toDouble(qtVal) except : pass if boul == 0 : @@ -94,7 +94,8 @@ class MonParamPanel(DParam,QTPanelTBW2,QTPanel): pass if boul: commentaire="Valeur correcte" self.Commentaire.setText(QString(commentaire)) - return val + valString=str(self.lineEditVal.text()) + return valString def LENomPressed(self): self.Commentaire.setText(QString("")) diff --git a/InterfaceQT/viewManager.py b/InterfaceQT/viewManager.py index 1915a5a5..cf9f2d37 100644 --- a/InterfaceQT/viewManager.py +++ b/InterfaceQT/viewManager.py @@ -649,8 +649,8 @@ class ViewManager: self.trUtf8("Fichier Modifie"), self.trUtf8("Le fichier %1 n a pas ete sauvegarde.") .arg(fn), - self.trUtf8("&Sauvegarder"), self.trUtf8("&Annuler Modifications"), - self.trUtf8("&Abandonner"), 0, 2) + self.trUtf8("&Sauvegarder"), self.trUtf8("&Quitter "), + self.trUtf8("&Annuler"), 0, 2) if res == 0: (ok, newName) = editor.saveFile() if ok: @@ -945,7 +945,7 @@ class ViewManager: self.trUtf8("Fichier"), self.trUtf8("Le fichier %1 est deja ouvert.Voulez-vous l ouvrir tel qu'il etait lors du dernier enregistrement") .arg(fn), self.trUtf8("&Duplication"), - self.trUtf8("&Abort"), None, 1) + self.trUtf8("&Annuler"), None, 1) if abort: break double=editor diff --git a/Ui/OptionsEditeur.py b/Ui/OptionsEditeur.py index 44c98918..69ae4f2c 100644 --- a/Ui/OptionsEditeur.py +++ b/Ui/OptionsEditeur.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'OptionsEditeur.ui' # -# Created: lun mai 5 12:15:56 2008 +# Created: ven mai 16 13:30:39 2008 # by: The PyQt User Interface Compiler (pyuic) 3.13 # # WARNING! All changes made in this file will be lost! @@ -19,19 +19,9 @@ class desOptions(QDialog): self.setName("desOptions") - desOptionsLayout = QGridLayout(self,1,1,11,6,"desOptionsLayout") - - self.groupBox3 = QGroupBox(self,"groupBox3") - - self.textLabel1 = QLabel(self.groupBox3,"textLabel1") - self.textLabel1.setGeometry(QRect(20,20,280,20)) - - self.LERepDoc = QLineEdit(self.groupBox3,"LERepDoc") - self.LERepDoc.setGeometry(QRect(20,40,520,31)) - - desOptionsLayout.addWidget(self.groupBox3,2,0) self.groupBox1 = QGroupBox(self,"groupBox1") + self.groupBox1.setGeometry(QRect(11,11,548,191)) self.textLabel1_3 = QLabel(self.groupBox1,"textLabel1_3") self.textLabel1_3.setGeometry(QRect(30,60,280,20)) @@ -52,59 +42,74 @@ class desOptions(QDialog): self.Bok.setGeometry(QRect(440,20,90,31)) self.Bok.setAutoDefault(0) - desOptionsLayout.addWidget(self.groupBox1,0,0) - self.groupBox2 = QGroupBox(self,"groupBox2") + self.groupBox2.setGeometry(QRect(11,208,548,90)) - self.textLabel1_2_3 = QLabel(self.groupBox2,"textLabel1_2_3") - self.textLabel1_2_3.setGeometry(QRect(20,60,180,21)) + self.LEVersionAjout = QLineEdit(self.groupBox2,"LEVersionAjout") + self.LEVersionAjout.setGeometry(QRect(120,31,101,30)) - self.textLabel3 = QLabel(self.groupBox2,"textLabel3") - self.textLabel3.setGeometry(QRect(19,19,141,21)) + self.LEVersionSup = QLineEdit(self.groupBox2,"LEVersionSup") + self.LEVersionSup.setGeometry(QRect(410,30,101,30)) - self.textLabel3_2 = QLabel(self.groupBox2,"textLabel3_2") - self.textLabel3_2.setGeometry(QRect(300,20,130,21)) + self.PBSup = QPushButton(self.groupBox2,"PBSup") + self.PBSup.setGeometry(QRect(300,20,101,41)) - self.LEVersionAjout = QLineEdit(self.groupBox2,"LEVersionAjout") - self.LEVersionAjout.setGeometry(QRect(140,20,101,21)) + self.PBajout = QPushButton(self.groupBox2,"PBajout") + self.PBajout.setGeometry(QRect(10,20,101,41)) - self.LEVersionSup = QLineEdit(self.groupBox2,"LEVersionSup") - self.LEVersionSup.setGeometry(QRect(420,20,101,21)) + self.groupBox3 = QGroupBox(self,"groupBox3") + self.groupBox3.setGeometry(QRect(10,310,548,90)) - self.Bdefaut = QCheckBox(self.groupBox2,"Bdefaut") - self.Bdefaut.setGeometry(QRect(210,60,20,20)) + self.textLabel1 = QLabel(self.groupBox3,"textLabel1") + self.textLabel1.setGeometry(QRect(20,10,280,40)) + + self.LERepDoc = QLineEdit(self.groupBox3,"LERepDoc") + self.LERepDoc.setGeometry(QRect(20,50,520,31)) - desOptionsLayout.addWidget(self.groupBox2,1,0) + self.Bdefaut = QCheckBox(self,"Bdefaut") + self.Bdefaut.setGeometry(QRect(10,430,280,20)) + Bdefaut_font = QFont(self.Bdefaut.font()) + Bdefaut_font.setPointSize(12) + self.Bdefaut.setFont(Bdefaut_font) + + self.PBQuit = QPushButton(self,"PBQuit") + self.PBQuit.setGeometry(QRect(400,420,151,31)) + self.PBQuit.setMinimumSize(QSize(0,30)) self.languageChange() - self.resize(QSize(570,434).expandedTo(self.minimumSizeHint())) + self.resize(QSize(570,474).expandedTo(self.minimumSizeHint())) self.clearWState(Qt.WState_Polished) self.connect(self.CBVersions,SIGNAL("activated(int)"),self.VersionChoisie) self.connect(self.Bdefaut,SIGNAL("clicked()"),self.BdefautChecked) self.connect(self.LEVersionAjout,SIGNAL("returnPressed()"),self.AjoutVersion) - self.connect(self.LEVersionSup,SIGNAL("returnPressed()"),self.SupVersion) self.connect(self.LERepDoc,SIGNAL("returnPressed()"),self.ChangePathDoc) self.connect(self.Bok,SIGNAL("clicked()"),self.BokClicked) + self.connect(self.LEVersionSup,SIGNAL("returnPressed()"),self.SupVersion) + self.connect(self.PBajout,SIGNAL("clicked()"),self.AjoutVersion) + self.connect(self.PBSup,SIGNAL("clicked()"),self.SupVersion) + self.connect(self.PBQuit,SIGNAL("clicked()"),self.close) def languageChange(self): self.setCaption(self.__tr("Options Aster")) - self.groupBox3.setTitle(self.__tr("Doc")) - self.textLabel1.setText(self.__trUtf8("\x52\x65\x70\x65\x72\x74\x6f\x69\x72\x65\x20\x64\x27\x61\x63\x63\x65\x73\x20\xc3\xa0\x20\x6c\x61\x20\x64\x6f\x63\x75\x6d\x65\x6e\x74\x61\x74\x69\x6f\x6e\x20\x3a")) - self.LERepDoc.setText(QString.null) self.groupBox1.setTitle(self.__tr("Configurer une Version")) self.textLabel1_3.setText(self.__trUtf8("\x52\xc3\xa9\x70\x65\x72\x74\x6f\x69\x72\x65\x20\x64\x27\x61\x63\x63\xc3\xa8\x73\x20\x61\x75\x20\x63\x61\x74\x61\x6c\x6f\x67\x75\x65\x20\x3a")) self.textLabel1_2_2.setText(self.__trUtf8("\x52\xc3\xa9\x70\x65\x72\x74\x6f\x69\x72\x65\x20\x64\x27\x61\x63\x63\xc3\xa8\x73\x20\x61\x75\x78\x20\x6d\x61\x74\xc3\xa9\x72\x69\x61\x75\x78\x20\x3a")) self.LERepMat.setText(QString.null) self.LERepCata.setText(QString.null) - self.Bok.setText(self.__tr("Ok")) + self.Bok.setText(self.__tr("Valider")) self.groupBox2.setTitle(self.__trUtf8("\x47\xc3\xa9\x72\x65\x72\x20\x6c\x65\x73\x20\x76\x65\x72\x73\x69\x6f\x6e\x73")) - self.textLabel1_2_3.setText(self.__trUtf8("\x52\x65\x69\x6e\x69\x74\x69\x61\x6c\x69\x73\x65\x72\x20\x61\x76\x65\x63\x20\x6c\x65\x73\x20\x76\x61\x6c\x65\x75\x72\x73\x20\x70\x61\x72\x20\x64\xc3\xa9\x66\x61\x75\x74")) - self.textLabel3.setText(self.__tr("Ajouter une version")) - self.textLabel3_2.setText(self.__tr("Supprimer une version")) - self.Bdefaut.setText(QString.null) + self.PBSup.setText(self.__tr("Supprimer\n" +"Version :")) + self.PBajout.setText(self.__tr("Ajouter\n" +"Version :")) + self.groupBox3.setTitle(self.__tr("Doc")) + self.textLabel1.setText(self.__trUtf8("\x52\x65\x70\x65\x72\x74\x6f\x69\x72\x65\x20\x64\x27\x61\x63\x63\x65\x73\x20\xc3\xa0\x20\x6c\x61\x20\x64\x6f\x63\x75\x6d\x65\x6e\x74\x61\x74\x69\x6f\x6e\x20\x3a")) + self.LERepDoc.setText(QString.null) + self.Bdefaut.setText(self.__tr("Reinitialiser avec les valeurs par defaut")) + self.PBQuit.setText(self.__tr("Quitter")) def VersionChoisie(self): diff --git a/Ui/OptionsEditeur.ui b/Ui/OptionsEditeur.ui index 7216be43..ced2a9bc 100644 --- a/Ui/OptionsEditeur.ui +++ b/Ui/OptionsEditeur.ui @@ -9,259 +9,291 @@ 0 0 570 - 434 + 474 Options Aster - + - unnamed + groupBox1 - + + + 11 + 11 + 548 + 191 + + + + Configurer une Version + + + + textLabel1_3 + + + + 30 + 60 + 280 + 20 + + + + Répertoire d'accès au catalogue : + + + + + textLabel1_2_2 + + + + 30 + 120 + 280 + 20 + + + + Répertoire d'accès aux matériaux : + + + + + CBVersions + + + + 30 + 20 + 90 + 30 + + + + + + LERepMat + + + + 30 + 140 + 501 + 31 + + + + + + + + + LERepCata + + + + 30 + 80 + 501 + 31 + + + + + + + + + Bok + + + + 440 + 20 + 90 + 31 + + + + Valider + + + false + + + + + + groupBox2 + + + + 11 + 208 + 548 + 90 + + + + Gérer les versions + + + + LEVersionAjout + + + + 120 + 31 + 101 + 30 + + + + + + LEVersionSup + + + + 410 + 30 + 101 + 30 + + + + + + PBSup + + + + 300 + 20 + 101 + 41 + + + + Supprimer +Version : + + + - groupBox3 - - - Doc - - - - textLabel1 - - - - 20 - 20 - 280 - 20 - - - - Repertoire d'acces à la documentation : - - - - - LERepDoc - - - - 20 - 40 - 520 - 31 - - - - - - + PBajout + + + + 10 + 20 + 101 + 41 + + + + Ajouter +Version : + - + + + + groupBox3 + + + + 10 + 310 + 548 + 90 + + + + Doc + + - groupBox1 - - - Configurer une Version - - - - textLabel1_3 - - - - 30 - 60 - 280 - 20 - - - - Répertoire d'accès au catalogue : - - - - - textLabel1_2_2 - - - - 30 - 120 - 280 - 20 - - - - Répertoire d'accès aux matériaux : - - - - - CBVersions - - - - 30 - 20 - 90 - 30 - - - - - - LERepMat - - - - 30 - 140 - 501 - 31 - - - - - - - - - LERepCata - - - - 30 - 80 - 501 - 31 - - - - - - - - - Bok - - - - 440 - 20 - 90 - 31 - - - - Ok - - - false - - + textLabel1 + + + + 20 + 10 + 280 + 40 + + + + Repertoire d'acces à la documentation : + - + - groupBox2 - - - Gérer les versions - - - - textLabel1_2_3 - - - - 20 - 60 - 180 - 21 - - - - Reinitialiser avec les valeurs par défaut - - - - - textLabel3 - - - - 19 - 19 - 141 - 21 - - - - Ajouter une version - - - - - textLabel3_2 - - - - 300 - 20 - 130 - 21 - - - - Supprimer une version - - - - - LEVersionAjout - - - - 140 - 20 - 101 - 21 - - - - - - LEVersionSup - - - - 420 - 20 - 101 - 21 - - - - - - Bdefaut - - - - 210 - 60 - 20 - 20 - - - - - - + LERepDoc + + + + 20 + 50 + 520 + 31 + + + + + - + + + + Bdefaut + + + + 10 + 430 + 280 + 20 + + + + + 12 + + + + Reinitialiser avec les valeurs par defaut + + + + + PBQuit + + + + 400 + 420 + 151 + 31 + + + + + 0 + 30 + + + + Quitter + + @@ -282,6 +314,18 @@ desOptions AjoutVersion() + + LERepDoc + returnPressed() + desOptions + ChangePathDoc() + + + Bok + clicked() + desOptions + BokClicked() + LEVersionSup returnPressed() @@ -289,16 +333,22 @@ SupVersion() - LERepDoc - returnPressed() + PBajout + clicked() desOptions - ChangePathDoc() + AjoutVersion() - Bok + PBSup clicked() desOptions - BokClicked() + SupVersion() + + + PBQuit + clicked() + desOptions + close() diff --git a/Ui/desCommande.py b/Ui/desCommande.py index 830dd66b..2a4cc274 100644 --- a/Ui/desCommande.py +++ b/Ui/desCommande.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'desCommande.ui' # -# Created: ven avr 4 11:27:08 2008 +# Created: ven mai 16 13:30:38 2008 # by: The PyQt User Interface Compiler (pyuic) 3.13 # # WARNING! All changes made in this file will be lost! @@ -22,6 +22,31 @@ class DComm(QWidget): DCommLayout = QGridLayout(self,1,1,11,6,"DCommLayout") + self.Commentaire = QLabel(self,"Commentaire") + self.Commentaire.setFrameShape(QLabel.NoFrame) + self.Commentaire.setFrameShadow(QLabel.Plain) + + DCommLayout.addMultiCellWidget(self.Commentaire,1,1,0,2) + + self.bOk = QPushButton(self,"bOk") + 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) + + self.bHelp = QPushButton(self,"bHelp") + self.bHelp.setMinimumSize(QSize(0,30)) + self.bHelp.setAutoDefault(1) + + DCommLayout.addWidget(self.bHelp,2,2) + self.TWChoix = QTabWidget(self,"TWChoix") self.MotClef = QWidget(self.TWChoix,"MotClef") @@ -65,9 +90,9 @@ class DComm(QWidget): self.TWChoix.insertTab(self.Concept,QString("")) self.Commande = QWidget(self.TWChoix,"Commande") + CommandeLayout = QGridLayout(self.Commande,1,1,11,6,"CommandeLayout") self.buttonGroup1 = QButtonGroup(self.Commande,"buttonGroup1") - self.buttonGroup1.setGeometry(QRect(308,11,160,80)) self.RBalpha = QRadioButton(self.buttonGroup1,"RBalpha") self.RBalpha.setGeometry(QRect(20,20,120,20)) @@ -76,49 +101,39 @@ class DComm(QWidget): self.RBGroupe = QRadioButton(self.buttonGroup1,"RBGroupe") self.RBGroupe.setGeometry(QRect(20,40,110,20)) - self.textLabel1_4 = QLabel(self.Commande,"textLabel1_4") - self.textLabel1_4.setGeometry(QRect(11,11,257,53)) - - self.textLabel4 = QLabel(self.Commande,"textLabel4") - self.textLabel4.setGeometry(QRect(11,365,457,16)) + CommandeLayout.addMultiCellWidget(self.buttonGroup1,0,1,3,3) self.LBNouvCommande = QListBox(self.Commande,"LBNouvCommande") - self.LBNouvCommande.setGeometry(QRect(11,97,457,262)) - self.textLabel6 = QLabel(self.Commande,"textLabel6") - self.textLabel6.setGeometry(QRect(11,70,23,21)) + CommandeLayout.addMultiCellWidget(self.LBNouvCommande,2,2,0,3) - self.BNext = QToolButton(self.Commande,"BNext") - self.BNext.setGeometry(QRect(257,61,41,30)) - self.BNext.setIconSet(QIconSet()) + self.textLabel1_4 = QLabel(self.Commande,"textLabel1_4") + self.textLabel1_4.setMaximumSize(QSize(32767,20)) - self.LEFiltre = QLineEdit(self.Commande,"LEFiltre") - self.LEFiltre.setGeometry(QRect(40,60,200,30)) - self.TWChoix.insertTab(self.Commande,QString("")) + CommandeLayout.addMultiCellWidget(self.textLabel1_4,0,0,0,2) - DCommLayout.addMultiCellWidget(self.TWChoix,0,0,0,2) + self.textLabel4 = QLabel(self.Commande,"textLabel4") - self.bOk = QPushButton(self,"bOk") - self.bOk.setAutoDefault(1) - self.bOk.setDefault(1) + CommandeLayout.addMultiCellWidget(self.textLabel4,3,3,0,3) - DCommLayout.addWidget(self.bOk,2,1) + self.textLabel6 = QLabel(self.Commande,"textLabel6") + self.textLabel6.setMinimumSize(QSize(40,40)) - self.bSup = QPushButton(self,"bSup") - self.bSup.setAutoDefault(1) + CommandeLayout.addWidget(self.textLabel6,1,0) - DCommLayout.addWidget(self.bSup,2,0) + self.LEFiltre = QLineEdit(self.Commande,"LEFiltre") + self.LEFiltre.setMinimumSize(QSize(0,40)) - self.bHelp = QPushButton(self,"bHelp") - self.bHelp.setAutoDefault(1) + CommandeLayout.addWidget(self.LEFiltre,1,1) - DCommLayout.addWidget(self.bHelp,2,2) + self.BNext = QToolButton(self.Commande,"BNext") + self.BNext.setMinimumSize(QSize(70,40)) + self.BNext.setIconSet(QIconSet()) - self.Commentaire = QLabel(self,"Commentaire") - self.Commentaire.setFrameShape(QLabel.NoFrame) - self.Commentaire.setFrameShadow(QLabel.Plain) + CommandeLayout.addWidget(self.BNext,1,2) + self.TWChoix.insertTab(self.Commande,QString("")) - DCommLayout.addMultiCellWidget(self.Commentaire,1,1,0,2) + DCommLayout.addMultiCellWidget(self.TWChoix,0,0,0,2) self.languageChange() @@ -149,6 +164,16 @@ 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")) + QToolTip.add(self.bSup,self.__tr("suppression du mot clef")) + self.bHelp.setText(self.__tr("&Documentation")) + self.bHelp.setAccel(self.__tr("Alt+D")) + QToolTip.add(self.bHelp,self.__tr("affichage documentation aster")) self.textLabel1.setText(self.__tr("

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")) @@ -167,16 +192,6 @@ class DComm(QWidget): self.BNext.setText(self.__tr("Suivant")) QToolTip.add(self.BNext,self.__tr("affiche la prochaine occurence")) self.TWChoix.changeTab(self.Commande,self.__tr("Nouvelle Commande")) - self.bOk.setText(self.__tr("&Valider")) - self.bOk.setAccel(self.__tr("Shift+A, Alt+A, Alt+A, Alt+A")) - QToolTip.add(self.bOk,self.__tr("validation de la saisie")) - self.bSup.setText(self.__tr("&Supprimer")) - self.bSup.setAccel(self.__tr("Alt+S")) - QToolTip.add(self.bSup,self.__tr("suppression du mot clef")) - self.bHelp.setText(self.__tr("&Documentation")) - self.bHelp.setAccel(self.__tr("Alt+D")) - QToolTip.add(self.bHelp,self.__tr("affichage documentation aster")) - self.Commentaire.setText(QString.null) def LBNouvCommandeClicked(self): diff --git a/Ui/desCommande.ui b/Ui/desCommande.ui index 45010fcb..8bff53b5 100644 --- a/Ui/desCommande.ui +++ b/Ui/desCommande.ui @@ -25,6 +25,92 @@ unnamed + + + Commentaire + + + NoFrame + + + Plain + + + + + + + + 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 @@ -212,223 +298,128 @@ Nouvelle Commande - + - buttonGroup1 - - - - 308 - 11 - 160 - 80 - - - - Affichage + unnamed - + - RBalpha + buttonGroup1 + + + Affichage - - - 20 - 20 - 120 + + + RBalpha + + + + 20 + 20 + 120 + 20 + + + + alphabétique + + + true + + + + + RBGroupe + + + + 20 + 40 + 110 + 20 + + + + par groupe + + + + + + LBNouvCommande + + + + + textLabel1_4 + + + + 32767 20 - + - alphabétique + <b><u>Commandes :</u></b> + + + + + textLabel4 - - true + + La commande choisie sera ajoutée APRES la commande courante - + - RBGroupe + textLabel6 - - - 20 - 40 - 110 - 20 - + + + 40 + 40 + - par groupe + Filtre - - - - textLabel1_4 - - - - 11 - 11 - 257 - 53 - - - - <b><u>Commandes :</u></b> - - - - - textLabel4 - - - - 11 - 365 - 457 - 16 - - - - La commande choisie sera ajoutée APRES la commande courante - - - - - LBNouvCommande - - - - 11 - 97 - 457 - 262 - - - - - - textLabel6 - - - - 11 - 70 - 23 - 21 - - - - Filtre - - - - - BNext - - - - 257 - 61 - 41 - 30 - - - - Suivant - - - - - - affiche la prochaine occurence - - - - - LEFiltre - - - - 40 - 60 - 200 - 30 - - - + + + LEFiltre + + + + 0 + 40 + + + + + + BNext + + + + 70 + 40 + + + + Suivant + + + + + + affiche la prochaine occurence + + + - - - bOk - - - &Valider - - - Shift+A, Alt+A, Alt+A, Alt+A - - - true - - - true - - - validation de la saisie - - - - - bSup - - - &Supprimer - - - Alt+S - - - true - - - suppression du mot clef - - - - - bHelp - - - &Documentation - - - Alt+D - - - true - - - affichage documentation aster - - - - - Commentaire - - - NoFrame - - - Plain - - - - - diff --git a/Ui/desCommentaire.py b/Ui/desCommentaire.py index 2c73e681..7210da28 100644 --- a/Ui/desCommentaire.py +++ b/Ui/desCommentaire.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'desCommentaire.ui' # -# Created: ven avr 4 11:27:09 2008 +# Created: ven mai 16 13:30:38 2008 # by: The PyQt User Interface Compiler (pyuic) 3.13 # # WARNING! All changes made in this file will be lost! @@ -33,10 +33,6 @@ class DComment(QWidget): self.Commande = QWidget(self.TWChoix,"Commande") CommandeLayout = QGridLayout(self.Commande,1,1,11,6,"CommandeLayout") - self.textLabel6 = QLabel(self.Commande,"textLabel6") - - CommandeLayout.addWidget(self.textLabel6,1,0) - self.LBNouvCommande = QListBox(self.Commande,"LBNouvCommande") CommandeLayout.addMultiCellWidget(self.LBNouvCommande,2,2,0,3) @@ -54,37 +50,46 @@ class DComment(QWidget): self.textLabel1_4 = QLabel(self.Commande,"textLabel1_4") - CommandeLayout.addMultiCellWidget(self.textLabel1_4,0,0,0,1) + CommandeLayout.addMultiCellWidget(self.textLabel1_4,0,0,0,2) self.textLabel4 = QLabel(self.Commande,"textLabel4") CommandeLayout.addMultiCellWidget(self.textLabel4,3,3,0,3) + self.LEFiltre = QLineEdit(self.Commande,"LEFiltre") + self.LEFiltre.setMinimumSize(QSize(160,30)) + + CommandeLayout.addWidget(self.LEFiltre,1,1) + self.BNext = QToolButton(self.Commande,"BNext") + self.BNext.setMinimumSize(QSize(60,30)) self.BNext.setIconSet(QIconSet()) CommandeLayout.addWidget(self.BNext,1,2) - self.LEFiltre = QLineEdit(self.Commande,"LEFiltre") - self.LEFiltre.setMinimumSize(QSize(160,30)) + self.textLabel6 = QLabel(self.Commande,"textLabel6") + self.textLabel6.setMinimumSize(QSize(50,30)) - CommandeLayout.addWidget(self.LEFiltre,1,1) + CommandeLayout.addWidget(self.textLabel6,1,0) self.TWChoix.insertTab(self.Commande,QString("")) 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) self.bSup = QPushButton(self,"bSup") + self.bSup.setMinimumSize(QSize(0,30)) self.bSup.setAutoDefault(1) DCommentLayout.addWidget(self.bSup,2,0) self.bHelp = QPushButton(self,"bHelp") + self.bHelp.setMinimumSize(QSize(0,30)) self.bHelp.setAutoDefault(1) DCommentLayout.addWidget(self.bHelp,2,2) @@ -122,7 +127,6 @@ class DComment(QWidget): def languageChange(self): self.setCaption(self.__tr("DComm")) self.TWChoix.changeTab(self.Valeur_Parametre,self.__tr("Commentaire")) - self.textLabel6.setText(self.__tr("Filtre")) self.buttonGroup1.setTitle(self.__tr("Affichage")) self.RBGroupe.setText(self.__tr("par groupe")) self.RBalpha.setText(self.__trUtf8("\x61\x6c\x70\x68\x61\x62\xc3\xa9\x74\x69\x71\x75\x65")) @@ -130,6 +134,7 @@ class DComment(QWidget): 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.bOk.setText(self.__tr("&Valider")) self.bOk.setAccel(self.__tr("Shift+A, Alt+A, Alt+A, Alt+A")) diff --git a/Ui/desCommentaire.ui b/Ui/desCommentaire.ui index 45f3e23b..e9cfa820 100644 --- a/Ui/desCommentaire.ui +++ b/Ui/desCommentaire.ui @@ -61,14 +61,6 @@ unnamed - - - textLabel6 - - - Filtre - - LBNouvCommande @@ -117,7 +109,7 @@ - + textLabel1_4 @@ -133,10 +125,27 @@ La commande choisie sera ajoutée APRES la commande courante + + + LEFiltre + + + + 160 + 30 + + + BNext + + + 60 + 30 + + Suivant @@ -147,16 +156,19 @@ affiche la prochaine occurence - + - LEFiltre + textLabel6 - 160 + 50 30 + + Filtre + @@ -165,6 +177,12 @@ bOk + + + 0 + 30 + + &Valider @@ -185,6 +203,12 @@ bSup + + + 0 + 30 + + &Supprimer @@ -202,6 +226,12 @@ bHelp + + + 0 + 30 + + &Documentation diff --git a/Ui/desFormule.py b/Ui/desFormule.py index bf1a33fc..6d7b72c2 100644 --- a/Ui/desFormule.py +++ b/Ui/desFormule.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'desFormule.ui' # -# Created: ven avr 4 11:27:09 2008 +# Created: ven mai 16 13:30:38 2008 # by: The PyQt User Interface Compiler (pyuic) 3.13 # # WARNING! All changes made in this file will be lost! @@ -115,10 +115,6 @@ class DFormule(QWidget): CommandeLayout.addMultiCellWidget(self.textLabel4,3,3,0,3) - self.textLabel1_4 = QLabel(self.Commande,"textLabel1_4") - - CommandeLayout.addMultiCellWidget(self.textLabel1_4,0,0,0,1) - self.buttonGroup1 = QButtonGroup(self.Commande,"buttonGroup1") LayoutWidget = QWidget(self.buttonGroup1,"layout1") @@ -134,23 +130,29 @@ class DFormule(QWidget): CommandeLayout.addMultiCellWidget(self.buttonGroup1,0,1,3,3) - self.LEFiltre = QLineEdit(self.Commande,"LEFiltre") - self.LEFiltre.setMinimumSize(QSize(160,30)) + self.LBNouvCommande = QListBox(self.Commande,"LBNouvCommande") - CommandeLayout.addWidget(self.LEFiltre,1,1) + CommandeLayout.addMultiCellWidget(self.LBNouvCommande,2,2,0,3) - self.BNext = QToolButton(self.Commande,"BNext") - self.BNext.setIconSet(QIconSet()) + self.textLabel1_4 = QLabel(self.Commande,"textLabel1_4") - CommandeLayout.addWidget(self.BNext,1,2) + 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.LBNouvCommande = QListBox(self.Commande,"LBNouvCommande") + self.LEFiltre = QLineEdit(self.Commande,"LEFiltre") + self.LEFiltre.setMinimumSize(QSize(160,40)) - CommandeLayout.addMultiCellWidget(self.LBNouvCommande,2,2,0,3) + CommandeLayout.addWidget(self.LEFiltre,1,1) + + self.BNext = QToolButton(self.Commande,"BNext") + self.BNext.setMinimumSize(QSize(60,40)) + self.BNext.setIconSet(QIconSet()) + + CommandeLayout.addWidget(self.BNext,1,2) self.TWChoix.insertTab(self.Commande,QString("")) DFormuleLayout.addWidget(self.TWChoix,0,0) @@ -208,13 +210,13 @@ class DFormule(QWidget): self.textLabel1_2.setText(self.__tr("

Arguments

")) 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.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.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.TWChoix.changeTab(self.Commande,self.__tr("Nouvelle Commande")) diff --git a/Ui/desFormule.ui b/Ui/desFormule.ui index daffdd5a..37d5e0a2 100644 --- a/Ui/desFormule.ui +++ b/Ui/desFormule.ui @@ -290,14 +290,6 @@ valeurs seront effectivement prises en compte <p align="left">La commande choisie sera ajoutée APRES la commande courante</p> - - - textLabel1_4 - - - <b><u>Commandes :</u></b> - - buttonGroup1 @@ -343,6 +335,33 @@ valeurs seront effectivement prises en compte + + + LBNouvCommande + + + + + textLabel1_4 + + + <b><u>Commandes :</u></b> + + + + + textLabel6 + + + + 40 + 0 + + + + Filtre + + LEFiltre @@ -350,7 +369,7 @@ valeurs seront effectivement prises en compte 160 - 30 + 40 @@ -358,6 +377,12 @@ valeurs seront effectivement prises en compte BNext + + + 60 + 40 + + Suivant @@ -368,19 +393,6 @@ valeurs seront effectivement prises en compte affiche la prochaine occurence - - - textLabel6 - - - Filtre - - - - - LBNouvCommande - - diff --git a/Ui/desInclude.py b/Ui/desInclude.py index 4a9917f8..dfe0d625 100644 --- a/Ui/desInclude.py +++ b/Ui/desInclude.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'desInclude.ui' # -# Created: ven avr 4 11:27:09 2008 +# Created: ven mai 16 13:30:38 2008 # by: The PyQt User Interface Compiler (pyuic) 3.13 # # WARNING! All changes made in this file will be lost! @@ -22,25 +22,28 @@ class DInc1(QWidget): DInc1Layout = QGridLayout(self,1,1,11,6,"DInc1Layout") - self.Commentaire = QLabel(self,"Commentaire") + self.bOk = QPushButton(self,"bOk") + self.bOk.setMinimumSize(QSize(0,30)) + self.bOk.setAutoDefault(1) + self.bOk.setDefault(1) - DInc1Layout.addMultiCellWidget(self.Commentaire,1,1,0,2) + DInc1Layout.addWidget(self.bOk,2,1) self.bHelp = QPushButton(self,"bHelp") + self.bHelp.setMinimumSize(QSize(0,30)) self.bHelp.setAutoDefault(1) DInc1Layout.addWidget(self.bHelp,2,2) self.bSup = QPushButton(self,"bSup") + self.bSup.setMinimumSize(QSize(0,30)) self.bSup.setAutoDefault(1) DInc1Layout.addWidget(self.bSup,2,0) - self.bOk = QPushButton(self,"bOk") - self.bOk.setAutoDefault(1) - self.bOk.setDefault(1) + self.Commentaire = QLabel(self,"Commentaire") - DInc1Layout.addWidget(self.bOk,2,1) + DInc1Layout.addMultiCellWidget(self.Commentaire,1,1,0,2) self.TWChoix = QTabWidget(self,"TWChoix") @@ -69,10 +72,6 @@ class DInc1(QWidget): self.Commande = QWidget(self.TWChoix,"Commande") CommandeLayout = QGridLayout(self.Commande,1,1,11,6,"CommandeLayout") - self.textLabel6 = QLabel(self.Commande,"textLabel6") - - CommandeLayout.addWidget(self.textLabel6,1,0) - self.LBNouvCommande = QListBox(self.Commande,"LBNouvCommande") CommandeLayout.addMultiCellWidget(self.LBNouvCommande,2,2,0,3) @@ -88,23 +87,29 @@ class DInc1(QWidget): CommandeLayout.addMultiCellWidget(self.buttonGroup1,0,1,3,3) - self.textLabel1_4 = QLabel(self.Commande,"textLabel1_4") - - CommandeLayout.addMultiCellWidget(self.textLabel1_4,0,0,0,1) - self.textLabel4 = QLabel(self.Commande,"textLabel4") CommandeLayout.addMultiCellWidget(self.textLabel4,3,3,0,3) - self.BNext = QToolButton(self.Commande,"BNext") - self.BNext.setIconSet(QIconSet()) + self.textLabel1_4 = QLabel(self.Commande,"textLabel1_4") - CommandeLayout.addWidget(self.BNext,1,2) + 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,30)) + self.LEFiltre.setMinimumSize(QSize(160,40)) CommandeLayout.addWidget(self.LEFiltre,1,1) + + self.BNext = QToolButton(self.Commande,"BNext") + self.BNext.setMinimumSize(QSize(60,0)) + self.BNext.setIconSet(QIconSet()) + + CommandeLayout.addWidget(self.BNext,1,2) self.TWChoix.insertTab(self.Commande,QString("")) self.TabPage = QWidget(self.TWChoix,"TabPage") @@ -138,7 +143,7 @@ class DInc1(QWidget): self.languageChange() - self.resize(QSize(521,499).expandedTo(self.minimumSizeHint())) + self.resize(QSize(521,511).expandedTo(self.minimumSizeHint())) self.clearWState(Qt.WState_Polished) self.connect(self.LBNouvCommande,SIGNAL("doubleClicked(QListBoxItem*)"),self.LBNouvCommandeClicked) @@ -168,25 +173,25 @@ class DInc1(QWidget): def languageChange(self): self.setCaption(self.__tr("DMacro")) - self.Commentaire.setText(QString.null) + self.bOk.setText(self.__tr("&Valider")) + self.bOk.setAccel(self.__tr("Shift+A, Alt+A, Alt+A, Alt+A")) + QToolTip.add(self.bOk,self.__tr("validation de la saisie")) self.bHelp.setText(self.__tr("&Documentation")) self.bHelp.setAccel(self.__tr("Alt+D")) QToolTip.add(self.bHelp,self.__tr("affichage documentation aster")) self.bSup.setText(self.__tr("&Supprimer")) self.bSup.setAccel(self.__tr("Alt+S")) QToolTip.add(self.bSup,self.__tr("suppression du mot clef")) - self.bOk.setText(self.__tr("&Valider")) - self.bOk.setAccel(self.__tr("Shift+A, Alt+A, Alt+A, Alt+A")) - QToolTip.add(self.bOk,self.__tr("validation de la saisie")) + self.Commentaire.setText(QString.null) self.textLabel1.setText(self.__tr("

Mots Clefs Permis

")) self.textLabel1_2.setText(self.__trUtf8("\x3c\x68\x33\x3e\x3c\x70\x20\x61\x6c\x69\x67\x6e\x3d\x22\x63\x65\x6e\x74\x65\x72\x22\x3e\x3c\x75\x3e\x3c\x62\x3e\x52\xc3\xa9\x67\x6c\x65\x73\x3c\x2f\x62\x3e\x3c\x2f\x75\x3e\x3c\x2f\x70\x3e\x3c\x2f\x68\x33\x3e")) self.TWChoix.changeTab(self.MotClef,self.__tr("Ajouter Mot-Clef")) - self.textLabel6.setText(self.__tr("Filtre")) self.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.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.TWChoix.changeTab(self.Commande,self.__tr("Nouvelle Commande")) diff --git a/Ui/desInclude.ui b/Ui/desInclude.ui index 02883fc4..9edfc3e7 100644 --- a/Ui/desInclude.ui +++ b/Ui/desInclude.ui @@ -9,7 +9,7 @@ 0 0 521 - 499 + 511 @@ -25,18 +25,42 @@ unnamed - + - Commentaire + bOk + + + + 0 + 30 + - + &Valider + + + Shift+A, Alt+A, Alt+A, Alt+A + + + true + + + true + + + validation de la saisie bHelp + + + 0 + 30 + + &Documentation @@ -54,6 +78,12 @@ bSup + + + 0 + 30 + + &Supprimer @@ -67,24 +97,12 @@ suppression du mot clef - + - bOk + Commentaire - &Valider - - - Shift+A, Alt+A, Alt+A, Alt+A - - - true - - - true - - - validation de la saisie + @@ -153,14 +171,6 @@ unnamed - - - textLabel6 - - - Filtre - - LBNouvCommande @@ -209,7 +219,15 @@ - + + + textLabel4 + + + La commande choisie sera ajoutée APRES la commande courante + + + textLabel1_4 @@ -217,18 +235,41 @@ <b><u>Commandes :</u></b> - + - textLabel4 + textLabel6 + + + + 40 + 0 + - La commande choisie sera ajoutée APRES la commande courante + Filtre + + + + + LEFiltre + + + + 160 + 40 + BNext + + + 60 + 0 + + Suivant @@ -239,17 +280,6 @@ affiche la prochaine occurence - - - LEFiltre - - - - 160 - 30 - - - diff --git a/Ui/desMacro.py b/Ui/desMacro.py index 03217686..79b8a083 100644 --- a/Ui/desMacro.py +++ b/Ui/desMacro.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'desMacro.ui' # -# Created: ven avr 4 11:27:09 2008 +# Created: ven mai 16 13:30:38 2008 # by: The PyQt User Interface Compiler (pyuic) 3.13 # # WARNING! All changes made in this file will be lost! @@ -73,11 +73,13 @@ class DMacro(QWidget): CommandeLayout.addMultiCellWidget(self.textLabel1_4,0,0,0,1) self.BNext = QToolButton(self.Commande,"BNext") + self.BNext.setMinimumSize(QSize(60,0)) self.BNext.setIconSet(QIconSet()) CommandeLayout.addWidget(self.BNext,1,2) self.textLabel6 = QLabel(self.Commande,"textLabel6") + self.textLabel6.setMinimumSize(QSize(40,0)) CommandeLayout.addWidget(self.textLabel6,1,0) @@ -115,16 +117,19 @@ class DMacro(QWidget): DMacroLayout.addMultiCellWidget(self.TWChoix,0,0,0,2) self.bSup = QPushButton(self,"bSup") + self.bSup.setMinimumSize(QSize(0,30)) self.bSup.setAutoDefault(1) DMacroLayout.addWidget(self.bSup,2,0) self.bHelp = QPushButton(self,"bHelp") + self.bHelp.setMinimumSize(QSize(0,30)) self.bHelp.setAutoDefault(1) DMacroLayout.addWidget(self.bHelp,2,2) self.bOk = QPushButton(self,"bOk") + self.bOk.setMinimumSize(QSize(0,30)) self.bOk.setAutoDefault(1) self.bOk.setDefault(1) diff --git a/Ui/desMacro.ui b/Ui/desMacro.ui index 3be939ed..d451544b 100644 --- a/Ui/desMacro.ui +++ b/Ui/desMacro.ui @@ -159,6 +159,12 @@ BNext + + + 60 + 0 + + Suivant @@ -173,6 +179,12 @@ textLabel6 + + + 40 + 0 + + Filtre @@ -304,6 +316,12 @@ bSup + + + 0 + 30 + + &Supprimer @@ -321,6 +339,12 @@ bHelp + + + 0 + 30 + + &Documentation @@ -338,6 +362,12 @@ bOk + + + 0 + 30 + + &Valider diff --git a/Ui/desParam.py b/Ui/desParam.py index 16c6bbd0..bd886581 100644 --- a/Ui/desParam.py +++ b/Ui/desParam.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'desParam.ui' # -# Created: ven avr 4 11:27:09 2008 +# Created: ven mai 16 13:30:38 2008 # by: The PyQt User Interface Compiler (pyuic) 3.13 # # WARNING! All changes made in this file will be lost! @@ -60,6 +60,7 @@ class DParam(QWidget): CommandeLayout = QGridLayout(self.Commande,1,1,11,6,"CommandeLayout") self.textLabel6 = QLabel(self.Commande,"textLabel6") + self.textLabel6.setMinimumSize(QSize(40,0)) CommandeLayout.addWidget(self.textLabel6,1,0) @@ -87,6 +88,7 @@ class DParam(QWidget): CommandeLayout.addMultiCellWidget(self.textLabel4,3,3,0,3) self.BNext = QToolButton(self.Commande,"BNext") + self.BNext.setMinimumSize(QSize(60,0)) self.BNext.setIconSet(QIconSet()) CommandeLayout.addWidget(self.BNext,1,2) @@ -100,17 +102,20 @@ class DParam(QWidget): DParamLayout.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) DParamLayout.addWidget(self.bOk,2,1) self.bSup = QPushButton(self,"bSup") + self.bSup.setMinimumSize(QSize(0,30)) self.bSup.setAutoDefault(1) DParamLayout.addWidget(self.bSup,2,0) self.bHelp = QPushButton(self,"bHelp") + self.bHelp.setMinimumSize(QSize(0,30)) self.bHelp.setAutoDefault(1) DParamLayout.addWidget(self.bHelp,2,2) diff --git a/Ui/desParam.ui b/Ui/desParam.ui index aeb6e692..7aa81f89 100644 --- a/Ui/desParam.ui +++ b/Ui/desParam.ui @@ -238,6 +238,12 @@ appuyé sur le bouton Valider. textLabel6 + + + 40 + 0 + + Filtre @@ -310,6 +316,12 @@ appuyé sur le bouton Valider. BNext + + + 60 + 0 + + Suivant @@ -338,6 +350,12 @@ appuyé sur le bouton Valider. bOk + + + 0 + 30 + + &Valider @@ -358,6 +376,12 @@ appuyé sur le bouton Valider. bSup + + + 0 + 30 + + &Supprimer @@ -375,6 +399,12 @@ appuyé sur le bouton Valider. bHelp + + + 0 + 30 + + &Documentation diff --git a/Ui/desPoursuite.py b/Ui/desPoursuite.py index 2ce61ed2..2db030cc 100644 --- a/Ui/desPoursuite.py +++ b/Ui/desPoursuite.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'desPoursuite.ui' # -# Created: ven avr 4 11:27:09 2008 +# Created: ven mai 16 13:30:38 2008 # by: The PyQt User Interface Compiler (pyuic) 3.13 # # WARNING! All changes made in this file will be lost! @@ -77,11 +77,13 @@ class DPour(QWidget): CommandeLayout.addMultiCellWidget(self.textLabel4,3,3,0,3) self.BNext = QToolButton(self.Commande,"BNext") + self.BNext.setMinimumSize(QSize(60,0)) self.BNext.setIconSet(QIconSet()) CommandeLayout.addWidget(self.BNext,1,2) self.textLabel6 = QLabel(self.Commande,"textLabel6") + self.textLabel6.setMinimumSize(QSize(40,0)) CommandeLayout.addWidget(self.textLabel6,1,0) @@ -125,17 +127,20 @@ class DPour(QWidget): DPourLayout.addMultiCellWidget(self.TWChoix,0,0,0,2) self.bSup = QPushButton(self,"bSup") + self.bSup.setMinimumSize(QSize(0,30)) self.bSup.setAutoDefault(1) DPourLayout.addWidget(self.bSup,2,0) self.bOk = QPushButton(self,"bOk") + self.bOk.setMinimumSize(QSize(0,30)) self.bOk.setAutoDefault(1) self.bOk.setDefault(1) DPourLayout.addWidget(self.bOk,2,1) self.bHelp = QPushButton(self,"bHelp") + self.bHelp.setMinimumSize(QSize(0,30)) self.bHelp.setAutoDefault(1) DPourLayout.addWidget(self.bHelp,2,2) diff --git a/Ui/desPoursuite.ui b/Ui/desPoursuite.ui index 6414067a..17f7d6da 100644 --- a/Ui/desPoursuite.ui +++ b/Ui/desPoursuite.ui @@ -167,6 +167,12 @@ BNext + + + 60 + 0 + + Suivant @@ -181,6 +187,12 @@ textLabel6 + + + 40 + 0 + + Filtre @@ -332,6 +344,12 @@ bSup + + + 0 + 30 + + &Supprimer @@ -349,6 +367,12 @@ bOk + + + 0 + 30 + + &Valider @@ -369,6 +393,12 @@ bHelp + + + 0 + 30 + + &Documentation diff --git a/Ui/desRacine.py b/Ui/desRacine.py index 9658be85..81d6eaf6 100644 --- a/Ui/desRacine.py +++ b/Ui/desRacine.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'desRacine.ui' # -# Created: lun mai 5 15:47:37 2008 +# Created: ven mai 16 13:30:38 2008 # by: The PyQt User Interface Compiler (pyuic) 3.13 # # WARNING! All changes made in this file will be lost! @@ -22,71 +22,73 @@ class DRac(QWidget): DRacLayout = QGridLayout(self,1,1,11,6,"DRacLayout") - layout4 = QGridLayout(None,1,1,0,6,"layout4") + self.bSup = QPushButton(self,"bSup") + self.bSup.setMinimumSize(QSize(0,30)) + self.bSup.setAutoDefault(1) - self.LEFiltre = QLineEdit(self,"LEFiltre") - self.LEFiltre.setMinimumSize(QSize(151,30)) + DRacLayout.addMultiCellWidget(self.bSup,4,4,0,1) - layout4.addWidget(self.LEFiltre,2,1) + self.bOk = QPushButton(self,"bOk") + self.bOk.setMinimumSize(QSize(0,30)) + self.bOk.setAutoDefault(1) + self.bOk.setDefault(1) - self.buttonGroup1 = QButtonGroup(self,"buttonGroup1") + DRacLayout.addMultiCellWidget(self.bOk,4,4,2,3) - self.RBGroupe = QRadioButton(self.buttonGroup1,"RBGroupe") - self.RBGroupe.setGeometry(QRect(10,20,90,20)) - - self.RBalpha = QRadioButton(self.buttonGroup1,"RBalpha") - self.RBalpha.setGeometry(QRect(110,20,110,20)) - self.RBalpha.setChecked(1) + self.bHelp = QPushButton(self,"bHelp") + self.bHelp.setMinimumSize(QSize(0,30)) + self.bHelp.setAutoDefault(1) - layout4.addMultiCellWidget(self.buttonGroup1,1,1,0,2) + DRacLayout.addWidget(self.bHelp,4,4) - self.textLabel6 = QLabel(self,"textLabel6") - - layout4.addWidget(self.textLabel6,2,0) + self.textLabel1_4 = QLabel(self,"textLabel1_4") - self.BNext = QToolButton(self,"BNext") - self.BNext.setIconSet(QIconSet()) + DRacLayout.addMultiCellWidget(self.textLabel1_4,0,0,1,2) - layout4.addWidget(self.BNext,2,2) + self.textLabel1_4_2 = QLabel(self,"textLabel1_4_2") - self.textLabel1_4 = QLabel(self,"textLabel1_4") + DRacLayout.addMultiCellWidget(self.textLabel1_4_2,0,1,3,4) - layout4.addWidget(self.textLabel1_4,0,1) + self.LEFiltre = QLineEdit(self,"LEFiltre") + self.LEFiltre.setMinimumSize(QSize(0,30)) - DRacLayout.addMultiCellLayout(layout4,0,1,0,1) + DRacLayout.addWidget(self.LEFiltre,2,1) - self.LBRegles = QListBox(self,"LBRegles") - self.LBRegles.setMinimumSize(QSize(250,400)) + self.textLabel6 = QLabel(self,"textLabel6") + self.textLabel6.setMinimumSize(QSize(40,0)) - DRacLayout.addMultiCellWidget(self.LBRegles,1,2,2,3) + DRacLayout.addWidget(self.textLabel6,2,0) - self.textLabel1_4_2 = QLabel(self,"textLabel1_4_2") + self.BNext = QToolButton(self,"BNext") + self.BNext.setMinimumSize(QSize(60,30)) + self.BNext.setIconSet(QIconSet()) - DRacLayout.addMultiCellWidget(self.textLabel1_4_2,0,0,2,3) + DRacLayout.addWidget(self.BNext,2,2) - self.bSup = QPushButton(self,"bSup") - self.bSup.setAutoDefault(1) + self.buttonGroup1 = QButtonGroup(self,"buttonGroup1") + self.buttonGroup1.setMinimumSize(QSize(0,60)) - DRacLayout.addWidget(self.bSup,3,0) + self.RBGroupe = QRadioButton(self.buttonGroup1,"RBGroupe") + self.RBGroupe.setGeometry(QRect(10,20,90,20)) - self.bOk = QPushButton(self,"bOk") - self.bOk.setAutoDefault(1) - self.bOk.setDefault(1) + self.RBalpha = QRadioButton(self.buttonGroup1,"RBalpha") + self.RBalpha.setGeometry(QRect(110,20,100,20)) + self.RBalpha.setChecked(1) - DRacLayout.addMultiCellWidget(self.bOk,3,3,1,2) + DRacLayout.addMultiCellWidget(self.buttonGroup1,1,1,0,2) - self.bHelp = QPushButton(self,"bHelp") - self.bHelp.setAutoDefault(1) + self.LBNouvCommande = QListBox(self,"LBNouvCommande") - DRacLayout.addWidget(self.bHelp,3,3) + DRacLayout.addMultiCellWidget(self.LBNouvCommande,3,3,0,2) - self.LBNouvCommande = QListBox(self,"LBNouvCommande") + self.LBRegles = QListBox(self,"LBRegles") + self.LBRegles.setMinimumSize(QSize(250,350)) - DRacLayout.addMultiCellWidget(self.LBNouvCommande,2,2,0,1) + DRacLayout.addMultiCellWidget(self.LBRegles,2,3,3,4) self.languageChange() - self.resize(QSize(505,513).expandedTo(self.minimumSizeHint())) + self.resize(QSize(519,513).expandedTo(self.minimumSizeHint())) self.clearWState(Qt.WState_Polished) self.connect(self.LBNouvCommande,SIGNAL("doubleClicked(QListBoxItem*)"),self.LBNouvCommandeClicked) @@ -109,14 +111,6 @@ class DRac(QWidget): def languageChange(self): self.setCaption(self.__tr("DMacro")) - 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.textLabel6.setText(self.__tr("Filtre")) - self.BNext.setText(self.__tr("Suivant")) - QToolTip.add(self.BNext,self.__tr("affiche la prochaine occurence")) - self.textLabel1_4.setText(self.__tr("Commandes :")) - self.textLabel1_4_2.setText(self.__trUtf8("\x3c\x62\x3e\x3c\x75\x3e\x52\xc3\xa9\x67\x6c\x65\x73\x20\x3a\x3c\x2f\x75\x3e\x3c\x2f\x62\x3e")) self.bSup.setText(self.__tr("&Supprimer")) self.bSup.setAccel(self.__tr("Alt+S")) QToolTip.add(self.bSup,self.__tr("suppression du mot clef")) @@ -126,6 +120,14 @@ class DRac(QWidget): self.bHelp.setText(self.__tr("&Documentation")) self.bHelp.setAccel(self.__tr("Alt+D")) QToolTip.add(self.bHelp,self.__tr("affichage documentation aster")) + self.textLabel1_4.setText(self.__tr("Commandes :")) + self.textLabel1_4_2.setText(self.__trUtf8("\x3c\x62\x3e\x3c\x75\x3e\x52\xc3\xa9\x67\x6c\x65\x73\x20\x3a\x3c\x2f\x75\x3e\x3c\x2f\x62\x3e")) + self.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.RBGroupe.setText(self.__tr("par groupe")) + self.RBalpha.setText(self.__trUtf8("\x61\x6c\x70\x68\x61\x62\xc3\xa9\x74\x69\x71\x75\x65")) def LBNouvCommandeClicked(self): diff --git a/Ui/desRacine.ui b/Ui/desRacine.ui index 54c67215..2f5ba8cf 100644 --- a/Ui/desRacine.ui +++ b/Ui/desRacine.ui @@ -8,7 +8,7 @@ 0 0 - 505 + 519 513 @@ -25,123 +25,16 @@ unnamed - - - layout4 - - - - unnamed - - - - LEFiltre - - - - 151 - 30 - - - - - - buttonGroup1 - - - Affichage - - - - RBGroupe - - - - 10 - 20 - 90 - 20 - - - - par groupe - - - - - RBalpha - - - - 110 - 20 - 110 - 20 - - - - alphabétique - - - true - - - - - - textLabel6 - - - Filtre - - - - - BNext - - - Suivant - - - - - - affiche la prochaine occurence - - - - - textLabel1_4 - - - <b><u>Commandes :</u></b> - - - - - + - LBRegles + bSup - 250 - 400 + 0 + 30 - - - - textLabel1_4_2 - - - <b><u>Régles :</u></b> - - - - - bSup - &Supprimer @@ -155,10 +48,16 @@ suppression du mot clef - + bOk + + + 0 + 30 + + &Valider @@ -175,10 +74,16 @@ validation de la saisie - + bHelp + + + 0 + 30 + + &Documentation @@ -192,11 +97,132 @@ affichage documentation aster - + + + textLabel1_4 + + + <b><u>Commandes :</u></b> + + + + + textLabel1_4_2 + + + <b><u>Régles :</u></b> + + + + + LEFiltre + + + + 0 + 30 + + + + + + textLabel6 + + + + 40 + 0 + + + + Filtre + + + + + BNext + + + + 60 + 30 + + + + Suivant + + + + + + affiche la prochaine occurence + + + + + buttonGroup1 + + + + 0 + 60 + + + + Affichage + + + + RBGroupe + + + + 10 + 20 + 90 + 20 + + + + par groupe + + + + + RBalpha + + + + 110 + 20 + 100 + 20 + + + + alphabétique + + + true + + + + LBNouvCommande + + + LBRegles + + + + 250 + 350 + + + diff --git a/Ui/myMain.py b/Ui/myMain.py index 7f22fd99..b36b65b8 100644 --- a/Ui/myMain.py +++ b/Ui/myMain.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'myMain.ui' # -# Created: lun avr 7 08:16:42 2008 +# Created: ven mai 16 12:44:22 2008 # by: The PyQt User Interface Compiler (pyuic) 3.13 # # WARNING! All changes made in this file will be lost! @@ -401,7 +401,7 @@ class Eficas(QMainWindow): self.fileOpenAction.setText(self.__tr("Ouvrir")) self.fileOpenAction.setMenuText(self.__tr("&Ouvrir")) self.fileOpenAction.setAccel(self.__tr("Ctrl+O")) - self.fileSaveAction.setText(self.__tr("Enregister")) + self.fileSaveAction.setText(self.__tr("Enregistrer")) self.fileSaveAction.setMenuText(self.__tr("&Enregister")) self.fileSaveAction.setAccel(self.__tr("Ctrl+E")) self.fileSaveAsAction.setText(self.__tr("Enregister Sous")) diff --git a/Ui/myMain.ui b/Ui/myMain.ui index 73a5906b..a636a0ea 100644 --- a/Ui/myMain.ui +++ b/Ui/myMain.ui @@ -173,7 +173,7 @@ image2 - Enregister + Enregistrer &Enregister