diff options
Diffstat (limited to 'views')
-rw-r--r-- | views/calendar/qml/DaylongEvents.qml | 6 | ||||
-rw-r--r-- | views/calendar/qml/WeekEvents.qml | 6 | ||||
-rw-r--r-- | views/calendar/qml/WeekView.qml | 10 |
3 files changed, 4 insertions, 18 deletions
diff --git a/views/calendar/qml/DaylongEvents.qml b/views/calendar/qml/DaylongEvents.qml deleted file mode 100644 index a338cf3b..00000000 --- a/views/calendar/qml/DaylongEvents.qml +++ /dev/null | |||
@@ -1,6 +0,0 @@ | |||
1 | import QtQuick 2.7 | ||
2 | |||
3 | import org.kube.framework 1.0 as Kube | ||
4 | |||
5 | Kube.DayLongEventModel { | ||
6 | } | ||
diff --git a/views/calendar/qml/WeekEvents.qml b/views/calendar/qml/WeekEvents.qml deleted file mode 100644 index 73774b27..00000000 --- a/views/calendar/qml/WeekEvents.qml +++ /dev/null | |||
@@ -1,6 +0,0 @@ | |||
1 | import QtQuick 2.7 | ||
2 | |||
3 | import org.kube.framework 1.0 as Kube | ||
4 | |||
5 | Kube.PeriodDayEventModel { | ||
6 | } | ||
diff --git a/views/calendar/qml/WeekView.qml b/views/calendar/qml/WeekView.qml index fb49e8e0..08c56e5a 100644 --- a/views/calendar/qml/WeekView.qml +++ b/views/calendar/qml/WeekView.qml | |||
@@ -111,7 +111,7 @@ FocusScope { | |||
111 | 111 | ||
112 | clip: true | 112 | clip: true |
113 | 113 | ||
114 | model: DaylongEvents { | 114 | model: Kube.DayLongEventModel { |
115 | start: root.startDate | 115 | start: root.startDate |
116 | length: root.daysToShow | 116 | length: root.daysToShow |
117 | } | 117 | } |
@@ -124,8 +124,7 @@ FocusScope { | |||
124 | width: root.dayWidth * model.duration | 124 | width: root.dayWidth * model.duration |
125 | height: parent.height | 125 | height: parent.height |
126 | x: root.dayWidth * model.starts | 126 | x: root.dayWidth * model.starts |
127 | //color: model.color | 127 | color: model.color |
128 | color: Kube.Colors.jazzberryJam | ||
129 | border.width: 1 | 128 | border.width: 1 |
130 | border.color: Kube.Colors.viewBackgroundColor | 129 | border.color: Kube.Colors.viewBackgroundColor |
131 | 130 | ||
@@ -204,7 +203,7 @@ FocusScope { | |||
204 | //END time labels | 203 | //END time labels |
205 | 204 | ||
206 | Repeater { | 205 | Repeater { |
207 | model: WeekEvents { | 206 | model: Kube.PeriodDayEventModel { |
208 | start: root.startDate | 207 | start: root.startDate |
209 | length: root.daysToShow | 208 | length: root.daysToShow |
210 | } | 209 | } |
@@ -266,8 +265,7 @@ FocusScope { | |||
266 | y: root.hourHeight * model.modelData.starts | 265 | y: root.hourHeight * model.modelData.starts |
267 | x: Kube.Units.gridUnit * model.modelData.indention | 266 | x: Kube.Units.gridUnit * model.modelData.indention |
268 | 267 | ||
269 | //color: model.modelData.color | 268 | color: model.modelData.color |
270 | color: Kube.Colors.bewareOrange | ||
271 | opacity: 0.8 | 269 | opacity: 0.8 |
272 | border.width: 1 | 270 | border.width: 1 |
273 | border.color: Kube.Colors.viewBackgroundColor | 271 | border.color: Kube.Colors.viewBackgroundColor |