From: vsv Date: Mon, 20 Aug 2018 14:03:44 +0000 (+0300) Subject: Switch off help X-Git-Tag: SHAPER_V9_1_0RC1~55 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=e2cb5de944a16004163fd5168f939eaadd115466;p=modules%2Fshaper.git Switch off help --- diff --git a/doc/gui/CMakeLists.txt b/doc/gui/CMakeLists.txt index f66b3e2c8..79e7b2d47 100644 --- a/doc/gui/CMakeLists.txt +++ b/doc/gui/CMakeLists.txt @@ -26,30 +26,30 @@ CONFIGURE_FILE(${input} ${output}) #sphinx-build -b html -c doc -D latex_paper_size=a4 -d doc/doctree /dn23/PPGP/vsv/SALOME730/SOURCES/PPGP_SRC/doc doc/html -INSTALL(CODE " -EXECUTE_PROCESS( -COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/build_index.py ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} -) -") - - -INSTALL(CODE " -EXECUTE_PROCESS( -COMMAND ${SPHINX_EXECUTABLE} -Q -b html -c ${CMAKE_CURRENT_BINARY_DIR} -d doctree ${CMAKE_CURRENT_BINARY_DIR} html -WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} -)" -) - -IF(${HAVE_SALOME}) - INSTALL(CODE " - EXECUTE_PROCESS( - COMMAND ${PYTHON_EXECUTABLE} -c \"import shutil;shutil.rmtree('${CMAKE_INSTALL_PREFIX}/share/doc/salome/gui/SHAPER', True);shutil.copytree('${CMAKE_CURRENT_BINARY_DIR}/html', '${CMAKE_INSTALL_PREFIX}/share/doc/salome/gui/SHAPER')\" - ) - ") -ELSE(${HAVE_SALOME}) - INSTALL(CODE " - EXECUTE_PROCESS( - COMMAND ${PYTHON_EXECUTABLE} -c \"import shutil;shutil.rmtree('${CMAKE_INSTALL_PREFIX}/doc/gui', True);shutil.copytree('${CMAKE_CURRENT_BINARY_DIR}/html', '${CMAKE_INSTALL_PREFIX}/doc/gui')\" - ) - ") -ENDIF(${HAVE_SALOME}) +# INSTALL(CODE " +# EXECUTE_PROCESS( +# COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/build_index.py ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} +# ) +# ") + + +# INSTALL(CODE " +# EXECUTE_PROCESS( +# COMMAND ${SPHINX_EXECUTABLE} -Q -b html -c ${CMAKE_CURRENT_BINARY_DIR} -d doctree ${CMAKE_CURRENT_BINARY_DIR} html +# WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} +# )" +# ) + +# IF(${HAVE_SALOME}) + # INSTALL(CODE " + # EXECUTE_PROCESS( + # COMMAND ${PYTHON_EXECUTABLE} -c \"import shutil;shutil.rmtree('${CMAKE_INSTALL_PREFIX}/share/doc/salome/gui/SHAPER', True);shutil.copytree('${CMAKE_CURRENT_BINARY_DIR}/html', '${CMAKE_INSTALL_PREFIX}/share/doc/salome/gui/SHAPER')\" + # ) + # ") +# ELSE(${HAVE_SALOME}) + # INSTALL(CODE " + # EXECUTE_PROCESS( + # COMMAND ${PYTHON_EXECUTABLE} -c \"import shutil;shutil.rmtree('${CMAKE_INSTALL_PREFIX}/doc/gui', True);shutil.copytree('${CMAKE_CURRENT_BINARY_DIR}/html', '${CMAKE_INSTALL_PREFIX}/doc/gui')\" + # ) + # ") +# ENDIF(${HAVE_SALOME}) diff --git a/src/XGUI/XGUI_Workshop.cpp b/src/XGUI/XGUI_Workshop.cpp index fc533769b..7145cfb61 100755 --- a/src/XGUI/XGUI_Workshop.cpp +++ b/src/XGUI/XGUI_Workshop.cpp @@ -592,7 +592,6 @@ void XGUI_Workshop::onHelpActionClicked() #endif QStringList aParams; aParams << aDocDir + aSep + aHelpPage; - QProcess::startDetached(aBrowserName, aParams); } } }