diff options
author | Rémi Nicole <nicole@kolabsystems.com> | 2018-05-15 12:01:09 +0200 |
---|---|---|
committer | Christian Mollekopf <chrigi_1@fastmail.fm> | 2018-05-15 12:01:42 +0200 |
commit | 455809b0e5d6e80406867aa8f5a74aa10a39bf35 (patch) | |
tree | bc50d0dfaca7f12695c959ac87c797293f49a3f3 /views/calendar/qml | |
parent | d353ec997f06891455dce9b51333687da670a03e (diff) | |
download | kube-455809b0e5d6e80406867aa8f5a74aa10a39bf35.tar.gz kube-455809b0e5d6e80406867aa8f5a74aa10a39bf35.zip |
Implement DayLongEventModel and integrate it to the calendar
Summary: Fixes T8697
Reviewers: cmollekopf
Reviewed By: cmollekopf
Tags: #kube
Maniphest Tasks: T8697
Differential Revision: https://phabricator.kde.org/D12875
Diffstat (limited to 'views/calendar/qml')
-rw-r--r-- | views/calendar/qml/DaylongEvents.qml | 18 | ||||
-rw-r--r-- | views/calendar/qml/WeekView.qml | 5 |
2 files changed, 8 insertions, 15 deletions
diff --git a/views/calendar/qml/DaylongEvents.qml b/views/calendar/qml/DaylongEvents.qml index 340c9d79..a07b66dd 100644 --- a/views/calendar/qml/DaylongEvents.qml +++ b/views/calendar/qml/DaylongEvents.qml | |||
@@ -1,16 +1,8 @@ | |||
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 | color: "#af1a6a" | 5 | Kube.DayLongEventModel { |
6 | starts: 1 | 6 | start: "2018-04-09" |
7 | duration: 4 | 7 | length: 7 |
8 | text: "Baustelle Adalbertstr." | ||
9 | } | ||
10 | ListElement { | ||
11 | color: "#134bab" | ||
12 | starts: 0 | ||
13 | duration: 6 | ||
14 | text: "Urlaub" | ||
15 | } | ||
16 | } | 8 | } |
diff --git a/views/calendar/qml/WeekView.qml b/views/calendar/qml/WeekView.qml index f798e489..bcf037fa 100644 --- a/views/calendar/qml/WeekView.qml +++ b/views/calendar/qml/WeekView.qml | |||
@@ -97,7 +97,8 @@ FocusScope { | |||
97 | width: root.dayWidth * model.duration | 97 | width: root.dayWidth * model.duration |
98 | height: parent.height | 98 | height: parent.height |
99 | x: root.dayWidth * model.starts | 99 | x: root.dayWidth * model.starts |
100 | color: model.color | 100 | //color: model.color |
101 | color: Kube.Colors.jazzberryJam | ||
101 | border.width: 1 | 102 | border.width: 1 |
102 | border.color: Kube.Colors.viewBackgroundColor | 103 | border.color: Kube.Colors.viewBackgroundColor |
103 | 104 | ||
@@ -107,7 +108,7 @@ FocusScope { | |||
107 | leftMargin: Kube.Units.smallSpacing | 108 | leftMargin: Kube.Units.smallSpacing |
108 | } | 109 | } |
109 | color: Kube.Colors.highlightedTextColor | 110 | color: Kube.Colors.highlightedTextColor |
110 | text: model.text | 111 | text: model.summary |
111 | } | 112 | } |
112 | } | 113 | } |
113 | } | 114 | } |