Update SALOME 7.8.0

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ab6fa02e5e31ec7ced8eaee1cfa9d67dfccdd3f4..ab3ec5f15ca680095597f8216daf6a9572c0d3b5 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -56,7 +56,8 @@ ENDIF()
 
 # KERNEL optionals:
 IF(SALOME_BUILD_DOC)
-  FIND_PACKAGE(SalomePython)
+  FIND_PACKAGE(SalomePythonInterp REQUIRED)
+  FIND_PACKAGE(SalomePythonLibs REQUIRED)
   FIND_PACKAGE(SalomeSphinx)
   SALOME_LOG_OPTIONAL_PACKAGE(Sphinx SALOME_BUILD_DOC)
 ENDIF()

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 90d6d527805c76f0b8cf88bfcd726f063a76f2cc..4d38ef2ccd2d8a459a306049ab875014db4c188c 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 90d6d527805c76f0b8cf88bfcd726f063a76f2cc..4d38ef2ccd2d8a459a306049ab875014db4c188c 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 b5586171b4168c554bf3157a06ae814b0eb373cb..6e138c757bc1554a0ba3d974d03e755f6702c7e3 100644 (file)
--- a/src/resources/LightApp_msg_en.ts
+++ b/src/resources/LightApp_msg_en.ts
@@ -17,7 +17,7 @@
     </message>
     <message>
         <source>APP_VERSION</source>
-        <translation>V7.8.0alpha</translation>
+        <translation>V7.8.0</translation>
     </message>
     <message>
         <source>ABOUT_LICENSE</source>
@@ -25,7 +25,7 @@
     </message>
     <message>
         <source>ABOUT_VERSION</source>
-        <translation>Version 7.8.0alpha</translation>
+        <translation>Version 7.8.0</translation>
     </message>
     <message>
         <source>ABOUT_TITLE</source>

diff --git a/src/resources/LightApp_msg_fr.ts b/src/resources/LightApp_msg_fr.ts
index cbdac3f0f355f19f70aa0ad9d9d5db32b21eb928..2e4e69aa6f15aeb2e8447376627914c302a127bd 100644 (file)
--- a/src/resources/LightApp_msg_fr.ts
+++ b/src/resources/LightApp_msg_fr.ts
@@ -17,7 +17,7 @@
     </message>
     <message>
         <source>APP_VERSION</source>
-        <translation>V7.8.0alpha</translation>
+        <translation>V7.8.0</translation>
     </message>
     <message>
         <source>ABOUT_LICENSE</source>
@@ -25,7 +25,7 @@
     </message>
     <message>
         <source>ABOUT_VERSION</source>
-        <translation>Version 7.8.0alpha</translation>
+        <translation>Version 7.8.0</translation>
     </message>
     <message>
         <source>ABOUT_TITLE</source>

diff --git a/src/resources/LightApp_msg_ja.ts b/src/resources/LightApp_msg_ja.ts
index 594165e65491e93089ac639ef9ab058a5b2231b2..b8c5d452ac62e965bd177cc3981fb27c91876cc9 100644 (file)
--- a/src/resources/LightApp_msg_ja.ts
+++ b/src/resources/LightApp_msg_ja.ts
@@ -17,7 +17,7 @@
     </message>
     <message>
       <source>APP_VERSION</source>
-      <translation>V7.8.0alpha</translation>
+      <translation>V7.8.0</translation>
     </message>
     <message>
       <source>ABOUT_LICENSE</source>
@@ -25,7 +25,7 @@
     </message>
     <message>
       <source>ABOUT_VERSION</source>
-      <translation>Version 7.8.0alpha</translation>
+      <translation>Version 7.8.0</translation>
     </message>
     <message>
       <source>ABOUT_TITLE</source>

diff --git a/src/salomeContextUtils.py b/src/salomeContextUtils.py
index 9b0c938283fba3c8cd038c8ed8a1e536cf11c85e..eed1dd58802d0a9170aae5ebd6e02c5018544d44 100755 (executable)
--- a/src/salomeContextUtils.py
+++ b/src/salomeContextUtils.py
@@ -333,7 +333,7 @@ def getScriptsAndArgs(args=None, searchPathList=None):
         pass
 
       if currentScript and callPython:
-        currentKey = " "+currentScript
+        currentKey = "python "+currentScript
         scriptArgs.append(ScriptAndArgs(script=currentKey))
         callPython = False
       elif currentScript:
@@ -342,7 +342,7 @@ def getScriptsAndArgs(args=None, searchPathList=None):
           scriptArgs.append(ScriptAndArgs(script=currentKey))
           callPython = False
         elif not os.access(currentScript, os.X_OK):
-          currentKey = " "+currentScript
+          currentKey = "python "+currentScript
           scriptArgs.append(ScriptAndArgs(script=currentKey))
         else:
           ispython = False
@@ -358,7 +358,7 @@ def getScriptsAndArgs(args=None, searchPathList=None):
           except:
             pass
           if not ispython and currentScript[-3:] == ".py":
-            currentKey = " "+currentScript
+            currentKey = "python "+currentScript
           else:
             currentKey = currentScript
             pass