Telemac - pytel

diff --git a/InterfaceQT4/configuration.py b/InterfaceQT4/configuration.py
index ac80afcc167764911b412ac9ea5ba88cfa484a58..bd55230f1528934680056dda0f42a38f5c511522 100644 (file)
--- a/InterfaceQT4/configuration.py
+++ b/InterfaceQT4/configuration.py
@@ -101,6 +101,7 @@ class CONFIG_BASE:
       self.closeEntete = False\r
       self.closeArbre = False\r
       self.force_langue=False\r
+      self.suiteTelemac=False\r
 \r
  \r
   #--------------------------------------\r

diff --git a/InterfaceQT4/editor.py b/InterfaceQT4/editor.py
index 2c3c421e618695b99e46e63fd70d4132c29044fe..7311d9f4c94837a5bf738901af4a2d1c0eeb31af 100755 (executable)
--- a/InterfaceQT4/editor.py
+++ b/InterfaceQT4/editor.py
@@ -328,7 +328,7 @@ class JDCEditor(Ui_baseWidget,QWidget):
         if self.code == "CARMELCND" : texte=self._newJDCCND()
         if self.code == "ZCRACKS" : texte=self._newZCRACKS()
         if self.code == "TELEMAC" : texte=self._newTELEMAC()
-        if self.code == "PSEN" : texte = self._newPSEN()
+        if self.code == "PSEN"    : texte = self._newPSEN()
         if self.code == "PSEN_N1" : texte = self._newPSEN_N1()
 
         if hasattr(self.readercata.cata[0],'TEXTE_NEW_JDC') : texte=self.readercata.cata[0].TEXTE_NEW_JDC

diff --git a/InterfaceQT4/qtEficas.py b/InterfaceQT4/qtEficas.py
index 494f424b68a0bae7324fff2d5beffe62b773ceea..44a668bcbf476a4acc65a1621b1fe9187ab13f83 100755 (executable)
--- a/InterfaceQT4/qtEficas.py
+++ b/InterfaceQT4/qtEficas.py
@@ -100,6 +100,8 @@ class Appli(Ui_Eficas,QMainWindow):
            ret=widgetLangue.exec_()
 
 
+        self.suiteTelemac=self.CONFIGURATION.suiteTelemac 
+
         from Extensions import localisation
         app=QApplication
         localisation.localise(None,self.langue)
@@ -204,6 +206,7 @@ class Appli(Ui_Eficas,QMainWindow):
               self.toolBar.removeAction(action)
         if self.code.upper() in Appli.__dict__.keys():
           listeTexte=apply(Appli.__dict__[self.code.upper()],(self,))
+        if self.suiteTelemac : self.lookSuiteTelemac()
 
     def initAides(self):
         #print "je passe la"
@@ -313,6 +316,8 @@ class Appli(Ui_Eficas,QMainWindow):
         self.toolBar.removeAction(self.actionParametres)
         self.menuJdC.removeAction(self.actionParametres)
 
+    def enleverSupprimer(self):
+        self.toolBar.removeAction(self.actionSupprimer)
 
     def enleverNewInclude(self):
         self.actionNouvel_Include.setVisible(False)
@@ -421,6 +426,13 @@ class Appli(Ui_Eficas,QMainWindow):
         self.connectRechercherDsCatalogue()
         self.ajoutSortieLegere()
 
+    def lookSuiteTelemac(self):
+        self.enleverActionsStructures()
+        self.enleverNewInclude()
+        self.enleverParametres()
+        self.enleverSupprimer()
+        self.enleverRechercherDsCatalogue()
+
     def ajoutHelpPSEN(self):
         self.actionParametres_Eficas.setText('Help PSEN')
         if monEnvQT5 :  self.actionParametres_Eficas.triggered.connect(self.aidePSEN)