Preparation a la V9_4

diff --git a/InterfaceQT4/eficas_go.py b/InterfaceQT4/eficas_go.py
index d7aea420395a51840183530d2c185f726b943139..0bd3abfb2e8c86200caea792b3d673b2eb5964dd 100755 (executable)
--- a/InterfaceQT4/eficas_go.py
+++ b/InterfaceQT4/eficas_go.py
@@ -26,7 +26,6 @@ try :
    from builtins import str
 except : pass
 
-from PyQt5.QtWidgets import QApplication
 
 import sys,os
 repIni=os.path.abspath(os.path.join(os.path.dirname(os.path.abspath(__file__)),".."))
@@ -52,6 +51,12 @@ def lanceEficas(code=None,fichier=None,ssCode=None,multi=False,langue='en'):
         Lance l'appli EFICAS
     """
     # Analyse des arguments de la ligne de commande
+    try :
+      from PyQt5.QtWidgets import QApplication
+    except :
+      print('Please, set qt environment')
+      return
+
     from Editeur  import session
     options=session.parse(sys.argv)
     if options.code!= None : code=options.code

diff --git a/MT/configuration_MT.py b/MT/configuration_MT.py
index b9b56fe0ffdafaa203382b58347dfbfc0fa3bc87..b4ca36bd4bba718ebbaca98e44c67013e1ea722e 100644 (file)
--- a/MT/configuration_MT.py
+++ b/MT/configuration_MT.py
@@ -26,7 +26,7 @@ from InterfaceQT4 import configuration
 import os\r
 \r
 \r
-class CONFIG(configuration.CONFIG_BASE):\r
+class CONFIG(configuration.configBase):\r
 \r
   #-----------------------------------\r
   def __init__(self,appli,repIni):\r
@@ -35,7 +35,7 @@ class CONFIG(configuration.CONFIG_BASE):
       self.labels_user=['catalogues','lang']\r
       self.labels_eficas=['lang','rep_cata','catalogues']\r
 \r
-      configuration.CONFIG_BASE.__init__(self,appli,repIni)\r
+      configuration.configBase.__init__(self,appli,repIni)\r
 \r
 \r
 def make_config(appli,rep):\r

diff --git a/MT/qtEficasMT.py b/MT/qtEficasMT.py
index e07cbaf36dde1dfe7c4d3664da51bd24be1ffc93..3fa63c87eb7ab72daa1ce6b769a872b2766eafa8 100755 (executable)
--- a/MT/qtEficasMT.py
+++ b/MT/qtEficasMT.py
@@ -23,16 +23,14 @@
 """
 # Modules Python
 # Modules Eficas
+import sys
 import prefs
 name='prefs_'+prefs.code
 __import__(name)
 
-import sys
-reload(sys)
-sys.setdefaultencoding('latin1')
 import os
 sys.path.append(os.path.join(os.path.abspath(os.path.dirname(__file__)),'..'))
 
 import prefs
 from InterfaceQT4 import eficas_go
-eficas_go.lance_eficas(code=prefs.code)
+eficas_go.lanceEficas(code=prefs.code)