Merge remote-tracking branch 'github/usrok'

3 files changed, 20 insertions, 25 deletions

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 @@
+<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="M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zM7.07 18.28c.43-.9 3.05-1.78 4.93-1.78s4.51.88 4.93 1.78C15.57 19.36 13.86 20 12 20s-3.57-.64-4.93-1.72zm11.29-1.45c-1.43-1.74-4.9-2.33-6.36-2.33s-4.93.59-6.36 2.33C4.62 15.49 4 13.82 4 12c0-4.41 3.59-8 8-8s8 3.59 8 8c0 1.82-.62 3.49-1.64 4.83zM12 6c-1.94 0-3.5 1.56-3.5 3.5S10.06 13 12 13s3.5-1.56 3.5-3.5S13.94 6 12 6zm0 5c-.83 0-1.5-.67-1.5-1.5S11.17 8 12 8s1.5.67 1.5 1.5S12.83 11 12 11z"/></svg>
\ 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 @@
         <file>pages/ConfirmPassword.qml</file>
         <file>pages/CreateProfile.qml</file>
         <file>pages/CreateProfileForm.ui.qml</file>
-	<file>pages/TaskForm.ui.qml</file>
-	<file>pages/TaskList.qml</file>
-	<file>pages/TaskListForm.ui.qml</file>
+        <file>pages/TaskForm.ui.qml</file>
+        <file>pages/TaskList.qml</file>
+        <file>pages/TaskListForm.ui.qml</file>
         <file>assets/photo_camera_24px.svg</file>
         <file>pages/Home.qml</file>
         <file>pages/HomeForm.ui.qml</file>
@@ -26,5 +26,6 @@
         <file>assets/check-box-outline-24px.svg</file>
         <file>assets/chevron-right-24px.svg</file>
         <file>assets/add-24px.svg</file>
+        <file>assets/profile-24px.svg</file>
     </qresource>
 </RCC>
diff --git a/pages/HomeForm.ui.qml b/pages/HomeForm.ui.qml
index 23ac660..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
+            }
         }
     }
 
@@ -62,27 +67,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 +84,9 @@ Rectangle {
     }
 }
 
-
-
-
-/*##^## Designer {
+/*##^##
+Designer {
     D{i:0;autoSize:true;height:480;width:640}
 }
- ##^##*/
+##^##*/
+