2 files changed, 9 insertions, 96 deletions
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 {
+import org.kube.framework 1.0 as Kube
-    ListElement {
-        events: [
+Kube.EventTreeModel {
-        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: []
-    }
 }
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
+                                width: Kube.Units.gridUnit * 7 - Kube.Units.smallSpacing * 2 - Kube.Units.gridUnit * model.modelData.indention
-                                height: Kube.Units.gridUnit * model.duration
+                                height: Kube.Units.gridUnit * model.modelData.duration
-                                y: Kube.Units.gridUnit * model.starts
+                                y: Kube.Units.gridUnit * model.modelData.starts
-                                x: Kube.Units.gridUnit * model.indention
+                                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
                                }

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 @@
1	import QtQuick 2.7	1	import QtQuick 2.7
2		2
3	ListModel {	3	import org.kube.framework 1.0 as Kube
4	ListElement {	4
5	events: [	5	Kube.EventTreeModel {
6	ListElement {
7	color: "#af1a6a"
8	starts: 1
9	duration: 4
10	text: "Meeting"
11	indention: 0
12	},
13	ListElement {
14	color: "#134bab"
15	starts: 9
16	duration: 5
17	text: "Sport"
18	indention: 0
19	}
20	]
21	}
22	ListElement {
23	events: [
24	ListElement {
25	color: "#134bab"
26	starts: 9
27	duration: 5
28	text: "Sport"
29	indention: 0
30	}
31	]
32	}
33	ListElement {
34	events: []
35	}
36	ListElement {
37	events: [
38	ListElement {
39	color: "#af1a6a"
40	starts: 1
41	duration: 4
42	indention: 0
43	text: "Meeting"
44	}
45	]
46	}
47	ListElement {
48	events: [
49	ListElement {
50	color: "#134bab"
51	starts: 3
52	duration: 5
53	indention: 0
54	text: "Meeting"
55	},
56	ListElement {
57	color: "#af1a6a"
58	starts: 4
59	duration: 7
60	indention: 1
61	text: "Meeting2"
62	}
63	]
64	}
65	ListElement {
66	events: [
67	ListElement {
68	color: "#134bab"
69	starts: 8
70	duration: 5
71	indention: 0
72	text: "Meeting"
73	},
74	ListElement {
75	color: "#af1a6a"
76	starts: 8
77	duration: 4
78	indention: 1
79	text: "Meeting2"
80	},
81	ListElement {
82	color: "#af1a6a"
83	starts: 9
84	duration: 7
85	indention: 2
86	text: "Meeting2"
87	}
88	]
89	}
90	ListElement {
91	events: []
92	}
93	}	6	}


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 {
212	right: parent.right	212	right: parent.right
213	rightMargin: Kube.Units.smallSpacing	213	rightMargin: Kube.Units.smallSpacing
214	}	214	}
215	width: Kube.Units.gridUnit * 7 - Kube.Units.smallSpacing * 2 - Kube.Units.gridUnit * model.indention	215	width: Kube.Units.gridUnit * 7 - Kube.Units.smallSpacing * 2 - Kube.Units.gridUnit * model.modelData.indention
216	height: Kube.Units.gridUnit * model.duration	216	height: Kube.Units.gridUnit * model.modelData.duration
217	y: Kube.Units.gridUnit * model.starts	217	y: Kube.Units.gridUnit * model.modelData.starts
218	x: Kube.Units.gridUnit * model.indention	218	x: Kube.Units.gridUnit * model.modelData.indention
219		219
220	color: model.color	220	color: model.modelData.color
221	border.width: 1	221	border.width: 1
222	border.color: Kube.Colors.viewBackgroundColor	222	border.color: Kube.Colors.viewBackgroundColor
223		223
@@ -226,7 +226,7 @@ FocusScope {
226	left: parent.left	226	left: parent.left
227	leftMargin: Kube.Units.smallSpacing	227	leftMargin: Kube.Units.smallSpacing
228	}	228	}
229	text: model.text	229	text: model.modelData.text
230	color: Kube.Colors.highlightedTextColor	230	color: Kube.Colors.highlightedTextColor
231	}	231	}
232		232