From 2085b83960cbb8e4693cf48a5bd265aa946256de Mon Sep 17 00:00:00 2001
From: Christian Mollekopf <chrigi_1@fastmail.fm>
Date: Fri, 3 Aug 2018 13:49:56 +0200
Subject: Weekview with calendar colors

---
 views/calendar/qml/DaylongEvents.qml |  6 ------
 views/calendar/qml/WeekEvents.qml    |  6 ------
 views/calendar/qml/WeekView.qml      | 10 ++++------
 3 files changed, 4 insertions(+), 18 deletions(-)
 delete mode 100644 views/calendar/qml/DaylongEvents.qml
 delete mode 100644 views/calendar/qml/WeekEvents.qml

(limited to 'views')

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 @@
-import QtQuick 2.7
-
-import org.kube.framework 1.0 as Kube
-
-Kube.DayLongEventModel {
-}
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 @@
-import QtQuick 2.7
-
-import org.kube.framework 1.0 as Kube
-
-Kube.PeriodDayEventModel {
-}
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 {
 
                 clip: true
 
-                model: DaylongEvents {
+                model: Kube.DayLongEventModel {
                     start: root.startDate
                     length: root.daysToShow
                 }
@@ -124,8 +124,7 @@ FocusScope {
                         width: root.dayWidth * model.duration
                         height: parent.height
                         x: root.dayWidth * model.starts
-                        //color: model.color
-                        color: Kube.Colors.jazzberryJam
+                        color: model.color
                         border.width: 1
                         border.color: Kube.Colors.viewBackgroundColor
 
@@ -204,7 +203,7 @@ FocusScope {
                 //END time labels
 
                 Repeater {
-                    model: WeekEvents {
+                    model: Kube.PeriodDayEventModel {
                         start: root.startDate
                         length: root.daysToShow
                     }
@@ -266,8 +265,7 @@ FocusScope {
                                 y: root.hourHeight * model.modelData.starts
                                 x: Kube.Units.gridUnit * model.modelData.indention
 
-                                //color: model.modelData.color
-                                color: Kube.Colors.bewareOrange
+                                color: model.modelData.color
                                 opacity: 0.8
                                 border.width: 1
                                 border.color: Kube.Colors.viewBackgroundColor
-- 
cgit v1.2.3