diff options
author | Christian Mollekopf <chrigi_1@fastmail.fm> | 2016-03-03 17:10:18 +0100 |
---|---|---|
committer | Christian Mollekopf <chrigi_1@fastmail.fm> | 2016-03-03 17:10:18 +0100 |
commit | 54c3e5912b0d64bad5a1c66bc96f0552ac5e21f5 (patch) | |
tree | 65b511dc68bd327d59cc320b04cb077a0a52e014 | |
parent | 7bc71c84a91d980f46bc042731ee903cef591031 (diff) | |
download | kube-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.txt | 1 | ||||
-rw-r--r-- | accounts/CMakeLists.txt | 1 | ||||
-rw-r--r-- | accounts/maildir/CMakeLists.txt | 27 | ||||
-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/qmldir | 3 | ||||
-rw-r--r-- | applications/kube-mail/package/contents/ui/Settings.qml | 3 |
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 | ||
5 | add_subdirectory(applications) | 5 | add_subdirectory(applications) |
6 | add_subdirectory(framework) | 6 | add_subdirectory(framework) |
7 | add_subdirectory(accounts) | ||
7 | add_subdirectory(icons) | 8 | add_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 @@ | |||
1 | project(kube-accounts-maildir) | ||
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) | ||
21 | |||
22 | set (QT_MIN_VERSION "5.4.0") | ||
23 | find_package(KF5 REQUIRED COMPONENTS Package) | ||
24 | |||
25 | install(FILES qmldir DESTINATION ${QML_INSTALL_DIR}/org/kde/kube/accounts/maildir) | ||
26 | install(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 @@ | |||
1 | module org.kde.kube.accounts.maildir | ||
2 | |||
3 | AccountSettings 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 | |||
20 | import QtQuick.Layouts 1.1 | 20 | import QtQuick.Layouts 1.1 |
21 | 21 | ||
22 | import org.kde.kube.settings 1.0 as KubeSettings | 22 | import org.kde.kube.settings 1.0 as KubeSettings |
23 | import org.kde.kube.accounts.maildir 1.0 as Maildir | ||
23 | 24 | ||
24 | Rectangle { | 25 | Rectangle { |
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 | } |