Normalize the component package structure

2 files changed, 345 insertions, 321 deletions

diff --git a/components/mail/contents/ui/Mail.qml b/components/mail/contents/ui/Mail.qml
new file mode 100644
index 00000000..d8f6e787
--- /dev/null
+++ b/components/mail/contents/ui/Mail.qml
@@ -0,0 +1,343 @@
+/*
+ *  Copyright (C) 2017 Michael Bohlender, <michael.bohlender@kdemail.net>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along
+ *  with this program; if not, write to the Free Software Foundation, Inc.,
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+
+import QtQuick 2.7
+import QtQuick.Controls 1.3
+import QtQuick.Layouts 1.1
+
+import QtQuick.Controls 2.0 as Controls2
+import org.kde.kirigami 1.0 as Kirigami
+
+import org.kube.framework.actions 1.0 as KubeAction
+import org.kube.framework.settings 1.0 as KubeSettings
+import org.kube.framework.domain 1.0 as KubeFramework
+import org.kube.components 1.0 as KubeComponents
+import org.kube.components.accounts 1.0 as KubeAccounts
+
+Controls2.ApplicationWindow {
+    id: app
+
+    //FIXME remove fixed pixel hight
+    //for now just convinience during testing
+    height: 1080 * 0.8
+    width: 1920  * 0.8
+
+    visible: true
+
+    //BEGIN Actions
+    KubeAction.Context {
+        id: maillistcontext
+        property variant mail
+        property bool isDraft
+        mail: mailListView.currentMail
+        isDraft: mailListView.isDraft
+    }
+
+    KubeAction.Action {
+        id: replyAction
+        actionId: "org.kde.kube.actions.reply"
+        context: maillistcontext
+    }
+    //END Actions
+
+    //BEGIN ActionHandler
+    KubeAction.ActionHandler {
+        actionId: "org.kde.kube.actions.reply"
+        function isReady(context) {
+            return context.mail ? true : false;
+        }
+
+        function handler(context) {
+            composer.loadMessage(context.mail, false)
+            composer.open()
+        }
+    }
+
+    KubeAction.ActionHandler {
+        actionId: "org.kde.kube.actions.edit"
+        function isReady(context) {
+            return context.mail && context.isDraft;
+        }
+        function handler(context) {
+            composer.loadMessage(context.mail, true)
+            composer.open()
+        }
+    }
+    //END ActionHandler
+
+    //Controller
+    KubeFramework.MailController {
+        id: mailController
+        threadLeader: mailListView.currentMail
+    }
+
+    KubeFramework.FolderController {
+        id: folderController
+        folder: folderListView.currentFolder
+    }
+
+    //BEGIN Shortcuts
+    Shortcut {
+        sequence: StandardKey.Refresh
+        onActivated: folderController.synchronizeAction.execute()
+        enabled: folderController.synchronizeAction.enabled
+    }
+    Shortcut {
+        sequence: StandardKey.Delete
+        onActivated: mailController.moveToTrashAction.execute()
+        enabled: mailController.moveToTrashAction.enabled
+    }
+    Shortcut {
+        sequence: StandardKey.MoveToNextLine
+        onActivated: mailListView.currentIndex++
+    }
+    Shortcut {
+        sequence: StandardKey.MoveToPreviousLine
+        onActivated: mailListView.currentIndex--
+    }
+    //END Shortcuts
+
+    //BEGIN background
+    Rectangle {
+        anchors.fill: parent
+
+        color: Kirigami.Theme.backgroundColor
+    }
+    //END background
+
+    //BEGIN Main content
+    SplitView {
+        anchors {
+            top: app.top
+            left: app.left
+        }
+
+        height: app.height
+        width: app.width
+
+        Rectangle {
+            width: Kirigami.Units.gridUnit * 10
+            Layout.maximumWidth: app.width * 0.25
+            Layout.minimumWidth: Kirigami.Units.gridUnit * 5
+
+            color: Kirigami.Theme.textColor
+
+            Controls2.ToolBar {
+                id: toolBar
+
+                anchors {
+                    top: parent.top
+                    left: parent.left
+                    right: parent.right
+                }
+
+                RowLayout {
+                    anchors.centerIn: parent
+
+                    spacing: Kirigami.Units.largeSpacing
+
+                    KubeComponents.AccountSwitcher {
+                        id: accountSwitcher
+
+                        iconName: "kdenlive-menu"
+                        height: Kirigami.Units.gridUnit * 1.5
+                        width: height
+                    }
+
+                    ToolButton {
+                        iconName: "user"
+                        height: Kirigami.Units.gridUnit * 1.5
+                        width: height
+
+                        onClicked: {
+                            people.open()
+                        }
+                    }
+
+                    ToolButton {
+                        iconName: "search"
+                        height: Kirigami.Units.gridUnit * 1.5
+                        width: height
+
+                        onClicked: {
+                            search.open()
+                        }
+                    }
+                }
+            }
+
+            Rectangle {
+                id: newMailButton
+
+                anchors {
+                    top: toolBar.bottom
+                    left: parent.left
+                    right: parent.right
+                    margins: Kirigami.Units.largeSpacing
+                }
+
+                color: "#27ae60"
+                clip: true
+
+                height: Kirigami.Units.gridUnit * 1.5
+
+                Text {
+                    anchors.centerIn: parent
+
+                    text: qsTr("New Email")
+                    color: "white"
+                }
+                //iconName: "mail-message-new"
+                //Controls2.Tooltip.text: "compose new email"
+
+                MouseArea {
+                    anchors.fill: parent
+                    onClicked: {
+                        composer.open()
+                    }
+                }
+            }
+
+            Item {
+                id: accountName
+
+                anchors {
+                    top: newMailButton.bottom
+                    topMargin: Kirigami.Units.smallSpacing
+                }
+
+                width: parent.width
+                height: Kirigami.Units.gridUnit * 2
+
+                Text {
+                    anchors {
+                        bottom: parent.bottom
+                        left: parent.left
+                        leftMargin: Kirigami.Units.smallSpacing
+                    }
+
+                    text: accountSwitcher.accountName
+                    font.weight: Font.DemiBold
+                    color: "white"
+                }
+            }
+
+            KubeComponents.FolderListView {
+                id: folderListView
+
+                anchors {
+                    top: accountName.bottom
+                    topMargin: Kirigami.Units.smallSpacing
+                    bottom: parent.bottom
+                    left: parent.left
+                    right: parent.right
+                }
+
+                focus: true
+                accountId: accountSwitcher.accountId
+            }
+        }
+
+        KubeComponents.MailListView  {
+            id: mailListView
+            parentFolder: folderListView.currentFolder
+            width: Kirigami.Units.gridUnit * 20
+            height: parent.height
+            Layout.maximumWidth: app.width * 0.4
+            Layout.minimumWidth: Kirigami.Units.gridUnit * 10
+            focus: true
+        }
+
+        KubeComponents.SingleMailView {
+            id: mailView
+            mail: mailListView.currentMail
+            Layout.fillWidth: true
+        }
+    }
+    //END Main content
+
+    //BEGIN Composer
+    KubeComponents.FocusComposer {
+        id: composer
+
+        height: app.height * 0.85
+        width: app.width * 0.85
+
+        x: app.width * 0.075
+        y: app.height * 0.075
+    }
+    //END Composer
+
+    //BEGIN AccountWizard
+    KubeAccounts.AccountWizard {
+        id: accountWizard
+
+        height: app.height * 0.85
+        width: app.width * 0.85
+
+        x: app.width * 0.075
+        y: app.height * 0.075
+    }
+    //END AccountWizard
+
+    //BEGIN Search
+    Controls2.Popup {
+        id: search
+
+        width: app.width * 0.6
+        height: Kirigami.Units.gridUnit * 3
+
+        x: app.width * 0.2
+        y: app.height * 0.2
+
+        modal: true
+        focus: true
+
+        RowLayout {
+            anchors.fill: parent
+
+            Controls2.TextField {
+                Layout.fillWidth: true
+                placeholderText: "Search...   is not available in this beta"
+            }
+
+            Controls2.Button {
+                text: "Go"
+
+                onClicked: {
+                    search.close()
+                }
+            }
+        }
+    }
+    //END Search
+
+    //BEGIN People
+    KubeComponents.People {
+        id: people
+
+        height: app.height * 0.85
+        width: app.width * 0.85
+
+        x: app.width * 0.075
+        y: app.height * 0.075
+
+    }
+    //END People
+}
diff --git a/components/mail/contents/ui/main.qml b/components/mail/contents/ui/main.qml
index eed80f55..0a1e1d75 100644
--- a/components/mail/contents/ui/main.qml
+++ b/components/mail/contents/ui/main.qml
@@ -16,328 +16,9 @@
  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
-
 import QtQuick 2.7
-import QtQuick.Controls 1.3
-import QtQuick.Layouts 1.1
-
-import QtQuick.Controls 2.0 as Controls2
-import org.kde.kirigami 1.0 as Kirigami
-
-import org.kube.framework.actions 1.0 as KubeAction
-import org.kube.framework.settings 1.0 as KubeSettings
-import org.kube.framework.domain 1.0 as KubeFramework
-import org.kube.components 1.0 as KubeComponents
-import org.kube.accounts 1.0 as KubeAccounts
-
-Controls2.ApplicationWindow {
-    id: app
-
-    //FIXME remove fixed pixel hight
-    //for now just convinience during testing
-    height: 1080 * 0.8
-    width: 1920  * 0.8
-
-    visible: true
-
-    //BEGIN Actions
-    KubeAction.Context {
-        id: maillistcontext
-        property variant mail
-        property bool isDraft
-        mail: mailListView.currentMail
-        isDraft: mailListView.isDraft
-    }
-
-    KubeAction.Action {
-        id: replyAction
-        actionId: "org.kde.kube.actions.reply"
-        context: maillistcontext
-    }
-    //END Actions
-
-    //BEGIN ActionHandler
-    KubeAction.ActionHandler {
-        actionId: "org.kde.kube.actions.reply"
-        function isReady(context) {
-            return context.mail ? true : false;
-        }
-
-        function handler(context) {
-            composer.loadMessage(context.mail, false)
-            composer.open()
-        }
-    }
-
-    KubeAction.ActionHandler {
-        actionId: "org.kde.kube.actions.edit"
-        function isReady(context) {
-            return context.mail && context.isDraft;
-        }
-        function handler(context) {
-            composer.loadMessage(context.mail, true)
-            composer.open()
-        }
-    }
-    //END ActionHandler
-
-    //Controller
-    KubeFramework.MailController {
-        id: mailController
-        threadLeader: mailListView.currentMail
-    }
-
-    KubeFramework.FolderController {
-        id: folderController
-        folder: folderListView.currentFolder
-    }
-
-    //BEGIN Shortcuts
-    Shortcut {
-        sequence: StandardKey.Refresh
-        onActivated: folderController.synchronizeAction.execute()
-        enabled: folderController.synchronizeAction.enabled
-    }
-    Shortcut {
-        sequence: StandardKey.Delete
-        onActivated: mailController.moveToTrashAction.execute()
-        enabled: mailController.moveToTrashAction.enabled
-    }
-    Shortcut {
-        sequence: StandardKey.MoveToNextLine
-        onActivated: mailListView.currentIndex++
-    }
-    Shortcut {
-        sequence: StandardKey.MoveToPreviousLine
-        onActivated: mailListView.currentIndex--
-    }
-    //END Shortcuts
-
-    //BEGIN background
-    Rectangle {
-        anchors.fill: parent
-
-        color: Kirigami.Theme.backgroundColor
-    }
-    //END background
-
-    //BEGIN Main content
-    SplitView {
-        anchors {
-            top: app.top
-            left: app.left
-        }
-
-        height: app.height
-        width: app.width
-
-        Rectangle {
-            width: Kirigami.Units.gridUnit * 10
-            Layout.maximumWidth: app.width * 0.25
-            Layout.minimumWidth: Kirigami.Units.gridUnit * 5
-
-            color: Kirigami.Theme.textColor
-
-            Controls2.ToolBar {
-                id: toolBar
-
-                anchors {
-                    top: parent.top
-                    left: parent.left
-                    right: parent.right
-                }
-
-                RowLayout {
-                    anchors.centerIn: parent
-
-                    spacing: Kirigami.Units.largeSpacing
-
-                    KubeComponents.AccountSwitcher {
-                        id: accountSwitcher
-
-                        iconName: "kdenlive-menu"
-                        height: Kirigami.Units.gridUnit * 1.5
-                        width: height
-                    }
-
-                    ToolButton {
-                        iconName: "user"
-                        height: Kirigami.Units.gridUnit * 1.5
-                        width: height
-
-                        onClicked: {
-                            people.open()
-                        }
-                    }
-
-                    ToolButton {
-                        iconName: "search"
-                        height: Kirigami.Units.gridUnit * 1.5
-                        width: height
-
-                        onClicked: {
-                            search.open()
-                        }
-                    }
-                }
-            }
-
-            Rectangle {
-                id: newMailButton
-
-                anchors {
-                    top: toolBar.bottom
-                    left: parent.left
-                    right: parent.right
-                    margins: Kirigami.Units.largeSpacing
-                }
-
-                color: "#27ae60"
-                clip: true
-
-                height: Kirigami.Units.gridUnit * 1.5
-
-                Text {
-                    anchors.centerIn: parent
-
-                    text: qsTr("New Email")
-                    color: "white"
-                }
-                //iconName: "mail-message-new"
-                //Controls2.Tooltip.text: "compose new email"
-
-                MouseArea {
-                    anchors.fill: parent
-                    onClicked: {
-                        composer.open()
-                    }
-                }
-            }
-
-            Item {
-                id: accountName
-
-                anchors {
-                    top: newMailButton.bottom
-                    topMargin: Kirigami.Units.smallSpacing
-                }
-
-                width: parent.width
-                height: Kirigami.Units.gridUnit * 2
-
-                Text {
-                    anchors {
-                        bottom: parent.bottom
-                        left: parent.left
-                        leftMargin: Kirigami.Units.smallSpacing
-                    }
-
-                    text: accountSwitcher.accountName
-                    font.weight: Font.DemiBold
-                    color: "white"
-                }
-            }
-
-            KubeComponents.FolderListView {
-                id: folderListView
-
-                anchors {
-                    top: accountName.bottom
-                    topMargin: Kirigami.Units.smallSpacing
-                    bottom: parent.bottom
-                    left: parent.left
-                    right: parent.right
-                }
-
-                focus: true
-                accountId: accountSwitcher.accountId
-            }
-        }
-
-        KubeComponents.MailListView  {
-            id: mailListView
-            parentFolder: folderListView.currentFolder
-            width: Kirigami.Units.gridUnit * 20
-            height: parent.height
-            Layout.maximumWidth: app.width * 0.4
-            Layout.minimumWidth: Kirigami.Units.gridUnit * 10
-            focus: true
-        }
-
-        KubeComponents.SingleMailView {
-            id: mailView
-            mail: mailListView.currentMail
-            Layout.fillWidth: true
-        }
-    }
-    //END Main content
-
-    //BEGIN Composer
-    KubeComponents.FocusComposer {
-        id: composer
-
-        height: app.height * 0.85
-        width: app.width * 0.85
-
-        x: app.width * 0.075
-        y: app.height * 0.075
-    }
-    //END Composer
-
-    //BEGIN AccountWizard
-    KubeAccounts.AccountWizard {
-        id: accountWizard
-
-        height: app.height * 0.85
-        width: app.width * 0.85
-
-        x: app.width * 0.075
-        y: app.height * 0.075
-    }
-    //END AccountWizard
-
-    //BEGIN Search
-    Controls2.Popup {
-        id: search
-
-        width: app.width * 0.6
-        height: Kirigami.Units.gridUnit * 3
-
-        x: app.width * 0.2
-        y: app.height * 0.2
-
-        modal: true
-        focus: true
-
-        RowLayout {
-            anchors.fill: parent
-
-            Controls2.TextField {
-                Layout.fillWidth: true
-                placeholderText: "Search...   is not available in this beta"
-            }
-
-            Controls2.Button {
-                text: "Go"
-
-                onClicked: {
-                    search.close()
-                }
-            }
-        }
-    }
-    //END Search
-
-    //BEGIN People
-    KubeComponents.People {
-        id: people
-
-        height: app.height * 0.85
-        width: app.width * 0.85
+import org.kube.components.Mail 1.0 as MailComponent
 
-        x: app.width * 0.075
-        y: app.height * 0.075
+MailComponent.Mail {
 
-    }
-    //END People
 }