From: Pascale Noyret Date: Tue, 27 Nov 2007 14:04:36 +0000 (+0000) Subject: *** empty log message *** X-Git-Tag: V1_13b2 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=1233ffdef756df115a8c4683aaa1cb9b423a6d0f;p=tools%2Feficas.git *** empty log message *** --- diff --git a/InterfaceQT/compobloc.py b/InterfaceQT/compobloc.py index ff386c51..7c8b844d 100644 --- 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 fda1ab4e..d007b3be 100644 --- 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 c28756a9..153f2b71 100644 --- 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 26f97a77..bf440576 100644 --- 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 196218a6..6f3bd9dd 100644 --- 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 288e4bec..1cd49081 100644 --- 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 57135842..989399c6 100644 --- 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 6a3102a0..e07d05ae 100644 --- 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 37b38b7f..866d585e 100644 --- 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 f078cd8c..725e7f19 100644 --- 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 cef01b24..64a78585 100644 --- 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 c128496a..ffbfdf03 100644 --- 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 df6266f0..18b12d34 100644 --- 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 55828070..e038fd7f 100644 --- 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 07543d5e..cd668855 100644 --- 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 2c8c7dd5..0e90aa8e 100644 --- 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 813f344a..e3785743 100644 --- 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 ade9f8c9..50108524 100644 --- 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 eb9feae8..edfd2e68 100644 --- a/InterfaceTK/bureau.py +++ b/InterfaceTK/bureau.py @@ -76,7 +76,7 @@ class BUREAU: ] ), ('Aide',[ - ('Aide EFICAS','aideEFICAS'), + ('Aide EFICAS','aideEFICAS','','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 171e3222..3ce6d9dc 100644 --- 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 dea29549..c9dadb32 100644 --- 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 8b756d74..55663932 100644 --- 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 915f0306..ff80b3c0 100644 --- 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 a998b79c..02c437bf 100644 --- 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 5cdcfb1a..fbed12f6 100644 --- 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 68750294..3fc31854 100644 --- 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 e1ea6a0b..41050c7e 100644 --- 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 e9fe0096..b50723a6 100644 --- 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 1c3f081f..402ad029 100644 --- 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 6e86c7a6..6ff292e3 100644 --- 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 5e38c0b3..5e95eacb 100644 --- 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("Valeur(s) actuelle(s)")) 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("Valeur")) + 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 27e6802f..0b5e5992 100644 --- a/Ui/desPlusieursBase.ui +++ b/Ui/desPlusieursBase.ui @@ -40,7 +40,7 @@ unnamed - + layout3 @@ -122,60 +122,6 @@ - - - layout8 - - - - unnamed - - - - BSup1Val - - - - 0 - 0 - 0 - 0 - - - - - - - image0 - - - enleve l occurence selectionnee - - - - - BAjout1Val - - - - 0 - 0 - 0 - 0 - - - - - - - image1 - - - ajoute la valeur saisie sous l occurence selectionnée (en fin de liste si il n y a pas de selection) - - - - textLabel1 @@ -184,12 +130,7 @@ <u><font size="+1">Valeur(s) actuelle(s)</font></u> - - - LBValeurs - - - + spacer5 @@ -206,7 +147,7 @@ - + layout6 @@ -250,23 +191,6 @@ - - - spacer3 - - - Vertical - - - Expanding - - - - 31 - 131 - - - layout19 @@ -331,6 +255,128 @@ + + + LBValeurs + + + + + spacer3 + + + Vertical + + + Expanding + + + + 31 + 131 + + + + + + layout8 + + + + unnamed + + + + spacer5_2 + + + Vertical + + + Expanding + + + + 20 + 31 + + + + + + BAjout1Val + + + + 0 + 0 + 0 + 0 + + + + + 40 + 30 + + + + + + + image0 + + + ajoute la valeur saisie sous l occurence selectionnée (en fin de liste si il n y a pas de selection) + + + + + BSup1Val + + + + 0 + 0 + 0 + 0 + + + + + 40 + 30 + + + + + + + image1 + + + enleve l occurence selectionnee + + + + + spacer4 + + + Vertical + + + Expanding + + + + 21 + 231 + + + + + @@ -338,10 +384,10 @@ - 89504e470d0a1a0a0000000d49484452000000210000000e0806000000a11e758c000000cf49444154388dd594db0ec3200c43edfdf8d897bb0f345b480845d51eb64888f412e76001c00f046fd6e99bba77200480924a1032c92efbd8c7d5cabcc025400099e957849568fe7f06c0ded1deb32b4a1ec4ea824b9e74097165bd01f85527f78a7201e0a3129f345a017c543bafdc983d0f7109d15a331b471f47072c17494a82338f6178203a8817e67306b1f08b07ba03e602c9b831077e37e0209e67e3386710977b17de80c185ad38695a51d522c82ce77912e2fed8be83762092f52b1820dd11bb10e565b53a5a3bbaff130713d66fa6981857060000000049454e44ae426082 + 89504e470d0a1a0a0000000d49484452000000210000000e0806000000a11e758c000000c749444154388dcd94590ec3200c4471d57bc73df9f407d331b159a228aa254448bc3cc68152fec0e4420ceeceb912e08a0239838848f5df02c99c11f86004300119054ae868c56ac206c06b4b109111c802874f3a52a587757123897e4039c46b50d8865b07f5400a450053330893cf8674a30028d492deef04626b559dfe48ac842b1a6daae6850155033b99c5009f70ceda111aab413b6f6a70d118e008e6fd8bc51d5d00a0f614556d1ff9b9be4952aabc3721f8f8b6f624c557ef8947afedf48c5e60b8dfbeb81d6dab9aff99270000000049454e44ae426082 - 89504e470d0a1a0a0000000d49484452000000210000000e0806000000a11e758c000000c749444154388dcd94590ec3200c4471d57bc73df9f407d331b159a228aa254448bc3cc68152fec0e4420ceeceb912e08a0239838848f5df02c99c11f86004300119054ae868c56ac206c06b4b109111c802874f3a52a587757123897e4039c46b50d8865b07f5400a450053330893cf8674a30028d492deef04626b559dfe48ac842b1a6daae6850155033b99c5009f70ceda111aab413b6f6a70d118e008e6fd8bc51d5d00a0f614556d1ff9b9be4952aabc3721f8f8b6f624c557ef8947afedf48c5e60b8dfbeb81d6dab9aff99270000000049454e44ae426082 + 89504e470d0a1a0a0000000d49484452000000210000000e0806000000a11e758c000000cf49444154388dd594db0ec3200c43edfdf8d897bb0f345b480845d51eb64888f412e76001c00f046fd6e99bba77200480924a1032c92efbd8c7d5cabcc025400099e957849568fe7f06c0ded1deb32b4a1ec4ea824b9e74097165bd01f85527f78a7201e0a3129f345a017c543bafdc983d0f7109d15a331b471f47072c17494a82338f6178203a8817e67306b1f08b07ba03e602c9b831077e37e0209e67e3386710977b17de80c185ad38695a51d522c82ce77912e2fed8be83762092f52b1820dd11bb10e565b53a5a3bbaff130713d66fa6981857060000000049454e44ae426082 diff --git a/Ui/desPlusieursInto.py b/Ui/desPlusieursInto.py index 410391b1..31cb6b46 100644 --- 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("Valeur(s) possibles(s)")) self.textLabel1.setText(self.__tr("Valeur(s) actuelle(s)")) - 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 1accb364..7fd9c3fc 100644 --- a/Ui/desPlusieursInto.ui +++ b/Ui/desPlusieursInto.ui @@ -112,14 +112,6 @@ - - - textLabel1_2 - - - <u><font size="+1">Valeur(s) possibles(s)</font></u> - - textLabel1 @@ -138,9 +130,17 @@ listBoxVal + + + textLabel1_2 + + + <u><font size="+1">Valeur(s) possibles(s)</font></u> + + - layout4 + layout3 @@ -159,13 +159,13 @@ 21 - 72 + 50 - BAjout1Val + BSup1Val @@ -186,12 +186,12 @@ image0 - ajoute la valeur saisie sous l occurence selectionnée (en fin de liste si il n y a pas de selection) + enleve l occurence selectionnee - BSup1Val + BAjout1Val @@ -212,7 +212,7 @@ image1 - enleve l occurence selectionnee + ajoute la valeur saisie sous l occurence selectionnée (en fin de liste si il n y a pas de selection) @@ -241,10 +241,10 @@ - 89504e470d0a1a0a0000000d49484452000000210000000e0806000000a11e758c000000c749444154388dcd94590ec3200c4471d57bc73df9f407d331b159a228aa254448bc3cc68152fec0e4420ceeceb912e08a0239838848f5df02c99c11f86004300119054ae868c56ac206c06b4b109111c802874f3a52a587757123897e4039c46b50d8865b07f5400a450053330893cf8674a30028d492deef04626b559dfe48ac842b1a6daae6850155033b99c5009f70ceda111aab413b6f6a70d118e008e6fd8bc51d5d00a0f614556d1ff9b9be4952aabc3721f8f8b6f624c557ef8947afedf48c5e60b8dfbeb81d6dab9aff99270000000049454e44ae426082 + 89504e470d0a1a0a0000000d49484452000000210000000e0806000000a11e758c000000cf49444154388dd594db0ec3200c43edfdf8d897bb0f345b480845d51eb64888f412e76001c00f046fd6e99bba77200480924a1032c92efbd8c7d5cabcc025400099e957849568fe7f06c0ded1deb32b4a1ec4ea824b9e74097165bd01f85527f78a7201e0a3129f345a017c543bafdc983d0f7109d15a331b471f47072c17494a82338f6178203a8817e67306b1f08b07ba03e602c9b831077e37e0209e67e3386710977b17de80c185ad38695a51d522c82ce77912e2fed8be83762092f52b1820dd11bb10e565b53a5a3bbaff130713d66fa6981857060000000049454e44ae426082 - 89504e470d0a1a0a0000000d49484452000000210000000e0806000000a11e758c000000cf49444154388dd594db0ec3200c43edfdf8d897bb0f345b480845d51eb64888f412e76001c00f046fd6e99bba77200480924a1032c92efbd8c7d5cabcc025400099e957849568fe7f06c0ded1deb32b4a1ec4ea824b9e74097165bd01f85527f78a7201e0a3129f345a017c543bafdc983d0f7109d15a331b471f47072c17494a82338f6178203a8817e67306b1f08b07ba03e602c9b831077e37e0209e67e3386710977b17de80c185ad38695a51d522c82ce77912e2fed8be83762092f52b1820dd11bb10e565b53a5a3bbaff130713d66fa6981857060000000049454e44ae426082 + 89504e470d0a1a0a0000000d49484452000000210000000e0806000000a11e758c000000c749444154388dcd94590ec3200c4471d57bc73df9f407d331b159a228aa254448bc3cc68152fec0e4420ceeceb912e08a0239838848f5df02c99c11f86004300119054ae868c56ac206c06b4b109111c802874f3a52a587757123897e4039c46b50d8865b07f5400a450053330893cf8674a30028d492deef04626b559dfe48ac842b1a6daae6850155033b99c5009f70ceda111aab413b6f6a70d118e008e6fd8bc51d5d00a0f614556d1ff9b9be4952aabc3721f8f8b6f624c557ef8947afedf48c5e60b8dfbeb81d6dab9aff99270000000049454e44ae426082 diff --git a/Ui/desRacine.py b/Ui/desRacine.py index 5593f115..e07f042c 100644 --- 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 e48ad642..c28d39d6 100644 --- 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 4c77a0c6..831998ab 100644 --- 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 c0181862..687530f6 100644 --- 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 9bdb94e5..38100e18 100644 --- 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 d49a4980..e1fc77c7 100644 --- 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 51799021..5cb47ac1 100644 --- 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 6561f5b5..51cdee7c 100644 --- 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 b4d80a14..17cb44bd 100644 --- 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 d675f50f..5a0c5f8b 100644 --- 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 464ff855..1450677c 100644 --- a/Ui/myMain.ui +++ b/Ui/myMain.ui @@ -86,12 +86,11 @@ - - + @@ -123,7 +122,7 @@ - + @@ -301,19 +300,19 @@ - editFindAction + jdcFichierResultatAction - false + true image8 - Find + Fichier Resultat - &Find... + Fichier Resultat Ctrl+F @@ -536,10 +535,10 @@ editPaste() - editFindAction + jdcFichierResultatAction activated() Eficas - editFind() + visuJdcPy() helpIndexAction @@ -614,7 +613,7 @@ jdcFichierSource() fileNewView() editPaste() - editFind() + visuJdcPy() helpIndex() helpContents() helpAbout()