*** empty log message ***

diff --git a/InterfaceQT/compobloc.py b/InterfaceQT/compobloc.py
index ff386c5188bb9cae60a4957a0f7de0c08f6575eb..7c8b844df8d2a4f3101906b450f2bff897ecb5f3 100644 (file)
--- a/InterfaceQT/compobloc.py
+++ b/InterfaceQT/compobloc.py
@@ -1,9 +1,10 @@
 # -*- coding: utf-8 -*-
 
-from Editeur     import Objecttreeitem
-from InterfaceQT import compofact
-from InterfaceQT import browser
 from qt import *
+from Editeur     import Objecttreeitem
+
+import compofact
+import browser
 
 
 class Node(browser.JDCNode):

diff --git a/InterfaceQT/compocomm.py b/InterfaceQT/compocomm.py
index fda1ab4e8db979647de4df939ad1b8357a5872ea..d007b3be18a28de3b8794cdd5bd009c979c2714f 100644 (file)
--- a/InterfaceQT/compocomm.py
+++ b/InterfaceQT/compocomm.py
@@ -23,8 +23,8 @@ import string
 from qt import *
 
 from Editeur     import Objecttreeitem
-from InterfaceQT import browser
-from InterfaceQT import typeNode
+import browser
+import typeNode
 
 
 class Node(browser.JDCNode,typeNode.PopUpMenuNodePartiel):

diff --git a/InterfaceQT/compocommandecomm.py b/InterfaceQT/compocommandecomm.py
index c28756a964435e6435e3b16bccd0d666f84ed3d2..153f2b7120b2d35c4289e48cf6538d746163ab53 100644 (file)
--- a/InterfaceQT/compocommandecomm.py
+++ b/InterfaceQT/compocommandecomm.py
@@ -22,7 +22,7 @@ import traceback
 import string
 
 from Editeur import Objecttreeitem
-from InterfaceQT import compocomm
+import compocomm
 
 class COMMANDE_COMMTreeItem(Objecttreeitem.ObjectTreeItem):
     itemNode=compocomm.Node

diff --git a/InterfaceQT/compofact.py b/InterfaceQT/compofact.py
index 26f97a7715bdb9c455a7b4f67878654487e78f8f..bf4405769886182682b2e4b268269dfb99fb1d20 100644 (file)
--- a/InterfaceQT/compofact.py
+++ b/InterfaceQT/compofact.py
@@ -19,9 +19,9 @@
 #
 # ======================================================================
 
-from Editeur     import Objecttreeitem
-from InterfaceQT import browser
 from qt import *
+from Editeur     import Objecttreeitem
+import browser
 
 
 class Node(browser.JDCNode):

diff --git a/InterfaceQT/compoformule.py b/InterfaceQT/compoformule.py
index 196218a653170bc551035e49d4e35588debe395e..6f3bd9dd486a875b0a51419763eae2d48e14302e 100644 (file)
--- a/InterfaceQT/compoformule.py
+++ b/InterfaceQT/compoformule.py
@@ -8,9 +8,9 @@ d'EFICAS
 
 import string
 from qt import *
-from InterfaceQT import compooper
-from InterfaceQT import browser
-from InterfaceQT import typeNode
+import compooper
+import browser
+import typeNode
 
 
 class FormuleNode(browser.JDCNode,typeNode.PopUpMenuNode):

diff --git a/InterfaceQT/compojdc.py b/InterfaceQT/compojdc.py
index 288e4bec42209349f45c7705ad94359e4b2d5060..1cd49081b68990e9021fd17fe145f7cb0d411c3d 100644 (file)
--- a/InterfaceQT/compojdc.py
+++ b/InterfaceQT/compojdc.py
@@ -2,7 +2,7 @@
 
 from qt import *
 from Editeur import Objecttreeitem
-from InterfaceQT import browser
+import browser
 
 
 class Node(browser.JDCNode):

diff --git a/InterfaceQT/compomacro.py b/InterfaceQT/compomacro.py
index 571358428671c89a70c380be1155552baa4768c0..989399c6cde6060354f036f18dc244a15a2b0d27 100644 (file)
--- a/InterfaceQT/compomacro.py
+++ b/InterfaceQT/compomacro.py
@@ -8,9 +8,9 @@ from qt import *
 
 # Modules Eficas
 from Editeur import Objecttreeitem
-from InterfaceQT import compooper
-from InterfaceQT import browser
-from InterfaceQT import typeNode
+import compooper
+import browser
+import typeNode
 
 
 class MACRONode(browser.JDCNode,typeNode.PopUpMenuNode):         

diff --git a/InterfaceQT/compomclist.py b/InterfaceQT/compomclist.py
index 6a3102a0d3a1b0a1b47abe383d1d58d76b50e36c..e07d05ae9d357289d62944d6a9cfd1605cab4d55 100644 (file)
--- a/InterfaceQT/compomclist.py
+++ b/InterfaceQT/compomclist.py
@@ -5,8 +5,8 @@ import traceback
 
 from qt import *
 
-from InterfaceQT import compofact
-from InterfaceQT import browser
+import compofact
+import browser
 from Editeur     import Objecttreeitem
 from Noyau.N_OBJECT import ErrorObj
 #import compoerror

diff --git a/InterfaceQT/componiveau.py b/InterfaceQT/componiveau.py
index 37b38b7f39e4aff0df38e7407e55f3eddd9baac0..866d585ec594b5192b90ea32c20aab5158b90609 100644 (file)
--- a/InterfaceQT/componiveau.py
+++ b/InterfaceQT/componiveau.py
@@ -3,16 +3,12 @@
 from qt import *
 from Editeur     import Objecttreeitem
 from Extensions  import commentaire 
-from InterfaceQT import browser
+import browser
 
-class Node(browser.JDCNode): pass
-##    def getPanel(self):
-##        """        
-##        """    
-##        return NIVEAUPanel( self, self.editor )
+class Node(browser.JDCNode):
+      pass
 
 class NIVEAUTreeItem(Objecttreeitem.ObjectTreeItem):
-##  panel = NIVEAUPanel
   itemNode=Node
 
   def isactif(self):

diff --git a/InterfaceQT/compooper.py b/InterfaceQT/compooper.py
index f078cd8c85e93d1856267eac451000deec4ada75..725e7f1926430e49e96ce99303d07ff524248a63 100644 (file)
--- a/InterfaceQT/compooper.py
+++ b/InterfaceQT/compooper.py
@@ -6,8 +6,8 @@ import string
 from qt import *
 
 from Editeur     import Objecttreeitem
-from InterfaceQT import browser
-from InterfaceQT import typeNode
+import browser
+import typeNode
 
 class Node(browser.JDCNode, typeNode.PopUpMenuNode):
     def getPanel( self ):

diff --git a/InterfaceQT/compoparam.py b/InterfaceQT/compoparam.py
index cef01b244a240dc3a94fbd40a31703b84c6f1ccd..64a785853b84861d8c0ae243e9745d4c50b0fded 100644 (file)
--- a/InterfaceQT/compoparam.py
+++ b/InterfaceQT/compoparam.py
@@ -11,8 +11,8 @@ from qt import *
 
 # import modules EFICAS
 from Editeur     import Objecttreeitem
-from InterfaceQT import browser
-from InterfaceQT import typeNode
+import browser
+import typeNode
 
 
 class Node(browser.JDCNode,typeNode.PopUpMenuNode): 

diff --git a/InterfaceQT/compoproc.py b/InterfaceQT/compoproc.py
index c128496aa20e3c641d1b05828b24d04d9e4925b3..ffbfdf03bd52681ef43623ae7e178329b3f8c31c 100644 (file)
--- a/InterfaceQT/compoproc.py
+++ b/InterfaceQT/compoproc.py
@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 from Editeur     import Objecttreeitem
-from InterfaceQT import compooper
-from InterfaceQT import browser
-from InterfaceQT import typeNode
+import compooper
+import browser
+import typeNode
 
 from qt import *
 

diff --git a/InterfaceQT/composimp.py b/InterfaceQT/composimp.py
index df6266f03e0ddc3e48ea677d7815413b8fe60e3d..18b12d3400bb3b08afd4ed975bb83b9aa3e43acc 100644 (file)
--- a/InterfaceQT/composimp.py
+++ b/InterfaceQT/composimp.py
@@ -7,8 +7,8 @@ import traceback
 from qt import *
 
 # Modules Eficas
-from Editeur      import Objecttreeitem
-from InterfaceQT  import browser
+import Objecttreeitem
+import browser
 from Noyau.N_CR   import justify_text
     
 import prefs

diff --git a/InterfaceQT/editor.py b/InterfaceQT/editor.py
index 558280706df07fe3dceea21ac5128576f310fb36..e038fd7f21cf110e425acd6a700cdce1b116c735 100644 (file)
--- a/InterfaceQT/editor.py
+++ b/InterfaceQT/editor.py
@@ -11,9 +11,9 @@ import convert,generator
 from Editeur     import session
 from Editeur     import comploader
 from Editeur     import Objecttreeitem
-from InterfaceQT import panelsQT
-from InterfaceQT import browser
-from InterfaceQT import readercata
+import panelsQT
+import browser
+import readercata
 
 import prefs
 import qtCommun
@@ -307,10 +307,21 @@ class JDCEditor(QSplitter):
         
     #-----------------------#
     def viewJdcSource(self):        
+    #-----------------------#
+        format = self.format_fichier
+        print dir(self)
+        print self.getFileName()
+        #f=open(self.JDCDisplay_courant.fichier,'r')
+        #texteSource=f.read()
+        #f.close()
+        #self._viewText(texteSource, "JDC_SOURCE")
+                
+    #-----------------------#
+    def viewJdcPy(self):        
     #-----------------------#
         format = self.format_fichier
         strSource = str( self.get_text_JDC(format) )       
-        self._viewText(strSource, "JDC_SOURCE")
+        self._viewText(strSource, "JDC_RESULTAT")
                 
     #-----------------------#
     def viewJdcRapport(self):

diff --git a/InterfaceQT/politiquesValidation.py b/InterfaceQT/politiquesValidation.py
index 07543d5e8b3f5b5948e679d2afe9eb87e32c55e0..cd66885542b095085bac623d1061044dab43e7aa 100644 (file)
--- a/InterfaceQT/politiquesValidation.py
+++ b/InterfaceQT/politiquesValidation.py
@@ -129,13 +129,14 @@ class PolitiquePlusieurs:
              # On teste le type de la valeur
              valide=self.node.item.valide_item(valeur)
              if not valide :
-                testtype,commentaire = self.node.item.object.verif_type(valeur)
-                print self.__class__
-                if not testtype :
-                   return testtype,commentaire,"",listeRetour
+                #testtype,commentaire = self.node.item.object.verif_type(valeur)
+                #print self.__class__
+                #if not testtype :
                 try :
                    valeur,valide=self.node.item.eval_valeur(valeur)
+                   print "apres try"
                 except :
+                   #return testtype,commentaire,"",listeRetour
                    pass
              if not valide:
                 commentaire="Valeur "+str(valeur)+ " incorrecte : ajout à la liste refusé"

diff --git a/InterfaceQT/qtCommun.py b/InterfaceQT/qtCommun.py
index 2c8c7dd5f1ffee77417130f491e0467409dbf38b..0e90aa8e763fe5c0c89cbe33b81affed0729be2d 100644 (file)
--- a/InterfaceQT/qtCommun.py
+++ b/InterfaceQT/qtCommun.py
@@ -23,7 +23,7 @@ import string,types,os
 import traceback
 
 from qt import *
-from InterfaceQT import prefsQT
+import prefsQT
 
 # Import des panels
 

diff --git a/InterfaceQT/qtEficas.py b/InterfaceQT/qtEficas.py
index 813f344ac78df02bfa34cccc7f0a840f7def1b62..e3785743ed603d83e408140d45470ada61727fb6 100644 (file)
--- a/InterfaceQT/qtEficas.py
+++ b/InterfaceQT/qtEficas.py
@@ -14,7 +14,7 @@ from viewManager import MyTabview
 from Editeur import configuration
 from Editeur import session
 
-from InterfaceQT import utilIcons
+import utilIcons
 utilIcons.initializeMimeSourceFactory()
 
 
@@ -204,6 +204,9 @@ class Appli(Eficas):
     def jdcRapport(self):
         self.viewmanager.handleViewJdcRapport()
         
+    def visuJdcPy(self):
+        self.viewmanager.handlevisuJdcPy()
+
     def get_source(self,file):
         from editor import JDCEditor
         monEditeur=JDCEditor()

diff --git a/InterfaceQT/viewManager.py b/InterfaceQT/viewManager.py
index ade9f8c961f47b926f8eb3ef47384ffa11669771..50108524f4c56dada2f3bd4ffd3fe65e365a1049 100644 (file)
--- a/InterfaceQT/viewManager.py
+++ b/InterfaceQT/viewManager.py
@@ -1095,6 +1095,9 @@ class ViewManager:
         else:
             return
 
+    def handlevisuJdcPy(self):
+        if self.activeWindow()== None : return
+        self.activeWindow().viewJdcPy()
         
     def handleViewJdcFichierSource(self):
         if self.activeWindow()== None : return

diff --git a/InterfaceTK/bureau.py b/InterfaceTK/bureau.py
index eb9feae8b7292103f528f001ef30b835872de235..edfd2e68cb2512ae38e3a78b08470bcb058ba1fd 100644 (file)
--- a/InterfaceTK/bureau.py
+++ b/InterfaceTK/bureau.py
@@ -76,7 +76,7 @@ class BUREAU:
                             ]
               ),
               ('Aide',[
-                        ('Aide EFICAS','aideEFICAS'),
+                        ('Aide EFICAS','aideEFICAS','<Control-a>','Ctrl+A'),
                       ]
               ),
              ]
@@ -736,7 +736,7 @@ class BUREAU:
    def update_jdc_courant(self):
       self.JDCDisplay_courant.update()
 
-   def TraduitFichier(self):
+   def TraduitFichier(self,event=None):
       directory = self.appli.CONFIGURATION.rep_user
       FichieraTraduire = askopenfilename(title="Nom du  Fichier à Traduire",
                                  defaultextension=".comm",

diff --git a/Ui/desChoixCata.py b/Ui/desChoixCata.py
index 171e3222b25c332495eb471cacd3546d529bca8b..3ce6d9dc9f47c34178392f86b50ab6f4fafda69a 100644 (file)
--- a/Ui/desChoixCata.py
+++ b/Ui/desChoixCata.py
@@ -2,7 +2,7 @@
 
 # Form implementation generated from reading ui file 'desChoixCata.ui'
 #
-# Created: mer nov 14 11:57:46 2007
+# Created: lun nov 19 11:09:03 2007
 #      by: The PyQt User Interface Compiler (pyuic) 3.13
 #
 # WARNING! All changes made in this file will be lost!

diff --git a/Ui/desCommande.py b/Ui/desCommande.py
index dea295499aa269df76484b141f76bbf0a8ccbff4..c9dadb32410dbb7c0e1bfd7f26a469d91974fa89 100644 (file)
--- a/Ui/desCommande.py
+++ b/Ui/desCommande.py
@@ -2,7 +2,7 @@
 
 # Form implementation generated from reading ui file 'desCommande.ui'
 #
-# Created: mer nov 14 11:57:46 2007
+# Created: lun nov 19 11:09:03 2007
 #      by: The PyQt User Interface Compiler (pyuic) 3.13
 #
 # WARNING! All changes made in this file will be lost!

diff --git a/Ui/desCommentaire.py b/Ui/desCommentaire.py
index 8b756d74a01617cd12fa55a91d493448cf00cdfc..55663932bbe473b0921130bff803c912c25c81ae 100644 (file)
--- a/Ui/desCommentaire.py
+++ b/Ui/desCommentaire.py
@@ -2,7 +2,7 @@
 
 # Form implementation generated from reading ui file 'desCommentaire.ui'
 #
-# Created: mer nov 14 11:57:46 2007
+# Created: lun nov 19 11:09:03 2007
 #      by: The PyQt User Interface Compiler (pyuic) 3.13
 #
 # WARNING! All changes made in this file will be lost!
@@ -53,6 +53,7 @@ class DComment(QWidget):
         self.clearWState(Qt.WState_Polished)
 
         self.connect(self.bOk,SIGNAL("clicked()"),self.TexteCommentaireEntre)
+        self.connect(self.bHelp,SIGNAL("clicked()"),self.ViewDoc)
 
 
     def languageChange(self):
@@ -72,5 +73,8 @@ class DComment(QWidget):
     def TexteCommentaireEntre(self):
         print "DComment.TexteCommentaireEntre(): Not implemented yet"
 
+    def ViewDoc(self):
+        print "DComment.ViewDoc(): Not implemented yet"
+
     def __tr(self,s,c = None):
         return qApp.translate("DComment",s,c)

diff --git a/Ui/desFormule.py b/Ui/desFormule.py
index 915f030676dab8429ca3cd3423be5276b2aaf944..ff80b3c04546dcc38c796fd152a27ec2f267cbe3 100644 (file)
--- a/Ui/desFormule.py
+++ b/Ui/desFormule.py
@@ -2,7 +2,7 @@
 
 # Form implementation generated from reading ui file 'desFormule.ui'
 #
-# Created: mer nov 14 11:57:46 2007
+# Created: lun nov 19 11:09:03 2007
 #      by: The PyQt User Interface Compiler (pyuic) 3.13
 #
 # WARNING! All changes made in this file will be lost!
@@ -192,6 +192,7 @@ class DFormule(QWidget):
         self.connect(self.LENomFormule,SIGNAL("returnPressed()"),self.NomFormuleSaisi)
         self.connect(self.LENomsArgs,SIGNAL("returnPressed()"),self.argsSaisis)
         self.connect(self.LECorpsFormule,SIGNAL("returnPressed()"),self.FormuleSaisie)
+        self.connect(self.bHelp,SIGNAL("clicked()"),self.ViewDoc)
 
 
     def languageChange(self):
@@ -257,6 +258,9 @@ class DFormule(QWidget):
     def FormuleSaisie(self):
         print "DFormule.FormuleSaisie(): Not implemented yet"
 
+    def ViewDoc(self):
+        print "DFormule.ViewDoc(): Not implemented yet"
+
     def __tr(self,s,c = None):
         return qApp.translate("DFormule",s,c)
 

diff --git a/Ui/desInactif.py b/Ui/desInactif.py
index a998b79cb5caac265aac4c37ba9abc0bf285e203..02c437bf4843946d29c231bf6ecf77c63afe0291 100644 (file)
--- a/Ui/desInactif.py
+++ b/Ui/desInactif.py
@@ -2,7 +2,7 @@
 
 # Form implementation generated from reading ui file 'desInactif.ui'
 #
-# Created: mer nov 14 11:57:46 2007
+# Created: lun nov 19 11:09:04 2007
 #      by: The PyQt User Interface Compiler (pyuic) 3.13
 #
 # WARNING! All changes made in this file will be lost!

diff --git a/Ui/desInclude.py b/Ui/desInclude.py
index 5cdcfb1aa538cb0c7f67a3afdd864d468fd2e75a..fbed12f6762cd13f5c4c3e966f6d00b4e8fca827 100644 (file)
--- a/Ui/desInclude.py
+++ b/Ui/desInclude.py
@@ -2,7 +2,7 @@
 
 # Form implementation generated from reading ui file 'desInclude.ui'
 #
-# Created: mer nov 14 11:57:46 2007
+# Created: lun nov 19 11:09:04 2007
 #      by: The PyQt User Interface Compiler (pyuic) 3.13
 #
 # WARNING! All changes made in this file will be lost!
@@ -173,6 +173,7 @@ class DInc1(QWidget):
         self.connect(self.BNext,SIGNAL("clicked()"),self.BNextPressed)
         self.connect(self.BBrowse,SIGNAL("clicked()"),self.BBrowsePressed)
         self.connect(self.LENomFichier,SIGNAL("returnPressed()"),self.LENomFichReturnPressed)
+        self.connect(self.bHelp,SIGNAL("clicked()"),self.ViewDoc)
 
 
     def languageChange(self):
@@ -233,6 +234,9 @@ class DInc1(QWidget):
     def LENomFichReturnPressed(self):
         print "DInc1.LENomFichReturnPressed(): Not implemented yet"
 
+    def ViewDoc(self):
+        print "DInc1.ViewDoc(): Not implemented yet"
+
     def __tr(self,s,c = None):
         return qApp.translate("DInc1",s,c)
 

diff --git a/Ui/desListeParam.py b/Ui/desListeParam.py
index 687502945740570c94d92876573f0719c93d8274..3fc318547400f05e8c004dd6f9b52443d392149a 100644 (file)
--- a/Ui/desListeParam.py
+++ b/Ui/desListeParam.py
@@ -2,7 +2,7 @@
 
 # Form implementation generated from reading ui file 'desListeParam.ui'
 #
-# Created: mer nov 14 11:57:47 2007
+# Created: lun nov 19 11:09:04 2007
 #      by: The PyQt User Interface Compiler (pyuic) 3.13
 #
 # WARNING! All changes made in this file will be lost!

diff --git a/Ui/desMCFact.py b/Ui/desMCFact.py
index e1ea6a0b8c29a12e1485f15771e0c3fe12a21786..41050c7eccc9619363cf50156235743da3aeaf93 100644 (file)
--- a/Ui/desMCFact.py
+++ b/Ui/desMCFact.py
@@ -2,7 +2,7 @@
 
 # Form implementation generated from reading ui file 'desMCFact.ui'
 #
-# Created: mer nov 14 11:57:47 2007
+# Created: lun nov 19 11:09:04 2007
 #      by: The PyQt User Interface Compiler (pyuic) 3.13
 #
 # WARNING! All changes made in this file will be lost!

diff --git a/Ui/desMCListAjout.py b/Ui/desMCListAjout.py
index e9fe009640978bcfae73aa311712d661bc456b5d..b50723a6e22db81d38f6e5c72b32fbed5b757792 100644 (file)
--- a/Ui/desMCListAjout.py
+++ b/Ui/desMCListAjout.py
@@ -2,7 +2,7 @@
 
 # Form implementation generated from reading ui file 'desMCListAjout.ui'
 #
-# Created: mer nov 14 11:57:47 2007
+# Created: lun nov 19 11:09:04 2007
 #      by: The PyQt User Interface Compiler (pyuic) 3.13
 #
 # WARNING! All changes made in this file will be lost!

diff --git a/Ui/desMacro.py b/Ui/desMacro.py
index 1c3f081fed4d1c149d6a6eb5b790fe2203198334..402ad029ece9e8e9fc024a2bd34629a723985375 100644 (file)
--- a/Ui/desMacro.py
+++ b/Ui/desMacro.py
@@ -2,7 +2,7 @@
 
 # Form implementation generated from reading ui file 'desMacro.ui'
 #
-# Created: mer nov 14 11:57:47 2007
+# Created: lun nov 19 11:09:04 2007
 #      by: The PyQt User Interface Compiler (pyuic) 3.13
 #
 # WARNING! All changes made in this file will be lost!

diff --git a/Ui/desParam.py b/Ui/desParam.py
index 6e86c7a60d436f18f1649e7c2ab251bde6a1f39d..6ff292e3d4d21e916b2e1ee9ff08a1a55042191a 100644 (file)
--- a/Ui/desParam.py
+++ b/Ui/desParam.py
@@ -2,7 +2,7 @@
 
 # Form implementation generated from reading ui file 'desParam.ui'
 #
-# Created: mer nov 14 11:57:47 2007
+# Created: lun nov 19 11:09:04 2007
 #      by: The PyQt User Interface Compiler (pyuic) 3.13
 #
 # WARNING! All changes made in this file will be lost!

diff --git a/Ui/desPlusieursBase.py b/Ui/desPlusieursBase.py
index 5e38c0b38ba78a840c9a8da237e81ad16d639d63..5e95eacba8eee332c19f1d9b5febc46c86fd217c 100644 (file)
--- a/Ui/desPlusieursBase.py
+++ b/Ui/desPlusieursBase.py
@@ -2,7 +2,7 @@
 
 # Form implementation generated from reading ui file 'desPlusieursBase.ui'
 #
-# Created: mer nov 14 11:57:47 2007
+# Created: lun nov 19 11:31:09 2007
 #      by: The PyQt User Interface Compiler (pyuic) 3.13
 #
 # WARNING! All changes made in this file will be lost!
@@ -11,29 +11,6 @@
 from qt import *
 
 image0_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"
-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" \
@@ -56,6 +33,29 @@ image1_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"
+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"
 
 class DPlusBase(QWidget):
     def __init__(self,parent = None,name = None,fl = 0):
@@ -98,31 +98,13 @@ class DPlusBase(QWidget):
         layout1.addWidget(self.bSup)
         layout3.addLayout(layout1)
 
-        Widget8Layout.addMultiCellLayout(layout3,4,4,0,3)
-
-        layout8 = QVBoxLayout(None,0,6,"layout8")
-
-        self.BSup1Val = QToolButton(self.Widget8,"BSup1Val")
-        self.BSup1Val.setSizePolicy(QSizePolicy(0,0,0,0,self.BSup1Val.sizePolicy().hasHeightForWidth()))
-        self.BSup1Val.setIconSet(QIconSet(self.image0))
-        layout8.addWidget(self.BSup1Val)
-
-        self.BAjout1Val = QToolButton(self.Widget8,"BAjout1Val")
-        self.BAjout1Val.setSizePolicy(QSizePolicy(0,0,0,0,self.BAjout1Val.sizePolicy().hasHeightForWidth()))
-        self.BAjout1Val.setIconSet(QIconSet(self.image1))
-        layout8.addWidget(self.BAjout1Val)
-
-        Widget8Layout.addLayout(layout8,1,1)
+        Widget8Layout.addMultiCellLayout(layout3,5,5,0,3)
 
         self.textLabel1 = QLabel(self.Widget8,"textLabel1")
 
         Widget8Layout.addWidget(self.textLabel1,0,0)
-
-        self.LBValeurs = QListBox(self.Widget8,"LBValeurs")
-
-        Widget8Layout.addMultiCellWidget(self.LBValeurs,1,3,0,0)
         spacer5 = QSpacerItem(120,20,QSizePolicy.Expanding,QSizePolicy.Minimum)
-        Widget8Layout.addMultiCell(spacer5,3,3,1,2)
+        Widget8Layout.addMultiCell(spacer5,4,4,1,2)
 
         layout6 = QVBoxLayout(None,0,6,"layout6")
 
@@ -134,9 +116,7 @@ class DPlusBase(QWidget):
         self.bImport.setAutoDefault(1)
         layout6.addWidget(self.bImport)
 
-        Widget8Layout.addLayout(layout6,3,3)
-        spacer3 = QSpacerItem(31,131,QSizePolicy.Minimum,QSizePolicy.Expanding)
-        Widget8Layout.addItem(spacer3,2,3)
+        Widget8Layout.addMultiCellLayout(layout6,3,4,3,3)
 
         layout19 = QVBoxLayout(None,0,6,"layout19")
 
@@ -154,6 +134,32 @@ class DPlusBase(QWidget):
         layout19.addWidget(self.LEValeur)
 
         Widget8Layout.addMultiCellLayout(layout19,1,1,2,3)
+
+        self.LBValeurs = QListBox(self.Widget8,"LBValeurs")
+
+        Widget8Layout.addMultiCellWidget(self.LBValeurs,1,4,0,0)
+        spacer3 = QSpacerItem(31,131,QSizePolicy.Minimum,QSizePolicy.Expanding)
+        Widget8Layout.addItem(spacer3,2,3)
+
+        layout8 = QVBoxLayout(None,0,6,"layout8")
+        spacer5_2 = QSpacerItem(20,31,QSizePolicy.Minimum,QSizePolicy.Expanding)
+        layout8.addItem(spacer5_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.image0))
+        layout8.addWidget(self.BAjout1Val)
+
+        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))
+        layout8.addWidget(self.BSup1Val)
+        spacer4 = QSpacerItem(21,231,QSizePolicy.Minimum,QSizePolicy.Expanding)
+        layout8.addItem(spacer4)
+
+        Widget8Layout.addMultiCellLayout(layout8,0,3,1,1)
         self.tabuniqueinto.insertTab(self.Widget8,QString(""))
 
         DPlusBaseLayout.addWidget(self.tabuniqueinto,0,0)
@@ -185,10 +191,6 @@ class DPlusBase(QWidget):
         self.bSup.setText(self.__tr("&Supprimer"))
         self.bSup.setAccel(self.__tr("Alt+S"))
         QToolTip.add(self.bSup,self.__tr("suppression du mot clef"))
-        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.setText(self.__tr("<u><font size=\"+1\">Valeur(s) actuelle(s)</font></u>"))
         self.bParam.setText(self.__tr("&Parametres"))
         self.bParam.setAccel(self.__tr("Alt+P"))
@@ -197,6 +199,10 @@ class DPlusBase(QWidget):
         self.bImport.setAccel(self.__tr("Alt+I"))
         QToolTip.add(self.bImport,self.__tr("suppression du mot clef"))
         self.textLabel1_2.setText(self.__tr("<font size=\"+1\">Valeur</font>"))
+        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.BSup1Val.setText(QString.null)
+        QToolTip.add(self.BSup1Val,self.__tr("enleve l occurence selectionnee"))
         self.tabuniqueinto.changeTab(self.Widget8,self.__tr("Saisir Valeur"))
 
 

diff --git a/Ui/desPlusieursBase.ui b/Ui/desPlusieursBase.ui
index 27e6802fbae16d68c3ab3eb906cd0a90bab2de33..0b5e599264c7860271d18e6d820c95ca7bd562fe 100644 (file)
--- a/Ui/desPlusieursBase.ui
+++ b/Ui/desPlusieursBase.ui
@@ -40,7 +40,7 @@
                     <property name="name">
                         <cstring>unnamed</cstring>
                     </property>
-                    <widget class="QLayoutWidget" row="4" column="0" rowspan="1" colspan="4">
+                    <widget class="QLayoutWidget" row="5" column="0" rowspan="1" colspan="4">
                         <property name="name">
                             <cstring>layout3</cstring>
                         </property>
@@ -122,60 +122,6 @@
                             </widget>
                         </vbox>
                     </widget>
-                    <widget class="QLayoutWidget" row="1" column="1">
-                        <property name="name">
-                            <cstring>layout8</cstring>
-                        </property>
-                        <vbox>
-                            <property name="name">
-                                <cstring>unnamed</cstring>
-                            </property>
-                            <widget class="QToolButton">
-                                <property name="name">
-                                    <cstring>BSup1Val</cstring>
-                                </property>
-                                <property name="sizePolicy">
-                                    <sizepolicy>
-                                        <hsizetype>0</hsizetype>
-                                        <vsizetype>0</vsizetype>
-                                        <horstretch>0</horstretch>
-                                        <verstretch>0</verstretch>
-                                    </sizepolicy>
-                                </property>
-                                <property name="text">
-                                    <string></string>
-                                </property>
-                                <property name="iconSet">
-                                    <iconset>image0</iconset>
-                                </property>
-                                <property name="toolTip" stdset="0">
-                                    <string>enleve l occurence selectionnee</string>
-                                </property>
-                            </widget>
-                            <widget class="QToolButton">
-                                <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="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>
-                        </vbox>
-                    </widget>
                     <widget class="QLabel" row="0" column="0">
                         <property name="name">
                             <cstring>textLabel1</cstring>
@@ -184,12 +130,7 @@
                             <string>&lt;u&gt;&lt;font size="+1"&gt;Valeur(s) actuelle(s)&lt;/font&gt;&lt;/u&gt;</string>
                         </property>
                     </widget>
-                    <widget class="QListBox" row="1" column="0" rowspan="3" colspan="1">
-                        <property name="name">
-                            <cstring>LBValeurs</cstring>
-                        </property>
-                    </widget>
-                    <spacer row="3" column="1" rowspan="1" colspan="2">
+                    <spacer row="4" column="1" rowspan="1" colspan="2">
                         <property name="name">
                             <cstring>spacer5</cstring>
                         </property>
@@ -206,7 +147,7 @@
                             </size>
                         </property>
                     </spacer>
-                    <widget class="QLayoutWidget" row="3" column="3">
+                    <widget class="QLayoutWidget" row="3" column="3" rowspan="2" colspan="1">
                         <property name="name">
                             <cstring>layout6</cstring>
                         </property>
@@ -250,23 +191,6 @@
                             </widget>
                         </vbox>
                     </widget>
-                    <spacer row="2" column="3">
-                        <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>131</height>
-                            </size>
-                        </property>
-                    </spacer>
                     <widget class="QLayoutWidget" row="1" column="2" rowspan="1" colspan="2">
                         <property name="name">
                             <cstring>layout19</cstring>
@@ -331,6 +255,128 @@
                             </widget>
                         </vbox>
                     </widget>
+                    <widget class="QListBox" row="1" column="0" rowspan="4" colspan="1">
+                        <property name="name">
+                            <cstring>LBValeurs</cstring>
+                        </property>
+                    </widget>
+                    <spacer row="2" column="3">
+                        <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>131</height>
+                            </size>
+                        </property>
+                    </spacer>
+                    <widget class="QLayoutWidget" row="0" column="1" rowspan="4" colspan="1">
+                        <property name="name">
+                            <cstring>layout8</cstring>
+                        </property>
+                        <vbox>
+                            <property name="name">
+                                <cstring>unnamed</cstring>
+                            </property>
+                            <spacer>
+                                <property name="name">
+                                    <cstring>spacer5_2</cstring>
+                                </property>
+                                <property name="orientation">
+                                    <enum>Vertical</enum>
+                                </property>
+                                <property name="sizeType">
+                                    <enum>Expanding</enum>
+                                </property>
+                                <property name="sizeHint">
+                                    <size>
+                                        <width>20</width>
+                                        <height>31</height>
+                                    </size>
+                                </property>
+                            </spacer>
+                            <widget class="QToolButton">
+                                <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>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="QToolButton">
+                                <property name="name">
+                                    <cstring>BSup1Val</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>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>enleve l occurence selectionnee</string>
+                                </property>
+                            </widget>
+                            <spacer>
+                                <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>
+                        </vbox>
+                    </widget>
                 </grid>
             </widget>
         </widget>
@@ -338,10 +384,10 @@
 </widget>
 <images>
     <image name="image0">
-        <data format="PNG" length="264">89504e470d0a1a0a0000000d49484452000000210000000e0806000000a11e758c000000cf49444154388dd594db0ec3200c43edfdf8d897bb0f345b480845d51eb64888f412e76001c00f046fd6e99bba77200480924a1032c92efbd8c7d5cabcc025400099e957849568fe7f06c0ded1deb32b4a1ec4ea824b9e74097165bd01f85527f78a7201e0a3129f345a017c543bafdc983d0f7109d15a331b471f47072c17494a82338f6178203a8817e67306b1f08b07ba03e602c9b831077e37e0209e67e3386710977b17de80c185ad38695a51d522c82ce77912e2fed8be83762092f52b1820dd11bb10e565b53a5a3bbaff130713d66fa6981857060000000049454e44ae426082</data>
+        <data format="PNG" length="256">89504e470d0a1a0a0000000d49484452000000210000000e0806000000a11e758c000000c749444154388dcd94590ec3200c4471d57bc73df9f407d331b159a228aa254448bc3cc68152fec0e4420ceeceb912e08a0239838848f5df02c99c11f86004300119054ae868c56ac206c06b4b109111c802874f3a52a587757123897e4039c46b50d8865b07f5400a450053330893cf8674a30028d492deef04626b559dfe48ac842b1a6daae6850155033b99c5009f70ceda111aab413b6f6a70d118e008e6fd8bc51d5d00a0f614556d1ff9b9be4952aabc3721f8f8b6f624c557ef8947afedf48c5e60b8dfbeb81d6dab9aff99270000000049454e44ae426082</data>
     </image>
     <image name="image1">
-        <data format="PNG" length="256">89504e470d0a1a0a0000000d49484452000000210000000e0806000000a11e758c000000c749444154388dcd94590ec3200c4471d57bc73df9f407d331b159a228aa254448bc3cc68152fec0e4420ceeceb912e08a0239838848f5df02c99c11f86004300119054ae868c56ac206c06b4b109111c802874f3a52a587757123897e4039c46b50d8865b07f5400a450053330893cf8674a30028d492deef04626b559dfe48ac842b1a6daae6850155033b99c5009f70ceda111aab413b6f6a70d118e008e6fd8bc51d5d00a0f614556d1ff9b9be4952aabc3721f8f8b6f624c557ef8947afedf48c5e60b8dfbeb81d6dab9aff99270000000049454e44ae426082</data>
+        <data format="PNG" length="264">89504e470d0a1a0a0000000d49484452000000210000000e0806000000a11e758c000000cf49444154388dd594db0ec3200c43edfdf8d897bb0f345b480845d51eb64888f412e76001c00f046fd6e99bba77200480924a1032c92efbd8c7d5cabcc025400099e957849568fe7f06c0ded1deb32b4a1ec4ea824b9e74097165bd01f85527f78a7201e0a3129f345a017c543bafdc983d0f7109d15a331b471f47072c17494a82338f6178203a8817e67306b1f08b07ba03e602c9b831077e37e0209e67e3386710977b17de80c185ad38695a51d522c82ce77912e2fed8be83762092f52b1820dd11bb10e565b53a5a3bbaff130713d66fa6981857060000000049454e44ae426082</data>
     </image>
 </images>
 <connections>

diff --git a/Ui/desPlusieursInto.py b/Ui/desPlusieursInto.py
index 410391b1762f43abf85031115de6ba7bd4818f75..31cb6b46108c80f017a53d08695f95992640f60f 100644 (file)
--- a/Ui/desPlusieursInto.py
+++ b/Ui/desPlusieursInto.py
@@ -2,7 +2,7 @@
 
 # Form implementation generated from reading ui file 'desPlusieursInto.ui'
 #
-# Created: mer nov 14 11:57:47 2007
+# Created: lun nov 19 11:09:04 2007
 #      by: The PyQt User Interface Compiler (pyuic) 3.13
 #
 # WARNING! All changes made in this file will be lost!
@@ -11,29 +11,6 @@
 from qt import *
 
 image0_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"
-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" \
@@ -56,6 +33,29 @@ image1_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"
+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"
 
 class DPlusInto(QWidget):
     def __init__(self,parent = None,name = None,fl = 0):
@@ -79,7 +79,7 @@ class DPlusInto(QWidget):
 
         self.Commentaire = QLabel(self.Widget8,"Commentaire")
 
-        Widget8Layout.addMultiCellWidget(self.Commentaire,2,2,0,1)
+        Widget8Layout.addMultiCellWidget(self.Commentaire,2,2,0,3)
 
         layout1 = QHBoxLayout(None,0,6,"layout1")
 
@@ -96,44 +96,43 @@ class DPlusInto(QWidget):
         self.bSup.setAutoDefault(1)
         layout1.addWidget(self.bSup)
 
-        Widget8Layout.addMultiCellLayout(layout1,3,3,0,1)
+        Widget8Layout.addMultiCellLayout(layout1,3,3,0,3)
 
         self.textLabel1_2 = QLabel(self.Widget8,"textLabel1_2")
 
-        Widget8Layout.addWidget(self.textLabel1_2,0,1)
+        Widget8Layout.addMultiCellWidget(self.textLabel1_2,0,0,2,3)
 
         self.textLabel1 = QLabel(self.Widget8,"textLabel1")
 
-        Widget8Layout.addWidget(self.textLabel1,0,0)
-
-        layout6 = QHBoxLayout(None,0,6,"layout6")
+        Widget8Layout.addMultiCellWidget(self.textLabel1,0,0,0,1)
 
         self.LBValeurs = QListBox(self.Widget8,"LBValeurs")
-        layout6.addWidget(self.LBValeurs)
 
-        layout5 = QVBoxLayout(None,0,6,"layout5")
-        spacer2 = QSpacerItem(21,31,QSizePolicy.Minimum,QSizePolicy.Expanding)
-        layout5.addItem(spacer2)
+        Widget8Layout.addWidget(self.LBValeurs,1,0)
 
-        self.BSup1Val = QToolButton(self.Widget8,"BSup1Val")
-        self.BSup1Val.setMinimumSize(QSize(40,31))
-        self.BSup1Val.setMaximumSize(QSize(40,31))
-        self.BSup1Val.setIconSet(QIconSet(self.image0))
-        layout5.addWidget(self.BSup1Val)
+        self.listBoxVal = QListBox(self.Widget8,"listBoxVal")
+
+        Widget8Layout.addWidget(self.listBoxVal,1,3)
+
+        layout4 = QVBoxLayout(None,0,6,"layout4")
+        spacer2 = QSpacerItem(21,72,QSizePolicy.Minimum,QSizePolicy.Expanding)
+        layout4.addItem(spacer2)
 
         self.BAjout1Val = QToolButton(self.Widget8,"BAjout1Val")
         self.BAjout1Val.setMinimumSize(QSize(40,31))
         self.BAjout1Val.setMaximumSize(QSize(40,31))
-        self.BAjout1Val.setIconSet(QIconSet(self.image1))
-        layout5.addWidget(self.BAjout1Val)
-        spacer3 = QSpacerItem(21,181,QSizePolicy.Minimum,QSizePolicy.Expanding)
-        layout5.addItem(spacer3)
-        layout6.addLayout(layout5)
+        self.BAjout1Val.setIconSet(QIconSet(self.image0))
+        layout4.addWidget(self.BAjout1Val)
 
-        self.listBoxVal = QListBox(self.Widget8,"listBoxVal")
-        layout6.addWidget(self.listBoxVal)
+        self.BSup1Val = QToolButton(self.Widget8,"BSup1Val")
+        self.BSup1Val.setMinimumSize(QSize(40,31))
+        self.BSup1Val.setMaximumSize(QSize(40,31))
+        self.BSup1Val.setIconSet(QIconSet(self.image1))
+        layout4.addWidget(self.BSup1Val)
+        spacer3 = QSpacerItem(21,181,QSizePolicy.Minimum,QSizePolicy.Expanding)
+        layout4.addItem(spacer3)
 
-        Widget8Layout.addMultiCellLayout(layout6,1,1,0,1)
+        Widget8Layout.addMultiCellLayout(layout4,1,1,1,2)
         self.tabuniqueinto.insertTab(self.Widget8,QString(""))
 
         DPlusIntoLayout.addWidget(self.tabuniqueinto,0,0)
@@ -165,10 +164,10 @@ class DPlusInto(QWidget):
         QToolTip.add(self.bSup,self.__tr("suppression du mot clef"))
         self.textLabel1_2.setText(self.__tr("<u><font size=\"+1\">Valeur(s) possibles(s)</font></u>"))
         self.textLabel1.setText(self.__tr("<u><font size=\"+1\">Valeur(s) actuelle(s)</font></u>"))
-        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.BSup1Val.setText(QString.null)
+        QToolTip.add(self.BSup1Val,self.__tr("enleve l occurence selectionnee"))
         self.tabuniqueinto.changeTab(self.Widget8,self.__tr("Saisir Valeur"))
 
 

diff --git a/Ui/desPlusieursInto.ui b/Ui/desPlusieursInto.ui
index 1accb3640abffd09ac9abc4b17a4d4378317cd07..7fd9c3fce81beafb0268d9d203f6b3a27d0de512 100644 (file)
--- a/Ui/desPlusieursInto.ui
+++ b/Ui/desPlusieursInto.ui
@@ -112,14 +112,6 @@
                             </widget>
                         </hbox>
                     </widget>
-                    <widget class="QLabel" row="0" column="2" rowspan="1" colspan="2">
-                        <property name="name">
-                            <cstring>textLabel1_2</cstring>
-                        </property>
-                        <property name="text">
-                            <string>&lt;u&gt;&lt;font size="+1"&gt;Valeur(s) possibles(s)&lt;/font&gt;&lt;/u&gt;</string>
-                        </property>
-                    </widget>
                     <widget class="QLabel" row="0" column="0" rowspan="1" colspan="2">
                         <property name="name">
                             <cstring>textLabel1</cstring>
@@ -138,9 +130,17 @@
                             <cstring>listBoxVal</cstring>
                         </property>
                     </widget>
+                    <widget class="QLabel" row="0" column="2" rowspan="1" colspan="2">
+                        <property name="name">
+                            <cstring>textLabel1_2</cstring>
+                        </property>
+                        <property name="text">
+                            <string>&lt;u&gt;&lt;font size="+1"&gt;Valeur(s) possibles(s)&lt;/font&gt;&lt;/u&gt;</string>
+                        </property>
+                    </widget>
                     <widget class="QLayoutWidget" row="1" column="1" rowspan="1" colspan="2">
                         <property name="name">
-                            <cstring>layout4</cstring>
+                            <cstring>layout3</cstring>
                         </property>
                         <vbox>
                             <property name="name">
@@ -159,13 +159,13 @@
                                 <property name="sizeHint">
                                     <size>
                                         <width>21</width>
-                                        <height>72</height>
+                                        <height>50</height>
                                     </size>
                                 </property>
                             </spacer>
                             <widget class="QToolButton">
                                 <property name="name">
-                                    <cstring>BAjout1Val</cstring>
+                                    <cstring>BSup1Val</cstring>
                                 </property>
                                 <property name="minimumSize">
                                     <size>
@@ -186,12 +186,12 @@
                                     <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>
+                                    <string>enleve l occurence selectionnee</string>
                                 </property>
                             </widget>
                             <widget class="QToolButton">
                                 <property name="name">
-                                    <cstring>BSup1Val</cstring>
+                                    <cstring>BAjout1Val</cstring>
                                 </property>
                                 <property name="minimumSize">
                                     <size>
@@ -212,7 +212,7 @@
                                     <iconset>image1</iconset>
                                 </property>
                                 <property name="toolTip" stdset="0">
-                                    <string>enleve l occurence selectionnee</string>
+                                    <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>
                             <spacer>
@@ -241,10 +241,10 @@
 </widget>
 <images>
     <image name="image0">
-        <data format="PNG" length="256">89504e470d0a1a0a0000000d49484452000000210000000e0806000000a11e758c000000c749444154388dcd94590ec3200c4471d57bc73df9f407d331b159a228aa254448bc3cc68152fec0e4420ceeceb912e08a0239838848f5df02c99c11f86004300119054ae868c56ac206c06b4b109111c802874f3a52a587757123897e4039c46b50d8865b07f5400a450053330893cf8674a30028d492deef04626b559dfe48ac842b1a6daae6850155033b99c5009f70ceda111aab413b6f6a70d118e008e6fd8bc51d5d00a0f614556d1ff9b9be4952aabc3721f8f8b6f624c557ef8947afedf48c5e60b8dfbeb81d6dab9aff99270000000049454e44ae426082</data>
+        <data format="PNG" length="264">89504e470d0a1a0a0000000d49484452000000210000000e0806000000a11e758c000000cf49444154388dd594db0ec3200c43edfdf8d897bb0f345b480845d51eb64888f412e76001c00f046fd6e99bba77200480924a1032c92efbd8c7d5cabcc025400099e957849568fe7f06c0ded1deb32b4a1ec4ea824b9e74097165bd01f85527f78a7201e0a3129f345a017c543bafdc983d0f7109d15a331b471f47072c17494a82338f6178203a8817e67306b1f08b07ba03e602c9b831077e37e0209e67e3386710977b17de80c185ad38695a51d522c82ce77912e2fed8be83762092f52b1820dd11bb10e565b53a5a3bbaff130713d66fa6981857060000000049454e44ae426082</data>
     </image>
     <image name="image1">
-        <data format="PNG" length="264">89504e470d0a1a0a0000000d49484452000000210000000e0806000000a11e758c000000cf49444154388dd594db0ec3200c43edfdf8d897bb0f345b480845d51eb64888f412e76001c00f046fd6e99bba77200480924a1032c92efbd8c7d5cabcc025400099e957849568fe7f06c0ded1deb32b4a1ec4ea824b9e74097165bd01f85527f78a7201e0a3129f345a017c543bafdc983d0f7109d15a331b471f47072c17494a82338f6178203a8817e67306b1f08b07ba03e602c9b831077e37e0209e67e3386710977b17de80c185ad38695a51d522c82ce77912e2fed8be83762092f52b1820dd11bb10e565b53a5a3bbaff130713d66fa6981857060000000049454e44ae426082</data>
+        <data format="PNG" length="256">89504e470d0a1a0a0000000d49484452000000210000000e0806000000a11e758c000000c749444154388dcd94590ec3200c4471d57bc73df9f407d331b159a228aa254448bc3cc68152fec0e4420ceeceb912e08a0239838848f5df02c99c11f86004300119054ae868c56ac206c06b4b109111c802874f3a52a587757123897e4039c46b50d8865b07f5400a450053330893cf8674a30028d492deef04626b559dfe48ac842b1a6daae6850155033b99c5009f70ceda111aab413b6f6a70d118e008e6fd8bc51d5d00a0f614556d1ff9b9be4952aabc3721f8f8b6f624c557ef8947afedf48c5e60b8dfbeb81d6dab9aff99270000000049454e44ae426082</data>
     </image>
 </images>
 <connections>

diff --git a/Ui/desRacine.py b/Ui/desRacine.py
index 5593f11536b847ac06647136b741e9cf53a2d881..e07f042c599fb2ec8193ed00bcb83229131b4b1c 100644 (file)
--- a/Ui/desRacine.py
+++ b/Ui/desRacine.py
@@ -2,7 +2,7 @@
 
 # Form implementation generated from reading ui file 'desRacine.ui'
 #
-# Created: mer nov 14 11:57:47 2007
+# Created: lun nov 19 11:09:04 2007
 #      by: The PyQt User Interface Compiler (pyuic) 3.13
 #
 # WARNING! All changes made in this file will be lost!

diff --git a/Ui/desSelectVal.py b/Ui/desSelectVal.py
index e48ad64241c288953abb75bf8f683b18646b8387..c28d39d660446e4fab6cb581011c085bf6834716 100644 (file)
--- a/Ui/desSelectVal.py
+++ b/Ui/desSelectVal.py
@@ -2,7 +2,7 @@
 
 # Form implementation generated from reading ui file 'desSelectVal.ui'
 #
-# Created: mer nov 14 11:57:47 2007
+# Created: lun nov 19 11:09:04 2007
 #      by: The PyQt User Interface Compiler (pyuic) 3.13
 #
 # WARNING! All changes made in this file will be lost!

diff --git a/Ui/desUniqueASSD.py b/Ui/desUniqueASSD.py
index 4c77a0c624207e9b6322a57337fe62627427e1b6..831998ab38405a82a4b8fd6392947a4ae9f5ea78 100644 (file)
--- a/Ui/desUniqueASSD.py
+++ b/Ui/desUniqueASSD.py
@@ -2,7 +2,7 @@
 
 # Form implementation generated from reading ui file 'desUniqueASSD.ui'
 #
-# Created: mer nov 14 11:57:47 2007
+# Created: lun nov 19 11:09:04 2007
 #      by: The PyQt User Interface Compiler (pyuic) 3.13
 #
 # WARNING! All changes made in this file will be lost!

diff --git a/Ui/desUniqueBase.py b/Ui/desUniqueBase.py
index c018186221c566e990dc857acc84cf869013a941..687530f68fd8b7d028e184c7bdbaad2e132b25f8 100644 (file)
--- a/Ui/desUniqueBase.py
+++ b/Ui/desUniqueBase.py
@@ -2,7 +2,7 @@
 
 # Form implementation generated from reading ui file 'desUniqueBase.ui'
 #
-# Created: mer nov 14 11:57:47 2007
+# Created: lun nov 19 11:09:04 2007
 #      by: The PyQt User Interface Compiler (pyuic) 3.13
 #
 # WARNING! All changes made in this file will be lost!

diff --git a/Ui/desUniqueComp.py b/Ui/desUniqueComp.py
index 9bdb94e5264c929978d883a0d493bd6d9052bfce..38100e18b203313cf098095bf53f5cff4bbe39a5 100644 (file)
--- a/Ui/desUniqueComp.py
+++ b/Ui/desUniqueComp.py
@@ -2,7 +2,7 @@
 
 # Form implementation generated from reading ui file 'desUniqueComp.ui'
 #
-# Created: mer nov 14 11:57:47 2007
+# Created: lun nov 19 11:09:05 2007
 #      by: The PyQt User Interface Compiler (pyuic) 3.13
 #
 # WARNING! All changes made in this file will be lost!

diff --git a/Ui/desUniqueInto.py b/Ui/desUniqueInto.py
index d49a498061a0138ab7419a8ccc8f8aa9088322b7..e1fc77c70629d1d8d1a517382e8c2263d066f66e 100644 (file)
--- a/Ui/desUniqueInto.py
+++ b/Ui/desUniqueInto.py
@@ -2,7 +2,7 @@
 
 # Form implementation generated from reading ui file 'desUniqueInto.ui'
 #
-# Created: mer nov 14 11:57:47 2007
+# Created: lun nov 19 11:16:55 2007
 #      by: The PyQt User Interface Compiler (pyuic) 3.13
 #
 # WARNING! All changes made in this file will be lost!

diff --git a/Ui/desUniqueSDCO.py b/Ui/desUniqueSDCO.py
index 5179902121eb76dffbcee7b5d7633ecec6749937..5cb47ac10b47511da311ea490a543f7334a0ce71 100644 (file)
--- a/Ui/desUniqueSDCO.py
+++ b/Ui/desUniqueSDCO.py
@@ -2,7 +2,7 @@
 
 # Form implementation generated from reading ui file 'desUniqueSDCO.ui'
 #
-# Created: mer nov 14 11:57:48 2007
+# Created: lun nov 19 11:09:05 2007
 #      by: The PyQt User Interface Compiler (pyuic) 3.13
 #
 # WARNING! All changes made in this file will be lost!

diff --git a/Ui/desUniqueSDCOInto.py b/Ui/desUniqueSDCOInto.py
index 6561f5b5c5585a4845a1eeee6cafab975f681a33..51cdee7ca7d839451dc85ad8439936b0fc7d82f3 100644 (file)
--- a/Ui/desUniqueSDCOInto.py
+++ b/Ui/desUniqueSDCOInto.py
@@ -2,7 +2,7 @@
 
 # Form implementation generated from reading ui file 'desUniqueSDCOInto.ui'
 #
-# Created: mer nov 14 11:57:47 2007
+# Created: lun nov 19 11:09:05 2007
 #      by: The PyQt User Interface Compiler (pyuic) 3.13
 #
 # WARNING! All changes made in this file will be lost!

diff --git a/Ui/desVisu.py b/Ui/desVisu.py
index b4d80a14cb58694a62790b54494011a5a82f456d..17cb44bd256574a97026ab35ffdc1f8d28f2e26e 100644 (file)
--- a/Ui/desVisu.py
+++ b/Ui/desVisu.py
@@ -2,7 +2,7 @@
 
 # Form implementation generated from reading ui file 'desVisu.ui'
 #
-# Created: mer nov 14 11:57:48 2007
+# Created: lun nov 19 11:09:05 2007
 #      by: The PyQt User Interface Compiler (pyuic) 3.13
 #
 # WARNING! All changes made in this file will be lost!

diff --git a/Ui/myMain.py b/Ui/myMain.py
index d675f50fe97db6c361a68292040b2f26f8cc7034..5a0c5f8b027932f87c278218e9a141d42aed2fcc 100644 (file)
--- a/Ui/myMain.py
+++ b/Ui/myMain.py
@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 
-# Form implementation generated from reading ui file 'myMain.ui'
+# Form implementation generated from reading ui file '../Ui/myMain.ui'
 #
-# Created: mer nov 14 11:57:48 2007
+# Created: lun nov 19 16:49:43 2007
 #      by: The PyQt User Interface Compiler (pyuic) 3.13
 #
 # WARNING! All changes made in this file will be lost!
@@ -279,9 +279,9 @@ class Eficas(QMainWindow):
         self.editCopyAction.setIconSet(QIconSet(self.image6))
         self.editPasteAction = QAction(self,"editPasteAction")
         self.editPasteAction.setIconSet(QIconSet(self.image7))
-        self.editFindAction = QAction(self,"editFindAction")
-        self.editFindAction.setEnabled(0)
-        self.editFindAction.setIconSet(QIconSet(self.image8))
+        self.jdcFichierResultatAction = QAction(self,"jdcFichierResultatAction")
+        self.jdcFichierResultatAction.setEnabled(1)
+        self.jdcFichierResultatAction.setIconSet(QIconSet(self.image8))
         self.helpContentsAction = QAction(self,"helpContentsAction")
         self.helpIndexAction = QAction(self,"helpIndexAction")
         self.helpAboutAction = QAction(self,"helpAboutAction")
@@ -306,7 +306,7 @@ class Eficas(QMainWindow):
         self.fileSaveAsAction.addTo(self.toolBar)
         self.editCutAction.addTo(self.toolBar)
         self.editPasteAction.addTo(self.toolBar)
-        self.editFindAction.addTo(self.toolBar)
+        self.jdcFichierResultatAction.addTo(self.toolBar)
         self.fileExitAction.addTo(self.toolBar)
         self.toolBar.addSeparator()
 
@@ -333,13 +333,12 @@ class Eficas(QMainWindow):
         self.editCutAction.addTo(self.Edition)
         self.editCopyAction.addTo(self.Edition)
         self.editPasteAction.addTo(self.Edition)
-        self.Edition.insertSeparator()
-        self.editFindAction.addTo(self.Edition)
         self.MenuBar.insertItem(QString(""),self.Edition,3)
 
         self.JdC = QPopupMenu(self)
         self.jdcRapportDeValidationAction.addTo(self.JdC)
         self.jdcFichierSourceAction.addTo(self.JdC)
+        self.jdcFichierResultatAction.addTo(self.JdC)
         self.MenuBar.insertItem(QString(""),self.JdC,4)
 
         self.Options = QPopupMenu(self)
@@ -370,7 +369,7 @@ class Eficas(QMainWindow):
         self.connect(self.editRedoAction,SIGNAL("activated()"),self.editRedo)
         self.connect(self.editCutAction,SIGNAL("activated()"),self.editCut)
         self.connect(self.editPasteAction,SIGNAL("activated()"),self.editPaste)
-        self.connect(self.editFindAction,SIGNAL("activated()"),self.editFind)
+        self.connect(self.jdcFichierResultatAction,SIGNAL("activated()"),self.visuJdcPy)
         self.connect(self.helpIndexAction,SIGNAL("activated()"),self.helpIndex)
         self.connect(self.helpContentsAction,SIGNAL("activated()"),self.helpContents)
         self.connect(self.helpAboutAction,SIGNAL("activated()"),self.helpAbout)
@@ -415,9 +414,9 @@ class Eficas(QMainWindow):
         self.editPasteAction.setText(self.__tr("Coller"))
         self.editPasteAction.setMenuText(self.__tr("&Coller"))
         self.editPasteAction.setAccel(self.__tr("Ctrl+V"))
-        self.editFindAction.setText(self.__tr("Find"))
-        self.editFindAction.setMenuText(self.__tr("&Find..."))
-        self.editFindAction.setAccel(self.__tr("Ctrl+F"))
+        self.jdcFichierResultatAction.setText(self.__tr("Fichier Resultat"))
+        self.jdcFichierResultatAction.setMenuText(self.__tr("Fichier Resultat"))
+        self.jdcFichierResultatAction.setAccel(self.__tr("Ctrl+F"))
         self.helpContentsAction.setText(self.__tr("Contents"))
         self.helpContentsAction.setMenuText(self.__tr("&Contents..."))
         self.helpContentsAction.setAccel(QString.null)
@@ -493,8 +492,8 @@ class Eficas(QMainWindow):
     def editPaste(self):
         print "Eficas.editPaste(): Not implemented yet"
 
-    def editFind(self):
-        print "Eficas.editFind(): Not implemented yet"
+    def visuJdcPy(self):
+        print "Eficas.visuJdcPy(): Not implemented yet"
 
     def helpIndex(self):
         print "Eficas.helpIndex(): Not implemented yet"

diff --git a/Ui/myMain.ui b/Ui/myMain.ui
index 464ff855f355efcdbf269a7a7cc86eebaafaa575..1450677c8ac80366b25e5383a001d48c7cf65c11 100644 (file)
--- a/Ui/myMain.ui
+++ b/Ui/myMain.ui
@@ -86,12 +86,11 @@
         <action name="editCutAction"/>
         <action name="editCopyAction"/>
         <action name="editPasteAction"/>
-        <separator/>
-        <action name="editFindAction"/>
     </item>
     <item text="JdC" name="JdC">
         <action name="jdcRapportDeValidationAction"/>
         <action name="jdcFichierSourceAction"/>
+        <action name="jdcFichierResultatAction"/>
     </item>
     <item text="Options" name="Options">
     </item>
@@ -123,7 +122,7 @@
         <action name="fileSaveAsAction"/>
         <action name="editCutAction"/>
         <action name="editPasteAction"/>
-        <action name="editFindAction"/>
+        <action name="jdcFichierResultatAction"/>
         <action name="fileExitAction"/>
         <separator/>
     </toolbar>
@@ -301,19 +300,19 @@
     </action>
     <action>
         <property name="name">
-            <cstring>editFindAction</cstring>
+            <cstring>jdcFichierResultatAction</cstring>
         </property>
         <property name="enabled">
-            <bool>false</bool>
+            <bool>true</bool>
         </property>
         <property name="iconSet">
             <iconset>image8</iconset>
         </property>
         <property name="text">
-            <string>Find</string>
+            <string>Fichier Resultat</string>
         </property>
         <property name="menuText">
-            <string>&amp;Find...</string>
+            <string>Fichier Resultat</string>
         </property>
         <property name="accel">
             <string>Ctrl+F</string>
@@ -536,10 +535,10 @@
         <slot>editPaste()</slot>
     </connection>
     <connection>
-        <sender>editFindAction</sender>
+        <sender>jdcFichierResultatAction</sender>
         <signal>activated()</signal>
         <receiver>Eficas</receiver>
-        <slot>editFind()</slot>
+        <slot>visuJdcPy()</slot>
     </connection>
     <connection>
         <sender>helpIndexAction</sender>
@@ -614,7 +613,7 @@
     <slot>jdcFichierSource()</slot>
     <slot>fileNewView()</slot>
     <slot>editPaste()</slot>
-    <slot>editFind()</slot>
+    <slot>visuJdcPy()</slot>
     <slot>helpIndex()</slot>
     <slot>helpContents()</slot>
     <slot>helpAbout()</slot>