Adapt help management to Linux Salome environment

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6086abc2ecb96a05f3842812cdda259117c42641..ced9a4d2b9100a77b78ad60dbe8bb322c0f00cc5 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -99,7 +99,6 @@ IF(${HAVE_SALOME})
     SET(SHAPER_INSTALL_GUI_DOC share/doc/salome/gui/SHAPER CACHE INTERNAL "" FORCE)
     SET(SHAPER_INSTALL_TUI_DOC share/doc/salome/tui/SHAPER CACHE INTERNAL "" FORCE)
     # without SALOME there is another kind of documentation, separated one
-    #ADD_SUBDIRECTORY (doc)
 ELSE(${HAVE_SALOME})
     SET(SHAPER_INSTALL_ADDONS addons CACHE INTERNAL "" FORCE)
     SET(SHAPER_INSTALL_BIN bin CACHE INTERNAL "" FORCE)

diff --git a/make.sh b/make.sh
index eb82fb25c014c4661c798935de644b7d1dbd07e2..d70b02447ea72b01afecd2d6451da4ceec416485 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -23,7 +23,10 @@ while [[ $# > 0 ]]; do
   esac
 done
 
+## Preserve PTHONPATH in order to avoid problems with Sphinx on Fedora26 because of Pigments in ParaView
+export PYTHONPATH_OLD=$PYTHONPATH
 source env.sh
+export PYTHONPATH=$PYTHONPATH_OLD
 
 CMAKE_ARGS=""
 CMAKE_ARGS="${CMAKE_ARGS} -DCMAKE_BUILD_TYPE=${BUILD_TYPE:-Release}"

diff --git a/src/XGUI/XGUI_Workshop.cpp b/src/XGUI/XGUI_Workshop.cpp
index a475dd5843456e081ff3545fcbc75d8893ba4b84..ed2ba64718bbb06452cb7d0a5e2cac2e1142f3f0 100755 (executable)
--- a/src/XGUI/XGUI_Workshop.cpp
+++ b/src/XGUI/XGUI_Workshop.cpp
@@ -570,23 +570,19 @@ void XGUI_Workshop::onHelpActionClicked()
       QString aDocDir;
       const QChar aSep = QDir::separator();
 #ifdef HAVE_SALOME
-      QString aBrowserName("HelpBrowser");
       QString aDir(getenv("SHAPER_ROOT_DIR"));
       if (!aDir.isEmpty()) {
         aDocDir = aDir + aSep + "share" + aSep + "doc" + aSep +
           "salome" + aSep + "gui" + aSep + "SHAPER";
       }
       SUIT_ResourceMgr* aResMgr = ModuleBase_Preferences::resourceMgr();
-      bool aUseExtBrowser = aResMgr->booleanValue("ExternalBrowser", "use_external_browser", false);
-      if (aUseExtBrowser) {
-        QString platform;
+      QString platform;
 #ifdef WIN32
-        platform = "winapplication";
+      platform = "winapplication";
 #else
-        platform = "application";
+      platform = "application";
 #endif
-        aBrowserName = aResMgr->stringValue("ExternalBrowser", platform);
-      }
+      QString aBrowserName = aResMgr->stringValue("ExternalBrowser", platform);
 #else
       QString aBrowserName("C:\\Program Files\\Internet Explorer\\iexplore.exe");
       QString aDir(getenv("OPENPARTS_ROOT_DIR"));