From 796ae3b5a78f9a81f2cb397b14860c40af8990fb Mon Sep 17 00:00:00 2001 From: Michael Bohlender Date: Thu, 19 Apr 2018 16:31:11 +0200 Subject: calendar++ --- views/calendar/main.qml | 7 +++++++ views/calendar/qml/View.qml | 6 +++++- 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 { starts: "2018-04-11T09:03:00", ends: "2018-04-11T14:03:00", }, + { + resource: "caldavresource", + summary: "Test Event3", + description: "This is test event #3", + starts: "2018-04-11T10:03:00", + ends: "2018-04-11T15:00:00", + }, ], }], } 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 import org.kube.framework 1.0 as Kube -Controls1.SplitView { +RowLayout { id: root anchors.fill: parent @@ -68,6 +68,10 @@ Controls1.SplitView { color: Kube.Colors.highlightedTextColor } + Kube.Label { + text: "Agenda" + color: Kube.Colors.highlightedTextColor + } } } 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 { property var dayWidth: (root.width - Kube.Units.gridUnit - Kube.Units.largeSpacing * 2) / 7 property var hourHeight: Kube.Units.gridUnit * 2 - Item { anchors { top: parent.top -- cgit v1.2.3