From b8d76329bced92d712185e5588dfd6061e8fe0f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Nicole?= Date: Tue, 17 Apr 2018 14:30:27 +0200 Subject: Implement PeriodDayEventModel Summary: Implements a model to load events. When finished, should fix T8225 TODO: - Use the parent / children model in qml, instead of relying on the ".events" attribute (using DelegateModel I think) Reviewers: cmollekopf Tags: #kube Maniphest Tasks: T8225 Differential Revision: https://phabricator.kde.org/D12089 --- views/calendar/qml/WeekEvents.qml | 95 +++------------------------------------ views/calendar/qml/WeekView.qml | 12 ++--- 2 files changed, 11 insertions(+), 96 deletions(-) (limited to 'views') diff --git a/views/calendar/qml/WeekEvents.qml b/views/calendar/qml/WeekEvents.qml index 005fb19e..774f254e 100644 --- a/views/calendar/qml/WeekEvents.qml +++ b/views/calendar/qml/WeekEvents.qml @@ -1,93 +1,8 @@ import QtQuick 2.7 -ListModel { - ListElement { - events: [ - ListElement { - color: "#af1a6a" - starts: 1 - duration: 4 - text: "Meeting" - indention: 0 - }, - ListElement { - color: "#134bab" - starts: 9 - duration: 5 - text: "Sport" - indention: 0 - } - ] - } - ListElement { - events: [ - ListElement { - color: "#134bab" - starts: 9 - duration: 5 - text: "Sport" - indention: 0 - } - ] - } - ListElement { - events: [] - } - ListElement { - events: [ - ListElement { - color: "#af1a6a" - starts: 1 - duration: 4 - indention: 0 - text: "Meeting" - } - ] - } - ListElement { - events: [ - ListElement { - color: "#134bab" - starts: 3 - duration: 5 - indention: 0 - text: "Meeting" - }, - ListElement { - color: "#af1a6a" - starts: 4 - duration: 7 - indention: 1 - text: "Meeting2" - } - ] - } - ListElement { - events: [ - ListElement { - color: "#134bab" - starts: 8 - duration: 5 - indention: 0 - text: "Meeting" - }, - ListElement { - color: "#af1a6a" - starts: 8 - duration: 4 - indention: 1 - text: "Meeting2" - }, - ListElement { - color: "#af1a6a" - starts: 9 - duration: 7 - indention: 2 - text: "Meeting2" - } - ] - } - ListElement { - events: [] - } +import org.kube.framework 1.0 as Kube + +Kube.PeriodDayEventModel { + start: "2018-04-09" + length: 7 } diff --git a/views/calendar/qml/WeekView.qml b/views/calendar/qml/WeekView.qml index 8eef3a92..877500c5 100644 --- a/views/calendar/qml/WeekView.qml +++ b/views/calendar/qml/WeekView.qml @@ -212,12 +212,12 @@ FocusScope { right: parent.right rightMargin: Kube.Units.smallSpacing } - width: Kube.Units.gridUnit * 7 - Kube.Units.smallSpacing * 2 - Kube.Units.gridUnit * model.indention - height: Kube.Units.gridUnit * model.duration - y: Kube.Units.gridUnit * model.starts - x: Kube.Units.gridUnit * model.indention + width: Kube.Units.gridUnit * 7 - Kube.Units.smallSpacing * 2 - Kube.Units.gridUnit * model.modelData.indention + height: Kube.Units.gridUnit * model.modelData.duration + y: Kube.Units.gridUnit * model.modelData.starts + x: Kube.Units.gridUnit * model.modelData.indention - color: model.color + color: model.modelData.color border.width: 1 border.color: Kube.Colors.viewBackgroundColor @@ -226,7 +226,7 @@ FocusScope { left: parent.left leftMargin: Kube.Units.smallSpacing } - text: model.text + text: model.modelData.text color: Kube.Colors.highlightedTextColor } -- cgit v1.2.3