From: Pascale Noyret <pascale.noyret@edf.fr>
Date: Mon, 5 May 2008 14:56:40 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: V1_14a3^0
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=7c5a30d5919145cdc290db96b738c98c0b5197c6;p=modules%2Feficas.git

*** empty log message ***
---

diff --git a/InterfaceQT/monPlusieursBasePanel.py b/InterfaceQT/monPlusieursBasePanel.py
index 1c382a6c..6f21db54 100644
--- a/InterfaceQT/monPlusieursBasePanel.py
+++ b/InterfaceQT/monPlusieursBasePanel.py
@@ -51,9 +51,10 @@ class MonPlusieursBasePanel(DPlusBase,QTPanel,SaisieValeur):
   def detruitBouton(self):
         mc = self.node.item.get_definition()
         type = mc.type[0]
+        print self.editor.salome
         if not('grma' in repr(type)) or not(self.editor.salome) :
            self.BSalome.close()
-           self.BView2D.close
+           self.BView2D.close()
 
   def ViewDoc(self):
         QTPanel.ViewDoc(self)
diff --git a/InterfaceQT/viewManager.py b/InterfaceQT/viewManager.py
index a0bc448a..1915a5a5 100644
--- a/InterfaceQT/viewManager.py
+++ b/InterfaceQT/viewManager.py
@@ -2169,7 +2169,6 @@ class Tabview(QSplitter, ViewManager):
             if not QFileInfo(fn).isWritable():
                 txt = '%s (ro)' % txt
             self.currentTabWidget.addTab(win, txt)
-            print win
             self.currentTabWidget.setTabToolTip(win, os.path.dirname(fn))
         self.currentTabWidget.showPage(win)
         win.setFocus()
diff --git a/Ui/desPlusieursBase.py b/Ui/desPlusieursBase.py
index d1044d7e..dc7ca0f1 100644
--- a/Ui/desPlusieursBase.py
+++ b/Ui/desPlusieursBase.py
@@ -2,7 +2,7 @@
 
 # Form implementation generated from reading ui file 'desPlusieursBase.ui'
 #
-# Created: mar avr 15 16:16:00 2008
+# Created: lun mai 5 17:43:44 2008
 #      by: The PyQt User Interface Compiler (pyuic) 3.13
 #
 # WARNING! All changes made in this file will be lost!
@@ -29,29 +29,6 @@ image0_data = \
     "\x65\xf7\x82\x6b\x45\x7b\x00\x00\x00\x00\x49\x45" \
     "\x4e\x44\xae\x42\x60\x82"
 image1_data = \
-    "\x89\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d" \
-    "\x49\x48\x44\x52\x00\x00\x00\x21\x00\x00\x00\x0e" \
-    "\x08\x06\x00\x00\x00\xa1\x1e\x75\x8c\x00\x00\x00" \
-    "\xcf\x49\x44\x41\x54\x38\x8d\xd5\x94\xdb\x0e\xc3" \
-    "\x20\x0c\x43\xed\xfd\xf8\xd8\x97\xbb\x0f\x34\x5b" \
-    "\x48\x08\x45\xd5\x1e\xb6\x48\x88\xf4\x12\xe7\x60" \
-    "\x01\xc0\x0f\x04\x6f\xd6\xe9\x9b\xba\x77\x20\x04" \
-    "\x80\x92\x4a\x10\x32\xc9\x2e\xfb\xd8\xc7\xd5\xca" \
-    "\xbc\xc0\x25\x40\x00\x99\xe9\x57\x84\x95\x68\xfe" \
-    "\x7f\x06\xc0\xde\xd1\xde\xb3\x2b\x4a\x1e\xc4\xea" \
-    "\x82\x4b\x9e\x74\x09\x71\x65\xbd\x01\xf8\x55\x27" \
-    "\xf7\x8a\x72\x01\xe0\xa3\x12\x9f\x34\x5a\x01\x7c" \
-    "\x54\x3b\xaf\xdc\x98\x3d\x0f\x71\x09\xd1\x5a\x33" \
-    "\x1b\x47\x1f\x47\x07\x2c\x17\x49\x4a\x82\x33\x8f" \
-    "\x61\x78\x20\x3a\x88\x17\xe6\x73\x06\xb1\xf0\x8b" \
-    "\x07\xba\x03\xe6\x02\xc9\xb8\x31\x07\x7e\x37\xe0" \
-    "\x20\x9e\x67\xe3\x38\x67\x10\x97\x7b\x17\xde\x80" \
-    "\xc1\x85\xad\x38\x69\x5a\x51\xd5\x22\xc8\x2c\xe7" \
-    "\x79\x12\xe2\xfe\xd8\xbe\x83\x76\x20\x92\xf5\x2b" \
-    "\x18\x20\xdd\x11\xbb\x10\xe5\x65\xb5\x3a\x5a\x3b" \
-    "\xba\xff\x13\x07\x13\xd6\x6f\xa6\x98\x18\x57\x06" \
-    "\x00\x00\x00\x00\x49\x45\x4e\x44\xae\x42\x60\x82"
-image2_data = \
     "\x89\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d" \
     "\x49\x48\x44\x52\x00\x00\x00\x21\x00\x00\x00\x0e" \
     "\x08\x06\x00\x00\x00\xa1\x1e\x75\x8c\x00\x00\x00" \
@@ -74,6 +51,29 @@ image2_data = \
     "\xed\xf4\x8c\x5e\x60\xb8\xdf\xbe\xb8\x1d\x6d\xab" \
     "\x9a\xff\x99\x27\x00\x00\x00\x00\x49\x45\x4e\x44" \
     "\xae\x42\x60\x82"
+image2_data = \
+    "\x89\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d" \
+    "\x49\x48\x44\x52\x00\x00\x00\x21\x00\x00\x00\x0e" \
+    "\x08\x06\x00\x00\x00\xa1\x1e\x75\x8c\x00\x00\x00" \
+    "\xcf\x49\x44\x41\x54\x38\x8d\xd5\x94\xdb\x0e\xc3" \
+    "\x20\x0c\x43\xed\xfd\xf8\xd8\x97\xbb\x0f\x34\x5b" \
+    "\x48\x08\x45\xd5\x1e\xb6\x48\x88\xf4\x12\xe7\x60" \
+    "\x01\xc0\x0f\x04\x6f\xd6\xe9\x9b\xba\x77\x20\x04" \
+    "\x80\x92\x4a\x10\x32\xc9\x2e\xfb\xd8\xc7\xd5\xca" \
+    "\xbc\xc0\x25\x40\x00\x99\xe9\x57\x84\x95\x68\xfe" \
+    "\x7f\x06\xc0\xde\xd1\xde\xb3\x2b\x4a\x1e\xc4\xea" \
+    "\x82\x4b\x9e\x74\x09\x71\x65\xbd\x01\xf8\x55\x27" \
+    "\xf7\x8a\x72\x01\xe0\xa3\x12\x9f\x34\x5a\x01\x7c" \
+    "\x54\x3b\xaf\xdc\x98\x3d\x0f\x71\x09\xd1\x5a\x33" \
+    "\x1b\x47\x1f\x47\x07\x2c\x17\x49\x4a\x82\x33\x8f" \
+    "\x61\x78\x20\x3a\x88\x17\xe6\x73\x06\xb1\xf0\x8b" \
+    "\x07\xba\x03\xe6\x02\xc9\xb8\x31\x07\x7e\x37\xe0" \
+    "\x20\x9e\x67\xe3\x38\x67\x10\x97\x7b\x17\xde\x80" \
+    "\xc1\x85\xad\x38\x69\x5a\x51\xd5\x22\xc8\x2c\xe7" \
+    "\x79\x12\xe2\xfe\xd8\xbe\x83\x76\x20\x92\xf5\x2b" \
+    "\x18\x20\xdd\x11\xbb\x10\xe5\x65\xb5\x3a\x5a\x3b" \
+    "\xba\xff\x13\x07\x13\xd6\x6f\xa6\x98\x18\x57\x06" \
+    "\x00\x00\x00\x00\x49\x45\x4e\x44\xae\x42\x60\x82"
 
 class DPlusBase(QWidget):
     def __init__(self,parent = None,name = None,fl = 0):
@@ -100,32 +100,25 @@ class DPlusBase(QWidget):
 
         self.textLabel1 = QLabel(self.Widget8,"textLabel1")
 
-        Widget8Layout.addMultiCellWidget(self.textLabel1,0,0,0,1)
-
-        layout6 = QHBoxLayout(None,0,6,"layout6")
+        Widget8Layout.addWidget(self.textLabel1,0,0)
 
-        self.bSup = QPushButton(self.Widget8,"bSup")
-        self.bSup.setMinimumSize(QSize(0,30))
-        self.bSup.setAutoDefault(1)
-        layout6.addWidget(self.bSup)
-
-        self.bOk = QPushButton(self.Widget8,"bOk")
-        self.bOk.setMinimumSize(QSize(0,30))
-        self.bOk.setAutoDefault(1)
-        self.bOk.setDefault(1)
-        layout6.addWidget(self.bOk)
-
-        self.bHelp = QPushButton(self.Widget8,"bHelp")
-        self.bHelp.setMinimumSize(QSize(0,30))
-        self.bHelp.setAutoDefault(1)
-        layout6.addWidget(self.bHelp)
+        self.LBValeurs = QListBox(self.Widget8,"LBValeurs")
+        self.LBValeurs.setMinimumSize(QSize(200,0))
 
-        Widget8Layout.addMultiCellLayout(layout6,8,8,0,6)
+        Widget8Layout.addMultiCellWidget(self.LBValeurs,1,9,0,0)
+        spacer4 = QSpacerItem(21,231,QSizePolicy.Minimum,QSizePolicy.Expanding)
+        Widget8Layout.addMultiCell(spacer4,5,9,1,2)
+        spacer3_3 = QSpacerItem(31,30,QSizePolicy.Minimum,QSizePolicy.Expanding)
+        Widget8Layout.addMultiCell(spacer3_3,0,0,1,2)
 
-        self.Commentaire = QLabel(self.Widget8,"Commentaire")
-        self.Commentaire.setMinimumSize(QSize(0,60))
+        self.BAjout1Val = QToolButton(self.Widget8,"BAjout1Val")
+        self.BAjout1Val.setSizePolicy(QSizePolicy(0,0,0,0,self.BAjout1Val.sizePolicy().hasHeightForWidth()))
+        self.BAjout1Val.setMinimumSize(QSize(40,30))
+        self.BAjout1Val.setIconSet(QIconSet(self.image1))
 
-        Widget8Layout.addMultiCellWidget(self.Commentaire,4,4,3,6)
+        Widget8Layout.addMultiCellWidget(self.BAjout1Val,2,2,1,2)
+        spacer5 = QSpacerItem(150,20,QSizePolicy.Expanding,QSizePolicy.Minimum)
+        Widget8Layout.addMultiCell(spacer5,8,8,2,4)
 
         layout7 = QVBoxLayout(None,0,6,"layout7")
 
@@ -139,70 +132,77 @@ class DPlusBase(QWidget):
         self.bImport.setAutoDefault(1)
         layout7.addWidget(self.bImport)
 
-        Widget8Layout.addLayout(layout7,6,6)
-        spacer5 = QSpacerItem(186,20,QSizePolicy.Expanding,QSizePolicy.Minimum)
-        Widget8Layout.addMultiCell(spacer5,6,6,4,5)
+        Widget8Layout.addMultiCellLayout(layout7,7,8,5,5)
+        spacer3 = QSpacerItem(31,50,QSizePolicy.Minimum,QSizePolicy.Expanding)
+        Widget8Layout.addItem(spacer3,6,5)
         spacer3_2 = QSpacerItem(31,50,QSizePolicy.Minimum,QSizePolicy.Expanding)
-        Widget8Layout.addItem(spacer3_2,7,6)
+        Widget8Layout.addItem(spacer3_2,9,5)
 
-        self.LEValeur = QLineEdit(self.Widget8,"LEValeur")
-        self.LEValeur.setSizePolicy(QSizePolicy(1,1,0,0,self.LEValeur.sizePolicy().hasHeightForWidth()))
-        self.LEValeur.setMinimumSize(QSize(220,30))
+        self.BSalome = QToolButton(self.Widget8,"BSalome")
+        self.BSalome.setSizePolicy(QSizePolicy(0,0,0,0,self.BSalome.sizePolicy().hasHeightForWidth()))
+        self.BSalome.setMinimumSize(QSize(40,30))
+        self.BSalome.setIconSet(QIconSet(self.image0))
 
-        Widget8Layout.addMultiCellWidget(self.LEValeur,2,2,4,6)
+        Widget8Layout.addWidget(self.BSalome,4,3)
 
         self.BView2D = QPushButton(self.Widget8,"BView2D")
         self.BView2D.setMinimumSize(QSize(120,30))
 
-        Widget8Layout.addMultiCellWidget(self.BView2D,3,3,5,6)
+        Widget8Layout.addMultiCellWidget(self.BView2D,4,4,4,5)
 
-        self.BSalome = QToolButton(self.Widget8,"BSalome")
-        self.BSalome.setSizePolicy(QSizePolicy(0,0,0,0,self.BSalome.sizePolicy().hasHeightForWidth()))
-        self.BSalome.setMinimumSize(QSize(40,30))
-        self.BSalome.setIconSet(QIconSet(self.image0))
+        layout12 = QHBoxLayout(None,0,6,"layout12")
+
+        self.textLabel1_2 = QLabel(self.Widget8,"textLabel1_2")
+        layout12.addWidget(self.textLabel1_2)
+        spacer6 = QSpacerItem(111,20,QSizePolicy.Expanding,QSizePolicy.Minimum)
+        layout12.addItem(spacer6)
+
+        Widget8Layout.addMultiCellLayout(layout12,0,1,3,5)
+
+        self.LEValeur = QLineEdit(self.Widget8,"LEValeur")
+        self.LEValeur.setSizePolicy(QSizePolicy(1,1,0,0,self.LEValeur.sizePolicy().hasHeightForWidth()))
+        self.LEValeur.setMinimumSize(QSize(220,30))
 
-        Widget8Layout.addWidget(self.BSalome,3,4)
+        Widget8Layout.addMultiCellWidget(self.LEValeur,2,3,3,5)
 
         self.BSup1Val = QToolButton(self.Widget8,"BSup1Val")
         self.BSup1Val.setSizePolicy(QSizePolicy(0,0,0,0,self.BSup1Val.sizePolicy().hasHeightForWidth()))
         self.BSup1Val.setMinimumSize(QSize(40,30))
-        self.BSup1Val.setIconSet(QIconSet(self.image1))
+        self.BSup1Val.setIconSet(QIconSet(self.image2))
 
-        Widget8Layout.addMultiCellWidget(self.BSup1Val,3,3,1,3)
+        Widget8Layout.addMultiCellWidget(self.BSup1Val,3,4,1,2)
 
-        self.BAjout1Val = QToolButton(self.Widget8,"BAjout1Val")
-        self.BAjout1Val.setSizePolicy(QSizePolicy(0,0,0,0,self.BAjout1Val.sizePolicy().hasHeightForWidth()))
-        self.BAjout1Val.setMinimumSize(QSize(40,30))
-        self.BAjout1Val.setIconSet(QIconSet(self.image2))
+        self.Commentaire = QLabel(self.Widget8,"Commentaire")
+        self.Commentaire.setMinimumSize(QSize(0,60))
 
-        Widget8Layout.addMultiCellWidget(self.BAjout1Val,2,2,1,3)
+        Widget8Layout.addMultiCellWidget(self.Commentaire,5,5,3,5)
 
-        layout12 = QHBoxLayout(None,0,6,"layout12")
+        layout6 = QHBoxLayout(None,0,6,"layout6")
 
-        self.textLabel1_2 = QLabel(self.Widget8,"textLabel1_2")
-        layout12.addWidget(self.textLabel1_2)
-        spacer6 = QSpacerItem(111,20,QSizePolicy.Expanding,QSizePolicy.Minimum)
-        layout12.addItem(spacer6)
+        self.bSup = QPushButton(self.Widget8,"bSup")
+        self.bSup.setMinimumSize(QSize(0,30))
+        self.bSup.setAutoDefault(1)
+        layout6.addWidget(self.bSup)
 
-        Widget8Layout.addMultiCellLayout(layout12,1,1,4,6)
-        spacer4 = QSpacerItem(21,231,QSizePolicy.Minimum,QSizePolicy.Expanding)
-        Widget8Layout.addMultiCell(spacer4,4,7,2,2)
-        spacer3 = QSpacerItem(31,50,QSizePolicy.Minimum,QSizePolicy.Expanding)
-        Widget8Layout.addItem(spacer3,5,6)
-        spacer3_3 = QSpacerItem(31,50,QSizePolicy.Minimum,QSizePolicy.Expanding)
-        Widget8Layout.addMultiCell(spacer3_3,0,1,2,3)
+        self.bOk = QPushButton(self.Widget8,"bOk")
+        self.bOk.setMinimumSize(QSize(0,30))
+        self.bOk.setAutoDefault(1)
+        self.bOk.setDefault(1)
+        layout6.addWidget(self.bOk)
 
-        self.LBValeurs = QListBox(self.Widget8,"LBValeurs")
-        self.LBValeurs.setMinimumSize(QSize(200,0))
+        self.bHelp = QPushButton(self.Widget8,"bHelp")
+        self.bHelp.setMinimumSize(QSize(0,30))
+        self.bHelp.setAutoDefault(1)
+        layout6.addWidget(self.bHelp)
 
-        Widget8Layout.addMultiCellWidget(self.LBValeurs,1,7,0,0)
+        Widget8Layout.addMultiCellLayout(layout6,10,10,0,5)
         self.tabuniqueinto.insertTab(self.Widget8,QString(""))
 
         DPlusBaseLayout.addWidget(self.tabuniqueinto,0,0)
 
         self.languageChange()
 
-        self.resize(QSize(564,480).expandedTo(self.minimumSizeHint()))
+        self.resize(QSize(552,480).expandedTo(self.minimumSizeHint()))
         self.clearWState(Qt.WState_Polished)
 
         self.connect(self.bHelp,SIGNAL("clicked()"),self.ViewDoc)
@@ -229,30 +229,30 @@ class DPlusBase(QWidget):
     def languageChange(self):
         self.setCaption(self.__tr("DUnIn"))
         self.textLabel1.setText(self.__tr("<u><font size=\"+1\">Valeur(s) actuelle(s)</font></u>"))
-        self.bSup.setText(self.__tr("&Supprimer"))
-        self.bSup.setAccel(self.__tr("Alt+S"))
-        QToolTip.add(self.bSup,self.__tr("suppression du mot clef"))
-        self.bOk.setText(self.__tr("&Valider"))
-        self.bOk.setAccel(self.__tr("Shift+A, Alt+A, Alt+A, Alt+A"))
-        QToolTip.add(self.bOk,self.__tr("validation de la saisie"))
-        self.bHelp.setText(self.__tr("&Documentation"))
-        self.bHelp.setAccel(self.__tr("Alt+D"))
-        QToolTip.add(self.bHelp,self.__tr("affichage documentation aster"))
-        self.Commentaire.setText(QString.null)
+        self.BAjout1Val.setText(QString.null)
+        QToolTip.add(self.BAjout1Val,self.__trUtf8("\x61\x6a\x6f\x75\x74\x65\x20\x6c\x61\x20\x76\x61\x6c\x65\x75\x72\x20\x73\x61\x69\x73\x69\x65\x20\x73\x6f\x75\x73\x20\x6c\x20\x6f\x63\x63\x75\x72\x65\x6e\x63\x65\x20\x73\x65\x6c\x65\x63\x74\x69\x6f\x6e\x6e\xc3\xa9\x65\x20\x28\x65\x6e\x20\x66\x69\x6e\x20\x64\x65\x20\x6c\x69\x73\x74\x65\x20\x73\x69\x20\x69\x6c\x20\x6e\x20\x79\x20\x61\x20\x70\x61\x73\x20\x64\x65\x20\x73\x65\x6c\x65\x63\x74\x69\x6f\x6e\x29"))
         self.bParam.setText(self.__tr("&Parametres"))
         self.bParam.setAccel(self.__tr("Alt+P"))
         QToolTip.add(self.bParam,self.__tr("suppression du mot clef"))
         self.bImport.setText(self.__tr("&Importer"))
         self.bImport.setAccel(self.__tr("Alt+I"))
         QToolTip.add(self.bImport,self.__tr("suppression du mot clef"))
-        self.BView2D.setText(self.__tr("Visualiser"))
         self.BSalome.setText(QString.null)
         QToolTip.add(self.BSalome,self.__trUtf8("\x61\x6a\x6f\x75\x74\x65\x20\x6c\x61\x20\x76\x61\x6c\x65\x75\x72\x20\x73\x61\x69\x73\x69\x65\x20\x73\x6f\x75\x73\x20\x6c\x20\x6f\x63\x63\x75\x72\x65\x6e\x63\x65\x20\x73\x65\x6c\x65\x63\x74\x69\x6f\x6e\x6e\xc3\xa9\x65\x20\x28\x65\x6e\x20\x66\x69\x6e\x20\x64\x65\x20\x6c\x69\x73\x74\x65\x20\x73\x69\x20\x69\x6c\x20\x6e\x20\x79\x20\x61\x20\x70\x61\x73\x20\x64\x65\x20\x73\x65\x6c\x65\x63\x74\x69\x6f\x6e\x29"))
+        self.BView2D.setText(self.__tr("Visualiser"))
+        self.textLabel1_2.setText(self.__tr("<font size=\"+1\">Valeur</font>"))
         self.BSup1Val.setText(QString.null)
         QToolTip.add(self.BSup1Val,self.__tr("enleve l occurence selectionnee"))
-        self.BAjout1Val.setText(QString.null)
-        QToolTip.add(self.BAjout1Val,self.__trUtf8("\x61\x6a\x6f\x75\x74\x65\x20\x6c\x61\x20\x76\x61\x6c\x65\x75\x72\x20\x73\x61\x69\x73\x69\x65\x20\x73\x6f\x75\x73\x20\x6c\x20\x6f\x63\x63\x75\x72\x65\x6e\x63\x65\x20\x73\x65\x6c\x65\x63\x74\x69\x6f\x6e\x6e\xc3\xa9\x65\x20\x28\x65\x6e\x20\x66\x69\x6e\x20\x64\x65\x20\x6c\x69\x73\x74\x65\x20\x73\x69\x20\x69\x6c\x20\x6e\x20\x79\x20\x61\x20\x70\x61\x73\x20\x64\x65\x20\x73\x65\x6c\x65\x63\x74\x69\x6f\x6e\x29"))
-        self.textLabel1_2.setText(self.__tr("<font size=\"+1\">Valeur</font>"))
+        self.Commentaire.setText(QString.null)
+        self.bSup.setText(self.__tr("&Supprimer"))
+        self.bSup.setAccel(self.__tr("Alt+S"))
+        QToolTip.add(self.bSup,self.__tr("suppression du mot clef"))
+        self.bOk.setText(self.__tr("&Valider"))
+        self.bOk.setAccel(self.__tr("Shift+A, Alt+A, Alt+A, Alt+A"))
+        QToolTip.add(self.bOk,self.__tr("validation de la saisie"))
+        self.bHelp.setText(self.__tr("&Documentation"))
+        self.bHelp.setAccel(self.__tr("Alt+D"))
+        QToolTip.add(self.bHelp,self.__tr("affichage documentation aster"))
         self.tabuniqueinto.changeTab(self.Widget8,self.__tr("Saisir Valeur"))
 
 
diff --git a/Ui/desPlusieursBase.ui b/Ui/desPlusieursBase.ui
index 940cfccf..a6a4eb0c 100644
--- a/Ui/desPlusieursBase.ui
+++ b/Ui/desPlusieursBase.ui
@@ -8,7 +8,7 @@
         <rect>
             <x>0</x>
             <y>0</y>
-            <width>564</width>
+            <width>552</width>
             <height>480</height>
         </rect>
     </property>
@@ -43,7 +43,7 @@
                     <property name="name">
                         <cstring>unnamed</cstring>
                     </property>
-                    <widget class="QLabel" row="0" column="0" rowspan="1" colspan="2">
+                    <widget class="QLabel" row="0" column="0">
                         <property name="name">
                             <cstring>textLabel1</cstring>
                         </property>
@@ -51,103 +51,97 @@
                             <string>&lt;u&gt;&lt;font size="+1"&gt;Valeur(s) actuelle(s)&lt;/font&gt;&lt;/u&gt;</string>
                         </property>
                     </widget>
-                    <widget class="QLayoutWidget" row="8" column="0" rowspan="1" colspan="7">
+                    <widget class="QListBox" row="1" column="0" rowspan="9" colspan="1">
                         <property name="name">
-                            <cstring>layout6</cstring>
+                            <cstring>LBValeurs</cstring>
+                        </property>
+                        <property name="minimumSize">
+                            <size>
+                                <width>200</width>
+                                <height>0</height>
+                            </size>
                         </property>
-                        <hbox>
-                            <property name="name">
-                                <cstring>unnamed</cstring>
-                            </property>
-                            <widget class="QPushButton">
-                                <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">
-                                <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">
-                                <property name="name">
-                                    <cstring>bHelp</cstring>
-                                </property>
-                                <property name="minimumSize">
-                                    <size>
-                                        <width>0</width>
-                                        <height>30</height>
-                                    </size>
-                                </property>
-                                <property name="text">
-                                    <string>&amp;Documentation</string>
-                                </property>
-                                <property name="accel">
-                                    <string>Alt+D</string>
-                                </property>
-                                <property name="autoDefault">
-                                    <bool>true</bool>
-                                </property>
-                                <property name="toolTip" stdset="0">
-                                    <string>affichage documentation aster</string>
-                                </property>
-                            </widget>
-                        </hbox>
                     </widget>
-                    <widget class="QLabel" row="4" column="3" rowspan="1" colspan="4">
+                    <spacer row="5" column="1" rowspan="5" colspan="2">
                         <property name="name">
-                            <cstring>Commentaire</cstring>
+                            <cstring>spacer4</cstring>
+                        </property>
+                        <property name="orientation">
+                            <enum>Vertical</enum>
+                        </property>
+                        <property name="sizeType">
+                            <enum>Expanding</enum>
+                        </property>
+                        <property name="sizeHint">
+                            <size>
+                                <width>21</width>
+                                <height>231</height>
+                            </size>
+                        </property>
+                    </spacer>
+                    <spacer row="0" column="1" rowspan="1" colspan="2">
+                        <property name="name">
+                            <cstring>spacer3_3</cstring>
+                        </property>
+                        <property name="orientation">
+                            <enum>Vertical</enum>
+                        </property>
+                        <property name="sizeType">
+                            <enum>Expanding</enum>
+                        </property>
+                        <property name="sizeHint">
+                            <size>
+                                <width>31</width>
+                                <height>30</height>
+                            </size>
+                        </property>
+                    </spacer>
+                    <widget class="QToolButton" row="2" column="1" rowspan="1" colspan="2">
+                        <property name="name">
+                            <cstring>BAjout1Val</cstring>
+                        </property>
+                        <property name="sizePolicy">
+                            <sizepolicy>
+                                <hsizetype>0</hsizetype>
+                                <vsizetype>0</vsizetype>
+                                <horstretch>0</horstretch>
+                                <verstretch>0</verstretch>
+                            </sizepolicy>
                         </property>
                         <property name="minimumSize">
                             <size>
-                                <width>0</width>
-                                <height>60</height>
+                                <width>40</width>
+                                <height>30</height>
                             </size>
                         </property>
                         <property name="text">
                             <string></string>
                         </property>
+                        <property name="iconSet">
+                            <iconset>image1</iconset>
+                        </property>
+                        <property name="toolTip" stdset="0">
+                            <string>ajoute la valeur saisie sous l occurence selectionnée (en fin de liste si il n y a pas de selection)</string>
+                        </property>
                     </widget>
-                    <widget class="QLayoutWidget" row="6" column="6">
+                    <spacer row="8" column="2" rowspan="1" colspan="3">
+                        <property name="name">
+                            <cstring>spacer5</cstring>
+                        </property>
+                        <property name="orientation">
+                            <enum>Horizontal</enum>
+                        </property>
+                        <property name="sizeType">
+                            <enum>Expanding</enum>
+                        </property>
+                        <property name="sizeHint">
+                            <size>
+                                <width>150</width>
+                                <height>20</height>
+                            </size>
+                        </property>
+                    </spacer>
+                    <widget class="QLayoutWidget" row="7" column="5" rowspan="2" colspan="1">
                         <property name="name">
                             <cstring>layout7</cstring>
                         </property>
@@ -203,24 +197,24 @@
                             </widget>
                         </vbox>
                     </widget>
-                    <spacer row="6" column="4" rowspan="1" colspan="2">
+                    <spacer row="6" column="5">
                         <property name="name">
-                            <cstring>spacer5</cstring>
+                            <cstring>spacer3</cstring>
                         </property>
                         <property name="orientation">
-                            <enum>Horizontal</enum>
+                            <enum>Vertical</enum>
                         </property>
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
                         <property name="sizeHint">
                             <size>
-                                <width>186</width>
-                                <height>20</height>
+                                <width>31</width>
+                                <height>50</height>
                             </size>
                         </property>
                     </spacer>
-                    <spacer row="7" column="6">
+                    <spacer row="9" column="5">
                         <property name="name">
                             <cstring>spacer3_2</cstring>
                         </property>
@@ -237,26 +231,35 @@
                             </size>
                         </property>
                     </spacer>
-                    <widget class="QLineEdit" row="2" column="4" rowspan="1" colspan="3">
+                    <widget class="QToolButton" row="4" column="3">
                         <property name="name">
-                            <cstring>LEValeur</cstring>
+                            <cstring>BSalome</cstring>
                         </property>
                         <property name="sizePolicy">
                             <sizepolicy>
-                                <hsizetype>1</hsizetype>
-                                <vsizetype>1</vsizetype>
+                                <hsizetype>0</hsizetype>
+                                <vsizetype>0</vsizetype>
                                 <horstretch>0</horstretch>
                                 <verstretch>0</verstretch>
                             </sizepolicy>
                         </property>
                         <property name="minimumSize">
                             <size>
-                                <width>220</width>
+                                <width>40</width>
                                 <height>30</height>
                             </size>
                         </property>
+                        <property name="text">
+                            <string></string>
+                        </property>
+                        <property name="iconSet">
+                            <iconset>image0</iconset>
+                        </property>
+                        <property name="toolTip" stdset="0">
+                            <string>ajoute la valeur saisie sous l occurence selectionnée (en fin de liste si il n y a pas de selection)</string>
+                        </property>
                     </widget>
-                    <widget class="QPushButton" row="3" column="5" rowspan="1" colspan="2">
+                    <widget class="QPushButton" row="4" column="4" rowspan="1" colspan="2">
                         <property name="name">
                             <cstring>BView2D</cstring>
                         </property>
@@ -270,35 +273,61 @@
                             <string>Visualiser</string>
                         </property>
                     </widget>
-                    <widget class="QToolButton" row="3" column="4">
+                    <widget class="QLayoutWidget" row="0" column="3" rowspan="2" colspan="3">
                         <property name="name">
-                            <cstring>BSalome</cstring>
+                            <cstring>layout12</cstring>
+                        </property>
+                        <hbox>
+                            <property name="name">
+                                <cstring>unnamed</cstring>
+                            </property>
+                            <widget class="QLabel">
+                                <property name="name">
+                                    <cstring>textLabel1_2</cstring>
+                                </property>
+                                <property name="text">
+                                    <string>&lt;font size="+1"&gt;Valeur&lt;/font&gt;</string>
+                                </property>
+                            </widget>
+                            <spacer>
+                                <property name="name">
+                                    <cstring>spacer6</cstring>
+                                </property>
+                                <property name="orientation">
+                                    <enum>Horizontal</enum>
+                                </property>
+                                <property name="sizeType">
+                                    <enum>Expanding</enum>
+                                </property>
+                                <property name="sizeHint">
+                                    <size>
+                                        <width>111</width>
+                                        <height>20</height>
+                                    </size>
+                                </property>
+                            </spacer>
+                        </hbox>
+                    </widget>
+                    <widget class="QLineEdit" row="2" column="3" rowspan="2" colspan="3">
+                        <property name="name">
+                            <cstring>LEValeur</cstring>
                         </property>
                         <property name="sizePolicy">
                             <sizepolicy>
-                                <hsizetype>0</hsizetype>
-                                <vsizetype>0</vsizetype>
+                                <hsizetype>1</hsizetype>
+                                <vsizetype>1</vsizetype>
                                 <horstretch>0</horstretch>
                                 <verstretch>0</verstretch>
                             </sizepolicy>
                         </property>
                         <property name="minimumSize">
                             <size>
-                                <width>40</width>
+                                <width>220</width>
                                 <height>30</height>
                             </size>
                         </property>
-                        <property name="text">
-                            <string></string>
-                        </property>
-                        <property name="iconSet">
-                            <iconset>image0</iconset>
-                        </property>
-                        <property name="toolTip" stdset="0">
-                            <string>ajoute la valeur saisie sous l occurence selectionnée (en fin de liste si il n y a pas de selection)</string>
-                        </property>
                     </widget>
-                    <widget class="QToolButton" row="3" column="1" rowspan="1" colspan="3">
+                    <widget class="QToolButton" row="3" column="1" rowspan="2" colspan="2">
                         <property name="name">
                             <cstring>BSup1Val</cstring>
                         </property>
@@ -320,137 +349,108 @@
                             <string></string>
                         </property>
                         <property name="iconSet">
-                            <iconset>image1</iconset>
+                            <iconset>image2</iconset>
                         </property>
                         <property name="toolTip" stdset="0">
                             <string>enleve l occurence selectionnee</string>
                         </property>
                     </widget>
-                    <widget class="QToolButton" row="2" column="1" rowspan="1" colspan="3">
+                    <widget class="QLabel" row="5" column="3" rowspan="1" colspan="3">
                         <property name="name">
-                            <cstring>BAjout1Val</cstring>
-                        </property>
-                        <property name="sizePolicy">
-                            <sizepolicy>
-                                <hsizetype>0</hsizetype>
-                                <vsizetype>0</vsizetype>
-                                <horstretch>0</horstretch>
-                                <verstretch>0</verstretch>
-                            </sizepolicy>
+                            <cstring>Commentaire</cstring>
                         </property>
                         <property name="minimumSize">
                             <size>
-                                <width>40</width>
-                                <height>30</height>
+                                <width>0</width>
+                                <height>60</height>
                             </size>
                         </property>
                         <property name="text">
                             <string></string>
                         </property>
-                        <property name="iconSet">
-                            <iconset>image2</iconset>
-                        </property>
-                        <property name="toolTip" stdset="0">
-                            <string>ajoute la valeur saisie sous l occurence selectionnée (en fin de liste si il n y a pas de selection)</string>
-                        </property>
                     </widget>
-                    <widget class="QLayoutWidget" row="1" column="4" rowspan="1" colspan="3">
+                    <widget class="QLayoutWidget" row="10" column="0" rowspan="1" colspan="6">
                         <property name="name">
-                            <cstring>layout12</cstring>
+                            <cstring>layout6</cstring>
                         </property>
                         <hbox>
                             <property name="name">
                                 <cstring>unnamed</cstring>
                             </property>
-                            <widget class="QLabel">
+                            <widget class="QPushButton">
                                 <property name="name">
-                                    <cstring>textLabel1_2</cstring>
+                                    <cstring>bSup</cstring>
+                                </property>
+                                <property name="minimumSize">
+                                    <size>
+                                        <width>0</width>
+                                        <height>30</height>
+                                    </size>
                                 </property>
                                 <property name="text">
-                                    <string>&lt;font size="+1"&gt;Valeur&lt;/font&gt;</string>
+                                    <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>
-                            <spacer>
+                            <widget class="QPushButton">
                                 <property name="name">
-                                    <cstring>spacer6</cstring>
+                                    <cstring>bOk</cstring>
                                 </property>
-                                <property name="orientation">
-                                    <enum>Horizontal</enum>
+                                <property name="minimumSize">
+                                    <size>
+                                        <width>0</width>
+                                        <height>30</height>
+                                    </size>
                                 </property>
-                                <property name="sizeType">
-                                    <enum>Expanding</enum>
+                                <property name="text">
+                                    <string>&amp;Valider</string>
                                 </property>
-                                <property name="sizeHint">
+                                <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">
+                                <property name="name">
+                                    <cstring>bHelp</cstring>
+                                </property>
+                                <property name="minimumSize">
                                     <size>
-                                        <width>111</width>
-                                        <height>20</height>
+                                        <width>0</width>
+                                        <height>30</height>
                                     </size>
                                 </property>
-                            </spacer>
+                                <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>
                         </hbox>
                     </widget>
-                    <spacer row="4" column="2" rowspan="4" colspan="1">
-                        <property name="name">
-                            <cstring>spacer4</cstring>
-                        </property>
-                        <property name="orientation">
-                            <enum>Vertical</enum>
-                        </property>
-                        <property name="sizeType">
-                            <enum>Expanding</enum>
-                        </property>
-                        <property name="sizeHint">
-                            <size>
-                                <width>21</width>
-                                <height>231</height>
-                            </size>
-                        </property>
-                    </spacer>
-                    <spacer row="5" column="6">
-                        <property name="name">
-                            <cstring>spacer3</cstring>
-                        </property>
-                        <property name="orientation">
-                            <enum>Vertical</enum>
-                        </property>
-                        <property name="sizeType">
-                            <enum>Expanding</enum>
-                        </property>
-                        <property name="sizeHint">
-                            <size>
-                                <width>31</width>
-                                <height>50</height>
-                            </size>
-                        </property>
-                    </spacer>
-                    <spacer row="0" column="2" rowspan="2" colspan="2">
-                        <property name="name">
-                            <cstring>spacer3_3</cstring>
-                        </property>
-                        <property name="orientation">
-                            <enum>Vertical</enum>
-                        </property>
-                        <property name="sizeType">
-                            <enum>Expanding</enum>
-                        </property>
-                        <property name="sizeHint">
-                            <size>
-                                <width>31</width>
-                                <height>50</height>
-                            </size>
-                        </property>
-                    </spacer>
-                    <widget class="QListBox" row="1" column="0" rowspan="7" colspan="1">
-                        <property name="name">
-                            <cstring>LBValeurs</cstring>
-                        </property>
-                        <property name="minimumSize">
-                            <size>
-                                <width>200</width>
-                                <height>0</height>
-                            </size>
-                        </property>
-                    </widget>
                 </grid>
             </widget>
         </widget>
@@ -461,10 +461,10 @@
         <data format="PNG" length="198">89504e470d0a1a0a0000000d49484452000000140000001408060000008d891d0d0000008d49444154388db5d3db0d80200c05d05be33a8ee24c8699188581ea87c6c4d25628d8840f5e27175002636a2d73b91fc0b569153917c3a07ef0ae9ccaabbf1f5bb5a6edc80c028334200602008165c23828302fa977dd36c6a067a778143fa185f95be66176c220a68303580d0e627ac201cc04a3d8552c1ac03995ab27e75a9a3e1847ddef3072ecef5fafb34ecb0165f7826b457b0000000049454e44ae426082</data>
     </image>
     <image name="image1">
-        <data format="PNG" length="264">89504e470d0a1a0a0000000d49484452000000210000000e0806000000a11e758c000000cf49444154388dd594db0ec3200c43edfdf8d897bb0f345b480845d51eb64888f412e76001c00f046fd6e99bba77200480924a1032c92efbd8c7d5cabcc025400099e957849568fe7f06c0ded1deb32b4a1ec4ea824b9e74097165bd01f85527f78a7201e0a3129f345a017c543bafdc983d0f7109d15a331b471f47072c17494a82338f6178203a8817e67306b1f08b07ba03e602c9b831077e37e0209e67e3386710977b17de80c185ad38695a51d522c82ce77912e2fed8be83762092f52b1820dd11bb10e565b53a5a3bbaff130713d66fa6981857060000000049454e44ae426082</data>
+        <data format="PNG" length="256">89504e470d0a1a0a0000000d49484452000000210000000e0806000000a11e758c000000c749444154388dcd94590ec3200c4471d57bc73df9f407d331b159a228aa254448bc3cc68152fec0e4420ceeceb912e08a0239838848f5df02c99c11f86004300119054ae868c56ac206c06b4b109111c802874f3a52a587757123897e4039c46b50d8865b07f5400a450053330893cf8674a30028d492deef04626b559dfe48ac842b1a6daae6850155033b99c5009f70ceda111aab413b6f6a70d118e008e6fd8bc51d5d00a0f614556d1ff9b9be4952aabc3721f8f8b6f624c557ef8947afedf48c5e60b8dfbeb81d6dab9aff99270000000049454e44ae426082</data>
     </image>
     <image name="image2">
-        <data format="PNG" length="256">89504e470d0a1a0a0000000d49484452000000210000000e0806000000a11e758c000000c749444154388dcd94590ec3200c4471d57bc73df9f407d331b159a228aa254448bc3cc68152fec0e4420ceeceb912e08a0239838848f5df02c99c11f86004300119054ae868c56ac206c06b4b109111c802874f3a52a587757123897e4039c46b50d8865b07f5400a450053330893cf8674a30028d492deef04626b559dfe48ac842b1a6daae6850155033b99c5009f70ceda111aab413b6f6a70d118e008e6fd8bc51d5d00a0f614556d1ff9b9be4952aabc3721f8f8b6f624c557ef8947afedf48c5e60b8dfbeb81d6dab9aff99270000000049454e44ae426082</data>
+        <data format="PNG" length="264">89504e470d0a1a0a0000000d49484452000000210000000e0806000000a11e758c000000cf49444154388dd594db0ec3200c43edfdf8d897bb0f345b480845d51eb64888f412e76001c00f046fd6e99bba77200480924a1032c92efbd8c7d5cabcc025400099e957849568fe7f06c0ded1deb32b4a1ec4ea824b9e74097165bd01f85527f78a7201e0a3129f345a017c543bafdc983d0f7109d15a331b471f47072c17494a82338f6178203a8817e67306b1f08b07ba03e602c9b831077e37e0209e67e3386710977b17de80c185ad38695a51d522c82ce77912e2fed8be83762092f52b1820dd11bb10e565b53a5a3bbaff130713d66fa6981857060000000049454e44ae426082</data>
     </image>
 </images>
 <connections>