From: Pascale Noyret Date: Tue, 30 Oct 2007 14:51:43 +0000 (+0000) Subject: *** empty log message *** X-Git-Tag: V1_13b1~33 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=5f3db0f80e6a76f5e126c072d7c6e24ca24d2403;p=modules%2Feficas.git *** empty log message *** --- diff --git a/Ihm/I_MACRO_ETAPE.py b/Ihm/I_MACRO_ETAPE.py index 278922cf..7e58aa03 100644 --- a/Ihm/I_MACRO_ETAPE.py +++ b/Ihm/I_MACRO_ETAPE.py @@ -770,7 +770,6 @@ class MACRO_ETAPE(I_ETAPE.ETAPE): #print "make_include",unite # On supprime l'attribut unite qui bloque l'evaluation du source de l'INCLUDE # car on ne s'appuie pas sur lui dans EFICAS mais sur l'attribut fichier_ini - del self.unite # Si unite n'a pas de valeur, l'etape est forcement invalide. On peut retourner None if not unite : return diff --git a/InterfaceQT/browser.py b/InterfaceQT/browser.py index bb83b5b4..d9a10167 100644 --- a/InterfaceQT/browser.py +++ b/InterfaceQT/browser.py @@ -76,7 +76,6 @@ class JDCTree( QListView ): def update(self): """ Update tous les elements de l'arbre """ - print 'TREE update' for child in self.children: child.update() @@ -84,7 +83,7 @@ class JDCTree( QListView ): """Cette methode a pour but de mettre a jour la validite du noeud et de propager la demande de mise a jour a son parent """ - print 'TREE update_valid' + self.parent.update_valid() # type de noeud COMMENT = "COMMENTAIRE" diff --git a/InterfaceQT/compomacro.py b/InterfaceQT/compomacro.py index 79f2663b..57135842 100644 --- a/InterfaceQT/compomacro.py +++ b/InterfaceQT/compomacro.py @@ -38,9 +38,6 @@ class INCLUDETreeItemBase(MACROTreeItem): MACROTreeItem.__init__(self,appli, labeltext, object, setfunction) def iscopiable(self): - """ - Retourne 1 si l'objet est copiable, 0 sinon - """ return 0 @@ -65,11 +62,8 @@ class INCLUDENode(browser.JDCNode,typeNode.PopUpMenuNode): self.item.object.build_include(None,"") # On cree un nouvel onglet dans le bureau - self.editor.vm.displayJDC( self.item.object.jdc_aux , self.item.object.jdc_aux.nom.split("/")[-1] ) - - def makeView(self):#,appli,node): - pass #CS_pbruno todo - + self.editor.vm.displayJDC( self.item.object.jdc_aux , self.item.object.jdc_aux.nom ) + class INCLUDETreeItem(INCLUDETreeItemBase): itemNode=INCLUDENode @@ -80,82 +74,69 @@ class INCLUDETreeItem(INCLUDETreeItemBase): # ------------------------------------ class POURSUITENode(browser.JDCNode, typeNode.PopUpMenuNode): -## def getPanel(self): -## """ -## """ -## return INCLUDEPanel( self, self.editor ) + def getPanel(self): + from monPoursuitePanel import MonPoursuitePanel + return MonPoursuitePanel (self,parent=self.editor ) + + def createPopUpMenu(self): + typeNode.PopUpMenuNode.createPopUpMenu(self) + self.menu.insertItem( qApp.translate('Browser','Edit'), self.makeEdit ) def makeEdit(self): #,appli,node if self.item.object.text_converted == 0: - # Le texte du fichier inclus n'a pas pu etre converti par le module convert msg="Le fichier de commande n'a pas pu etre converti pour etre editable par Eficas\n\n" msg=msg+self.item.object.text_error -## Fenetre(self,titre="Poursuite non editable",texte=msg,wrap='none') #CS_pbruno todo return if not hasattr(self.item.object,"jdc_aux") or self.item.object.jdc_aux is None: - #La poursuite n'est pas initialisee text="""DEBUT() FIN()""" self.object.build_poursuite(None,text) # On cree un nouvel onglet dans le bureau -## appli.bureau.ShowJDC( self.item.object.jdc_aux, -## self.item.object.jdc_aux.nom, -## label_onglet=None, -## JDCDISPLAY=macrodisplay.MACRODISPLAY) - self.editor.vm.displayJDC( self.item.object.jdc_aux ) #, self.item.object.jdc_aux.nom ) - - def makeView(self):#,appli,node): - pass #CS_pbruno todo - - + self.editor.vm.displayJDC( self.item.object.jdc_aux , self.item.object.jdc_aux.nom) class POURSUITETreeItem(INCLUDETreeItemBase): itemNode=POURSUITENode -## def makeEdit(self,appli,node): -## if self.object.text_converted == 0: -## # Le texte du fichier inclus n'a pas pu etre converti par le module convert -## msg="Le fichier de commande n'a pas pu etre converti pour etre editable par Eficas\n\n" -## msg=msg+self.object.text_error -## Fenetre(self,titre="Poursuite non editable",texte=msg,wrap='none') -## return -## -## if not hasattr(self.object,"jdc_aux") or self.object.jdc_aux is None: -## #La poursuite n'est pas initialisee -## text="""DEBUT() -##FIN()""" -## self.object.build_poursuite(None,text) -## -## # On cree un nouvel onglet dans le bureau -## appli.bureau.ShowJDC(self.object.jdc_aux,self.object.jdc_aux.nom, -## label_onglet=None, -## JDCDISPLAY=macrodisplay.MACRODISPLAY) -## -## def makeView(self,appli,node): -## if not hasattr(self.object,"jdc_aux") or self.object.jdc_aux is None: -## showerror("Poursuite vide","Une POURSUITE doit etre correctement initialisée pour etre visualisée") -## return -## nom=self.object.nom -## if hasattr(self.object,'fichier_ini'): -## if self.object.fichier_ini is None: -## nom=nom+' '+"Fichier non défini" -## else: -## nom=nom+' '+self.object.fichier_ini -## macdisp=macrodisplay.makeMacroDisplay(appli,self,nom) + + +# ------------------------------------ +# Classes necessaires à POURSUITE +# ------------------------------------ + + +class MATERIAUNode(MACRONode): + + def getPanel(self): + from monMacroPanel import MonMacroPanel + return MonMacroPanel (self,parent=self.editor ) + + def createPopUpMenu(self): + typeNode.PopUpMenuNode.createPopUpMenu(self) + self.menu.insertItem( qApp.translate('Browser','View'), self.makeView ) + + def makeView(self) : + if hasattr(self.item.object,'fichier_ini') and self.item.object.fichier_ini==None: + QMessageBox.information( self, "Include vide","L'include doit etre correctement initialisé pour etre visualisé") + return + f = open(self.item.object.fichier_ini, "rb") + texte = f.read() + f.close() + from desVisu import DVisu + monVisu=DVisu(parent=self.editor,fl=Qt.WType_Dialog) + monVisu.TB.setText(texte) + monVisu.show() class INCLUDE_MATERIAUTreeItem(INCLUDETreeItemBase): - rmenu_specs=[("View","makeView"), - ] - def iscopiable(self): - """ - Retourne 1 si l'objet est copiable, 0 sinon - """ - return 1 + itemNode=MATERIAUNode +# ------------------------------------ +# TreeItem +# ------------------------------------ + def treeitem(appli, labeltext, object, setfunction=None): - """ Factory qui retourne l'item adapté au type de macro : + """ Factory qui retourne l'item adapte au type de macro : INCLUDE, POURSUITE, MACRO """ if object.nom == "INCLUDE_MATERIAU": @@ -170,5 +151,4 @@ def treeitem(appli, labeltext, object, setfunction=None): import Accas objet=Accas.MACRO_ETAPE -#import macrodisplay diff --git a/InterfaceQT/compooper.py b/InterfaceQT/compooper.py index 1611cea1..61d73e78 100644 --- a/InterfaceQT/compooper.py +++ b/InterfaceQT/compooper.py @@ -104,9 +104,7 @@ class EtapeTreeItem(Objecttreeitem.ObjectTreeItem): return "" def additem(self,name,pos): - print "CS_PBRUNO compooper.additem",name,pos mcent = self._object.addentite(name,pos) - print "CS_PBRUNO mcent ",mcent return mcent diff --git a/InterfaceQT/compoparam.py b/InterfaceQT/compoparam.py index cfdf276a..cef01b24 100644 --- a/InterfaceQT/compoparam.py +++ b/InterfaceQT/compoparam.py @@ -62,7 +62,7 @@ class PARAMTreeItem(Objecttreeitem.ObjectTreeItem): - la fonte dans laquelle afficher ce texte - la couleur du texte """ - return 'Parametre',None,None + return 'PARAMETRE',None,None def GetText(self): """ diff --git a/InterfaceQT/editor.py b/InterfaceQT/editor.py index f2031a85..7f563a63 100644 --- a/InterfaceQT/editor.py +++ b/InterfaceQT/editor.py @@ -79,8 +79,6 @@ class JDCEditor(QSplitter): self.fileInfo.setCaching(0) if editor is None: self.jdc = self.readFile(self.fileName) - print "uuuuuuuuuuuuuuuuuuuuuuuuuuuu" - print self.fileName if units is not None: self.jdc.recorded_units=units self.jdc.old_recorded_units=units @@ -227,7 +225,7 @@ class JDCEditor(QSplitter): if unite : titre = "Choix unite %d " %unite texte = "Le fichier %s contient une commande INCLUDE \n" % fic_origine - texte = texte+'Donnez le nom du fichier correspondant\n à  l unité logique %d' % unite + texte = texte+'Donnez le nom du fichier correspondant\n à l unité logique %d' % unite labeltexte = 'Fichier pour unite %d :' % unite else: titre = "Choix d'un fichier de poursuite" @@ -308,7 +306,7 @@ class JDCEditor(QSplitter): #-----------------------# def viewJdcSource(self): #-----------------------# - format = self.format_fichier.get() + format = self.format_fichier strSource = str( self.get_text_JDC(format) ) self._viewText(strSource, "JDC_SOURCE") diff --git a/InterfaceQT/monFonctionPanel.py b/InterfaceQT/monFonctionPanel.py index 9bde8dc0..36d3d965 100644 --- a/InterfaceQT/monFonctionPanel.py +++ b/InterfaceQT/monFonctionPanel.py @@ -23,7 +23,7 @@ import string,types,os from qt import * # Modules Eficas - +from qtSaisie import SaisieValeur from monPlusieursBasePanel import MonPlusieursBasePanel # Import des panels diff --git a/InterfaceQT/monFormulePanel.py b/InterfaceQT/monFormulePanel.py index 6fa2e588..7f3ba74c 100644 --- a/InterfaceQT/monFormulePanel.py +++ b/InterfaceQT/monFormulePanel.py @@ -42,10 +42,11 @@ class MonFormulePanel(DFormule,QTPanelTBW2): self.LENomFormule.setText(node.item.get_nom()) self.LECorpsFormule.setText(node.item.get_corps()) texte_args="" - for i in node.item.get_args() : - if texte_args != "" : - texte_args = texte_args +"," - texte_args=texte_args + i + if node.item.get_args() != None : + for i in node.item.get_args() : + if texte_args != "" : + texte_args = texte_args +"," + texte_args=texte_args + i self.LENomsArgs.setText(texte_args) diff --git a/InterfaceQT/monIncludePanel.py b/InterfaceQT/monIncludePanel.py index 6da7fa71..8dbbfad1 100644 --- a/InterfaceQT/monIncludePanel.py +++ b/InterfaceQT/monIncludePanel.py @@ -59,6 +59,11 @@ class MonIncludePanel(MonMacroPanel): self.BBrowse.setText(self._DMacro__tr("Edit")) self.TWChoix.changeTab(self.TabPage,self._DMacro__tr("Fichier Include")) self.TWChoix.setCurrentPage(2) + if hasattr(self.node.item.object,'fichier_ini'): + self.LENomFichier.setText(self.node.item.object.fichier_ini) + else : + self.LENomFichier.setText("") + self.LENomFichier.setText(self.node.item.object.fichier_ini) @@ -77,7 +82,7 @@ class MonIncludePanel(MonMacroPanel): def BBrowsePressed(self): - pass + self.node.makeEdit() def BOkIncPressed (self): self.LENomFichReturnPressed() diff --git a/InterfaceQT/monMacroPanel.py b/InterfaceQT/monMacroPanel.py index b7905c2c..10bcf416 100644 --- a/InterfaceQT/monMacroPanel.py +++ b/InterfaceQT/monMacroPanel.py @@ -25,12 +25,13 @@ from desMacro import DMacro from qtCommun import QTPanel from qtCommun import QTPanelTBW1 from qtCommun import QTPanelTBW2 +from qtCommun import QTPanelTBW3 from qt import * # Import des panels -class MonMacroPanel(DMacro,QTPanelTBW1,QTPanelTBW2): +class MonMacroPanel(DMacro,QTPanelTBW1,QTPanelTBW2,QTPanelTBW3): """ Classe définissant le panel associé aux mots-clés qui demandent à l'utilisateur de choisir une seule valeur parmi une liste de valeurs @@ -41,6 +42,11 @@ class MonMacroPanel(DMacro,QTPanelTBW1,QTPanelTBW2): QTPanel.__init__(self,node,parent) QTPanelTBW2.__init__(self,node,parent) QTPanelTBW1.__init__(self,node,parent) + if self.node.item.object.get_type_produit() != None : + QTPanelTBW3.__init__(self,node,parent) + else : + self.TWChoix.removePage(self.TWChoix.page(2)) + def BSupPressed(self): QTPanel.BSupPressed(self) @@ -63,3 +69,6 @@ class MonMacroPanel(DMacro,QTPanelTBW1,QTPanelTBW2): def LBNouvCommandeClicked(self): QTPanelTBW2.LBNouvCommandeClicked(self) + def LENomConceptReturnPressed(self): + QTPanelTBW3.LENomConceptReturnPressed(self) + diff --git a/InterfaceQT/monPoursuitePanel.py b/InterfaceQT/monPoursuitePanel.py new file mode 100644 index 00000000..cb202ad6 --- /dev/null +++ b/InterfaceQT/monPoursuitePanel.py @@ -0,0 +1,112 @@ +# -*- coding: utf-8 -*- +# CONFIGURATION MANAGEMENT OF EDF VERSION +# ====================================================================== +# COPYRIGHT (C) 1991 - 2002 EDF R&D WWW.CODE-ASTER.ORG +# THIS PROGRAM IS FREE SOFTWARE; YOU CAN REDISTRIBUTE IT AND/OR MODIFY +# IT UNDER THE TERMS OF THE GNU GENERAL PUBLIC LICENSE AS PUBLISHED BY +# THE FREE SOFTWARE FOUNDATION; EITHER VERSION 2 OF THE LICENSE, OR +# (AT YOUR OPTION) ANY LATER VERSION. +# +# THIS PROGRAM IS DISTRIBUTED IN THE HOPE THAT IT WILL BE USEFUL, BUT +# WITHOUT ANY WARRANTY; WITHOUT EVEN THE IMPLIED WARRANTY OF +# MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. SEE THE GNU +# GENERAL PUBLIC LICENSE FOR MORE DETAILS. +# +# YOU SHOULD HAVE RECEIVED A COPY OF THE GNU GENERAL PUBLIC LICENSE +# ALONG WITH THIS PROGRAM; IF NOT, WRITE TO EDF R&D CODE_ASTER, +# 1 AVENUE DU GENERAL DE GAULLE, 92141 CLAMART CEDEX, FRANCE. +# +# +# ====================================================================== +# Modules Python +# Modules Eficas + +import os,traceback,sys +from qt import * +from desMacro import DMacro + +from monMacroPanel import MonMacroPanel +import convert + + +# Import des panels + +class MonPoursuitePanel(MonMacroPanel): + """ + Classe définissant le panel associé aux mots-clés qui demandent + à l'utilisateur de choisir une seule valeur parmi une liste de valeurs + discrètes + """ + def __init__(self,node, parent = None,name = None,fl = 0): + MonMacroPanel.__init__(self,node,parent,name,fl) + #Version TK ?? + self.ajoutPageOk() + + def ajoutPageOk(self) : + self.TabPage = QWidget(self.TWChoix,"TabPage") + self.LENomFichier = QLineEdit(self.TabPage,"LENomFichier") + self.LENomFichier.setGeometry(QRect(18,127,450,30)) + self.textLabel1_3 = QLabel(self.TabPage,"textLabel1_3") + self.textLabel1_3.setGeometry(QRect(70,50,350,41)) + self.BBrowse = QPushButton(self.TabPage,"BBrowse") + self.BBrowse.setGeometry(QRect(288,306,161,41)) + self.TWChoix.insertTab(self.TabPage,QString("")) + self.textLabel1_3.setText(self._DMacro__tr("La commande POURSUITE requiert un nom de Fichier :")) + self.BBrowse.setText(self._DMacro__tr("Edit")) + self.TWChoix.changeTab(self.TabPage,self._DMacro__tr("Fichier Poursuite")) + self.TWChoix.setCurrentPage(2) + if hasattr(self.node.item.object,'fichier_ini'): + self.LENomFichier.setText(self.node.item.object.fichier_ini) + else : + self.LENomFichier.setText("") + self.connect(self.BBrowse,SIGNAL("clicked()"),self.BBrowsePressed) + self.connect(self.LENomFichier,SIGNAL("returnPressed()"),self.LENomFichReturnPressed) + + + def BBrowsePressed(self): + self.node.makeEdit() + + def BOkIncPressed (self): + self.LENomFichReturnPressed() + + def LENomFichReturnPressed(self): + nomFichier=str(self.LENomFichier.text()) + if not os.path.isfile(nomFichier) : + commentaire = "Fichier introuvable" + self.Commentaire.setText(QString(commentaire)) + return + + text=self.convert_file(nomFichier) + + # Si probleme a la lecture-conversion on arrete le traitement + if not text: + return + + try : + self.node.item.object.change_fichier_init(nomFichier,text) + commentaire = "Fichier modifie : " + self.node.item.get_nom() + self.Commentaire.setText(QString(commentaire)) + except: + l=traceback.format_exception_only("Fichier invalide",sys.exc_info()[1]) + QMessageBox.critical( self, "Erreur fatale au chargement du fichier Include", l[0]) + commentaire = "Fichier invalide" + self.Commentaire.setText(QString(commentaire)) + return + + + def convert_file(self,file): + """ + Methode pour convertir le fichier file dans le format courant + """ + format=self.editor.format_fichier + text=None + if convert.plugins.has_key(format): + # Le convertisseur existe on l'utilise + p=convert.plugins[format]() + p.readfile(file) + text=p.convert('execnoparseur') + else : + commentaire = "Impossible de lire le fichier : Format inconnu" + self.Commentaire.setText(QString(commentaire)) + return text + diff --git a/InterfaceQT/monRacinePanel.py b/InterfaceQT/monRacinePanel.py index e7b0aeb8..1a4abb9b 100644 --- a/InterfaceQT/monRacinePanel.py +++ b/InterfaceQT/monRacinePanel.py @@ -68,6 +68,7 @@ class MonRacinePanel(DRac,QTPanelTBW2): self.BuildLBRegles(listeRegles,listeNomsEtapes) def DefCmd(self): + if self.LBNouvCommande.selectedItem()== None : return name=str(self.LBNouvCommande.selectedItem().text()) if name==QString(" "): return if name.find("GROUPE :")==0 : return diff --git a/InterfaceQT/qtCommun.py b/InterfaceQT/qtCommun.py index def3ca0f..bc144f21 100644 --- a/InterfaceQT/qtCommun.py +++ b/InterfaceQT/qtCommun.py @@ -123,6 +123,7 @@ class QTPanelTBW1(QTPanel): def DefMC(self): """ On ajoute un mot-clé à la commande : subnode """ + if self.LBMCPermis.selectedItem() == None : return name=str(self.LBMCPermis.selectedItem().text()) self.editor.init_modif() self.node.append_child(name) @@ -172,6 +173,7 @@ class QTPanelTBW2(QTPanel): def DefCmd(self): if self.LBNouvCommande.selectedItem()== 0 : return + if self.LBNouvCommande.selectedItem()== None : return name=str(self.LBNouvCommande.selectedItem().text()) if name==QString(" "): return diff --git a/InterfaceQT/qtEficas.py b/InterfaceQT/qtEficas.py index 299637f8..699a4306 100644 --- a/InterfaceQT/qtEficas.py +++ b/InterfaceQT/qtEficas.py @@ -8,7 +8,7 @@ sys.path.append(INSTALLDIR+"/Ui") sys.path.append(INSTALLDIR+"/InterfaceQT") from qt import * -from myMain_ui import Eficas +from myMain import Eficas from viewManager import MyTabview from Editeur import configuration @@ -42,7 +42,7 @@ class Appli(Eficas): self.setCentralWidget(self.viewmanager) self.recentMenu = QPopupMenu(self.Fichier) - self.Fichier.insertItem(self.trUtf8('Open &Recent Files'), self.recentMenu) + self.Fichier.insertItem(self.trUtf8('&Recents'), self.recentMenu) self.connect(self.recentMenu,SIGNAL('aboutToShow()'),self.handleShowRecentMenu) self.connect(self,PYSIGNAL('preferencesChanged'), self.viewmanager.handlePreferencesChanged) @@ -189,7 +189,6 @@ class Appli(Eficas): from editor import JDCEditor monEditeur=JDCEditor() texte=monEditeur.get_source(file) - print "______________________________________" return texte if __name__=='__main__': diff --git a/InterfaceQT/qtSaisie.py b/InterfaceQT/qtSaisie.py index 14d37373..f9cae0e7 100644 --- a/InterfaceQT/qtSaisie.py +++ b/InterfaceQT/qtSaisie.py @@ -61,6 +61,7 @@ class SaisieValeur: self.listBoxVal.setSelected(0,1) def ClicASSD(self): + if self.listBoxASSD.selectedItem()== None : return valeurQstring=self.listBoxASSD.selectedItem().text() commentaire = QString("Valeur selectionnée : ") commentaire.append(valeurQstring) @@ -70,6 +71,7 @@ class SaisieValeur: self.Commentaire.setText(QString(commentaire)) def ClicValeur(self): + if self.listBoxVal.selectedItem()== None : return valeurQstring=self.listBoxVal.selectedItem().text() valeur=valeurQstring.latin1() validite,commentaire=self.politique.RecordValeur(valeur) diff --git a/InterfaceQT/viewManager.py b/InterfaceQT/viewManager.py index 483957f5..29c8b0e8 100644 --- a/InterfaceQT/viewManager.py +++ b/InterfaceQT/viewManager.py @@ -765,9 +765,12 @@ class ViewManager: @param fn name of file to be opened @param lineno line number to place the cursor at """ - newWin, editor = self.getEditor(None, jdc, title = fn) + titre=None + if fn != None : titre=fn.split("/")[-1] + newWin, editor = self.getEditor(None, jdc, title = titre ) if newWin: + editor.fileName=fn self.handleModificationStatusChanged(editor.modified, editor) self.checkActions(editor) diff --git a/InterfaceQT/visualisation.py b/InterfaceQT/visualisation.py deleted file mode 100644 index 675bc29b..00000000 --- a/InterfaceQT/visualisation.py +++ /dev/null @@ -1,59 +0,0 @@ -# -*- coding: utf-8 -*- - -# Form implementation generated from reading ui file 'visualisation.ui' -# -# Created: mer fév 21 10:55:14 2007 -# by: The PyQt User Interface Compiler (pyuic) 3.13 -# -# WARNING! All changes made in this file will be lost! - - -from qt import * - - -class visual(QWidget): - def __init__(self,parent = None,name = None,fl = 0): - QWidget.__init__(self,parent,name,fl) - - if not name: - self.setName("visual") - - f = QFont(self.font()) - f.setPointSize(14) - self.setFont(f) - - - self.frame5 = QFrame(self,"frame5") - self.frame5.setGeometry(QRect(10,520,801,41)) - self.frame5.setFrameShape(QFrame.StyledPanel) - self.frame5.setFrameShadow(QFrame.Raised) - - self.pushBOK = QPushButton(self.frame5,"pushBOK") - self.pushBOK.setGeometry(QRect(120,8,121,25)) - - self.pushBSave = QPushButton(self.frame5,"pushBSave") - self.pushBSave.setGeometry(QRect(470,8,120,25)) - - self.textBrowser1 = QTextBrowser(self,"textBrowser1") - self.textBrowser1.setGeometry(QRect(10,10,810,500)) - - self.languageChange() - - self.resize(QSize(830,582).expandedTo(self.minimumSizeHint())) - self.clearWState(Qt.WState_Polished) - - self.connect(self.pushBOK,SIGNAL("clicked()"),self.close) - self.connect(self.pushBSave,SIGNAL("clicked()"),self.Save) - - - def languageChange(self): - self.setCaption(self.__tr("Visualisation du rapport de validation du jeu de commandes courant")) - self.pushBOK.setText(self.__tr("Fermer")) - self.pushBSave.setText(self.__tr("Sauver")) - - - def Save(self): - print "visual.Save(): Not implemented yet" - - def __tr(self,s,c = None): - return qApp.translate("visual",s,c) diff --git a/InterfaceTK/bureau.py b/InterfaceTK/bureau.py index b02a06ef..77c8d322 100644 --- a/InterfaceTK/bureau.py +++ b/InterfaceTK/bureau.py @@ -479,6 +479,7 @@ class BUREAU: if ok and hasattr( self.appli, 'salome'): # eficas a été lancé à partir deSalome #1)ajout dans l'arbre d'étude du nom du jdc + if self.appli.salome==0 : return 0 ok, msg = self.appli.addJdcInSalome( self.JDCDisplay_courant.fichier ) #2)CS_pbruno ?? diff --git a/InterfaceTK/panelsSalome.py b/InterfaceTK/panelsSalome.py index ba199709..800848ed 100644 --- a/InterfaceTK/panelsSalome.py +++ b/InterfaceTK/panelsSalome.py @@ -1,5 +1,4 @@ # -*- coding: utf-8 -*- -print "Import de panelsSalome" from Tkinter import * from widgets import ListeChoix diff --git a/Ui/desCommentaire.py b/Ui/desCommentaire.py index 2f4ef35a..78d4a8a2 100644 --- a/Ui/desCommentaire.py +++ b/Ui/desCommentaire.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'desCommentaire.ui' # -# Created: lun mar 19 11:05:34 2007 +# Created: mar oct 30 12:05:11 2007 # by: The PyQt User Interface Compiler (pyuic) 3.13 # # WARNING! All changes made in this file will be lost! @@ -45,7 +45,6 @@ class DComment(QWidget): self.resize(QSize(475,480).expandedTo(self.minimumSizeHint())) self.clearWState(Qt.WState_Polished) - self.connect(self.textCommentaire,SIGNAL("returnPressed()"),self.TexteCommentaireEntre) self.connect(self.bOk,SIGNAL("clicked()"),self.TexteCommentaireEntre) diff --git a/Ui/desCommentaire.ui b/Ui/desCommentaire.ui index e161ac53..5c0a3b5c 100644 --- a/Ui/desCommentaire.ui +++ b/Ui/desCommentaire.ui @@ -130,12 +130,6 @@ - - textCommentaire - returnPressed() - DComment - TexteCommentaireEntre() - bOk clicked() diff --git a/Ui/desMacro.py b/Ui/desMacro.py index 2ec81cd5..515791a1 100644 --- a/Ui/desMacro.py +++ b/Ui/desMacro.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'desMacro.ui' # -# Created: jeu avr 26 14:25:17 2007 +# Created: mar oct 30 14:42:14 2007 # by: The PyQt User Interface Compiler (pyuic) 3.13 # # WARNING! All changes made in this file will be lost! @@ -114,6 +114,27 @@ class DMacro(QWidget): self.BNext.setIconSet(QIconSet(self.image0)) self.TWChoix.insertTab(self.Commande,QString("")) + self.TabPage = QWidget(self.TWChoix,"TabPage") + + self.groupBox1_2 = QGroupBox(self.TabPage,"groupBox1_2") + self.groupBox1_2.setGeometry(QRect(0,0,520,380)) + + self.textLabel1_3_2_3 = QLabel(self.groupBox1_2,"textLabel1_3_2_3") + self.textLabel1_3_2_3.setGeometry(QRect(80,170,82,31)) + + self.textLabel3_2 = QLabel(self.groupBox1_2,"textLabel3_2") + self.textLabel3_2.setGeometry(QRect(80,200,230,31)) + + self.textLabel1_3_3 = QLabel(self.groupBox1_2,"textLabel1_3_3") + self.textLabel1_3_3.setGeometry(QRect(80,50,82,31)) + + self.LENomConcept = QLineEdit(self.groupBox1_2,"LENomConcept") + self.LENomConcept.setGeometry(QRect(80,110,310,30)) + + self.typeConcept = QLabel(self.groupBox1_2,"typeConcept") + self.typeConcept.setGeometry(QRect(320,200,100,31)) + self.TWChoix.insertTab(self.TabPage,QString("")) + self.languageChange() self.resize(QSize(521,499).expandedTo(self.minimumSizeHint())) @@ -127,6 +148,7 @@ class DMacro(QWidget): self.connect(self.RBalpha,SIGNAL("clicked()"),self.BuildTabCommand) self.connect(self.RBGroupe,SIGNAL("clicked()"),self.BuildTabCommand) self.connect(self.BNext,SIGNAL("clicked()"),self.BNextPressed) + self.connect(self.LENomConcept,SIGNAL("returnPressed()"),self.LENomConceptReturnPressed) def languageChange(self): @@ -153,6 +175,12 @@ class DMacro(QWidget): self.BNext.setText(QString.null) QToolTip.add(self.BNext,self.__tr("affiche la prochaine occurence")) self.TWChoix.changeTab(self.Commande,self.__tr("Nouvelle Commande")) + self.groupBox1_2.setTitle(self.__tr("Concept")) + self.textLabel1_3_2_3.setText(self.__tr("Type du concept :")) + self.textLabel3_2.setText(self.__trUtf8("\x4c\x27\x6f\x70\xc3\xa9\x72\x61\x74\x65\x75\x72\x20\x63\x6f\x75\x72\x61\x6e\x74\x20\x72\x65\x74\x6f\x75\x72\x6e\x65\x20\x75\x6e\x20\x63\x6f\x6e\x63\x65\x70\x74\x20\x64\x65\x20\x74\x79\x70\x65\x20\x3a")) + self.textLabel1_3_3.setText(self.__tr("Nom du concept :")) + self.typeConcept.setText(self.__tr("TypeDuConcept")) + self.TWChoix.changeTab(self.TabPage,self.__tr("Nommer Concept")) def LBNouvCommandeClicked(self): @@ -176,6 +204,9 @@ class DMacro(QWidget): def BNextPressed(self): print "DMacro.BNextPressed(): Not implemented yet" + def LENomConceptReturnPressed(self): + print "DMacro.LENomConceptReturnPressed(): Not implemented yet" + def __tr(self,s,c = None): return qApp.translate("DMacro",s,c) diff --git a/Ui/desMacro.ui b/Ui/desMacro.ui index a54b2a63..d85115c5 100644 --- a/Ui/desMacro.ui +++ b/Ui/desMacro.ui @@ -360,6 +360,107 @@ + + + TabPage + + + Nommer Concept + + + + groupBox1_2 + + + + 0 + 0 + 520 + 380 + + + + Concept + + + + textLabel1_3_2_3 + + + + 80 + 170 + 82 + 31 + + + + <u>Type du concept :</u> + + + + + textLabel3_2 + + + + 80 + 200 + 230 + 31 + + + + L'opérateur courant retourne un concept de type : + + + + + textLabel1_3_3 + + + + 80 + 50 + 82 + 31 + + + + <u>Nom du concept :</u> + + + + + LENomConcept + + + + 80 + 110 + 310 + 30 + + + + + + typeConcept + + + + 320 + 200 + 100 + 31 + + + + TypeDuConcept + + + + @@ -416,6 +517,12 @@ DMacro BNextPressed() + + LENomConcept + returnPressed() + DMacro + LENomConceptReturnPressed() + LBNouvCommandeClicked() @@ -425,6 +532,7 @@ BOkPressed() BuildTabCommand() BNextPressed() + LENomConceptReturnPressed() diff --git a/Ui/desVisu.py b/Ui/desVisu.py new file mode 100644 index 00000000..e1d0a494 --- /dev/null +++ b/Ui/desVisu.py @@ -0,0 +1,37 @@ +# -*- coding: utf-8 -*- + +# Form implementation generated from reading ui file 'desVisu.ui' +# +# Created: mar oct 30 11:06:17 2007 +# by: The PyQt User Interface Compiler (pyuic) 3.13 +# +# WARNING! All changes made in this file will be lost! + + +from qt import * + + +class DVisu(QWidget): + def __init__(self,parent = None,name = None,fl = 0): + QWidget.__init__(self,parent,name,fl) + + if not name: + self.setName("DVisu") + + + + self.TB = QTextBrowser(self,"TB") + self.TB.setGeometry(QRect(0,0,740,401)) + + self.languageChange() + + self.resize(QSize(739,394).expandedTo(self.minimumSizeHint())) + self.clearWState(Qt.WState_Polished) + + + def languageChange(self): + self.setCaption(self.__tr("Visualisation Include Materiau")) + + + def __tr(self,s,c = None): + return qApp.translate("DVisu",s,c) diff --git a/Ui/desVisu.ui b/Ui/desVisu.ui new file mode 100644 index 00000000..f6d1373f --- /dev/null +++ b/Ui/desVisu.ui @@ -0,0 +1,33 @@ + +DVisu + + + DVisu + + + + 0 + 0 + 739 + 394 + + + + Visualisation Include Materiau + + + + TB + + + + 0 + 0 + 740 + 401 + + + + + + diff --git a/Ui/myMain.py b/Ui/myMain.py new file mode 100644 index 00000000..c4affb46 --- /dev/null +++ b/Ui/myMain.py @@ -0,0 +1,523 @@ +# -*- coding: utf-8 -*- + +# Form implementation generated from reading ui file 'myMain.ui' +# +# Created: mar oct 30 14:35:07 2007 +# by: The PyQt User Interface Compiler (pyuic) 3.13 +# +# WARNING! All changes made in this file will be lost! + + +from qt import * + +image0_data = \ + "\x89\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d" \ + "\x49\x48\x44\x52\x00\x00\x00\x16\x00\x00\x00\x16" \ + "\x08\x06\x00\x00\x00\xc4\xb4\x6c\x3b\x00\x00\x00" \ + "\x74\x49\x44\x41\x54\x38\x8d\xed\xd5\xc1\x09\xc0" \ + "\x20\x0c\x05\xd0\x6f\xe9\x36\x81\x2c\x10\xb2\xff" \ + "\xdd\x85\xd2\x53\x85\xb6\xa9\x91\x48\x0f\x05\x3f" \ + "\x08\x1a\xf0\x29\x12\x10\xf8\x28\xc5\xa9\xd9\xc4" \ + "\xde\x96\xcd\x2b\x9a\xd9\xeb\x00\x00\x66\x0e\x2f" \ + "\xe0\xc2\x51\x98\x39\xc4\xf7\x0c\x4c\x44\x6d\x5e" \ + "\x6b\x35\x38\xcf\x92\x82\x45\xe4\xb2\xf6\xf0\x14" \ + "\xac\xaa\x8f\xda\x1d\x4f\xc1\xa5\x74\x1b\x22\x07" \ + "\x9f\x9d\x11\x1d\x96\xea\x8a\x91\x2c\x78\xc1\x0b" \ + "\xee\x64\xe6\x07\x19\xf5\x7e\x92\x03\xad\x45\x2a" \ + "\x04\xcc\x4e\x50\x20\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\x16\x00\x00\x00\x16" \ + "\x08\x06\x00\x00\x00\xc4\xb4\x6c\x3b\x00\x00\x00" \ + "\x99\x49\x44\x41\x54\x38\x8d\xed\x94\x41\x0e\x85" \ + "\x20\x0c\x44\x5f\x89\xc7\x36\x7f\x61\xbc\x77\x5d" \ + "\x28\x48\xa4\x28\x60\xff\xce\xd9\x54\x8b\xbe\x8e" \ + "\x13\x04\x3e\x1d\x92\x81\x77\xf4\x81\xa1\x23\xdc" \ + "\x2b\x34\xf6\xf4\x7a\x3d\xe2\xb8\x65\xa8\x84\x3f" \ + "\x40\x01\x98\x2a\x0b\x3d\x5f\x62\xc5\x83\x00\xaa" \ + "\x1a\xd7\x05\x50\x44\x9a\xb9\xd5\x07\xa7\x73\xa8" \ + "\xa4\xba\x4f\x92\xa2\xdf\x33\x3c\x64\xc6\x3b\xeb" \ + "\xbd\x82\xe5\xb8\xad\xde\xcb\xcc\x78\x20\xeb\x42" \ + "\x66\xc6\x39\x74\x5d\xfa\x80\xf3\x6f\xaf\x66\xc6" \ + "\x6f\xa1\x9c\x3f\x88\x2f\xb4\x70\xec\x05\xcd\xc0" \ + "\xbe\xd0\x78\x93\xf6\x8e\x17\x14\x92\x63\x5f\x68" \ + "\x6c\x3e\xef\xf6\xba\x3c\x8f\xdd\x36\x6d\xc4\xc0" \ + "\x45\x2c\x87\x81\xf8\x08\x00\x00\x00\x00\x49\x45" \ + "\x4e\x44\xae\x42\x60\x82" +image2_data = \ + "\x89\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d" \ + "\x49\x48\x44\x52\x00\x00\x00\x16\x00\x00\x00\x16" \ + "\x08\x06\x00\x00\x00\xc4\xb4\x6c\x3b\x00\x00\x00" \ + "\xa0\x49\x44\x41\x54\x38\x8d\xd5\x95\x4d\x0a\x80" \ + "\x20\x10\x85\x9f\xd1\x46\x68\xe1\x8d\xe6\x62\xd2" \ + "\x22\xbc\x98\x37\x6a\x21\xb4\xac\x45\x19\x92\xc6" \ + "\x64\x69\xe0\xb7\xf1\x87\xf1\xf1\x1c\x47\x05\x2a" \ + "\x21\x8e\x76\x2d\xad\xdb\xfb\x9e\x99\xf6\x56\x8f" \ + "\x80\xb5\x36\x4b\x85\x88\xce\x35\x44\x04\x00\xe8" \ + "\x0a\x39\x8c\xe8\xf9\x90\x34\xd2\x29\x2c\xc3\x7c" \ + "\x8e\xbd\x53\x0f\xeb\x58\x3a\x05\xe9\x54\x34\x1f" \ + "\x8a\x02\x7b\x2a\x7d\x3a\x1f\x09\xbf\x85\x4d\xc5" \ + "\xd5\xd9\x53\xaa\x39\x6e\x4f\x38\xca\xb1\x99\xe2" \ + "\xd2\xe1\x08\xab\xe1\x56\xf8\x2e\x30\x97\x7f\xcb" \ + "\x4d\x8f\xf9\x42\xd7\x5d\xbe\xbe\xd2\xe1\x43\x95" \ + "\x3a\x93\xf6\xca\xad\x3d\x61\x11\xf4\x4b\x7d\x4f" \ + "\x82\x0f\xf9\xc0\x06\x9b\xb5\x1e\xcd\xed\x31\x8c" \ + "\x5c\x00\x00\x00\x00\x49\x45\x4e\x44\xae\x42\x60" \ + "\x82" +image3_data = \ + "\x89\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d" \ + "\x49\x48\x44\x52\x00\x00\x00\x16\x00\x00\x00\x16" \ + "\x08\x06\x00\x00\x00\xc4\xb4\x6c\x3b\x00\x00\x00" \ + "\x73\x49\x44\x41\x54\x38\x8d\xed\x92\xc1\x0e\x80" \ + "\x20\x08\x40\xb1\xef\x66\x1d\x1c\xff\x4d\x87\x6a" \ + "\xa8\x88\xa1\x76\x69\xf9\x36\x0f\x28\x3e\xd8\x00" \ + "\x60\xf1\x59\x42\x5f\x3a\x71\xf5\x36\x02\xe0\x8e" \ + "\x99\x2b\x09\x88\x01\xd0\x28\x54\x17\x6a\xe4\x7f" \ + "\x21\xce\x1f\xb5\xb0\x5d\x38\xed\xdc\x90\x60\xd0" \ + "\xf1\x13\x79\x63\x5b\x3b\xc9\x2b\xd5\x18\xe2\x39" \ + "\xa9\x43\xec\x1d\x5a\xb7\x78\x5c\xee\x10\x7b\xe4" \ + "\xb2\x15\xaf\x40\x91\xf8\x94\xde\x47\x18\x1e\xce" \ + "\xa5\x9e\xde\x9e\xc5\x9f\x38\x00\x62\xac\x28\xb1" \ + "\xe3\xd7\x01\xd9\x00\x00\x00\x00\x49\x45\x4e\x44" \ + "\xae\x42\x60\x82" +image4_data = \ + "\x89\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d" \ + "\x49\x48\x44\x52\x00\x00\x00\x16\x00\x00\x00\x16" \ + "\x08\x06\x00\x00\x00\xc4\xb4\x6c\x3b\x00\x00\x00" \ + "\x74\x49\x44\x41\x54\x38\x8d\xed\x92\xc1\x0a\xc0" \ + "\x20\x08\x40\x6d\xdf\x2d\x3b\x84\xff\xed\x0e\xa3" \ + "\x58\x6a\x26\xd1\x65\xe0\x83\x0e\xa5\x3e\x85\x04" \ + "\x48\x7e\x4b\x91\x0f\x54\x89\xf1\x9e\xa5\xa3\xca" \ + "\x0f\x8a\x89\x63\x65\xb3\x06\xc4\x2d\xd6\x13\xc6" \ + "\x49\xbd\xc2\x59\x83\x16\x13\x62\x19\xf0\xf9\x36" \ + "\xc0\xa2\xef\x00\xd7\x5a\x62\x61\x4d\x3a\xb2\x29" \ + "\x96\xf2\xa3\x62\xff\xa3\x37\xc5\xeb\xed\xe9\x62" \ + "\xaa\xd1\xa2\xe8\x4a\xaa\xa2\xf7\x50\xdd\x12\x74" \ + "\x8c\x0f\xd0\xab\x93\x24\x67\x78\x00\x59\x6e\x28" \ + "\xb1\x74\x3f\x46\x86\x00\x00\x00\x00\x49\x45\x4e" \ + "\x44\xae\x42\x60\x82" +image5_data = \ + "\x89\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d" \ + "\x49\x48\x44\x52\x00\x00\x00\x16\x00\x00\x00\x16" \ + "\x08\x06\x00\x00\x00\xc4\xb4\x6c\x3b\x00\x00\x00" \ + "\x82\x49\x44\x41\x54\x38\x8d\xcd\xd3\x41\x12\x80" \ + "\x20\x08\x05\x50\xe8\xe0\x2e\xbc\x38\xad\x32\x73" \ + "\x50\x3e\x48\x53\x7f\xe3\xe4\x8c\x4f\x24\x25\xfa" \ + "\x28\xe2\x9c\x6f\x39\x92\x0b\xf9\x27\x6c\xb6\x01" \ + "\x85\x35\x88\x77\x61\x13\x88\xc2\x57\x64\x18\xcd" \ + "\xa0\x15\xf5\x20\xb4\xe6\xb5\x5b\xe1\x09\xdc\x06" \ + "\x22\xb8\xe2\x2a\xcf\x31\x05\x6e\x18\xdf\xdf\xf8" \ + "\x06\x06\xaa\x55\x1c\xc6\x35\x64\xc4\xdc\xf8\x0c" \ + "\xd0\x20\x1d\x57\x7a\x5c\x85\xa8\x84\x5f\xdc\x02" \ + "\x5e\xa5\x30\x7a\xfc\xcd\x07\xe2\x3a\x1d\xf2\x83" \ + "\xec\x2b\x37\xd9\xad\x5f\xb4\xdf\xef\xd4\x9c\xfb" \ + "\xf7\x2f\xac\x98\xc8\xcc\x89\x00\x00\x00\x00\x49" \ + "\x45\x4e\x44\xae\x42\x60\x82" +image6_data = \ + "\x89\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d" \ + "\x49\x48\x44\x52\x00\x00\x00\x16\x00\x00\x00\x16" \ + "\x08\x06\x00\x00\x00\xc4\xb4\x6c\x3b\x00\x00\x00" \ + "\xbf\x49\x44\x41\x54\x38\x8d\xd5\x93\x41\x0a\x83" \ + "\x30\x10\x45\xdf\x48\x8e\xe5\x1d\xbc\x8c\x3b\xa9" \ + "\x8b\xf4\x6a\x9e\xab\xd3\x85\x35\x0d\x26\x63\x62" \ + "\x44\x4a\x3f\x0c\x42\x66\xfc\xf3\xf8\x24\xf0\x6f" \ + "\x12\x40\x2b\x66\xda\x8c\x55\xf3\xde\x22\x12\xcf" \ + "\x9d\x92\xcb\x98\xc0\xba\x2d\x7c\x45\x44\xcf\x9a" \ + "\x07\x63\x8b\xba\xd5\x3c\x44\x91\x23\x5e\xcf\x7c" \ + "\xc1\x62\x36\x97\xa9\x25\x40\xc1\x1f\xf4\xfd\xa7" \ + "\x52\x75\x01\x5d\x24\xa9\x38\x9e\x7d\x6f\x53\xdf" \ + "\x4f\xe4\xcc\xab\x32\x3e\xea\x0f\x03\xc0\xc4\xb2" \ + "\xa0\x71\x2c\xe6\xad\xd8\x9b\x59\xb7\x66\x1c\x3b" \ + "\xe0\x95\x98\x5f\x26\x16\x79\xee\x4e\xbc\xc2\x2c" \ + "\x97\x88\x55\x1f\xe6\xa2\xcb\xc4\x96\x9a\x89\x4b" \ + "\xcb\x6f\x23\xee\x36\x1a\xab\x62\xe2\x52\xc5\x72" \ + "\x94\xdf\xbf\xb6\x10\xbb\xf2\xc8\x97\xb8\xa4\x6c" \ + "\xc6\x67\x7e\xaa\x51\x95\x71\xfa\x08\x7e\xa8\x37" \ + "\x62\xda\x9a\xba\xcb\x20\x23\x5f\x00\x00\x00\x00" \ + "\x49\x45\x4e\x44\xae\x42\x60\x82" +image7_data = \ + "\x89\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d" \ + "\x49\x48\x44\x52\x00\x00\x00\x16\x00\x00\x00\x16" \ + "\x08\x06\x00\x00\x00\xc4\xb4\x6c\x3b\x00\x00\x00" \ + "\xd5\x49\x44\x41\x54\x38\x8d\xc5\x95\x5d\x0a\x84" \ + "\x30\x0c\x84\x27\xe2\xa9\x0a\x9e\x6c\x8b\x0f\x4b" \ + "\x3d\xd9\x82\xd7\xca\x3e\x58\xd7\xfe\x4c\xd0\xba" \ + "\x5d\x76\x40\x02\x4d\xf2\x65\xda\x0a\x05\x7e\x24" \ + "\x39\xc9\xeb\x8d\x9e\xaa\x88\x41\xa0\xc9\xaa\xd8" \ + "\xc8\x2a\xb3\x2f\x9c\x42\x5b\xe1\xe3\x0e\x0d\xcf" \ + "\x00\xc0\x03\x08\xf0\xb3\xa7\xa0\x74\x10\xa9\xd7" \ + "\x14\x2e\x00\xb4\x2c\x5a\x5f\xab\x69\x6b\x97\x9b" \ + "\x1c\x83\x7f\xc0\xc3\x16\xb6\xe4\x16\x5b\x64\xf7" \ + "\x8d\x71\x63\x59\x91\x9b\xdc\x45\x70\xde\x47\xc0" \ + "\x47\x32\xdd\x5e\x5b\xcc\x35\xf0\xc9\x77\x62\xae" \ + "\x78\x79\x36\xdc\xcf\x75\x13\x57\x7e\x79\xf4\x8c" \ + "\x4b\x27\xaa\x0f\x13\x27\xb2\x40\xf5\x11\x7f\xcb" \ + "\xe3\x48\xaa\x33\xb6\xe0\x22\x4b\x05\x4d\x07\x46" \ + "\xb8\x02\x5e\x2e\x3b\x3e\x73\xcd\xe0\xdd\x1c\x97" \ + "\xf0\x2e\x8e\xd9\xd0\xaf\x1d\xb3\x81\x22\x4b\xdf" \ + "\x33\xee\xe6\x98\xa9\x34\xa0\xf6\x17\xb4\x55\x40" \ + "\xd0\x0b\xcf\x4c\xa0\x8f\xc0\xdf\xf4\x06\xe3\x25" \ + "\xc1\x98\x1b\xc4\x18\x76\x00\x00\x00\x00\x49\x45" \ + "\x4e\x44\xae\x42\x60\x82" +image8_data = \ + "\x89\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d" \ + "\x49\x48\x44\x52\x00\x00\x00\x16\x00\x00\x00\x16" \ + "\x08\x06\x00\x00\x00\xc4\xb4\x6c\x3b\x00\x00\x02" \ + "\x5d\x49\x44\x41\x54\x38\x8d\xd5\x93\xa1\x72\xdb" \ + "\x40\x10\x86\x3f\x67\x0a\x56\xec\xc4\x22\x78\xd0" \ + "\x65\x36\x93\xa0\xc2\x1c\x68\xd6\xc2\xe6\x0d\xf2" \ + "\x1a\x81\x81\x11\x34\x94\x99\xc2\x54\xa8\x32\x9b" \ + "\x55\xf0\xe0\x89\xdd\xb1\x5b\xa6\x02\xb7\x9d\x66" \ + "\x92\xd6\x99\xb6\xd3\x99\xfe\xe8\x6e\x67\xe7\xdb" \ + "\x7f\x77\xef\xe0\x7f\xd3\xe2\xc7\x4b\xd7\x75\xb3" \ + "\x73\x0e\xef\x3d\x51\x15\x00\x23\x82\xb5\x16\x6b" \ + "\x2d\x57\x57\x57\x8b\x17\x29\xbf\x02\xb7\x6d\x3b" \ + "\x0f\x87\x03\xb9\x2d\x58\xae\xd7\x60\x04\x00\xef" \ + "\x1c\xe3\xc7\x03\x06\xa8\xaa\x8a\xeb\xeb\xeb\x57" \ + "\xc1\x17\xdf\xa0\x6d\xdb\x52\x5d\xd7\x54\xef\xb6" \ + "\x00\xa8\x2a\x49\x13\x8a\x12\x35\x32\xec\x3a\xc4" \ + "\x2b\x9b\xcd\xe6\x55\xce\x2f\xfa\xbe\x9f\x87\xc3" \ + "\x40\xfd\xe1\x3d\xcb\x4d\x8d\xaa\xa2\x4e\x48\xee" \ + "\x12\xc6\x82\x38\x08\xc1\x07\x96\x9b\x1a\x8a\x9c" \ + "\xe3\xf1\xf8\xaa\x51\x5c\x38\xe7\xc8\xad\xa5\xaa" \ + "\x6b\x00\xc4\x5f\x12\x9c\x67\xd2\x23\x93\x8c\x88" \ + "\xe6\xc8\x60\xd1\x18\xb1\xd5\x92\xd1\x39\xba\xae" \ + "\x9b\xcf\x83\xa7\x89\x65\xb5\x46\x51\x34\x80\x1b" \ + "\x1d\x2e\x1f\x49\x45\xc0\xe3\x50\x09\x64\x08\xea" \ + "\x15\x44\x90\xc2\xe0\xbd\x3f\xef\x58\x53\xc2\xe4" \ + "\x86\xa0\x01\x9f\x4d\x84\xf5\x84\x18\x41\x83\x62" \ + "\xb0\x40\x8e\x8b\x23\xc9\x24\x50\x10\x93\x31\x4d" \ + "\xd3\x59\xf0\x1b\x80\x98\x14\x11\x20\x25\x14\x40" \ + "\x15\xf1\x96\x4c\x0b\xbc\x1b\x48\x4b\x07\xe4\x68" \ + "\x88\x80\xc0\x29\xeb\xd7\x8e\x41\x41\xf5\xb4\x34" \ + "\xfd\x76\x86\x4c\x05\x3f\x1e\x08\x4b\x0f\x85\x80" \ + "\x26\x54\x40\x63\x40\x44\xce\x83\x8b\xbc\xc0\x39" \ + "\x87\xa6\x13\x50\xa3\xa2\x28\x5e\x1d\x5a\x44\x14" \ + "\xd0\x70\x8a\xa5\x98\x08\x21\x62\xad\x3d\x0f\xb6" \ + "\xd6\xe2\x87\xcf\xa4\x98\x50\x8d\x27\x40\x50\x44" \ + "\x73\x70\x42\x8c\x91\xaf\x8d\x10\xfd\x44\x81\x60" \ + "\x8c\x39\x0b\x5e\x00\xdc\xdd\xdd\xcd\x8e\x80\xa9" \ + "\xde\x42\x02\x48\xe8\x04\x84\x08\x56\xf0\x3e\x02" \ + "\x90\x7d\x72\x94\x65\xc9\xba\x5a\xe3\x46\x87\x31" \ + "\xe6\xa7\x9f\xe5\x02\x60\xb5\x5a\x61\x02\xc4\xee" \ + "\x40\xa6\x89\x4c\x33\xf2\xcb\x0c\xb1\x06\x51\x28" \ + "\x14\xf8\xf8\x99\xb2\x2c\xb9\xb9\xb9\x59\xb8\xd1" \ + "\xf1\xf8\xf8\x48\xd3\x34\xb4\x6d\xfb\xe2\x9b\xfe" \ + "\x5e\xad\xef\xfb\xf9\x78\x3c\x32\x3a\x87\x18\x81" \ + "\xec\xb4\x20\x0d\x11\x51\xa8\xeb\x9a\xed\x76\xbb" \ + "\x00\x18\x86\x61\xee\xba\x8e\xfd\x7e\x8f\x31\x86" \ + "\xed\x76\xcb\x6a\xb5\x7a\xe2\xfe\x59\x1b\x5d\xd7" \ + "\xcd\xde\x7b\x62\x8c\x88\x08\x79\x9e\x63\xad\xa5" \ + "\xaa\xaa\x67\xb9\xbb\xdd\x6e\x6e\x9a\x06\xef\x3d" \ + "\x75\x5d\x3f\x29\xfe\xc7\xea\xfb\x7e\xbe\xbd\xbd" \ + "\x9d\xad\xb5\x73\x59\x96\xf3\xfd\xfd\xfd\xfc\xa2" \ + "\xe3\xdf\xd5\xc3\xc3\xc3\xdc\x34\x0d\xd3\x34\xb1" \ + "\xd9\x6c\xfe\x1e\x18\x4e\x63\xdc\xef\xf7\xa4\x94" \ + "\xfe\x26\xf6\x1f\xe9\x0b\xbc\x4c\x5e\x59\xd6\x14" \ + "\xca\xf4\x00\x00\x00\x00\x49\x45\x4e\x44\xae\x42" \ + "\x60\x82" + +class Eficas(QMainWindow): + def __init__(self,parent = None,name = None,fl = 0): + QMainWindow.__init__(self,parent,name,fl) + self.statusBar() + + self.image0 = QPixmap() + self.image0.loadFromData(image0_data,"PNG") + self.image1 = QPixmap() + self.image1.loadFromData(image1_data,"PNG") + self.image2 = QPixmap() + self.image2.loadFromData(image2_data,"PNG") + self.image3 = QPixmap() + self.image3.loadFromData(image3_data,"PNG") + self.image4 = QPixmap() + self.image4.loadFromData(image4_data,"PNG") + self.image5 = QPixmap() + self.image5.loadFromData(image5_data,"PNG") + self.image6 = QPixmap() + self.image6.loadFromData(image6_data,"PNG") + self.image7 = QPixmap() + self.image7.loadFromData(image7_data,"PNG") + self.image8 = QPixmap() + self.image8.loadFromData(image8_data,"PNG") + if not name: + self.setName("Eficas") + + self.setEnabled(1) + self.setSizePolicy(QSizePolicy(1,1,0,0,self.sizePolicy().hasHeightForWidth())) + self.setMinimumSize(QSize(21,323)) + self.setBackgroundOrigin(QMainWindow.WidgetOrigin) + f = QFont(self.font()) + self.setFont(f) + + self.setCentralWidget(QWidget(self,"qt_central_widget")) + + self.line1 = QFrame(self.centralWidget(),"line1") + self.line1.setGeometry(QRect(-30,-10,930,20)) + self.line1.setFrameShape(QFrame.HLine) + self.line1.setFrameShadow(QFrame.Sunken) + self.line1.setFrameShape(QFrame.HLine) + + self.fileNewAction = QAction(self,"fileNewAction") + self.fileNewAction.setIconSet(QIconSet(self.image0)) + self.fileOpenAction = QAction(self,"fileOpenAction") + self.fileOpenAction.setIconSet(QIconSet(self.image1)) + self.fileSaveAction = QAction(self,"fileSaveAction") + self.fileSaveAction.setIconSet(QIconSet(self.image2)) + self.fileSaveAsAction = QAction(self,"fileSaveAsAction") + self.fileExitAction = QAction(self,"fileExitAction") + self.editUndoAction = QAction(self,"editUndoAction") + self.editUndoAction.setEnabled(0) + self.editUndoAction.setIconSet(QIconSet(self.image3)) + self.editRedoAction = QAction(self,"editRedoAction") + self.editRedoAction.setEnabled(0) + self.editRedoAction.setIconSet(QIconSet(self.image4)) + self.editCutAction = QAction(self,"editCutAction") + self.editCutAction.setIconSet(QIconSet(self.image5)) + self.editCopyAction = QAction(self,"editCopyAction") + 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.helpContentsAction = QAction(self,"helpContentsAction") + self.helpIndexAction = QAction(self,"helpIndexAction") + self.helpAboutAction = QAction(self,"helpAboutAction") + self.helpAboutAction.setOn(0) + self.traductionnew_itemAction = QAction(self,"traductionnew_itemAction") + self.fileSaveCloseAction = QAction(self,"fileSaveCloseAction") + self.fileCloseAction = QAction(self,"fileCloseAction") + self.fileNewViewAction = QAction(self,"fileNewViewAction") + self.fileNewViewAction.setEnabled(0) + self.fileCloseAllAction = QAction(self,"fileCloseAllAction") + self.jdcRapportDeValidationAction = QAction(self,"jdcRapportDeValidationAction") + self.jdcFichierSourceAction = QAction(self,"jdcFichierSourceAction") + + + self.toolBar = QToolBar(QString(""),self,Qt.DockTop) + + self.toolBar.setFrameShape(QToolBar.MenuBarPanel) + self.toolBar.setHorizontallyStretchable(0) + self.fileNewAction.addTo(self.toolBar) + self.fileSaveAction.addTo(self.toolBar) + self.fileOpenAction.addTo(self.toolBar) + self.fileSaveAsAction.addTo(self.toolBar) + self.editCutAction.addTo(self.toolBar) + self.editPasteAction.addTo(self.toolBar) + self.editFindAction.addTo(self.toolBar) + self.fileExitAction.addTo(self.toolBar) + self.toolBar.addSeparator() + + + self.MenuBar = QMenuBar(self,"MenuBar") + + self.MenuBar.setMargin(2) + + self.Fichier = QPopupMenu(self) + self.fileNewAction.addTo(self.Fichier) + self.fileNewViewAction.addTo(self.Fichier) + self.fileOpenAction.addTo(self.Fichier) + self.fileSaveAction.addTo(self.Fichier) + self.fileSaveAsAction.addTo(self.Fichier) + self.fileCloseAction.addTo(self.Fichier) + self.fileCloseAllAction.addTo(self.Fichier) + self.Fichier.insertSeparator() + self.Fichier.insertSeparator() + self.fileExitAction.addTo(self.Fichier) + self.MenuBar.insertItem(QString(""),self.Fichier,2) + + self.Edition = QPopupMenu(self) + self.Edition.insertSeparator() + 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.MenuBar.insertItem(QString(""),self.JdC,4) + + self.Options = QPopupMenu(self) + self.MenuBar.insertItem(QString(""),self.Options,5) + + self.Aide = QPopupMenu(self) + self.MenuBar.insertItem(QString(""),self.Aide,6) + + self.Traduction = QPopupMenu(self) + self.traductionnew_itemAction.addTo(self.Traduction) + self.MenuBar.insertItem(QString(""),self.Traduction,7) + + self.Patrons = QPopupMenu(self) + self.MenuBar.insertItem(QString(""),self.Patrons,8) + + + self.languageChange() + + self.resize(QSize(902,575).expandedTo(self.minimumSizeHint())) + self.clearWState(Qt.WState_Polished) + + self.connect(self.fileNewAction,SIGNAL("activated()"),self.fileNew) + self.connect(self.fileOpenAction,SIGNAL("activated()"),self.fileOpen) + self.connect(self.fileSaveAction,SIGNAL("activated()"),self.fileSave) + self.connect(self.fileSaveAsAction,SIGNAL("activated()"),self.fileSaveAs) + self.connect(self.fileExitAction,SIGNAL("activated()"),self.fileExit) + self.connect(self.editUndoAction,SIGNAL("activated()"),self.editUndo) + 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.helpIndexAction,SIGNAL("activated()"),self.helpIndex) + self.connect(self.helpContentsAction,SIGNAL("activated()"),self.helpContents) + self.connect(self.helpAboutAction,SIGNAL("activated()"),self.helpAbout) + self.connect(self.fileCloseAction,SIGNAL("activated()"),self.fileClose) + self.connect(self.fileNewViewAction,SIGNAL("activated()"),self.fileNewView) + self.connect(self.fileCloseAllAction,SIGNAL("activated()"),self.fileCloseAll) + self.connect(self.editCopyAction,SIGNAL("activated()"),self.editCopy) + self.connect(self.jdcRapportDeValidationAction,SIGNAL("activated()"),self.jdcRapport) + self.connect(self.jdcFichierSourceAction,SIGNAL("activated()"),self.jdcFichierSource) + + + def languageChange(self): + self.setCaption(self.__tr("Eficas ")) + self.fileNewAction.setText(self.__tr("Nouveau")) + self.fileNewAction.setMenuText(self.__tr("&Nouveau")) + self.fileNewAction.setAccel(self.__tr("Ctrl+N")) + self.fileOpenAction.setText(self.__tr("Ouvrir")) + self.fileOpenAction.setMenuText(self.__tr("&Ouvrir")) + self.fileOpenAction.setAccel(self.__tr("Ctrl+O")) + self.fileSaveAction.setText(self.__tr("Sauver")) + self.fileSaveAction.setMenuText(self.__tr("&Sauver")) + self.fileSaveAction.setAccel(self.__tr("Ctrl+S")) + self.fileSaveAsAction.setText(self.__tr("Sauver Comme")) + self.fileSaveAsAction.setMenuText(self.__tr("Sauver Comme")) + self.fileSaveAsAction.setAccel(QString.null) + self.fileExitAction.setText(self.__tr("Exit")) + self.fileExitAction.setMenuText(self.__tr("E&xit")) + self.fileExitAction.setAccel(QString.null) + self.editUndoAction.setText(self.__tr("Undo")) + self.editUndoAction.setMenuText(self.__tr("&Undo")) + self.editUndoAction.setAccel(self.__tr("Ctrl+Z")) + self.editRedoAction.setText(self.__tr("Redo")) + self.editRedoAction.setMenuText(self.__tr("&Redo")) + self.editRedoAction.setAccel(self.__tr("Ctrl+Y")) + self.editCutAction.setText(self.__tr("Couper")) + self.editCutAction.setMenuText(self.__tr("C&ouper")) + self.editCutAction.setAccel(self.__tr("Ctrl+X")) + self.editCopyAction.setText(self.__tr("Copier")) + self.editCopyAction.setMenuText(self.__tr("&Copier")) + self.editCopyAction.setAccel(self.__tr("Ctrl+C")) + 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.helpContentsAction.setText(self.__tr("Contents")) + self.helpContentsAction.setMenuText(self.__tr("&Contents...")) + self.helpContentsAction.setAccel(QString.null) + self.helpIndexAction.setText(self.__tr("Index")) + self.helpIndexAction.setMenuText(self.__tr("&Index...")) + self.helpIndexAction.setAccel(QString.null) + self.helpAboutAction.setText(self.__tr("About")) + self.helpAboutAction.setMenuText(self.__tr("&About")) + self.helpAboutAction.setAccel(QString.null) + self.traductionnew_itemAction.setText(self.__tr("new item")) + self.traductionnew_itemAction.setMenuText(self.__tr("new item")) + self.fileSaveCloseAction.setText(self.__tr("Fermer")) + self.fileSaveCloseAction.setMenuText(self.__tr("Fermer")) + self.fileCloseAction.setText(self.__tr("Fermer")) + self.fileCloseAction.setMenuText(self.__tr("Fermer")) + self.fileCloseAction.setAccel(self.__tr("Ctrl+W")) + self.fileNewViewAction.setText(self.__tr("New view")) + self.fileCloseAllAction.setText(self.__tr("Tout Fermer")) + self.fileCloseAllAction.setMenuText(self.__tr("Tout Fermer")) + self.jdcRapportDeValidationAction.setText(self.__tr("Rapport de validation")) + self.jdcRapportDeValidationAction.setMenuText(self.__tr("Rapport de validation")) + self.jdcRapportDeValidationAction.setAccel(self.__tr("Ctrl+R")) + self.jdcFichierSourceAction.setText(self.__tr("Fichier source")) + self.jdcFichierSourceAction.setMenuText(self.__tr("Fichier source")) + self.jdcFichierSourceAction.setAccel(self.__tr("Ctrl+B")) + self.toolBar.setLabel(self.__tr("Tools")) + if self.MenuBar.findItem(2): + self.MenuBar.findItem(2).setText(self.__tr("&Fichier")) + if self.MenuBar.findItem(3): + self.MenuBar.findItem(3).setText(self.__tr("&Edition")) + if self.MenuBar.findItem(4): + self.MenuBar.findItem(4).setText(self.__tr("JdC")) + if self.MenuBar.findItem(5): + self.MenuBar.findItem(5).setText(self.__tr("Options")) + if self.MenuBar.findItem(6): + self.MenuBar.findItem(6).setText(self.__tr("&Aide")) + if self.MenuBar.findItem(7): + self.MenuBar.findItem(7).setText(self.__tr("Traduction")) + if self.MenuBar.findItem(8): + self.MenuBar.findItem(8).setText(self.__tr("Patrons")) + + + def fileNew(self): + print "Eficas.fileNew(): Not implemented yet" + + def fileOpen(self): + print "Eficas.fileOpen(): Not implemented yet" + + def fileSave(self): + print "Eficas.fileSave(): Not implemented yet" + + def fileSaveAs(self): + print "Eficas.fileSaveAs(): Not implemented yet" + + def filePrint(self): + print "Eficas.filePrint(): Not implemented yet" + + def fileExit(self): + print "Eficas.fileExit(): Not implemented yet" + + def editUndo(self): + print "Eficas.editUndo(): Not implemented yet" + + def editRedo(self): + print "Eficas.editRedo(): Not implemented yet" + + def jdcFichierSource(self): + print "Eficas.jdcFichierSource(): Not implemented yet" + + def fileNewView(self): + print "Eficas.fileNewView(): Not implemented yet" + + def editPaste(self): + print "Eficas.editPaste(): Not implemented yet" + + def editFind(self): + print "Eficas.editFind(): Not implemented yet" + + def helpIndex(self): + print "Eficas.helpIndex(): Not implemented yet" + + def helpContents(self): + print "Eficas.helpContents(): Not implemented yet" + + def helpAbout(self): + print "Eficas.helpAbout(): Not implemented yet" + + def fileClose(self): + print "Eficas.fileClose(): Not implemented yet" + + def fileCloseAll(self): + print "Eficas.fileCloseAll(): Not implemented yet" + + def jdcRapport(self): + print "Eficas.jdcRapport(): Not implemented yet" + + def editCut(self): + print "Eficas.editCut(): Not implemented yet" + + def editCopy(self): + print "Eficas.editCopy(): Not implemented yet" + + def __tr(self,s,c = None): + return qApp.translate("Eficas",s,c) diff --git a/Ui/myMain.ui b/Ui/myMain.ui index 863e7fc3..f04e2bec 100644 --- a/Ui/myMain.ui +++ b/Ui/myMain.ui @@ -137,10 +137,10 @@ image0 - New + Nouveau - &New + &Nouveau Ctrl+N @@ -154,10 +154,10 @@ image1 - Open + Ouvrir - &Open... + &Ouvrir Ctrl+O @@ -171,10 +171,10 @@ image2 - Save + Sauver - &Save + &Sauver Ctrl+S @@ -185,10 +185,10 @@ fileSaveAsAction - Save As + Sauver Comme - Save &As... + Sauver Comme @@ -212,6 +212,9 @@ editUndoAction + + false + image3 @@ -229,6 +232,9 @@ editRedoAction + + false + image4 @@ -250,10 +256,10 @@ image5 - Cut + Couper - Cu&t + C&ouper Ctrl+X @@ -267,10 +273,10 @@ image6 - Copy + Copier - &Copy + &Copier Ctrl+C @@ -284,10 +290,10 @@ image7 - Paste + Coller - &Paste + &Coller Ctrl+V @@ -297,6 +303,9 @@ editFindAction + + false + image8 @@ -342,6 +351,9 @@ helpAboutAction + + false + About @@ -368,10 +380,10 @@ fileSaveCloseAction - Close + Fermer - Close + Fermer @@ -379,10 +391,10 @@ fileCloseAction - Close + Fermer - Close + Fermer Ctrl+W @@ -392,6 +404,9 @@ fileNewViewAction + + false + New view @@ -401,10 +416,10 @@ fileCloseAllAction - Close All + Tout Fermer - Close All + Tout Fermer