fixing a problem with the window and module titles

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d99188ecf7c4f5c6494649196b76a1ace307e468..baebcbb68d4e806e15ab7e0c0b660bcea8dc1a6c 100644 (file)
--- 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 db93f5fd00513f02bbea2512d4fff6d351d9120f..c9563b01d5a08120f3575968235fb02a1b1c1ccd 100644 (file)
--- 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 1a9562257d59aaa00bbd730145a8e5cb816cb762..745cf2d9294a0d9e704f43222221ea5a53631d24 100644 (file)
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 33971d224ee0b70bd212c2e5eeea6129bcf228da..e5c1f96d925962b2dc25c4dce3e59588095b5870 100644 (file)
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 1a9562257d59aaa00bbd730145a8e5cb816cb762..745cf2d9294a0d9e704f43222221ea5a53631d24 100644 (file)
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 f098275ebf70c475284e88bba52d3b045956c48e..059227262aa20b07276cae50cb49b97da1459c67 100644 (file)
--- 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 05603d14f173fc88b6f1fadf71d75f0f0a006c8f..741a430972a8fcc8292587f97cffb05b5c36b95f 100644 (file)
--- 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 703bf36b93006ff777a6c41d86d35cd3962540ce..3e55248a338476fc4cac2b54f94d8759579815a9 100644 (file)
--- 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 7a89e9666250300eeacf871ac046996629bb54e8..f30c0151e4852165f20902e8e654eaaf6978682f 100755 (executable)
--- 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"""