From: CEA Support SALOME <support-salome@cea.fr>
Date: Wed, 17 Feb 2016 09:39:29 +0000 (+0100)
Subject: Update SALOME 7.8.0
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=e79e512005f39890f7e13c232472a2bfe810ff98;p=tools%2FSALOME.git

Update SALOME 7.8.0
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ab6fa02..ab3ec5f 100644
--- 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 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 90d6d52..4d38ef2 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 90d6d52..4d38ef2 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 b558617..6e138c7 100644
--- 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 cbdac3f..2e4e69a 100644
--- 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 594165e..b8c5d45 100644
--- 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 9b0c938..eed1dd5 100755
--- 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