Update About page

2023-11-13 19:18:38 +01:00 · 2023-11-13 19:18:38 +01:00 · f47036e8f3
commit f47036e8f3
parent 4721e6c034
10 changed files with 128 additions and 1156 deletions
--- a/.gitignore
+++ b/.gitignore
@ -0,0 +1,3 @@
+
+harbour-expenditure.pro.user
+harbour-expenditure.pro.*
--- a/harbour-expenditure.pro.user
+++ b/harbour-expenditure.pro.user
--- a/qml/cover/CoverPage.qml
+++ b/qml/cover/CoverPage.qml
@ -1,5 +1,6 @@
 import QtQuick 2.6
 import Sailfish.Silica 1.0
+import "../pages"

 CoverBackground {
    /*
@ -12,23 +13,31 @@ CoverBackground {
    Image {
        id: name
        anchors.centerIn: parent
-        source: "harbour-expenditure.png"
+        source: "/usr/share/icons/hicolor/172x172/apps/harbour-expenditure.png"
        width: Theme.iconSizeLarge
        height: Theme.iconSizeLarge
        sourceSize.width: width
        sourceSize.height: height
        fillMode: Image.PreserveAspectFit
    }
-    /*
+    BannerAddExpense {
+        id: bannerAddExpense
+    }
+
+
    CoverActionList {
        id: coverAction

        CoverAction {
-            iconSource: "image://theme/icon-cover-next"
-        }
-        CoverAction {
-            iconSource: "image://theme/icon-cover-pause"
+            onTriggered: {
+                if(Number(storageItem.getSettings("activeProjectID_unixtime", 0)) !== 0) {
+                    main.activate()
+                    bannerAddExpense.notify( Theme.rgba(Theme.highlightDimmerColor, 1), Theme.itemSizeLarge, "new", activeProjectID_unixtime, 0 )
+                }
+
+            }
+
+            iconSource: "image://theme/icon-cover-add"
        }
    }
-    */
 }
--- a/qml/harbour-expenditure.qml
+++ b/qml/harbour-expenditure.qml
@ -4,6 +4,7 @@ import QtQuick.LocalStorage 2.0
 import "pages"

 ApplicationWindow {
+    id: main
    initialPage: Component { FirstPage { } }
    cover: Qt.resolvedUrl("cover/CoverPage.qml")
    allowedOrientations: defaultAllowedOrientations
--- a/qml/pages/AboutPage.qml
+++ b/qml/pages/AboutPage.qml
@ -18,6 +18,18 @@ Page {
            x: Theme.paddingLarge
            width: parent.width - 2*x

+            SectionHeader{
+                text: qsTr("About")
+            }
+
+            Image {
+                id: logo
+                source: "/usr/share/icons/hicolor/172x172/apps/harbour-expenditure.png"
+                smooth: true
+                height: parent.width / 2
+                width: parent.width / 2
+                anchors.horizontalCenter: parent.horizontalCenter
+            }
            Label {
                width: parent.width
                height: Theme.itemSizeLarge
@ -31,14 +43,6 @@ Page {
                width: parent.width
                height: Theme.paddingLarge
            }
-            Image {
-                width: parent.width
-                height: Theme.itemSizeHuge
-                source: "../cover/harbour-expenditure.png"
-                sourceSize.width: height
-                sourceSize.height: height
-                fillMode: Image.PreserveAspectFit
-            }
            Item {
                width: parent.width
                height: Theme.paddingLarge * 2.5
@ -61,24 +65,64 @@ Page {
                text: qsTr("Thanksgiving, feedback and support is always welcome.")
                bottomPadding: Theme.paddingLarge * 2
            }
+            SectionHeader{
+                text: qsTr("Troubleshooting")
+            }
+
            Label {
                x: Theme.paddingMedium
                width: parent.width - 2*x
                horizontalAlignment: Text.AlignHCenter
                font.pixelSize: Theme.fontSizeExtraSmall
                wrapMode: Text.Wrap
-                text: qsTr("Troubleshooting:")
-                    + "\n" + qsTr("In case of any database error tap 10x on the word 'Settings' for cleanup options.")
+                text: qsTr("In case of any database error tap 10x on the word 'Settings' for cleanup options.")
                bottomPadding: Theme.paddingLarge * 2
            }
+            SectionHeader {
+                text: qsTr("Source code")
+            }
+
+            Label {
+                x: Theme.paddingMedium
+                width: parent.width - 2*x
+                horizontalAlignment: Text.AlignHCenter
+                font.pixelSize: Theme.fontSizeExtraSmall
+                wrapMode: Text.Wrap
+                text: qsTr("Thanksgiving, feedback and support is always welcome.")
+                bottomPadding: Theme.paddingLarge * 2
+                onLinkActivated: Qt.openUrlExternally(link)
+            }
+            BackgroundItem{
+                            width: parent.width
+                            height: Theme.itemSizeMedium
+                            Row{
+                                width:parent.width - 2 * x
+                                height: parent.height
+                                x:Theme.horizontalPageMargin
+                                spacing:Theme.paddingLarge
+
+                                Label{
+                                    width: parent.width - parent.spacing
+                                    anchors.verticalCenter: parent.verticalCenter
+                                    wrapMode: Text.WrapAnywhere
+                                    font.pixelSize: Theme.fontSizeSmall
+
+                                    text: "https://github.com/yajo10/harbour-expenditure"
+                                    color: parent.parent.pressed ? Theme.highlightColor : Theme.primaryColor
+
+                                }
+                            }
+                            onClicked: Qt.openUrlExternally("https://github.com/yajo10/harbour-expenditure")
+                        }
+
            Label {
                width: parent.width
                horizontalAlignment: Text.AlignHCenter
                font.pixelSize: Theme.fontSizeExtraSmall
                color: Theme.secondaryColor
                wrapMode: Text.Wrap
-                text: qsTr("Contact:")
-                + "\n" + qsTr("Copyright © 2022 Tobias Planitzer")
+                text: qsTr("First author:")
+                + "\n" + qsTr("Tobias Planitzer")
                + "\n" + ("tp.labs@protonmail.com")
                + "\n" + qsTr("License: GPL v3")
            }
--- a/qml/pages/FirstPage.qml
+++ b/qml/pages/FirstPage.qml
@ -145,6 +145,10 @@ Page {
            qsort(0,count)
        }
    }
+    AboutPage {
+        id: aboutPage
+    }
+
    SettingsPage {
        id: settingsPage
    }
@ -234,6 +238,10 @@ Page {
            id: idPulldownMenu
            quickSelect: true

+            MenuItem {
+                text: qsTr("About")
+                onClicked: pageStack.push(aboutPage)
+            }
            MenuItem {
                text: qsTr("Settings")
                onClicked: pageStack.push(settingsPage)
--- a/rpm/harbour-expenditure.spec
+++ b/rpm/harbour-expenditure.spec
@ -9,7 +9,7 @@ Name:       harbour-expenditure
 # << macros

 Summary:    Expenditure
-Version:    0.2
+Version:    0.3
 Release:    1
 Group:      Qt/Qt
 License:    LICENSE
--- a/rpm/harbour-expenditure.yaml
+++ b/rpm/harbour-expenditure.yaml
@ -1,6 +1,6 @@
 Name: harbour-expenditure
 Summary: Expenditure
-Version: 0.2
+Version: 0.3
 Release: 1
 # The contents of the Group field should be one of the groups listed here:
 # https://github.com/mer-tools/spectacle/blob/master/data/GROUPS
--- a/translations/harbour-expenditure-de.ts
+++ b/translations/harbour-expenditure-de.ts
@ -7,10 +7,6 @@
        <source>Expenditure</source>
        <translation type="unfinished"></translation>
    </message>
-    <message>
-        <source>Copyright © 2022 Tobias Planitzer</source>
-        <translation type="unfinished"></translation>
-    </message>
    <message>
        <source>License: GPL v3</source>
        <translation type="unfinished"></translation>
@ -23,16 +19,28 @@
        <source>Thanksgiving, feedback and support is always welcome.</source>
        <translation type="unfinished"></translation>
    </message>
-    <message>
-        <source>Troubleshooting:</source>
-        <translation type="unfinished"></translation>
-    </message>
    <message>
        <source>In case of any database error tap 10x on the word &apos;Settings&apos; for cleanup options.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <source>Contact:</source>
+        <source>First author:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tobias Planitzer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>About</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Troubleshooting</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Source code</source>
        <translation type="unfinished"></translation>
    </message>
 </context>
@ -287,6 +295,10 @@
        <source>Remove entry?</source>
        <translation type="unfinished"></translation>
    </message>
+    <message>
+        <source>About</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
    <name>SettingsPage</name>
--- a/translations/harbour-expenditure.ts
+++ b/translations/harbour-expenditure.ts
@ -7,10 +7,6 @@
        <source>Expenditure</source>
        <translation type="unfinished"></translation>
    </message>
-    <message>
-        <source>Copyright © 2022 Tobias Planitzer</source>
-        <translation type="unfinished"></translation>
-    </message>
    <message>
        <source>License: GPL v3</source>
        <translation type="unfinished"></translation>
@ -23,16 +19,28 @@
        <source>Thanksgiving, feedback and support is always welcome.</source>
        <translation type="unfinished"></translation>
    </message>
-    <message>
-        <source>Troubleshooting:</source>
-        <translation type="unfinished"></translation>
-    </message>
    <message>
        <source>In case of any database error tap 10x on the word &apos;Settings&apos; for cleanup options.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <source>Contact:</source>
+        <source>First author:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tobias Planitzer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>About</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Troubleshooting</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Source code</source>
        <translation type="unfinished"></translation>
    </message>
 </context>
@ -287,6 +295,10 @@
        <source>Remove entry?</source>
        <translation type="unfinished"></translation>
    </message>
+    <message>
+        <source>About</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
    <name>SettingsPage</name>