From: vsv Date: Mon, 6 Aug 2018 13:09:27 +0000 (+0300) Subject: Adapt help management to Linux Salome environment X-Git-Tag: SHAPER_V9_1_0RC1~94 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=0360e47a874c5776d439542ccec396fd02a96456;p=modules%2Fshaper.git Adapt help management to Linux Salome environment --- diff --git a/CMakeLists.txt b/CMakeLists.txt index 6086abc2e..ced9a4d2b 100644 --- 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 eb82fb25c..d70b02447 100755 --- 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 d71b8d7f1..892bc8ec7 100755 --- a/src/XGUI/XGUI_Workshop.cpp +++ b/src/XGUI/XGUI_Workshop.cpp @@ -571,23 +571,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"));