diff options
author | Michael Bohlender <michael.bohlender@kdemail.net> | 2018-04-19 16:31:11 +0200 |
---|---|---|
committer | Michael Bohlender <michael.bohlender@kdemail.net> | 2018-04-19 16:31:11 +0200 |
commit | 796ae3b5a78f9a81f2cb397b14860c40af8990fb (patch) | |
tree | dddb8c7003daa0728a7e504bfcf5e4847d56fae5 /views | |
parent | 394d04974b6b1722434720d8e8a96e8df46c8ff9 (diff) | |
download | kube-796ae3b5a78f9a81f2cb397b14860c40af8990fb.tar.gz kube-796ae3b5a78f9a81f2cb397b14860c40af8990fb.zip |
calendar++
Diffstat (limited to 'views')
-rw-r--r-- | views/calendar/main.qml | 7 | ||||
-rw-r--r-- | views/calendar/qml/View.qml | 6 | ||||
-rw-r--r-- | views/calendar/qml/WeekView.qml | 1 |
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 | |||
23 | import org.kube.framework 1.0 as Kube | 23 | import org.kube.framework 1.0 as Kube |
24 | 24 | ||
25 | 25 | ||
26 | Controls1.SplitView { | 26 | RowLayout { |
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 |