Remove Patrons menu for Aster (patch from Pascale)

diff --git a/Editeur/listePatrons.py b/Editeur/listePatrons.py
index 872f290bcf8b88487846795083028659d7679f00..3de4e4f9c9abaab9e00e0d9febf1897a76259d8d 100644 (file)
--- a/Editeur/listePatrons.py
+++ b/Editeur/listePatrons.py
@@ -1,7 +1,7 @@
 import os
 import re
 
-sous_menus={"ASTER" : {0:{"3D":"3D.comm"},1:{"poutre":"pou.comm"},2:{"salome":"salome.comm"},3:{"divers":"comm"}},
+sous_menus={
            "OPENTURNS_STUDY" : {0:{"Anne":"Std.comm"}},
             "OPENTURNS_WRAPPER" : {0:{"Anne":"wrapper_exemple.comm"}},
            }

diff --git a/InterfaceQT4/qtEficas.py b/InterfaceQT4/qtEficas.py
index 8df1afabf05f11e3bfb68a17888666e69525402a..d7ea43f8c8766a8548f0c6cde27323bd66654a50 100644 (file)
--- a/InterfaceQT4/qtEficas.py
+++ b/InterfaceQT4/qtEficas.py
@@ -206,6 +206,12 @@ class Appli(Ui_Eficas,QMainWindow):
     def initPatrons(self) :
     # Mise à jour du menu des fichiers recemment ouverts
         from Editeur import listePatrons
+        if not(self.code in listePatrons.sous_menus.keys()) :
+           return
+        self.menuPatrons = QMenu(self.menubar)
+        self.menuPatrons.setObjectName("menuPatrons")
+        self.menubar.addAction(self.menuPatrons.menuAction())
+        self.menuPatrons.setTitle(QApplication.translate("Eficas", "Patrons", None, QApplication.UnicodeUTF8))
         self.listePatrons = listePatrons.listePatrons(self.code)
         idx = 0
         for nomSsMenu in self.listePatrons.liste.keys():

diff --git a/UiQT4/myMain.ui b/UiQT4/myMain.ui
index cf9dbea54cfb4bfa0c655bde6fa111bac79e5117..b49ae8dfb1a3f6f00e75c81959be66c2038ca6eb 100644 (file)
--- a/UiQT4/myMain.ui
+++ b/UiQT4/myMain.ui
@@ -68,17 +68,11 @@
     <addaction name="actionParametres_Eficas" />
     <addaction name="actionLecteur_Pdf" />
    </widget>
-   <widget class="QMenu" name="menuPatrons" >
-    <property name="title" >
-     <string>Patrons</string>
-    </property>
-   </widget>
    <addaction name="menuFichier" />
    <addaction name="menuEdition" />
    <addaction name="menuJdC" />
    <addaction name="menu_Aide" />
    <addaction name="menuOptions" />
-   <addaction name="menuPatrons" />
   </widget>
   <widget class="QStatusBar" name="statusbar" />
   <widget class="QToolBar" name="toolBar" >