22 files changed, 2 insertions, 24 deletions

diff --git a/components/accounts/metadata.desktop b/components/accounts/metadata.desktop
deleted file mode 100644
index d93813d0..00000000
--- a/components/accounts/metadata.desktop
+++ /dev/null
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Name=Kube Accounts
-X-KDE-PluginInfo-Name=org.kube.components.accounts
-Exec=kpackagelauncherqml -a org.kube.components.accounts
-X-Plasma-MainScript=ui/main.qml
-X-KDE-ServiceTypes=KPackage/GenericQML
-Icon=kmail2
-Type=Service
diff --git a/components/accounts/contents/ui/AccountWizard.qml b/components/accounts/qml/AccountWizard.qml
index 4a11ca05..4a11ca05 100644
--- a/components/accounts/contents/ui/AccountWizard.qml
+++ b/components/accounts/qml/AccountWizard.qml
diff --git a/components/accounts/contents/ui/AccountWizardPage.qml b/components/accounts/qml/AccountWizardPage.qml
index 18001419..9f11ac36 100644
--- a/components/accounts/contents/ui/AccountWizardPage.qml
+++ b/components/accounts/qml/AccountWizardPage.qml
@@ -42,6 +42,7 @@ FocusScope {
         }
     }
 
+    //accountType -> uiPath
     Kube.AccountFactory {
         id: accountFactory
         accountType: root.accountType
diff --git a/components/accounts/contents/ui/main.qml b/components/accounts/qml/main.qml
index e15bca8f..e15bca8f 100644
--- a/components/accounts/contents/ui/main.qml
+++ b/components/accounts/qml/main.qml
diff --git a/components/kube/metadata.desktop b/components/kube/metadata.desktop
deleted file mode 100644
index 581bbdf4..00000000
--- a/components/kube/metadata.desktop
+++ /dev/null
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Name=Kube
-X-KDE-PluginInfo-Name=org.kube.components.kube
-Exec=kpackagelauncherqml -a org.kube.components.kube
-X-Plasma-MainScript=ui/main.qml
-X-KDE-ServiceTypes=KPackage/GenericQML
-Icon=kmail2
-Type=Service
diff --git a/components/kube/contents/ui/AccountsView.qml b/components/kube/qml/AccountsView.qml
index df88e1f7..df88e1f7 100644
--- a/components/kube/contents/ui/AccountsView.qml
+++ b/components/kube/qml/AccountsView.qml
diff --git a/components/kube/contents/ui/AddresseeListEditor.qml b/components/kube/qml/AddresseeListEditor.qml
index 8f9862e7..8f9862e7 100644
--- a/components/kube/contents/ui/AddresseeListEditor.qml
+++ b/components/kube/qml/AddresseeListEditor.qml
diff --git a/components/kube/contents/ui/ComposerView.qml b/components/kube/qml/ComposerView.qml
index 2e0267d5..2e0267d5 100644
--- a/components/kube/contents/ui/ComposerView.qml
+++ b/components/kube/qml/ComposerView.qml
diff --git a/components/kube/contents/ui/Kube.qml b/components/kube/qml/Kube.qml
index c73d5bfa..79b18a2f 100644
--- a/components/kube/contents/ui/Kube.qml
+++ b/components/kube/qml/Kube.qml
@@ -50,6 +50,7 @@ Controls2.ApplicationWindow {
         }
     }
 
+    //accountId -> requiresKeyring
     Kube.AccountFactory {
         id: accountFactory
         accountId: !!app.currentAccount ? app.currentAccount : ""
diff --git a/components/kube/contents/ui/LogView.qml b/components/kube/qml/LogView.qml
index 3b0aa2d5..3b0aa2d5 100644
--- a/components/kube/contents/ui/LogView.qml
+++ b/components/kube/qml/LogView.qml
diff --git a/components/kube/contents/ui/LoginView.qml b/components/kube/qml/LoginView.qml
index dbbed11c..dbbed11c 100644
--- a/components/kube/contents/ui/LoginView.qml
+++ b/components/kube/qml/LoginView.qml
diff --git a/components/kube/contents/ui/MailView.qml b/components/kube/qml/MailView.qml
index 8b2b0caf..8b2b0caf 100644
--- a/components/kube/contents/ui/MailView.qml
+++ b/components/kube/qml/MailView.qml
diff --git a/components/kube/contents/ui/PeopleView.qml b/components/kube/qml/PeopleView.qml
index 3f1b9261..3f1b9261 100644
--- a/components/kube/contents/ui/PeopleView.qml
+++ b/components/kube/qml/PeopleView.qml
diff --git a/components/kube/contents/ui/main.qml b/components/kube/qml/main.qml
index 4391ebe5..4391ebe5 100644
--- a/components/kube/contents/ui/main.qml
+++ b/components/kube/qml/main.qml
diff --git a/components/mailviewer/metadata.desktop b/components/mailviewer/metadata.desktop
deleted file mode 100644
index c573ff89..00000000
--- a/components/mailviewer/metadata.desktop
+++ /dev/null
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Name=Kube Mailviewer
-X-KDE-PluginInfo-Name=org.kube.components.mailviewer
-Exec=kpackagelauncherqml -a org.kube.components.mailviewer
-X-Plasma-MainScript=ui/main.qml
-X-KDE-ServiceTypes=KPackage/GenericQML
-Icon=kmail2
-Type=Service
diff --git a/components/mailviewer/contents/ui/ErrorPart.qml b/components/mailviewer/qml/ErrorPart.qml
index 0e5d9b8e..0e5d9b8e 100644
--- a/components/mailviewer/contents/ui/ErrorPart.qml
+++ b/components/mailviewer/qml/ErrorPart.qml
diff --git a/components/mailviewer/contents/ui/HtmlContent.qml b/components/mailviewer/qml/HtmlContent.qml
index 3ac1bb38..3ac1bb38 100644
--- a/components/mailviewer/contents/ui/HtmlContent.qml
+++ b/components/mailviewer/qml/HtmlContent.qml
diff --git a/components/mailviewer/contents/ui/MailDataModel.qml b/components/mailviewer/qml/MailDataModel.qml
index ec7f8e74..ec7f8e74 100644
--- a/components/mailviewer/contents/ui/MailDataModel.qml
+++ b/components/mailviewer/qml/MailDataModel.qml
diff --git a/components/mailviewer/contents/ui/MailPart.qml b/components/mailviewer/qml/MailPart.qml
index e570ebaa..e570ebaa 100644
--- a/components/mailviewer/contents/ui/MailPart.qml
+++ b/components/mailviewer/qml/MailPart.qml
diff --git a/components/mailviewer/contents/ui/MailViewer.qml b/components/mailviewer/qml/MailViewer.qml
index 9031ec17..9031ec17 100644
--- a/components/mailviewer/contents/ui/MailViewer.qml
+++ b/components/mailviewer/qml/MailViewer.qml
diff --git a/components/mailviewer/contents/ui/TextContent.qml b/components/mailviewer/qml/TextContent.qml
index 5d8dbc90..5d8dbc90 100644
--- a/components/mailviewer/contents/ui/TextContent.qml
+++ b/components/mailviewer/qml/TextContent.qml
diff --git a/components/mailviewer/contents/ui/main.qml b/components/mailviewer/qml/main.qml
index e69dd5a2..e69dd5a2 100644
--- a/components/mailviewer/contents/ui/main.qml
+++ b/components/mailviewer/qml/main.qml