gestion des listes et label sur 2

[tools/eficas.git] / InterfaceQT4 / qtEficas.py

diff --git a/InterfaceQT4/qtEficas.py b/InterfaceQT4/qtEficas.py
index 4e66776467dda31e719c146c5d4a4fb979bb8f0f..fb9cf98eec033163f6ec2dd36a63135b44b631bf 100644 (file)
--- a/InterfaceQT4/qtEficas.py
+++ b/InterfaceQT4/qtEficas.py
@@ -91,12 +91,6 @@ class Appli(Ui_Eficas,QMainWindow):
         self.ouvreFichiers()
 
 
-    #def eventFilter(QObject watched, QEvent e) :
-    #def eventFilter(watched, e) :
-    #    print "hhhhhhhhhhhhhhhhhhhhhh"
-    #    return QMainWindow.eventFilter(watched, e)
-
-   
 
     def definitCode(self,code,ssCode) :
         self.code=code
@@ -164,7 +158,8 @@ class Appli(Ui_Eficas,QMainWindow):
         self.actionCode.setEnabled(True)
         self.menuAide.addAction(self.actionCode)
 
-    def MAP(self):
+
+    def ajoutExecution(self):
         self.menuExecution = self.menubar.addMenu(QApplication.translate("Eficas", "Execution", None, QApplication.UnicodeUTF8))
         self.actionExecution = QAction(self)
         icon6 = QIcon(self.repIcon+"/roue.png")
@@ -176,9 +171,9 @@ class Appli(Ui_Eficas,QMainWindow):
         self.actionExecution.setText(QApplication.translate("Eficas", "Execution ", None, QApplication.UnicodeUTF8))
         self.connect(self.actionExecution,SIGNAL("activated()"),self.run)
 
+    def ajoutSauveExecution(self):
         self.actionSaveRun = QAction(self)
         icon7 = QIcon(self.repIcon+"/export_MAP.png")
-        #icon7 = QIcon(self.repIcon+"/saveRun.png")
         self.actionSaveRun.setIcon(icon7)
         self.actionSaveRun.setObjectName("actionSaveRun")
         self.menuExecution.addAction(self.actionSaveRun)
@@ -187,35 +182,41 @@ class Appli(Ui_Eficas,QMainWindow):
         self.actionSaveRun.setText(QApplication.translate("Eficas", "Save Run", None, QApplication.UnicodeUTF8))
         self.connect(self.actionSaveRun,SIGNAL("activated()"),self.saveRun)
 
-        self.menuOptions = self.menubar.addMenu("menuOptions")
-        self.menuOptions.addAction(self.actionParametres_Eficas)
-        self.menuOptions.setTitle(tr("Options"))
+    def griserActionsStructures(self):
+        self.actionCouper.setEnabled(False)
+        self.actionColler.setEnabled(False)
+        self.actionCopier.setEnabled(False)
+        self.actionSupprimer.setEnabled(False)
+
+    def enleverNewInclude(self):
+        self.actionNouvel_Include.setVisible(False)
+
+    def enleverRechercherDsCatalogue(self):
+        self.actionRechercherDsCatalogue.setVisible(False)
 
     def ZCRACKS(self):
+        self.enleverNewInclude()
         self.toolBar.addSeparator()
-        self.menuExecution = self.menubar.addMenu(QApplication.translate("Eficas", "Execution", None, QApplication.UnicodeUTF8))
-        self.actionExecution = QAction(self)
-        icon6 = QIcon(self.repIcon+"/compute.png")
-        self.actionExecution.setIcon(icon6)
-        self.actionExecution.setObjectName("actionExecution")
-        self.menuExecution.addAction(self.actionExecution)
-        if not(self.actionExecution in self.toolBar.actions()):
-           self.toolBar.addAction(self.actionExecution)
-        self.actionExecution.setText(QApplication.translate("Eficas", "Execution ", None, QApplication.UnicodeUTF8))
-        self.connect(self.actionExecution,SIGNAL("activated()"),self.run)
+        self.ajoutExecution()
 
         self.menuOptions = self.menubar.addMenu("menuOptions")
         self.menuOptions.addAction(self.actionParametres_Eficas)
         self.menuOptions.setTitle(tr("Options"))
 
+    def ADAO(self):
+        self.griserActionsStructures()
+        self.enleverNewInclude()
+        self.enleverRechercherDsCatalogue()
 
     def ASTER(self) :
         self.menuTraduction = self.menubar.addMenu("menuTraduction")
-        self.menuTraduction.addAction(self.actionTraduitV7V8)
-        self.menuTraduction.addAction(self.actionTraduitV8V9)
+        self.menuTraduction.addAction(self.actionTraduitV11V12)
+        self.menuTraduction.addAction(self.actionTraduitV10V11)
         self.menuTraduction.addAction(self.actionTraduitV9V10)
         self.menuTraduction.setTitle(tr("Traduction"))
 
+        self.menuFichier.addAction(self.actionSauveLigne)
+
         self.menuOptions = self.menubar.addMenu("menuOptions")
         self.menuOptions.addAction(self.actionParametres_Eficas)
         self.menuOptions.addAction(self.actionLecteur_Pdf)
@@ -223,24 +224,27 @@ class Appli(Ui_Eficas,QMainWindow):
 
     def CARMEL3D(self):
         #if self.salome == 0 : return
+        self.enleverNewInclude()
         self.menuMesh = self.menubar.addMenu("menuMesh")
         self.menuMesh.setObjectName("Mesh")
         self.menuMesh.addAction(self.actionChercheGrpMaille)
+        self.griserActionsStructures()
 
     def CARMELCND(self):
-        self.menuMesh = self.menubar.addMenu("Maillage")
-        self.menuMesh.setObjectName("Mesh")
-        self.menuMesh.addAction(self.actionChercheGrp)
-        self.menuExecution = self.menubar.addMenu(QApplication.translate("Eficas", "Execution", None, QApplication.UnicodeUTF8))
-        self.actionExecution = QAction(self)
-        icon6 = QIcon(self.repIcon+"/compute.png")
-        self.actionExecution.setIcon(icon6)
-        self.actionExecution.setObjectName("actionExecution")
-        self.menuExecution.addAction(self.actionExecution)
-        if not(self.actionExecution in self.toolBar.actions()):
-           self.toolBar.addAction(self.actionExecution)
-        self.actionExecution.setText(QApplication.translate("Eficas", "Execution ", None, QApplication.UnicodeUTF8))
-        self.connect(self.actionExecution,SIGNAL("activated()"),self.run)
+        self.enleverNewInclude()
+        self.enleverRechercherDsCatalogue()
+        self.ajoutExecution()
+        self.ajoutSauveExecution()
+        self.griserActionsStructures()
+        
+    def MAP(self):
+        self.enleverNewInclude()
+        self.toolBar.addSeparator()
+        self.ajoutExecution()
+        self.ajoutSauveExecution()
+        self.menuOptions = self.menubar.addMenu("menuOptions")
+        self.menuOptions.addAction(self.actionParametres_Eficas)
+        self.menuOptions.setTitle(tr("Options"))
 
 
     def ChercheGrpMesh(self):
@@ -298,6 +302,7 @@ class Appli(Ui_Eficas,QMainWindow):
 
         self.connect(self.actionEficas,SIGNAL("activated()"),self.aidePPal)
         self.connect(self.actionVersion,SIGNAL("activated()"),self.version)
+        self.connect(self.actionParametres,SIGNAL("activated()"),self.gestionParam)
 
         self.connect(self.actionCouper,SIGNAL("activated()"),self.editCut)
         self.connect(self.actionCopier,SIGNAL("activated()"),self.editCopy)
@@ -315,20 +320,25 @@ class Appli(Ui_Eficas,QMainWindow):
         #self.connect(self.helpContentsAction,SIGNAL("activated()"),self.helpContents)
 
         # Pour Aster
-        self.actionTraduitV7V8 = QAction(self)
-        self.actionTraduitV7V8.setObjectName("actionTraduitV7V8")
-        self.actionTraduitV8V9 = QAction(self)
-        self.actionTraduitV8V9.setObjectName("actionTraduitV8V9")
         self.actionTraduitV9V10 = QAction(self)
         self.actionTraduitV9V10.setObjectName("actionTraduitV9V10")
-        self.actionTraduitV7V8.setText(tr("TraduitV7V8"))
-        self.actionTraduitV8V9.setText(tr("TraduitV8V9"))
         self.actionTraduitV9V10.setText(tr("TraduitV9V10"))
+        self.actionTraduitV10V11 = QAction(self)
+        self.actionTraduitV10V11.setObjectName("actionTraduitV10V11")
+        self.actionTraduitV10V11.setText(tr("TraduitV10V11"))
+        self.actionTraduitV11V12 = QAction(self)
+        self.actionTraduitV11V12.setObjectName("actionTraduitV11V12")
+        self.actionTraduitV11V12.setText(tr("TraduitV11V12"))
+        self.actionSauveLigne = QAction(self)
+        self.actionSauveLigne.setText(tr("Sauve Format Ligne"))
+
         self.connect(self.actionParametres_Eficas,SIGNAL("activated()"),self.optionEditeur)
         self.connect(self.actionLecteur_Pdf,SIGNAL("activated()"),self.optionPdf)
-        self.connect(self.actionTraduitV7V8,SIGNAL("activated()"),self.traductionV7V8)
-        self.connect(self.actionTraduitV8V9,SIGNAL("activated()"),self.traductionV8V9)
         self.connect(self.actionTraduitV9V10,SIGNAL("activated()"),self.traductionV9V10)
+        self.connect(self.actionTraduitV10V11,SIGNAL("activated()"),self.traductionV10V11)
+        self.connect(self.actionTraduitV11V12,SIGNAL("activated()"),self.traductionV11V12)
+        self.connect(self.actionSauveLigne,SIGNAL("activated()"),self.sauveLigne)
+
 
         # Pour Carmel
         self.actionChercheGrpMaille = QAction(self)
@@ -448,13 +458,13 @@ class Appli(Ui_Eficas,QMainWindow):
 
 
 
-    def traductionV7V8(self):
+    def traductionV11V12(self):
         from gereTraduction import traduction
-        traduction(self.CONFIGURATION.repIni,self.viewmanager,"V7V8")
+        traduction(self.CONFIGURATION.repIni,self.viewmanager,"V11V12")
 
-    def traductionV8V9(self):
+    def traductionV10V11(self):
         from gereTraduction import traduction
-        traduction(self.CONFIGURATION.repIni,self.viewmanager,"V8V9")
+        traduction(self.CONFIGURATION.repIni,self.viewmanager,"V10V11")
 
     def traductionV9V10(self):
         from gereTraduction import traduction
@@ -556,6 +566,9 @@ class Appli(Ui_Eficas,QMainWindow):
             if msg != "":
                 QMessageBox.warning(self, tr(u"Erreur"), msg)
 
+    def sauveLigne(self):
+        return self.viewmanager.sauveLigneCurrentEditor()
+
     def fileSave(self):
         return self.viewmanager.saveCurrentEditor()
 
@@ -603,6 +616,9 @@ class Appli(Ui_Eficas,QMainWindow):
     def jdcRapport(self):
         self.viewmanager.handleViewJdcRapport()
 
+    def gestionParam(self):
+        self.viewmanager.handlegestionParam()
+
     def visuJdcPy(self):
         self.viewmanager.handleViewJdcPy()