4 files changed, 13 insertions, 96 deletions

diff --git a/framework/src/CMakeLists.txt b/framework/src/CMakeLists.txt
index 0059bd00..a4392b33 100644
--- a/framework/src/CMakeLists.txt
+++ b/framework/src/CMakeLists.txt
@@ -1,6 +1,7 @@
 
 find_package(Qt5 COMPONENTS REQUIRED Core Concurrent Quick Qml WebEngineWidgets Test WebEngine Gui)
 find_package(KF5Mime 4.87.0 CONFIG REQUIRED)
+find_package(KF5CalendarCore CONFIG REQUIRED)
 find_package(Sink 0.6.0 CONFIG REQUIRED)
 find_package(KAsync CONFIG REQUIRED)
 find_package(QGpgme CONFIG REQUIRED)
@@ -16,6 +17,7 @@ add_library(kubeframework SHARED
     settings/settings.cpp
     domain/maillistmodel.cpp
     domain/folderlistmodel.cpp
+    domain/eventtreemodel.cpp
     domain/composercontroller.cpp
     domain/modeltest.cpp
     domain/retriever.cpp
diff --git a/framework/src/frameworkplugin.cpp b/framework/src/frameworkplugin.cpp
index d512ce10..289f502b 100644
--- a/framework/src/frameworkplugin.cpp
+++ b/framework/src/frameworkplugin.cpp
@@ -22,6 +22,7 @@
 
 #include "domain/maillistmodel.h"
 #include "domain/folderlistmodel.h"
+#include "domain/eventtreemodel.h"
 #include "domain/composercontroller.h"
 #include "domain/mime/messageparser.h"
 #include "domain/retriever.h"
@@ -120,6 +121,7 @@ void FrameworkPlugin::registerTypes (const char *uri)
 {
     qmlRegisterType<FolderListModel>(uri, 1, 0, "FolderListModel");
     qmlRegisterType<MailListModel>(uri, 1, 0, "MailListModel");
+    qmlRegisterType<EventTreeModel>(uri, 1, 0, "EventTreeModel");
     qmlRegisterType<ComposerController>(uri, 1, 0, "ComposerController");
     qmlRegisterType<Kube::ControllerAction>(uri, 1, 0, "ControllerAction");
     qmlRegisterType<MessageParser>(uri, 1, 0, "MessageParser");
diff --git a/views/calendar/qml/WeekEvents.qml b/views/calendar/qml/WeekEvents.qml
index 005fb19e..47afae40 100644
--- a/views/calendar/qml/WeekEvents.qml
+++ b/views/calendar/qml/WeekEvents.qml
@@ -1,93 +1,6 @@
 import QtQuick 2.7
 
-ListModel {
-    ListElement {
-        events: [
-        ListElement {
-            color: "#af1a6a"
-            starts: 1
-            duration: 4
-            text: "Meeting"
-            indention: 0
-        },
-        ListElement  {
-            color: "#134bab"
-            starts: 9
-            duration: 5
-            text: "Sport"
-            indention: 0
-        }
-        ]
-    }
-    ListElement {
-        events: [
-        ListElement  {
-            color: "#134bab"
-            starts: 9
-            duration: 5
-            text: "Sport"
-            indention: 0
-        }
-        ]
-    }
-    ListElement {
-        events: []
-    }
-    ListElement {
-        events: [
-        ListElement {
-            color: "#af1a6a"
-            starts: 1
-            duration: 4
-            indention: 0
-            text: "Meeting"
-        }
-        ]
-    }
-    ListElement {
-        events: [
-        ListElement {
-            color: "#134bab"
-            starts: 3
-            duration: 5
-            indention: 0
-            text: "Meeting"
-        },
-        ListElement {
-            color: "#af1a6a"
-            starts: 4
-            duration: 7
-            indention: 1
-            text: "Meeting2"
-        }
-        ]
-    }
-    ListElement {
-        events: [
-                    ListElement {
-            color: "#134bab"
-            starts: 8
-            duration: 5
-            indention: 0
-            text: "Meeting"
-        },
-        ListElement {
-            color: "#af1a6a"
-            starts: 8
-            duration: 4
-            indention: 1
-            text: "Meeting2"
-        },
-        ListElement {
-            color: "#af1a6a"
-            starts: 9
-            duration: 7
-            indention: 2
-            text: "Meeting2"
-        }
-        ]
-    }
-    ListElement {
-        events: []
-    }
+import org.kube.framework 1.0 as Kube
+
+Kube.EventTreeModel {
 }
diff --git a/views/calendar/qml/WeekView.qml b/views/calendar/qml/WeekView.qml
index 8eef3a92..877500c5 100644
--- a/views/calendar/qml/WeekView.qml
+++ b/views/calendar/qml/WeekView.qml
@@ -212,12 +212,12 @@ FocusScope {
                                     right: parent.right
                                     rightMargin: Kube.Units.smallSpacing
                                 }
-                                width: Kube.Units.gridUnit * 7 - Kube.Units.smallSpacing * 2 - Kube.Units.gridUnit * model.indention
-                                height: Kube.Units.gridUnit * model.duration
-                                y: Kube.Units.gridUnit * model.starts
-                                x: Kube.Units.gridUnit * model.indention
+                                width: Kube.Units.gridUnit * 7 - Kube.Units.smallSpacing * 2 - Kube.Units.gridUnit * model.modelData.indention
+                                height: Kube.Units.gridUnit * model.modelData.duration
+                                y: Kube.Units.gridUnit * model.modelData.starts
+                                x: Kube.Units.gridUnit * model.modelData.indention
 
-                                color: model.color
+                                color: model.modelData.color
                                 border.width: 1
                                 border.color: Kube.Colors.viewBackgroundColor
 
@@ -226,7 +226,7 @@ FocusScope {
                                         left: parent.left
                                         leftMargin: Kube.Units.smallSpacing
                                     }
-                                    text: model.text
+                                    text: model.modelData.text
                                     color: Kube.Colors.highlightedTextColor
                                 }