diff options
author | Christian Mollekopf <chrigi_1@fastmail.fm> | 2016-03-09 15:13:00 +0100 |
---|---|---|
committer | Christian Mollekopf <chrigi_1@fastmail.fm> | 2016-03-09 15:14:19 +0100 |
commit | 2dac72ae43f627340694d89db68184cb07e68650 (patch) | |
tree | 5397a5b6216bd05f9f48a219f379d59d64c8bde4 | |
parent | da079fe211094621fbcb89614e58b84caa9a603b (diff) | |
download | kube-2dac72ae43f627340694d89db68184cb07e68650.tar.gz kube-2dac72ae43f627340694d89db68184cb07e68650.zip |
Moved application to components
-rw-r--r-- | CMakeLists.txt | 3 | ||||
-rw-r--r-- | applications/CMakeLists.txt | 4 | ||||
-rw-r--r-- | applications/mail/CMakeLists.txt (renamed from applications/kube-mail/CMakeLists.txt) | 3 | ||||
-rw-r--r-- | applications/mail/main.cpp (renamed from applications/kube-mail/main.cpp) | 0 | ||||
-rw-r--r-- | components/CMakeLists.txt | 26 | ||||
-rw-r--r-- | components/package/contents/ui/Avatar.qml (renamed from applications/kube-mail/package/contents/ui/Avatar.qml) | 0 | ||||
-rw-r--r-- | components/package/contents/ui/ColorPalette.qml (renamed from applications/kube-mail/package/contents/ui/ColorPalette.qml) | 0 | ||||
-rw-r--r-- | components/package/contents/ui/Composer.qml (renamed from applications/kube-mail/package/contents/ui/Composer.qml) | 0 | ||||
-rw-r--r-- | components/package/contents/ui/FocusComposer.qml (renamed from applications/kube-mail/package/contents/ui/FocusComposer.qml) | 0 | ||||
-rw-r--r-- | components/package/contents/ui/FolderListView.qml (renamed from applications/kube-mail/package/contents/ui/FolderListView.qml) | 0 | ||||
-rw-r--r-- | components/package/contents/ui/FolderModel.qml (renamed from applications/kube-mail/package/contents/ui/FolderModel.qml) | 0 | ||||
-rw-r--r-- | components/package/contents/ui/ListItem.qml (renamed from applications/kube-mail/package/contents/ui/ListItem.qml) | 0 | ||||
-rw-r--r-- | components/package/contents/ui/MailListModel.qml (renamed from applications/kube-mail/package/contents/ui/MailListModel.qml) | 0 | ||||
-rw-r--r-- | components/package/contents/ui/MailListView.qml (renamed from applications/kube-mail/package/contents/ui/MailListView.qml) | 0 | ||||
-rw-r--r-- | components/package/contents/ui/MailViewer.qml (renamed from applications/kube-mail/package/contents/ui/MailViewer.qml) | 0 | ||||
-rw-r--r-- | components/package/contents/ui/Settings.qml (renamed from applications/kube-mail/package/contents/ui/Settings.qml) | 0 | ||||
-rw-r--r-- | components/package/contents/ui/SingleMailView.qml (renamed from applications/kube-mail/package/contents/ui/SingleMailView.qml) | 0 | ||||
-rw-r--r-- | components/package/contents/ui/example.qml (renamed from applications/kube-mail/package/contents/ui/example.qml) | 0 | ||||
-rw-r--r-- | components/package/contents/ui/main.qml (renamed from applications/kube-mail/package/contents/ui/main.qml) | 0 | ||||
-rw-r--r-- | components/package/metadata.desktop (renamed from applications/kube-mail/package/metadata.desktop) | 0 |
20 files changed, 30 insertions, 6 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 7d896eb0..901e1c83 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt | |||
@@ -2,7 +2,8 @@ project(kube) | |||
2 | 2 | ||
3 | cmake_minimum_required(VERSION 2.8.10.1) | 3 | cmake_minimum_required(VERSION 2.8.10.1) |
4 | 4 | ||
5 | add_subdirectory(applications) | ||
6 | add_subdirectory(framework) | 5 | add_subdirectory(framework) |
6 | add_subdirectory(components) | ||
7 | add_subdirectory(accounts) | 7 | add_subdirectory(accounts) |
8 | add_subdirectory(icons) | 8 | add_subdirectory(icons) |
9 | add_subdirectory(applications) | ||
diff --git a/applications/CMakeLists.txt b/applications/CMakeLists.txt index dd65a3e8..df78d62a 100644 --- a/applications/CMakeLists.txt +++ b/applications/CMakeLists.txt | |||
@@ -1,2 +1,2 @@ | |||
1 | add_subdirectory(kube-mail) | 1 | add_subdirectory(mail) |
2 | add_subdirectory(kube-accounts) | 2 | #add_subdirectory(kube-accounts) |
diff --git a/applications/kube-mail/CMakeLists.txt b/applications/mail/CMakeLists.txt index 1b1767ed..706be8aa 100644 --- a/applications/kube-mail/CMakeLists.txt +++ b/applications/mail/CMakeLists.txt | |||
@@ -22,9 +22,6 @@ find_package(Qt5 REQUIRED NO_MODULE COMPONENTS Core Quick Test Gui Widgets) | |||
22 | set (QT_MIN_VERSION "5.4.0") | 22 | set (QT_MIN_VERSION "5.4.0") |
23 | find_package(KF5 REQUIRED COMPONENTS Package) | 23 | find_package(KF5 REQUIRED COMPONENTS Package) |
24 | 24 | ||
25 | # install UI package | ||
26 | kpackage_install_package(package org.kde.kube.mail "genericqml") | ||
27 | |||
28 | # install executable | 25 | # install executable |
29 | add_executable(${PROJECT_NAME} main.cpp) | 26 | add_executable(${PROJECT_NAME} main.cpp) |
30 | qt5_use_modules(${PROJECT_NAME} Gui Quick Widgets) | 27 | qt5_use_modules(${PROJECT_NAME} Gui Quick Widgets) |
diff --git a/applications/kube-mail/main.cpp b/applications/mail/main.cpp index 1ff4effb..1ff4effb 100644 --- a/applications/kube-mail/main.cpp +++ b/applications/mail/main.cpp | |||
diff --git a/components/CMakeLists.txt b/components/CMakeLists.txt new file mode 100644 index 00000000..2227e170 --- /dev/null +++ b/components/CMakeLists.txt | |||
@@ -0,0 +1,26 @@ | |||
1 | project(kube-components) | ||
2 | |||
3 | cmake_minimum_required(VERSION 2.8.10.1) | ||
4 | |||
5 | include(CPack) | ||
6 | include(FeatureSummary) | ||
7 | find_package(PkgConfig) | ||
8 | |||
9 | ################# set KDE specific information ################# | ||
10 | |||
11 | find_package(ECM 0.0.8 REQUIRED NO_MODULE) | ||
12 | |||
13 | # where to look first for cmake modules, before ${CMAKE_ROOT}/Modules/ is checked | ||
14 | set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR}) | ||
15 | |||
16 | include(KDEInstallDirs) | ||
17 | include(KDECMakeSettings) | ||
18 | include(KDECompilerSettings) | ||
19 | |||
20 | find_package(Qt5 REQUIRED NO_MODULE COMPONENTS Core Quick Test Gui Widgets) | ||
21 | |||
22 | set (QT_MIN_VERSION "5.4.0") | ||
23 | find_package(KF5 REQUIRED COMPONENTS Package) | ||
24 | |||
25 | # install UI package | ||
26 | kpackage_install_package(package org.kde.kube.mail "genericqml") | ||
diff --git a/applications/kube-mail/package/contents/ui/Avatar.qml b/components/package/contents/ui/Avatar.qml index 33d6733c..33d6733c 100644 --- a/applications/kube-mail/package/contents/ui/Avatar.qml +++ b/components/package/contents/ui/Avatar.qml | |||
diff --git a/applications/kube-mail/package/contents/ui/ColorPalette.qml b/components/package/contents/ui/ColorPalette.qml index db85cac6..db85cac6 100644 --- a/applications/kube-mail/package/contents/ui/ColorPalette.qml +++ b/components/package/contents/ui/ColorPalette.qml | |||
diff --git a/applications/kube-mail/package/contents/ui/Composer.qml b/components/package/contents/ui/Composer.qml index 1a6a4cc4..1a6a4cc4 100644 --- a/applications/kube-mail/package/contents/ui/Composer.qml +++ b/components/package/contents/ui/Composer.qml | |||
diff --git a/applications/kube-mail/package/contents/ui/FocusComposer.qml b/components/package/contents/ui/FocusComposer.qml index 8ec01cc9..8ec01cc9 100644 --- a/applications/kube-mail/package/contents/ui/FocusComposer.qml +++ b/components/package/contents/ui/FocusComposer.qml | |||
diff --git a/applications/kube-mail/package/contents/ui/FolderListView.qml b/components/package/contents/ui/FolderListView.qml index 1934932c..1934932c 100644 --- a/applications/kube-mail/package/contents/ui/FolderListView.qml +++ b/components/package/contents/ui/FolderListView.qml | |||
diff --git a/applications/kube-mail/package/contents/ui/FolderModel.qml b/components/package/contents/ui/FolderModel.qml index b20a1606..b20a1606 100644 --- a/applications/kube-mail/package/contents/ui/FolderModel.qml +++ b/components/package/contents/ui/FolderModel.qml | |||
diff --git a/applications/kube-mail/package/contents/ui/ListItem.qml b/components/package/contents/ui/ListItem.qml index 5396645d..5396645d 100644 --- a/applications/kube-mail/package/contents/ui/ListItem.qml +++ b/components/package/contents/ui/ListItem.qml | |||
diff --git a/applications/kube-mail/package/contents/ui/MailListModel.qml b/components/package/contents/ui/MailListModel.qml index bf0f70a2..bf0f70a2 100644 --- a/applications/kube-mail/package/contents/ui/MailListModel.qml +++ b/components/package/contents/ui/MailListModel.qml | |||
diff --git a/applications/kube-mail/package/contents/ui/MailListView.qml b/components/package/contents/ui/MailListView.qml index ff773e0e..ff773e0e 100644 --- a/applications/kube-mail/package/contents/ui/MailListView.qml +++ b/components/package/contents/ui/MailListView.qml | |||
diff --git a/applications/kube-mail/package/contents/ui/MailViewer.qml b/components/package/contents/ui/MailViewer.qml index 1d305297..1d305297 100644 --- a/applications/kube-mail/package/contents/ui/MailViewer.qml +++ b/components/package/contents/ui/MailViewer.qml | |||
diff --git a/applications/kube-mail/package/contents/ui/Settings.qml b/components/package/contents/ui/Settings.qml index da44d331..da44d331 100644 --- a/applications/kube-mail/package/contents/ui/Settings.qml +++ b/components/package/contents/ui/Settings.qml | |||
diff --git a/applications/kube-mail/package/contents/ui/SingleMailView.qml b/components/package/contents/ui/SingleMailView.qml index d6ae4bfa..d6ae4bfa 100644 --- a/applications/kube-mail/package/contents/ui/SingleMailView.qml +++ b/components/package/contents/ui/SingleMailView.qml | |||
diff --git a/applications/kube-mail/package/contents/ui/example.qml b/components/package/contents/ui/example.qml index e0c0a077..e0c0a077 100644 --- a/applications/kube-mail/package/contents/ui/example.qml +++ b/components/package/contents/ui/example.qml | |||
diff --git a/applications/kube-mail/package/contents/ui/main.qml b/components/package/contents/ui/main.qml index cf983dee..cf983dee 100644 --- a/applications/kube-mail/package/contents/ui/main.qml +++ b/components/package/contents/ui/main.qml | |||
diff --git a/applications/kube-mail/package/metadata.desktop b/components/package/metadata.desktop index 630cc133..630cc133 100644 --- a/applications/kube-mail/package/metadata.desktop +++ b/components/package/metadata.desktop | |||