You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@corinthia.apache.org by ja...@apache.org on 2015/08/15 19:11:34 UTC
incubator-corinthia git commit: ready to add files
Repository: incubator-corinthia
Updated Branches:
refs/heads/editorFramework 133150eb7 -> 58764190d
ready to add files
Project: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/commit/58764190
Tree: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/tree/58764190
Diff: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/diff/58764190
Branch: refs/heads/editorFramework
Commit: 58764190d536493fc47927c94d9d7f9763e39f58
Parents: 133150e
Author: jani <ja...@apache.org>
Authored: Sat Aug 15 19:11:01 2015 +0200
Committer: jani <ja...@apache.org>
Committed: Sat Aug 15 19:11:01 2015 +0200
----------------------------------------------------------------------
CMakeLists.txt | 5 +--
experiments/editorFramework/CMakeLists.txt | 46 +++++++++++++++-----
.../src/Layer1_toolkit/qt/qt_toolkit.h | 4 ++
3 files changed, 40 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/58764190/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/CMakeLists.txt b/CMakeLists.txt
index d1f43c2..4e6af40 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -81,8 +81,5 @@ add_subdirectory(DocFormats)
add_subdirectory(consumers/dftest/src)
add_subdirectory(consumers/dfconvert/src)
add_subdirectory(consumers/dfutil/src)
-if(DEFINED NONCONFORM_APACHE)
- add_subdirectory(consumers/corinthia/src)
-endif(DEFINED NONCONFORM_APACHE)
-
add_subdirectory(experiments/flat/src)
+add_subdirectory(experiments/editorframework)
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/58764190/experiments/editorFramework/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/experiments/editorFramework/CMakeLists.txt b/experiments/editorFramework/CMakeLists.txt
index bd904de..90c223b 100644
--- a/experiments/editorFramework/CMakeLists.txt
+++ b/experiments/editorFramework/CMakeLists.txt
@@ -78,11 +78,39 @@ set(SOURCES_JS_elementtypes
src/Layer0_Javascript/elementtypes/elements.txt
)
+
+
+###
+## group Qt implementation defined toolkit
+###
+set(SOURCES_TOOLKIT_QT
+ src/Layer1_toolkit/qt/qt_toolkit.c
+ src/Layer1_toolkit/qt/qt_toolkit.h)
+
+
+
+###
+## group Web implementation defined toolkit
+###
+set(SOURCES_TOOLKIT_WEB
+ )
+
+
+
###
## group source objects
###
+if(${EDITOR_TOOLKIT} MATCHES "Web")
+ set (SOURCES_TK ${SOURCES_TOOLKIT_WEB})
+else()
+ set (SOURCES_TK ${SOURCES_TOOLKIT_QT})
+endif(${EDITOR_TOOLKIT} MATCHES "Web")
+
set(SOURCES
- src/main.c)
+ src/Layer1_toolkit/toolkit.h
+ src/Layer1_toolkit/Layer1_interface.h
+ ${SOURCES_TK}
+ )
@@ -91,12 +119,6 @@ set(SOURCES
###
include_directories()
include_directories(SYSTEM ${INCLUDE_DIRS})
-include_directories(.)
-include_directories(SYSTEM ../../../DocFormats/api/headers)
-include_directories(../../../DocFormats/headers)
-include_directories(../../../DocFormats/core/src/lib)
-include_directories(../../../DocFormats/unittest)
-link_directories(${LIB_DIRS})
@@ -106,10 +128,12 @@ link_directories(${LIB_DIRS})
add_executable(corinthia ${SOURCES})
target_link_libraries(corinthia DocFormats ${LIBS})
source_group(src FILES ${SOURCES})
+source_group(src\\toolkit_qt FILES ${SOURCES_TOOLKIT_QT})
+source_group(src\\toolkit_web FILES ${SOURCES_TOOLKIT_WEB})
-source_group(javascript FILES ${SOURCES_JS})
-source_group(javascript/3rdparty FILES ${SOURCES_JS_3rdparty})
-source_group(javascript/dtdsource FILES ${SOURCES_JS_dtdsource})
-source_group(javascript/elementtypes FILES ${SOURCES_JS_elementtypes})
+source_group(src\\javascript FILES ${SOURCES_JS})
+source_group(src\\javascript\\3rdparty FILES ${SOURCES_JS_3rdparty})
+source_group(src\\javascript\\dtdsource FILES ${SOURCES_JS_dtdsource})
+source_group(src\\javascript\\elementtypes FILES ${SOURCES_JS_elementtypes})
set_property(TARGET corinthia PROPERTY FOLDER consumers)
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/58764190/experiments/editorFramework/src/Layer1_toolkit/qt/qt_toolkit.h
----------------------------------------------------------------------
diff --git a/experiments/editorFramework/src/Layer1_toolkit/qt/qt_toolkit.h b/experiments/editorFramework/src/Layer1_toolkit/qt/qt_toolkit.h
index 031ed49..701f494 100644
--- a/experiments/editorFramework/src/Layer1_toolkit/qt/qt_toolkit.h
+++ b/experiments/editorFramework/src/Layer1_toolkit/qt/qt_toolkit.h
@@ -29,5 +29,9 @@ class qt_toolkit : toolkit
/* toolkit qt implementation */
public:
+
+private:
+ QApplication *app;
+ MainWindow *window;
};