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 --- forms/TaskForm.ui.qml | 1 + 1 file changed, 1 insertion(+) (limited to 'forms') 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 -- cgit v1.2.3 From b4a7a55b35b441d7e4e4acd83e85f2c21961f9b6 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 16:03:53 +0800 Subject: Task related forms are moved to Larva --- forms/DayListForm.ui.qml | 18 ---------- forms/HomeForm.ui.qml | 55 ------------------------------- forms/TaskForm.ui.qml | 83 ----------------------------------------------- forms/TaskListForm.ui.qml | 46 -------------------------- 4 files changed, 202 deletions(-) delete mode 100644 forms/DayListForm.ui.qml delete mode 100644 forms/HomeForm.ui.qml delete mode 100644 forms/TaskForm.ui.qml delete mode 100644 forms/TaskListForm.ui.qml (limited to 'forms') diff --git a/forms/DayListForm.ui.qml b/forms/DayListForm.ui.qml deleted file mode 100644 index 1b4c937..0000000 --- a/forms/DayListForm.ui.qml +++ /dev/null @@ -1,18 +0,0 @@ -import QtQuick 2.12 -import QtQuick.Controls 2.12 - -Column { - property alias todayItemDelegate: todayItemDelegate - property alias futureItemDelegate: futureItemDelegate - - anchors.fill: parent - ItemDelegate { - id: todayItemDelegate - width: parent.width - } - - ItemDelegate { - id: futureItemDelegate - width: parent.width - } -} diff --git a/forms/HomeForm.ui.qml b/forms/HomeForm.ui.qml deleted file mode 100644 index c44aac5..0000000 --- a/forms/HomeForm.ui.qml +++ /dev/null @@ -1,55 +0,0 @@ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Controls.Material 2.12 -import QtQuick.Layouts 1.12 - -Page { - property alias menuButton: menuButton - property alias titleLabel: titleLabel - property alias profileButton: profileButton - property alias contentView: contentView - - header: ToolBar { - background: Rectangle { - color: "#FAFFFFFF" - } - RowLayout { - anchors.fill: parent - spacing: 0 - ToolButton { - id: menuButton - icon.name: "menu-button" - highlighted: true - } - Label { - id: titleLabel - Layout.leftMargin: 16 - verticalAlignment: Text.AlignVCenter - horizontalAlignment: Text.AlignLeft - wrapMode: Text.WordWrap - font.family: "Work Sans" - font.weight: Font.Medium - font.pointSize: 20 - color: "#000000" - Layout.fillWidth: true - } - ToolButton { - id: profileButton - icon.name: "profile-button" - highlighted: true - } - } - } - - StackView { - id: contentView - anchors.fill: parent - } -} - -/*##^## -Designer { - D{i:0;autoSize:true;height:480;width:640} -} -##^##*/ - diff --git a/forms/TaskForm.ui.qml b/forms/TaskForm.ui.qml deleted file mode 100644 index 57cfbce..0000000 --- a/forms/TaskForm.ui.qml +++ /dev/null @@ -1,83 +0,0 @@ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Layouts 1.12 - -GridLayout { - property alias task: task - property alias taskTitle: taskTitle - property alias itemDelegate: itemDelegate - - id: task - height: 72 - anchors.right: parent.right - anchors.rightMargin: 0 - anchors.left: parent.left - anchors.leftMargin: 0 - - ItemDelegate { - id: itemDelegate - Layout.fillWidth: parent.width - Layout.fillHeight: parent.height - GridLayout { - - anchors.fill: parent - CheckBox { - Layout.leftMargin: 4 - display: AbstractButton.IconOnly - } - ColumnLayout { - Layout.leftMargin: 14 - spacing: 0 - Layout.fillWidth: true - Layout.fillHeight: true - - Text { - id: taskTitle - text: qsTr("Task title") - Layout.rightMargin: 16 - elide: Text.ElideRight - Layout.columnSpan: 0 - Layout.rowSpan: 0 - verticalAlignment: Text.AlignVCenter - Layout.topMargin: 0 - font.weight: Font.Medium - font.family: "Work Sans" - font.pixelSize: 16 - Layout.fillWidth: true - } - Text { - text: qsTr("Truncated task description") - Layout.rightMargin: 16 - font.pixelSize: 14 - Layout.topMargin: 4 - Layout.columnSpan: 0 - Layout.rowSpan: 0 - verticalAlignment: Text.AlignVCenter - Layout.bottomMargin: 0 - color: "#b3000000" - Layout.fillWidth: true - elide: Text.ElideRight - } - Text { - id: taskTimestamp - color: "#8a000000" - text: qsTr("DD/MM/YYYY") - topPadding: 4 - font.pixelSize: 12 - font.family: "Work Sans" - } - } - Image { - id: chevronRight - Layout.minimumHeight: 24 - Layout.minimumWidth: 24 - Layout.rightMargin: 12 - opacity: 0.54 - sourceSize.height: 24 - sourceSize.width: 24 - Layout.alignment: Qt.AlignRight | Qt.AlignVCenter - source: "/assets/chevron-right-24px.svg" - } - } - } -} diff --git a/forms/TaskListForm.ui.qml b/forms/TaskListForm.ui.qml deleted file mode 100644 index 0016bb8..0000000 --- a/forms/TaskListForm.ui.qml +++ /dev/null @@ -1,46 +0,0 @@ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Controls.Material 2.12 -import QtQuick.Layouts 1.12 - -Page { - id: page - property alias listView: listView - - ListView { - id: listView - width: parent.width - 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 - } - - ScrollBar.vertical: ScrollBar {} - } - RoundButton { - anchors.bottom: parent.bottom - anchors.bottomMargin: 8 - anchors.right: parent.right - anchors.rightMargin: 8 - highlighted: true - icon.source: "../assets/add-24px.svg" - height: 64 - width: 64 - } -} - -/*##^## -Designer { - D{i:0;autoSize:true;height:480;width:640} -} -##^##*/ - -- cgit v1.2.3