15 files changed, 11 insertions, 81 deletions

diff --git a/accounts/gmail/qml/AccountSettings.qml b/accounts/gmail/qml/AccountSettings.qml
index 15430a17..d7df5eaf 100644
--- a/accounts/gmail/qml/AccountSettings.qml
+++ b/accounts/gmail/qml/AccountSettings.qml
@@ -18,7 +18,6 @@
 */
 
 import QtQuick 2.4
-import QtQuick.Controls 1.4 as Controls
 import QtQuick.Layouts 1.1
 import org.kube.framework 1.0 as Kube
 import org.kube.accounts.gmail 1.0 as GmailAccount
diff --git a/accounts/imap/qml/AccountSettings.qml b/accounts/imap/qml/AccountSettings.qml
index 186b6bd7..72bcd507 100644
--- a/accounts/imap/qml/AccountSettings.qml
+++ b/accounts/imap/qml/AccountSettings.qml
@@ -18,7 +18,6 @@
 */
 
 import QtQuick 2.4
-import QtQuick.Controls 1.4 as Controls
 import QtQuick.Layouts 1.1
 import org.kube.framework 1.0 as Kube
 import org.kube.accounts.imap 1.0 as ImapAccount
diff --git a/accounts/maildir/qml/AccountSettings.qml b/accounts/maildir/qml/AccountSettings.qml
index 0fb87810..9553135b 100644
--- a/accounts/maildir/qml/AccountSettings.qml
+++ b/accounts/maildir/qml/AccountSettings.qml
@@ -18,7 +18,6 @@
 */
 
 import QtQuick 2.4
-import QtQuick.Controls 1.4 as Controls
 import QtQuick.Layouts 1.1
 import QtQuick.Dialogs 1.0 as Dialogs
 import org.kube.framework 1.0 as Kube
@@ -79,7 +78,7 @@ Item {
                 text: maildirSettings.path
             }
 
-            Controls.Button {
+            Kube.Button {
                 iconName: Kube.Icons.folder
 
                 onClicked: {
diff --git a/components/mailviewer/qml/HtmlContent.qml b/components/mailviewer/qml/HtmlContent.qml
index c775a3ca..2ebd3b67 100644
--- a/components/mailviewer/qml/HtmlContent.qml
+++ b/components/mailviewer/qml/HtmlContent.qml
@@ -17,7 +17,6 @@
 */
 
 import QtQuick 2.4
-import QtQuick.Controls 1.3
 import QtWebEngine 1.4
 
 import org.kube.framework 1.0 as Kube
diff --git a/framework/qml/MailListView.qml b/framework/qml/MailListView.qml
index ff72a59c..f5806d82 100644
--- a/framework/qml/MailListView.qml
+++ b/framework/qml/MailListView.qml
@@ -18,7 +18,6 @@
 
 import QtQuick 2.9
 import QtQuick.Controls 2.0
-import QtQuick.Controls 1.4 as Controls
 import QtQuick.Layouts 1.1
 
 import org.kube.framework 1.0 as Kube
diff --git a/framework/qml/OverlayDialog.qml b/framework/qml/OverlayDialog.qml
deleted file mode 100644
index 4334754f..00000000
--- a/framework/qml/OverlayDialog.qml
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
-  Copyright (C) 2016 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.4
-import QtQuick.Controls 1.4
-import QtQuick.Layouts 1.1
-
-import org.kube.framework 1.0 as Kube
-
-
-Item {
-    id: root
-
-     function closeDialog() {
-         root.destroy();
-     }
-
-    Rectangle {
-        id: background
-        anchors.fill: parent
-
-        color: "black"
-        opacity: 0.6
-    }
-
-    MouseArea {
-        anchors.fill: parent
-        onClicked: {
-            root.closeDialog()
-        }
-    }
-
-    Rectangle {
-        id: dialog
-        anchors.centerIn: parent
-
-        height: root.height * 0.8
-        width: root.width * 0.8
-
-        color: Kube.Colors.backgroundColor
-
-        MouseArea {
-            anchors.fill: parent
-        }
-    }
-}
diff --git a/framework/qml/TreeView.qml b/framework/qml/TreeView.qml
index 7b9a1103..21345fb0 100644
--- a/framework/qml/TreeView.qml
+++ b/framework/qml/TreeView.qml
@@ -18,7 +18,7 @@
 */
 
 import QtQuick 2.4
-import QtQuick.Controls 1.4
+import QtQuick.Controls 1.4 as Controls1
 import QtQuick.Controls 2 as Controls2
 import QtQuick.Controls.Styles 1.4
 import QtQuick.Layouts 1.1
@@ -60,7 +60,7 @@ FocusScope {
             flickable: flickableItem
         }
 
-        TreeView {
+        Controls1.TreeView {
             id: treeView
 
             anchors {
diff --git a/framework/qml/View.qml b/framework/qml/View.qml
index e5a4c274..b0c108fc 100644
--- a/framework/qml/View.qml
+++ b/framework/qml/View.qml
@@ -19,7 +19,6 @@
 
 
 import QtQuick 2.7
-import QtQuick.Controls 1.3
 import QtQuick.Controls 2.0 as Controls2
 import QtQuick.Layouts 1.1
 import org.kube.framework 1.0 as Kube
diff --git a/framework/qmldir b/framework/qmldir
index 4a6f40ef..c62444c9 100644
--- a/framework/qmldir
+++ b/framework/qmldir
@@ -9,7 +9,6 @@ InlineAccountSwitcher 1.0 InlineAccountSwitcher.qml
 NewAccountDialog 1.0 NewAccountDialog.qml
 EditAccount 1.0 EditAccount.qml
 LoginAccount 1.0 LoginAccount.qml
-OverlayDialog 1.0 OverlayDialog.qml
 Outbox 1.0 Outbox.qml
 NotificationPopup 1.0 NotificationPopup.qml
 Icon 1.0 Icon.qml
diff --git a/views/accounts/qml/View.qml b/views/accounts/qml/View.qml
index 28849ae4..e25c32c9 100644
--- a/views/accounts/qml/View.qml
+++ b/views/accounts/qml/View.qml
@@ -18,7 +18,7 @@
 
 import QtQuick 2.4
 import QtQuick.Layouts 1.1
-import QtQuick.Controls 1.3 as Controls
+import QtQuick.Controls 1.3 as Controls1
 import QtQuick.Controls 2.0
 import org.kube.framework 1.0 as Kube
 import org.kube.components.accounts 1.0 as KubeAccounts
@@ -30,7 +30,7 @@ FocusScope {
     //Defines available account types.
     property var availableAccountPlugins: ["kolabnow", "imap", "maildir", "gmail"]
 
-    Controls.SplitView {
+    Controls1.SplitView {
         height: parent.height
         width: parent.width
 
diff --git a/views/composer/qml/AddresseeListEditor.qml b/views/composer/qml/AddresseeListEditor.qml
index 8f9862e7..9267ebee 100644
--- a/views/composer/qml/AddresseeListEditor.qml
+++ b/views/composer/qml/AddresseeListEditor.qml
@@ -19,7 +19,6 @@
 
 
 import QtQuick 2.7
-import QtQuick.Controls 1.3
 import QtQuick.Layouts 1.1
 
 import org.kube.framework 1.0 as Kube
diff --git a/views/composer/qml/View.qml b/views/composer/qml/View.qml
index ad9689e8..85e8b559 100644
--- a/views/composer/qml/View.qml
+++ b/views/composer/qml/View.qml
@@ -19,7 +19,6 @@
 
 
 import QtQuick 2.7
-import QtQuick.Controls 1.3
 import QtQuick.Controls 2.0 as Controls2
 import QtQuick.Layouts 1.1
 import QtQuick.Dialogs 1.0 as Dialogs
diff --git a/views/conversation/qml/View.qml b/views/conversation/qml/View.qml
index c0e44144..c1f3625b 100644
--- a/views/conversation/qml/View.qml
+++ b/views/conversation/qml/View.qml
@@ -19,7 +19,7 @@
 
 
 import QtQuick 2.7
-import QtQuick.Controls 1.3
+import QtQuick.Controls 1.3 as Controls1
 import QtQuick.Controls 2.0 as Controls2
 import QtQuick.Layouts 1.1
 
@@ -27,7 +27,7 @@ import org.kube.framework 1.0 as Kube
 
 FocusScope {
     property alias currentAccount: accountFolderview.currentAccount
-    SplitView {
+    Controls1.SplitView {
         anchors.fill: parent
         Rectangle {
             width: Kube.Units.gridUnit * 10
diff --git a/views/log/qml/View.qml b/views/log/qml/View.qml
index 9b2ac24a..bf06b76c 100644
--- a/views/log/qml/View.qml
+++ b/views/log/qml/View.qml
@@ -19,11 +19,11 @@
 
 import QtQuick 2.4
 import QtQuick.Layouts 1.1
-import QtQuick.Controls 1.3 as Controls
+import QtQuick.Controls 1.3 as Controls1
 import QtQuick.Controls 2.0 as Controls2
 import org.kube.framework 1.0 as Kube
 
-Controls.SplitView {
+Controls1.SplitView {
     id: root
 
     property bool pendingError: false;
diff --git a/views/search/qml/View.qml b/views/search/qml/View.qml
index 437b0ba2..d63f6d1f 100644
--- a/views/search/qml/View.qml
+++ b/views/search/qml/View.qml
@@ -19,14 +19,14 @@
 
 
 import QtQuick 2.7
-import QtQuick.Controls 1.3
+import QtQuick.Controls 1.3 as Controls1
 import QtQuick.Controls 2.0 as Controls2
 import QtQuick.Layouts 1.1
 
 import org.kube.framework 1.0 as Kube
 
 FocusScope {
-    SplitView {
+    Controls1.SplitView {
         anchors.fill: parent
         ColumnLayout {
             width: Kube.Units.gridUnit * 18