sauve du 9 mai

[tools/eficas.git] / InterfaceQT4 / configuration.py

diff --git a/InterfaceQT4/configuration.py b/InterfaceQT4/configuration.py
index ff2f4aad0560147506655fa218c8c97ad84e9147..97b46c0d6ff8263639c90d92f57b612bf03717b9 100644 (file)
--- a/InterfaceQT4/configuration.py
+++ b/InterfaceQT4/configuration.py
@@ -23,7 +23,11 @@
 # Modules Python\r
 import os, sys, string, types, re\r
 import traceback\r
-from PyQt4.QtGui import QMessageBox\r
+from  determine import monEnvQT5\r
+if monEnvQT5 :\r
+   from PyQt5.QtWidgets import QMessageBox\r
+else :\r
+   from PyQt4.QtGui import QMessageBox\r
 from  Editeur.utils import read_file\r
 from Extensions.i18n import tr\r
 \r
@@ -51,7 +55,11 @@ class CONFIG_BASE:
       else           : self.name="editeur.ini"\r
       self.rep_mat = None\r
       self.repIni  = repIni\r
-      self.rep_user   = os.path.join(os.environ['HOME'],'.config/Eficas',appli.code)\r
+      if sys.platform[0:5]=="linux" :\r
+              self.rep_user   = os.path.join(os.environ['HOME'],'.config/Eficas',appli.code)\r
+      else :\r
+              self.rep_user   = os.path.join('C:/','.config/Eficas',appli.code)\r
+\r
      \r
 \r
       self.setValeursParDefaut()\r
@@ -66,7 +74,11 @@ class CONFIG_BASE:
       if self.appli: self.parent=appli.top\r
       else:         self.parent=None\r
 \r
-      if not os.path.isdir(self.savedir) : self.savedir=os.environ['HOME']\r
+      if not os.path.isdir(self.savedir) :\r
+        if sys.platform[0:5]=="linux" :\r
+          self.savedir=os.environ['HOME']\r
+        else:\r
+          self.savedir='C:/'\r
       \r
 \r
 \r
@@ -78,7 +90,10 @@ class CONFIG_BASE:
       self.path_doc     = os.path.abspath(os.path.join(self.repIni,'..','Doc'))\r
       self.exec_acrobat = 'acroread'\r
       nomDir="Eficas_"+self.code\r
-      self.savedir   = os.path.abspath(os.path.join(os.environ['HOME'],nomDir))\r
+      if sys.platform[0:5]=="linux" :\r
+        self.savedir   = os.path.abspath(os.path.join(os.environ['HOME'],nomDir))\r
+      else:\r
+        self.savedir = os.path.abspath('C:/')\r
       self.mode_nouv_commande='initial'\r
       self.affiche="alpha"\r
  \r