Activate help system

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9b6a431d9f7b8359288b78b42cd3f3b07831efae..dd2b1bdee57662e12293897fb32e2deef3f94ab2 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -30,7 +30,7 @@ ENDIF(WIN32)
 SET (SHAPER_Version 9.1.0RC1)
 
 SET(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/CMakeCommon" ${CMAKE_MODULE_PATH})
-OPTION(SHAPER_BUILD_DOC "Generate SHAPER documentation" OFF)
+OPTION(SHAPER_BUILD_DOC "Generate SHAPER documentation" ON)
 
 INCLUDE(SalomeMacros)
 

diff --git a/doc/gui/CMakeLists.txt b/doc/gui/CMakeLists.txt
index 79e7b2d47e27a052fdb5494b0b5f1fa29846acee..f66b3e2c81e5269910390b9d6130711c4d726aab 100644 (file)
--- 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 27f496e32bdd022876af889310806fd244333e63..a1ae91d19785ea74489c07b27c0a4d771d04cdcc 100755 (executable)
--- a/src/XGUI/XGUI_Workshop.cpp
+++ b/src/XGUI/XGUI_Workshop.cpp
@@ -596,6 +596,7 @@ void XGUI_Workshop::onHelpActionClicked()
 #endif
         QStringList aParams;
         aParams << aDocDir + aSep + aHelpPage;
+        QProcess::startDetached(aBrowserName, aParams);
       }
     }
   }