From: pascale.noyret <pascale.noyret@edf.fr>
Date: Wed, 16 Nov 2016 12:08:34 +0000 (+0100)
Subject: Pour coherence avec ADAO module"
X-Git-Tag: V8_2_0~12
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=896c37db7732d07210a27c222a21725b7a48c072;p=tools%2Feficas.git

Pour coherence avec ADAO module"
---

diff --git a/Adao/configuration_Adao.py b/Adao/configuration_Adao.py
index b9b56fe0..eacd427b 100644
--- a/Adao/configuration_Adao.py
+++ b/Adao/configuration_Adao.py
@@ -1,43 +1,73 @@
-# -*- coding: utf-8 -*-
-#            CONFIGURATION MANAGEMENT OF EDF VERSION
-# ======================================================================
-# COPYRIGHT (C) 1991 - 2002  EDF R&D                  WWW.CODE-ASTER.ORG
-# THIS PROGRAM IS FREE SOFTWARE; YOU CAN REDISTRIBUTE IT AND/OR MODIFY
-# IT UNDER THE TERMS OF THE GNU GENERAL PUBLIC LICENSE AS PUBLISHED BY
-# THE FREE SOFTWARE FOUNDATION; EITHER VERSION 2 OF THE LICENSE, OR
-# (AT YOUR OPTION) ANY LATER VERSION.
-#
-# THIS PROGRAM IS DISTRIBUTED IN THE HOPE THAT IT WILL BE USEFUL, BUT
-# WITHOUT ANY WARRANTY; WITHOUT EVEN THE IMPLIED WARRANTY OF
-# MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. SEE THE GNU
-# GENERAL PUBLIC LICENSE FOR MORE DETAILS.
-#
-# YOU SHOULD HAVE RECEIVED A COPY OF THE GNU GENERAL PUBLIC LICENSE
-# ALONG WITH THIS PROGRAM; IF NOT, WRITE TO EDF R&D CODE_ASTER,
-#    1 AVENUE DU GENERAL DE GAULLE, 92141 CLAMART CEDEX, FRANCE.
-#
-#
-# ======================================================================
-"""
-    Ce module sert pour charger les paramètres de configuration d'EFICAS
-"""
-# Modules Python
-from InterfaceQT4 import configuration
-import os
-
-
-class CONFIG(configuration.CONFIG_BASE):
-
-  #-----------------------------------
-  def __init__(self,appli,repIni):
-  #-----------------------------------
-
-      self.labels_user=['catalogues','lang']
-      self.labels_eficas=['lang','rep_cata','catalogues']
-
-      configuration.CONFIG_BASE.__init__(self,appli,repIni)
-
-
-def make_config(appli,rep):
-    return CONFIG(appli,rep)
-
+# -*- coding: utf-8 -*-
+#
+# Copyright (C) 2008-2016 EDF R&D
+#
+# This file is part of SALOME ADAO module
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+#
+# 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
+"""
+# 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 InterfaceQT4 import configuration
+
+# Classe de base permettant de lire, afficher
+# et sauvegarder les fichiers utilisateurs
+class CONFIG(configuration.CONFIG_BASE):
+
+  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)
+
+    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"
+
+    # 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"),)
+
+def make_config(appli,rep):
+
+    return CONFIG(appli,rep)
+
+def make_config_style(appli,rep):
+
+    return None
diff --git a/Adao/prefs_Adao.py b/Adao/prefs_Adao.py
index 65ed235b..490b46cd 100644
--- a/Adao/prefs_Adao.py
+++ b/Adao/prefs_Adao.py
@@ -21,5 +21,9 @@ catalogues = (
 
 # lang indique la langue utilisée pour les chaines d'aide : fr ou ang
 lang='fr'
+closeAutreCommande = True
+closeFrameRechercheCommande = True
+closeEntete = True
+