release 7.8.0

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4ba49a9d9be2a3e5349f97dfd592f8045dd55000..376d538e49c5973510948370b874d799e9213b19 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2012-2015  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2012-2016  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public

diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
index c8a2d79a625742fdaa50ba799e814fa26756b972..832706162a2e3b488401477a636e52b83d89db48 100644 (file)
--- a/doc/CMakeLists.txt
+++ b/doc/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2012-2015  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2012-2016  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public

diff --git a/doc/conf.py.in b/doc/conf.py.in
index c9563b01d5a08120f3575968235fb02a1b1c1ccd..be88a545f6af59b3f0a5c5a4e35cf663e9dcf2a6 100644 (file)
--- a/doc/conf.py.in
+++ b/doc/conf.py.in
@@ -36,7 +36,7 @@ master_doc = 'index'
 
 # General information about the project.
 project = 'salome'
-copyright = '2010-2015 CEA/DEN, EDF R&D, OPEN CASCADE, ASTEK INDUSTRIE'
+copyright = '2010-2016 CEA/DEN, EDF R&D, OPEN CASCADE, ASTEK INDUSTRIE'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the

diff --git a/resources/CMakeLists.txt b/resources/CMakeLists.txt
index b1797a93cce27bda3b1eae1c46808adc377e508e..91e0358f25686e581df1d83fc3b872e92a01198c 100644 (file)
--- a/resources/CMakeLists.txt
+++ b/resources/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2012-2015  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2012-2016  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public

diff --git a/resources/about.png b/resources/about.png
index c73d028e5dcc1c9cb33c3c1bab72f88119948957..b725ce14db4819e299f2f9a9555c7d76d712ddf8 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 e5c1f96d925962b2dc25c4dce3e59588095b5870..33971d224ee0b70bd212c2e5eeea6129bcf228da 100644 (file)
Binary files a/resources/app_logo.png and b/resources/app_logo.png differ

diff --git a/resources/doc/CMakeLists.txt b/resources/doc/CMakeLists.txt
index 5852f682334781121ad73efe71a024f2f1ef567d..660f62173632ab06343717774757260f8eaf1921 100644 (file)
--- a/resources/doc/CMakeLists.txt
+++ b/resources/doc/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2012-2015  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2012-2016  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public

diff --git a/resources/splash.png b/resources/splash.png
index c73d028e5dcc1c9cb33c3c1bab72f88119948957..b725ce14db4819e299f2f9a9555c7d76d712ddf8 100644 (file)
Binary files a/resources/splash.png and b/resources/splash.png differ

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 5dc593a7a75a298034d216588127d4ed3dec8862..847da555d33c243c27708f043aa4ed397ecc2240 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2012-2015  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2012-2016  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public

diff --git a/src/parseConfigFile.py b/src/parseConfigFile.py
index e6c2bde9dcf97716e130ea6de0d06207f70021c3..58ff8af7ef440aa8b37719df2efbebf8a5a801b0 100755 (executable)
--- a/src/parseConfigFile.py
+++ b/src/parseConfigFile.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2013-2015  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2013-2016  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public

diff --git a/src/resources/CMakeLists.txt b/src/resources/CMakeLists.txt
index 812fddcebd1b44d726dea8ac3ffe42651ca178f0..b0a2d0fcdec8b80d1723d9d3ab073bd24993d23e 100644 (file)
--- a/src/resources/CMakeLists.txt
+++ b/src/resources/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2012-2015  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2012-2016  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public

diff --git a/src/resources/LightApp_msg_en.ts b/src/resources/LightApp_msg_en.ts
index e729f8e8750262b90c0f83a0bbd091e355d492a6..8b43b8fb34f608ee6968400769b2f05a92bc6d9e 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.0BR</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.0BR</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 1fe841196aab5d3d0f9944b058075e8bb71ad299..093d78a44d6ce280c3722948e9cf28e820854956 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.0BR</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.0BR</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 b568d191d1f700b2cef2976affc9c07932ee051f..48a5c255843845cfa318713e560d2c778cce3d22 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.0BR</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.0BR</translation>
+      <translation>Version 7.8.0</translation>
     </message>
     <message>
       <source>ABOUT_TITLE</source>

diff --git a/src/salomeContext.py b/src/salomeContext.py
index f30c0151e4852165f20902e8e654eaaf6978682f..00fa1bca86df5c2eb559bc4e86afd00097557bf0 100755 (executable)
--- a/src/salomeContext.py
+++ b/src/salomeContext.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2013-2015  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2013-2016  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -85,6 +85,7 @@ class SalomeContext:
   to .cfg format before setting the context.
   """
   def __init__(self, configFileNames=0):
+    self.getLogger().setLevel(logging.INFO)
     #it could be None explicitely (if user use multiples setVariable...for standalone)
     if configFileNames is None:
        return
@@ -142,8 +143,8 @@ class SalomeContext:
     absoluteAppliPath = os.getenv('ABSOLUTE_APPLI_PATH','')
     env_copy = os.environ.copy()
     proc = subprocess.Popen(['python', os.path.join(absoluteAppliPath,"bin","salome","salomeContext.py"), pickle.dumps(self), pickle.dumps(args)], shell=False, close_fds=True, env=env_copy)
-    msg = proc.communicate()
-    return msg, proc.returncode
+    out, err = proc.communicate()
+    return out, err, proc.returncode
   #
 
   """Append value to PATH environment variable"""

diff --git a/src/salomeContextUtils.py b/src/salomeContextUtils.py
index eed1dd58802d0a9170aae5ebd6e02c5018544d44..36bec2572f827569896949fd19538ed8ccec3174 100755 (executable)
--- a/src/salomeContextUtils.py
+++ b/src/salomeContextUtils.py
@@ -1,6 +1,6 @@
 #! /usr/bin/env python
 
-# Copyright (C) 2013-2015  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2013-2016  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public

diff --git a/src/tests/CMakeLists.txt b/src/tests/CMakeLists.txt
index b0e95da057507ff501043b1f612f85667a635de2..1895f45aa487d02dd1c526cd857ab39ba7fbac80 100644 (file)
--- a/src/tests/CMakeLists.txt
+++ b/src/tests/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2012-2015  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2012-2016  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public