Install org.kube.components.mail package and install the rest of

components as qml package

5 files changed, 20 insertions, 8 deletions

diff --git a/applications/mail/main.cpp b/applications/mail/main.cpp
index 1ff4effb..26353aa4 100644
--- a/applications/mail/main.cpp
+++ b/applications/mail/main.cpp
@@ -34,7 +34,7 @@ public:
 int main(int argc, char *argv[])
 {
     QApplication app(argc, argv);
-    auto package = KPackage::PackageLoader::self()->loadPackage("KPackage/GenericQML", "org.kde.kube.mail");
+    auto package = KPackage::PackageLoader::self()->loadPackage("KPackage/GenericQML", "org.kube.components.mail");
     Q_ASSERT(package.isValid());
     QQmlApplicationEngine engine;
     engine.addImageProvider(QLatin1String("kube"), new KubeImageProvider);
diff --git a/components/CMakeLists.txt b/components/CMakeLists.txt
index 2227e170..bd9c100a 100644
--- a/components/CMakeLists.txt
+++ b/components/CMakeLists.txt
@@ -22,5 +22,8 @@ find_package(Qt5 REQUIRED NO_MODULE COMPONENTS Core Quick Test Gui Widgets)
 set (QT_MIN_VERSION "5.4.0")
 find_package(KF5 REQUIRED COMPONENTS Package)
 
+install(FILES qmldir DESTINATION ${QML_INSTALL_DIR}/org/kube/components)
+install(DIRECTORY package/contents/ui/ DESTINATION ${QML_INSTALL_DIR}/org/kube/components)
+
 # install UI package
-kpackage_install_package(package org.kde.kube.mail "genericqml")
+kpackage_install_package(mail org.kube.components.mail "genericqml")
diff --git a/components/package/contents/ui/main.qml b/components/mail/contents/ui/main.qml
index cf983dee..95729954 100644
--- a/components/package/contents/ui/main.qml
+++ b/components/mail/contents/ui/main.qml
@@ -22,6 +22,7 @@ import org.kde.plasma.components 2.0 as PlasmaComponents
 
 import org.kde.kube.actions 1.0 as KubeAction
 import org.kde.kube.settings 1.0 as KubeSettings
+import org.kube.components 1.0 as KubeComponents
 
 ApplicationWindow {
     id: app
@@ -151,14 +152,14 @@ ApplicationWindow {
     SplitView {
         anchors.fill: parent
 
-        FolderListView {
+        KubeComponents.FolderListView {
             id: folderListView
             width: unit.size * 55
             Layout.maximumWidth: unit.size * 150
             Layout.minimumWidth: unit.size * 30
         }
 
-        MailListView  {
+        KubeComponents.MailListView  {
             id: mailListView
             parentFolder: folderListView.currentFolder
             width: unit.size * 80
@@ -167,7 +168,7 @@ ApplicationWindow {
             focus: true
         }
 
-        SingleMailView {
+        KubeComponents.SingleMailView {
             id: mailView
             mail: mailListView.currentMail
             Layout.fillWidth: true
@@ -175,13 +176,13 @@ ApplicationWindow {
 
     }
 
-    Settings {
+    KubeComponents.Settings {
         id: settings
 
         anchors.fill: parent
     }
 
-    FocusComposer {
+    KubeComponents.FocusComposer {
         id: composer
 
         anchors.fill: parent
@@ -193,7 +194,7 @@ ApplicationWindow {
         property int size: 5
     }
 
-    ColorPalette {
+    KubeComponents.ColorPalette {
         id: colorPalette
     }
 }
diff --git a/components/package/metadata.desktop b/components/mail/metadata.desktop
index 630cc133..630cc133 100644
--- a/components/package/metadata.desktop
+++ b/components/mail/metadata.desktop
diff --git a/components/qmldir b/components/qmldir
new file mode 100644
index 00000000..204beff8
--- /dev/null
+++ b/components/qmldir
@@ -0,0 +1,8 @@
+module org.kube.components
+
+ColorPalette 1.0 ColorPalette.qml
+FocusComposer 1.0 FocusComposer.qml
+SingleMailView 1.0 SingleMailView.qml
+FolderListView 1.0 FolderListView.qml
+MailListView 1.0 MailListView.qml
+Settings 1.0 Settings.qml