diff options
| -rw-r--r-- | Home.qml | 4 | ||||
| -rw-r--r-- | TaskList.qml (renamed from pages/TaskList.qml) | 1 | ||||
| -rw-r--r-- | kelakon.qrc | 4 | ||||
| -rw-r--r-- | pages/HomeForm.ui.qml | 11 | ||||
| -rw-r--r-- | pages/TaskListForm.ui.qml | 21 |
5 files changed, 21 insertions, 20 deletions
@@ -3,4 +3,8 @@ import "pages" HomeForm { menuButton.onClicked: drawer.visible = !drawer.visible + + TaskList { + anchors.top: toolbar.bottom + } } diff --git a/pages/TaskList.qml b/TaskList.qml index 07a10ba..042fcad 100644 --- a/pages/TaskList.qml +++ b/TaskList.qml @@ -1,5 +1,6 @@ import QtQuick 2.12 import QtQuick.Controls 2.12 +import "pages" TaskListForm { objectName: "taskList" diff --git a/kelakon.qrc b/kelakon.qrc index e216def..667ac33 100644 --- a/kelakon.qrc +++ b/kelakon.qrc @@ -24,9 +24,9 @@ <file>pages/CreateProfileForm.ui.qml</file> <file>Home.qml</file> <file>pages/HomeForm.ui.qml</file> - <file>pages/TaskForm.ui.qml</file> - <file>pages/TaskList.qml</file> + <file>TaskList.qml</file> <file>pages/TaskListForm.ui.qml</file> + <file>pages/TaskForm.ui.qml</file> <file>assets/photo_camera_24px.svg</file> <file>assets/menu-24px.svg</file> <file>assets/check-box-outline-24px.svg</file> 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/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 + } } |