optim eciture

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

diff --git a/InterfaceQT4/monWidgetFormule.py b/InterfaceQT4/monWidgetFormule.py
index 49e3f19fac397e60b571f7a96b31bb6747e34112..50a21468f695f2311fec9d0c4c729171b5ecd9b8 100644 (file)
--- a/InterfaceQT4/monWidgetFormule.py
+++ b/InterfaceQT4/monWidgetFormule.py
@@ -19,23 +19,22 @@
 # Modules Python
 # Modules Eficas
 
+from __future__ import absolute_import
+try :
+   from builtins import str
+except : pass
+
 from desWidgetFormule import Ui_WidgetFormule
-from gereIcones import FacultatifOuOptionnel
-from determine import monEnvQT5
+from .gereIcones import FacultatifOuOptionnel
 
-if monEnvQT5:
-   from PyQt5.QtWidgets  import QWidget
-   from PyQt5.QtGui import QIcon
-   from PyQt5.QtCore import Qt
-else :
-   from PyQt4.QtGui import *
-   from PyQt4.QtCore import *
+from PyQt5.QtWidgets  import QWidget
+from PyQt5.QtGui import QIcon
+from PyQt5.QtCore import Qt
 
 
 from Extensions.i18n import tr
 import Accas 
 import os
-import string
 
     
 # Import des panels
@@ -60,32 +59,18 @@ class MonWidgetFormule(QWidget,Ui_WidgetFormule,FacultatifOuOptionnel):
       self.setValide()
 
      
-      if monEnvQT5 :
-         if self.editor.code in ['MAP','CARMELCND'] : self.bCatalogue.close()
-         else : self.bCatalogue.clicked.connect(self.afficheCatalogue)
-         if self.editor.code in ['Adao','MAP'] : 
-               self.bAvant.close()
-               self.bApres.close()
-         else : 
-               self.bAvant.clicked.connect(self.afficheAvant)
-               self.bApres.clicked.connect(self.afficheApres)
-         self.LENom.returnPressed.connect(self.nomChange)
-         self.LENomFormule.returnPressed.connect(self.NomFormuleSaisi)
-         self.LENomsArgs.returnPressed.connect(self.argsSaisis)
-         self.LECorpsFormule.returnPressed.connect(self.FormuleSaisie)
+      if self.editor.code in ['MAP','CARMELCND'] : self.bCatalogue.close()
+      else : self.bCatalogue.clicked.connect(self.afficheCatalogue)
+      if self.editor.code in ['Adao','MAP','ADAO'] : 
+          self.bAvant.close()
+          self.bApres.close()
       else : 
-         if self.editor.code in ['MAP','CARMELCND'] : self.bCatalogue.close()
-         else : self.connect(self.bCatalogue,SIGNAL("clicked()"), self.afficheCatalogue)
-         if self.editor.code in ['Adao','MAP'] : 
-               self.bAvant.close()
-               self.bApres.close()
-         else : 
-               self.connect(self.bAvant,SIGNAL("clicked()"), self.afficheAvant)
-               self.connect(self.bApres,SIGNAL("clicked()"), self.afficheApres)
-         self.connect(self.LENom,SIGNAL("returnPressed()"),self.nomChange)
-         self.connect(self.LENomFormule,SIGNAL("returnPressed()"),self.NomFormuleSaisi)
-         self.connect(self.LENomsArgs,SIGNAL("returnPressed()"),self.argsSaisis)
-         self.connect(self.LECorpsFormule,SIGNAL("returnPressed()"),self.FormuleSaisie)
+          self.bAvant.clicked.connect(self.afficheAvant)
+          self.bApres.clicked.connect(self.afficheApres)
+      self.LENom.returnPressed.connect(self.nomChange)
+      self.LENomFormule.returnPressed.connect(self.NomFormuleSaisi)
+      self.LENomsArgs.returnPressed.connect(self.argsSaisis)
+      self.LECorpsFormule.returnPressed.connect(self.FormuleSaisie)