From: vsr <vsr@opencascade.com>
Date: Fri, 31 Oct 2008 08:14:26 +0000 (+0000)
Subject: Improve SALOME style handling
X-Git-Tag: V5_1_0rc1~14
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=57c947ad7f5802858d08fd738fa177d7277bf9fa;p=modules%2Fgui.git

Improve SALOME style handling
---

diff --git a/bin/runLightSalome.csh b/bin/runLightSalome.csh
index 39c742dc8..e4c8939da 100755
--- a/bin/runLightSalome.csh
+++ b/bin/runLightSalome.csh
@@ -27,8 +27,16 @@
 # is necessary for loading of .ini or .xml resources file
 ###
 
-if ( ! $?LightAppConfig )    setenv LightAppConfig ${GUI_ROOT_DIR}/share/salome/resources/gui
-if ( ! $?LightAppResources ) setenv LightAppResources ${GUI_ROOT_DIR}/share/salome/resources/gui
+if ( ! ($?LightAppConfig) ) then
+    setenv LightAppConfig ${GUI_ROOT_DIR}/share/salome/resources/gui
+else
+    setenv LightAppConfig ${LightAppConfig}:${GUI_ROOT_DIR}/share/salome/resources/gui
+endif
+if ( ! ($?LightAppResources) ) then
+    setenv LightAppResources ${GUI_ROOT_DIR}/share/salome/resources/gui
+else
+    setenv LightAppResources ${LightAppResources}:${GUI_ROOT_DIR}/share/salome/resources/gui
+endif
 
 ###
 # default settings 
@@ -144,4 +152,4 @@ if ( "${PYTHONPATH}" != "" ) setenv PYTHONPATH ${MY_PYTHONPATH}:${PYTHONPATH}
 # start application
 ###
 
-SUITApp LightApp -style salome $* &
+SUITApp LightApp $* &
diff --git a/bin/runLightSalome.sh b/bin/runLightSalome.sh
index cc2540a04..3f1eb230b 100755
--- a/bin/runLightSalome.sh
+++ b/bin/runLightSalome.sh
@@ -29,9 +29,13 @@
 
 if [ -z "$LightAppConfig" ] ; then
   export LightAppConfig=${GUI_ROOT_DIR}/share/salome/resources/gui
+else
+  export LightAppConfig=${LightAppConfig}:${GUI_ROOT_DIR}/share/salome/resources/gui
 fi
 if [ -z "$LightAppResources" ] ; then
   export LightAppResources=${GUI_ROOT_DIR}/share/salome/resources/gui
+else
+  export LightAppResources=${LightAppResources}:${GUI_ROOT_DIR}/share/salome/resources/gui
 fi
 
 ###
@@ -142,4 +146,4 @@ fi
 # start application
 ###
 
-SUITApp LightApp -style salome $* &
+SUITApp LightApp $* &