From 061b0b205ea84a008bb52ef4f13dea77d9a37952 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:04:46 +0800 Subject: Move task related forms to the new forms directory --- forms/TaskForm.ui.qml | 41 +++++++++++++++++++++++++++++++++++++++++ forms/TaskListForm.ui.qml | 20 ++++++++++++++++++++ kelakon.qrc | 4 ++-- pages/TaskForm.ui.qml | 41 ----------------------------------------- pages/TaskListForm.ui.qml | 20 -------------------- 5 files changed, 63 insertions(+), 63 deletions(-) create mode 100644 forms/TaskForm.ui.qml create mode 100644 forms/TaskListForm.ui.qml delete mode 100644 pages/TaskForm.ui.qml delete mode 100644 pages/TaskListForm.ui.qml diff --git a/forms/TaskForm.ui.qml b/forms/TaskForm.ui.qml new file mode 100644 index 0000000..6010b57 --- /dev/null +++ b/forms/TaskForm.ui.qml @@ -0,0 +1,41 @@ +import QtQuick 2.12 +import QtQuick.Controls 2.12 +import QtQuick.Layouts 1.12 + +RowLayout { + property alias task: task + property alias checkBox: checkBox + + id: task + width: fillWidth + height: 54 + anchors.topMargin: 8 + anchors.right: parent.right + anchors.rightMargin: 0 + anchors.left: parent.left + anchors.leftMargin: 0 + spacing: 8 + + CheckBox { + id: checkBox + text: qsTr("This is a task title") + padding: 8 + rightPadding: 16 + leftPadding: 16 + bottomPadding: 16 + topPadding: 16 + Layout.fillHeight: true + Layout.fillWidth: true + font.family: "Google Sans" + font.pointSize: 16 + font.weight: Font.Medium + spacing: 24 + } + RoundButton { + id: chevronRight + flat: true + icon.name: "chevron-right-icon" + icon.source: "/assets/chevron-right-24px.svg" + icon.color: "#99000000" + } +} diff --git a/forms/TaskListForm.ui.qml b/forms/TaskListForm.ui.qml new file mode 100644 index 0000000..87f1b1c --- /dev/null +++ b/forms/TaskListForm.ui.qml @@ -0,0 +1,20 @@ +import QtQuick 2.12 +import QtQuick.Controls 2.12 +import QtQuick.Controls.Material 2.12 + +ListView { + 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 + } +} diff --git a/kelakon.qrc b/kelakon.qrc index 0348b57..d8ba880 100644 --- a/kelakon.qrc +++ b/kelakon.qrc @@ -25,8 +25,8 @@ forms/DayForm.ui.qml forms/DayListForm.ui.qml TaskList.qml - pages/TaskListForm.ui.qml - pages/TaskForm.ui.qml + forms/TaskListForm.ui.qml + forms/TaskForm.ui.qml assets/photo_camera_24px.svg assets/menu-24px.svg assets/check-box-outline-24px.svg diff --git a/pages/TaskForm.ui.qml b/pages/TaskForm.ui.qml deleted file mode 100644 index 6010b57..0000000 --- a/pages/TaskForm.ui.qml +++ /dev/null @@ -1,41 +0,0 @@ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Layouts 1.12 - -RowLayout { - property alias task: task - property alias checkBox: checkBox - - id: task - width: fillWidth - height: 54 - anchors.topMargin: 8 - anchors.right: parent.right - anchors.rightMargin: 0 - anchors.left: parent.left - anchors.leftMargin: 0 - spacing: 8 - - CheckBox { - id: checkBox - text: qsTr("This is a task title") - padding: 8 - rightPadding: 16 - leftPadding: 16 - bottomPadding: 16 - topPadding: 16 - Layout.fillHeight: true - Layout.fillWidth: true - font.family: "Google Sans" - font.pointSize: 16 - font.weight: Font.Medium - spacing: 24 - } - RoundButton { - id: chevronRight - flat: true - icon.name: "chevron-right-icon" - icon.source: "/assets/chevron-right-24px.svg" - icon.color: "#99000000" - } -} diff --git a/pages/TaskListForm.ui.qml b/pages/TaskListForm.ui.qml deleted file mode 100644 index 87f1b1c..0000000 --- a/pages/TaskListForm.ui.qml +++ /dev/null @@ -1,20 +0,0 @@ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Controls.Material 2.12 - -ListView { - 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 - } -} -- cgit v1.2.3