From: Pascale Noyret <pascale.noyret@edf.fr>
Date: Tue, 27 Nov 2007 13:47:41 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: V1_13b2~1
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=7954e324c09a8f4c33d741b319a087f1c306b74c;p=tools%2Feficas.git

*** empty log message ***
---

diff --git a/Aster/editeur.ini b/Aster/editeur.ini
index 77ef4249..d0881d54 100644
--- a/Aster/editeur.ini
+++ b/Aster/editeur.ini
@@ -37,7 +37,8 @@ rep_travail     =   "/tmp"
 initialdir=os.curdir
 
 # Choix des catalogues
-rep_mat=os.path.join(rep_cata,'..','materiau')
+rep_mat_v85=os.path.join(rep_cata,'cataSTA8','materiau')
+rep_mat_v91=os.path.join(rep_cata,'cataSTA9','materiau')
 
 catalogues = (
               ('ASTER','v7.8',os.path.join(rep_cata,'cataSTA7'),'python'),
diff --git a/Editeur/configuration.py b/Editeur/configuration.py
index cca88569..7aa6d4c2 100644
--- a/Editeur/configuration.py
+++ b/Editeur/configuration.py
@@ -51,8 +51,8 @@ class CONFIGbase:
       self.lecture_catalogues_standard()
       self.lecture_fichier_ini_utilisateur()
       self.init_liste_param()
-  
- 
+      self.pref="style."
+
   #--------------------------------------
   def lecture_fichier_ini_standard(self):
   #--------------------------------------
@@ -224,7 +224,6 @@ class CONFIG(CONFIGbase):
       self.titre = "Paramètres nécessaires à la configuration d'EFICAS"
       self.texte_ini = "Voici les paramètres que requiert Eficas"
       self.commande = self.creation_fichier_ini_si_possible
-      self.pref=""
       self.labels={"initialdir"    : "Répertoire initial pour Open/Save des fichiers",
                    "rep_travail"   : "Répertoire de travail",
                    "rep_mat"       : "Répertoire materiaux",
diff --git a/InterfaceQT/browser.py b/InterfaceQT/browser.py
index 509ce88e..060579ba 100644
--- a/InterfaceQT/browser.py
+++ b/InterfaceQT/browser.py
@@ -2,9 +2,7 @@
 import os,sys,string,re,types,traceback
 
 from qt import *
-
-
-from InterfaceQT import utilIcons
+import utilIcons
 
 
 class JDCTree( QListView ):
diff --git a/Ui/desError.py b/Ui/desError.py
index b9f56506..a9a89173 100644
--- a/Ui/desError.py
+++ b/Ui/desError.py
@@ -2,7 +2,7 @@
 
 # Form implementation generated from reading ui file 'desError.ui'
 #
-# Created: mer nov 14 11:57:46 2007
+# Created: lun nov 19 11:09:03 2007
 #      by: The PyQt User Interface Compiler (pyuic) 3.13
 #
 # WARNING! All changes made in this file will be lost!