*** empty log message ***

diff --git a/InterfaceQT4/monPoursuitePanel.py b/InterfaceQT4/monPoursuitePanel.py
index 93e8e9277e5709a80aef4934bbb4e46aa2357705..2143f273e1b3e653fa4f18654d1bfd9bc101e6c3 100644 (file)
--- a/InterfaceQT4/monPoursuitePanel.py
+++ b/InterfaceQT4/monPoursuitePanel.py
@@ -24,13 +24,13 @@
 import os,traceback,sys
 from PyQt4 import *
 from PyQt4.QtGui import *
-from desMacro import DMacro
+from PyQt4.QtCore import *
 
 from monMacroPanel import MonMacroPanel
-import convert
 
 
 # Import des panels
+# La page est ajoutee a partir du python genere par designer
 
 class MonPoursuitePanel(MonMacroPanel):
   """
@@ -39,79 +39,52 @@ class MonPoursuitePanel(MonMacroPanel):
   discrètes
   """
   def __init__(self,node, parent = None,name = None,fl = 0):
-        #print "MonPoursuitePanel"
         MonMacroPanel.__init__(self,node,parent,name,fl)
-        #Version TK ??
+        self.node=node
         self.ajoutPageOk()
 
   def ajoutPageOk(self) :
-        self.TabPage = QWidget(self.TWChoix,"TabPage")
-        self.LENomFichier = QLineEdit(self.TabPage,"LENomFichier")
-        self.LENomFichier.setGeometry(QRect(18,127,450,30))
-        self.textLabel1_3 = QLabel(self.TabPage,"textLabel1_3")
-        self.textLabel1_3.setGeometry(QRect(70,50,350,41))
-        self.BBrowse = QPushButton(self.TabPage,"BBrowse")
-        self.BBrowse.setGeometry(QRect(288,306,161,41))
-        self.TWChoix.insertTab(self.TabPage,QString(""))
-        self.textLabel1_3.setText(self._DMacro__tr("<font size=\"+1\">La commande POURSUITE requiert un nom de Fichier :</font>"))
-        self.BBrowse.setText(self._DMacro__tr("Edit"))
-        self.TWChoix.changeTab(self.TabPage,self._DMacro__tr("Fichier Poursuite"))
-        self.TWChoix.setCurrentPage(2)
-        if hasattr(self.node.item.object,'fichier_ini'):
-           self.LENomFichier.setText(self.node.item.object.fichier_ini)
-        else :
-           self.LENomFichier.setText("")
+        self.TabPage = QtGui.QWidget()
+        self.TabPage.setGeometry(QtCore.QRect(0,0,499,433))
+        self.TabPage.setObjectName("TabPage")
+        self.gridLayout_2 = QtGui.QGridLayout(self.TabPage)
+        self.gridLayout_2.setObjectName("gridLayout_2")
+        self.textLabel1_3 = QtGui.QLabel(self.TabPage)
+        self.textLabel1_3.setWordWrap(False)
+        self.textLabel1_3.setObjectName("textLabel1_3")
+        self.gridLayout_2.addWidget(self.textLabel1_3,0,0,1,1)
+        self.LENomFichier = QtGui.QLineEdit(self.TabPage)
+        self.LENomFichier.setMinimumSize(QtCore.QSize(470,40))
+        self.LENomFichier.setObjectName("LENomFichier")
+        self.gridLayout_2.addWidget(self.LENomFichier,1,0,1,1)
+        spacerItem = QtGui.QSpacerItem(21,190,QtGui.QSizePolicy.Minimum,QtGui.QSizePolicy.Expanding)
+        self.gridLayout_2.addItem(spacerItem,2,0,1,1)
+        self.hboxlayout = QtGui.QHBoxLayout()
+        self.hboxlayout.setObjectName("hboxlayout")
+        spacerItem1 = QtGui.QSpacerItem(331,20,QtGui.QSizePolicy.Expanding,QtGui.QSizePolicy.Minimum)
+        self.hboxlayout.addItem(spacerItem1)
+        self.BBrowse = QtGui.QPushButton(self.TabPage)
+        sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed,QtGui.QSizePolicy.Fixed)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(self.BBrowse.sizePolicy().hasHeightForWidth())
+        self.BBrowse.setSizePolicy(sizePolicy)
+        self.BBrowse.setMinimumSize(QtCore.QSize(140,50))
+        self.BBrowse.setObjectName("BBrowse")
+        self.hboxlayout.addWidget(self.BBrowse)
+        self.gridLayout_2.addLayout(self.hboxlayout,3,0,1,1)
+        spacerItem2 = QtGui.QSpacerItem(21,87,QtGui.QSizePolicy.Minimum,QtGui.QSizePolicy.Expanding)
+        self.gridLayout_2.addItem(spacerItem2,4,0,1,1)
+        self.TWChoix.addTab(self.TabPage,"")
+        self.textLabel1_3.setText(QtGui.QApplication.translate("DPour", "<font size=\"+1\">La commande POURSUITE requiert un nom de Fichier :</font>", None, QtGui.QApplication.UnicodeUTF8))
+        self.BBrowse.setText(QtGui.QApplication.translate("DPour", "Edit", None, QtGui.QApplication.UnicodeUTF8))
+        self.TWChoix.setTabText(self.TWChoix.indexOf(self.TabPage), QtGui.QApplication.translate("DPour", "Fichier Poursuite", None, QtGui.QApplication.UnicodeUTF8))
+
+        self.LENomFichier.setText(self.node.item.object.jdc_aux.nom)
         self.connect(self.BBrowse,SIGNAL("clicked()"),self.BBrowsePressed)
-        self.connect(self.LENomFichier,SIGNAL("returnPressed()"),self.LENomFichReturnPressed)
 
 
   def BBrowsePressed(self):
       self.node.makeEdit()
 
-  def BOkIncPressed (self):
-      self.LENomFichReturnPressed()
-
-  def LENomFichReturnPressed(self):
-        nomFichier=str(self.LENomFichier.text())
-        if not os.path.isfile(nomFichier) :
-           commentaire = "Fichier introuvable"
-           self.Commentaire.setText(QString(commentaire))
-           self.editor.affiche_infos(commentaire)
-           return
-
-        text=self.convert_file(nomFichier)
-
-        # Si probleme a la lecture-conversion on arrete le traitement
-        if not text:
-           return
-
-        try :
-           self.node.item.object.change_fichier_init(nomFichier,text)
-           commentaire = "Fichier modifie  : " + self.node.item.get_nom()
-           self.Commentaire.setText(QString(commentaire))
-        except: 
-           l=traceback.format_exception_only("Fichier invalide",sys.exc_info()[1])
-           QMessageBox.critical( self, "Erreur fatale au chargement du fichier Include", l[0])
-           commentaire = "Fichier invalide" 
-           self.Commentaire.setText(QString(commentaire))
-           self.editor.affiche_infos(commentaire)
-           return
-
-
-  def convert_file(self,file):
-       """
-         Methode pour convertir le fichier file dans le format courant
-       """
-       format=self.editor.format_fichier
-       text=None
-       if convert.plugins.has_key(format):
-          # Le convertisseur existe on l'utilise
-          p=convert.plugins[format]()
-          p.readfile(file)
-          text=p.convert('execnoparseur')
-       else :
-            commentaire = "Impossible de lire le fichier : Format inconnu"
-            self.Commentaire.setText(QString(commentaire))
-            self.editor.affiche_infos(commentaire)
-       return text
 

diff --git a/UiQT4/desCommande.py b/UiQT4/desCommande.py
index bbdf4704b123da2148257184df6812d8887545c4..03e404f2dac9377116205c76a1fe5a2db711c84f 100644 (file)
--- a/UiQT4/desCommande.py
+++ b/UiQT4/desCommande.py
@@ -2,7 +2,7 @@
 
 # Form implementation generated from reading ui file 'desCommande.ui'
 #
-# Created: Wed Jul 23 12:04:11 2008
+# Created: Tue Sep 23 10:19:58 2008
 #      by: PyQt4 UI code generator 4.4.2
 #
 # WARNING! All changes made in this file will be lost!
@@ -43,21 +43,23 @@ class Ui_DComm(object):
         self.MotClef = QtGui.QWidget()
         self.MotClef.setGeometry(QtCore.QRect(0,0,483,372))
         self.MotClef.setObjectName("MotClef")
+        self.gridLayout_3 = QtGui.QGridLayout(self.MotClef)
+        self.gridLayout_3.setObjectName("gridLayout_3")
         self.textLabel1 = QtGui.QLabel(self.MotClef)
-        self.textLabel1.setGeometry(QtCore.QRect(11,11,226,18))
         self.textLabel1.setMinimumSize(QtCore.QSize(0,0))
         self.textLabel1.setWordWrap(False)
         self.textLabel1.setObjectName("textLabel1")
+        self.gridLayout_3.addWidget(self.textLabel1,0,0,1,1)
         self.textLabel1_2 = QtGui.QLabel(self.MotClef)
-        self.textLabel1_2.setGeometry(QtCore.QRect(243,11,225,18))
         self.textLabel1_2.setWordWrap(False)
         self.textLabel1_2.setObjectName("textLabel1_2")
+        self.gridLayout_3.addWidget(self.textLabel1_2,0,1,1,1)
         self.LBMCPermis = QtGui.QListWidget(self.MotClef)
-        self.LBMCPermis.setGeometry(QtCore.QRect(10,40,211,321))
         self.LBMCPermis.setObjectName("LBMCPermis")
+        self.gridLayout_3.addWidget(self.LBMCPermis,1,0,1,1)
         self.LBRegles = QtGui.QListWidget(self.MotClef)
-        self.LBRegles.setGeometry(QtCore.QRect(250,40,211,321))
         self.LBRegles.setObjectName("LBRegles")
+        self.gridLayout_3.addWidget(self.LBRegles,1,1,1,1)
         self.TWChoix.addTab(self.MotClef,"")
         self.Concept = QtGui.QWidget()
         self.Concept.setGeometry(QtCore.QRect(0,0,483,372))

diff --git a/UiQT4/desCommande.ui b/UiQT4/desCommande.ui
index ef5fd5c995832d9152cb1a7889e38da3c34d00bd..9cdc1812c758b0fc65d5f24a4658384ecaf89456 100644 (file)
--- a/UiQT4/desCommande.ui
+++ b/UiQT4/desCommande.ui
@@ -121,64 +121,40 @@
       <attribute name="title" >
        <string>Ajouter Mot-Clef</string>
       </attribute>
-      <widget class="QLabel" name="textLabel1" >
-       <property name="geometry" >
-        <rect>
-         <x>11</x>
-         <y>11</y>
-         <width>226</width>
-         <height>18</height>
-        </rect>
-       </property>
-       <property name="minimumSize" >
-        <size>
-         <width>0</width>
-         <height>0</height>
-        </size>
-       </property>
-       <property name="text" >
-        <string>&lt;h3>&lt;p align="center">&lt;u>&lt;b>Mots Clefs Permis&lt;/b>&lt;/u>&lt;/p>&lt;/h3></string>
-       </property>
-       <property name="wordWrap" >
-        <bool>false</bool>
-       </property>
-      </widget>
-      <widget class="QLabel" name="textLabel1_2" >
-       <property name="geometry" >
-        <rect>
-         <x>243</x>
-         <y>11</y>
-         <width>225</width>
-         <height>18</height>
-        </rect>
-       </property>
-       <property name="text" >
-        <string>&lt;h3>&lt;p align="center">&lt;u>&lt;b>Règles&lt;/b>&lt;/u>&lt;/p>&lt;/h3></string>
-       </property>
-       <property name="wordWrap" >
-        <bool>false</bool>
-       </property>
-      </widget>
-      <widget class="QListWidget" name="LBMCPermis" >
-       <property name="geometry" >
-        <rect>
-         <x>10</x>
-         <y>40</y>
-         <width>211</width>
-         <height>321</height>
-        </rect>
-       </property>
-      </widget>
-      <widget class="QListWidget" name="LBRegles" >
-       <property name="geometry" >
-        <rect>
-         <x>250</x>
-         <y>40</y>
-         <width>211</width>
-         <height>321</height>
-        </rect>
-       </property>
-      </widget>
+      <layout class="QGridLayout" name="gridLayout_3" >
+       <item row="0" column="0" >
+        <widget class="QLabel" name="textLabel1" >
+         <property name="minimumSize" >
+          <size>
+           <width>0</width>
+           <height>0</height>
+          </size>
+         </property>
+         <property name="text" >
+          <string>&lt;h3>&lt;p align="center">&lt;u>&lt;b>Mots Clefs Permis&lt;/b>&lt;/u>&lt;/p>&lt;/h3></string>
+         </property>
+         <property name="wordWrap" >
+          <bool>false</bool>
+         </property>
+        </widget>
+       </item>
+       <item row="0" column="1" >
+        <widget class="QLabel" name="textLabel1_2" >
+         <property name="text" >
+          <string>&lt;h3>&lt;p align="center">&lt;u>&lt;b>Règles&lt;/b>&lt;/u>&lt;/p>&lt;/h3></string>
+         </property>
+         <property name="wordWrap" >
+          <bool>false</bool>
+         </property>
+        </widget>
+       </item>
+       <item row="1" column="0" >
+        <widget class="QListWidget" name="LBMCPermis" />
+       </item>
+       <item row="1" column="1" >
+        <widget class="QListWidget" name="LBRegles" />
+       </item>
+      </layout>
      </widget>
      <widget class="QWidget" name="Concept" >
       <property name="geometry" >

diff --git a/UiQT4/desInclude.py b/UiQT4/desInclude.py
index aeadffda1f844ddd9458eff84ca52eacc616c70b..73a967c7819fdd12ee333365cda149a7ac4a1555 100644 (file)
--- a/UiQT4/desInclude.py
+++ b/UiQT4/desInclude.py
@@ -2,7 +2,7 @@
 
 # Form implementation generated from reading ui file 'desInclude.ui'
 #
-# Created: Wed Jul 23 11:48:02 2008
+# Created: Tue Oct  7 16:59:34 2008
 #      by: PyQt4 UI code generator 4.4.2
 #
 # WARNING! All changes made in this file will be lost!
@@ -101,14 +101,14 @@ class Ui_DInc1(object):
         self.textLabel4.setObjectName("textLabel4")
         self.gridLayout_2.addWidget(self.textLabel4,3,0,1,4)
         self.TWChoix.addTab(self.Commande,"")
-        self.TabPage = QtGui.QWidget()
-        self.TabPage.setGeometry(QtCore.QRect(0,0,499,400))
-        self.TabPage.setObjectName("TabPage")
-        self.textLabel1_3 = QtGui.QLabel(self.TabPage)
+        self.maPageOk = QtGui.QWidget()
+        self.maPageOk.setGeometry(QtCore.QRect(0,0,499,400))
+        self.maPageOk.setObjectName("maPageOk")
+        self.textLabel1_3 = QtGui.QLabel(self.maPageOk)
         self.textLabel1_3.setGeometry(QtCore.QRect(30,40,440,41))
         self.textLabel1_3.setWordWrap(False)
         self.textLabel1_3.setObjectName("textLabel1_3")
-        self.LENomFichier = QtGui.QLineEdit(self.TabPage)
+        self.LENomFichier = QtGui.QLineEdit(self.maPageOk)
         self.LENomFichier.setGeometry(QtCore.QRect(18,117,450,40))
         sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed,QtGui.QSizePolicy.Fixed)
         sizePolicy.setHorizontalStretch(0)
@@ -117,33 +117,33 @@ class Ui_DInc1(object):
         self.LENomFichier.setSizePolicy(sizePolicy)
         self.LENomFichier.setMinimumSize(QtCore.QSize(450,40))
         self.LENomFichier.setObjectName("LENomFichier")
-        self.BBrowse = QtGui.QPushButton(self.TabPage)
-        self.BBrowse.setGeometry(QtCore.QRect(288,306,161,41))
+        self.BBrowse = QtGui.QPushButton(self.maPageOk)
+        self.BBrowse.setGeometry(QtCore.QRect(280,240,161,41))
         sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed,QtGui.QSizePolicy.Fixed)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
         sizePolicy.setHeightForWidth(self.BBrowse.sizePolicy().hasHeightForWidth())
         self.BBrowse.setSizePolicy(sizePolicy)
         self.BBrowse.setObjectName("BBrowse")
-        self.BChangeFile = QtGui.QPushButton(self.TabPage)
-        self.BChangeFile.setGeometry(QtCore.QRect(290,350,161,41))
+        self.BChangeFile = QtGui.QPushButton(self.maPageOk)
+        self.BChangeFile.setGeometry(QtCore.QRect(280,290,161,41))
         sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed,QtGui.QSizePolicy.Fixed)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
         sizePolicy.setHeightForWidth(self.BChangeFile.sizePolicy().hasHeightForWidth())
         self.BChangeFile.setSizePolicy(sizePolicy)
         self.BChangeFile.setObjectName("BChangeFile")
-        self.TWChoix.addTab(self.TabPage,"")
-        self.TabPage1 = QtGui.QWidget()
-        self.TabPage1.setGeometry(QtCore.QRect(0,0,499,400))
-        self.TabPage1.setObjectName("TabPage1")
-        self.gridlayout2 = QtGui.QGridLayout(self.TabPage1)
+        self.TWChoix.addTab(self.maPageOk,"")
+        self.maPageBad = QtGui.QWidget()
+        self.maPageBad.setGeometry(QtCore.QRect(0,0,499,400))
+        self.maPageBad.setObjectName("maPageBad")
+        self.gridlayout2 = QtGui.QGridLayout(self.maPageBad)
         self.gridlayout2.setObjectName("gridlayout2")
-        self.textLabel1_5 = QtGui.QLabel(self.TabPage1)
+        self.textLabel1_5 = QtGui.QLabel(self.maPageBad)
         self.textLabel1_5.setWordWrap(False)
         self.textLabel1_5.setObjectName("textLabel1_5")
         self.gridlayout2.addWidget(self.textLabel1_5,0,0,1,1)
-        self.TWChoix.addTab(self.TabPage1,"")
+        self.TWChoix.addTab(self.maPageBad,"")
         self.gridlayout.addWidget(self.TWChoix,0,0,1,3)
 
         self.retranslateUi(DInc1)
@@ -186,14 +186,14 @@ class Ui_DInc1(object):
         self.textLabel1_3.setText(QtGui.QApplication.translate("DInc1", "<font size=\"+1\">La commande INCLUDE requiert un nom de Fichier :</font>", None, QtGui.QApplication.UnicodeUTF8))
         self.BBrowse.setText(QtGui.QApplication.translate("DInc1", "Edit", None, QtGui.QApplication.UnicodeUTF8))
         self.BChangeFile.setText(QtGui.QApplication.translate("DInc1", "Autre Fichier", None, QtGui.QApplication.UnicodeUTF8))
-        self.TWChoix.setTabText(self.TWChoix.indexOf(self.TabPage), QtGui.QApplication.translate("DInc1", "Fichier Include", None, QtGui.QApplication.UnicodeUTF8))
+        self.TWChoix.setTabText(self.TWChoix.indexOf(self.maPageOk), QtGui.QApplication.translate("DInc1", "Fichier Include", None, QtGui.QApplication.UnicodeUTF8))
         self.textLabel1_5.setText(QtGui.QApplication.translate("DInc1", "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
 "<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\n"
 "p, li { white-space: pre-wrap; }\n"
 "</style></head><body style=\" font-family:\'Sans Serif\'; font-size:9pt; font-weight:400; font-style:normal;\">\n"
 "<p align=\"center\" style=\" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:large;\"><span style=\" font-size:11pt; font-weight:600;\">La commande INCLUDE n\'a pas de fichier associé. </span></p>\n"
 "<p align=\"center\" style=\" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:11pt; font-weight:600;\"><span style=\" font-size:large;\">Il faut d\'abord choisir un numéro d\'unité</span></p></body></html>", None, QtGui.QApplication.UnicodeUTF8))
-        self.TWChoix.setTabText(self.TWChoix.indexOf(self.TabPage1), QtGui.QApplication.translate("DInc1", "Fichier Inc", None, QtGui.QApplication.UnicodeUTF8))
+        self.TWChoix.setTabText(self.TWChoix.indexOf(self.maPageBad), QtGui.QApplication.translate("DInc1", "Fichier Inc", None, QtGui.QApplication.UnicodeUTF8))
 
 
 if __name__ == "__main__":

diff --git a/UiQT4/desInclude.ui b/UiQT4/desInclude.ui
index e0ac6469d9beb6fe75c6115d25d38a9f960ace62..dc21a3f63a48d3a24b9cc852cb6ccd2d3471c621 100644 (file)
--- a/UiQT4/desInclude.ui
+++ b/UiQT4/desInclude.ui
@@ -254,7 +254,7 @@
        </item>
       </layout>
      </widget>
-     <widget class="QWidget" name="TabPage" >
+     <widget class="QWidget" name="maPageOk" >
       <property name="geometry" >
        <rect>
         <x>0</x>
@@ -307,8 +307,8 @@
       <widget class="QPushButton" name="BBrowse" >
        <property name="geometry" >
         <rect>
-         <x>288</x>
-         <y>306</y>
+         <x>280</x>
+         <y>240</y>
          <width>161</width>
          <height>41</height>
         </rect>
@@ -326,8 +326,8 @@
       <widget class="QPushButton" name="BChangeFile" >
        <property name="geometry" >
         <rect>
-         <x>290</x>
-         <y>350</y>
+         <x>280</x>
+         <y>290</y>
          <width>161</width>
          <height>41</height>
         </rect>
@@ -343,7 +343,7 @@
        </property>
       </widget>
      </widget>
-     <widget class="QWidget" name="TabPage" >
+     <widget class="QWidget" name="maPageBad" >
       <property name="geometry" >
        <rect>
         <x>0</x>

diff --git a/UiQT4/desParam.py b/UiQT4/desParam.py
index 398bdb1a0b64b26b3209ecda5395c8ccd500630e..cee894d99243d0b5c47562a455411fe1a2710597 100644 (file)
--- a/UiQT4/desParam.py
+++ b/UiQT4/desParam.py
@@ -2,7 +2,7 @@
 
 # Form implementation generated from reading ui file 'desParam.ui'
 #
-# Created: Wed Jul 23 11:49:56 2008
+# Created: Wed Sep 10 11:20:17 2008
 #      by: PyQt4 UI code generator 4.4.2
 #
 # WARNING! All changes made in this file will be lost!
@@ -27,34 +27,36 @@ class Ui_DParam(object):
         self.Valeur_Parametre = QtGui.QWidget()
         self.Valeur_Parametre.setGeometry(QtCore.QRect(0,0,483,372))
         self.Valeur_Parametre.setObjectName("Valeur_Parametre")
+        self.gridLayout_3 = QtGui.QGridLayout(self.Valeur_Parametre)
+        self.gridLayout_3.setObjectName("gridLayout_3")
         self.textLabel2_2_2 = QtGui.QLabel(self.Valeur_Parametre)
-        self.textLabel2_2_2.setGeometry(QtCore.QRect(80,11,231,89))
         self.textLabel2_2_2.setWordWrap(False)
         self.textLabel2_2_2.setObjectName("textLabel2_2_2")
-        self.Commentaire_2 = QtGui.QLabel(self.Valeur_Parametre)
-        self.Commentaire_2.setGeometry(QtCore.QRect(11,275,459,89))
-        self.Commentaire_2.setWordWrap(False)
-        self.Commentaire_2.setObjectName("Commentaire_2")
-        self.lineEditNom = QtGui.QLineEdit(self.Valeur_Parametre)
-        self.lineEditNom.setGeometry(QtCore.QRect(80,106,231,31))
-        self.lineEditNom.setMinimumSize(QtCore.QSize(231,31))
-        self.lineEditNom.setObjectName("lineEditNom")
+        self.gridLayout_3.addWidget(self.textLabel2_2_2,0,1,1,1)
         self.textLabel2_2 = QtGui.QLabel(self.Valeur_Parametre)
-        self.textLabel2_2.setGeometry(QtCore.QRect(11,106,63,31))
         self.textLabel2_2.setWordWrap(False)
         self.textLabel2_2.setObjectName("textLabel2_2")
+        self.gridLayout_3.addWidget(self.textLabel2_2,1,0,1,1)
+        self.lineEditNom = QtGui.QLineEdit(self.Valeur_Parametre)
+        self.lineEditNom.setMinimumSize(QtCore.QSize(231,31))
+        self.lineEditNom.setObjectName("lineEditNom")
+        self.gridLayout_3.addWidget(self.lineEditNom,1,1,1,1)
         self.textLabel2 = QtGui.QLabel(self.Valeur_Parametre)
-        self.textLabel2.setGeometry(QtCore.QRect(11,143,63,31))
         self.textLabel2.setWordWrap(False)
         self.textLabel2.setObjectName("textLabel2")
-        self.Commentaire2 = QtGui.QLabel(self.Valeur_Parametre)
-        self.Commentaire2.setGeometry(QtCore.QRect(11,180,459,89))
-        self.Commentaire2.setWordWrap(False)
-        self.Commentaire2.setObjectName("Commentaire2")
+        self.gridLayout_3.addWidget(self.textLabel2,2,0,1,1)
         self.lineEditVal = QtGui.QLineEdit(self.Valeur_Parametre)
-        self.lineEditVal.setGeometry(QtCore.QRect(80,143,231,31))
         self.lineEditVal.setMinimumSize(QtCore.QSize(231,31))
         self.lineEditVal.setObjectName("lineEditVal")
+        self.gridLayout_3.addWidget(self.lineEditVal,2,1,1,1)
+        self.Commentaire2 = QtGui.QLabel(self.Valeur_Parametre)
+        self.Commentaire2.setWordWrap(False)
+        self.Commentaire2.setObjectName("Commentaire2")
+        self.gridLayout_3.addWidget(self.Commentaire2,3,0,1,2)
+        self.Commentaire_2 = QtGui.QLabel(self.Valeur_Parametre)
+        self.Commentaire_2.setWordWrap(False)
+        self.Commentaire_2.setObjectName("Commentaire_2")
+        self.gridLayout_3.addWidget(self.Commentaire_2,4,0,1,2)
         self.TWChoix.addTab(self.Valeur_Parametre,"")
         self.Commande = QtGui.QWidget()
         self.Commande.setGeometry(QtCore.QRect(0,0,483,372))

diff --git a/UiQT4/desParam.ui b/UiQT4/desParam.ui
index a15789c073b09fd3b6c5f3ac5fc0adf05e32cc80..faf4ef171641c7bb3f575ed1579f6c073bb49023 100644 (file)
--- a/UiQT4/desParam.ui
+++ b/UiQT4/desParam.ui
@@ -52,122 +52,82 @@
       <attribute name="title" >
        <string>Valeur Parametre</string>
       </attribute>
-      <widget class="QLabel" name="textLabel2_2_2" >
-       <property name="geometry" >
-        <rect>
-         <x>80</x>
-         <y>11</y>
-         <width>231</width>
-         <height>89</height>
-        </rect>
-       </property>
-       <property name="text" >
-        <string>&lt;u>&lt;b>&lt;p align="center">Parametre&lt;/p>&lt;/b>&lt;/u></string>
-       </property>
-       <property name="wordWrap" >
-        <bool>false</bool>
-       </property>
-      </widget>
-      <widget class="QLabel" name="Commentaire_2" >
-       <property name="geometry" >
-        <rect>
-         <x>11</x>
-         <y>275</y>
-         <width>459</width>
-         <height>89</height>
-        </rect>
-       </property>
-       <property name="text" >
-        <string/>
-       </property>
-       <property name="wordWrap" >
-        <bool>false</bool>
-       </property>
-      </widget>
-      <widget class="QLineEdit" name="lineEditNom" >
-       <property name="geometry" >
-        <rect>
-         <x>80</x>
-         <y>106</y>
-         <width>231</width>
-         <height>31</height>
-        </rect>
-       </property>
-       <property name="minimumSize" >
-        <size>
-         <width>231</width>
-         <height>31</height>
-        </size>
-       </property>
-      </widget>
-      <widget class="QLabel" name="textLabel2_2" >
-       <property name="geometry" >
-        <rect>
-         <x>11</x>
-         <y>106</y>
-         <width>63</width>
-         <height>31</height>
-        </rect>
-       </property>
-       <property name="text" >
-        <string>&lt;b> Nom: &lt;/b></string>
-       </property>
-       <property name="wordWrap" >
-        <bool>false</bool>
-       </property>
-      </widget>
-      <widget class="QLabel" name="textLabel2" >
-       <property name="geometry" >
-        <rect>
-         <x>11</x>
-         <y>143</y>
-         <width>63</width>
-         <height>31</height>
-        </rect>
-       </property>
-       <property name="text" >
-        <string>&lt;b> Valeur: &lt;/b></string>
-       </property>
-       <property name="wordWrap" >
-        <bool>false</bool>
-       </property>
-      </widget>
-      <widget class="QLabel" name="Commentaire2" >
-       <property name="geometry" >
-        <rect>
-         <x>11</x>
-         <y>180</y>
-         <width>459</width>
-         <height>89</height>
-        </rect>
-       </property>
-       <property name="text" >
-        <string>Retour Chariot dans une sone de saisie permet de vérifier la 
+      <layout class="QGridLayout" name="gridLayout_3" >
+       <item row="0" column="1" >
+        <widget class="QLabel" name="textLabel2_2_2" >
+         <property name="text" >
+          <string>&lt;u>&lt;b>&lt;p align="center">Parametre&lt;/p>&lt;/b>&lt;/u></string>
+         </property>
+         <property name="wordWrap" >
+          <bool>false</bool>
+         </property>
+        </widget>
+       </item>
+       <item row="1" column="0" >
+        <widget class="QLabel" name="textLabel2_2" >
+         <property name="text" >
+          <string>&lt;b> Nom: &lt;/b></string>
+         </property>
+         <property name="wordWrap" >
+          <bool>false</bool>
+         </property>
+        </widget>
+       </item>
+       <item row="1" column="1" >
+        <widget class="QLineEdit" name="lineEditNom" >
+         <property name="minimumSize" >
+          <size>
+           <width>231</width>
+           <height>31</height>
+          </size>
+         </property>
+        </widget>
+       </item>
+       <item row="2" column="0" >
+        <widget class="QLabel" name="textLabel2" >
+         <property name="text" >
+          <string>&lt;b> Valeur: &lt;/b></string>
+         </property>
+         <property name="wordWrap" >
+          <bool>false</bool>
+         </property>
+        </widget>
+       </item>
+       <item row="2" column="1" >
+        <widget class="QLineEdit" name="lineEditVal" >
+         <property name="minimumSize" >
+          <size>
+           <width>231</width>
+           <height>31</height>
+          </size>
+         </property>
+        </widget>
+       </item>
+       <item row="3" column="0" colspan="2" >
+        <widget class="QLabel" name="Commentaire2" >
+         <property name="text" >
+          <string>Retour Chariot dans une sone de saisie permet de vérifier la 
 validité de la valeur saisie.
 
 Les nouvelles valeurs ne seront prises  en compte qu'après avoir 
 appuyé sur  le bouton Valider.</string>
-       </property>
-       <property name="wordWrap" >
-        <bool>false</bool>
-       </property>
-      </widget>
-      <widget class="QLineEdit" name="lineEditVal" >
-       <property name="geometry" >
-        <rect>
-         <x>80</x>
-         <y>143</y>
-         <width>231</width>
-         <height>31</height>
-        </rect>
-       </property>
-       <property name="minimumSize" >
-        <size>
-         <width>231</width>
-         <height>31</height>
-        </size>
-       </property>
-      </widget>
+         </property>
+         <property name="wordWrap" >
+          <bool>false</bool>
+         </property>
+        </widget>
+       </item>
+       <item row="4" column="0" colspan="2" >
+        <widget class="QLabel" name="Commentaire_2" >
+         <property name="text" >
+          <string/>
+         </property>
+         <property name="wordWrap" >
+          <bool>false</bool>
+         </property>
+        </widget>
+       </item>
+      </layout>
      </widget>
      <widget class="QWidget" name="Commande" >
       <property name="geometry" >
@@ -216,8 +176,6 @@ appuyé sur  le bouton Valider.</string>
            </widget>
           </item>
          </layout>
-         <zorder>RBGroupe</zorder>
-         <zorder>RBalpha</zorder>
         </widget>
        </item>
        <item row="1" column="0" >

diff --git a/UiQT4/desPlusieursInto.py b/UiQT4/desPlusieursInto.py
index f00206c6d2c0d63157c6df6fa2bfcf91c894a28d..0af9546faa998aeb74d73f9fed275e9cfa9aa490 100644 (file)
--- a/UiQT4/desPlusieursInto.py
+++ b/UiQT4/desPlusieursInto.py
@@ -2,7 +2,7 @@
 
 # Form implementation generated from reading ui file 'desPlusieursInto.ui'
 #
-# Created: Fri Jul 18 16:24:35 2008
+# Created: Fri Sep 26 11:16:49 2008
 #      by: PyQt4 UI code generator 4.4.2
 #
 # WARNING! All changes made in this file will be lost!
@@ -64,22 +64,22 @@ class Ui_DPlusInto(object):
         self.vboxlayout.addItem(spacerItem)
         self.vboxlayout1 = QtGui.QVBoxLayout()
         self.vboxlayout1.setObjectName("vboxlayout1")
-        self.BSup1Val = QtGui.QToolButton(self.Widget8)
-        self.BSup1Val.setMinimumSize(QtCore.QSize(40,31))
-        self.BSup1Val.setMaximumSize(QtCore.QSize(40,31))
-        icon = QtGui.QIcon()
-        icon.addPixmap(QtGui.QPixmap("../../EficasV1/Editeur/icons/arrow_left.gif"),QtGui.QIcon.Normal,QtGui.QIcon.Off)
-        self.BSup1Val.setIcon(icon)
-        self.BSup1Val.setObjectName("BSup1Val")
-        self.vboxlayout1.addWidget(self.BSup1Val)
         self.BAjout1Val = QtGui.QToolButton(self.Widget8)
         self.BAjout1Val.setMinimumSize(QtCore.QSize(40,31))
         self.BAjout1Val.setMaximumSize(QtCore.QSize(40,31))
         icon = QtGui.QIcon()
-        icon.addPixmap(QtGui.QPixmap("../Editeur/icons/arrow_right.gif"),QtGui.QIcon.Normal,QtGui.QIcon.Off)
+        icon.addPixmap(QtGui.QPixmap("../../EficasV1/Editeur/icons/arrow_left.gif"),QtGui.QIcon.Normal,QtGui.QIcon.Off)
         self.BAjout1Val.setIcon(icon)
         self.BAjout1Val.setObjectName("BAjout1Val")
         self.vboxlayout1.addWidget(self.BAjout1Val)
+        self.BSup1Val = QtGui.QToolButton(self.Widget8)
+        self.BSup1Val.setMinimumSize(QtCore.QSize(40,31))
+        self.BSup1Val.setMaximumSize(QtCore.QSize(40,31))
+        icon = QtGui.QIcon()
+        icon.addPixmap(QtGui.QPixmap("../Editeur/icons/arrow_right.gif"),QtGui.QIcon.Normal,QtGui.QIcon.Off)
+        self.BSup1Val.setIcon(icon)
+        self.BSup1Val.setObjectName("BSup1Val")
+        self.vboxlayout1.addWidget(self.BSup1Val)
         spacerItem1 = QtGui.QSpacerItem(21,176,QtGui.QSizePolicy.Minimum,QtGui.QSizePolicy.Expanding)
         self.vboxlayout1.addItem(spacerItem1)
         self.vboxlayout.addLayout(self.vboxlayout1)
@@ -115,8 +115,8 @@ class Ui_DPlusInto(object):
         self.bHelp.setToolTip(QtGui.QApplication.translate("DPlusInto", "affichage documentation aster", None, QtGui.QApplication.UnicodeUTF8))
         self.bHelp.setText(QtGui.QApplication.translate("DPlusInto", "&Documentation", None, QtGui.QApplication.UnicodeUTF8))
         self.bHelp.setShortcut(QtGui.QApplication.translate("DPlusInto", "Alt+D", None, QtGui.QApplication.UnicodeUTF8))
-        self.BSup1Val.setToolTip(QtGui.QApplication.translate("DPlusInto", "enleve l occurence selectionnee", None, QtGui.QApplication.UnicodeUTF8))
-        self.BAjout1Val.setToolTip(QtGui.QApplication.translate("DPlusInto", "ajoute la valeur saisie sous l occurence selectionnée (en fin de liste si il n y a pas de selection)", None, QtGui.QApplication.UnicodeUTF8))
+        self.BAjout1Val.setToolTip(QtGui.QApplication.translate("DPlusInto", "enleve l occurence selectionnee", None, QtGui.QApplication.UnicodeUTF8))
+        self.BSup1Val.setToolTip(QtGui.QApplication.translate("DPlusInto", "ajoute la valeur saisie sous l occurence selectionnée (en fin de liste si il n y a pas de selection)", None, QtGui.QApplication.UnicodeUTF8))
         self.textLabel1_2.setText(QtGui.QApplication.translate("DPlusInto", "<u><font size=\"+1\">Valeur(s) possibles(s)</font></u>", None, QtGui.QApplication.UnicodeUTF8))
         self.tabuniqueinto.setTabText(self.tabuniqueinto.indexOf(self.Widget8), QtGui.QApplication.translate("DPlusInto", "Saisir Valeur", None, QtGui.QApplication.UnicodeUTF8))
 

diff --git a/UiQT4/desPlusieursInto.ui b/UiQT4/desPlusieursInto.ui
index 140ddc106c759af1a144be08d9b3a77981d424a5..9fa87f7d8bcad2a1642b1198d0ce7372e8f503c9 100644 (file)
--- a/UiQT4/desPlusieursInto.ui
+++ b/UiQT4/desPlusieursInto.ui
@@ -161,7 +161,7 @@
            <item>
             <layout class="QVBoxLayout" >
              <item>
-              <widget class="QToolButton" name="BSup1Val" >
+              <widget class="QToolButton" name="BAjout1Val" >
                <property name="minimumSize" >
                 <size>
                  <width>40</width>
@@ -187,7 +187,7 @@
               </widget>
              </item>
              <item>
-              <widget class="QToolButton" name="BAjout1Val" >
+              <widget class="QToolButton" name="BSup1Val" >
                <property name="minimumSize" >
                 <size>
                  <width>40</width>

diff --git a/UiQT4/desPoursuite.py b/UiQT4/desPoursuite.py
index cf9c48da03cc838fc1beaaf59927c380bad4dce4..3b36f1c5bebb82c9bc4cd18726b661330db64e77 100644 (file)
--- a/UiQT4/desPoursuite.py
+++ b/UiQT4/desPoursuite.py
@@ -2,7 +2,7 @@
 
 # Form implementation generated from reading ui file 'desPoursuite.ui'
 #
-# Created: Wed Jul 23 11:56:47 2008
+# Created: Fri Oct 10 11:42:29 2008
 #      by: PyQt4 UI code generator 4.4.2
 #
 # WARNING! All changes made in this file will be lost!
@@ -12,47 +12,43 @@ from PyQt4 import QtCore, QtGui
 class Ui_DPour(object):
     def setupUi(self, DPour):
         DPour.setObjectName("DPour")
-        DPour.resize(521,499)
+        DPour.resize(521,544)
         DPour.setMinimumSize(QtCore.QSize(505,0))
         self.gridlayout = QtGui.QGridLayout(DPour)
         self.gridlayout.setObjectName("gridlayout")
-        self.Commentaire = QtGui.QLabel(DPour)
-        self.Commentaire.setWordWrap(False)
-        self.Commentaire.setObjectName("Commentaire")
-        self.gridlayout.addWidget(self.Commentaire,1,0,1,3)
         self.TWChoix = QtGui.QTabWidget(DPour)
         self.TWChoix.setObjectName("TWChoix")
         self.MotClef = QtGui.QWidget()
-        self.MotClef.setGeometry(QtCore.QRect(0,0,499,388))
+        self.MotClef.setGeometry(QtCore.QRect(0,0,499,433))
         self.MotClef.setObjectName("MotClef")
-        self.gridlayout1 = QtGui.QGridLayout(self.MotClef)
-        self.gridlayout1.setObjectName("gridlayout1")
+        self.gridLayout_4 = QtGui.QGridLayout(self.MotClef)
+        self.gridLayout_4.setObjectName("gridLayout_4")
+        self.textLabel1 = QtGui.QLabel(self.MotClef)
+        self.textLabel1.setMinimumSize(QtCore.QSize(0,0))
+        self.textLabel1.setWordWrap(False)
+        self.textLabel1.setObjectName("textLabel1")
+        self.gridLayout_4.addWidget(self.textLabel1,0,0,1,1)
         self.textLabel1_2 = QtGui.QLabel(self.MotClef)
         self.textLabel1_2.setWordWrap(False)
         self.textLabel1_2.setObjectName("textLabel1_2")
-        self.gridlayout1.addWidget(self.textLabel1_2,0,1,1,1)
+        self.gridLayout_4.addWidget(self.textLabel1_2,0,1,1,1)
         self.LBMCPermis = QtGui.QListWidget(self.MotClef)
         self.LBMCPermis.setMinimumSize(QtCore.QSize(0,0))
         self.LBMCPermis.setObjectName("LBMCPermis")
-        self.gridlayout1.addWidget(self.LBMCPermis,1,0,1,1)
+        self.gridLayout_4.addWidget(self.LBMCPermis,1,0,1,1)
         self.LBRegles = QtGui.QListWidget(self.MotClef)
         self.LBRegles.setObjectName("LBRegles")
-        self.gridlayout1.addWidget(self.LBRegles,1,1,1,1)
-        self.textLabel1 = QtGui.QLabel(self.MotClef)
-        self.textLabel1.setMinimumSize(QtCore.QSize(0,0))
-        self.textLabel1.setWordWrap(False)
-        self.textLabel1.setObjectName("textLabel1")
-        self.gridlayout1.addWidget(self.textLabel1,0,0,1,1)
+        self.gridLayout_4.addWidget(self.LBRegles,1,1,1,1)
         self.TWChoix.addTab(self.MotClef,"")
         self.Commande = QtGui.QWidget()
-        self.Commande.setGeometry(QtCore.QRect(0,0,499,388))
+        self.Commande.setGeometry(QtCore.QRect(0,0,499,433))
         self.Commande.setObjectName("Commande")
-        self.gridLayout_2 = QtGui.QGridLayout(self.Commande)
-        self.gridLayout_2.setObjectName("gridLayout_2")
+        self.gridLayout_3 = QtGui.QGridLayout(self.Commande)
+        self.gridLayout_3.setObjectName("gridLayout_3")
         self.textLabel1_4 = QtGui.QLabel(self.Commande)
         self.textLabel1_4.setWordWrap(False)
         self.textLabel1_4.setObjectName("textLabel1_4")
-        self.gridLayout_2.addWidget(self.textLabel1_4,0,0,1,3)
+        self.gridLayout_3.addWidget(self.textLabel1_4,0,0,1,3)
         self.groupBox = QtGui.QGroupBox(self.Commande)
         self.groupBox.setObjectName("groupBox")
         self.gridLayout = QtGui.QGridLayout(self.groupBox)
@@ -64,53 +60,47 @@ class Ui_DPour(object):
         self.RBGroupe = QtGui.QRadioButton(self.groupBox)
         self.RBGroupe.setObjectName("RBGroupe")
         self.gridLayout.addWidget(self.RBGroupe,1,0,1,1)
-        self.gridLayout_2.addWidget(self.groupBox,0,3,2,1)
+        self.gridLayout_3.addWidget(self.groupBox,0,3,2,1)
         self.textLabel6 = QtGui.QLabel(self.Commande)
         self.textLabel6.setMinimumSize(QtCore.QSize(50,30))
         self.textLabel6.setWordWrap(False)
         self.textLabel6.setObjectName("textLabel6")
-        self.gridLayout_2.addWidget(self.textLabel6,1,0,1,1)
+        self.gridLayout_3.addWidget(self.textLabel6,1,0,1,1)
         self.LEFiltre = QtGui.QLineEdit(self.Commande)
         self.LEFiltre.setMinimumSize(QtCore.QSize(160,30))
         self.LEFiltre.setObjectName("LEFiltre")
-        self.gridLayout_2.addWidget(self.LEFiltre,1,1,1,1)
+        self.gridLayout_3.addWidget(self.LEFiltre,1,1,1,1)
         self.pushButton = QtGui.QPushButton(self.Commande)
         self.pushButton.setObjectName("pushButton")
-        self.gridLayout_2.addWidget(self.pushButton,1,2,1,1)
+        self.gridLayout_3.addWidget(self.pushButton,1,2,1,1)
         self.LBNouvCommande = QtGui.QListWidget(self.Commande)
         self.LBNouvCommande.setObjectName("LBNouvCommande")
-        self.gridLayout_2.addWidget(self.LBNouvCommande,2,0,1,4)
+        self.gridLayout_3.addWidget(self.LBNouvCommande,2,0,1,4)
         self.textLabel4 = QtGui.QLabel(self.Commande)
         self.textLabel4.setWordWrap(False)
         self.textLabel4.setObjectName("textLabel4")
-        self.gridLayout_2.addWidget(self.textLabel4,3,0,1,4)
+        self.gridLayout_3.addWidget(self.textLabel4,3,0,1,4)
         self.TWChoix.addTab(self.Commande,"")
         self.TabPage = QtGui.QWidget()
-        self.TabPage.setGeometry(QtCore.QRect(0,0,499,388))
+        self.TabPage.setGeometry(QtCore.QRect(0,0,499,433))
         self.TabPage.setObjectName("TabPage")
-        self.layout4 = QtGui.QWidget(self.TabPage)
-        self.layout4.setGeometry(QtCore.QRect(10,31,472,90))
-        self.layout4.setObjectName("layout4")
-        self.vboxlayout = QtGui.QVBoxLayout(self.layout4)
-        self.vboxlayout.setObjectName("vboxlayout")
-        self.textLabel1_3 = QtGui.QLabel(self.layout4)
+        self.gridLayout_2 = QtGui.QGridLayout(self.TabPage)
+        self.gridLayout_2.setObjectName("gridLayout_2")
+        self.textLabel1_3 = QtGui.QLabel(self.TabPage)
         self.textLabel1_3.setWordWrap(False)
         self.textLabel1_3.setObjectName("textLabel1_3")
-        self.vboxlayout.addWidget(self.textLabel1_3)
-        self.LENomFichier = QtGui.QLineEdit(self.layout4)
+        self.gridLayout_2.addWidget(self.textLabel1_3,0,0,1,1)
+        self.LENomFichier = QtGui.QLineEdit(self.TabPage)
         self.LENomFichier.setMinimumSize(QtCore.QSize(470,40))
         self.LENomFichier.setObjectName("LENomFichier")
-        self.vboxlayout.addWidget(self.LENomFichier)
-        self.layout5 = QtGui.QWidget(self.TabPage)
-        self.layout5.setGeometry(QtCore.QRect(8,131,481,250))
-        self.layout5.setObjectName("layout5")
-        self.gridlayout2 = QtGui.QGridLayout(self.layout5)
-        self.gridlayout2.setObjectName("gridlayout2")
+        self.gridLayout_2.addWidget(self.LENomFichier,1,0,1,1)
+        spacerItem = QtGui.QSpacerItem(21,190,QtGui.QSizePolicy.Minimum,QtGui.QSizePolicy.Expanding)
+        self.gridLayout_2.addItem(spacerItem,2,0,1,1)
         self.hboxlayout = QtGui.QHBoxLayout()
         self.hboxlayout.setObjectName("hboxlayout")
-        spacerItem = QtGui.QSpacerItem(331,20,QtGui.QSizePolicy.Expanding,QtGui.QSizePolicy.Minimum)
-        self.hboxlayout.addItem(spacerItem)
-        self.BBrowse = QtGui.QPushButton(self.layout5)
+        spacerItem1 = QtGui.QSpacerItem(331,20,QtGui.QSizePolicy.Expanding,QtGui.QSizePolicy.Minimum)
+        self.hboxlayout.addItem(spacerItem1)
+        self.BBrowse = QtGui.QPushButton(self.TabPage)
         sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed,QtGui.QSizePolicy.Fixed)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
@@ -119,9 +109,9 @@ class Ui_DPour(object):
         self.BBrowse.setMinimumSize(QtCore.QSize(140,50))
         self.BBrowse.setObjectName("BBrowse")
         self.hboxlayout.addWidget(self.BBrowse)
-        self.gridlayout2.addLayout(self.hboxlayout,1,0,1,1)
-        spacerItem1 = QtGui.QSpacerItem(21,190,QtGui.QSizePolicy.Minimum,QtGui.QSizePolicy.Expanding)
-        self.gridlayout2.addItem(spacerItem1,0,0,1,1)
+        self.gridLayout_2.addLayout(self.hboxlayout,3,0,1,1)
+        spacerItem2 = QtGui.QSpacerItem(21,87,QtGui.QSizePolicy.Minimum,QtGui.QSizePolicy.Expanding)
+        self.gridLayout_2.addItem(spacerItem2,4,0,1,1)
         self.TWChoix.addTab(self.TabPage,"")
         self.gridlayout.addWidget(self.TWChoix,0,0,1,3)
         self.bSup = QtGui.QPushButton(DPour)
@@ -140,9 +130,13 @@ class Ui_DPour(object):
         self.bHelp.setAutoDefault(True)
         self.bHelp.setObjectName("bHelp")
         self.gridlayout.addWidget(self.bHelp,2,2,1,1)
+        self.Commentaire = QtGui.QLabel(DPour)
+        self.Commentaire.setWordWrap(False)
+        self.Commentaire.setObjectName("Commentaire")
+        self.gridlayout.addWidget(self.Commentaire,1,0,1,3)
 
         self.retranslateUi(DPour)
-        self.TWChoix.setCurrentIndex(2)
+        self.TWChoix.setCurrentIndex(0)
         QtCore.QMetaObject.connectSlotsByName(DPour)
         DPour.setTabOrder(self.LEFiltre,self.LENomFichier)
         DPour.setTabOrder(self.LENomFichier,self.TWChoix)
@@ -157,8 +151,8 @@ class Ui_DPour(object):
 
     def retranslateUi(self, DPour):
         DPour.setWindowTitle(QtGui.QApplication.translate("DPour", "DMacro", None, QtGui.QApplication.UnicodeUTF8))
-        self.textLabel1_2.setText(QtGui.QApplication.translate("DPour", "<h3><p align=\"center\"><u><b>Régles</b></u></p></h3>", None, QtGui.QApplication.UnicodeUTF8))
         self.textLabel1.setText(QtGui.QApplication.translate("DPour", "<h3><p align=\"center\"><u><b>Mots Clefs Permis</b></u></p></h3>", None, QtGui.QApplication.UnicodeUTF8))
+        self.textLabel1_2.setText(QtGui.QApplication.translate("DPour", "<h3><p align=\"center\"><u><b>Régles</b></u></p></h3>", None, QtGui.QApplication.UnicodeUTF8))
         self.TWChoix.setTabText(self.TWChoix.indexOf(self.MotClef), QtGui.QApplication.translate("DPour", "Ajouter Mot-Clef", None, QtGui.QApplication.UnicodeUTF8))
         self.textLabel1_4.setText(QtGui.QApplication.translate("DPour", "<b><u>Commandes :</u></b>", None, QtGui.QApplication.UnicodeUTF8))
         self.groupBox.setTitle(QtGui.QApplication.translate("DPour", "Affichage", None, QtGui.QApplication.UnicodeUTF8))

diff --git a/UiQT4/desPoursuite.ui b/UiQT4/desPoursuite.ui
index 65b43e0ecf82f45ed1d288e01111329d207f6d0c..71a35017a177ed4daa05501b576647b7ba8528d0 100644 (file)
--- a/UiQT4/desPoursuite.ui
+++ b/UiQT4/desPoursuite.ui
@@ -6,7 +6,7 @@
     <x>0</x>
     <y>0</y>
     <width>521</width>
-    <height>499</height>
+    <height>544</height>
    </rect>
   </property>
   <property name="minimumSize" >
@@ -19,20 +19,10 @@
    <string>DMacro</string>
   </property>
   <layout class="QGridLayout" >
-   <item row="1" column="0" colspan="3" >
-    <widget class="QLabel" name="Commentaire" >
-     <property name="text" >
-      <string/>
-     </property>
-     <property name="wordWrap" >
-      <bool>false</bool>
-     </property>
-    </widget>
-   </item>
    <item row="0" column="0" colspan="3" >
     <widget class="QTabWidget" name="TWChoix" >
      <property name="currentIndex" >
-      <number>2</number>
+      <number>0</number>
      </property>
      <widget class="QWidget" name="MotClef" >
       <property name="geometry" >
@@ -40,13 +30,29 @@
         <x>0</x>
         <y>0</y>
         <width>499</width>
-        <height>388</height>
+        <height>433</height>
        </rect>
       </property>
       <attribute name="title" >
        <string>Ajouter Mot-Clef</string>
       </attribute>
-      <layout class="QGridLayout" >
+      <layout class="QGridLayout" name="gridLayout_4" >
+       <item row="0" column="0" >
+        <widget class="QLabel" name="textLabel1" >
+         <property name="minimumSize" >
+          <size>
+           <width>0</width>
+           <height>0</height>
+          </size>
+         </property>
+         <property name="text" >
+          <string>&lt;h3>&lt;p align="center">&lt;u>&lt;b>Mots Clefs Permis&lt;/b>&lt;/u>&lt;/p>&lt;/h3></string>
+         </property>
+         <property name="wordWrap" >
+          <bool>false</bool>
+         </property>
+        </widget>
+       </item>
        <item row="0" column="1" >
         <widget class="QLabel" name="textLabel1_2" >
          <property name="text" >
@@ -70,22 +76,6 @@
        <item row="1" column="1" >
         <widget class="QListWidget" name="LBRegles" />
        </item>
-       <item row="0" column="0" >
-        <widget class="QLabel" name="textLabel1" >
-         <property name="minimumSize" >
-          <size>
-           <width>0</width>
-           <height>0</height>
-          </size>
-         </property>
-         <property name="text" >
-          <string>&lt;h3>&lt;p align="center">&lt;u>&lt;b>Mots Clefs Permis&lt;/b>&lt;/u>&lt;/p>&lt;/h3></string>
-         </property>
-         <property name="wordWrap" >
-          <bool>false</bool>
-         </property>
-        </widget>
-       </item>
       </layout>
      </widget>
      <widget class="QWidget" name="Commande" >
@@ -94,13 +84,13 @@
         <x>0</x>
         <y>0</y>
         <width>499</width>
-        <height>388</height>
+        <height>433</height>
        </rect>
       </property>
       <attribute name="title" >
        <string>Nouvelle Commande</string>
       </attribute>
-      <layout class="QGridLayout" name="gridLayout_2" >
+      <layout class="QGridLayout" name="gridLayout_3" >
        <item row="0" column="0" colspan="3" >
         <widget class="QLabel" name="textLabel1_4" >
          <property name="text" >
@@ -191,111 +181,105 @@
         <x>0</x>
         <y>0</y>
         <width>499</width>
-        <height>388</height>
+        <height>433</height>
        </rect>
       </property>
       <attribute name="title" >
        <string>Fichier Poursuite</string>
       </attribute>
-      <widget class="QWidget" name="layout4" >
-       <property name="geometry" >
-        <rect>
-         <x>10</x>
-         <y>31</y>
-         <width>472</width>
-         <height>90</height>
-        </rect>
-       </property>
-       <layout class="QVBoxLayout" >
-        <item>
-         <widget class="QLabel" name="textLabel1_3" >
-          <property name="text" >
-           <string>&lt;font size="+1">La commande POURSUITE requiert un nom de Fichier :&lt;/font></string>
-          </property>
-          <property name="wordWrap" >
-           <bool>false</bool>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="QLineEdit" name="LENomFichier" >
-          <property name="minimumSize" >
-           <size>
-            <width>470</width>
-            <height>40</height>
-           </size>
-          </property>
-         </widget>
-        </item>
-       </layout>
-      </widget>
-      <widget class="QWidget" name="layout5" >
-       <property name="geometry" >
-        <rect>
-         <x>8</x>
-         <y>131</y>
-         <width>481</width>
-         <height>250</height>
-        </rect>
-       </property>
-       <layout class="QGridLayout" >
-        <item row="1" column="0" >
-         <layout class="QHBoxLayout" >
-          <item>
-           <spacer name="spacer3" >
-            <property name="orientation" >
-             <enum>Qt::Horizontal</enum>
-            </property>
-            <property name="sizeType" >
-             <enum>QSizePolicy::Expanding</enum>
-            </property>
-            <property name="sizeHint" stdset="0" >
-             <size>
-              <width>331</width>
-              <height>20</height>
-             </size>
-            </property>
-           </spacer>
-          </item>
-          <item>
-           <widget class="QPushButton" name="BBrowse" >
-            <property name="sizePolicy" >
-             <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
-              <horstretch>0</horstretch>
-              <verstretch>0</verstretch>
-             </sizepolicy>
-            </property>
-            <property name="minimumSize" >
-             <size>
-              <width>140</width>
-              <height>50</height>
-             </size>
-            </property>
-            <property name="text" >
-             <string>Edit</string>
-            </property>
-           </widget>
-          </item>
-         </layout>
-        </item>
-        <item row="0" column="0" >
-         <spacer name="spacer1" >
-          <property name="orientation" >
-           <enum>Qt::Vertical</enum>
-          </property>
-          <property name="sizeType" >
-           <enum>QSizePolicy::Expanding</enum>
-          </property>
-          <property name="sizeHint" stdset="0" >
-           <size>
-            <width>21</width>
-            <height>190</height>
-           </size>
-          </property>
-         </spacer>
-        </item>
-       </layout>
-      </widget>
+      <layout class="QGridLayout" name="gridLayout_2" >
+       <item row="0" column="0" >
+        <widget class="QLabel" name="textLabel1_3" >
+         <property name="text" >
+          <string>&lt;font size="+1">La commande POURSUITE requiert un nom de Fichier :&lt;/font></string>
+         </property>
+         <property name="wordWrap" >
+          <bool>false</bool>
+         </property>
+        </widget>
+       </item>
+       <item row="1" column="0" >
+        <widget class="QLineEdit" name="LENomFichier" >
+         <property name="minimumSize" >
+          <size>
+           <width>470</width>
+           <height>40</height>
+          </size>
+         </property>
+        </widget>
+       </item>
+       <item row="2" column="0" >
+        <spacer name="spacer1" >
+         <property name="orientation" >
+          <enum>Qt::Vertical</enum>
+         </property>
+         <property name="sizeType" >
+          <enum>QSizePolicy::Expanding</enum>
+         </property>
+         <property name="sizeHint" stdset="0" >
+          <size>
+           <width>21</width>
+           <height>190</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+       <item row="3" column="0" >
+        <layout class="QHBoxLayout" >
+         <item>
+          <spacer name="spacer3" >
+           <property name="orientation" >
+            <enum>Qt::Horizontal</enum>
+           </property>
+           <property name="sizeType" >
+            <enum>QSizePolicy::Expanding</enum>
+           </property>
+           <property name="sizeHint" stdset="0" >
+            <size>
+             <width>331</width>
+             <height>20</height>
+            </size>
+           </property>
+          </spacer>
+         </item>
+         <item>
+          <widget class="QPushButton" name="BBrowse" >
+           <property name="sizePolicy" >
+            <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
+           <property name="minimumSize" >
+            <size>
+             <width>140</width>
+             <height>50</height>
+            </size>
+           </property>
+           <property name="text" >
+            <string>Edit</string>
+           </property>
+          </widget>
+         </item>
+        </layout>
+       </item>
+       <item row="4" column="0" >
+        <spacer name="spacer1_2" >
+         <property name="orientation" >
+          <enum>Qt::Vertical</enum>
+         </property>
+         <property name="sizeType" >
+          <enum>QSizePolicy::Expanding</enum>
+         </property>
+         <property name="sizeHint" stdset="0" >
+          <size>
+           <width>21</width>
+           <height>87</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+      </layout>
      </widget>
     </widget>
    </item>
@@ -368,6 +352,16 @@
      </property>
     </widget>
    </item>
+   <item row="1" column="0" colspan="3" >
+    <widget class="QLabel" name="Commentaire" >
+     <property name="text" >
+      <string/>
+     </property>
+     <property name="wordWrap" >
+      <bool>false</bool>
+     </property>
+    </widget>
+   </item>
   </layout>
  </widget>
  <layoutdefault spacing="6" margin="11" />

diff --git a/UiQT4/desRacine.py b/UiQT4/desRacine.py
index eb368a12fbc86f300756907779ec01c87fd5bb08..19def6bc50fd68f1d394cf42279e46b8d517d389 100644 (file)
--- a/UiQT4/desRacine.py
+++ b/UiQT4/desRacine.py
@@ -2,7 +2,7 @@
 
 # Form implementation generated from reading ui file 'desRacine.ui'
 #
-# Created: Fri Jul 18 16:24:35 2008
+# Created: Tue Sep 23 10:19:58 2008
 #      by: PyQt4 UI code generator 4.4.2
 #
 # WARNING! All changes made in this file will be lost!
@@ -45,7 +45,7 @@ class Ui_DRac(object):
         self.BNext.setObjectName("BNext")
         self.gridLayout.addWidget(self.BNext,3,2,1,1)
         self.LBRegles = QtGui.QListWidget(DRac)
-        self.LBRegles.setMinimumSize(QtCore.QSize(240,350))
+        self.LBRegles.setMinimumSize(QtCore.QSize(0,0))
         self.LBRegles.setObjectName("LBRegles")
         self.gridLayout.addWidget(self.LBRegles,3,3,2,3)
         self.LBNouvCommande = QtGui.QListWidget(DRac)

diff --git a/UiQT4/desRacine.ui b/UiQT4/desRacine.ui
index 99fab0d2e2618a0f510f3e15b5e8a1ba3e839560..d21e3ce378c587a12d258258f23cdcde1803d693 100644 (file)
--- a/UiQT4/desRacine.ui
+++ b/UiQT4/desRacine.ui
@@ -99,8 +99,8 @@
     <widget class="QListWidget" name="LBRegles" >
      <property name="minimumSize" >
       <size>
-       <width>240</width>
-       <height>350</height>
+       <width>0</width>
+       <height>0</height>
       </size>
      </property>
     </widget>

diff --git a/UiQT4/desSelectVal.py b/UiQT4/desSelectVal.py
index c6efa26b5a3bffca6a76a6dd2f89ebe28bbe4f69..914a3fa2dc198ad3ff26b2b605c6cae2b44ce7c5 100644 (file)
--- a/UiQT4/desSelectVal.py
+++ b/UiQT4/desSelectVal.py
@@ -2,7 +2,7 @@
 
 # Form implementation generated from reading ui file 'desSelectVal.ui'
 #
-# Created: Wed Jul  9 10:11:22 2008
+# Created: Fri Sep 26 17:59:06 2008
 #      by: PyQt4 UI code generator 4.4.2
 #
 # WARNING! All changes made in this file will be lost!
@@ -12,48 +12,41 @@ from PyQt4 import QtCore, QtGui
 class Ui_DSelVal(object):
     def setupUi(self, DSelVal):
         DSelVal.setObjectName("DSelVal")
-        DSelVal.resize(413,497)
-        self.gridlayout = QtGui.QGridLayout(DSelVal)
-        self.gridlayout.setObjectName("gridlayout")
-        self.TBtext = QtGui.QTextBrowser(DSelVal)
+        DSelVal.resize(469,624)
+        self.TBtext = QtGui.QTextEdit(DSelVal)
+        self.TBtext.setGeometry(QtCore.QRect(9,9,451,476))
         self.TBtext.setObjectName("TBtext")
-        self.gridlayout.addWidget(self.TBtext,0,0,1,2)
-        self.BImportTout = QtGui.QPushButton(DSelVal)
-        self.BImportTout.setObjectName("BImportTout")
-        self.gridlayout.addWidget(self.BImportTout,2,1,1,1)
         self.BImportSel = QtGui.QPushButton(DSelVal)
+        self.BImportSel.setGeometry(QtCore.QRect(220,520,208,27))
         self.BImportSel.setObjectName("BImportSel")
-        self.gridlayout.addWidget(self.BImportSel,1,1,1,1)
-        self.BGSeparateur = QtGui.QFrame(DSelVal)
-        self.BGSeparateur.setMinimumSize(QtCore.QSize(180,100))
-        self.BGSeparateur.setProperty("title",QtCore.QVariant(QtGui.QApplication.translate("DSelVal", "Séparateur", None, QtGui.QApplication.UnicodeUTF8)))
+        self.BImportTout = QtGui.QPushButton(DSelVal)
+        self.BImportTout.setGeometry(QtCore.QRect(220,560,208,27))
+        self.BImportTout.setObjectName("BImportTout")
+        self.BGSeparateur = QtGui.QGroupBox(DSelVal)
+        self.BGSeparateur.setGeometry(QtCore.QRect(20,500,188,103))
         self.BGSeparateur.setObjectName("BGSeparateur")
-        self.layout1 = QtGui.QWidget(self.BGSeparateur)
-        self.layout1.setGeometry(QtCore.QRect(17,20,150,74))
-        self.layout1.setObjectName("layout1")
-        self.gridlayout1 = QtGui.QGridLayout(self.layout1)
-        self.gridlayout1.setObjectName("gridlayout1")
-        self.BpointVirgule = QtGui.QRadioButton(self.layout1)
-        self.BpointVirgule.setObjectName("BpointVirgule")
-        self.gridlayout1.addWidget(self.BpointVirgule,2,0,1,1)
-        self.Bespace = QtGui.QRadioButton(self.layout1)
+        self.Bespace = QtGui.QRadioButton(self.BGSeparateur)
+        self.Bespace.setGeometry(QtCore.QRect(20,20,148,23))
         self.Bespace.setChecked(True)
         self.Bespace.setObjectName("Bespace")
-        self.gridlayout1.addWidget(self.Bespace,0,0,1,1)
-        self.Bvirgule = QtGui.QRadioButton(self.layout1)
+        self.Bvirgule = QtGui.QRadioButton(self.BGSeparateur)
+        self.Bvirgule.setGeometry(QtCore.QRect(20,40,148,23))
         self.Bvirgule.setObjectName("Bvirgule")
-        self.gridlayout1.addWidget(self.Bvirgule,1,0,1,1)
-        self.gridlayout.addWidget(self.BGSeparateur,1,0,2,1)
+        self.BpointVirgule = QtGui.QRadioButton(self.BGSeparateur)
+        self.BpointVirgule.setGeometry(QtCore.QRect(20,60,148,23))
+        self.BpointVirgule.setObjectName("BpointVirgule")
 
         self.retranslateUi(DSelVal)
+        QtCore.QMetaObject.connectSlotsByName(DSelVal)
 
     def retranslateUi(self, DSelVal):
         DSelVal.setWindowTitle(QtGui.QApplication.translate("DSelVal", "Sélection de valeurs", None, QtGui.QApplication.UnicodeUTF8))
-        self.BImportTout.setText(QtGui.QApplication.translate("DSelVal", "Importer Tout", None, QtGui.QApplication.UnicodeUTF8))
         self.BImportSel.setText(QtGui.QApplication.translate("DSelVal", "Ajouter Selection", None, QtGui.QApplication.UnicodeUTF8))
-        self.BpointVirgule.setText(QtGui.QApplication.translate("DSelVal", "point-virgule", None, QtGui.QApplication.UnicodeUTF8))
+        self.BImportTout.setText(QtGui.QApplication.translate("DSelVal", "Importer Tout", None, QtGui.QApplication.UnicodeUTF8))
+        self.BGSeparateur.setTitle(QtGui.QApplication.translate("DSelVal", "Separateur", None, QtGui.QApplication.UnicodeUTF8))
         self.Bespace.setText(QtGui.QApplication.translate("DSelVal", "espace", None, QtGui.QApplication.UnicodeUTF8))
         self.Bvirgule.setText(QtGui.QApplication.translate("DSelVal", "virgule", None, QtGui.QApplication.UnicodeUTF8))
+        self.BpointVirgule.setText(QtGui.QApplication.translate("DSelVal", "point-virgule", None, QtGui.QApplication.UnicodeUTF8))
 
 
 if __name__ == "__main__":

diff --git a/UiQT4/desSelectVal.ui b/UiQT4/desSelectVal.ui
index a3c3f23d67b381ccd8b1576479cfb24d36a4add2..48eb58c840ea530bb309e1805ed772b0a3e2fb76 100644 (file)
--- a/UiQT4/desSelectVal.ui
+++ b/UiQT4/desSelectVal.ui
@@ -5,83 +5,107 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>413</width>
-    <height>497</height>
+    <width>469</width>
+    <height>624</height>
    </rect>
   </property>
   <property name="windowTitle" >
    <string>Sélection de valeurs</string>
   </property>
-  <layout class="QGridLayout" >
-   <item row="0" column="0" colspan="2" >
-    <widget class="QTextBrowser" name="TBtext" />
-   </item>
-   <item row="2" column="1" >
-    <widget class="QPushButton" name="BImportTout" >
-     <property name="text" >
-      <string>Importer Tout</string>
-     </property>
-    </widget>
-   </item>
-   <item row="1" column="1" >
-    <widget class="QPushButton" name="BImportSel" >
-     <property name="text" >
-      <string>Ajouter Selection</string>
-     </property>
-    </widget>
-   </item>
-   <item rowspan="2" row="1" column="0" >
-    <widget class="QFrame" name="BGSeparateur" >
-     <property name="minimumSize" >
-      <size>
-       <width>180</width>
-       <height>100</height>
-      </size>
-     </property>
-     <property name="title" stdset="0" >
-      <string>Séparateur</string>
-     </property>
-     <widget class="QWidget" name="layout1" >
-      <property name="geometry" >
-       <rect>
-        <x>17</x>
-        <y>20</y>
-        <width>150</width>
-        <height>74</height>
-       </rect>
-      </property>
-      <layout class="QGridLayout" >
-       <item row="2" column="0" >
-        <widget class="QRadioButton" name="BpointVirgule" >
-         <property name="text" >
-          <string>point-virgule</string>
-         </property>
-        </widget>
-       </item>
-       <item row="0" column="0" >
-        <widget class="QRadioButton" name="Bespace" >
-         <property name="text" >
-          <string>espace</string>
-         </property>
-         <property name="checked" >
-          <bool>true</bool>
-         </property>
-        </widget>
-       </item>
-       <item row="1" column="0" >
-        <widget class="QRadioButton" name="Bvirgule" >
-         <property name="text" >
-          <string>virgule</string>
-         </property>
-        </widget>
-       </item>
-      </layout>
-     </widget>
-    </widget>
-   </item>
-  </layout>
+  <widget class="QTextEdit" name="TBtext" >
+   <property name="geometry" >
+    <rect>
+     <x>9</x>
+     <y>9</y>
+     <width>451</width>
+     <height>476</height>
+    </rect>
+   </property>
+  </widget>
+  <widget class="QPushButton" name="BImportSel" >
+   <property name="geometry" >
+    <rect>
+     <x>220</x>
+     <y>520</y>
+     <width>208</width>
+     <height>27</height>
+    </rect>
+   </property>
+   <property name="text" >
+    <string>Ajouter Selection</string>
+   </property>
+  </widget>
+  <widget class="QPushButton" name="BImportTout" >
+   <property name="geometry" >
+    <rect>
+     <x>220</x>
+     <y>560</y>
+     <width>208</width>
+     <height>27</height>
+    </rect>
+   </property>
+   <property name="text" >
+    <string>Importer Tout</string>
+   </property>
+  </widget>
+  <widget class="QGroupBox" name="BGSeparateur" >
+   <property name="geometry" >
+    <rect>
+     <x>20</x>
+     <y>500</y>
+     <width>188</width>
+     <height>103</height>
+    </rect>
+   </property>
+   <property name="title" >
+    <string>Separateur</string>
+   </property>
+   <widget class="QRadioButton" name="Bespace" >
+    <property name="geometry" >
+     <rect>
+      <x>20</x>
+      <y>20</y>
+      <width>148</width>
+      <height>23</height>
+     </rect>
+    </property>
+    <property name="text" >
+     <string>espace</string>
+    </property>
+    <property name="checked" >
+     <bool>true</bool>
+    </property>
+   </widget>
+   <widget class="QRadioButton" name="Bvirgule" >
+    <property name="geometry" >
+     <rect>
+      <x>20</x>
+      <y>40</y>
+      <width>148</width>
+      <height>23</height>
+     </rect>
+    </property>
+    <property name="text" >
+     <string>virgule</string>
+    </property>
+   </widget>
+   <widget class="QRadioButton" name="BpointVirgule" >
+    <property name="geometry" >
+     <rect>
+      <x>20</x>
+      <y>60</y>
+      <width>148</width>
+      <height>23</height>
+     </rect>
+    </property>
+    <property name="text" >
+     <string>point-virgule</string>
+    </property>
+   </widget>
+  </widget>
  </widget>
  <layoutdefault spacing="6" margin="11" />
  <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
  <resources/>
+ <connections/>
 </ui>

diff --git a/UiQT4/myMain.py b/UiQT4/myMain.py
index 4eeae1a827c2de01daa1c3b2f1433a8beeffd0ab..604403a7e2e413152778a9f747c3956a46796f14 100644 (file)
--- a/UiQT4/myMain.py
+++ b/UiQT4/myMain.py
@@ -2,7 +2,7 @@
 
 # Form implementation generated from reading ui file 'myMain.ui'
 #
-# Created: Fri Jul 11 12:24:53 2008
+# Created: Wed Sep 10 09:57:04 2008
 #      by: PyQt4 UI code generator 4.4.2
 #
 # WARNING! All changes made in this file will be lost!
@@ -12,13 +12,13 @@ from PyQt4 import QtCore, QtGui
 class Ui_Eficas(object):
     def setupUi(self, Eficas):
         Eficas.setObjectName("Eficas")
-        Eficas.resize(800,600)
+        Eficas.resize(1406,600)
         self.centralwidget = QtGui.QWidget(Eficas)
-        self.centralwidget.setGeometry(QtCore.QRect(0,68,800,510))
+        self.centralwidget.setGeometry(QtCore.QRect(0,68,1406,510))
         self.centralwidget.setObjectName("centralwidget")
         Eficas.setCentralWidget(self.centralwidget)
         self.menubar = QtGui.QMenuBar(Eficas)
-        self.menubar.setGeometry(QtCore.QRect(0,0,800,29))
+        self.menubar.setGeometry(QtCore.QRect(0,0,1406,29))
         self.menubar.setObjectName("menubar")
         self.menuFichier = QtGui.QMenu(self.menubar)
         self.menuFichier.setObjectName("menuFichier")
@@ -36,11 +36,11 @@ class Ui_Eficas(object):
         self.menuPatrons.setObjectName("menuPatrons")
         Eficas.setMenuBar(self.menubar)
         self.statusbar = QtGui.QStatusBar(Eficas)
-        self.statusbar.setGeometry(QtCore.QRect(0,578,800,22))
+        self.statusbar.setGeometry(QtCore.QRect(0,578,1406,22))
         self.statusbar.setObjectName("statusbar")
         Eficas.setStatusBar(self.statusbar)
         self.toolBar = QtGui.QToolBar(Eficas)
-        self.toolBar.setGeometry(QtCore.QRect(0,29,800,39))
+        self.toolBar.setGeometry(QtCore.QRect(0,29,1406,39))
         self.toolBar.setObjectName("toolBar")
         Eficas.addToolBar(QtCore.Qt.TopToolBarArea,self.toolBar)
         self.action_Nouveau = QtGui.QAction(Eficas)

diff --git a/UiQT4/myMain.ui b/UiQT4/myMain.ui
index d924d3f14343a16ada36595da203d9daa9b1be44..0112d9c6117f29d16bf058225392450ccc483dd4 100644 (file)
--- a/UiQT4/myMain.ui
+++ b/UiQT4/myMain.ui
@@ -5,7 +5,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>800</width>
+    <width>1406</width>
     <height>600</height>
    </rect>
   </property>
@@ -17,7 +17,7 @@
     <rect>
      <x>0</x>
      <y>68</y>
-     <width>800</width>
+     <width>1406</width>
      <height>510</height>
     </rect>
    </property>
@@ -27,7 +27,7 @@
     <rect>
      <x>0</x>
      <y>0</y>
-     <width>800</width>
+     <width>1406</width>
      <height>29</height>
     </rect>
    </property>
@@ -99,7 +99,7 @@
     <rect>
      <x>0</x>
      <y>578</y>
-     <width>800</width>
+     <width>1406</width>
      <height>22</height>
     </rect>
    </property>
@@ -109,7 +109,7 @@
     <rect>
      <x>0</x>
      <y>29</y>
-     <width>800</width>
+     <width>1406</width>
      <height>39</height>
     </rect>
    </property>