Updating version and copyright date information

[modules/adao.git] / src / daEficas / configuration_ADAO.py

diff --git a/src/daEficas/configuration_ADAO.py b/src/daEficas/configuration_ADAO.py
index fee72b53ebe67cc7343c0e1115aa9725e59822bc..f7b5d6c2abcad63ddf8104e27363ff6a8fa30f10 100644 (file)
--- a/src/daEficas/configuration_ADAO.py
+++ b/src/daEficas/configuration_ADAO.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2008-2016 EDF R&D
+# Copyright (C) 2008-2020 EDF R&D
 #
 # This file is part of SALOME ADAO module
 #
@@ -20,48 +20,46 @@
 #
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
-# Author: André Ribes, andre.ribes@edf.fr, EDF R&D
+# Author: André Ribes, andre.ribes@edf.fr, EDF R&D
 
 """
-    Ce module sert pour charger les paramètres de configuration d'EFICAS
+    Ce module sert pour charger les paramètres de configuration d'EFICAS
 """
 # 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 *
+from PyQt5.QtGui  import *
 
 # Modules Eficas
-from Editeur import 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): # configuration.CONFIG_BASE):
 
   def __init__(self,appli,repIni):
 
-    self.labels_eficas = ['lang']
-    configuration.CONFIG_BASE.__init__(self,appli,repIni)
+    # self.labels_eficas = ['lang']
+    self.labels_eficas = ['lang','rep_cata','catalogues','closeAutreCommande','closeFrameRechercheCommande','closeEntete','taille']
+    configuration.configBase.__init__(self,appli,repIni)
+    #~ configuration.CONFIG_BASE.__init__(self,appli,repIni)
 
-    self.rep_user = os.environ["HOME"]
-    self.appli   = appli
-    self.code    = appli.code
-    # self.lang    = "fr"
-    self.rep_ini = repIni
-    self.rep_mat=" " # Compatbilite Aster
-    self.savedir      = self.rep_user
+    self.rep_user         = os.environ["HOME"]
+    self.appli            = appli
+    self.code             = appli.code
+    # self.lang           = "fr"
+    self.rep_ini          = repIni
+    self.rep_mat          = " " # Compatbilite Aster
+    self.savedir          = self.rep_user
     self.generator_module = "generator_adao"
-    self.convert_module = "convert_adao"
+    self.convert_module   = "convert_adao"
 
     # 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"),)
+# JPA 21/09/2017 : self.catalogues = (("ADAO", "V0", os.path.join(self.rep_ini, 'ADAO_Cata_V0.py'), "python", "adao"),)
 
 def make_config(appli,rep):