From 12255d2fc81bb43fd01a941cd015ef17adfa0f7f 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: Thu, 19 Sep 2019 22:31:01 +0800 Subject: Make HomeForm UI independent from implementation-dependent TaskList --- pages/HomeForm.ui.qml | 11 +---------- pages/TaskList.qml | 13 ------------- pages/TaskListForm.ui.qml | 21 +++++++++++++-------- 3 files changed, 14 insertions(+), 31 deletions(-) delete mode 100644 pages/TaskList.qml (limited to 'pages') diff --git a/pages/HomeForm.ui.qml b/pages/HomeForm.ui.qml index c0c95f2..6c34617 100644 --- a/pages/HomeForm.ui.qml +++ b/pages/HomeForm.ui.qml @@ -7,6 +7,7 @@ Rectangle { id: rectangle property alias menuButton: menuButton + property alias toolbar: toolbar ToolBar { id: toolbar @@ -55,16 +56,6 @@ Rectangle { } } - TaskList { - height: parent.height - anchors.top: toolbar.bottom - anchors.topMargin: 8 - anchors.right: parent.right - anchors.rightMargin: 0 - anchors.left: parent.left - anchors.leftMargin: 0 - } - RoundButton { id: roundButton width: 64 diff --git a/pages/TaskList.qml b/pages/TaskList.qml deleted file mode 100644 index 07a10ba..0000000 --- a/pages/TaskList.qml +++ /dev/null @@ -1,13 +0,0 @@ -import QtQuick 2.12 -import QtQuick.Controls 2.12 - -TaskListForm { - objectName: "taskList" - model: taskList - delegate: TaskForm { - width: parent.width - height: task.height - checkBox.text: subject - } - ScrollBar.vertical: ScrollBar {} -} diff --git a/pages/TaskListForm.ui.qml b/pages/TaskListForm.ui.qml index 3dfd6cc..87f1b1c 100644 --- a/pages/TaskListForm.ui.qml +++ b/pages/TaskListForm.ui.qml @@ -1,15 +1,20 @@ import QtQuick 2.12 import QtQuick.Controls 2.12 import QtQuick.Controls.Material 2.12 -import QtQuick.Layouts 1.12 ListView { - width: 362 - spacing: 12 + width: 362 + height: parent.height + anchors.topMargin: 8 + anchors.right: parent.right + anchors.rightMargin: 0 + anchors.left: parent.left + anchors.leftMargin: 0 + spacing: 12 - Rectangle { - id: rectangle - anchors.fill: parent - z: -1 - } + Rectangle { + id: rectangle + anchors.fill: parent + z: -1 + } } -- cgit v1.2.3