7 files changed, 22 insertions, 20 deletions

diff --git a/components/accounts/contents/ui/AccountWizard.qml b/components/accounts/contents/ui/AccountWizard.qml
index c5ec4ba3..26001162 100644
--- a/components/accounts/contents/ui/AccountWizard.qml
+++ b/components/accounts/contents/ui/AccountWizard.qml
@@ -19,7 +19,6 @@
 import QtQuick 2.7
 import QtQuick.Layouts 1.1
 import QtQuick.Controls 2.0 as Controls2
-import org.kde.kirigami 1.0 as Kirigami
 import org.kube.framework 1.0 as Kube
 
 Kube.Popup {
@@ -43,7 +42,8 @@ Kube.Popup {
         id: mainView
 
         Item {
-            Kirigami.Heading {
+            //TODO Kube.Heading
+            Kube.Label {
                 id: heading
                 text: "Select your new account type"
                 color: Kube.Colors.highlightColor
diff --git a/components/accounts/contents/ui/AccountWizardPage.qml b/components/accounts/contents/ui/AccountWizardPage.qml
index e77f0cd9..12d8efd8 100644
--- a/components/accounts/contents/ui/AccountWizardPage.qml
+++ b/components/accounts/contents/ui/AccountWizardPage.qml
@@ -21,7 +21,6 @@ import QtQuick 2.7
 import QtQuick.Layouts 1.1
 import QtQuick.Controls 1.4 as Controls
 import QtQuick.Controls 2.0 as Controls2
-import org.kde.kirigami 1.0 as Kirigami
 import org.kube.framework 1.0 as Kube
 
 
@@ -53,7 +52,8 @@ Item {
             bottom: parent.bottom
         }
 
-        Kirigami.Heading {
+        //TODO Kube.Heading
+        Kube.Label {
             id: heading
             text: loader.item.heading
             color: Kube.Colors.highlightColor
diff --git a/dist/kube.spec b/dist/kube.spec
index ae577aec..62829c85 100644
--- a/dist/kube.spec
+++ b/dist/kube.spec
@@ -31,7 +31,6 @@ Requires:       qt5-qtquick1
 Requires:       qt5-qtquickcontrols
 Requires:       qt5-qtquickcontrols2-devel
 Requires:       sink >= 0.3
-Requires:       kirigami
 Requires:       google-noto-sans-fonts
 
 %description
diff --git a/framework/qml/AutocompleteLineEdit.qml b/framework/qml/AutocompleteLineEdit.qml
index e7518867..c5f89450 100644
--- a/framework/qml/AutocompleteLineEdit.qml
+++ b/framework/qml/AutocompleteLineEdit.qml
@@ -20,7 +20,6 @@ import QtQuick 2.7
 import QtQuick.Controls 2.0 as Controls2
 import QtQuick.Layouts 1.1
 
-import org.kde.kirigami 1.0 as Kirigami
 import org.kube.framework 1.0 as Kube
 
 Kube.TextField {
@@ -109,20 +108,26 @@ Kube.TextField {
                 width: parent.width
                 interactive: true
                 model: root.model
-                delegate: Kirigami.AbstractListItem {
+                //TODO abstract listItem
+                delegate: Rectangle {
                     id: listDelegate
                     property string text: model.text
 
                     width: listView.width
                     height: root.height
 
-                    enabled: true
-                    supportsMouseEvents: true
+                    //enabled: true
+                    //supportsMouseEvents: true
 
-                    checked: listView.currentIndex == index
-                    onClicked:  {
-                        listView.currentIndex = model.index
-                        accept()
+                    //checked: listView.currentIndex == index
+
+                    MouseArea {
+                        anchors.fill: parent
+
+                        onClicked:  {
+                            listView.currentIndex = model.index
+                            accept()
+                        }
                     }
 
                     //Content
diff --git a/framework/qml/EditAccount.qml b/framework/qml/EditAccount.qml
index 3f8abc8b..dfda020e 100644
--- a/framework/qml/EditAccount.qml
+++ b/framework/qml/EditAccount.qml
@@ -19,7 +19,6 @@
 
 import QtQuick 2.7
 import QtQuick.Layouts 1.1
-import org.kde.kirigami 1.0 as Kirigami
 import org.kube.framework 1.0 as Kube
 
 
@@ -39,7 +38,8 @@ Item {
             margins: Kube.Units.largeSpacing * 2
         }
 
-        Kirigami.Heading {
+        //TODO Kube.Heading
+        Kube.Label {
             id: heading
             text: loader.item.heading
             color: Kube.Colors.highlightColor
diff --git a/framework/qml/MailViewer.qml b/framework/qml/MailViewer.qml
index 9df3554c..6ad8c760 100644
--- a/framework/qml/MailViewer.qml
+++ b/framework/qml/MailViewer.qml
@@ -25,8 +25,6 @@ import QtQuick.Layouts 1.1
 import org.kube.components.mailviewer 1.0 as MV
 import org.kube.framework 1.0 as Kube
 
-import org.kde.kirigami 1.0 as Kirigami
-
 Rectangle {
     id: root
 
@@ -107,7 +105,8 @@ Rectangle {
 
             text: Qt.formatDateTime(root.date, "dd MMM yyyy hh:mm")
 
-            font.pointSize: Kirigami.Theme.defaultFont.pointSize * 0.7
+            //FIXME font pointsize
+            font.pointSize: 6
             opacity: 0.75
         }
 
diff --git a/framework/qml/People.qml b/framework/qml/People.qml
index fc41ceaf..e60763d9 100644
--- a/framework/qml/People.qml
+++ b/framework/qml/People.qml
@@ -22,7 +22,6 @@ import QtQuick.Controls 2.0
 import QtQuick.Controls 1.4 as Controls
 import QtQuick.Layouts 1.1
 
-import org.kde.kirigami 1.0 as Kirigami
 import org.kube.framework 1.0 as Kube
 
 
@@ -252,7 +251,7 @@ Item {
                         }
 
                         //TODO replace with Kube.Heading once it is there
-                        Kirigami.Heading {
+                        Kube.Label {
                             id: nameLabel
 
                             anchors {