From: CEA Support SALOME <support-salome@cea.fr>
Date: Thu, 3 Mar 2016 09:23:49 +0000 (+0100)
Subject: fixing a problem with the window and module titles
X-Git-Tag: V8.0.0rc2
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=42db3ddce1c25f1966788ccef69c8e018bb3af01;p=tools%2FSALOME.git

fixing a problem with the window and module titles
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d99188e..baebcbb 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -119,4 +119,5 @@ SALOME_INSTALL_SCRIPTS("${_salome_context_API_SCRIPTS}" ${SALOME_INSTALL_SCRIPT_
 SET(_salome_context_BASHRC
    ${KERNEL_ROOT_DIR}/bin/salome/appliskel/.bashrc
 )
-SALOME_INSTALL_SCRIPTS("${_salome_context_BASHRC}" $ENV{SALOME_PROFILE_ROOT_DIR})
+FILE(TO_CMAKE_PATH $ENV{SALOME_PROFILE_ROOT_DIR} _SALOME_PROFILE_ROOT_DIR)
+SALOME_INSTALL_SCRIPTS("${_salome_context_BASHRC}" ${_SALOME_PROFILE_ROOT_DIR})
diff --git a/doc/conf.py.in b/doc/conf.py.in
index db93f5f..c9563b0 100644
--- a/doc/conf.py.in
+++ b/doc/conf.py.in
@@ -92,7 +92,7 @@ pygments_style = 'sphinx'
 
 # The theme to use for HTML and HTML Help pages.  Major themes that come with
 # Sphinx are currently 'default' and 'sphinxdoc'.
-html_theme = 'default'
+html_theme = '@SPHINX_THEME@'
 
 # The name for this set of Sphinx documents.  If None, it defaults to
 # "<project> v<release> documentation".
diff --git a/resources/about.png b/resources/about.png
index 1a95622..745cf2d 100644
Binary files a/resources/about.png and b/resources/about.png differ
diff --git a/resources/app_logo.png b/resources/app_logo.png
index 33971d2..e5c1f96 100644
Binary files a/resources/app_logo.png and b/resources/app_logo.png differ
diff --git a/resources/splash.png b/resources/splash.png
index 1a95622..745cf2d 100644
Binary files a/resources/splash.png and b/resources/splash.png differ
diff --git a/src/resources/LightApp_msg_en.ts b/src/resources/LightApp_msg_en.ts
index f098275..0592272 100644
--- a/src/resources/LightApp_msg_en.ts
+++ b/src/resources/LightApp_msg_en.ts
@@ -13,11 +13,11 @@
     </message>
     <message>
         <source>APP_NAME</source>
-        <translation>SALOME SALOME</translation>
+        <translation>SALOME </translation>
     </message>
     <message>
         <source>APP_VERSION</source>
-        <translation>V8.0.0beta</translation>
+        <translation>V8.0.0rc2</translation>
     </message>
     <message>
         <source>ABOUT_LICENSE</source>
@@ -25,7 +25,7 @@
     </message>
     <message>
         <source>ABOUT_VERSION</source>
-        <translation>Version 8.0.0beta</translation>
+        <translation>Version 8.0.0rc2</translation>
     </message>
     <message>
         <source>ABOUT_TITLE</source>
diff --git a/src/resources/LightApp_msg_fr.ts b/src/resources/LightApp_msg_fr.ts
index 05603d1..741a430 100644
--- a/src/resources/LightApp_msg_fr.ts
+++ b/src/resources/LightApp_msg_fr.ts
@@ -13,11 +13,11 @@
     </message>
     <message>
         <source>APP_NAME</source>
-        <translation>SALOME SALOME</translation>
+        <translation>SALOME </translation>
     </message>
     <message>
         <source>APP_VERSION</source>
-        <translation>V8.0.0beta</translation>
+        <translation>V8.0.0rc2</translation>
     </message>
     <message>
         <source>ABOUT_LICENSE</source>
@@ -25,7 +25,7 @@
     </message>
     <message>
         <source>ABOUT_VERSION</source>
-        <translation>Version 8.0.0beta</translation>
+        <translation>Version 8.0.0rc2</translation>
     </message>
     <message>
         <source>ABOUT_TITLE</source>
diff --git a/src/resources/LightApp_msg_ja.ts b/src/resources/LightApp_msg_ja.ts
index 703bf36..3e55248 100644
--- a/src/resources/LightApp_msg_ja.ts
+++ b/src/resources/LightApp_msg_ja.ts
@@ -13,11 +13,11 @@
     </message>
     <message>
       <source>APP_NAME</source>
-      <translation>SALOME SALOME</translation>
+      <translation>SALOME </translation>
     </message>
     <message>
       <source>APP_VERSION</source>
-      <translation>V8.0.0beta</translation>
+      <translation>V8.0.0rc2</translation>
     </message>
     <message>
       <source>ABOUT_LICENSE</source>
@@ -25,7 +25,7 @@
     </message>
     <message>
       <source>ABOUT_VERSION</source>
-      <translation>Version 8.0.0beta</translation>
+      <translation>Version 8.0.0rc2</translation>
     </message>
     <message>
       <source>ABOUT_TITLE</source>
diff --git a/src/salomeContext.py b/src/salomeContext.py
index 7a89e96..f30c015 100755
--- a/src/salomeContext.py
+++ b/src/salomeContext.py
@@ -153,7 +153,10 @@ class SalomeContext:
 
   """Append value to LD_LIBRARY_PATH environment variable"""
   def addToLdLibraryPath(self, value):
-    self.addToVariable('LD_LIBRARY_PATH', value)
+    if platform.system() == 'Windows':
+      self.addToVariable('PATH', value)
+    else:
+      self.addToVariable('LD_LIBRARY_PATH', value)
   #
 
   """Append value to DYLD_LIBRARY_PATH environment variable"""