From 7a188ea594de86c131326847d9bd68baaa71a3a5 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: Tue, 24 Sep 2019 15:52:43 +0800 Subject: Task list element pushes to task details --- TaskDetails.qml | 5 +++++ TaskList.qml | 10 ++-------- forms/TaskForm.ui.qml | 1 + kelakon.qrc | 1 + larva | 2 +- 5 files changed, 10 insertions(+), 9 deletions(-) create mode 100644 TaskDetails.qml diff --git a/TaskDetails.qml b/TaskDetails.qml new file mode 100644 index 0000000..190dfae --- /dev/null +++ b/TaskDetails.qml @@ -0,0 +1,5 @@ +import QtQuick 2.12 +import "larva/features" + +TaskDetailForm { +} diff --git a/TaskList.qml b/TaskList.qml index d522417..6507ac3 100644 --- a/TaskList.qml +++ b/TaskList.qml @@ -1,5 +1,4 @@ import QtQuick 2.12 -import QtQuick.Controls 2.12 import "forms" TaskListForm { @@ -9,13 +8,8 @@ TaskListForm { delegate: TaskForm { width: parent.width height: task.height - taskTitle.text: subject + taskTitle.text: subject + itemDelegate.onClicked: contentView.push("TaskDetails.qml") } } } - -/*##^## -Designer { - D{i:0;autoSize:true;height:480;width:640} -} -##^##*/ diff --git a/forms/TaskForm.ui.qml b/forms/TaskForm.ui.qml index 4007e75..57cfbce 100644 --- a/forms/TaskForm.ui.qml +++ b/forms/TaskForm.ui.qml @@ -5,6 +5,7 @@ import QtQuick.Layouts 1.12 GridLayout { property alias task: task property alias taskTitle: taskTitle + property alias itemDelegate: itemDelegate id: task height: 72 diff --git a/kelakon.qrc b/kelakon.qrc index 0409170..3757956 100644 --- a/kelakon.qrc +++ b/kelakon.qrc @@ -22,6 +22,7 @@ forms/HomeForm.ui.qml forms/DayListForm.ui.qml TaskList.qml + TaskDetails.qml forms/TaskListForm.ui.qml forms/TaskForm.ui.qml assets/photo_camera_24px.svg diff --git a/larva b/larva index d5d916c..4a682d9 160000 --- a/larva +++ b/larva @@ -1 +1 @@ -Subproject commit d5d916ce5871a9786dfbeb5f016a6a8558c349cd +Subproject commit 4a682d953c2352107fee6d3dec8de324207351fb -- cgit v1.2.3