summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Mollekopf <chrigi_1@fastmail.fm>2016-03-03 17:10:18 +0100
committerChristian Mollekopf <chrigi_1@fastmail.fm>2016-03-03 17:10:18 +0100
commit54c3e5912b0d64bad5a1c66bc96f0552ac5e21f5 (patch)
tree65b511dc68bd327d59cc320b04cb077a0a52e014
parent7bc71c84a91d980f46bc042731ee903cef591031 (diff)
downloadkube-54c3e5912b0d64bad5a1c66bc96f0552ac5e21f5.tar.gz
kube-54c3e5912b0d64bad5a1c66bc96f0552ac5e21f5.zip
Install a qml plugin for the maildir account
This works and allows us to register other controllers and action handlers, but it's not yet clear to me whether we should rather be using kpackage for this as well (and I failed to get it to run, so, here we are...)
-rw-r--r--CMakeLists.txt1
-rw-r--r--accounts/CMakeLists.txt1
-rw-r--r--accounts/maildir/CMakeLists.txt27
-rw-r--r--accounts/maildir/package/contents/ui/MaildirAccountSettings.qml (renamed from applications/kube-mail/package/contents/ui/MaildirAccountSettings.qml)0
-rw-r--r--accounts/maildir/qmldir3
-rw-r--r--applications/kube-mail/package/contents/ui/Settings.qml3
6 files changed, 34 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index a70344bd..7d896eb0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -4,4 +4,5 @@ cmake_minimum_required(VERSION 2.8.10.1)
4 4
5add_subdirectory(applications) 5add_subdirectory(applications)
6add_subdirectory(framework) 6add_subdirectory(framework)
7add_subdirectory(accounts)
7add_subdirectory(icons) 8add_subdirectory(icons)
diff --git a/accounts/CMakeLists.txt b/accounts/CMakeLists.txt
new file mode 100644
index 00000000..25fa7f67
--- /dev/null
+++ b/accounts/CMakeLists.txt
@@ -0,0 +1 @@
add_subdirectory(maildir)
diff --git a/accounts/maildir/CMakeLists.txt b/accounts/maildir/CMakeLists.txt
new file mode 100644
index 00000000..7e9894b1
--- /dev/null
+++ b/accounts/maildir/CMakeLists.txt
@@ -0,0 +1,27 @@
1project(kube-accounts-maildir)
2
3cmake_minimum_required(VERSION 2.8.10.1)
4
5include(CPack)
6include(FeatureSummary)
7find_package(PkgConfig)
8
9################# set KDE specific information #################
10
11find_package(ECM 0.0.8 REQUIRED NO_MODULE)
12
13# where to look first for cmake modules, before ${CMAKE_ROOT}/Modules/ is checked
14set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR})
15
16include(KDEInstallDirs)
17include(KDECMakeSettings)
18include(KDECompilerSettings)
19
20find_package(Qt5 REQUIRED NO_MODULE COMPONENTS Core Quick Test Gui)
21
22set (QT_MIN_VERSION "5.4.0")
23find_package(KF5 REQUIRED COMPONENTS Package)
24
25install(FILES qmldir DESTINATION ${QML_INSTALL_DIR}/org/kde/kube/accounts/maildir)
26install(FILES package/contents/ui/MaildirAccountSettings.qml DESTINATION ${QML_INSTALL_DIR}/org/kde/kube/accounts/maildir)
27
diff --git a/applications/kube-mail/package/contents/ui/MaildirAccountSettings.qml b/accounts/maildir/package/contents/ui/MaildirAccountSettings.qml
index 5ba9f0c1..5ba9f0c1 100644
--- a/applications/kube-mail/package/contents/ui/MaildirAccountSettings.qml
+++ b/accounts/maildir/package/contents/ui/MaildirAccountSettings.qml
diff --git a/accounts/maildir/qmldir b/accounts/maildir/qmldir
new file mode 100644
index 00000000..40e6be1c
--- /dev/null
+++ b/accounts/maildir/qmldir
@@ -0,0 +1,3 @@
1module org.kde.kube.accounts.maildir
2
3AccountSettings 1.0 MaildirAccountSettings.qml
diff --git a/applications/kube-mail/package/contents/ui/Settings.qml b/applications/kube-mail/package/contents/ui/Settings.qml
index 34755df0..a3ea32f0 100644
--- a/applications/kube-mail/package/contents/ui/Settings.qml
+++ b/applications/kube-mail/package/contents/ui/Settings.qml
@@ -20,6 +20,7 @@ import QtQuick.Controls 1.4
20import QtQuick.Layouts 1.1 20import QtQuick.Layouts 1.1
21 21
22import org.kde.kube.settings 1.0 as KubeSettings 22import org.kde.kube.settings 1.0 as KubeSettings
23import org.kde.kube.accounts.maildir 1.0 as Maildir
23 24
24Rectangle { 25Rectangle {
25 id: root 26 id: root
@@ -60,7 +61,7 @@ Rectangle {
60 spacing: 5 61 spacing: 5
61 Repeater { 62 Repeater {
62 model: ["current"] //Get from context settings 63 model: ["current"] //Get from context settings
63 delegate: MaildirAccountSettings { //This should be retrieved from the accounts plugin: KubeAccounts { identifier: modelData }.settingsUi 64 delegate: Maildir.AccountSettings { //This should be retrieved from the accounts plugin: KubeAccounts { identifier: modelData }.settingsUi
64 accountId: modelData 65 accountId: modelData
65 accountName: "Maildir" 66 accountName: "Maildir"
66 } 67 }