From d19f4c5017984171c7fd0331d0a6b878cfd05748 Mon Sep 17 00:00:00 2001 From: Pascale Noyret Date: Wed, 5 Mar 2008 09:13:48 +0000 Subject: [PATCH] *** empty log message *** --- Aster/sdist.py | 2 +- InterfaceQT/browser.py | 16 + InterfaceQT/compoparam.py | 9 +- InterfaceQT/editor.py | 57 +++- InterfaceQT/monCommentairePanel.py | 28 +- InterfaceQT/monFonctionPanel.py | 9 +- InterfaceQT/monIncludePanel.py | 4 + InterfaceQT/monParamPanel.py | 13 +- InterfaceQT/monPlusieursASSDPanel.py | 4 + InterfaceQT/monPlusieursBasePanel.py | 27 ++ InterfaceQT/monPlusieursIntoPanel.py | 27 ++ InterfaceQT/monPoursuitePanel.py | 3 + InterfaceQT/monUniqueASSDPanel.py | 18 ++ InterfaceQT/monUniqueBasePanel.py | 12 + InterfaceQT/monUniqueCompPanel.py | 8 + InterfaceQT/monUniqueSDCOIntoPanel.py | 1 + InterfaceQT/qtCommun.py | 11 +- InterfaceQT/qtEficas.py | 7 + InterfaceQT/qtSaisie.py | 9 +- InterfaceQT/typeNode.py | 1 - InterfaceQT/viewManager.py | 8 +- Noyau/N_VALIDATOR.py | 2 +- Ui/desFormule.py | 123 ++++---- Ui/desFormule.ui | 239 ++++++++------ Ui/desPlusieursBase.py | 68 ++-- Ui/desPlusieursBase.ui | 200 +++++++----- Ui/desPlusieursInto.py | 59 ++-- Ui/desPlusieursInto.ui | 172 +++++----- Ui/desUniqueASSD.py | 37 ++- Ui/desUniqueASSD.ui | 239 +++++++------- Ui/desUniqueBase.py | 59 ++-- Ui/desUniqueBase.ui | 411 +++++++++++------------- Ui/desUniqueInto.py | 37 ++- Ui/desUniqueInto.ui | 227 +++++++------ Ui/desUniqueSDCO.py | 107 ++++--- Ui/desUniqueSDCO.ui | 439 ++++++++++---------------- Ui/desUniqueSDCOInto.py | 36 ++- Ui/desUniqueSDCOInto.ui | 146 +++++---- 38 files changed, 1523 insertions(+), 1352 deletions(-) diff --git a/Aster/sdist.py b/Aster/sdist.py index 2fbe5d25..9b0f3af7 100644 --- a/Aster/sdist.py +++ b/Aster/sdist.py @@ -39,7 +39,7 @@ def main(): copyfiles('../Editeur',os.path.join(path_distrib,'Editeur'),['*.py','faqs.txt']) copyfiles('../InterfaceTK',os.path.join(path_distrib,'InterfaceTK'),['*.py','faqs.txt']) copyfiles('../InterfaceQT',os.path.join(path_distrib,'InterfaceQT'),['*.py']) - copyfiles('../Ui',os.path.join(path_distrib,'Ui'),['*.ui',Makefile]) + copyfiles('../Ui',os.path.join(path_distrib,'Ui'),['*.ui','makefile']) copyfiles('../Traducteur',os.path.join(path_distrib,'Traducteur'),['*.py']) copyfiles('../Ihm',os.path.join(path_distrib,'Ihm'),['*.py']) copyfiles('../Extensions',os.path.join(path_distrib,'Extensions'),['*.py']) diff --git a/InterfaceQT/browser.py b/InterfaceQT/browser.py index 060579ba..5dec0e42 100644 --- a/InterfaceQT/browser.py +++ b/InterfaceQT/browser.py @@ -27,6 +27,8 @@ class JDCTree( QListView ): self.handleContextMenu) self.connect(self, SIGNAL("onItem ( QListViewItem * ) "), self.handleOnItem) + self.connect(self, SIGNAL('mouseButtonPressed(int, QListViewItem*, const QPoint&, int)'), + self.handleNommeItem) def handleContextMenu(self,itm,coord,col): @@ -43,6 +45,19 @@ class JDCTree( QListView ): except: pass + def handleNommeItem(self,bouton,itm,coord,col): + """ + PN --> a finir eventuellement pour nommer + le concept dans l arbre + """ + try : + if itm : + panel=itm.getPanel() + if panel.node.item.object.get_type_produit() != None : + pass + except: + pass + def handleOnItem(self, item ): fr = item.item.get_fr() if self.editor: @@ -192,6 +207,7 @@ class JDCNode(QListViewItem): self.item.connect("add",self.onAdd,()) self.item.connect("supp",self.onSupp,()) self.item.connect("valid",self.onValid,()) + def commentIt(self): """ diff --git a/InterfaceQT/compoparam.py b/InterfaceQT/compoparam.py index 64a78585..bd9bd069 100644 --- a/InterfaceQT/compoparam.py +++ b/InterfaceQT/compoparam.py @@ -15,7 +15,7 @@ import browser import typeNode -class Node(browser.JDCNode,typeNode.PopUpMenuNode): +class Node(browser.JDCNode,typeNode.PopUpMenuNodePartiel): def getPanel(self): """ """ @@ -23,8 +23,7 @@ class Node(browser.JDCNode,typeNode.PopUpMenuNode): return MonParamPanel(self, parent=self.editor ) def createPopUpMenu(self): - typeNode.PopUpMenuNode.createPopUpMenu(self) - + typeNode.PopUpMenuNodePartiel.createPopUpMenu(self) @@ -66,10 +65,10 @@ class PARAMTreeItem(Objecttreeitem.ObjectTreeItem): def GetText(self): """ - Retourne le texte à afficher aprês le nom de la commande (ici aprês 'paramêtre') + Retourne le texte à afficher aprês le nom de la commande (ici apres 'paramêtre') Ce texte est tronqué à 25 caractêres """ - texte = repr(self.object) + texte=self.object.nom+"="+repr(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 01268b3c..b805e313 100644 --- a/InterfaceQT/editor.py +++ b/InterfaceQT/editor.py @@ -30,14 +30,16 @@ class JDCEditor(QSplitter): Editeur de jdc """ - def __init__(self,fn = None, jdc = None ,parent=None, editor = None, units = None): - #--------------------------------------------------------------------------------# + def __init__(self,fn = None, jdc = None ,parent=None, editor = None, units = None, include=0): + #-------------------------------------------------------------------------------------------# QSplitter.__init__(self, parent,'') VERSION_CODE = session.d_env.cata + self.salome=0 self.parent = parent - self.salome = self.parent.salome + if parent != None : + self.salome = self.parent.salome self.top = None self.code = prefs.code self.version_code = VERSION_CODE @@ -104,7 +106,10 @@ class JDCEditor(QSplitter): self.jdc = editor.jdc else: if not self.jdc: # nouveau jdc - self.jdc = self._newJDC(units=units) + if not include : + self.jdc = self._newJDC(units=units) + else : + self.jdc = self._newJDCInclude(units=units) nouveau=1 if self.jdc: @@ -198,6 +203,37 @@ class JDCEditor(QSplitter): jdc.analyse() return jdc + #--------------------------------# + def _newJDCInclude( self ,units = None): + #--------------------------------# + """ + Initialise un nouveau JDC vierge + """ + import Extensions.jdc_include + JdC_aux=Extensions.jdc_include.JdC_include + CONTEXT.unset_current_step() + + jaux=self.readercata.cata[0].JdC( procedure="", + appli=self, + cata=self.readercata.cata, + cata_ord_dico=self.readercata.cata_ordonne_dico, + rep_mat=self.CONFIGURATION.rep_mat, + ) + jaux.analyse() + + J=JdC_aux( procedure="", + appli=self, + cata=self.readercata.cata, + cata_ord_dico=self.readercata.cata_ordonne_dico, + jdc_pere=jaux, + rep_mat=self.CONFIGURATION.rep_mat, + ) + J.analyse() + if units is not None: + J.recorded_units=units + J.old_recorded_units=units + return J + #-----------------------# def get_source(self,file): @@ -298,7 +334,10 @@ class JDCEditor(QSplitter): self.modified = False qApp.restoreOverrideCursor() - self.lastModified = self.fileInfo.lastModified() + if self.fileInfo!= None : + self.lastModified = self.fileInfo.lastModified() + else : + self.lastModified = 1 return jdc #----------------------------------------------# @@ -313,10 +352,10 @@ class JDCEditor(QSplitter): def viewJdcSource(self): #-----------------------# format = self.format_fichier - #f=open(self.JDCDisplay_courant.fichier,'r') - #texteSource=f.read() - #f.close() - #self._viewText(texteSource, "JDC_SOURCE") + f=open(self.fileName,'r') + texteSource=f.read() + f.close() + self._viewText(texteSource, "JDC_SOURCE") #-----------------------# def viewJdcPy(self): diff --git a/InterfaceQT/monCommentairePanel.py b/InterfaceQT/monCommentairePanel.py index 2a60ddbd..4a983a46 100644 --- a/InterfaceQT/monCommentairePanel.py +++ b/InterfaceQT/monCommentairePanel.py @@ -27,19 +27,22 @@ from qt import * from desCommentaire import DComment from qtCommun import QTPanel +from qtCommun import QTPanelTBW2 + import prefs # Import des panels -class MonCommentairePanel(DComment,QTPanel): +class MonCommentairePanel(DComment,QTPanelTBW2,QTPanel): """ Classe définissant le panel associé aux mots-clés qui demandent à l'utilisateur de choisir une seule valeur parmi une liste de valeurs discrètes """ def __init__(self,node, parent = None,name = None,fl = 0): - QTPanel.__init__(self,node,parent) DComment.__init__(self,parent,name,fl) + QTPanel.__init__(self,node,parent) + QTPanelTBW2.__init__(self,node,parent) self.RemplitPanel() def RemplitPanel(self): @@ -52,3 +55,24 @@ class MonCommentairePanel(DComment,QTPanel): self.node.item.set_valeur(texte) self.node.onValid() + def BuildTabCommand(self): + QTPanelTBW2.BuildLBNouvCommande(self) + + def LEFiltreTextChanged(self): + QTPanelTBW2.LEFiltreTextChanged(self) + + def LEfiltreReturnPressed(self): + QTPanelTBW2.LEfiltreReturnPressed(self) + + def LBNouvCommandeClicked(self): + QTPanelTBW2.LBNouvCommandeClicked(self) + + def BNextPressed(self) : + QTPanelTBW2.BNextPressed(self) + + def BOkPressed(self): + QTPanel.BOkPressed(self) + + def ViewDoc(self): + QTPanel.ViewDoc(self) + diff --git a/InterfaceQT/monFonctionPanel.py b/InterfaceQT/monFonctionPanel.py index 36d3d965..8a0a3f3d 100644 --- a/InterfaceQT/monFonctionPanel.py +++ b/InterfaceQT/monFonctionPanel.py @@ -52,7 +52,8 @@ class MonFonctionPanel(MonPlusieursBasePanel): l_valeurs=[] if (len(liste)% self.nbValeurs != 0): message="La cardinalité n'est pas correcte, la dernière valeur est ignorée" - self.Commentaire.setText(QString(commentaire)) + #self.Commentaire.setText(QString(commentaire)) + self.editor.affiche_infos(commentaire) for i in range(len(liste)/ self.nbValeurs) : if (self.nbValeurs==2): t=(liste[i*self.nbValeurs], liste[i*self.nbValeurs+1]) @@ -81,7 +82,8 @@ class MonFonctionPanel(MonPlusieursBasePanel): commentaire += QString(" n est pas un tuple de ") commentaire += QString(str(self.nbValeurs)) commentaire += QString(" valeurs") - self.Commentaire.setText(commentaire) + #self.Commentaire.setText(commentaire) + self.editor.affiche_infos(commentaire) return index=self.LBValeurs.currentItem() +1 @@ -109,7 +111,8 @@ class MonFonctionPanel(MonPlusieursBasePanel): def AjoutNValeur(self,liste) : if len(liste)%self.nbValeurs != 0 : texte="Nombre de valeur incorrecte" - self.Commentaire.setText(texte) + #self.Commentaire.setText(texte) + self.editor.affiche_infos(texte) return listeDecoupee=self.DecoupeListeValeurs(liste) for vals in listeDecoupee : diff --git a/InterfaceQT/monIncludePanel.py b/InterfaceQT/monIncludePanel.py index a9dce88a..3c1eba09 100644 --- a/InterfaceQT/monIncludePanel.py +++ b/InterfaceQT/monIncludePanel.py @@ -95,6 +95,7 @@ class MonIncludePanel(MonMacroPanel): if not os.path.isfile(nomFichier) : commentaire = "Fichier introuvable" self.Commentaire.setText(QString(commentaire)) + self.editor.affiche_infos(commentaire) return text=self.convert_file(nomFichier) @@ -107,11 +108,13 @@ class MonIncludePanel(MonMacroPanel): self.node.item.object.change_fichier_init(nomFichier,text) commentaire = "Fichier modifie : " + self.node.item.get_nom() self.Commentaire.setText(QString(commentaire)) + self.editor.affiche_infos(commentaire) except: l=traceback.format_exception_only("Fichier invalide",sys.exc_info()[1]) QMessageBox.critical( self, "Erreur fatale au chargement du fichier Include", l[0]) commentaire = "Fichier invalide" self.Commentaire.setText(QString(commentaire)) + self.editor.affiche_infos(commentaire) return @@ -129,5 +132,6 @@ class MonIncludePanel(MonMacroPanel): else : commentaire = "Impossible de lire le fichier : Format inconnu" self.Commentaire.setText(QString(commentaire)) + self.editor.affiche_infos(commentaire) return text diff --git a/InterfaceQT/monParamPanel.py b/InterfaceQT/monParamPanel.py index d1917d57..facf0973 100644 --- a/InterfaceQT/monParamPanel.py +++ b/InterfaceQT/monParamPanel.py @@ -27,8 +27,8 @@ import prefs from qt import * from desParam import DParam -from qtCommun import QTPanel -from qtCommun import QTPanelTBW2 +from qtCommun import QTPanel +from qtCommun import QTPanelTBW2 # Import des panels @@ -49,11 +49,8 @@ class MonParamPanel(DParam,QTPanelTBW2,QTPanel): self.lineEditNom.setText(nom) valeur=self.node.item.get_valeur() if valeur != None: - try : - str=QString("").setNum(valeur) - except : - str=QString(valeur) - self.lineEditVal.setText(str) + #str=QString("").setNum(valeur) + self.lineEditVal.setText(repr(valeur)) else : self.lineEditVal.clear() @@ -63,6 +60,7 @@ class MonParamPanel(DParam,QTPanelTBW2,QTPanel): if not nom : commentaire="Entrer un nom de parametre" self.Commentaire.setText(QString(commentaire)) + self.editor.affiche_infos(commentaire) return self.node.item.set_nom(nom) self.node.item.set_valeur(val) @@ -108,6 +106,7 @@ class MonParamPanel(DParam,QTPanelTBW2,QTPanel): else : commentaire="Les noms de parametre doivent commencer par une lettre" self.Commentaire.setText(QString(commentaire)) + self.editor.affiche_infos(commentaire) return None def BuildTabCommand(self): diff --git a/InterfaceQT/monPlusieursASSDPanel.py b/InterfaceQT/monPlusieursASSDPanel.py index 9b7ea7f9..5cc6b305 100644 --- a/InterfaceQT/monPlusieursASSDPanel.py +++ b/InterfaceQT/monPlusieursASSDPanel.py @@ -69,6 +69,9 @@ class MonPlusieursASSDPanel(MonPlusieursIntoPanel): self.listNomsValeurs.append(i.get_name()) def BOkPourListePressed(self): + if self.listeValeursCourantes == [] : + self.editor.affiche_infos("Pas de Validation d un groupe vide") + return self.node.item.set_valeur(self.listeValeursCourantes) self.editor.affiche_infos("Valeur Acceptée") pass @@ -91,6 +94,7 @@ class MonPlusieursASSDPanel(MonPlusieursIntoPanel): def Ajout1Valeur(self): liste=[] + if self.listBoxVal.currentText().latin1() == None : return liste.append(self.listBoxVal.currentText().latin1()) index=self.LBValeurs.currentItem() + 1 if index==0 : index = -1 diff --git a/InterfaceQT/monPlusieursBasePanel.py b/InterfaceQT/monPlusieursBasePanel.py index ae0a176b..fea6cb71 100644 --- a/InterfaceQT/monPlusieursBasePanel.py +++ b/InterfaceQT/monPlusieursBasePanel.py @@ -45,6 +45,7 @@ class MonPlusieursBasePanel(DPlusBase,QTPanel,SaisieValeur): self.politique=PolitiquePlusieurs(node,parent) self.BuildLBValeurs() self.listeValeursCourantes=self.node.item.GetListeValeurs() + self.InitCommentaire() def ViewDoc(self): QTPanel.ViewDoc(self) @@ -54,6 +55,9 @@ class MonPlusieursBasePanel(DPlusBase,QTPanel,SaisieValeur): SaisieValeur.BuildLBValeurs(self) def BOkPourListePressed(self): + if self.listeValeursCourantes == [] : + self.editor.affiche_infos("Pas de validation d un groupe vide") + return self.node.item.set_valeur(self.listeValeursCourantes) self.editor.affiche_infos("Valeur Acceptée") @@ -107,3 +111,26 @@ class MonPlusieursBasePanel(DPlusBase,QTPanel,SaisieValeur): if fn == "" : return from monSelectVal import MonSelectVal MonSelectVal(file=fn,parent=self).show() + + def InitCommentaire(self): + commentaire="" + mc = self.node.item.get_definition() + d_aides = { 'TXM' : 'chaînes de caractères', + 'R' : 'réels', + 'I' : 'entiers', + 'C' : 'complexes'} + type = mc.type[0] + if not d_aides.has_key(type) : + if mc.min == mc.max: + commentaire="Entrez "+str(mc.min)+" valeurs " + else : + commentaire="Entrez entre "+str(mc.min)+" et "+str(mc.max)+" valeurs " + else : + if mc.min == mc.max: + commentaire="Entrez "+str(mc.min)+" "+d_aides[type] + else : + commentaire="Entrez entre "+str(mc.min)+" et "+str(mc.max) +" " + d_aides[type] + aideval=self.node.item.aide() + commentaire=commentaire + "\n" + aideval + self.Commentaire.setText(QString(commentaire)) + diff --git a/InterfaceQT/monPlusieursIntoPanel.py b/InterfaceQT/monPlusieursIntoPanel.py index fe9aa862..80fa4235 100644 --- a/InterfaceQT/monPlusieursIntoPanel.py +++ b/InterfaceQT/monPlusieursIntoPanel.py @@ -47,8 +47,12 @@ class MonPlusieursIntoPanel(DPlusInto,QTPanel,SaisieValeur): self.listeValeursCourantes=self.node.item.GetListeValeurs() SaisieValeur.RemplitPanel(self,self.listeValeursCourantes) QObject.connect(self.listBoxVal, SIGNAL("doubleClicked(QListBoxItem*)" ), self.Ajout1Valeur ) + self.InitCommentaire() def BOkPourListePressed(self): + if self.listeValeursCourantes == [] : + self.editor.affiche_infos("Pas de validation d un groupe vide") + return self.node.item.set_valeur(self.listeValeursCourantes) self.editor.affiche_infos("Valeur Acceptée") @@ -71,6 +75,7 @@ class MonPlusieursIntoPanel(DPlusInto,QTPanel,SaisieValeur): def Ajout1Valeur(self): liste=[] + if self.listBoxVal.currentText().latin1() == None : return liste.append(self.listBoxVal.currentText().latin1()) index=self.LBValeurs.currentItem() + 1 if index==0 : index = -1 @@ -90,3 +95,25 @@ class MonPlusieursIntoPanel(DPlusInto,QTPanel,SaisieValeur): self.listeValeursCourantes=l1+listeRetour+l3 SaisieValeur.RemplitPanel(self,self.listeValeursCourantes) + def InitCommentaire(self): + commentaire="" + mc = self.node.item.get_definition() + d_aides = { 'TXM' : 'chaînes de caractères', + 'R' : 'réels', + 'I' : 'entiers', + 'C' : 'complexes'} + type = mc.type[0] + if not d_aides.has_key(type) : + if mc.min == mc.max: + commentaire="Entrez "+str(mc.min)+" valeurs " + else : + commentaire="Entrez entre "+str(mc.min)+" et "+str(mc.max)+" valeurs " + else : + if mc.min == mc.max: + commentaire="Entrez "+str(mc.min)+" "+d_aides[type] + else : + commentaire="Entrez entre "+str(mc.min)+" et "+str(mc.max)+" "+d_aides[type] + aideval=self.node.item.aide() + commentaire=commentaire + "\n" + aideval + self.Commentaire.setText(QString(commentaire)) + diff --git a/InterfaceQT/monPoursuitePanel.py b/InterfaceQT/monPoursuitePanel.py index cb202ad6..3ba31b20 100644 --- a/InterfaceQT/monPoursuitePanel.py +++ b/InterfaceQT/monPoursuitePanel.py @@ -74,6 +74,7 @@ class MonPoursuitePanel(MonMacroPanel): if not os.path.isfile(nomFichier) : commentaire = "Fichier introuvable" self.Commentaire.setText(QString(commentaire)) + self.editor.affiche_infos(commentaire) return text=self.convert_file(nomFichier) @@ -91,6 +92,7 @@ class MonPoursuitePanel(MonMacroPanel): QMessageBox.critical( self, "Erreur fatale au chargement du fichier Include", l[0]) commentaire = "Fichier invalide" self.Commentaire.setText(QString(commentaire)) + self.editor.affiche_infos(commentaire) return @@ -108,5 +110,6 @@ class MonPoursuitePanel(MonMacroPanel): else : commentaire = "Impossible de lire le fichier : Format inconnu" self.Commentaire.setText(QString(commentaire)) + self.editor.affiche_infos(commentaire) return text diff --git a/InterfaceQT/monUniqueASSDPanel.py b/InterfaceQT/monUniqueASSDPanel.py index c7c96493..c24f9062 100644 --- a/InterfaceQT/monUniqueASSDPanel.py +++ b/InterfaceQT/monUniqueASSDPanel.py @@ -44,6 +44,7 @@ class MonUniqueASSDPanel(DUnASSD,QTPanel,SaisieValeur): DUnASSD.__init__(self,parent,name,fl) self.politique=PolitiqueUnique(node,parent) self.InitListBoxASSD() + self.InitCommentaire() def BOkPressed(self): self.ClicASSD() @@ -54,3 +55,20 @@ class MonUniqueASSDPanel(DUnASSD,QTPanel,SaisieValeur): def ViewDoc(self): QTPanel.ViewDoc(self) + def InitCommentaire(self): + mc = self.node.item.get_definition() + try : + type = mc.type[0].__name__ + except : + type = str(mc.type[0]) + if len(mc.type)>1 : + for typ in mc.type[1:] : + try : + l=typ.__name__ + except: + l=str(typ) + type = type + ' ou '+l + commentaire="Un objet de type "+type+" est attendu" + aideval=self.node.item.aide() + commentaire=commentaire +"\n"+ aideval + self.Commentaire.setText(QString(commentaire)) diff --git a/InterfaceQT/monUniqueBasePanel.py b/InterfaceQT/monUniqueBasePanel.py index 30161f97..e2bd9c59 100644 --- a/InterfaceQT/monUniqueBasePanel.py +++ b/InterfaceQT/monUniqueBasePanel.py @@ -44,6 +44,7 @@ class MonUniqueBasePanel(DUnBase,QTPanel,SaisieValeur): DUnBase.__init__(self,parent,name,fl) self.politique=PolitiqueUnique(node,parent) self.InitLineEditVal() + self.InitCommentaire() def ViewDoc(self): QTPanel.ViewDoc(self) @@ -58,6 +59,17 @@ class MonUniqueBasePanel(DUnBase,QTPanel,SaisieValeur): str=QString(valeurTexte) self.lineEditVal.setText(str) + def InitCommentaire(self): + mc = self.node.item.get_definition() + d_aides = { 'TXM' : "Une chaîne de caractères est attendue", + 'R' : "Un réel est attendu", + 'I' : "Un entier est attendu"} + type = mc.type[0] + commentaire=d_aides.get(type,"Type de base inconnu") + aideval=self.node.item.aide() + commentaire=commentaire +"\n"+ aideval + self.Commentaire.setText(QString(commentaire)) + def BOk2Pressed(self): SaisieValeur.BOk2Pressed(self) diff --git a/InterfaceQT/monUniqueCompPanel.py b/InterfaceQT/monUniqueCompPanel.py index 05647db6..46a85338 100644 --- a/InterfaceQT/monUniqueCompPanel.py +++ b/InterfaceQT/monUniqueCompPanel.py @@ -44,6 +44,7 @@ class MonUniqueCompPanel(DUnComp,QTPanel,PolitiqueUnique): DUnComp.__init__(self,parent,name,fl) self.politique=PolitiqueUnique(node,parent) self.InitLinesVal() + self.InitCommentaire() def InitLinesVal(self): valeur=self.node.item.get_valeur() @@ -147,6 +148,13 @@ class MonUniqueCompPanel(DUnComp,QTPanel,PolitiqueUnique): return None return v + def InitCommentaire(self): + commentaire='Un complexe est attendu' + aideval=self.node.item.aide() + commentaire=commentaire +"\n"+ aideval + self.Commentaire.setText(QString(commentaire)) + + def BSupPressed(self): QTPanel.BSupPressed(self) diff --git a/InterfaceQT/monUniqueSDCOIntoPanel.py b/InterfaceQT/monUniqueSDCOIntoPanel.py index 3ec103ca..ff80d41c 100644 --- a/InterfaceQT/monUniqueSDCOIntoPanel.py +++ b/InterfaceQT/monUniqueSDCOIntoPanel.py @@ -91,6 +91,7 @@ class MonUniqueSDCOIntoPanel(DUnSDCOInto,QTPanel,SaisieSDCO): else : commentaire = self.node.item.get_cr() self.reset_old_valeur(anc_val,mess=mess) + self.editor.affiche_infos(commentaire) self.Commentaire.setText(commentaire) def LESDCOReturnPressed(self) : diff --git a/InterfaceQT/qtCommun.py b/InterfaceQT/qtCommun.py index 0e90aa8e..e94ccf6b 100644 --- a/InterfaceQT/qtCommun.py +++ b/InterfaceQT/qtCommun.py @@ -200,6 +200,7 @@ class QTPanelTBW2(QTPanel): self.LBNouvCommande.insertItem( aCmd) self.LBNouvCommande.insertItem( " " ) QObject.connect( self.LBNouvCommande, SIGNAL("doubleClicked(QListBoxItem*)"),self.DefCmd ) + QObject.connect( self.LBNouvCommande, SIGNAL("clicked(QListBoxItem*)"),self.DefCmd ) def DefCmd(self): if self.LBNouvCommande.selectedItem()== 0 : return @@ -218,13 +219,19 @@ class QTPanelTBW2(QTPanel): if MonItem != None : self.LBNouvCommande.setCurrentItem(MonItem) self.LBNouvCommande.setSelected(MonItem,1) + try : + QObject.disconnect(self.LBNouvCommande,SIGNAL("returnPressed(QListBoxItem*)"),self.DefCmd) + except : + pass def LEfiltreReturnPressed(self): self.DefCmd() def BNextPressed(self): - self.LBNouvCommande.setCurrentItem(self.LBNouvCommande.currentItem()+1) - self.LEFiltreTextChanged() + MonItem=self.LBNouvCommande.findItem(self.LEFiltre.text().upper(),Qt.Contains) + if MonItem != None : + self.LBNouvCommande.setCurrentItem(self.LBNouvCommande.currentItem()+1) + self.LEFiltreTextChanged() def LBNouvCommandeClicked(self): name=str(self.LBNouvCommande.currentText()) diff --git a/InterfaceQT/qtEficas.py b/InterfaceQT/qtEficas.py index 65552acf..93443557 100644 --- a/InterfaceQT/qtEficas.py +++ b/InterfaceQT/qtEficas.py @@ -227,6 +227,13 @@ class Appli(Eficas): texte=monEditeur.get_source(file) return texte + def helpAbout(self): + import AIDE + AIDE.go() + + def NewInclude(self): + self.viewmanager.newIncludeEditor() + if __name__=='__main__': # Modules Eficas diff --git a/InterfaceQT/qtSaisie.py b/InterfaceQT/qtSaisie.py index f9cae0e7..bc69b4a1 100644 --- a/InterfaceQT/qtSaisie.py +++ b/InterfaceQT/qtSaisie.py @@ -68,14 +68,16 @@ class SaisieValeur: self.Commentaire.setText(commentaire) valeur=valeurQstring.latin1() validite,commentaire=self.politique.RecordValeur(valeur) - self.Commentaire.setText(QString(commentaire)) + #self.Commentaire.setText(QString(commentaire)) + self.editor.affiche_infos(commentaire) def ClicValeur(self): if self.listBoxVal.selectedItem()== None : return valeurQstring=self.listBoxVal.selectedItem().text() valeur=valeurQstring.latin1() validite,commentaire=self.politique.RecordValeur(valeur) - self.Commentaire.setText(QString(commentaire)) + #self.Commentaire.setText(QString(commentaire)) + self.editor.affiche_infos(commentaire) def BOkPressed(self): if self.listBoxVal.selectedItem()==None : @@ -99,7 +101,8 @@ class SaisieValeur: nouvelleValeur=valeur validite,commentaire=self.politique.RecordValeur(nouvelleValeur) if commentaire != "" : - self.Commentaire.setText(QString(commentaire)) + #self.Commentaire.setText(QString(commentaire)) + self.editor.affiche_infos(commentaire) def TraiteLEValeur(self,valeurTraitee=None) : diff --git a/InterfaceQT/typeNode.py b/InterfaceQT/typeNode.py index 71e22c22..53d3f54c 100644 --- a/InterfaceQT/typeNode.py +++ b/InterfaceQT/typeNode.py @@ -50,5 +50,4 @@ class PopUpMenuNode(PopUpMenuNodePartiel) : #-----------------------------------------# def createPopUpMenu(self): PopUpMenuNodePartiel.createPopUpMenu(self) - self.commentMenu.insertItem( 'ce noeud', self.commentIt ) diff --git a/InterfaceQT/viewManager.py b/InterfaceQT/viewManager.py index fc345e29..55bbde77 100644 --- a/InterfaceQT/viewManager.py +++ b/InterfaceQT/viewManager.py @@ -1053,12 +1053,15 @@ class ViewManager: else: return - def newEditor(self): + def newIncludeEditor(self) : + self.newEditor(include=1) + + def newEditor(self,include=0): """ Public slot to generate a new empty editor. """ from editor import JDCEditor - editor = JDCEditor(None,None,self) + editor = JDCEditor(None,None,self,include=include) self.editors.append(editor) self.connect(editor, PYSIGNAL('modificationStatusChanged'), @@ -2440,7 +2443,6 @@ class MyTabview(Tabview): @return String name of directory to start or None """ # if we have an active source, return its path - print self.activeWindow() if self.activeWindow() is not None and \ self.activeWindow().getFileName(): return os.path.dirname(self.activeWindow().getFileName()) diff --git a/Noyau/N_VALIDATOR.py b/Noyau/N_VALIDATOR.py index 61a79a4c..2948164e 100644 --- a/Noyau/N_VALIDATOR.py +++ b/Noyau/N_VALIDATOR.py @@ -473,7 +473,7 @@ class NoRepeat(ListVal): self.cata_info="" def info(self): - return ": pas de présence de doublon dans la liste" + return "pas de présence de doublon dans la liste" def info_erreur_liste(self): return "Les doublons ne sont pas permis" diff --git a/Ui/desFormule.py b/Ui/desFormule.py index db3fa6bf..9d8c7399 100644 --- a/Ui/desFormule.py +++ b/Ui/desFormule.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'desFormule.ui' # -# Created: mar mar 4 10:36:38 2008 +# Created: mar mar 4 16:24:30 2008 # by: The PyQt User Interface Compiler (pyuic) 3.13 # # WARNING! All changes made in this file will be lost! @@ -47,69 +47,90 @@ class DFormule(QWidget): DFormuleLayout = QGridLayout(self,1,1,11,6,"DFormuleLayout") - self.Commentaire = QLabel(self,"Commentaire") - - DFormuleLayout.addMultiCellWidget(self.Commentaire,1,1,0,2) + layout4 = QHBoxLayout(None,0,6,"layout4") - self.TWChoix = QTabWidget(self,"TWChoix") + self.bSup = QPushButton(self,"bSup") + self.bSup.setMinimumSize(QSize(0,30)) + self.bSup.setAutoDefault(1) + layout4.addWidget(self.bSup) - self.Formule = QWidget(self.TWChoix,"Formule") - FormuleLayout = QGridLayout(self.Formule,1,1,11,6,"FormuleLayout") + self.bOk = QPushButton(self,"bOk") + self.bOk.setMinimumSize(QSize(0,30)) + self.bOk.setAutoDefault(1) + self.bOk.setDefault(1) + layout4.addWidget(self.bOk) - self.textLabel1_5 = QLabel(self.Formule,"textLabel1_5") - self.textLabel1_5.setMinimumSize(QSize(0,0)) + self.bHelp = QPushButton(self,"bHelp") + self.bHelp.setMinimumSize(QSize(0,30)) + self.bHelp.setAutoDefault(1) + layout4.addWidget(self.bHelp) - FormuleLayout.addMultiCellWidget(self.textLabel1_5,4,4,0,1) + DFormuleLayout.addLayout(layout4,2,0) - self.LECorpsFormule = QLineEdit(self.Formule,"LECorpsFormule") + self.Commentaire = QLabel(self,"Commentaire") - FormuleLayout.addMultiCellWidget(self.LECorpsFormule,5,5,0,1) + DFormuleLayout.addWidget(self.Commentaire,1,0) - self.textLabel1_2 = QLabel(self.Formule,"textLabel1_2") + self.TWChoix = QTabWidget(self,"TWChoix") - FormuleLayout.addWidget(self.textLabel1_2,0,1) + self.Formule = QWidget(self.TWChoix,"Formule") + FormuleLayout = QGridLayout(self.Formule,1,1,11,6,"FormuleLayout") self.textLabel1 = QLabel(self.Formule,"textLabel1") self.textLabel1.setMinimumSize(QSize(0,0)) FormuleLayout.addWidget(self.textLabel1,0,0) - self.textLabel1_3_2 = QLabel(self.Formule,"textLabel1_3_2") - - FormuleLayout.addMultiCellWidget(self.textLabel1_3_2,7,7,0,1) - self.textLabel1_3 = QLabel(self.Formule,"textLabel1_3") FormuleLayout.addMultiCellWidget(self.textLabel1_3,6,6,0,1) - self.textLabel2 = QLabel(self.Formule,"textLabel2") - - FormuleLayout.addWidget(self.textLabel2,1,1) - layout6 = QHBoxLayout(None,0,6,"layout6") self.LENomFormule = QLineEdit(self.Formule,"LENomFormule") self.LENomFormule.setMinimumSize(QSize(0,40)) layout6.addWidget(self.LENomFormule) - layout4 = QHBoxLayout(None,0,6,"layout4") + layout4_2 = QHBoxLayout(None,0,6,"layout4_2") self.textLabel1_6 = QLabel(self.Formule,"textLabel1_6") - layout4.addWidget(self.textLabel1_6) + layout4_2.addWidget(self.textLabel1_6) self.LENomsArgs = QLineEdit(self.Formule,"LENomsArgs") self.LENomsArgs.setMinimumSize(QSize(230,40)) - layout4.addWidget(self.LENomsArgs) + layout4_2.addWidget(self.LENomsArgs) self.textLabel1_6_2 = QLabel(self.Formule,"textLabel1_6_2") - layout4.addWidget(self.textLabel1_6_2) - layout6.addLayout(layout4) + 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_2 = QLabel(self.Formule,"textLabel2_2") - FormuleLayout.addWidget(self.textLabel2_2,3,1) + FormuleLayout.addMultiCellWidget(self.textLabel2_2,3,3,0,1) + + self.textLabel1_5 = QLabel(self.Formule,"textLabel1_5") + self.textLabel1_5.setMinimumSize(QSize(0,0)) + + FormuleLayout.addMultiCellWidget(self.textLabel1_5,4,4,0,1) + + self.LECorpsFormule = QLineEdit(self.Formule,"LECorpsFormule") + self.LECorpsFormule.setMinimumSize(QSize(0,30)) + + FormuleLayout.addMultiCellWidget(self.LECorpsFormule,5,5,0,1) + + self.textLabel1_2 = QLabel(self.Formule,"textLabel1_2") + + FormuleLayout.addWidget(self.textLabel1_2,0,1) self.TWChoix.insertTab(self.Formule,QString("")) self.Commande = QWidget(self.TWChoix,"Commande") @@ -157,27 +178,11 @@ class DFormule(QWidget): CommandeLayout.addMultiCellWidget(self.LBNouvCommande,2,2,0,3) self.TWChoix.insertTab(self.Commande,QString("")) - DFormuleLayout.addMultiCellWidget(self.TWChoix,0,0,0,2) - - self.bSup = QPushButton(self,"bSup") - self.bSup.setAutoDefault(1) - - DFormuleLayout.addWidget(self.bSup,2,0) - - self.bOk = QPushButton(self,"bOk") - self.bOk.setAutoDefault(1) - self.bOk.setDefault(1) - - DFormuleLayout.addWidget(self.bOk,2,1) - - self.bHelp = QPushButton(self,"bHelp") - self.bHelp.setAutoDefault(1) - - DFormuleLayout.addWidget(self.bHelp,2,2) + DFormuleLayout.addWidget(self.TWChoix,0,0) self.languageChange() - self.resize(QSize(529,484).expandedTo(self.minimumSizeHint())) + self.resize(QSize(529,493).expandedTo(self.minimumSizeHint())) self.clearWState(Qt.WState_Polished) self.connect(self.LBNouvCommande,SIGNAL("clicked(QListBoxItem*)"),self.LBNouvCommandeClicked) @@ -196,16 +201,25 @@ class DFormule(QWidget): def languageChange(self): self.setCaption(self.__tr("DMacro")) + self.bSup.setText(self.__tr("&Supprimer")) + self.bSup.setAccel(self.__tr("Alt+S")) + QToolTip.add(self.bSup,self.__tr("suppression du mot clef")) + self.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.textLabel1_5.setText(self.__tr("

Corps de la formule

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

Arguments

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

Nom de la formule

")) - self.textLabel1_3_2.setText(self.__trUtf8("\x43\x65\x20\x6e\x27\x65\x73\x74\x20\x71\x75\x27\x61\x70\x72\xc3\xa8\x73\x20\x61\x76\x6f\x69\x72\x20\x61\x70\x70\x75\x79\xc3\xa9\x20\x73\x75\x72\x20\x6c\x65\x20\x62\x6f\x75\x74\x6f\x6e\x20\x56\x61\x6c\x69\x64\x65\x72\x20\x71\x75\x65\x20\x6c\x65\x73\x20\x6e\x6f\x75\x76\x65\x6c\x6c\x65\x73\x0a\x76\x61\x6c\x65\x75\x72\x73\x20\x73\x65\x72\x6f\x6e\x74\x20\x65\x66\x66\x65\x63\x74\x69\x76\x65\x6d\x65\x6e\x74\x20\x70\x72\x69\x73\x65\x73\x20\x65\x6e\x20\x63\x6f\x6d\x70\x74\x65")) self.textLabel1_3.setText(self.__trUtf8("\x52\x65\x74\x6f\x75\x72\x2d\x43\x68\x61\x72\x69\x6f\x74\x20\x70\x65\x72\x6d\x65\x74\x20\x64\x65\x20\x76\xc3\xa9\x72\x69\x66\x69\x65\x72\x20\x71\x75\x65\x20\x6c\x27\x65\x78\x70\x72\x65\x73\x73\x69\x6f\x6e\x20\x65\x73\x74\x20\x76\x61\x6c\x69\x64\x65\x2e")) - self.textLabel2.setText(self.__trUtf8("\x76\x61\x72\x69\x61\x62\x6c\x65\x73\x20\x73\xc3\xa9\x70\x61\x72\xc3\xa9\x65\x73\x20\x70\x61\x72\x20\x64\x65\x73\x20\x22\x2c\x22\x20\x70\x61\x72\x20\x65\x78\x2e\x20\x3a\x20\x78\x2c\x79\x2c\x7a")) self.textLabel1_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.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 :")) @@ -216,15 +230,6 @@ class DFormule(QWidget): QToolTip.add(self.BNext,self.__tr("affiche la prochaine occurence")) self.textLabel6.setText(self.__tr("Filtre")) self.TWChoix.changeTab(self.Commande,self.__tr("Nouvelle Commande")) - self.bSup.setText(self.__tr("&Supprimer")) - self.bSup.setAccel(self.__tr("Alt+S")) - QToolTip.add(self.bSup,self.__tr("suppression du mot clef")) - self.bOk.setText(self.__tr("&Valider")) - self.bOk.setAccel(self.__tr("Shift+A, Alt+A, Alt+A, Alt+A")) - QToolTip.add(self.bOk,self.__tr("validation de la saisie")) - self.bHelp.setText(self.__tr("&Documentation")) - self.bHelp.setAccel(self.__tr("Alt+D")) - QToolTip.add(self.bHelp,self.__tr("affichage documentation aster")) def LBNouvCommandeClicked(self): diff --git a/Ui/desFormule.ui b/Ui/desFormule.ui index 84f92d56..80b9c9b2 100644 --- a/Ui/desFormule.ui +++ b/Ui/desFormule.ui @@ -9,7 +9,7 @@ 0 0 529 - 484 + 493 @@ -25,7 +25,89 @@ unnamed - + + + layout4 + + + + unnamed + + + + bSup + + + + 0 + 30 + + + + &Supprimer + + + Alt+S + + + true + + + suppression du mot clef + + + + + bOk + + + + 0 + 30 + + + + &Valider + + + Shift+A, Alt+A, Alt+A, Alt+A + + + true + + + true + + + validation de la saisie + + + + + bHelp + + + + 0 + 30 + + + + &Documentation + + + Alt+D + + + true + + + affichage documentation aster + + + + + Commentaire @@ -33,7 +115,7 @@ - + TWChoix @@ -48,33 +130,6 @@ unnamed - - - textLabel1_5 - - - - 0 - 0 - - - - <h3><p align="center"><u><b>Corps de la formule</b></u></p></h3> - - - - - LECorpsFormule - - - - - textLabel1_2 - - - <h3><p align="center"><u><b>Arguments</b></u></p></h3> - - textLabel1 @@ -89,15 +144,6 @@ <h3><p align="center"><u><b>Nom de la formule</b></u></p></h3> - - - textLabel1_3_2 - - - Ce n'est qu'après avoir appuyé sur le bouton Valider que les nouvelles -valeurs seront effectivement prises en compte - - textLabel1_3 @@ -106,14 +152,6 @@ valeurs seront effectivement prises en compte Retour-Chariot permet de vérifier que l'expression est valide. - - - textLabel2 - - - variables séparées par des "," par ex. : x,y,z - - layout6 @@ -172,7 +210,25 @@ valeurs seront effectivement prises en compte - + + + textLabel2 + + + 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 +valeurs seront effectivement prises en compte + + + textLabel2_2 @@ -180,6 +236,39 @@ valeurs seront effectivement prises en compte <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> + + @@ -295,60 +384,6 @@ valeurs seront effectivement prises en compte - - - bSup - - - &Supprimer - - - Alt+S - - - true - - - suppression du mot clef - - - - - bOk - - - &Valider - - - Shift+A, Alt+A, Alt+A, Alt+A - - - true - - - true - - - validation de la saisie - - - - - bHelp - - - &Documentation - - - Alt+D - - - true - - - affichage documentation aster - - diff --git a/Ui/desPlusieursBase.py b/Ui/desPlusieursBase.py index 3760ba9b..c23a084a 100644 --- a/Ui/desPlusieursBase.py +++ b/Ui/desPlusieursBase.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'desPlusieursBase.ui' # -# Created: mar mar 4 10:36:38 2008 +# Created: mar mar 4 17:30:52 2008 # by: The PyQt User Interface Compiler (pyuic) 3.13 # # WARNING! All changes made in this file will be lost! @@ -80,20 +80,6 @@ class DPlusBase(QWidget): self.textLabel1 = QLabel(self.Widget8,"textLabel1") Widget8Layout.addWidget(self.textLabel1,0,0) - spacer5 = QSpacerItem(120,20,QSizePolicy.Expanding,QSizePolicy.Minimum) - Widget8Layout.addMultiCell(spacer5,4,4,1,2) - - layout6 = QVBoxLayout(None,0,6,"layout6") - - self.bParam = QPushButton(self.Widget8,"bParam") - self.bParam.setAutoDefault(1) - layout6.addWidget(self.bParam) - - self.bImport = QPushButton(self.Widget8,"bImport") - self.bImport.setAutoDefault(1) - layout6.addWidget(self.bImport) - - Widget8Layout.addMultiCellLayout(layout6,3,4,3,3) layout19 = QVBoxLayout(None,0,6,"layout19") @@ -114,9 +100,7 @@ class DPlusBase(QWidget): self.LBValeurs = QListBox(self.Widget8,"LBValeurs") - Widget8Layout.addMultiCellWidget(self.LBValeurs,1,4,0,0) - spacer3 = QSpacerItem(31,131,QSizePolicy.Minimum,QSizePolicy.Expanding) - Widget8Layout.addItem(spacer3,2,3) + Widget8Layout.addMultiCellWidget(self.LBValeurs,1,5,0,0) layout8 = QVBoxLayout(None,0,6,"layout8") spacer5_2 = QSpacerItem(20,31,QSizePolicy.Minimum,QSizePolicy.Expanding) @@ -136,28 +120,50 @@ class DPlusBase(QWidget): spacer4 = QSpacerItem(21,231,QSizePolicy.Minimum,QSizePolicy.Expanding) layout8.addItem(spacer4) - Widget8Layout.addMultiCellLayout(layout8,0,3,1,1) + Widget8Layout.addMultiCellLayout(layout8,0,4,1,1) self.Commentaire = QLabel(self.Widget8,"Commentaire") + self.Commentaire.setMinimumSize(QSize(0,60)) - Widget8Layout.addMultiCellWidget(self.Commentaire,5,5,0,3) + Widget8Layout.addMultiCellWidget(self.Commentaire,2,2,2,3) - layout7 = QHBoxLayout(None,0,6,"layout7") + layout6 = QHBoxLayout(None,0,6,"layout6") self.bSup = QPushButton(self.Widget8,"bSup") + self.bSup.setMinimumSize(QSize(0,30)) self.bSup.setAutoDefault(1) - layout7.addWidget(self.bSup) + layout6.addWidget(self.bSup) self.bOk = QPushButton(self.Widget8,"bOk") + self.bOk.setMinimumSize(QSize(0,30)) self.bOk.setAutoDefault(1) self.bOk.setDefault(1) - layout7.addWidget(self.bOk) + layout6.addWidget(self.bOk) self.bHelp = QPushButton(self.Widget8,"bHelp") + self.bHelp.setMinimumSize(QSize(0,30)) self.bHelp.setAutoDefault(1) - layout7.addWidget(self.bHelp) + layout6.addWidget(self.bHelp) + + Widget8Layout.addMultiCellLayout(layout6,6,6,0,3) + spacer3 = QSpacerItem(31,130,QSizePolicy.Minimum,QSizePolicy.Expanding) + Widget8Layout.addItem(spacer3,3,3) + spacer5 = QSpacerItem(160,20,QSizePolicy.Expanding,QSizePolicy.Minimum) + Widget8Layout.addMultiCell(spacer5,5,5,1,2) + + layout7 = QVBoxLayout(None,0,6,"layout7") + + self.bParam = QPushButton(self.Widget8,"bParam") + self.bParam.setMinimumSize(QSize(0,30)) + self.bParam.setAutoDefault(1) + layout7.addWidget(self.bParam) + + self.bImport = QPushButton(self.Widget8,"bImport") + self.bImport.setMinimumSize(QSize(0,30)) + self.bImport.setAutoDefault(1) + layout7.addWidget(self.bImport) - Widget8Layout.addMultiCellLayout(layout7,6,6,0,3) + Widget8Layout.addMultiCellLayout(layout7,4,5,3,3) self.tabuniqueinto.insertTab(self.Widget8,QString("")) DPlusBaseLayout.addWidget(self.tabuniqueinto,0,0) @@ -180,12 +186,6 @@ class DPlusBase(QWidget): def languageChange(self): self.setCaption(self.__tr("DUnIn")) self.textLabel1.setText(self.__tr("Valeur(s) actuelle(s)")) - self.bParam.setText(self.__tr("&Parametres")) - self.bParam.setAccel(self.__tr("Alt+P")) - QToolTip.add(self.bParam,self.__tr("suppression du mot clef")) - self.bImport.setText(self.__tr("&Importer")) - self.bImport.setAccel(self.__tr("Alt+I")) - QToolTip.add(self.bImport,self.__tr("suppression du mot clef")) self.textLabel1_2.setText(self.__tr("Valeur")) self.BAjout1Val.setText(QString.null) QToolTip.add(self.BAjout1Val,self.__trUtf8("\x61\x6a\x6f\x75\x74\x65\x20\x6c\x61\x20\x76\x61\x6c\x65\x75\x72\x20\x73\x61\x69\x73\x69\x65\x20\x73\x6f\x75\x73\x20\x6c\x20\x6f\x63\x63\x75\x72\x65\x6e\x63\x65\x20\x73\x65\x6c\x65\x63\x74\x69\x6f\x6e\x6e\xc3\xa9\x65\x20\x28\x65\x6e\x20\x66\x69\x6e\x20\x64\x65\x20\x6c\x69\x73\x74\x65\x20\x73\x69\x20\x69\x6c\x20\x6e\x20\x79\x20\x61\x20\x70\x61\x73\x20\x64\x65\x20\x73\x65\x6c\x65\x63\x74\x69\x6f\x6e\x29")) @@ -201,6 +201,12 @@ class DPlusBase(QWidget): self.bHelp.setText(self.__tr("&Documentation")) self.bHelp.setAccel(self.__tr("Alt+D")) QToolTip.add(self.bHelp,self.__tr("affichage documentation aster")) + self.bParam.setText(self.__tr("&Parametres")) + self.bParam.setAccel(self.__tr("Alt+P")) + QToolTip.add(self.bParam,self.__tr("suppression du mot clef")) + self.bImport.setText(self.__tr("&Importer")) + self.bImport.setAccel(self.__tr("Alt+I")) + QToolTip.add(self.bImport,self.__tr("suppression du mot clef")) self.tabuniqueinto.changeTab(self.Widget8,self.__tr("Saisir Valeur")) diff --git a/Ui/desPlusieursBase.ui b/Ui/desPlusieursBase.ui index 5c2578d6..3a6e13da 100644 --- a/Ui/desPlusieursBase.ui +++ b/Ui/desPlusieursBase.ui @@ -48,67 +48,6 @@ <u><font size="+1">Valeur(s) actuelle(s)</font></u> - - - spacer5 - - - Horizontal - - - Expanding - - - - 120 - 20 - - - - - - layout6 - - - - unnamed - - - - bParam - - - &Parametres - - - Alt+P - - - true - - - suppression du mot clef - - - - - bImport - - - &Importer - - - Alt+I - - - true - - - suppression du mot clef - - - - layout19 @@ -173,29 +112,12 @@ - + LBValeurs - - - spacer3 - - - Vertical - - - Expanding - - - - 31 - 131 - - - - + layout8 @@ -295,17 +217,23 @@ - + Commentaire + + + 0 + 60 + + - layout7 + layout6 @@ -315,6 +243,12 @@ bSup + + + 0 + 30 + + &Supprimer @@ -332,6 +266,12 @@ bOk + + + 0 + 30 + + &Valider @@ -352,6 +292,12 @@ bHelp + + + 0 + 30 + + &Documentation @@ -367,6 +313,96 @@ + + + spacer3 + + + Vertical + + + Expanding + + + + 31 + 130 + + + + + + spacer5 + + + Horizontal + + + Expanding + + + + 160 + 20 + + + + + + layout7 + + + + unnamed + + + + bParam + + + + 0 + 30 + + + + &Parametres + + + Alt+P + + + true + + + suppression du mot clef + + + + + bImport + + + + 0 + 30 + + + + &Importer + + + Alt+I + + + true + + + suppression du mot clef + + + + diff --git a/Ui/desPlusieursInto.py b/Ui/desPlusieursInto.py index c1aa71a6..de60fae6 100644 --- a/Ui/desPlusieursInto.py +++ b/Ui/desPlusieursInto.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'desPlusieursInto.ui' # -# Created: mar mar 4 10:36:38 2008 +# Created: mar mar 4 16:38:40 2008 # by: The PyQt User Interface Compiler (pyuic) 3.13 # # WARNING! All changes made in this file will be lost! @@ -77,25 +77,21 @@ class DPlusInto(QWidget): self.Widget8 = QWidget(self.tabuniqueinto,"Widget8") Widget8Layout = QGridLayout(self.Widget8,1,1,11,6,"Widget8Layout") - self.Commentaire = QLabel(self.Widget8,"Commentaire") - - Widget8Layout.addMultiCellWidget(self.Commentaire,2,2,0,3) - self.textLabel1 = QLabel(self.Widget8,"textLabel1") - Widget8Layout.addMultiCellWidget(self.textLabel1,0,0,0,1) + Widget8Layout.addMultiCellWidget(self.textLabel1,0,0,0,2) - self.LBValeurs = QListBox(self.Widget8,"LBValeurs") + self.textLabel1_2 = QLabel(self.Widget8,"textLabel1_2") - Widget8Layout.addWidget(self.LBValeurs,1,0) + Widget8Layout.addMultiCellWidget(self.textLabel1_2,0,0,3,5) self.listBoxVal = QListBox(self.Widget8,"listBoxVal") - Widget8Layout.addWidget(self.listBoxVal,1,3) + Widget8Layout.addMultiCellWidget(self.listBoxVal,1,1,4,5) - self.textLabel1_2 = QLabel(self.Widget8,"textLabel1_2") + self.LBValeurs = QListBox(self.Widget8,"LBValeurs") - Widget8Layout.addMultiCellWidget(self.textLabel1_2,0,0,2,3) + Widget8Layout.addMultiCellWidget(self.LBValeurs,1,1,0,1) layout3 = QVBoxLayout(None,0,6,"layout3") spacer2 = QSpacerItem(21,50,QSizePolicy.Minimum,QSizePolicy.Expanding) @@ -115,24 +111,31 @@ class DPlusInto(QWidget): spacer3 = QSpacerItem(21,181,QSizePolicy.Minimum,QSizePolicy.Expanding) layout3.addItem(spacer3) - Widget8Layout.addMultiCellLayout(layout3,1,1,1,2) + Widget8Layout.addMultiCellLayout(layout3,1,1,2,3) - layout3_2 = QHBoxLayout(None,0,6,"layout3_2") + self.bHelp = QPushButton(self.Widget8,"bHelp") + self.bHelp.setMinimumSize(QSize(0,30)) + self.bHelp.setAutoDefault(1) - self.bSup = QPushButton(self.Widget8,"bSup") - self.bSup.setAutoDefault(1) - layout3_2.addWidget(self.bSup) + Widget8Layout.addWidget(self.bHelp,3,5) self.bOk = QPushButton(self.Widget8,"bOk") + self.bOk.setMinimumSize(QSize(0,30)) self.bOk.setAutoDefault(1) self.bOk.setDefault(1) - layout3_2.addWidget(self.bOk) - self.bHelp = QPushButton(self.Widget8,"bHelp") - self.bHelp.setAutoDefault(1) - layout3_2.addWidget(self.bHelp) + Widget8Layout.addMultiCellWidget(self.bOk,3,3,1,4) + + self.bSup = QPushButton(self.Widget8,"bSup") + self.bSup.setMinimumSize(QSize(0,30)) + self.bSup.setAutoDefault(1) + + Widget8Layout.addWidget(self.bSup,3,0) - Widget8Layout.addMultiCellLayout(layout3_2,3,3,0,3) + self.Commentaire = QLabel(self.Widget8,"Commentaire") + self.Commentaire.setMinimumSize(QSize(0,40)) + + Widget8Layout.addMultiCellWidget(self.Commentaire,2,2,0,5) self.tabuniqueinto.insertTab(self.Widget8,QString("")) DPlusIntoLayout.addWidget(self.tabuniqueinto,0,0) @@ -152,22 +155,22 @@ class DPlusInto(QWidget): def languageChange(self): self.setCaption(self.__tr("DUnIn")) - self.Commentaire.setText(QString.null) self.textLabel1.setText(self.__tr("Valeur(s) actuelle(s)")) self.textLabel1_2.setText(self.__tr("Valeur(s) possibles(s)")) self.BSup1Val.setText(QString.null) QToolTip.add(self.BSup1Val,self.__tr("enleve l occurence selectionnee")) self.BAjout1Val.setText(QString.null) QToolTip.add(self.BAjout1Val,self.__trUtf8("\x61\x6a\x6f\x75\x74\x65\x20\x6c\x61\x20\x76\x61\x6c\x65\x75\x72\x20\x73\x61\x69\x73\x69\x65\x20\x73\x6f\x75\x73\x20\x6c\x20\x6f\x63\x63\x75\x72\x65\x6e\x63\x65\x20\x73\x65\x6c\x65\x63\x74\x69\x6f\x6e\x6e\xc3\xa9\x65\x20\x28\x65\x6e\x20\x66\x69\x6e\x20\x64\x65\x20\x6c\x69\x73\x74\x65\x20\x73\x69\x20\x69\x6c\x20\x6e\x20\x79\x20\x61\x20\x70\x61\x73\x20\x64\x65\x20\x73\x65\x6c\x65\x63\x74\x69\x6f\x6e\x29")) - self.bSup.setText(self.__tr("&Supprimer")) - self.bSup.setAccel(self.__tr("Alt+S")) - QToolTip.add(self.bSup,self.__tr("suppression du mot clef")) - self.bOk.setText(self.__tr("&Valider")) - self.bOk.setAccel(self.__tr("Shift+A, Alt+A, Alt+A, Alt+A")) - QToolTip.add(self.bOk,self.__tr("validation de la saisie")) self.bHelp.setText(self.__tr("&Documentation")) self.bHelp.setAccel(self.__tr("Alt+D")) QToolTip.add(self.bHelp,self.__tr("affichage documentation aster")) + self.bOk.setText(self.__tr("&Valider")) + self.bOk.setAccel(self.__tr("Shift+A, Alt+A, Alt+A, Alt+A")) + QToolTip.add(self.bOk,self.__tr("validation de la saisie")) + self.bSup.setText(self.__tr("&Supprimer")) + self.bSup.setAccel(self.__tr("Alt+S")) + QToolTip.add(self.bSup,self.__tr("suppression du mot clef")) + self.Commentaire.setText(QString.null) self.tabuniqueinto.changeTab(self.Widget8,self.__tr("Saisir Valeur")) diff --git a/Ui/desPlusieursInto.ui b/Ui/desPlusieursInto.ui index 4aca5cb1..e47a5b5a 100644 --- a/Ui/desPlusieursInto.ui +++ b/Ui/desPlusieursInto.ui @@ -40,15 +40,7 @@ unnamed - - - Commentaire - - - - - - + textLabel1 @@ -56,25 +48,25 @@ <u><font size="+1">Valeur(s) actuelle(s)</font></u> - + - LBValeurs + textLabel1_2 + + + <u><font size="+1">Valeur(s) possibles(s)</font></u> - + listBoxVal - + - textLabel1_2 - - - <u><font size="+1">Valeur(s) possibles(s)</font></u> + LBValeurs - + layout3 @@ -170,69 +162,91 @@ - + - layout3 + 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 + + + + + bSup + + + + 0 + 30 + + + + &Supprimer + + + Alt+S + + + true + + + suppression du mot clef + + + + + Commentaire + + + + 0 + 40 + + + + - - - unnamed - - - - bSup - - - &Supprimer - - - Alt+S - - - true - - - suppression du mot clef - - - - - bOk - - - &Valider - - - Shift+A, Alt+A, Alt+A, Alt+A - - - true - - - true - - - validation de la saisie - - - - - bHelp - - - &Documentation - - - Alt+D - - - true - - - affichage documentation aster - - - diff --git a/Ui/desUniqueASSD.py b/Ui/desUniqueASSD.py index 0aeeac58..766f34f4 100644 --- a/Ui/desUniqueASSD.py +++ b/Ui/desUniqueASSD.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'desUniqueASSD.ui' # -# Created: mar mar 4 10:36:39 2008 +# Created: mar mar 4 16:27:19 2008 # by: The PyQt User Interface Compiler (pyuic) 3.13 # # WARNING! All changes made in this file will be lost! @@ -25,34 +25,41 @@ class DUnASSD(QWidget): self.tabuniqueinto = QTabWidget(self,"tabuniqueinto") self.Widget8 = QWidget(self.tabuniqueinto,"Widget8") - - self.listBoxASSD = QListBox(self.Widget8,"listBoxASSD") - self.listBoxASSD.setGeometry(QRect(11,67,436,287)) + Widget8Layout = QGridLayout(self.Widget8,1,1,11,6,"Widget8Layout") self.textLabel2 = QLabel(self.Widget8,"textLabel2") - self.textLabel2.setGeometry(QRect(11,11,436,50)) self.textLabel2.setMinimumSize(QSize(436,50)) - LayoutWidget = QWidget(self.Widget8,"layout2") - LayoutWidget.setGeometry(QRect(10,400,440,23)) - layout2 = QHBoxLayout(LayoutWidget,11,6,"layout2") + Widget8Layout.addWidget(self.textLabel2,0,0) + + self.listBoxASSD = QListBox(self.Widget8,"listBoxASSD") + + Widget8Layout.addWidget(self.listBoxASSD,1,0) + + self.Commentaire = QLabel(self.Widget8,"Commentaire") + self.Commentaire.setMinimumSize(QSize(380,30)) + + Widget8Layout.addWidget(self.Commentaire,2,0) - self.bSup = QPushButton(LayoutWidget,"bSup") + layout2 = QHBoxLayout(None,0,6,"layout2") + + self.bSup = QPushButton(self.Widget8,"bSup") + self.bSup.setMinimumSize(QSize(0,30)) self.bSup.setAutoDefault(1) layout2.addWidget(self.bSup) - self.bOk = QPushButton(LayoutWidget,"bOk") + self.bOk = QPushButton(self.Widget8,"bOk") + self.bOk.setMinimumSize(QSize(0,30)) self.bOk.setAutoDefault(1) self.bOk.setDefault(1) layout2.addWidget(self.bOk) - self.bHelp = QPushButton(LayoutWidget,"bHelp") + self.bHelp = QPushButton(self.Widget8,"bHelp") + self.bHelp.setMinimumSize(QSize(0,30)) self.bHelp.setAutoDefault(1) layout2.addWidget(self.bHelp) - self.Commentaire = QLabel(self.Widget8,"Commentaire") - self.Commentaire.setGeometry(QRect(11,360,436,30)) - self.Commentaire.setMinimumSize(QSize(380,30)) + Widget8Layout.addLayout(layout2,3,0) self.tabuniqueinto.insertTab(self.Widget8,QString("")) DUnASSDLayout.addWidget(self.tabuniqueinto,0,0) @@ -70,6 +77,7 @@ class DUnASSD(QWidget): def languageChange(self): self.setCaption(self.__tr("DUnIn")) self.textLabel2.setText(self.__trUtf8("\x3c\x66\x6f\x6e\x74\x20\x73\x69\x7a\x65\x3d\x22\x2b\x31\x22\x3e\x3c\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")) QToolTip.add(self.bSup,self.__tr("suppression du mot clef")) @@ -79,7 +87,6 @@ class DUnASSD(QWidget): self.bHelp.setText(self.__tr("&Documentation")) self.bHelp.setAccel(self.__tr("Alt+D")) QToolTip.add(self.bHelp,self.__tr("affichage documentation aster")) - self.Commentaire.setText(QString.null) self.tabuniqueinto.changeTab(self.Widget8,self.__tr("Saisir Valeur")) diff --git a/Ui/desUniqueASSD.ui b/Ui/desUniqueASSD.ui index 0b186755..819c9294 100644 --- a/Ui/desUniqueASSD.ui +++ b/Ui/desUniqueASSD.ui @@ -36,136 +36,127 @@ Saisir Valeur - + - listBoxASSD + unnamed - - - 11 - 67 - 436 - 287 - - - - - - textLabel2 - - - - 11 - 11 - 436 - 50 - - - - - 436 - 50 - - - - <font size="+1"><p align="center">Structures de données du type + + + textLabel2 + + + + 436 + 50 + + + + <font size="+1"><p align="center">Structures de données du type requis par l'objet courant :</p></font> - - - - - layout2 - - - - 10 - 400 - 440 - 23 - - - + + + - unnamed + listBoxASSD - - - bSup - - - &Supprimer - - - Alt+S - - - true - - - suppression du mot clef - - - - - bOk - - - &Valider - - - Shift+A, Alt+A, Alt+A, Alt+A - - - true - - - true - - - validation de la saisie - - - + + + + Commentaire + + + + 380 + 30 + + + + + + + + + layout2 + + - bHelp - - - &Documentation - - - Alt+D - - - true - - - affichage documentation aster - - - - - - - Commentaire - - - - 11 - 360 - 436 - 30 - - - - - 380 - 30 - - - - - - + unnamed + + + + bSup + + + + 0 + 30 + + + + &Supprimer + + + Alt+S + + + true + + + suppression du mot clef + + + + + bOk + + + + 0 + 30 + + + + &Valider + + + Shift+A, Alt+A, Alt+A, Alt+A + + + true + + + true + + + validation de la saisie + + + + + bHelp + + + + 0 + 30 + + + + &Documentation + + + Alt+D + + + true + + + affichage documentation aster + + + + + diff --git a/Ui/desUniqueBase.py b/Ui/desUniqueBase.py index edcb5505..89e76db5 100644 --- a/Ui/desUniqueBase.py +++ b/Ui/desUniqueBase.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'desUniqueBase.ui' # -# Created: mar mar 4 10:36:39 2008 +# Created: mar mar 4 16:20:27 2008 # by: The PyQt User Interface Compiler (pyuic) 3.13 # # WARNING! All changes made in this file will be lost! @@ -25,49 +25,54 @@ class DUnBase(QWidget): self.tabuniqueinto = QTabWidget(self,"tabuniqueinto") self.Widget8 = QWidget(self.tabuniqueinto,"Widget8") + Widget8Layout = QGridLayout(self.Widget8,1,1,11,6,"Widget8Layout") - self.Commentaire = QLabel(self.Widget8,"Commentaire") - self.Commentaire.setGeometry(QRect(11,350,434,40)) - self.Commentaire.setMinimumSize(QSize(430,40)) - - LayoutWidget = QWidget(self.Widget8,"layout2") - LayoutWidget.setGeometry(QRect(11,171,434,52)) - layout2 = QHBoxLayout(LayoutWidget,11,6,"layout2") + layout2 = QHBoxLayout(None,0,6,"layout2") - self.textLabel2 = QLabel(LayoutWidget,"textLabel2") + self.textLabel2 = QLabel(self.Widget8,"textLabel2") layout2.addWidget(self.textLabel2) - self.lineEditVal = QLineEdit(LayoutWidget,"lineEditVal") + self.lineEditVal = QLineEdit(self.Widget8,"lineEditVal") self.lineEditVal.setMinimumSize(QSize(290,50)) layout2.addWidget(self.lineEditVal) - LayoutWidget_2 = QWidget(self.Widget8,"layout3") - LayoutWidget_2.setGeometry(QRect(11,11,434,32)) - layout3 = QHBoxLayout(LayoutWidget_2,11,6,"layout3") - spacer1 = QSpacerItem(281,21,QSizePolicy.Expanding,QSizePolicy.Minimum) - layout3.addItem(spacer1) + Widget8Layout.addMultiCellLayout(layout2,1,1,0,2) + spacer1 = QSpacerItem(286,21,QSizePolicy.Expanding,QSizePolicy.Minimum) + Widget8Layout.addMultiCell(spacer1,0,0,0,1) - self.bParametres = QPushButton(LayoutWidget_2,"bParametres") + self.bParametres = QPushButton(self.Widget8,"bParametres") self.bParametres.setSizePolicy(QSizePolicy(0,0,0,0,self.bParametres.sizePolicy().hasHeightForWidth())) self.bParametres.setMinimumSize(QSize(140,30)) - layout3.addWidget(self.bParametres) - LayoutWidget_3 = QWidget(self.Widget8,"layout4") - LayoutWidget_3.setGeometry(QRect(10,400,440,23)) - layout4 = QHBoxLayout(LayoutWidget_3,11,6,"layout4") + Widget8Layout.addWidget(self.bParametres,0,2) - self.bSup = QPushButton(LayoutWidget_3,"bSup") + self.bSup = QPushButton(self.Widget8,"bSup") + self.bSup.setMinimumSize(QSize(0,30)) self.bSup.setAutoDefault(1) - layout4.addWidget(self.bSup) - self.bOk = QPushButton(LayoutWidget_3,"bOk") + Widget8Layout.addWidget(self.bSup,5,0) + + self.bOk = QPushButton(self.Widget8,"bOk") + self.bOk.setMinimumSize(QSize(0,30)) self.bOk.setAutoDefault(1) self.bOk.setDefault(1) - layout4.addWidget(self.bOk) - self.bHelp = QPushButton(LayoutWidget_3,"bHelp") + Widget8Layout.addWidget(self.bOk,5,1) + + self.bHelp = QPushButton(self.Widget8,"bHelp") + self.bHelp.setMinimumSize(QSize(0,30)) self.bHelp.setAutoDefault(1) - layout4.addWidget(self.bHelp) + + Widget8Layout.addWidget(self.bHelp,5,2) + spacer4 = QSpacerItem(41,110,QSizePolicy.Minimum,QSizePolicy.Expanding) + Widget8Layout.addItem(spacer4,2,1) + spacer3 = QSpacerItem(21,111,QSizePolicy.Minimum,QSizePolicy.Expanding) + Widget8Layout.addItem(spacer3,4,1) + + self.Commentaire = QLabel(self.Widget8,"Commentaire") + self.Commentaire.setMinimumSize(QSize(430,40)) + + Widget8Layout.addMultiCellWidget(self.Commentaire,3,3,0,2) self.tabuniqueinto.insertTab(self.Widget8,QString("")) DUnBaseLayout.addWidget(self.tabuniqueinto,0,0) @@ -86,7 +91,6 @@ class DUnBase(QWidget): def languageChange(self): self.setCaption(self.__tr("DUnIn")) - self.Commentaire.setText(QString.null) self.textLabel2.setText(self.__tr("

Valeur:

")) self.bParametres.setText(self.__tr("Parametres")) self.bSup.setText(self.__tr("&Supprimer")) @@ -98,6 +102,7 @@ class DUnBase(QWidget): self.bHelp.setText(self.__tr("&Documentation")) self.bHelp.setAccel(self.__tr("Alt+D")) QToolTip.add(self.bHelp,self.__tr("affichage documentation aster")) + self.Commentaire.setText(QString.null) self.tabuniqueinto.changeTab(self.Widget8,self.__tr("Saisir Valeur")) diff --git a/Ui/desUniqueBase.ui b/Ui/desUniqueBase.ui index 2188b31b..6c5eb318 100644 --- a/Ui/desUniqueBase.ui +++ b/Ui/desUniqueBase.ui @@ -36,244 +36,199 @@ Saisir Valeur - + - Commentaire + unnamed - - - 11 - 350 - 434 - 40 - - - - - 430 - 40 - - - - - - - - - layout2 - - - - 11 - 171 - 434 - 52 - - - + - unnamed + layout2 - + - textLabel2 - - - <b><u><p align="center">Valeur: </p></u></b> + unnamed - - - - lineEditVal - - - - 290 - 50 - - - - - - - - layout3 - - - - 11 - 11 - 434 - 32 - - - + + + textLabel2 + + + <b><u><p align="center">Valeur: </p></u></b> + + + + + lineEditVal + + + + 290 + 50 + + + + + + - unnamed + spacer1 - - - spacer1 - - - Horizontal - - - Expanding - - - - 281 - 21 - - - - - - bParametres - - - - 0 - 0 - 0 - 0 - - - - - 140 - 30 - - - - Parametres - - - - - - - spacer2 - - - Vertical - - - Expanding - - - - 20 - 81 - - - - - 218 - 49 - 20 - 116 - - - - - - spacer3 - - - Vertical - - - Expanding - - - - 41 - 91 - - - - - 207 - 229 - 41 - 115 - - - - - - layout4 - - - - 10 - 400 - 440 - 23 - - - + + Horizontal + + + Expanding + + + + 286 + 21 + + + + - unnamed + bParametres - - - bSup - - - &Supprimer - - - Alt+S - - - true - - - suppression du mot clef - - - - - bOk - - - &Valider - - - Shift+A, Alt+A, Alt+A, Alt+A - - - true - - - true - - - validation de la saisie - - - - - bHelp - - - &Documentation - - - Alt+D - - - true - - - affichage documentation aster - - - - + + + 0 + 0 + 0 + 0 + + + + + 140 + 30 + + + + Parametres + + + + + bSup + + + + 0 + 30 + + + + &Supprimer + + + Alt+S + + + true + + + suppression du mot clef + + + + + bOk + + + + 0 + 30 + + + + &Valider + + + Shift+A, Alt+A, Alt+A, Alt+A + + + true + + + true + + + validation de la saisie + + + + + bHelp + + + + 0 + 30 + + + + &Documentation + + + Alt+D + + + true + + + affichage documentation aster + + + + + spacer4 + + + Vertical + + + Expanding + + + + 41 + 110 + + + + + + spacer3 + + + Vertical + + + Expanding + + + + 21 + 111 + + + + + + Commentaire + + + + 430 + 40 + + + + + + + diff --git a/Ui/desUniqueInto.py b/Ui/desUniqueInto.py index e5bddc23..690950be 100644 --- a/Ui/desUniqueInto.py +++ b/Ui/desUniqueInto.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'desUniqueInto.ui' # -# Created: mar mar 4 10:36:39 2008 +# Created: mar mar 4 16:32:40 2008 # by: The PyQt User Interface Compiler (pyuic) 3.13 # # WARNING! All changes made in this file will be lost! @@ -25,33 +25,40 @@ class DUnIn(QWidget): self.tabuniqueinto = QTabWidget(self,"tabuniqueinto") self.Widget8 = QWidget(self.tabuniqueinto,"Widget8") - - self.textLabel2 = QLabel(self.Widget8,"textLabel2") - self.textLabel2.setGeometry(QRect(11,11,434,16)) - - self.listBoxVal = QListBox(self.Widget8,"listBoxVal") - self.listBoxVal.setGeometry(QRect(11,33,434,321)) + Widget8Layout = QGridLayout(self.Widget8,1,1,11,6,"Widget8Layout") self.Commentaire = QLabel(self.Widget8,"Commentaire") - self.Commentaire.setGeometry(QRect(11,360,434,30)) self.Commentaire.setMinimumSize(QSize(420,30)) - LayoutWidget = QWidget(self.Widget8,"layout2") - LayoutWidget.setGeometry(QRect(10,400,440,23)) - layout2 = QHBoxLayout(LayoutWidget,11,6,"layout2") + Widget8Layout.addWidget(self.Commentaire,2,0) - self.bSup = QPushButton(LayoutWidget,"bSup") + layout2 = QHBoxLayout(None,0,6,"layout2") + + self.bSup = QPushButton(self.Widget8,"bSup") + self.bSup.setMinimumSize(QSize(0,30)) self.bSup.setAutoDefault(1) layout2.addWidget(self.bSup) - self.bOk = QPushButton(LayoutWidget,"bOk") + self.bOk = QPushButton(self.Widget8,"bOk") + self.bOk.setMinimumSize(QSize(0,30)) self.bOk.setAutoDefault(1) self.bOk.setDefault(1) layout2.addWidget(self.bOk) - self.bHelp = QPushButton(LayoutWidget,"bHelp") + self.bHelp = QPushButton(self.Widget8,"bHelp") + self.bHelp.setMinimumSize(QSize(0,30)) self.bHelp.setAutoDefault(1) layout2.addWidget(self.bHelp) + + Widget8Layout.addLayout(layout2,3,0) + + self.listBoxVal = QListBox(self.Widget8,"listBoxVal") + + Widget8Layout.addWidget(self.listBoxVal,1,0) + + self.textLabel2 = QLabel(self.Widget8,"textLabel2") + + Widget8Layout.addWidget(self.textLabel2,0,0) self.tabuniqueinto.insertTab(self.Widget8,QString("")) DUnInLayout.addWidget(self.tabuniqueinto,0,0) @@ -68,7 +75,6 @@ class DUnIn(QWidget): def languageChange(self): self.setCaption(self.__tr("DUnIn")) - self.textLabel2.setText(self.__tr("

Valeurs possibles

")) self.Commentaire.setText(QString.null) self.bSup.setText(self.__tr("&Supprimer")) self.bSup.setAccel(self.__tr("Alt+S")) @@ -79,6 +85,7 @@ class DUnIn(QWidget): self.bHelp.setText(self.__tr("&Documentation")) self.bHelp.setAccel(self.__tr("Alt+D")) QToolTip.add(self.bHelp,self.__tr("affichage documentation aster")) + self.textLabel2.setText(self.__tr("

Valeurs possibles

")) self.tabuniqueinto.changeTab(self.Widget8,self.__tr("Saisir Valeur")) diff --git a/Ui/desUniqueInto.ui b/Ui/desUniqueInto.ui index ffe01801..67f99a98 100644 --- a/Ui/desUniqueInto.ui +++ b/Ui/desUniqueInto.ui @@ -36,129 +36,120 @@ Saisir Valeur - + - textLabel2 + unnamed - - - 11 - 11 - 434 - 16 - - - - <b><u><p align="center">Valeurs possibles</p></u></b> - - - - - listBoxVal - - - - 11 - 33 - 434 - 321 - - - - - - Commentaire - - - - 11 - 360 - 434 - 30 - - - - - 420 - 30 - - - - - - - - - layout2 - - - - 10 - 400 - 440 - 23 - - - + - unnamed + Commentaire - - - bSup - - - &Supprimer - - - Alt+S - - - true - - - suppression du mot clef - - - - - bOk - - - &Valider - - - Shift+A, Alt+A, Alt+A, Alt+A - - - true - - - true - - - validation de la saisie - - - + + + 420 + 30 + + + + + + + + + layout2 + + - bHelp - - - &Documentation - - - Alt+D - - - true - - - affichage documentation aster - - - - + unnamed + + + + bSup + + + + 0 + 30 + + + + &Supprimer + + + Alt+S + + + true + + + suppression du mot clef + + + + + bOk + + + + 0 + 30 + + + + &Valider + + + Shift+A, Alt+A, Alt+A, Alt+A + + + true + + + true + + + validation de la saisie + + + + + bHelp + + + + 0 + 30 + + + + &Documentation + + + Alt+D + + + true + + + affichage documentation aster + + + + + + + listBoxVal + + + + + textLabel2 + + + <b><u><p align="center">Valeurs possibles</p></u></b> + + + diff --git a/Ui/desUniqueSDCO.py b/Ui/desUniqueSDCO.py index dbaf4f9d..79cf8fd8 100644 --- a/Ui/desUniqueSDCO.py +++ b/Ui/desUniqueSDCO.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'desUniqueSDCO.ui' # -# Created: mar mar 4 10:36:39 2008 +# Created: mar mar 4 17:53:43 2008 # by: The PyQt User Interface Compiler (pyuic) 3.13 # # WARNING! All changes made in this file will be lost! @@ -25,70 +25,73 @@ class DUnSDCO(QWidget): self.tabuniqueinto = QTabWidget(self,"tabuniqueinto") self.Widget8 = QWidget(self.tabuniqueinto,"Widget8") + Widget8Layout = QGridLayout(self.Widget8,1,1,11,6,"Widget8Layout") - LayoutWidget = QWidget(self.Widget8,"layout4") - LayoutWidget.setGeometry(QRect(11,11,413,44)) - layout4 = QHBoxLayout(LayoutWidget,11,6,"layout4") + self.Commentaire = QLabel(self.Widget8,"Commentaire") + self.Commentaire.setMinimumSize(QSize(311,30)) - self.textLabel1 = QLabel(LayoutWidget,"textLabel1") - layout4.addWidget(self.textLabel1) + Widget8Layout.addMultiCellWidget(self.Commentaire,3,3,0,3) - layout3 = QVBoxLayout(None,0,6,"layout3") + self.bSup = QPushButton(self.Widget8,"bSup") + self.bSup.setMinimumSize(QSize(0,30)) + self.bSup.setAutoDefault(1) - self.rbOui = QRadioButton(LayoutWidget,"rbOui") - self.rbOui.setEnabled(1) - self.rbOui.setChecked(1) - layout3.addWidget(self.rbOui) + Widget8Layout.addWidget(self.bSup,4,0) - self.rbNon = QRadioButton(LayoutWidget,"rbNon") - self.rbNon.setEnabled(0) - self.rbNon.setChecked(0) - layout3.addWidget(self.rbNon) - layout4.addLayout(layout3) + self.bOk = QPushButton(self.Widget8,"bOk") + self.bOk.setMinimumSize(QSize(0,30)) + self.bOk.setAutoDefault(1) + self.bOk.setDefault(1) + + Widget8Layout.addMultiCellWidget(self.bOk,4,4,1,2) + + self.bHelp = QPushButton(self.Widget8,"bHelp") + self.bHelp.setMinimumSize(QSize(0,30)) + self.bHelp.setAutoDefault(1) + + Widget8Layout.addWidget(self.bHelp,4,3) + + self.textLabel2 = QLabel(self.Widget8,"textLabel2") - LayoutWidget_2 = QWidget(self.Widget8,"layout5") - LayoutWidget_2.setGeometry(QRect(11,61,413,49)) - layout5 = QVBoxLayout(LayoutWidget_2,11,6,"layout5") + Widget8Layout.addMultiCellWidget(self.textLabel2,2,2,0,3) - self.frame3 = QFrame(LayoutWidget_2,"frame3") + self.frame3 = QFrame(self.Widget8,"frame3") self.frame3.setFrameShape(QFrame.StyledPanel) self.frame3.setFrameShadow(QFrame.Raised) + frame3Layout = QGridLayout(self.frame3,1,1,11,6,"frame3Layout") - self.textLabel2_2 = QLabel(self.frame3,"textLabel2_2") - self.textLabel2_2.setGeometry(QRect(10,10,280,26)) - layout5.addWidget(self.frame3) + layout5 = QGridLayout(None,1,1,0,6,"layout5") - self.LESDCO = QLineEdit(LayoutWidget_2,"LESDCO") + self.LESDCO = QLineEdit(self.frame3,"LESDCO") self.LESDCO.setMinimumSize(QSize(300,40)) - layout5.addWidget(self.LESDCO) - self.textLabel2 = QLabel(self.Widget8,"textLabel2") - self.textLabel2.setGeometry(QRect(11,116,413,18)) + layout5.addWidget(self.LESDCO,1,0) - self.Commentaire = QLabel(self.Widget8,"Commentaire") - self.Commentaire.setGeometry(QRect(11,360,413,30)) - self.Commentaire.setMinimumSize(QSize(311,30)) + self.textLabel2_2 = QLabel(self.frame3,"textLabel2_2") - LayoutWidget_3 = QWidget(self.Widget8,"layout6") - LayoutWidget_3.setGeometry(QRect(17,390,410,23)) - layout6 = QHBoxLayout(LayoutWidget_3,11,6,"layout6") + layout5.addWidget(self.textLabel2_2,0,0) - self.bSup = QPushButton(LayoutWidget_3,"bSup") - self.bSup.setAutoDefault(1) - layout6.addWidget(self.bSup) - spacer3_3 = QSpacerItem(20,20,QSizePolicy.Expanding,QSizePolicy.Minimum) - layout6.addItem(spacer3_3) + frame3Layout.addLayout(layout5,0,0) - self.bOk = QPushButton(LayoutWidget_3,"bOk") - self.bOk.setAutoDefault(1) - self.bOk.setDefault(1) - layout6.addWidget(self.bOk) - spacer3_3_3 = QSpacerItem(30,20,QSizePolicy.Expanding,QSizePolicy.Minimum) - layout6.addItem(spacer3_3_3) + Widget8Layout.addMultiCellWidget(self.frame3,1,1,0,3) - self.bHelp = QPushButton(LayoutWidget_3,"bHelp") - self.bHelp.setAutoDefault(1) - layout6.addWidget(self.bHelp) + self.textLabel1 = QLabel(self.Widget8,"textLabel1") + + Widget8Layout.addMultiCellWidget(self.textLabel1,0,0,0,1) + + layout6 = QVBoxLayout(None,0,6,"layout6") + + self.rbOui = QRadioButton(self.Widget8,"rbOui") + self.rbOui.setEnabled(1) + self.rbOui.setChecked(1) + layout6.addWidget(self.rbOui) + + self.rbNon = QRadioButton(self.Widget8,"rbNon") + self.rbNon.setEnabled(0) + self.rbNon.setChecked(0) + layout6.addWidget(self.rbNon) + + Widget8Layout.addMultiCellLayout(layout6,0,0,2,3) self.tabuniqueinto.insertTab(self.Widget8,QString("")) DUnSDCOLayout.addWidget(self.tabuniqueinto,0,0) @@ -107,11 +110,6 @@ class DUnSDCO(QWidget): def languageChange(self): self.setCaption(self.__tr("DUnIn")) - self.textLabel1.setText(self.__tr("Nouveau Concept : ")) - self.rbOui.setText(self.__tr("Oui")) - self.rbNon.setText(self.__tr("Non")) - self.textLabel2_2.setText(self.__tr("Nom du nouveau concept : ")) - self.textLabel2.setText(self.__tr("Un objet de type CO est attendu")) self.Commentaire.setText(QString.null) self.bSup.setText(self.__tr("&Supprimer")) self.bSup.setAccel(self.__tr("Alt+S")) @@ -122,6 +120,11 @@ class DUnSDCO(QWidget): self.bHelp.setText(self.__tr("&Documentation")) self.bHelp.setAccel(self.__tr("Alt+D")) QToolTip.add(self.bHelp,self.__tr("affichage documentation aster")) + self.textLabel2.setText(self.__tr("Un objet de type CO est attendu")) + self.textLabel2_2.setText(self.__tr("Nom du nouveau concept : ")) + self.textLabel1.setText(self.__tr("Nouveau Concept : ")) + self.rbOui.setText(self.__tr("Oui")) + self.rbNon.setText(self.__tr("Non")) self.tabuniqueinto.changeTab(self.Widget8,self.__tr("Saisir Valeur")) diff --git a/Ui/desUniqueSDCO.ui b/Ui/desUniqueSDCO.ui index 9d3e0eae..0375abdc 100644 --- a/Ui/desUniqueSDCO.ui +++ b/Ui/desUniqueSDCO.ui @@ -36,295 +36,196 @@ Saisir Valeur - + - layout4 + unnamed - - - 11 - 11 - 413 - 44 - - - + - unnamed + Commentaire - - - textLabel1 - - - <font size="+1">Nouveau Concept : </font> - - - + + + 311 + 30 + + + + + + + + + bSup + + + + 0 + 30 + + + + &Supprimer + + + Alt+S + + + true + + + suppression du mot clef + + + + + bOk + + + + 0 + 30 + + + + &Valider + + + Shift+A, Alt+A, Alt+A, Alt+A + + + true + + + true + + + validation de la saisie + + + + + bHelp + + + + 0 + 30 + + + + &Documentation + + + Alt+D + + + true + + + affichage documentation aster + + + + + textLabel2 + + + <font size="+1">Un objet de type CO est attendu</font> + + + + + frame3 + + + StyledPanel + + + Raised + + - layout3 + unnamed - + - unnamed + layout5 - + - rbOui - - - true - - - Oui - - - true - - - - - rbNon - - - false - - - Non + unnamed - - false - - - - - - - - - layout5 - - - - 11 - 61 - 413 - 49 - - - + + + LESDCO + + + + 300 + 40 + + + + + + textLabel2_2 + + + <font size="+2">Nom du nouveau concept : </font> + + + + + + + + + textLabel1 + + + <font size="+1">Nouveau Concept : </font> + + + - unnamed + layout6 - + - frame3 - - - StyledPanel + unnamed - - Raised - - + - textLabel2_2 + rbOui - - - 10 - 10 - 280 - 26 - + + true - <font size="+2">Nom du nouveau concept : </font> + Oui + + + true - - - - LESDCO - - - - 300 - 40 - - - - - - - - textLabel2 - - - - 11 - 116 - 413 - 18 - - - - <font size="+1">Un objet de type CO est attendu</font> - - - - - spacer5 - - - Vertical - - - Expanding - - - - 31 - 131 - - - - - 202 - 140 - 31 - 214 - - - - - - Commentaire - - - - 11 - 360 - 413 - 30 - - - - - 311 - 30 - - - - - - - - - layout6 - - - - 17 - 390 - 410 - 23 - - - - - unnamed - - - - bSup - - - &Supprimer - - - Alt+S - - - true - - - suppression du mot clef - - - - - spacer3_3 - - - Horizontal - - - Expanding - - - - 20 - 20 - - - - - - bOk - - - &Valider - - - Shift+A, Alt+A, Alt+A, Alt+A - - - true - - - true - - - validation de la saisie - - - - - spacer3_3_3 - - - Horizontal - - - Expanding - - - - 30 - 20 - - - - - - bHelp - - - &Documentation - - - Alt+D - - - true - - - affichage documentation aster - - - - + + + rbNon + + + false + + + Non + + + false + + + + + diff --git a/Ui/desUniqueSDCOInto.py b/Ui/desUniqueSDCOInto.py index 8d760745..185c6d43 100644 --- a/Ui/desUniqueSDCOInto.py +++ b/Ui/desUniqueSDCOInto.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'desUniqueSDCOInto.ui' # -# Created: mar mar 4 10:36:39 2008 +# Created: mar mar 4 17:57:52 2008 # by: The PyQt User Interface Compiler (pyuic) 3.13 # # WARNING! All changes made in this file will be lost! @@ -29,20 +29,20 @@ class DUnSDCOInto(QWidget): self.textLabel2 = QLabel(self.Widget8,"textLabel2") - Widget8Layout.addWidget(self.textLabel2,0,0) + Widget8Layout.addMultiCellWidget(self.textLabel2,0,0,0,2) self.LBSDCO = QListBox(self.Widget8,"LBSDCO") - Widget8Layout.addWidget(self.LBSDCO,1,0) + Widget8Layout.addMultiCellWidget(self.LBSDCO,1,1,0,2) self.textLabel2_3 = QLabel(self.Widget8,"textLabel2_3") - Widget8Layout.addWidget(self.textLabel2_3,5,0) + Widget8Layout.addMultiCellWidget(self.textLabel2_3,5,5,0,2) self.Commentaire = QLabel(self.Widget8,"Commentaire") self.Commentaire.setMinimumSize(QSize(420,30)) - Widget8Layout.addWidget(self.Commentaire,4,0) + Widget8Layout.addMultiCellWidget(self.Commentaire,4,4,0,2) layout3 = QGridLayout(None,1,1,0,6,"layout3") @@ -61,7 +61,7 @@ class DUnSDCOInto(QWidget): layout3.addMultiCellWidget(self.textLabel1,0,1,0,0) - Widget8Layout.addLayout(layout3,2,0) + Widget8Layout.addMultiCellLayout(layout3,2,2,0,2) layout6 = QHBoxLayout(None,0,6,"layout6") @@ -74,28 +74,30 @@ class DUnSDCOInto(QWidget): self.textLabel2_2.setGeometry(QRect(20,10,150,30)) layout6.addWidget(self.frame3) - self.LEDSCO = QLineEdit(self.Widget8,"LEDSCO") - self.LEDSCO.setMinimumSize(QSize(220,40)) - layout6.addWidget(self.LEDSCO) + self.LESDCO = QLineEdit(self.Widget8,"LESDCO") + self.LESDCO.setMinimumSize(QSize(220,40)) + layout6.addWidget(self.LESDCO) - Widget8Layout.addLayout(layout6,3,0) - - layout4 = QHBoxLayout(None,0,6,"layout4") + Widget8Layout.addMultiCellLayout(layout6,3,3,0,2) self.bSup = QPushButton(self.Widget8,"bSup") + self.bSup.setMinimumSize(QSize(0,30)) self.bSup.setAutoDefault(1) - layout4.addWidget(self.bSup) + + Widget8Layout.addWidget(self.bSup,6,0) self.bOk = QPushButton(self.Widget8,"bOk") + self.bOk.setMinimumSize(QSize(0,30)) self.bOk.setAutoDefault(1) self.bOk.setDefault(1) - layout4.addWidget(self.bOk) + + Widget8Layout.addWidget(self.bOk,6,1) self.bHelp = QPushButton(self.Widget8,"bHelp") + self.bHelp.setMinimumSize(QSize(0,30)) self.bHelp.setAutoDefault(1) - layout4.addWidget(self.bHelp) - Widget8Layout.addLayout(layout4,6,0) + Widget8Layout.addWidget(self.bHelp,6,2) self.tabuniqueinto.insertTab(self.Widget8,QString("")) DUnSDCOIntoLayout.addWidget(self.tabuniqueinto,0,0) @@ -111,7 +113,7 @@ class DUnSDCOInto(QWidget): self.connect(self.rbNon,SIGNAL("clicked()"),self.BNonPressed) self.connect(self.rbOui,SIGNAL("clicked()"),self.BOuiPressed) self.connect(self.LBSDCO,SIGNAL("clicked(QListBoxItem*)"),self.LBSDCOReturnPressed) - self.connect(self.LEDSCO,SIGNAL("returnPressed()"),self.LESDCOReturnPressed) + self.connect(self.LESDCO,SIGNAL("returnPressed()"),self.LESDCOReturnPressed) def languageChange(self): diff --git a/Ui/desUniqueSDCOInto.ui b/Ui/desUniqueSDCOInto.ui index fe3fde48..d6bbb36c 100644 --- a/Ui/desUniqueSDCOInto.ui +++ b/Ui/desUniqueSDCOInto.ui @@ -40,7 +40,7 @@ unnamed - + textLabel2 @@ -48,12 +48,12 @@ <font size="+1"><u>Structures de données du type requis par l'objet courant </u></font> - + LBSDCO - + textLabel2_3 @@ -61,7 +61,7 @@ <font size="+1">Un objet de type CO est attendu</font> - + Commentaire @@ -75,7 +75,7 @@ - + layout3 @@ -118,7 +118,7 @@ - + layout6 @@ -161,7 +161,7 @@ - LEDSCO + LESDCO @@ -172,69 +172,77 @@ - + - layout4 + bSup + + + + 0 + 30 + + + + &Supprimer + + + Alt+S + + + true + + + suppression du mot clef + + + + + bOk + + + + 0 + 30 + + + + &Valider + + + Shift+A, Alt+A, Alt+A, Alt+A + + + true + + + true + + + validation de la saisie + + + + + bHelp + + + + 0 + 30 + + + + &Documentation + + + Alt+D + + + true + + + affichage documentation aster - - - unnamed - - - - bSup - - - &Supprimer - - - Alt+S - - - true - - - suppression du mot clef - - - - - bOk - - - &Valider - - - Shift+A, Alt+A, Alt+A, Alt+A - - - true - - - true - - - validation de la saisie - - - - - bHelp - - - &Documentation - - - Alt+D - - - true - - - affichage documentation aster - - - @@ -279,7 +287,7 @@ LBSDCOReturnPressed() - LEDSCO + LESDCO returnPressed() DUnSDCOInto LESDCOReturnPressed() -- 2.39.2