[Ktutorial-commits] SF.net SVN: ktutorial:[255] trunk/ktutorial/ktutorial-editor/src

[<dan...@us...>]

Revision: 255
          http://ktutorial.svn.sourceforge.net/ktutorial/?rev=255&view=rev
Author:   danxuliu
Date:     2010-09-25 03:40:16 +0000 (Sat, 25 Sep 2010)

Log Message:
-----------
Use KTutorial library in KTutorial editor to be able to provide tutorials for the editor itself.

Modified Paths:
--------------
    trunk/ktutorial/ktutorial-editor/src/CMakeLists.txt
    trunk/ktutorial/ktutorial-editor/src/KTutorialEditor.cpp
    trunk/ktutorial/ktutorial-editor/src/ktutorial-editorui.rc

Modified: trunk/ktutorial/ktutorial-editor/src/CMakeLists.txt
===================================================================
--- trunk/ktutorial/ktutorial-editor/src/CMakeLists.txt	2010-09-25 03:33:38 UTC (rev 254)
+++ trunk/ktutorial/ktutorial-editor/src/CMakeLists.txt	2010-09-25 03:40:16 UTC (rev 255)
@@ -10,6 +10,22 @@
 add_subdirectory(util)
 add_subdirectory(view)
 
+# When KTutorial is built, the library isn't installed yet when the editor is
+# built. In that case, use the headers and libraries in the build directory
+# of the library.
+if(ktutorial-library_BINARY_DIR)
+    set(KTUTORIAL_FOUND TRUE)
+    include_directories(${ktutorial-library_BINARY_DIR}/includes)
+    set(KTUTORIAL_LIBRARIES ktutorial)
+endif(ktutorial-library_BINARY_DIR)
+
+# If ktutorial-test-app is built in standalone mode, look for an installed
+# KTutorial library.
+if(NOT KTUTORIAL_FOUND)
+    find_package(KTutorial REQUIRED)
+    include_directories(${KTUTORIAL_INCLUDE_DIRS})
+endif(NOT KTUTORIAL_FOUND)
+
 if (QT_QTDBUS_FOUND)
     add_definitions(-DQT_QTDBUS_FOUND)
     add_subdirectory(targetapplication)
@@ -39,6 +55,7 @@
                       ktutorial_editor_serialization
                       ktutorial_editor_util
                       ktutorial_editor_view
+                      ${KTUTORIAL_LIBRARIES}
 )
 
 if (QT_QTDBUS_FOUND)

Modified: trunk/ktutorial/ktutorial-editor/src/KTutorialEditor.cpp
===================================================================
--- trunk/ktutorial/ktutorial-editor/src/KTutorialEditor.cpp	2010-09-25 03:33:38 UTC (rev 254)
+++ trunk/ktutorial/ktutorial-editor/src/KTutorialEditor.cpp	2010-09-25 03:40:16 UTC (rev 255)
@@ -26,6 +26,8 @@
 #include <KConfigGroup>
 #include <KLocalizedString>
 
+#include <ktutorial/KTutorial.h>
+
 #include "EditActions.h"
 #include "FileActions.h"
 #include "data/Tutorial.h"
@@ -64,6 +66,8 @@
 
     mFileActions->newTutorial();
 
+    KTutorial::self()->setup(this);
+
     setupGUI();
 }
 

Modified: trunk/ktutorial/ktutorial-editor/src/ktutorial-editorui.rc
===================================================================
--- trunk/ktutorial/ktutorial-editor/src/ktutorial-editorui.rc	2010-09-25 03:33:38 UTC (rev 254)
+++ trunk/ktutorial/ktutorial-editor/src/ktutorial-editorui.rc	2010-09-25 03:40:16 UTC (rev 255)
@@ -38,6 +38,9 @@
                 <Action name="showEditReactionDock"/>
             </Menu>
         </Menu>
+        <Menu name="help">
+            <DefineGroup name="ktutorial"/>
+        </Menu>
     </MenuBar>
     <ToolBar name="mainToolBar">
         <Text context="@title:menu">Main Toolbar</Text>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.