summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--assets/check-box-outline-24px.svg1
-rw-r--r--assets/chevron-right-24px.svg1
-rw-r--r--kelakon.qrc2
-rw-r--r--pages/HomeForm.ui.qml66
4 files changed, 30 insertions, 40 deletions
diff --git a/assets/check-box-outline-24px.svg b/assets/check-box-outline-24px.svg
new file mode 100644
index 0000000..68d3447
--- /dev/null
+++ b/assets/check-box-outline-24px.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path fill="none" d="M0 0h24v24H0V0z"/><path d="M19 5v14H5V5h14m0-2H5c-1.1 0-2 .9-2 2v14c0 1.1.9 2 2 2h14c1.1 0 2-.9 2-2V5c0-1.1-.9-2-2-2z"/></svg> \ No newline at end of file
diff --git a/assets/chevron-right-24px.svg b/assets/chevron-right-24px.svg
new file mode 100644
index 0000000..acabc29
--- /dev/null
+++ b/assets/chevron-right-24px.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path fill="none" d="M0 0h24v24H0V0z"/><path d="M10 6L8.59 7.41 13.17 12l-4.58 4.59L10 18l6-6-6-6z"/></svg> \ No newline at end of file
diff --git a/kelakon.qrc b/kelakon.qrc
index bab06ed..d6251ff 100644
--- a/kelakon.qrc
+++ b/kelakon.qrc
@@ -21,5 +21,7 @@
<file>pages/Home.qml</file>
<file>pages/HomeForm.ui.qml</file>
<file>assets/menu-24px.svg</file>
+ <file>assets/check-box-outline-24px.svg</file>
+ <file>assets/chevron-right-24px.svg</file>
</qresource>
</RCC>
diff --git a/pages/HomeForm.ui.qml b/pages/HomeForm.ui.qml
index b186701..75e988b 100644
--- a/pages/HomeForm.ui.qml
+++ b/pages/HomeForm.ui.qml
@@ -8,9 +8,6 @@ Rectangle {
property alias menuButton: menuButton
property alias taskList: taskList
- property alias taskList2: taskList2
- property alias taskItem: taskItem
- property alias taskItem2: taskItem2
ToolBar {
id: toolbar
@@ -54,10 +51,9 @@ Rectangle {
}
}
- Rectangle {
+ RowLayout {
id: taskList
height: 72
- color: "#ffffff"
anchors.right: parent.right
anchors.rightMargin: 0
anchors.left: parent.left
@@ -65,41 +61,27 @@ Rectangle {
anchors.top: toolbar.bottom
anchors.topMargin: 8
- GridLayout {
- CheckBox {
- id: taskItem
- text: qsTr("Task name")
- font.weight: Font.Medium
- font.family: "Google Sans"
- font.pointSize: 16
- checked: true
- width: parent.width
- height: parent.height
- }
+ RoundButton {
+ id: checkBox
+ flat: true
+ icon.name: "check-box-icon"
+ icon.source: "/assets/check-box-outline-24px.svg"
+ icon.color: "#99000000"
}
- }
- Rectangle {
- id: taskList2
- height: 72
- color: "#ffffff"
- anchors.right: parent.right
- anchors.rightMargin: 0
- anchors.left: parent.left
- anchors.leftMargin: 0
- anchors.top: taskList.bottom
- anchors.topMargin: 0
-
- GridLayout {
- CheckBox {
- id: taskItem2
- text: qsTr("Another task name")
- font.weight: Font.Medium
- font.family: "Google Sans"
- font.pointSize: 16
- checked: false
- width: parent.width
- height: parent.height
- }
+ Label {
+ id: taskLabel
+ text: qsTr("Task number 1")
+ font.weight: Font.Medium
+ font.pointSize: 16
+ Layout.fillWidth: true
+ font.family: "Google Sans"
+ }
+ RoundButton {
+ id: taskDetailNavigate
+ flat: true
+ icon.name: "chevron-right-icon"
+ icon.source: "/assets/chevron-right-24px.svg"
+ icon.color: "#99000000"
}
}
}
@@ -107,7 +89,11 @@ Rectangle {
+
+
+
+
/*##^## Designer {
- D{i:0;autoSize:true;height:480;width:640}D{i:7;anchors_width:534;anchors_x:8;anchors_y:62}
+ D{i:0;autoSize:true;height:480;width:640}
}
##^##*/