sauve du 9 mai

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

diff --git a/InterfaceQT4/qtEficas.py b/InterfaceQT4/qtEficas.py
index c5b6bc99fd428c2c282c0f7c59ccbe7b56dd6cd5..9efa2851871347fef867d7441c009dde046ff9ba 100755 (executable)
--- a/InterfaceQT4/qtEficas.py
+++ b/InterfaceQT4/qtEficas.py
@@ -49,7 +49,8 @@ class Appli(Ui_Eficas,QMainWindow):
         Ui_Eficas.__init__(self)
 
         version=getEficasVersion()
-        self.VERSION_EFICAS="Eficas QT4 "+version
+        self.VERSION_EFICAS="Eficas QT4 Salome "+version
+        if monEnvQT5 : self.VERSION_EFICAS="Eficas QT5 Salome "
         self.salome=salome
         self.ihm="QT"
         self.ssIhm=ssIhm
@@ -84,6 +85,8 @@ class Appli(Ui_Eficas,QMainWindow):
         localisation.localise(app,langue)
 
         self.setupUi(self)
+        if self.code in ['MAP',] : self.resize(1440,self.height())
+        else : self.resize(1800,self.height())
 
         icon = QIcon(self.repIcon+"/parametres.png")
         self.actionParametres.setIcon(icon)
@@ -554,8 +557,7 @@ class Appli(Ui_Eficas,QMainWindow):
        except : pass
 
     def addToRecentList(self, fn):
-      if not monEnvQT5 : addToRecentListQT4(self, fn); return
-
+      if not monEnvQT5 : self.addToRecentListQT4(fn); return
       while fn in self.recent: self.recent.remove(fn)
       self.recent.insert(0,fn)
       if len(self.recent) > 9:
@@ -683,7 +685,7 @@ class Appli(Ui_Eficas,QMainWindow):
         for rp in self.recent:
             id = self.recentMenu.addAction(rp)
             self.ficRecents[id]=rp
-            if monEnvQT5 : self.id.triggered.connect(self.handleOpenRecent)
+            if monEnvQT5 : id.triggered.connect(self.handleOpenRecent)
             else         : self.connect(id, SIGNAL('triggered()'),self.handleOpenRecent)
         self.recentMenu.addSeparator()
         self.recentMenu.addAction(tr('&Effacer'), self.handleClearRecent)