diff --git a/views/calendar/qml/View.qml b/views/calendar/qml/View.qml index 1b72881d..a545f473 100644 --- a/views/calendar/qml/View.qml +++ b/views/calendar/qml/View.qml @@ -1,141 +1,145 @@ /* * Copyright (C) 2018 Michael Bohlender, * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License along * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import QtQuick 2.4 import QtQuick.Layouts 1.1 import QtQuick.Controls 2.0 import Qt.labs.calendar 1.0 import org.kube.framework 1.0 as Kube FocusScope { id: root property var month: Calendar.March property var year: 2017 - Column { anchors.centerIn: parent DayOfWeekRow { anchors.horizontalCenter: parent.horizontalCenter spacing: 0 locale: Qt.locale("de") delegate: Rectangle { width: Kube.Units.gridUnit * 7 height: Kube.Units.gridUnit + Kube.Units.smallSpacing * 3 border.width: 1 border.color: "lightgrey" color: Kube.Colors.viewBackgroundColor Kube.Label { anchors { top: parent.top left: parent.left margins: Kube.Units.smallSpacing } text: model.shortName } } } Rectangle { height: Kube.Units.gridUnit * 3 width: parent.width color: Kube.Colors.viewBackgroundColor ListView { id: daylong anchors.fill: parent model: DaylongEvents {} delegate: Item { height: Kube.Units.gridUnit width: daylong.width Rectangle { width: Kube.Units.gridUnit * 7 * model.duration height: Kube.Units.gridUnit x: Kube.Units.gridUnit * 7 * model.starts color: model.color Kube.Label { anchors { left: parent.left leftMargin: Kube.Units.smallSpacing } color: Kube.Colors.highlightedTextColor text: model.text } } } } } RowLayout { anchors.horizontalCenter: parent.horizontalCenter spacing: 0 Repeater { model: WeekEvents{} delegate: Rectangle { id: day property var events: model.events width: Kube.Units.gridUnit * 7 height: Kube.Units.gridUnit * 20 border.width: 1 border.color: "lightgrey" color: Kube.Colors.viewBackgroundColor Repeater { model: parent.events delegate: Rectangle { - anchors.horizontalCenter: parent.horizontalCenter - width: parent.width - Kube.Units.smallSpacing * 2 - height: Kube.Units.gridUnit * duration - y: Kube.Units.gridUnit * starts + anchors { + right: parent.right + rightMargin: Kube.Units.smallSpacing + } + width: parent.width - 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 + color: model.color Kube.Label { anchors { left: parent.left leftMargin: Kube.Units.smallSpacing } text: model.text color: Kube.Colors.highlightedTextColor } } } } } } } } diff --git a/views/calendar/qml/WeekEvents.qml b/views/calendar/qml/WeekEvents.qml index b08c00a5..c8a420e0 100644 --- a/views/calendar/qml/WeekEvents.qml +++ b/views/calendar/qml/WeekEvents.qml @@ -1,65 +1,71 @@ 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: "#af1a6a" + color: "#134bab" starts: 3 duration: 5 + indention: 0 text: "Meeting" }, ListElement { color: "#af1a6a" - starts: 9 - duration: 4 + starts: 4 + duration: 7 + indention: 1 text: "Meeting2" } ] } ListElement { events: [] } ListElement { events: [] } }