summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--views/calendar/main.qml7
-rw-r--r--views/calendar/qml/View.qml6
-rw-r--r--views/calendar/qml/WeekView.qml1
3 files changed, 12 insertions, 2 deletions
diff --git a/views/calendar/main.qml b/views/calendar/main.qml
index 672e3e21..1aa729d9 100644
--- a/views/calendar/main.qml
+++ b/views/calendar/main.qml
@@ -64,6 +64,13 @@ ApplicationWindow {
64 starts: "2018-04-11T09:03:00", 64 starts: "2018-04-11T09:03:00",
65 ends: "2018-04-11T14:03:00", 65 ends: "2018-04-11T14:03:00",
66 }, 66 },
67 {
68 resource: "caldavresource",
69 summary: "Test Event3",
70 description: "This is test event #3",
71 starts: "2018-04-11T10:03:00",
72 ends: "2018-04-11T15:00:00",
73 },
67 ], 74 ],
68 }], 75 }],
69 } 76 }
diff --git a/views/calendar/qml/View.qml b/views/calendar/qml/View.qml
index faad7f89..c0adae9f 100644
--- a/views/calendar/qml/View.qml
+++ b/views/calendar/qml/View.qml
@@ -23,7 +23,7 @@ import QtQuick.Layouts 1.2
23import org.kube.framework 1.0 as Kube 23import org.kube.framework 1.0 as Kube
24 24
25 25
26Controls1.SplitView { 26RowLayout {
27 id: root 27 id: root
28 28
29 anchors.fill: parent 29 anchors.fill: parent
@@ -68,6 +68,10 @@ Controls1.SplitView {
68 color: Kube.Colors.highlightedTextColor 68 color: Kube.Colors.highlightedTextColor
69 } 69 }
70 70
71 Kube.Label {
72 text: "Agenda"
73 color: Kube.Colors.highlightedTextColor
74 }
71 } 75 }
72 } 76 }
73 77
diff --git a/views/calendar/qml/WeekView.qml b/views/calendar/qml/WeekView.qml
index b590906c..f798e489 100644
--- a/views/calendar/qml/WeekView.qml
+++ b/views/calendar/qml/WeekView.qml
@@ -29,7 +29,6 @@ FocusScope {
29 property var dayWidth: (root.width - Kube.Units.gridUnit - Kube.Units.largeSpacing * 2) / 7 29 property var dayWidth: (root.width - Kube.Units.gridUnit - Kube.Units.largeSpacing * 2) / 7
30 property var hourHeight: Kube.Units.gridUnit * 2 30 property var hourHeight: Kube.Units.gridUnit * 2
31 31
32
33 Item { 32 Item {
34 anchors { 33 anchors {
35 top: parent.top 34 top: parent.top