]> SALOME platform Git repositories - tools/eficas.git/commitdiff
Salome HOME
*** empty log message *** V1_14a4
authorPascale Noyret <pascale.noyret@edf.fr>
Fri, 16 May 2008 15:04:23 +0000 (15:04 +0000)
committerPascale Noyret <pascale.noyret@edf.fr>
Fri, 16 May 2008 15:04:23 +0000 (15:04 +0000)
26 files changed:
InterfaceQT/compooper.py
InterfaceQT/compoparam.py
InterfaceQT/editor.py
InterfaceQT/monOptionsEditeur.py
InterfaceQT/monParamPanel.py
InterfaceQT/viewManager.py
Ui/OptionsEditeur.py
Ui/OptionsEditeur.ui
Ui/desCommande.py
Ui/desCommande.ui
Ui/desCommentaire.py
Ui/desCommentaire.ui
Ui/desFormule.py
Ui/desFormule.ui
Ui/desInclude.py
Ui/desInclude.ui
Ui/desMacro.py
Ui/desMacro.ui
Ui/desParam.py
Ui/desParam.ui
Ui/desPoursuite.py
Ui/desPoursuite.ui
Ui/desRacine.py
Ui/desRacine.ui
Ui/myMain.py
Ui/myMain.ui

index 54f6061ef5fe7449118cd67b52bd995c3617b2f9..dd89378e502047f0fcdde65bfc87f6da2b67fb19 100644 (file)
@@ -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 
index bd9bd069a11108430223f8ce2020a368b0159d28..4c3fb26b6ff6a4d07669471f17dce81cce3f6c22 100644 (file)
@@ -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
index 1ef3c1265bf8b7e06f425fdc01d2cd132d416526..0a9d920bb97af93e8f75eeb57309230115311f23 100644 (file)
@@ -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)
             
index 7c0bc6845f90a1655449137db6aa18b6e2694d76..7432ae372b6b861e601429f3bd040799bae12c0e 100644 (file)
@@ -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={}
index facf0973637a9fd8f36b97f5d24cdc5455350a58..84472fcd001ac720b8ded0dbdf3101f08362b930 100644 (file)
@@ -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(""))
index 1915a5a5c85fa6351017f6135a8b27aa8118819e..cf9f2d3712140b0232e8d301f78cdb1d39013cad 100644 (file)
@@ -649,8 +649,8 @@ class ViewManager:
                 self.trUtf8("Fichier Modifie"),
                 self.trUtf8("Le fichier <b>%1</b> 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 <b>%1</b> 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
index 44c98918fb4327753c01103e1b4cf71db613b96e..69ae4f2cca2c0db1501eaf0b5005a8773dc5b022 100644 (file)
@@ -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):
index 7216be434a84b071d96e71cc565fefbbbbf0629c..ced2a9bcb247a58c6662633d623ed82100014786 100644 (file)
             <x>0</x>
             <y>0</y>
             <width>570</width>
-            <height>434</height>
+            <height>474</height>
         </rect>
     </property>
     <property name="caption">
         <string>Options Aster</string>
     </property>
-    <grid>
+    <widget class="QGroupBox">
         <property name="name">
-            <cstring>unnamed</cstring>
+            <cstring>groupBox1</cstring>
         </property>
-        <widget class="QGroupBox" row="2" column="0">
+        <property name="geometry">
+            <rect>
+                <x>11</x>
+                <y>11</y>
+                <width>548</width>
+                <height>191</height>
+            </rect>
+        </property>
+        <property name="title">
+            <string>Configurer une Version</string>
+        </property>
+        <widget class="QLabel">
+            <property name="name">
+                <cstring>textLabel1_3</cstring>
+            </property>
+            <property name="geometry">
+                <rect>
+                    <x>30</x>
+                    <y>60</y>
+                    <width>280</width>
+                    <height>20</height>
+                </rect>
+            </property>
+            <property name="text">
+                <string>Répertoire d'accès au catalogue :</string>
+            </property>
+        </widget>
+        <widget class="QLabel">
+            <property name="name">
+                <cstring>textLabel1_2_2</cstring>
+            </property>
+            <property name="geometry">
+                <rect>
+                    <x>30</x>
+                    <y>120</y>
+                    <width>280</width>
+                    <height>20</height>
+                </rect>
+            </property>
+            <property name="text">
+                <string>Répertoire d'accès aux matériaux :</string>
+            </property>
+        </widget>
+        <widget class="QComboBox">
+            <property name="name">
+                <cstring>CBVersions</cstring>
+            </property>
+            <property name="geometry">
+                <rect>
+                    <x>30</x>
+                    <y>20</y>
+                    <width>90</width>
+                    <height>30</height>
+                </rect>
+            </property>
+        </widget>
+        <widget class="QLineEdit">
+            <property name="name">
+                <cstring>LERepMat</cstring>
+            </property>
+            <property name="geometry">
+                <rect>
+                    <x>30</x>
+                    <y>140</y>
+                    <width>501</width>
+                    <height>31</height>
+                </rect>
+            </property>
+            <property name="text">
+                <string></string>
+            </property>
+        </widget>
+        <widget class="QLineEdit">
+            <property name="name">
+                <cstring>LERepCata</cstring>
+            </property>
+            <property name="geometry">
+                <rect>
+                    <x>30</x>
+                    <y>80</y>
+                    <width>501</width>
+                    <height>31</height>
+                </rect>
+            </property>
+            <property name="text">
+                <string></string>
+            </property>
+        </widget>
+        <widget class="QPushButton">
+            <property name="name">
+                <cstring>Bok</cstring>
+            </property>
+            <property name="geometry">
+                <rect>
+                    <x>440</x>
+                    <y>20</y>
+                    <width>90</width>
+                    <height>31</height>
+                </rect>
+            </property>
+            <property name="text">
+                <string>Valider</string>
+            </property>
+            <property name="autoDefault">
+                <bool>false</bool>
+            </property>
+        </widget>
+    </widget>
+    <widget class="QGroupBox">
+        <property name="name">
+            <cstring>groupBox2</cstring>
+        </property>
+        <property name="geometry">
+            <rect>
+                <x>11</x>
+                <y>208</y>
+                <width>548</width>
+                <height>90</height>
+            </rect>
+        </property>
+        <property name="title">
+            <string>Gérer les versions</string>
+        </property>
+        <widget class="QLineEdit">
+            <property name="name">
+                <cstring>LEVersionAjout</cstring>
+            </property>
+            <property name="geometry">
+                <rect>
+                    <x>120</x>
+                    <y>31</y>
+                    <width>101</width>
+                    <height>30</height>
+                </rect>
+            </property>
+        </widget>
+        <widget class="QLineEdit">
+            <property name="name">
+                <cstring>LEVersionSup</cstring>
+            </property>
+            <property name="geometry">
+                <rect>
+                    <x>410</x>
+                    <y>30</y>
+                    <width>101</width>
+                    <height>30</height>
+                </rect>
+            </property>
+        </widget>
+        <widget class="QPushButton">
+            <property name="name">
+                <cstring>PBSup</cstring>
+            </property>
+            <property name="geometry">
+                <rect>
+                    <x>300</x>
+                    <y>20</y>
+                    <width>101</width>
+                    <height>41</height>
+                </rect>
+            </property>
+            <property name="text">
+                <string>Supprimer
+Version :</string>
+            </property>
+        </widget>
+        <widget class="QPushButton">
             <property name="name">
-                <cstring>groupBox3</cstring>
-            </property>
-            <property name="title">
-                <string>Doc</string>
-            </property>
-            <widget class="QLabel">
-                <property name="name">
-                    <cstring>textLabel1</cstring>
-                </property>
-                <property name="geometry">
-                    <rect>
-                        <x>20</x>
-                        <y>20</y>
-                        <width>280</width>
-                        <height>20</height>
-                    </rect>
-                </property>
-                <property name="text">
-                    <string>Repertoire d'acces à la documentation :</string>
-                </property>
-            </widget>
-            <widget class="QLineEdit">
-                <property name="name">
-                    <cstring>LERepDoc</cstring>
-                </property>
-                <property name="geometry">
-                    <rect>
-                        <x>20</x>
-                        <y>40</y>
-                        <width>520</width>
-                        <height>31</height>
-                    </rect>
-                </property>
-                <property name="text">
-                    <string></string>
-                </property>
-            </widget>
+                <cstring>PBajout</cstring>
+            </property>
+            <property name="geometry">
+                <rect>
+                    <x>10</x>
+                    <y>20</y>
+                    <width>101</width>
+                    <height>41</height>
+                </rect>
+            </property>
+            <property name="text">
+                <string>Ajouter
+Version :</string>
+            </property>
         </widget>
-        <widget class="QGroupBox" row="0" column="0">
+    </widget>
+    <widget class="QGroupBox">
+        <property name="name">
+            <cstring>groupBox3</cstring>
+        </property>
+        <property name="geometry">
+            <rect>
+                <x>10</x>
+                <y>310</y>
+                <width>548</width>
+                <height>90</height>
+            </rect>
+        </property>
+        <property name="title">
+            <string>Doc</string>
+        </property>
+        <widget class="QLabel">
             <property name="name">
-                <cstring>groupBox1</cstring>
-            </property>
-            <property name="title">
-                <string>Configurer une Version</string>
-            </property>
-            <widget class="QLabel">
-                <property name="name">
-                    <cstring>textLabel1_3</cstring>
-                </property>
-                <property name="geometry">
-                    <rect>
-                        <x>30</x>
-                        <y>60</y>
-                        <width>280</width>
-                        <height>20</height>
-                    </rect>
-                </property>
-                <property name="text">
-                    <string>Répertoire d'accès au catalogue :</string>
-                </property>
-            </widget>
-            <widget class="QLabel">
-                <property name="name">
-                    <cstring>textLabel1_2_2</cstring>
-                </property>
-                <property name="geometry">
-                    <rect>
-                        <x>30</x>
-                        <y>120</y>
-                        <width>280</width>
-                        <height>20</height>
-                    </rect>
-                </property>
-                <property name="text">
-                    <string>Répertoire d'accès aux matériaux :</string>
-                </property>
-            </widget>
-            <widget class="QComboBox">
-                <property name="name">
-                    <cstring>CBVersions</cstring>
-                </property>
-                <property name="geometry">
-                    <rect>
-                        <x>30</x>
-                        <y>20</y>
-                        <width>90</width>
-                        <height>30</height>
-                    </rect>
-                </property>
-            </widget>
-            <widget class="QLineEdit">
-                <property name="name">
-                    <cstring>LERepMat</cstring>
-                </property>
-                <property name="geometry">
-                    <rect>
-                        <x>30</x>
-                        <y>140</y>
-                        <width>501</width>
-                        <height>31</height>
-                    </rect>
-                </property>
-                <property name="text">
-                    <string></string>
-                </property>
-            </widget>
-            <widget class="QLineEdit">
-                <property name="name">
-                    <cstring>LERepCata</cstring>
-                </property>
-                <property name="geometry">
-                    <rect>
-                        <x>30</x>
-                        <y>80</y>
-                        <width>501</width>
-                        <height>31</height>
-                    </rect>
-                </property>
-                <property name="text">
-                    <string></string>
-                </property>
-            </widget>
-            <widget class="QPushButton">
-                <property name="name">
-                    <cstring>Bok</cstring>
-                </property>
-                <property name="geometry">
-                    <rect>
-                        <x>440</x>
-                        <y>20</y>
-                        <width>90</width>
-                        <height>31</height>
-                    </rect>
-                </property>
-                <property name="text">
-                    <string>Ok</string>
-                </property>
-                <property name="autoDefault">
-                    <bool>false</bool>
-                </property>
-            </widget>
+                <cstring>textLabel1</cstring>
+            </property>
+            <property name="geometry">
+                <rect>
+                    <x>20</x>
+                    <y>10</y>
+                    <width>280</width>
+                    <height>40</height>
+                </rect>
+            </property>
+            <property name="text">
+                <string>Repertoire d'acces à la documentation :</string>
+            </property>
         </widget>
-        <widget class="QGroupBox" row="1" column="0">
+        <widget class="QLineEdit">
             <property name="name">
-                <cstring>groupBox2</cstring>
-            </property>
-            <property name="title">
-                <string>Gérer les versions</string>
-            </property>
-            <widget class="QLabel">
-                <property name="name">
-                    <cstring>textLabel1_2_3</cstring>
-                </property>
-                <property name="geometry">
-                    <rect>
-                        <x>20</x>
-                        <y>60</y>
-                        <width>180</width>
-                        <height>21</height>
-                    </rect>
-                </property>
-                <property name="text">
-                    <string>Reinitialiser avec les valeurs par défaut</string>
-                </property>
-            </widget>
-            <widget class="QLabel">
-                <property name="name">
-                    <cstring>textLabel3</cstring>
-                </property>
-                <property name="geometry">
-                    <rect>
-                        <x>19</x>
-                        <y>19</y>
-                        <width>141</width>
-                        <height>21</height>
-                    </rect>
-                </property>
-                <property name="text">
-                    <string>Ajouter une version</string>
-                </property>
-            </widget>
-            <widget class="QLabel">
-                <property name="name">
-                    <cstring>textLabel3_2</cstring>
-                </property>
-                <property name="geometry">
-                    <rect>
-                        <x>300</x>
-                        <y>20</y>
-                        <width>130</width>
-                        <height>21</height>
-                    </rect>
-                </property>
-                <property name="text">
-                    <string>Supprimer une version</string>
-                </property>
-            </widget>
-            <widget class="QLineEdit">
-                <property name="name">
-                    <cstring>LEVersionAjout</cstring>
-                </property>
-                <property name="geometry">
-                    <rect>
-                        <x>140</x>
-                        <y>20</y>
-                        <width>101</width>
-                        <height>21</height>
-                    </rect>
-                </property>
-            </widget>
-            <widget class="QLineEdit">
-                <property name="name">
-                    <cstring>LEVersionSup</cstring>
-                </property>
-                <property name="geometry">
-                    <rect>
-                        <x>420</x>
-                        <y>20</y>
-                        <width>101</width>
-                        <height>21</height>
-                    </rect>
-                </property>
-            </widget>
-            <widget class="QCheckBox">
-                <property name="name">
-                    <cstring>Bdefaut</cstring>
-                </property>
-                <property name="geometry">
-                    <rect>
-                        <x>210</x>
-                        <y>60</y>
-                        <width>20</width>
-                        <height>20</height>
-                    </rect>
-                </property>
-                <property name="text">
-                    <string></string>
-                </property>
-            </widget>
+                <cstring>LERepDoc</cstring>
+            </property>
+            <property name="geometry">
+                <rect>
+                    <x>20</x>
+                    <y>50</y>
+                    <width>520</width>
+                    <height>31</height>
+                </rect>
+            </property>
+            <property name="text">
+                <string></string>
+            </property>
         </widget>
-    </grid>
+    </widget>
+    <widget class="QCheckBox">
+        <property name="name">
+            <cstring>Bdefaut</cstring>
+        </property>
+        <property name="geometry">
+            <rect>
+                <x>10</x>
+                <y>430</y>
+                <width>280</width>
+                <height>20</height>
+            </rect>
+        </property>
+        <property name="font">
+            <font>
+                <pointsize>12</pointsize>
+            </font>
+        </property>
+        <property name="text">
+            <string>Reinitialiser avec les valeurs par defaut</string>
+        </property>
+    </widget>
+    <widget class="QPushButton">
+        <property name="name">
+            <cstring>PBQuit</cstring>
+        </property>
+        <property name="geometry">
+            <rect>
+                <x>400</x>
+                <y>420</y>
+                <width>151</width>
+                <height>31</height>
+            </rect>
+        </property>
+        <property name="minimumSize">
+            <size>
+                <width>0</width>
+                <height>30</height>
+            </size>
+        </property>
+        <property name="text">
+            <string>Quitter</string>
+        </property>
+    </widget>
 </widget>
 <connections>
     <connection>
         <receiver>desOptions</receiver>
         <slot>AjoutVersion()</slot>
     </connection>
+    <connection>
+        <sender>LERepDoc</sender>
+        <signal>returnPressed()</signal>
+        <receiver>desOptions</receiver>
+        <slot>ChangePathDoc()</slot>
+    </connection>
+    <connection>
+        <sender>Bok</sender>
+        <signal>clicked()</signal>
+        <receiver>desOptions</receiver>
+        <slot>BokClicked()</slot>
+    </connection>
     <connection>
         <sender>LEVersionSup</sender>
         <signal>returnPressed()</signal>
         <slot>SupVersion()</slot>
     </connection>
     <connection>
-        <sender>LERepDoc</sender>
-        <signal>returnPressed()</signal>
+        <sender>PBajout</sender>
+        <signal>clicked()</signal>
         <receiver>desOptions</receiver>
-        <slot>ChangePathDoc()</slot>
+        <slot>AjoutVersion()</slot>
     </connection>
     <connection>
-        <sender>Bok</sender>
+        <sender>PBSup</sender>
         <signal>clicked()</signal>
         <receiver>desOptions</receiver>
-        <slot>BokClicked()</slot>
+        <slot>SupVersion()</slot>
+    </connection>
+    <connection>
+        <sender>PBQuit</sender>
+        <signal>clicked()</signal>
+        <receiver>desOptions</receiver>
+        <slot>close()</slot>
     </connection>
 </connections>
 <slots>
index 830dd66bdd4ffdcd6427b8b23aac525602971073..2a4cc274f7951b71220cb32f6599c4a03e645374 100644 (file)
@@ -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("<h3><p align=\"center\"><u><b>Mots Clefs Permis</b></u></p></h3>"))
         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):
index 45010fcb79e6c73bcd9f39b546f76f945c3306a9..8bff53b5429f4726ddc4a70e2919236c565fedfa 100644 (file)
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
+        <widget class="QLabel" row="1" column="0" rowspan="1" colspan="3">
+            <property name="name">
+                <cstring>Commentaire</cstring>
+            </property>
+            <property name="frameShape">
+                <enum>NoFrame</enum>
+            </property>
+            <property name="frameShadow">
+                <enum>Plain</enum>
+            </property>
+            <property name="text">
+                <string></string>
+            </property>
+        </widget>
+        <widget class="QPushButton" row="2" column="1">
+            <property name="name">
+                <cstring>bOk</cstring>
+            </property>
+            <property name="minimumSize">
+                <size>
+                    <width>0</width>
+                    <height>30</height>
+                </size>
+            </property>
+            <property name="text">
+                <string>&amp;Valider</string>
+            </property>
+            <property name="accel">
+                <string>Shift+A, Alt+A, Alt+A, Alt+A</string>
+            </property>
+            <property name="autoDefault">
+                <bool>true</bool>
+            </property>
+            <property name="default">
+                <bool>true</bool>
+            </property>
+            <property name="toolTip" stdset="0">
+                <string>validation de la saisie</string>
+            </property>
+        </widget>
+        <widget class="QPushButton" row="2" column="0">
+            <property name="name">
+                <cstring>bSup</cstring>
+            </property>
+            <property name="minimumSize">
+                <size>
+                    <width>0</width>
+                    <height>30</height>
+                </size>
+            </property>
+            <property name="text">
+                <string>&amp;Supprimer</string>
+            </property>
+            <property name="accel">
+                <string>Alt+S</string>
+            </property>
+            <property name="autoDefault">
+                <bool>true</bool>
+            </property>
+            <property name="toolTip" stdset="0">
+                <string>suppression du mot clef</string>
+            </property>
+        </widget>
+        <widget class="QPushButton" row="2" column="2">
+            <property name="name">
+                <cstring>bHelp</cstring>
+            </property>
+            <property name="minimumSize">
+                <size>
+                    <width>0</width>
+                    <height>30</height>
+                </size>
+            </property>
+            <property name="text">
+                <string>&amp;Documentation</string>
+            </property>
+            <property name="accel">
+                <string>Alt+D</string>
+            </property>
+            <property name="autoDefault">
+                <bool>true</bool>
+            </property>
+            <property name="toolTip" stdset="0">
+                <string>affichage documentation aster</string>
+            </property>
+        </widget>
         <widget class="QTabWidget" row="0" column="0" rowspan="1" colspan="3">
             <property name="name">
                 <cstring>TWChoix</cstring>
                 <attribute name="title">
                     <string>Nouvelle Commande</string>
                 </attribute>
-                <widget class="QButtonGroup">
+                <grid>
                     <property name="name">
-                        <cstring>buttonGroup1</cstring>
-                    </property>
-                    <property name="geometry">
-                        <rect>
-                            <x>308</x>
-                            <y>11</y>
-                            <width>160</width>
-                            <height>80</height>
-                        </rect>
-                    </property>
-                    <property name="title">
-                        <string>Affichage</string>
+                        <cstring>unnamed</cstring>
                     </property>
-                    <widget class="QRadioButton">
+                    <widget class="QButtonGroup" row="0" column="3" rowspan="2" colspan="1">
                         <property name="name">
-                            <cstring>RBalpha</cstring>
+                            <cstring>buttonGroup1</cstring>
+                        </property>
+                        <property name="title">
+                            <string>Affichage</string>
                         </property>
-                        <property name="geometry">
-                            <rect>
-                                <x>20</x>
-                                <y>20</y>
-                                <width>120</width>
+                        <widget class="QRadioButton">
+                            <property name="name">
+                                <cstring>RBalpha</cstring>
+                            </property>
+                            <property name="geometry">
+                                <rect>
+                                    <x>20</x>
+                                    <y>20</y>
+                                    <width>120</width>
+                                    <height>20</height>
+                                </rect>
+                            </property>
+                            <property name="text">
+                                <string>alphabétique</string>
+                            </property>
+                            <property name="checked">
+                                <bool>true</bool>
+                            </property>
+                        </widget>
+                        <widget class="QRadioButton">
+                            <property name="name">
+                                <cstring>RBGroupe</cstring>
+                            </property>
+                            <property name="geometry">
+                                <rect>
+                                    <x>20</x>
+                                    <y>40</y>
+                                    <width>110</width>
+                                    <height>20</height>
+                                </rect>
+                            </property>
+                            <property name="text">
+                                <string>par groupe</string>
+                            </property>
+                        </widget>
+                    </widget>
+                    <widget class="QListBox" row="2" column="0" rowspan="1" colspan="4">
+                        <property name="name">
+                            <cstring>LBNouvCommande</cstring>
+                        </property>
+                    </widget>
+                    <widget class="QLabel" row="0" column="0" rowspan="1" colspan="3">
+                        <property name="name">
+                            <cstring>textLabel1_4</cstring>
+                        </property>
+                        <property name="maximumSize">
+                            <size>
+                                <width>32767</width>
                                 <height>20</height>
-                            </rect>
+                            </size>
                         </property>
                         <property name="text">
-                            <string>alphabétique</string>
+                            <string>&lt;b&gt;&lt;u&gt;Commandes :&lt;/u&gt;&lt;/b&gt;</string>
+                        </property>
+                    </widget>
+                    <widget class="QLabel" row="3" column="0" rowspan="1" colspan="4">
+                        <property name="name">
+                            <cstring>textLabel4</cstring>
                         </property>
-                        <property name="checked">
-                            <bool>true</bool>
+                        <property name="text">
+                            <string>La commande choisie sera ajoutée APRES la commande courante</string>
                         </property>
                     </widget>
-                    <widget class="QRadioButton">
+                    <widget class="QLabel" row="1" column="0">
                         <property name="name">
-                            <cstring>RBGroupe</cstring>
+                            <cstring>textLabel6</cstring>
                         </property>
-                        <property name="geometry">
-                            <rect>
-                                <x>20</x>
-                                <y>40</y>
-                                <width>110</width>
-                                <height>20</height>
-                            </rect>
+                        <property name="minimumSize">
+                            <size>
+                                <width>40</width>
+                                <height>40</height>
+                            </size>
                         </property>
                         <property name="text">
-                            <string>par groupe</string>
+                            <string>Filtre</string>
                         </property>
                     </widget>
-                </widget>
-                <widget class="QLabel">
-                    <property name="name">
-                        <cstring>textLabel1_4</cstring>
-                    </property>
-                    <property name="geometry">
-                        <rect>
-                            <x>11</x>
-                            <y>11</y>
-                            <width>257</width>
-                            <height>53</height>
-                        </rect>
-                    </property>
-                    <property name="text">
-                        <string>&lt;b&gt;&lt;u&gt;Commandes :&lt;/u&gt;&lt;/b&gt;</string>
-                    </property>
-                </widget>
-                <widget class="QLabel">
-                    <property name="name">
-                        <cstring>textLabel4</cstring>
-                    </property>
-                    <property name="geometry">
-                        <rect>
-                            <x>11</x>
-                            <y>365</y>
-                            <width>457</width>
-                            <height>16</height>
-                        </rect>
-                    </property>
-                    <property name="text">
-                        <string>La commande choisie sera ajoutée APRES la commande courante</string>
-                    </property>
-                </widget>
-                <widget class="QListBox">
-                    <property name="name">
-                        <cstring>LBNouvCommande</cstring>
-                    </property>
-                    <property name="geometry">
-                        <rect>
-                            <x>11</x>
-                            <y>97</y>
-                            <width>457</width>
-                            <height>262</height>
-                        </rect>
-                    </property>
-                </widget>
-                <widget class="QLabel">
-                    <property name="name">
-                        <cstring>textLabel6</cstring>
-                    </property>
-                    <property name="geometry">
-                        <rect>
-                            <x>11</x>
-                            <y>70</y>
-                            <width>23</width>
-                            <height>21</height>
-                        </rect>
-                    </property>
-                    <property name="text">
-                        <string>Filtre</string>
-                    </property>
-                </widget>
-                <widget class="QToolButton">
-                    <property name="name">
-                        <cstring>BNext</cstring>
-                    </property>
-                    <property name="geometry">
-                        <rect>
-                            <x>257</x>
-                            <y>61</y>
-                            <width>41</width>
-                            <height>30</height>
-                        </rect>
-                    </property>
-                    <property name="text">
-                        <string>Suivant</string>
-                    </property>
-                    <property name="iconSet">
-                        <iconset></iconset>
-                    </property>
-                    <property name="toolTip" stdset="0">
-                        <string>affiche la prochaine occurence</string>
-                    </property>
-                </widget>
-                <widget class="QLineEdit">
-                    <property name="name">
-                        <cstring>LEFiltre</cstring>
-                    </property>
-                    <property name="geometry">
-                        <rect>
-                            <x>40</x>
-                            <y>60</y>
-                            <width>200</width>
-                            <height>30</height>
-                        </rect>
-                    </property>
-                </widget>
+                    <widget class="QLineEdit" row="1" column="1">
+                        <property name="name">
+                            <cstring>LEFiltre</cstring>
+                        </property>
+                        <property name="minimumSize">
+                            <size>
+                                <width>0</width>
+                                <height>40</height>
+                            </size>
+                        </property>
+                    </widget>
+                    <widget class="QToolButton" row="1" column="2">
+                        <property name="name">
+                            <cstring>BNext</cstring>
+                        </property>
+                        <property name="minimumSize">
+                            <size>
+                                <width>70</width>
+                                <height>40</height>
+                            </size>
+                        </property>
+                        <property name="text">
+                            <string>Suivant</string>
+                        </property>
+                        <property name="iconSet">
+                            <iconset></iconset>
+                        </property>
+                        <property name="toolTip" stdset="0">
+                            <string>affiche la prochaine occurence</string>
+                        </property>
+                    </widget>
+                </grid>
             </widget>
         </widget>
-        <widget class="QPushButton" row="2" column="1">
-            <property name="name">
-                <cstring>bOk</cstring>
-            </property>
-            <property name="text">
-                <string>&amp;Valider</string>
-            </property>
-            <property name="accel">
-                <string>Shift+A, Alt+A, Alt+A, Alt+A</string>
-            </property>
-            <property name="autoDefault">
-                <bool>true</bool>
-            </property>
-            <property name="default">
-                <bool>true</bool>
-            </property>
-            <property name="toolTip" stdset="0">
-                <string>validation de la saisie</string>
-            </property>
-        </widget>
-        <widget class="QPushButton" row="2" column="0">
-            <property name="name">
-                <cstring>bSup</cstring>
-            </property>
-            <property name="text">
-                <string>&amp;Supprimer</string>
-            </property>
-            <property name="accel">
-                <string>Alt+S</string>
-            </property>
-            <property name="autoDefault">
-                <bool>true</bool>
-            </property>
-            <property name="toolTip" stdset="0">
-                <string>suppression du mot clef</string>
-            </property>
-        </widget>
-        <widget class="QPushButton" row="2" column="2">
-            <property name="name">
-                <cstring>bHelp</cstring>
-            </property>
-            <property name="text">
-                <string>&amp;Documentation</string>
-            </property>
-            <property name="accel">
-                <string>Alt+D</string>
-            </property>
-            <property name="autoDefault">
-                <bool>true</bool>
-            </property>
-            <property name="toolTip" stdset="0">
-                <string>affichage documentation aster</string>
-            </property>
-        </widget>
-        <widget class="QLabel" row="1" column="0" rowspan="1" colspan="3">
-            <property name="name">
-                <cstring>Commentaire</cstring>
-            </property>
-            <property name="frameShape">
-                <enum>NoFrame</enum>
-            </property>
-            <property name="frameShadow">
-                <enum>Plain</enum>
-            </property>
-            <property name="text">
-                <string></string>
-            </property>
-        </widget>
     </grid>
 </widget>
 <connections>
index 2c73e6818f892c2472c623bb6fa3aac837d7efbd..7210da28f410a8bb13021360f7a9c459a5925d11 100644 (file)
@@ -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"))
index 45f3e23b62eaa484516dbd1c11a2e147bcd83e4c..e9cfa820de0379efc3dacdd0d03f62ab05071098 100644 (file)
                     <property name="name">
                         <cstring>unnamed</cstring>
                     </property>
-                    <widget class="QLabel" row="1" column="0">
-                        <property name="name">
-                            <cstring>textLabel6</cstring>
-                        </property>
-                        <property name="text">
-                            <string>Filtre</string>
-                        </property>
-                    </widget>
                     <widget class="QListBox" row="2" column="0" rowspan="1" colspan="4">
                         <property name="name">
                             <cstring>LBNouvCommande</cstring>
                             </property>
                         </widget>
                     </widget>
-                    <widget class="QLabel" row="0" column="0" rowspan="1" colspan="2">
+                    <widget class="QLabel" row="0" column="0" rowspan="1" colspan="3">
                         <property name="name">
                             <cstring>textLabel1_4</cstring>
                         </property>
                             <string>La commande choisie sera ajoutée APRES la commande courante</string>
                         </property>
                     </widget>
+                    <widget class="QLineEdit" row="1" column="1">
+                        <property name="name">
+                            <cstring>LEFiltre</cstring>
+                        </property>
+                        <property name="minimumSize">
+                            <size>
+                                <width>160</width>
+                                <height>30</height>
+                            </size>
+                        </property>
+                    </widget>
                     <widget class="QToolButton" row="1" column="2">
                         <property name="name">
                             <cstring>BNext</cstring>
                         </property>
+                        <property name="minimumSize">
+                            <size>
+                                <width>60</width>
+                                <height>30</height>
+                            </size>
+                        </property>
                         <property name="text">
                             <string>Suivant</string>
                         </property>
                             <string>affiche la prochaine occurence</string>
                         </property>
                     </widget>
-                    <widget class="QLineEdit" row="1" column="1">
+                    <widget class="QLabel" row="1" column="0">
                         <property name="name">
-                            <cstring>LEFiltre</cstring>
+                            <cstring>textLabel6</cstring>
                         </property>
                         <property name="minimumSize">
                             <size>
-                                <width>160</width>
+                                <width>50</width>
                                 <height>30</height>
                             </size>
                         </property>
+                        <property name="text">
+                            <string>Filtre</string>
+                        </property>
                     </widget>
                 </grid>
             </widget>
             <property name="name">
                 <cstring>bOk</cstring>
             </property>
+            <property name="minimumSize">
+                <size>
+                    <width>0</width>
+                    <height>30</height>
+                </size>
+            </property>
             <property name="text">
                 <string>&amp;Valider</string>
             </property>
             <property name="name">
                 <cstring>bSup</cstring>
             </property>
+            <property name="minimumSize">
+                <size>
+                    <width>0</width>
+                    <height>30</height>
+                </size>
+            </property>
             <property name="text">
                 <string>&amp;Supprimer</string>
             </property>
             <property name="name">
                 <cstring>bHelp</cstring>
             </property>
+            <property name="minimumSize">
+                <size>
+                    <width>0</width>
+                    <height>30</height>
+                </size>
+            </property>
             <property name="text">
                 <string>&amp;Documentation</string>
             </property>
index bf1a33fc5bbf8ca992bf940ff4a7ea2e9330b952..6d7b72c2988dcecf4c18929ea0afe72fdf0d8d77 100644 (file)
@@ -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("<h3><p align=\"center\"><u><b>Arguments</b></u></p></h3>"))
         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("<b><u>Commandes :</u></b>"))
         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("<b><u>Commandes :</u></b>"))
+        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"))
 
 
index daffdd5a17b2844626d59640bb0de616fad0ac6e..37d5e0a2a49a27c7123e4cbd92fdc903f9f94345 100644 (file)
@@ -290,14 +290,6 @@ valeurs seront effectivement prises en compte</string>
                             <string>&lt;p align="left"&gt;La commande choisie sera ajoutée APRES la commande courante&lt;/p&gt;</string>
                         </property>
                     </widget>
-                    <widget class="QLabel" row="0" column="0" rowspan="1" colspan="2">
-                        <property name="name">
-                            <cstring>textLabel1_4</cstring>
-                        </property>
-                        <property name="text">
-                            <string>&lt;b&gt;&lt;u&gt;Commandes :&lt;/u&gt;&lt;/b&gt;</string>
-                        </property>
-                    </widget>
                     <widget class="QButtonGroup" row="0" column="3" rowspan="2" colspan="1">
                         <property name="name">
                             <cstring>buttonGroup1</cstring>
@@ -343,6 +335,33 @@ valeurs seront effectivement prises en compte</string>
                             </vbox>
                         </widget>
                     </widget>
+                    <widget class="QListBox" row="2" column="0" rowspan="1" colspan="4">
+                        <property name="name">
+                            <cstring>LBNouvCommande</cstring>
+                        </property>
+                    </widget>
+                    <widget class="QLabel" row="0" column="0" rowspan="1" colspan="3">
+                        <property name="name">
+                            <cstring>textLabel1_4</cstring>
+                        </property>
+                        <property name="text">
+                            <string>&lt;b&gt;&lt;u&gt;Commandes :&lt;/u&gt;&lt;/b&gt;</string>
+                        </property>
+                    </widget>
+                    <widget class="QLabel" row="1" column="0">
+                        <property name="name">
+                            <cstring>textLabel6</cstring>
+                        </property>
+                        <property name="minimumSize">
+                            <size>
+                                <width>40</width>
+                                <height>0</height>
+                            </size>
+                        </property>
+                        <property name="text">
+                            <string>Filtre</string>
+                        </property>
+                    </widget>
                     <widget class="QLineEdit" row="1" column="1">
                         <property name="name">
                             <cstring>LEFiltre</cstring>
@@ -350,7 +369,7 @@ valeurs seront effectivement prises en compte</string>
                         <property name="minimumSize">
                             <size>
                                 <width>160</width>
-                                <height>30</height>
+                                <height>40</height>
                             </size>
                         </property>
                     </widget>
@@ -358,6 +377,12 @@ valeurs seront effectivement prises en compte</string>
                         <property name="name">
                             <cstring>BNext</cstring>
                         </property>
+                        <property name="minimumSize">
+                            <size>
+                                <width>60</width>
+                                <height>40</height>
+                            </size>
+                        </property>
                         <property name="text">
                             <string>Suivant</string>
                         </property>
@@ -368,19 +393,6 @@ valeurs seront effectivement prises en compte</string>
                             <string>affiche la prochaine occurence</string>
                         </property>
                     </widget>
-                    <widget class="QLabel" row="1" column="0">
-                        <property name="name">
-                            <cstring>textLabel6</cstring>
-                        </property>
-                        <property name="text">
-                            <string>Filtre</string>
-                        </property>
-                    </widget>
-                    <widget class="QListBox" row="2" column="0" rowspan="1" colspan="4">
-                        <property name="name">
-                            <cstring>LBNouvCommande</cstring>
-                        </property>
-                    </widget>
                 </grid>
             </widget>
         </widget>
index 4a9917f88a2ba70467b4f43047e9720b64506f67..dfe0d625a289bb9655b6cbb5973802dbb99fab8f 100644 (file)
@@ -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("<h3><p align=\"center\"><u><b>Mots Clefs Permis</b></u></p></h3>"))
         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("<b><u>Commandes :</u></b>"))
         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("<b><u>Commandes :</u></b>"))
+        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"))
index 02883fc448e7a8ba343f1d102535b9a0d64844df..9edfc3e74d93e54fb9cb4a254219bb9a9022c9e8 100644 (file)
@@ -9,7 +9,7 @@
             <x>0</x>
             <y>0</y>
             <width>521</width>
-            <height>499</height>
+            <height>511</height>
         </rect>
     </property>
     <property name="minimumSize">
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="QLabel" row="1" column="0" rowspan="1" colspan="3">
+        <widget class="QPushButton" row="2" column="1">
             <property name="name">
-                <cstring>Commentaire</cstring>
+                <cstring>bOk</cstring>
+            </property>
+            <property name="minimumSize">
+                <size>
+                    <width>0</width>
+                    <height>30</height>
+                </size>
             </property>
             <property name="text">
-                <string></string>
+                <string>&amp;Valider</string>
+            </property>
+            <property name="accel">
+                <string>Shift+A, Alt+A, Alt+A, Alt+A</string>
+            </property>
+            <property name="autoDefault">
+                <bool>true</bool>
+            </property>
+            <property name="default">
+                <bool>true</bool>
+            </property>
+            <property name="toolTip" stdset="0">
+                <string>validation de la saisie</string>
             </property>
         </widget>
         <widget class="QPushButton" row="2" column="2">
             <property name="name">
                 <cstring>bHelp</cstring>
             </property>
+            <property name="minimumSize">
+                <size>
+                    <width>0</width>
+                    <height>30</height>
+                </size>
+            </property>
             <property name="text">
                 <string>&amp;Documentation</string>
             </property>
             <property name="name">
                 <cstring>bSup</cstring>
             </property>
+            <property name="minimumSize">
+                <size>
+                    <width>0</width>
+                    <height>30</height>
+                </size>
+            </property>
             <property name="text">
                 <string>&amp;Supprimer</string>
             </property>
                 <string>suppression du mot clef</string>
             </property>
         </widget>
-        <widget class="QPushButton" row="2" column="1">
+        <widget class="QLabel" row="1" column="0" rowspan="1" colspan="3">
             <property name="name">
-                <cstring>bOk</cstring>
+                <cstring>Commentaire</cstring>
             </property>
             <property name="text">
-                <string>&amp;Valider</string>
-            </property>
-            <property name="accel">
-                <string>Shift+A, Alt+A, Alt+A, Alt+A</string>
-            </property>
-            <property name="autoDefault">
-                <bool>true</bool>
-            </property>
-            <property name="default">
-                <bool>true</bool>
-            </property>
-            <property name="toolTip" stdset="0">
-                <string>validation de la saisie</string>
+                <string></string>
             </property>
         </widget>
         <widget class="QTabWidget" row="0" column="0" rowspan="1" colspan="3">
                     <property name="name">
                         <cstring>unnamed</cstring>
                     </property>
-                    <widget class="QLabel" row="1" column="0">
-                        <property name="name">
-                            <cstring>textLabel6</cstring>
-                        </property>
-                        <property name="text">
-                            <string>Filtre</string>
-                        </property>
-                    </widget>
                     <widget class="QListBox" row="2" column="0" rowspan="1" colspan="4">
                         <property name="name">
                             <cstring>LBNouvCommande</cstring>
                             </property>
                         </widget>
                     </widget>
-                    <widget class="QLabel" row="0" column="0" rowspan="1" colspan="2">
+                    <widget class="QLabel" row="3" column="0" rowspan="1" colspan="4">
+                        <property name="name">
+                            <cstring>textLabel4</cstring>
+                        </property>
+                        <property name="text">
+                            <string>La commande choisie sera ajoutée APRES la commande courante</string>
+                        </property>
+                    </widget>
+                    <widget class="QLabel" row="0" column="0" rowspan="1" colspan="3">
                         <property name="name">
                             <cstring>textLabel1_4</cstring>
                         </property>
                             <string>&lt;b&gt;&lt;u&gt;Commandes :&lt;/u&gt;&lt;/b&gt;</string>
                         </property>
                     </widget>
-                    <widget class="QLabel" row="3" column="0" rowspan="1" colspan="4">
+                    <widget class="QLabel" row="1" column="0">
                         <property name="name">
-                            <cstring>textLabel4</cstring>
+                            <cstring>textLabel6</cstring>
+                        </property>
+                        <property name="minimumSize">
+                            <size>
+                                <width>40</width>
+                                <height>0</height>
+                            </size>
                         </property>
                         <property name="text">
-                            <string>La commande choisie sera ajoutée APRES la commande courante</string>
+                            <string>Filtre</string>
+                        </property>
+                    </widget>
+                    <widget class="QLineEdit" row="1" column="1">
+                        <property name="name">
+                            <cstring>LEFiltre</cstring>
+                        </property>
+                        <property name="minimumSize">
+                            <size>
+                                <width>160</width>
+                                <height>40</height>
+                            </size>
                         </property>
                     </widget>
                     <widget class="QToolButton" row="1" column="2">
                         <property name="name">
                             <cstring>BNext</cstring>
                         </property>
+                        <property name="minimumSize">
+                            <size>
+                                <width>60</width>
+                                <height>0</height>
+                            </size>
+                        </property>
                         <property name="text">
                             <string>Suivant</string>
                         </property>
                             <string>affiche la prochaine occurence</string>
                         </property>
                     </widget>
-                    <widget class="QLineEdit" row="1" column="1">
-                        <property name="name">
-                            <cstring>LEFiltre</cstring>
-                        </property>
-                        <property name="minimumSize">
-                            <size>
-                                <width>160</width>
-                                <height>30</height>
-                            </size>
-                        </property>
-                    </widget>
                 </grid>
             </widget>
             <widget class="QWidget">
index 0321768690cd476f47e300596bc97047a69a3dfd..79b8a08316a33aa15fd12584dbc6de21a174016d 100644 (file)
@@ -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)
 
index 3be939edfb9b6a042953ca4c341e0557950407d7..d451544b4cbab09755b170bc229a6f5e96f8c3c2 100644 (file)
                         <property name="name">
                             <cstring>BNext</cstring>
                         </property>
+                        <property name="minimumSize">
+                            <size>
+                                <width>60</width>
+                                <height>0</height>
+                            </size>
+                        </property>
                         <property name="text">
                             <string>Suivant</string>
                         </property>
                         <property name="name">
                             <cstring>textLabel6</cstring>
                         </property>
+                        <property name="minimumSize">
+                            <size>
+                                <width>40</width>
+                                <height>0</height>
+                            </size>
+                        </property>
                         <property name="text">
                             <string>Filtre</string>
                         </property>
             <property name="name">
                 <cstring>bSup</cstring>
             </property>
+            <property name="minimumSize">
+                <size>
+                    <width>0</width>
+                    <height>30</height>
+                </size>
+            </property>
             <property name="text">
                 <string>&amp;Supprimer</string>
             </property>
             <property name="name">
                 <cstring>bHelp</cstring>
             </property>
+            <property name="minimumSize">
+                <size>
+                    <width>0</width>
+                    <height>30</height>
+                </size>
+            </property>
             <property name="text">
                 <string>&amp;Documentation</string>
             </property>
             <property name="name">
                 <cstring>bOk</cstring>
             </property>
+            <property name="minimumSize">
+                <size>
+                    <width>0</width>
+                    <height>30</height>
+                </size>
+            </property>
             <property name="text">
                 <string>&amp;Valider</string>
             </property>
index 16c6bbd03eb7e2ae607c14aff043e0920e9fc81c..bd886581acad698b289cdd41c06194dc1a6128ed 100644 (file)
@@ -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)
index aeb6e692f53e389a8be05ccc6a16a687c6ce55d2..7aa81f89d0dd2048a14e4c786657f638c294c88f 100644 (file)
@@ -238,6 +238,12 @@ appuyé sur  le bouton Valider.</string>
                         <property name="name">
                             <cstring>textLabel6</cstring>
                         </property>
+                        <property name="minimumSize">
+                            <size>
+                                <width>40</width>
+                                <height>0</height>
+                            </size>
+                        </property>
                         <property name="text">
                             <string>Filtre</string>
                         </property>
@@ -310,6 +316,12 @@ appuyé sur  le bouton Valider.</string>
                         <property name="name">
                             <cstring>BNext</cstring>
                         </property>
+                        <property name="minimumSize">
+                            <size>
+                                <width>60</width>
+                                <height>0</height>
+                            </size>
+                        </property>
                         <property name="text">
                             <string>Suivant</string>
                         </property>
@@ -338,6 +350,12 @@ appuyé sur  le bouton Valider.</string>
             <property name="name">
                 <cstring>bOk</cstring>
             </property>
+            <property name="minimumSize">
+                <size>
+                    <width>0</width>
+                    <height>30</height>
+                </size>
+            </property>
             <property name="text">
                 <string>&amp;Valider</string>
             </property>
@@ -358,6 +376,12 @@ appuyé sur  le bouton Valider.</string>
             <property name="name">
                 <cstring>bSup</cstring>
             </property>
+            <property name="minimumSize">
+                <size>
+                    <width>0</width>
+                    <height>30</height>
+                </size>
+            </property>
             <property name="text">
                 <string>&amp;Supprimer</string>
             </property>
@@ -375,6 +399,12 @@ appuyé sur  le bouton Valider.</string>
             <property name="name">
                 <cstring>bHelp</cstring>
             </property>
+            <property name="minimumSize">
+                <size>
+                    <width>0</width>
+                    <height>30</height>
+                </size>
+            </property>
             <property name="text">
                 <string>&amp;Documentation</string>
             </property>
index 2ce61ed2b6f54164403bc6274528c85bd223a467..2db030cca7a85fd4626a9ce206929be1fb09d419 100644 (file)
@@ -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)
index 6414067ac0d6a4cee8a5589ddfac170862201a20..17f7d6daf669051c3405e65cb96813e157ca1fa4 100644 (file)
                         <property name="name">
                             <cstring>BNext</cstring>
                         </property>
+                        <property name="minimumSize">
+                            <size>
+                                <width>60</width>
+                                <height>0</height>
+                            </size>
+                        </property>
                         <property name="text">
                             <string>Suivant</string>
                         </property>
                         <property name="name">
                             <cstring>textLabel6</cstring>
                         </property>
+                        <property name="minimumSize">
+                            <size>
+                                <width>40</width>
+                                <height>0</height>
+                            </size>
+                        </property>
                         <property name="text">
                             <string>Filtre</string>
                         </property>
             <property name="name">
                 <cstring>bSup</cstring>
             </property>
+            <property name="minimumSize">
+                <size>
+                    <width>0</width>
+                    <height>30</height>
+                </size>
+            </property>
             <property name="text">
                 <string>&amp;Supprimer</string>
             </property>
             <property name="name">
                 <cstring>bOk</cstring>
             </property>
+            <property name="minimumSize">
+                <size>
+                    <width>0</width>
+                    <height>30</height>
+                </size>
+            </property>
             <property name="text">
                 <string>&amp;Valider</string>
             </property>
             <property name="name">
                 <cstring>bHelp</cstring>
             </property>
+            <property name="minimumSize">
+                <size>
+                    <width>0</width>
+                    <height>30</height>
+                </size>
+            </property>
             <property name="text">
                 <string>&amp;Documentation</string>
             </property>
index 9658be85da444bbccd2900809fa8f2d6b3bf0114..81d6eaf605eab7d3664553ec8c72f275df7e6d1b 100644 (file)
@@ -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("<b><u>Commandes :</u></b>"))
-        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("<b><u>Commandes :</u></b>"))
+        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):
index 54c67215d77df9bd7ffa6f5f9df2237f9c3753e9..2f5ba8cf38f821d8b3b3f5e672482ab9191856b5 100644 (file)
@@ -8,7 +8,7 @@
         <rect>
             <x>0</x>
             <y>0</y>
-            <width>505</width>
+            <width>519</width>
             <height>513</height>
         </rect>
     </property>
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="QLayoutWidget" row="0" column="0" rowspan="2" colspan="2">
-            <property name="name">
-                <cstring>layout4</cstring>
-            </property>
-            <grid>
-                <property name="name">
-                    <cstring>unnamed</cstring>
-                </property>
-                <widget class="QLineEdit" row="2" column="1">
-                    <property name="name">
-                        <cstring>LEFiltre</cstring>
-                    </property>
-                    <property name="minimumSize">
-                        <size>
-                            <width>151</width>
-                            <height>30</height>
-                        </size>
-                    </property>
-                </widget>
-                <widget class="QButtonGroup" row="1" column="0" rowspan="1" colspan="3">
-                    <property name="name">
-                        <cstring>buttonGroup1</cstring>
-                    </property>
-                    <property name="title">
-                        <string>Affichage</string>
-                    </property>
-                    <widget class="QRadioButton">
-                        <property name="name">
-                            <cstring>RBGroupe</cstring>
-                        </property>
-                        <property name="geometry">
-                            <rect>
-                                <x>10</x>
-                                <y>20</y>
-                                <width>90</width>
-                                <height>20</height>
-                            </rect>
-                        </property>
-                        <property name="text">
-                            <string>par groupe</string>
-                        </property>
-                    </widget>
-                    <widget class="QRadioButton">
-                        <property name="name">
-                            <cstring>RBalpha</cstring>
-                        </property>
-                        <property name="geometry">
-                            <rect>
-                                <x>110</x>
-                                <y>20</y>
-                                <width>110</width>
-                                <height>20</height>
-                            </rect>
-                        </property>
-                        <property name="text">
-                            <string>alphabétique</string>
-                        </property>
-                        <property name="checked">
-                            <bool>true</bool>
-                        </property>
-                    </widget>
-                </widget>
-                <widget class="QLabel" row="2" column="0">
-                    <property name="name">
-                        <cstring>textLabel6</cstring>
-                    </property>
-                    <property name="text">
-                        <string>Filtre</string>
-                    </property>
-                </widget>
-                <widget class="QToolButton" row="2" column="2">
-                    <property name="name">
-                        <cstring>BNext</cstring>
-                    </property>
-                    <property name="text">
-                        <string>Suivant</string>
-                    </property>
-                    <property name="iconSet">
-                        <iconset></iconset>
-                    </property>
-                    <property name="toolTip" stdset="0">
-                        <string>affiche la prochaine occurence</string>
-                    </property>
-                </widget>
-                <widget class="QLabel" row="0" column="1">
-                    <property name="name">
-                        <cstring>textLabel1_4</cstring>
-                    </property>
-                    <property name="text">
-                        <string>&lt;b&gt;&lt;u&gt;Commandes :&lt;/u&gt;&lt;/b&gt;</string>
-                    </property>
-                </widget>
-            </grid>
-        </widget>
-        <widget class="QListBox" row="1" column="2" rowspan="2" colspan="2">
+        <widget class="QPushButton" row="4" column="0" rowspan="1" colspan="2">
             <property name="name">
-                <cstring>LBRegles</cstring>
+                <cstring>bSup</cstring>
             </property>
             <property name="minimumSize">
                 <size>
-                    <width>250</width>
-                    <height>400</height>
+                    <width>0</width>
+                    <height>30</height>
                 </size>
             </property>
-        </widget>
-        <widget class="QLabel" row="0" column="2" rowspan="1" colspan="2">
-            <property name="name">
-                <cstring>textLabel1_4_2</cstring>
-            </property>
-            <property name="text">
-                <string>&lt;b&gt;&lt;u&gt;Régles :&lt;/u&gt;&lt;/b&gt;</string>
-            </property>
-        </widget>
-        <widget class="QPushButton" row="3" column="0">
-            <property name="name">
-                <cstring>bSup</cstring>
-            </property>
             <property name="text">
                 <string>&amp;Supprimer</string>
             </property>
                 <string>suppression du mot clef</string>
             </property>
         </widget>
-        <widget class="QPushButton" row="3" column="1" rowspan="1" colspan="2">
+        <widget class="QPushButton" row="4" column="2" rowspan="1" colspan="2">
             <property name="name">
                 <cstring>bOk</cstring>
             </property>
+            <property name="minimumSize">
+                <size>
+                    <width>0</width>
+                    <height>30</height>
+                </size>
+            </property>
             <property name="text">
                 <string>&amp;Valider</string>
             </property>
                 <string>validation de la saisie</string>
             </property>
         </widget>
-        <widget class="QPushButton" row="3" column="3">
+        <widget class="QPushButton" row="4" column="4">
             <property name="name">
                 <cstring>bHelp</cstring>
             </property>
+            <property name="minimumSize">
+                <size>
+                    <width>0</width>
+                    <height>30</height>
+                </size>
+            </property>
             <property name="text">
                 <string>&amp;Documentation</string>
             </property>
                 <string>affichage documentation aster</string>
             </property>
         </widget>
-        <widget class="QListBox" row="2" column="0" rowspan="1" colspan="2">
+        <widget class="QLabel" row="0" column="1" rowspan="1" colspan="2">
+            <property name="name">
+                <cstring>textLabel1_4</cstring>
+            </property>
+            <property name="text">
+                <string>&lt;b&gt;&lt;u&gt;Commandes :&lt;/u&gt;&lt;/b&gt;</string>
+            </property>
+        </widget>
+        <widget class="QLabel" row="0" column="3" rowspan="2" colspan="2">
+            <property name="name">
+                <cstring>textLabel1_4_2</cstring>
+            </property>
+            <property name="text">
+                <string>&lt;b&gt;&lt;u&gt;Régles :&lt;/u&gt;&lt;/b&gt;</string>
+            </property>
+        </widget>
+        <widget class="QLineEdit" row="2" column="1">
+            <property name="name">
+                <cstring>LEFiltre</cstring>
+            </property>
+            <property name="minimumSize">
+                <size>
+                    <width>0</width>
+                    <height>30</height>
+                </size>
+            </property>
+        </widget>
+        <widget class="QLabel" row="2" column="0">
+            <property name="name">
+                <cstring>textLabel6</cstring>
+            </property>
+            <property name="minimumSize">
+                <size>
+                    <width>40</width>
+                    <height>0</height>
+                </size>
+            </property>
+            <property name="text">
+                <string>Filtre</string>
+            </property>
+        </widget>
+        <widget class="QToolButton" row="2" column="2">
+            <property name="name">
+                <cstring>BNext</cstring>
+            </property>
+            <property name="minimumSize">
+                <size>
+                    <width>60</width>
+                    <height>30</height>
+                </size>
+            </property>
+            <property name="text">
+                <string>Suivant</string>
+            </property>
+            <property name="iconSet">
+                <iconset></iconset>
+            </property>
+            <property name="toolTip" stdset="0">
+                <string>affiche la prochaine occurence</string>
+            </property>
+        </widget>
+        <widget class="QButtonGroup" row="1" column="0" rowspan="1" colspan="3">
+            <property name="name">
+                <cstring>buttonGroup1</cstring>
+            </property>
+            <property name="minimumSize">
+                <size>
+                    <width>0</width>
+                    <height>60</height>
+                </size>
+            </property>
+            <property name="title">
+                <string>Affichage</string>
+            </property>
+            <widget class="QRadioButton">
+                <property name="name">
+                    <cstring>RBGroupe</cstring>
+                </property>
+                <property name="geometry">
+                    <rect>
+                        <x>10</x>
+                        <y>20</y>
+                        <width>90</width>
+                        <height>20</height>
+                    </rect>
+                </property>
+                <property name="text">
+                    <string>par groupe</string>
+                </property>
+            </widget>
+            <widget class="QRadioButton">
+                <property name="name">
+                    <cstring>RBalpha</cstring>
+                </property>
+                <property name="geometry">
+                    <rect>
+                        <x>110</x>
+                        <y>20</y>
+                        <width>100</width>
+                        <height>20</height>
+                    </rect>
+                </property>
+                <property name="text">
+                    <string>alphabétique</string>
+                </property>
+                <property name="checked">
+                    <bool>true</bool>
+                </property>
+            </widget>
+        </widget>
+        <widget class="QListBox" row="3" column="0" rowspan="1" colspan="3">
             <property name="name">
                 <cstring>LBNouvCommande</cstring>
             </property>
         </widget>
+        <widget class="QListBox" row="2" column="3" rowspan="2" colspan="2">
+            <property name="name">
+                <cstring>LBRegles</cstring>
+            </property>
+            <property name="minimumSize">
+                <size>
+                    <width>250</width>
+                    <height>350</height>
+                </size>
+            </property>
+        </widget>
     </grid>
 </widget>
 <connections>
index 7f22fd99f7a0df00524716bf828aff779aea5da4..b36b65b8c1ca3794329559d1caad2218de22c305 100644 (file)
@@ -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"))
index 73a5906b05a275c85f889fab4d726da0bf4ccbf4..a636a0eac236e99c63124eabc36a8e9dfa15cb1b 100644 (file)
             <iconset>image2</iconset>
         </property>
         <property name="text">
-            <string>Enregister</string>
+            <string>Enregistrer</string>
         </property>
         <property name="menuText">
             <string>&amp;Enregister</string>