Merge pull request #15 from eplatonoff/feature/versioning

Versioning
eplatonoff · Aug 5, 2020 · 4f3f73f · 4f3f73f
2 parents e851a3a + f64e0bf
commit 4f3f73f
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 4 deletions.
diff --git a/.github/workflows/pre-release.yml b/.github/workflows/pre-release.yml
@@ -20,6 +20,7 @@ jobs:
       run: |
         export VERSION=${GITHUB_REF##*v}
         sed -i '' 's/Version=[0-9]*\.[0-9]*\.[0-9]*/Version='"$VERSION"'/g' src/Pilorama.desktop
+        sed -i '' 's/VERSION=[0-9]*\.[0-9]*\.[0-9]*/VERSION='"$VERSION"'/g' src/Pilorama.pro
     - name: Build Application
       run: |
         /usr/local/opt/qt/bin/qmake -config release src/Pilorama.pro
@@ -51,8 +52,7 @@ jobs:
         export VERSION=${GITHUB_REF##*v}
         sed -i 's/Version=[0-9]*\.[0-9]*\.[0-9]*/Version='"$VERSION"'/g' src/Pilorama.desktop
         sed -i 's/#define MyAppVersion "[0-9]*\.[0-9]*\.[0-9]"/#define MyAppVersion "'"$VERSION"'"/g' wndws.iss
-        cat src/Pilorama.desktop
-        cat wndws.iss
+        sed -i 's/VERSION=[0-9]*\.[0-9]*\.[0-9]*/VERSION='"$VERSION"'/g' src/Pilorama.pro
     - name: Build Application
       shell: cmd
       run: |
@@ -84,6 +84,7 @@ jobs:
         export VERSION=${GITHUB_REF##*v}
         sed -i 's/Version=[0-9]*\.[0-9]*\.[0-9]*/Version='"$VERSION"'/g' src/Pilorama.desktop
         sed -i 's/#define MyAppVersion "[0-9]*\.[0-9]*\.[0-9]*"/#define MyAppVersion "'"$VERSION"'"/g' wndws.iss
+        sed -i 's/VERSION=[0-9]*\.[0-9]*\.[0-9]*/VERSION='"$VERSION"'/g' src/Pilorama.pro
     - name: Commit Version
       run: |
         export VERSION=${GITHUB_REF##*v}

diff --git a/src/Components/Preferences.qml b/src/Components/Preferences.qml
@@ -233,7 +233,7 @@ Item {
 
         Text {
             anchors.verticalCenter: parent.verticalCenter
-            textFormat: Text.RichText;
+            textFormat: Text.RichText
             text:   "<style>a:link { color: " + colors.getColor('mid') + "; }</style>" +
                     "<a href='https://github.com/eplatonoff/pilorama'>project on github</a>"
 
@@ -245,6 +245,27 @@ Item {
         }
     }
 
+    Row {
+        id: version
+        height: 32
+        anchors.horizontalCenter: parent.horizontalCenter
+        spacing: 3
+        anchors.bottom: parent.bottom
+        anchors.bottomMargin: 10
+
+        Text {
+            anchors.verticalCenter: parent.verticalCenter
+            textFormat: Text.RichText
+            text:   "<style>a:link { color: " + colors.getColor('mid') + "; }</style>" +
+                    "<a href='https://github.com/eplatonoff/pilorama/releases/latest/'>ver. " + Qt.application.version + "</a>"
+
+            font.family: localFont.name
+            font.pixelSize: preferences.infoFontSize
+
+            onLinkActivated: Qt.openUrlExternally(link)
+
+        }
+    }
 
 }
 

diff --git a/src/Pilorama.pro b/src/Pilorama.pro
@@ -52,3 +52,6 @@ unix:
     macx: target.path = /usr/local/bin
     !android: target.path = /usr/bin
 !isEmpty(target.path): INSTALLS += target
+
+VERSION=9.9.9
+DEFINES += APP_VERSION=\\\"$$VERSION\\\"
diff --git a/src/TrayIcon.qml b/src/TrayIcon.qml
@@ -172,7 +172,7 @@ SystemTrayIcon {
             }
         }
         MenuItem {
-            text: qsTr("Settings")
+            text: qsTr("Preferences")
             onTriggered: {
                if (stack.currentItem === content) {
                    popUp()

diff --git a/src/main.cpp b/src/main.cpp
@@ -30,6 +30,8 @@ int main(int argc, char *argv[])
     app.setOrganizationDomain("somehumans.com");
     app.setApplicationName("QML Timer");
 
+    app.setApplicationVersion(APP_VERSION);
+
     QQmlApplicationEngine engine;
     engine.addImageProvider("tray_icon_provider", new TrayImageProvider());