From 552fd78f70ad29490a7536d86a653a43c3c89a5f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=A6=8C=20=EA=A6=AB=EA=A6=B6=20=EA=A6=8F=EA=A7=80?= =?UTF-8?q?=EA=A6=A6=EA=A6=BF=20=EA=A6=A7=20=EA=A6=AE=20=EA=A6=91=20?= =?UTF-8?q?=EA=A6=A9=20=EA=A6=AD=EA=A7=80?= Date: Sat, 21 Sep 2019 09:16:26 +0800 Subject: Insert task list in the day form --- Future.qml | 3 +++ TaskList.qml | 2 +- Today.qml | 3 +++ forms/DayForm.ui.qml | 5 +++-- 4 files changed, 10 insertions(+), 3 deletions(-) diff --git a/Future.qml b/Future.qml index 6550ad5..33b66fd 100644 --- a/Future.qml +++ b/Future.qml @@ -4,4 +4,7 @@ import "forms" DayForm { title: qsTr("Future task") contentLabel.text: qsTr("You are back to the future.") + TaskList { + anchors.bottom: contentLabel.top + } } diff --git a/TaskList.qml b/TaskList.qml index 042fcad..696f9ce 100644 --- a/TaskList.qml +++ b/TaskList.qml @@ -1,6 +1,6 @@ import QtQuick 2.12 import QtQuick.Controls 2.12 -import "pages" +import "forms" TaskListForm { objectName: "taskList" diff --git a/Today.qml b/Today.qml index a1fd613..4b08fae 100644 --- a/Today.qml +++ b/Today.qml @@ -4,4 +4,7 @@ import "forms" DayForm { title: qsTr("Today") contentLabel.text: qsTr("Load `contentView` here") + TaskList { + anchors.bottom: contentLabel.top + } } diff --git a/forms/DayForm.ui.qml b/forms/DayForm.ui.qml index f2de6cf..0478110 100644 --- a/forms/DayForm.ui.qml +++ b/forms/DayForm.ui.qml @@ -1,12 +1,13 @@ import QtQuick 2.12 import QtQuick.Controls 2.12 -import QtQuick.Controls.Material 2.12 Page { + id: page property alias contentLabel: contentLabel Label { id: contentLabel - anchors.centerIn: parent + anchors.horizontalCenter: parent.horizontalCenter + anchors.bottom: parent.bottom } } -- cgit v1.2.3