*** empty log message ***

diff --git a/InterfaceQT/viewManager.py b/InterfaceQT/viewManager.py
index cf9f2d3712140b0232e8d301f78cdb1d39013cad..c4542f100fbe27c888b3ab8bbc15d870b63fc88b 100644 (file)
--- a/InterfaceQT/viewManager.py
+++ b/InterfaceQT/viewManager.py
@@ -638,7 +638,7 @@ class ViewManager:
                      self.trUtf8("Fichier Duplique"),
                      self.trUtf8("Le fichier ne sera pas sauvegarde."),
                      self.trUtf8("&Quitter"), 
-                     self.trUtf8("&Abandonner"))
+                     self.trUtf8("&Annuler"))
             if res == 0 : return 1
             return 0
         if editor.modified:
@@ -1035,7 +1035,7 @@ class ViewManager:
                      None,
                      self.trUtf8("Fichier Duplique"),
                      self.trUtf8("Le fichier ne sera pas sauvegarde."),
-                     self.trUtf8("&Abandonner"))
+                     self.trUtf8("&Annuler"))
            return
         if aw:
             ok, newName = aw.saveFile()

diff --git a/Ui/OptionsEditeur.py b/Ui/OptionsEditeur.py
index 69ae4f2cca2c0db1501eaf0b5005a8773dc5b022..8bd23b6267dc664a2fcf47cafe3c6931f4daf0a6 100644 (file)
--- a/Ui/OptionsEditeur.py
+++ b/Ui/OptionsEditeur.py
@@ -2,8 +2,8 @@
 
 # Form implementation generated from reading ui file 'OptionsEditeur.ui'
 #
-# Created: ven mai 16 13:30:39 2008
-#      by: The PyQt User Interface Compiler (pyuic) 3.13
+# Created: Mon Jun 2 16:08:31 2008
+#      by: The PyQt User Interface Compiler (pyuic) 3.16
 #
 # WARNING! All changes made in this file will be lost!
 
@@ -57,25 +57,25 @@ class desOptions(QDialog):
         self.PBajout = QPushButton(self.groupBox2,"PBajout")
         self.PBajout.setGeometry(QRect(10,20,101,41))
 
+        self.PBQuit = QPushButton(self,"PBQuit")
+        self.PBQuit.setGeometry(QRect(400,420,151,31))
+        self.PBQuit.setMinimumSize(QSize(0,30))
+
         self.groupBox3 = QGroupBox(self,"groupBox3")
         self.groupBox3.setGeometry(QRect(10,310,548,90))
 
-        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))
 
+        self.textLabel1 = QLabel(self.groupBox3,"textLabel1")
+        self.textLabel1.setGeometry(QRect(20,20,280,30))
+
         self.Bdefaut = QCheckBox(self,"Bdefaut")
-        self.Bdefaut.setGeometry(QRect(10,430,280,20))
+        self.Bdefaut.setGeometry(QRect(10,430,340,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,474).expandedTo(self.minimumSizeHint()))
@@ -105,11 +105,11 @@ class desOptions(QDialog):
 "Version :"))
         self.PBajout.setText(self.__tr("Ajouter\n"
 "Version :"))
+        self.PBQuit.setText(self.__tr("Quitter"))
         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.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.Bdefaut.setText(self.__tr("Reinitialiser avec les valeurs par defaut"))
-        self.PBQuit.setText(self.__tr("Quitter"))
 
 
     def VersionChoisie(self):

diff --git a/Ui/OptionsEditeur.ui b/Ui/OptionsEditeur.ui
index ced2a9bcb247a58c6662633d623ed82100014786..7cebf8a3b987bb5f3117804445e474734bc57ce3 100644 (file)
--- a/Ui/OptionsEditeur.ui
+++ b/Ui/OptionsEditeur.ui
@@ -203,6 +203,28 @@ Version :</string>
             </property>
         </widget>
     </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 class="QGroupBox">
         <property name="name">
             <cstring>groupBox3</cstring>
@@ -218,36 +240,36 @@ Version :</string>
         <property name="title">
             <string>Doc</string>
         </property>
-        <widget class="QLabel">
+        <widget class="QLineEdit">
             <property name="name">
-                <cstring>textLabel1</cstring>
+                <cstring>LERepDoc</cstring>
             </property>
             <property name="geometry">
                 <rect>
                     <x>20</x>
-                    <y>10</y>
-                    <width>280</width>
-                    <height>40</height>
+                    <y>50</y>
+                    <width>520</width>
+                    <height>31</height>
                 </rect>
             </property>
             <property name="text">
-                <string>Repertoire d'acces à la documentation :</string>
+                <string></string>
             </property>
         </widget>
-        <widget class="QLineEdit">
+        <widget class="QLabel">
             <property name="name">
-                <cstring>LERepDoc</cstring>
+                <cstring>textLabel1</cstring>
             </property>
             <property name="geometry">
                 <rect>
                     <x>20</x>
-                    <y>50</y>
-                    <width>520</width>
-                    <height>31</height>
+                    <y>20</y>
+                    <width>280</width>
+                    <height>30</height>
                 </rect>
             </property>
             <property name="text">
-                <string></string>
+                <string>Repertoire d'acces à la documentation :</string>
             </property>
         </widget>
     </widget>
@@ -259,7 +281,7 @@ Version :</string>
             <rect>
                 <x>10</x>
                 <y>430</y>
-                <width>280</width>
+                <width>340</width>
                 <height>20</height>
             </rect>
         </property>
@@ -272,28 +294,6 @@ Version :</string>
             <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>

diff --git a/Ui/desMacro.py b/Ui/desMacro.py
index 79b8a08316a33aa15fd12584dbc6de21a174016d..4850e07288ce96310222e59799d19aee604bef6e 100644 (file)
--- a/Ui/desMacro.py
+++ b/Ui/desMacro.py
@@ -2,8 +2,8 @@
 
 # Form implementation generated from reading ui file 'desMacro.ui'
 #
-# Created: ven mai 16 13:30:38 2008
-#      by: The PyQt User Interface Compiler (pyuic) 3.13
+# Created: Mon Jun 2 15:35:12 2008
+#      by: The PyQt User Interface Compiler (pyuic) 3.16
 #
 # WARNING! All changes made in this file will be lost!
 
@@ -48,7 +48,7 @@ class DMacro(QWidget):
         self.textLabel1.setMinimumSize(QSize(0,0))
 
         MotClefLayout.addWidget(self.textLabel1,0,0)
-        self.TWChoix.insertTab(self.MotClef,QString(""))
+        self.TWChoix.insertTab(self.MotClef,QString.fromLatin1(""))
 
         self.Commande = QWidget(self.TWChoix,"Commande")
         CommandeLayout = QGridLayout(self.Commande,1,1,11,6,"CommandeLayout")
@@ -91,7 +91,7 @@ class DMacro(QWidget):
         self.LEFiltre.setMinimumSize(QSize(160,30))
 
         CommandeLayout.addWidget(self.LEFiltre,1,1)
-        self.TWChoix.insertTab(self.Commande,QString(""))
+        self.TWChoix.insertTab(self.Commande,QString.fromLatin1(""))
 
         self.TabPage = QWidget(self.TWChoix,"TabPage")
 
@@ -112,7 +112,7 @@ class DMacro(QWidget):
 
         self.LENomConcept = QLineEdit(self.groupBox1_2,"LENomConcept")
         self.LENomConcept.setGeometry(QRect(20,80,440,30))
-        self.TWChoix.insertTab(self.TabPage,QString(""))
+        self.TWChoix.insertTab(self.TabPage,QString.fromLatin1(""))
 
         DMacroLayout.addMultiCellWidget(self.TWChoix,0,0,0,2)
 
@@ -184,13 +184,13 @@ class DMacro(QWidget):
         self.textLabel1_3_3.setText(self.__tr("<u>Nom du concept :</u>"))
         self.TWChoix.changeTab(self.TabPage,self.__tr("Nommer Concept"))
         self.bSup.setText(self.__tr("&Supprimer"))
-        self.bSup.setAccel(self.__tr("Alt+S"))
+        self.bSup.setAccel(QKeySequence(self.__tr("Alt+S")))
         QToolTip.add(self.bSup,self.__tr("suppression du mot clef"))
         self.bHelp.setText(self.__tr("&Documentation"))
-        self.bHelp.setAccel(self.__tr("Alt+D"))
+        self.bHelp.setAccel(QKeySequence(self.__tr("Alt+D")))
         QToolTip.add(self.bHelp,self.__tr("affichage documentation aster"))
         self.bOk.setText(self.__tr("&Valider"))
-        self.bOk.setAccel(self.__tr("Shift+A, Alt+A, Alt+A, Alt+A"))
+        self.bOk.setAccel(QKeySequence(self.__tr("Shift+A, Alt+A, Alt+A, Alt+A")))
         QToolTip.add(self.bOk,self.__tr("validation de la saisie"))
 
 

diff --git a/Ui/desRacine.py b/Ui/desRacine.py
index 81d6eaf605eab7d3664553ec8c72f275df7e6d1b..39382eb2714721b7a4bd876ab9af67929a0ed03f 100644 (file)
--- a/Ui/desRacine.py
+++ b/Ui/desRacine.py
@@ -2,8 +2,8 @@
 
 # Form implementation generated from reading ui file 'desRacine.ui'
 #
-# Created: ven mai 16 13:30:38 2008
-#      by: The PyQt User Interface Compiler (pyuic) 3.13
+# Created: Mon Jun 2 16:02:17 2008
+#      by: The PyQt User Interface Compiler (pyuic) 3.16
 #
 # WARNING! All changes made in this file will be lost!
 
@@ -22,73 +22,78 @@ class DRac(QWidget):
 
         DRacLayout = QGridLayout(self,1,1,11,6,"DRacLayout")
 
-        self.bSup = QPushButton(self,"bSup")
-        self.bSup.setMinimumSize(QSize(0,30))
-        self.bSup.setAutoDefault(1)
+        self.textLabel1_4 = QLabel(self,"textLabel1_4")
+        self.textLabel1_4.setMinimumSize(QSize(291,21))
 
-        DRacLayout.addMultiCellWidget(self.bSup,4,4,0,1)
+        DRacLayout.addMultiCellWidget(self.textLabel1_4,0,0,0,1)
 
-        self.bOk = QPushButton(self,"bOk")
-        self.bOk.setMinimumSize(QSize(0,30))
-        self.bOk.setAutoDefault(1)
-        self.bOk.setDefault(1)
+        self.textLabel1_4_2 = QLabel(self,"textLabel1_4_2")
 
-        DRacLayout.addMultiCellWidget(self.bOk,4,4,2,3)
+        DRacLayout.addMultiCellWidget(self.textLabel1_4_2,0,1,2,3)
 
-        self.bHelp = QPushButton(self,"bHelp")
-        self.bHelp.setMinimumSize(QSize(0,30))
-        self.bHelp.setAutoDefault(1)
+        self.buttonGroup1 = QButtonGroup(self,"buttonGroup1")
+        self.buttonGroup1.setMinimumSize(QSize(0,60))
 
-        DRacLayout.addWidget(self.bHelp,4,4)
+        self.RBGroupe = QRadioButton(self.buttonGroup1,"RBGroupe")
+        self.RBGroupe.setGeometry(QRect(10,20,90,20))
 
-        self.textLabel1_4 = QLabel(self,"textLabel1_4")
+        self.RBalpha = QRadioButton(self.buttonGroup1,"RBalpha")
+        self.RBalpha.setGeometry(QRect(110,20,120,20))
+        self.RBalpha.setChecked(1)
 
-        DRacLayout.addMultiCellWidget(self.textLabel1_4,0,0,1,2)
+        DRacLayout.addMultiCellWidget(self.buttonGroup1,1,1,0,1)
 
-        self.textLabel1_4_2 = QLabel(self,"textLabel1_4_2")
+        self.bHelp = QPushButton(self,"bHelp")
+        self.bHelp.setMinimumSize(QSize(160,30))
+        self.bHelp.setAutoDefault(1)
 
-        DRacLayout.addMultiCellWidget(self.textLabel1_4_2,0,1,3,4)
+        DRacLayout.addWidget(self.bHelp,3,3)
 
-        self.LEFiltre = QLineEdit(self,"LEFiltre")
-        self.LEFiltre.setMinimumSize(QSize(0,30))
+        self.bSup = QPushButton(self,"bSup")
+        self.bSup.setMinimumSize(QSize(160,30))
+        self.bSup.setAutoDefault(1)
 
-        DRacLayout.addWidget(self.LEFiltre,2,1)
+        DRacLayout.addWidget(self.bSup,3,0)
 
-        self.textLabel6 = QLabel(self,"textLabel6")
-        self.textLabel6.setMinimumSize(QSize(40,0))
+        self.bOk = QPushButton(self,"bOk")
+        self.bOk.setMinimumSize(QSize(160,30))
+        self.bOk.setAutoDefault(1)
+        self.bOk.setDefault(1)
+
+        DRacLayout.addMultiCellWidget(self.bOk,3,3,1,2)
 
-        DRacLayout.addWidget(self.textLabel6,2,0)
+        layout2 = QGridLayout(None,1,1,0,6,"layout2")
 
         self.BNext = QToolButton(self,"BNext")
         self.BNext.setMinimumSize(QSize(60,30))
         self.BNext.setIconSet(QIconSet())
 
-        DRacLayout.addWidget(self.BNext,2,2)
+        layout2.addWidget(self.BNext,0,2)
 
-        self.buttonGroup1 = QButtonGroup(self,"buttonGroup1")
-        self.buttonGroup1.setMinimumSize(QSize(0,60))
+        self.LEFiltre = QLineEdit(self,"LEFiltre")
+        self.LEFiltre.setMinimumSize(QSize(0,30))
 
-        self.RBGroupe = QRadioButton(self.buttonGroup1,"RBGroupe")
-        self.RBGroupe.setGeometry(QRect(10,20,90,20))
+        layout2.addWidget(self.LEFiltre,0,1)
 
-        self.RBalpha = QRadioButton(self.buttonGroup1,"RBalpha")
-        self.RBalpha.setGeometry(QRect(110,20,100,20))
-        self.RBalpha.setChecked(1)
+        self.LBRegles = QListBox(self,"LBRegles")
+        self.LBRegles.setMinimumSize(QSize(240,350))
 
-        DRacLayout.addMultiCellWidget(self.buttonGroup1,1,1,0,2)
+        layout2.addMultiCellWidget(self.LBRegles,0,1,3,3)
 
-        self.LBNouvCommande = QListBox(self,"LBNouvCommande")
+        self.textLabel6 = QLabel(self,"textLabel6")
+        self.textLabel6.setMinimumSize(QSize(40,0))
 
-        DRacLayout.addMultiCellWidget(self.LBNouvCommande,3,3,0,2)
+        layout2.addWidget(self.textLabel6,0,0)
 
-        self.LBRegles = QListBox(self,"LBRegles")
-        self.LBRegles.setMinimumSize(QSize(250,350))
+        self.LBNouvCommande = QListBox(self,"LBNouvCommande")
+
+        layout2.addMultiCellWidget(self.LBNouvCommande,1,1,0,2)
 
-        DRacLayout.addMultiCellWidget(self.LBRegles,2,3,3,4)
+        DRacLayout.addMultiCellLayout(layout2,2,2,0,3)
 
         self.languageChange()
 
-        self.resize(QSize(519,513).expandedTo(self.minimumSizeHint()))
+        self.resize(QSize(509,513).expandedTo(self.minimumSizeHint()))
         self.clearWState(Qt.WState_Polished)
 
         self.connect(self.LBNouvCommande,SIGNAL("doubleClicked(QListBoxItem*)"),self.LBNouvCommandeClicked)
@@ -111,23 +116,23 @@ class DRac(QWidget):
 
     def languageChange(self):
         self.setCaption(self.__tr("DMacro"))
+        self.textLabel1_4.setText(self.__tr("<b><u>Commandes :</u></b>"))
+        self.textLabel1_4_2.setText(self.__trUtf8("\x3c\x70\x20\x61\x6c\x69\x67\x6e\x3d\x22\x63\x65\x6e\x74\x65\x72\x22\x3e\x3c\x62\x3e\x3c\x75\x3e\x52\xc3\xa9\x67\x6c\x65\x73\x20\x3a\x3c\x2f\x75\x3e\x3c\x2f\x62\x3e\x3c\x2f\x70\x3e"))
+        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.bHelp.setText(self.__tr("&Documentation"))
+        self.bHelp.setAccel(QKeySequence(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"))
+        self.bSup.setAccel(QKeySequence(self.__tr("Alt+S")))
         QToolTip.add(self.bSup,self.__tr("suppression du mot clef"))
         self.bOk.setText(self.__tr("&Valider"))
-        self.bOk.setAccel(self.__tr("Shift+A, Alt+A, Alt+A, Alt+A"))
+        self.bOk.setAccel(QKeySequence(self.__tr("Shift+A, Alt+A, Alt+A, Alt+A")))
         QToolTip.add(self.bOk,self.__tr("validation de la saisie"))
-        self.bHelp.setText(self.__tr("&Documentation"))
-        self.bHelp.setAccel(self.__tr("Alt+D"))
-        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"))
+        self.textLabel6.setText(self.__tr("Filtre"))
 
 
     def LBNouvCommandeClicked(self):

diff --git a/Ui/desRacine.ui b/Ui/desRacine.ui
index 2f5ba8cf38f821d8b3b3f5e672482ab9191856b5..b4ee15d2d49c967cfe9a7c98561034db851a1b28 100644 (file)
--- a/Ui/desRacine.ui
+++ b/Ui/desRacine.ui
@@ -8,7 +8,7 @@
         <rect>
             <x>0</x>
             <y>0</y>
-            <width>519</width>
+            <width>509</width>
             <height>513</height>
         </rect>
     </property>
@@ -25,140 +25,29 @@
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="QPushButton" row="4" column="0" rowspan="1" colspan="2">
+        <widget class="QLabel" row="0" column="0" rowspan="1" colspan="2">
             <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="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>
-            <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="4" column="4">
-            <property name="name">
-                <cstring>bHelp</cstring>
+                <cstring>textLabel1_4</cstring>
             </property>
             <property name="minimumSize">
                 <size>
-                    <width>0</width>
-                    <height>30</height>
+                    <width>291</width>
+                    <height>21</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="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">
+        <widget class="QLabel" row="0" column="2" 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>
+                <string>&lt;p align="center"&gt;&lt;b&gt;&lt;u&gt;Régles :&lt;/u&gt;&lt;/b&gt;&lt;/p&gt;</string>
             </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">
+        <widget class="QButtonGroup" row="1" column="0" rowspan="1" colspan="2">
             <property name="name">
                 <cstring>buttonGroup1</cstring>
             </property>
@@ -195,7 +84,7 @@
                     <rect>
                         <x>110</x>
                         <y>20</y>
-                        <width>100</width>
+                        <width>120</width>
                         <height>20</height>
                     </rect>
                 </property>
@@ -207,21 +96,148 @@
                 </property>
             </widget>
         </widget>
-        <widget class="QListBox" row="3" column="0" rowspan="1" colspan="3">
+        <widget class="QPushButton" row="3" column="3">
             <property name="name">
-                <cstring>LBNouvCommande</cstring>
+                <cstring>bHelp</cstring>
+            </property>
+            <property name="minimumSize">
+                <size>
+                    <width>160</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="QListBox" row="2" column="3" rowspan="2" colspan="2">
+        <widget class="QPushButton" row="3" column="0">
             <property name="name">
-                <cstring>LBRegles</cstring>
+                <cstring>bSup</cstring>
             </property>
             <property name="minimumSize">
                 <size>
-                    <width>250</width>
-                    <height>350</height>
+                    <width>160</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="3" column="1" rowspan="1" colspan="2">
+            <property name="name">
+                <cstring>bOk</cstring>
+            </property>
+            <property name="minimumSize">
+                <size>
+                    <width>160</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="QLayoutWidget" row="2" column="0" rowspan="1" colspan="4">
+            <property name="name">
+                <cstring>layout2</cstring>
+            </property>
+            <grid>
+                <property name="name">
+                    <cstring>unnamed</cstring>
+                </property>
+                <widget class="QToolButton" row="0" 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="QLineEdit" row="0" column="1">
+                    <property name="name">
+                        <cstring>LEFiltre</cstring>
+                    </property>
+                    <property name="minimumSize">
+                        <size>
+                            <width>0</width>
+                            <height>30</height>
+                        </size>
+                    </property>
+                </widget>
+                <widget class="QListBox" row="0" column="3" rowspan="2" colspan="1">
+                    <property name="name">
+                        <cstring>LBRegles</cstring>
+                    </property>
+                    <property name="minimumSize">
+                        <size>
+                            <width>240</width>
+                            <height>350</height>
+                        </size>
+                    </property>
+                </widget>
+                <widget class="QLabel" row="0" 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="QListBox" row="1" column="0" rowspan="1" colspan="3">
+                    <property name="name">
+                        <cstring>LBNouvCommande</cstring>
+                    </property>
+                </widget>
+            </grid>
         </widget>
     </grid>
 </widget>

diff --git a/Ui/myMain.py b/Ui/myMain.py
index b36b65b8c1ca3794329559d1caad2218de22c305..1de67dd7a25243b7fa5ab55bfae0e17b1123faa1 100644 (file)
--- a/Ui/myMain.py
+++ b/Ui/myMain.py
@@ -2,8 +2,8 @@
 
 # Form implementation generated from reading ui file 'myMain.ui'
 #
-# Created: ven mai 16 12:44:22 2008
-#      by: The PyQt User Interface Compiler (pyuic) 3.13
+# Created: Mon Jun 2 15:38:21 2008
+#      by: The PyQt User Interface Compiler (pyuic) 3.16
 #
 # WARNING! All changes made in this file will be lost!
 
@@ -245,8 +245,8 @@ class Eficas(QMainWindow):
             self.setName("Eficas")
 
         self.setEnabled(1)
-        self.setSizePolicy(QSizePolicy(1,1,0,0,self.sizePolicy().hasHeightForWidth()))
-        self.setMinimumSize(QSize(21,323))
+        self.setSizePolicy(QSizePolicy(QSizePolicy.Minimum,QSizePolicy.Minimum,0,0,self.sizePolicy().hasHeightForWidth()))
+        self.setMinimumSize(QSize(21,336))
         self.setBackgroundOrigin(QMainWindow.WidgetOrigin)
         f = QFont(self.font())
         self.setFont(f)
@@ -402,10 +402,10 @@ class Eficas(QMainWindow):
         self.fileOpenAction.setMenuText(self.__tr("&Ouvrir"))
         self.fileOpenAction.setAccel(self.__tr("Ctrl+O"))
         self.fileSaveAction.setText(self.__tr("Enregistrer"))
-        self.fileSaveAction.setMenuText(self.__tr("&Enregister"))
+        self.fileSaveAction.setMenuText(self.__tr("&Enregistrer"))
         self.fileSaveAction.setAccel(self.__tr("Ctrl+E"))
-        self.fileSaveAsAction.setText(self.__tr("Enregister Sous"))
-        self.fileSaveAsAction.setMenuText(self.__tr("Enregister Sous"))
+        self.fileSaveAsAction.setText(self.__tr("Enregistrer Sous"))
+        self.fileSaveAsAction.setMenuText(self.__tr("Enregistrer Sous"))
         self.fileSaveAsAction.setAccel(QString.null)
         self.fileExitAction.setText(self.__tr("Quitter"))
         self.fileExitAction.setMenuText(self.__tr("Q&uitter"))

diff --git a/Ui/myMain.ui b/Ui/myMain.ui
index a636a0eac236e99c63124eabc36a8e9dfa15cb1b..955c4b2d1e162be9fe2bb89113c2dc7ef880c387 100644 (file)
--- a/Ui/myMain.ui
+++ b/Ui/myMain.ui
@@ -26,7 +26,7 @@
     <property name="minimumSize">
         <size>
             <width>21</width>
-            <height>323</height>
+            <height>336</height>
         </size>
     </property>
     <property name="backgroundOrigin">
@@ -176,7 +176,7 @@
             <string>Enregistrer</string>
         </property>
         <property name="menuText">
-            <string>&amp;Enregister</string>
+            <string>&amp;Enregistrer</string>
         </property>
         <property name="accel">
             <string>Ctrl+E</string>
@@ -187,10 +187,10 @@
             <cstring>fileSaveAsAction</cstring>
         </property>
         <property name="text">
-            <string>Enregister Sous</string>
+            <string>Enregistrer Sous</string>
         </property>
         <property name="menuText">
-            <string>Enregister Sous</string>
+            <string>Enregistrer Sous</string>
         </property>
         <property name="accel">
             <string></string>