merge V9

[tools/eficas.git] / Adao / configuration_Adao.py

diff --git a/Adao/configuration_Adao.py b/Adao/configuration_Adao.py
index eacd427b30026c7cf9f01f51dc76a1e46abb9e5e..580c9921b6e9e8cf0e98b2c3659e37e33ece0948 100644 (file)
--- a/Adao/configuration_Adao.py
+++ b/Adao/configuration_Adao.py
@@ -20,7 +20,6 @@
 #
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
-# Author: André Ribes, andre.ribes@edf.fr, EDF R&D
 
 """
     Ce module sert pour charger les paramètres de configuration d'EFICAS
@@ -28,26 +27,22 @@
 # Modules Python
 # print "passage dans la surcharge de configuration pour Adao"
 import os, sys, string, types, re
-import traceback
-from daUtils.qtversion import useQT5
-if useQT5:
-    from PyQt5.QtGui  import *
-else:
-    from PyQt4.QtGui  import *
+
 
 # Modules Eficas
-from Editeur import utils
+
+
+#from Editeur import Eficas_utils
 from InterfaceQT4 import configuration
 
 # Classe de base permettant de lire, afficher
 # et sauvegarder les fichiers utilisateurs
-class CONFIG(configuration.CONFIG_BASE):
+class CONFIG(configuration.configBase):
 
   def __init__(self,appli,repIni):
 
-    #self.labels_eficas = ['lang']
     self.labels_eficas=['lang','rep_cata','catalogues','closeAutreCommande','closeFrameRechercheCommande','closeEntete','taille']
-    configuration.CONFIG_BASE.__init__(self,appli,repIni)
+    configuration.configBase.__init__(self,appli,repIni)
 
     self.rep_user = os.environ["HOME"]
     self.appli   = appli
@@ -62,12 +57,8 @@ class CONFIG(configuration.CONFIG_BASE):
     # Format des catalogues...
     # (code, version, catalogue, formatIn, formatOut)
     # Il faut les mettre dans un tuple
-    self.catalogues = (("ADAO", "V0", os.path.join(self.rep_ini, 'ADAO_Cata_V0.py'), "adao"),)
+    #self.catalogues = (("ADAO", "V0", os.path.join(self.rep_ini, 'ADAO_Cata_V0.py'), "adao"),)
 
 def make_config(appli,rep):
-
     return CONFIG(appli,rep)
 
-def make_config_style(appli,rep):
-
-    return None