From: Renaud Barate <renaud.barate@edf.fr>
Date: Fri, 16 Sep 2011 10:06:44 +0000 (+0000)
Subject: Fix icons for Eficas in Salome
X-Git-Tag: LOGILAB~303
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=ea30c0d5dfabef722a8d8590b4db2c3f46392897;p=tools%2Feficas.git

Fix icons for Eficas in Salome
---

diff --git a/InterfaceQT4/qtEficas.py b/InterfaceQT4/qtEficas.py
index 740b3eae..ba237f06 100644
--- a/InterfaceQT4/qtEficas.py
+++ b/InterfaceQT4/qtEficas.py
@@ -26,14 +26,15 @@ class Appli(Ui_Eficas,QMainWindow):
         self.VERSION_EFICAS="Eficas QT4 V6.3.1"
         self.salome=salome
         self.ihm="QT"
-	self.top = self    #(pour CONFIGURATION)
+        self.top = self    #(pour CONFIGURATION)
         self.QWParent=None #(Pour lancement sans IHM)
         self.indice=0
         self.dict_reels={}
 
         self.multi=multi
         if self.multi == False :self.definitCode(code,ssCode)
-        self.RepIcon=os.path.abspath(os.path.join(os.getcwd(),'../Editeur/icons'))
+        eficas_root_dir = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
+        self.RepIcon = os.path.join(eficas_root_dir, "Editeur", "icons")
         self.ajoutIcones()
 
 
diff --git a/Openturns_Study/prefs_OPENTURNS_STUDY.py b/Openturns_Study/prefs_OPENTURNS_STUDY.py
index ad8d2311..7f544647 100644
--- a/Openturns_Study/prefs_OPENTURNS_STUDY.py
+++ b/Openturns_Study/prefs_OPENTURNS_STUDY.py
@@ -21,6 +21,7 @@
 
 import os, sys
 # Les variables pouvant positionnees sont :
+print "import des prefs de OPENTURNS"
 
 # repIni sert à localiser le fichier 
 # initialdir sert comme directory initial des QFileDialog
@@ -45,7 +46,6 @@ savedir         = os.environ['HOME']
 
 
 # OpenTURNS Python module
-#OpenTURNS_path="/opt/Openturns/Install_0_13_2/lib/python2.5/site-packages"
 OpenTURNS_path=""
 # Choix des catalogues
 if len(OpenTURNS_path) > 0: