From a3af7773cf891ee54d0b524b3806ab4cd86e2756 Mon Sep 17 00:00:00 2001 From: Anatasof Wirapraja Date: Sat, 14 Sep 2019 14:03:16 +0700 Subject: remove textLabel on FAB --- pages/HomeForm.ui.qml | 30 +++++++++--------------------- 1 file changed, 9 insertions(+), 21 deletions(-) diff --git a/pages/HomeForm.ui.qml b/pages/HomeForm.ui.qml index 23ac660..28448ae 100644 --- a/pages/HomeForm.ui.qml +++ b/pages/HomeForm.ui.qml @@ -62,27 +62,16 @@ Rectangle { RoundButton { id: roundButton - width: 144 - spacing: 8 + width: 64 height: 64 + display: AbstractButton.IconOnly + spacing: 8 - text: qsTr("New task") padding: 16 - font.capitalization: Font.MixedCase - font.family: "Google Sans" - font.pointSize: 16 - font.weight: Font.Medium - - rightPadding: 24 - leftPadding: 16 - bottomPadding: 16 - topPadding: 16 - autoExclusive: false - focusPolicy: Qt.NoFocus anchors.bottom: parent.bottom - anchors.bottomMargin: 16 + anchors.bottomMargin: 8 anchors.right: parent.right - anchors.rightMargin: 16 + anchors.rightMargin: 8 highlighted: true icon.name: "add-icon" @@ -90,10 +79,9 @@ Rectangle { } } - - - -/*##^## Designer { +/*##^## +Designer { D{i:0;autoSize:true;height:480;width:640} } - ##^##*/ +##^##*/ + -- cgit v1.2.3 From e92c75d5f89af5f23d28eeb4605ed8be9b2075c2 Mon Sep 17 00:00:00 2001 From: Anatasof Wirapraja Date: Sat, 14 Sep 2019 14:19:04 +0700 Subject: add profileButton on ToolBar --- assets/profile-24px.svg | 1 + kelakon.qrc | 7 ++++--- pages/HomeForm.ui.qml | 7 ++++++- 3 files changed, 11 insertions(+), 4 deletions(-) create mode 100644 assets/profile-24px.svg diff --git a/assets/profile-24px.svg b/assets/profile-24px.svg new file mode 100644 index 0000000..beed9cb --- /dev/null +++ b/assets/profile-24px.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/kelakon.qrc b/kelakon.qrc index 8588398..3c41d42 100644 --- a/kelakon.qrc +++ b/kelakon.qrc @@ -16,9 +16,9 @@ pages/ConfirmPassword.qml pages/CreateProfile.qml pages/CreateProfileForm.ui.qml - pages/TaskForm.ui.qml - pages/TaskList.qml - pages/TaskListForm.ui.qml + pages/TaskForm.ui.qml + pages/TaskList.qml + pages/TaskListForm.ui.qml assets/photo_camera_24px.svg pages/Home.qml pages/HomeForm.ui.qml @@ -26,5 +26,6 @@ assets/check-box-outline-24px.svg assets/chevron-right-24px.svg assets/add-24px.svg + assets/profile-24px.svg diff --git a/pages/HomeForm.ui.qml b/pages/HomeForm.ui.qml index 28448ae..c0c95f2 100644 --- a/pages/HomeForm.ui.qml +++ b/pages/HomeForm.ui.qml @@ -46,7 +46,12 @@ Rectangle { verticalAlignment: Qt.AlignVCenter Layout.fillWidth: true } - ToolButton {} + ToolButton { + id: profileButton + icon.name: "profile-icon" + icon.source: "/assets/profile-24px.svg" + highlighted: true + } } } -- cgit v1.2.3