X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=InterfaceQT4%2Fconfiguration.py;h=97b46c0d6ff8263639c90d92f57b612bf03717b9;hb=39b7b166eb606b80c9ac427811651b20db79bde2;hp=ff2f4aad0560147506655fa218c8c97ad84e9147;hpb=44f9c201a96d0e18eef4bbb4727fced2b66e826d;p=tools%2Feficas.git diff --git a/InterfaceQT4/configuration.py b/InterfaceQT4/configuration.py index ff2f4aad..97b46c0d 100644 --- a/InterfaceQT4/configuration.py +++ b/InterfaceQT4/configuration.py @@ -23,7 +23,11 @@ # Modules Python import os, sys, string, types, re import traceback -from PyQt4.QtGui import QMessageBox +from determine import monEnvQT5 +if monEnvQT5 : + from PyQt5.QtWidgets import QMessageBox +else : + from PyQt4.QtGui import QMessageBox from Editeur.utils import read_file from Extensions.i18n import tr @@ -51,7 +55,11 @@ class CONFIG_BASE: else : self.name="editeur.ini" self.rep_mat = None self.repIni = repIni - self.rep_user = os.path.join(os.environ['HOME'],'.config/Eficas',appli.code) + if sys.platform[0:5]=="linux" : + self.rep_user = os.path.join(os.environ['HOME'],'.config/Eficas',appli.code) + else : + self.rep_user = os.path.join('C:/','.config/Eficas',appli.code) + self.setValeursParDefaut() @@ -66,7 +74,11 @@ class CONFIG_BASE: if self.appli: self.parent=appli.top else: self.parent=None - if not os.path.isdir(self.savedir) : self.savedir=os.environ['HOME'] + if not os.path.isdir(self.savedir) : + if sys.platform[0:5]=="linux" : + self.savedir=os.environ['HOME'] + else: + self.savedir='C:/' @@ -78,7 +90,10 @@ class CONFIG_BASE: self.path_doc = os.path.abspath(os.path.join(self.repIni,'..','Doc')) self.exec_acrobat = 'acroread' nomDir="Eficas_"+self.code - self.savedir = os.path.abspath(os.path.join(os.environ['HOME'],nomDir)) + if sys.platform[0:5]=="linux" : + self.savedir = os.path.abspath(os.path.join(os.environ['HOME'],nomDir)) + else: + self.savedir = os.path.abspath('C:/') self.mode_nouv_commande='initial' self.affiche="alpha"