From: vsr <vsr@opencascade.com>
Date: Sun, 16 Oct 2011 13:04:55 +0000 (+0000)
Subject: Issue 0021247: EDF 1856 STUDY: Unification of the configuration files and directories... 
X-Git-Tag: V6_4_0a1~28
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=b66a88a39734969bf05e6da53eac1d2395bc7abc;p=modules%2Fgui.git

Issue 0021247: EDF 1856 STUDY: Unification of the configuration files and directories of Salome
Part 2: Store salome plugins (plugin manager) in the ~/.config/salome/Plugins directory
---

diff --git a/src/SalomeApp/salome_pluginsmanager.py b/src/SalomeApp/salome_pluginsmanager.py
index 031f856f1..171f5a6fc 100644
--- a/src/SalomeApp/salome_pluginsmanager.py
+++ b/src/SalomeApp/salome_pluginsmanager.py
@@ -29,7 +29,7 @@ A plugins manager is created when calling initialize.
 
 The plugins manager creates a submenu <menuname> in the <basemenuname> menu.
 
-The plugins manager searches in $HOME/.salome/Plugins, $HOME/$APPLI/Plugins, $SALOME_PLUGINS_PATH directories
+The plugins manager searches in $HOME/.config/salome/Plugins, $HOME/$APPLI/Plugins, $SALOME_PLUGINS_PATH directories
 files named <name>_plugins.py and executes them.
 
 These files should contain python code that register functions into the plugins manager.
@@ -137,8 +137,12 @@ class PluginsManager:
         self.plugins_files=[]
 
         # USER plugins directory
-        user_dir = os.path.expanduser("~/.salome/Plugins")
+        user_dir = os.path.expanduser("~/.config/salome/Plugins")
         self.plugindirs.append(user_dir)
+        # obsolete: USER plugins directory
+        # (for compatibility reasons only; new plugins should be stored in ~/.config/salome/Plugins)
+        user_obsolete_dir = os.path.expanduser("~/.salome/Plugins")
+        self.plugindirs.append(user_obsolete_dir)
 
         # APPLI plugins directory
         appli=os.getenv("APPLI")