Pn pour prefs

diff --git a/InterfaceQT/composimp.py b/InterfaceQT/composimp.py
index 4253185d61aea82f133f79364d0372761b279cd9..df6266f03e0ddc3e48ea677d7815413b8fe60e3d 100644 (file)
--- a/InterfaceQT/composimp.py
+++ b/InterfaceQT/composimp.py
@@ -8,10 +8,10 @@ from qt import *
 
 # Modules Eficas
 from Editeur      import Objecttreeitem
-from Aster        import prefs
 from InterfaceQT  import browser
 from Noyau.N_CR   import justify_text
     
+import prefs
 
 class Node(browser.JDCNode):    
     def getPanel(self):

diff --git a/InterfaceQT/editor.py b/InterfaceQT/editor.py
index 5321d7fcd40e754fd0af911cd2c964ad72591f77..30d6efe969815a191058a744420ede30e8c9143a 100644 (file)
--- a/InterfaceQT/editor.py
+++ b/InterfaceQT/editor.py
@@ -11,11 +11,11 @@ import convert,generator
 from Editeur     import session
 from Editeur     import comploader
 from Editeur     import Objecttreeitem
-from Aster       import prefs
 from InterfaceQT import panelsQT
 from InterfaceQT import browser
 from InterfaceQT import readercata
 
+import prefs
 import qtCommun
 
 VERSION_EFICAS  = "EFICAS v1.12"
@@ -70,7 +70,6 @@ class JDCEditor(QSplitter):
             readercata.reader = readercata.READERCATA( self, self )
         self.readercata = readercata.reader
         
-        
         #------- construction du jdc --------------
 
         jdc_item = None

diff --git a/InterfaceQT/eficas.py b/InterfaceQT/eficas.py
index 731589d0f2bf663f5e9b83a9265e9c2b51440759..a335ded957460dd660659ec2056c8c9a78ec7431 100644 (file)
--- a/InterfaceQT/eficas.py
+++ b/InterfaceQT/eficas.py
@@ -1,3 +1,5 @@
+# -*- coding: iso-8859-15 -*-
+
 class UserInterface(Eficas):    
     """
     Class implementing the main user interface.

diff --git a/InterfaceQT/eficas_go.py b/InterfaceQT/eficas_go.py
new file mode 100644 (file)
index 0000000..e2d2999
--- /dev/null
+++ b/InterfaceQT/eficas_go.py
@@ -0,0 +1,61 @@
+# -*- 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 permet de lancer l'application EFICAS en affichant
+    un ecran Splash pour faire patienter l'utilisateur
+"""
+# Modules Python
+import sys
+from qt import *
+
+# Modules Eficas
+import prefs
+if hasattr(prefs,'encoding'):
+   # Hack pour changer le codage par defaut des strings
+   import sys
+   reload(sys)
+   sys.setdefaultencoding(prefs.encoding)
+   del sys.setdefaultencoding
+   # Fin hack
+
+from Editeur import import_code
+from Editeur import session
+
+def lance_eficas(code=None,fichier=None):
+    """
+        Lance l'appli EFICAS
+    """
+    # Analyse des arguments de la ligne de commande
+    if code !=None : prefs.code=code
+    import qtEficas
+    options=session.parse(sys.argv)
+    code=options.code
+
+    app = QApplication(sys.argv)
+    mw = qtEficas.Appli(code=code)
+    app.setMainWidget(mw)
+    app.connect(app, SIGNAL("lastWindowClosed()"), app, SLOT("quit()"))
+    if fichier != None : mw.ouvreFichiers()
+    mw.show()
+    res = app.exec_loop()
+    sys.exit(res)
+
+

diff --git a/InterfaceQT/monCommentairePanel.py b/InterfaceQT/monCommentairePanel.py
index ae6ce6e34d8b494859fad024c7ebff15b58ea490..2a60ddbdb718ba82d8dccf762aab8beb2c536e1f 100644 (file)
--- a/InterfaceQT/monCommentairePanel.py
+++ b/InterfaceQT/monCommentairePanel.py
@@ -27,7 +27,7 @@ from qt import *
 
 from desCommentaire import DComment
 from qtCommun      import QTPanel
-from Aster import prefs
+import prefs
 
 # Import des panels
 

diff --git a/InterfaceQT/monParamPanel.py b/InterfaceQT/monParamPanel.py
index 33145e9ebca5878c35ff8d5ec23ff87aa36ddad8..a3760ae1eb5ff295d3b399811bc59e8ad71b143a 100644 (file)
--- a/InterfaceQT/monParamPanel.py
+++ b/InterfaceQT/monParamPanel.py
@@ -22,7 +22,7 @@
 import string,types,os,re
 
 # Modules Eficas
-from Aster import prefs 
+import prefs 
 
 from qt import *
 

diff --git a/InterfaceQT/monPlusieursASSDPanel.py b/InterfaceQT/monPlusieursASSDPanel.py
index 92ec2b6cdb39763e24d8f76f92b580534ef392ef..9b7ea7f94d105f5122fb21c943843480c7af9914 100644 (file)
--- a/InterfaceQT/monPlusieursASSDPanel.py
+++ b/InterfaceQT/monPlusieursASSDPanel.py
@@ -22,7 +22,7 @@
 import string,types,os
 
 # Modules Eficas
-from Aster import prefs 
+import prefs 
 
 from qt import *
 from monPlusieursIntoPanel import MonPlusieursIntoPanel

diff --git a/InterfaceQT/monPlusieursBasePanel.py b/InterfaceQT/monPlusieursBasePanel.py
index c6e59a8d059510cad6178a95feb05471f3c16678..2cc00e5d584ee8174b0cf7a831bff8a2c81c82d4 100644 (file)
--- a/InterfaceQT/monPlusieursBasePanel.py
+++ b/InterfaceQT/monPlusieursBasePanel.py
@@ -22,7 +22,7 @@
 import string,types,os
 
 # Modules Eficas
-from Aster import prefs
+import prefs
 
 from qt import *
 

diff --git a/InterfaceQT/monPlusieursIntoPanel.py b/InterfaceQT/monPlusieursIntoPanel.py
index 7aa23d7c12447889a1513287e32b40377852402c..2d08806706474b6c2a551d770a2c046fb6867b5f 100644 (file)
--- a/InterfaceQT/monPlusieursIntoPanel.py
+++ b/InterfaceQT/monPlusieursIntoPanel.py
@@ -22,7 +22,7 @@
 import string,types,os
 
 # Modules Eficas
-from Aster import prefs 
+import prefs 
 
 from qt import *
 

diff --git a/InterfaceQT/monUniqueASSDPanel.py b/InterfaceQT/monUniqueASSDPanel.py
index d41c7082cd1aacaab1ba7ff03ef6e7dc35d466c8..8875415378c89b09e0e5c4090cb0c99b725b17c6 100644 (file)
--- a/InterfaceQT/monUniqueASSDPanel.py
+++ b/InterfaceQT/monUniqueASSDPanel.py
@@ -22,7 +22,7 @@
 import string,types,os
 
 # Modules Eficas
-from Aster import prefs 
+import prefs 
 
 from qt import *
 

diff --git a/InterfaceQT/monUniqueBasePanel.py b/InterfaceQT/monUniqueBasePanel.py
index bbac7773e552e789b6c286efb7913f9b1f1d5ed4..a5795772995443d027620bdb294bc88e890f8ee9 100644 (file)
--- a/InterfaceQT/monUniqueBasePanel.py
+++ b/InterfaceQT/monUniqueBasePanel.py
@@ -22,7 +22,7 @@
 import string,types,os
 
 # Modules Eficas
-from Aster import prefs 
+import prefs 
 
 from qt import *
 

diff --git a/InterfaceQT/monUniqueCompPanel.py b/InterfaceQT/monUniqueCompPanel.py
index e47f2940923a8a8e04485d7479d3960baaf4562e..03a6bba0551acdedd68a9ca1ec8eb180d084816f 100644 (file)
--- a/InterfaceQT/monUniqueCompPanel.py
+++ b/InterfaceQT/monUniqueCompPanel.py
@@ -22,7 +22,7 @@
 import string,types,os,re
 
 # Modules Eficas
-from Aster import prefs 
+import prefs 
 
 from qt import *
 

diff --git a/InterfaceQT/monUniqueIntoPanel.py b/InterfaceQT/monUniqueIntoPanel.py
index 144dc700acaf819251d92668678f97cc149e43b8..433191814c87bfa30c9db87c6cdec8553d869da9 100644 (file)
--- a/InterfaceQT/monUniqueIntoPanel.py
+++ b/InterfaceQT/monUniqueIntoPanel.py
@@ -22,7 +22,7 @@
 import string,types,os
 
 # Modules Eficas
-from Aster import prefs 
+import prefs 
 
 from qt import *
 

diff --git a/InterfaceQT/monUniqueSDCOIntoPanel.py b/InterfaceQT/monUniqueSDCOIntoPanel.py
index 7890d1510aa7755c281079a01826548014dc9ce4..f0368f3d93cdcb53456df2b925beb99a46ae7e12 100644 (file)
--- a/InterfaceQT/monUniqueSDCOIntoPanel.py
+++ b/InterfaceQT/monUniqueSDCOIntoPanel.py
@@ -22,7 +22,7 @@
 import string,types,os
 
 # Modules Eficas
-from Aster import prefs 
+import prefs 
 
 from qt import *
 

diff --git a/InterfaceQT/monUniqueSDCOPanel.py b/InterfaceQT/monUniqueSDCOPanel.py
index dd23f829bd00fb741559807329eee99a184bf376..61e5d7460078fabe5a82693c72e0934c5bc8d57e 100644 (file)
--- a/InterfaceQT/monUniqueSDCOPanel.py
+++ b/InterfaceQT/monUniqueSDCOPanel.py
@@ -22,7 +22,7 @@
 import string,types,os
 
 # Modules Eficas
-from Aster import prefs 
+import prefs 
 
 from qt import *
 

diff --git a/InterfaceQT/qtEficas.py b/InterfaceQT/qtEficas.py
index 5cb6ee38dca0c281bde63139b2f1365ec9938846..a6d03abef7c9ba5cf8c5a07466e03effebd422f6 100644 (file)
--- a/InterfaceQT/qtEficas.py
+++ b/InterfaceQT/qtEficas.py
@@ -11,15 +11,18 @@ from myMain_ui import Eficas
 from viewManager import MyTabview
 
 from Editeur import configuration
-from Aster   import prefs
+from Editeur import session
+
 from InterfaceQT import utilIcons
 utilIcons.initializeMimeSourceFactory()
 
+import prefs
+
 class Appli(Eficas):    
     """
     Class implementing the main user interface.
     """
-    def __init__(self):
+    def __init__(self,code="ASTER"):
         """
         Constructor
         
@@ -58,6 +61,8 @@ class Appli(Eficas):
         self.ficPatrons={}
         self.initPatrons()
         self.ihm="QT"
+        self.salome=0
+        self.code=code
         #self.ouvreFichers()
         
         
@@ -181,7 +186,7 @@ class Appli(Eficas):
 if __name__=='__main__':
 
     # Modules Eficas
-    from Aster import prefs
+    import prefs
     if hasattr(prefs,'encoding'):
        # Hack pour changer le codage par defaut des strings
        import sys

diff --git a/InterfaceQT/readercata.py b/InterfaceQT/readercata.py
index 6ffb65909b5841006f98242e496e1c819232d558..174f637320475e7f8b53edd98ac6f4d8eae91a49 100644 (file)
--- a/InterfaceQT/readercata.py
+++ b/InterfaceQT/readercata.py
@@ -31,7 +31,7 @@ import cPickle
 import re
 
 # Modules Eficas
-from Aster      import prefs
+import prefs
 from Noyau.N_CR import CR
 from utils      import init_rep_cata_dev
 
@@ -84,9 +84,10 @@ class READERCATA:
           self.code = self.appli.CONFIGURATION.catalogues[0][0]
           self.version_code = liste_cata_possibles[0][1]
           self.appli.format_fichier=liste_cata_possibles[0][3] 
-          lab=QString("Eficas V1.12 pour ASTER avec le catalogue ")
+          lab=QString("Eficas V1.13 pour ASTER avec le catalogue ")
           lab+=self.version_code
-          qApp.mainWidget().setCaption(lab)
+          self.appli.parent.ui.setCaption(lab)
+          #qApp.mainWidget().setCaption(lab)
       else:
           # plusieurs catalogues sont disponibles : il faut demander a l'utilisateur
           # lequel il veut utiliser ...
@@ -308,7 +309,8 @@ class READERCATA:
           #self.appli.format_fichier.set( self.dico_catalogues[self.version_cata][3] )
           self.appli.format_fichier = self.dico_catalogues[self.version_cata][3]
           lab+=self.version_cata
-          qApp.mainWidget().setCaption(lab)
+          self.appli.parent.ui.setCaption(lab)
+          #qApp.mainWidget().setCaption(lab)
       else :
           sys.exit(0)
 

diff --git a/InterfaceQT/viewManager.py b/InterfaceQT/viewManager.py
index afa9cc829fecc7b811ff7df1dbdd9ce9b88aaa11..f5968dd0a70e1f2ee70598302693a495a5b86cdf 100644 (file)
--- a/InterfaceQT/viewManager.py
+++ b/InterfaceQT/viewManager.py
@@ -2498,7 +2498,7 @@ class MyTabview(Tabview):
 
 if __name__=='__main__':
     import sys
-    from Aster import prefs 
+    import prefs 
     if hasattr(prefs,'encoding'):
        # Hack pour changer le codage par defaut des strings
        import sys

diff --git a/InterfaceTK/appli.py b/InterfaceTK/appli.py
index 60314e3feb3ad8a133e7c42494a3f1e81b1b9445..8b4e4f7dca3f09e7dd79ec09e318780bae4986b3 100644 (file)
--- a/InterfaceTK/appli.py
+++ b/InterfaceTK/appli.py
@@ -35,7 +35,7 @@ from widgets import showerror
 
 # Modules Eficas
 import splash
-from Aster import prefs
+import prefs
 import styles
 from styles import style
 from InterfaceTK import fontes
@@ -60,6 +60,7 @@ class APPLI:
   def __init__ (self,master,code=prefs.code,fichier=None,test=0,ihm="TK") :
       self.ihm=ihm
       self.code=code
+      self.salome=0
       self.top=master
       self.top.protocol("WM_DELETE_WINDOW",self.exitEFICAS)
 

diff --git a/InterfaceTK/bureau.py b/InterfaceTK/bureau.py
index f9263e06ecc26801847f777f40325ec480c143b0..b02a06efd662e5638d07198cc6085440dceed799 100644 (file)
--- a/InterfaceTK/bureau.py
+++ b/InterfaceTK/bureau.py
@@ -30,7 +30,7 @@ from widgets import showinfo,askyesno,showerror
 
 # Modules Eficas
 import splash
-import Aster.prefs
+import prefs
 import convert
 import generator
 import AIDE

diff --git a/InterfaceTK/change_comm.py b/InterfaceTK/change_comm.py
index a664e27cc9931b2a6231320ecc53604382ec7e62..ae48ba0c23ed49d0fc4fbf60165d7fe4d04540a3 100755 (executable)
--- a/InterfaceTK/change_comm.py
+++ b/InterfaceTK/change_comm.py
@@ -29,7 +29,7 @@ import os
 # Modules Eficas
 from Editeur import import_code
 from Editeur import session
-from Aster import prefs
+import prefs
 import convert
 import generator
 import string

diff --git a/InterfaceTK/composimp.py b/InterfaceTK/composimp.py
index 6f9d7b98e81d570b4b51c2e01b53081efd253394..be59ce65b9c172a4622217dbc321199d3a811db8 100644 (file)
--- a/InterfaceTK/composimp.py
+++ b/InterfaceTK/composimp.py
@@ -27,7 +27,7 @@ import traceback
 
 # Modules Eficas
 from Editeur import Objecttreeitem
-from Aster import prefs
+import prefs
 import panels
 import images
 from widgets import ListeChoix

diff --git a/InterfaceTK/eficas_go.py b/InterfaceTK/eficas_go.py
index b4e99366de24166b7fdc86453aeb720db19ed899..c0d54ecc81430e4e858ad0ac5f8e41e9a0541f82 100644 (file)
--- a/InterfaceTK/eficas_go.py
+++ b/InterfaceTK/eficas_go.py
@@ -27,7 +27,7 @@ import sys
 import Tkinter
 
 # Modules Eficas
-from Aster import prefs
+import prefs
 if hasattr(prefs,'encoding'):
    # Hack pour changer le codage par defaut des strings
    import sys

diff --git a/InterfaceTK/faq.py b/InterfaceTK/faq.py
index afa09fedc93515fc4af9e5614e4bcc54de90445c..34358e2f2469912922c9486c60b6c15ab66b221e 100644 (file)
--- a/InterfaceTK/faq.py
+++ b/InterfaceTK/faq.py
@@ -28,7 +28,7 @@ import Pmw
 from Tkinter import END
 
 # Modules Eficas
-from Aster import prefs
+import prefs
 from InterfaceTK import fontes
 
 class FAQ:

diff --git a/InterfaceTK/fonctionpanel.py b/InterfaceTK/fonctionpanel.py
index 7b1646fcbbafa05196f30c9ac6d76979d92ca9d3..b17704d503765d63f816916ff50ee6baee1d1282 100644 (file)
--- a/InterfaceTK/fonctionpanel.py
+++ b/InterfaceTK/fonctionpanel.py
@@ -27,7 +27,7 @@ import traceback
 
 # Modules Eficas
 from Editeur import Objecttreeitem
-from Aster import prefs
+import prefs
 import panels
 import images
 from widgets import ListeChoix

diff --git a/InterfaceTK/images.py b/InterfaceTK/images.py
index 08401ffde0e3b3dab473942301a6cd3ac3874724..18d8c9ce0e66980b9b7cc532f64479f94e253e03 100644 (file)
--- a/InterfaceTK/images.py
+++ b/InterfaceTK/images.py
@@ -41,7 +41,7 @@ if __name__ == '__main__':
    sys.exit()
 
 try:
-   from Aster import prefs
+   import prefs
    ICONDIR=prefs.ICONDIR
 except:
    # Par defaut on utilise le repertoire local icons

diff --git a/InterfaceTK/newsimppanel.py b/InterfaceTK/newsimppanel.py
index 0a04ce0f76c71472855173ce373d52a1efd62b4e..77ca83aa48e1c605a4c4a63901886f55baaa6085 100644 (file)
--- a/InterfaceTK/newsimppanel.py
+++ b/InterfaceTK/newsimppanel.py
@@ -27,7 +27,7 @@ import traceback
 
 # Modules Eficas
 from Editeur import Objecttreeitem
-from Aster import prefs
+import prefs
 import panels
 import images
 import composimp

diff --git a/InterfaceTK/panels.py b/InterfaceTK/panels.py
index 15ab8ca9baaa1627fbf3d3c3d0d56677f8a67f75..636473a1ae0e852fbbf4a1fbd261bc02c8bb290c 100644 (file)
--- a/InterfaceTK/panels.py
+++ b/InterfaceTK/panels.py
@@ -28,7 +28,7 @@ import traceback
 import widgets
 from widgets import ListeChoix
 from widgets import ListeChoixParGroupes
-from Aster import prefs
+import prefs
 import options
 
 SEPARATEUR = '-'*30

diff --git a/InterfaceTK/plusieursassdpanel.py b/InterfaceTK/plusieursassdpanel.py
index 3d77f39fdf966a343694dce1042695f30c760ef5..3e5eb99bb81e1d033bb2de9e5d6cad956b97c16e 100644 (file)
--- a/InterfaceTK/plusieursassdpanel.py
+++ b/InterfaceTK/plusieursassdpanel.py
@@ -27,7 +27,7 @@ import traceback
 
 # Modules Eficas
 from Editeur import Objecttreeitem
-from Aster import prefs
+import prefs
 import panels
 import images
 from widgets import ListeChoix

diff --git a/InterfaceTK/plusieursbasepanel.py b/InterfaceTK/plusieursbasepanel.py
index 550b98eb3aa5a6e110a5aef5a3a4ee0c97bae3fb..dde20a8d6ea6740b43b6a7c9e6c0724a9adc1154 100644 (file)
--- a/InterfaceTK/plusieursbasepanel.py
+++ b/InterfaceTK/plusieursbasepanel.py
@@ -27,7 +27,7 @@ import traceback
 
 # Modules Eficas
 from Editeur import Objecttreeitem
-from Aster import prefs
+import prefs
 import panels
 import images
 from widgets import showinfo

diff --git a/InterfaceTK/plusieursintopanel.py b/InterfaceTK/plusieursintopanel.py
index 3484a83aa45bff6b7933af404a56f3576037f2a6..d5ef1e15327c2ca9fa5d922a727af2a29822d3cf 100644 (file)
--- a/InterfaceTK/plusieursintopanel.py
+++ b/InterfaceTK/plusieursintopanel.py
@@ -27,7 +27,7 @@ import traceback
 
 # Modules Eficas
 from Editeur import Objecttreeitem
-from Aster import prefs
+import prefs
 import panels
 import images
 from widgets import ListeChoix

diff --git a/InterfaceTK/plusieurspanel.py b/InterfaceTK/plusieurspanel.py
index b79906f6e23a5ae664130526ffbf4be216608a22..0a21907e646b718669b91b24d1205539f7c70591 100644 (file)
--- a/InterfaceTK/plusieurspanel.py
+++ b/InterfaceTK/plusieurspanel.py
@@ -27,7 +27,7 @@ import traceback
 
 # Modules Eficas
 from Editeur import Objecttreeitem
-from Aster import prefs
+import prefs
 import panels
 import images
 from widgets import ListeChoix

diff --git a/InterfaceTK/styles.py b/InterfaceTK/styles.py
index ead56a556f9749570e878a16d2fb95f0ae33f845..4d89ef6f96cc40118978c7577996a12ee701a7c8 100644 (file)
--- a/InterfaceTK/styles.py
+++ b/InterfaceTK/styles.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 import os
-from Aster import prefs
+import prefs
 import basestyle
 from basestyle import STYLE,style
 

diff --git a/InterfaceTK/uniqueassdpanel.py b/InterfaceTK/uniqueassdpanel.py
index ad9ed2442da302879c09ea30d43328a638d02564..27edcd9708410dc3f60701e53b285a3de46b746a 100644 (file)
--- a/InterfaceTK/uniqueassdpanel.py
+++ b/InterfaceTK/uniqueassdpanel.py
@@ -26,7 +26,7 @@ import traceback
 
 # Modules Eficas
 from Editeur import Objecttreeitem
-from Aster import prefs
+import prefs
 import panels
 import images
 from widgets import ListeChoix

diff --git a/InterfaceTK/uniquebasepanel.py b/InterfaceTK/uniquebasepanel.py
index 707fc2851ec2295e238f20d005efcae925a0b62a..b7a71beb54f8fed8f560d3f428aee0d4808574f6 100644 (file)
--- a/InterfaceTK/uniquebasepanel.py
+++ b/InterfaceTK/uniquebasepanel.py
@@ -28,7 +28,7 @@ import traceback
 
 # Modules Eficas
 from Editeur import Objecttreeitem
-from Aster import prefs
+import prefs
 import panels
 import images
 from widgets import FenetreDeParametre

diff --git a/InterfaceTK/uniquecomppanel.py b/InterfaceTK/uniquecomppanel.py
index b7fdf618d1806e928ac86d5a3488b0b053eb16d5..80d9aa77f8a3ad6b18c46af6f4c93690af698535 100644 (file)
--- a/InterfaceTK/uniquecomppanel.py
+++ b/InterfaceTK/uniquecomppanel.py
@@ -27,7 +27,7 @@ import traceback
 
 # Modules Eficas
 from Editeur import Objecttreeitem
-from Aster import prefs
+import prefs
 import panels
 import images
 from widgets import ListeChoix

diff --git a/InterfaceTK/uniqueintopanel.py b/InterfaceTK/uniqueintopanel.py
index caa0a3a3964cbde846bfc983d6f799b33ebed4c4..76133cd53278988f942f56834c164f18b005b86d 100644 (file)
--- a/InterfaceTK/uniqueintopanel.py
+++ b/InterfaceTK/uniqueintopanel.py
@@ -27,7 +27,7 @@ import traceback
 
 # Modules Eficas
 from Editeur import Objecttreeitem
-from Aster import prefs
+import prefs
 import panels
 import images
 from widgets import ListeChoix

diff --git a/InterfaceTK/uniquepanel.py b/InterfaceTK/uniquepanel.py
index 4e3a6037a6f18f71bf961e0103e81dc10e764693..90b3b9d9f189c103ad1151eef9a0c479e5d1f38d 100644 (file)
--- a/InterfaceTK/uniquepanel.py
+++ b/InterfaceTK/uniquepanel.py
@@ -27,7 +27,7 @@ import traceback
 
 # Modules Eficas
 from Editeur import Objecttreeitem
-from Aster import prefs
+import prefs
 import panels
 import images
 from widgets import ListeChoix

diff --git a/InterfaceTK/uniquesdcopanel.py b/InterfaceTK/uniquesdcopanel.py
index 9722862c806c5cc87149497fc16240e1f0cf01f1..a9e326c585dbc17eca3a4fb695626c17c00f7481 100644 (file)
--- a/InterfaceTK/uniquesdcopanel.py
+++ b/InterfaceTK/uniquesdcopanel.py
@@ -27,7 +27,7 @@ import traceback
 
 # Modules Eficas
 from Editeur import Objecttreeitem
-from Aster import prefs
+import prefs
 import panels
 import images
 from widgets import ListeChoix