fixing a problem with the window and module titles

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ab3ec5f15ca680095597f8216daf6a9572c0d3b5..4ba49a9d9be2a3e5349f97dfd592f8045dd55000 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -117,4 +117,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/resources/about.png b/resources/about.png
index 4d38ef2ccd2d8a459a306049ab875014db4c188c..c73d028e5dcc1c9cb33c3c1bab72f88119948957 100644 (file)
Binary files a/resources/about.png and b/resources/about.png differ

diff --git a/resources/splash.png b/resources/splash.png
index 4d38ef2ccd2d8a459a306049ab875014db4c188c..c73d028e5dcc1c9cb33c3c1bab72f88119948957 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 6e138c757bc1554a0ba3d974d03e755f6702c7e3..e729f8e8750262b90c0f83a0bbd091e355d492a6 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>V7.8.0</translation>
+        <translation>V7.8.0BR</translation>
     </message>
     <message>
         <source>ABOUT_LICENSE</source>
@@ -25,7 +25,7 @@
     </message>
     <message>
         <source>ABOUT_VERSION</source>
-        <translation>Version 7.8.0</translation>
+        <translation>Version 7.8.0BR</translation>
     </message>
     <message>
         <source>ABOUT_TITLE</source>

diff --git a/src/resources/LightApp_msg_fr.ts b/src/resources/LightApp_msg_fr.ts
index 2e4e69aa6f15aeb2e8447376627914c302a127bd..1fe841196aab5d3d0f9944b058075e8bb71ad299 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>V7.8.0</translation>
+        <translation>V7.8.0BR</translation>
     </message>
     <message>
         <source>ABOUT_LICENSE</source>
@@ -25,7 +25,7 @@
     </message>
     <message>
         <source>ABOUT_VERSION</source>
-        <translation>Version 7.8.0</translation>
+        <translation>Version 7.8.0BR</translation>
     </message>
     <message>
         <source>ABOUT_TITLE</source>

diff --git a/src/resources/LightApp_msg_ja.ts b/src/resources/LightApp_msg_ja.ts
index b8c5d452ac62e965bd177cc3981fb27c91876cc9..b568d191d1f700b2cef2976affc9c07932ee051f 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>V7.8.0</translation>
+      <translation>V7.8.0BR</translation>
     </message>
     <message>
       <source>ABOUT_LICENSE</source>
@@ -25,7 +25,7 @@
     </message>
     <message>
       <source>ABOUT_VERSION</source>
-      <translation>Version 7.8.0</translation>
+      <translation>Version 7.8.0BR</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"""