Version to main screen

amnezia-vpn · Dec 14, 2021 · 5aa47d3 · 5aa47d3
1 parent 313ceed
commit 5aa47d3
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 0 deletions.
diff --git a/client/ui/pages_logic/VpnLogic.cpp b/client/ui/pages_logic/VpnLogic.cpp
@@ -4,6 +4,7 @@
 #include "vpnconnection.h"
 #include <functional>
 #include "../uilogic.h"
+#include "defines.h"
 
 
 VpnLogic::VpnLogic(UiLogic *logic, QObject *parent):
@@ -59,6 +60,8 @@ void VpnLogic::onUpdatePage()
     else {
         set_labelErrorText("");
     }
+    QString ver = QString("v. %2").arg(QString(APP_MAJOR_VERSION));
+    set_labelVersionText(ver);
 }
 
 

diff --git a/client/ui/pages_logic/VpnLogic.h b/client/ui/pages_logic/VpnLogic.h
@@ -22,6 +22,7 @@ class VpnLogic : public PageLogicBase
     AUTO_PROPERTY(bool, isContainerWorkingOnPlatform)
 
     AUTO_PROPERTY(QString, labelErrorText)
+    AUTO_PROPERTY(QString, labelVersionText)
 
     AUTO_PROPERTY(bool, radioButtonVpnModeAllSitesChecked)
     AUTO_PROPERTY(bool, radioButtonVpnModeForwardSitesChecked)

diff --git a/client/ui/qml/Pages/PageVPN.qml b/client/ui/qml/Pages/PageVPN.qml
@@ -20,6 +20,16 @@ PageBase {
         source: "qrc:/images/background_connected.png"
     }
 
+    LabelType {
+        x: 10
+        y: 5
+        width: 100
+        height: 21
+        text: VpnLogic.labelVersionText
+        color: "#dddddd"
+        font.pixelSize: 12
+    }
+
     ImageButtonType {
         x: parent.width - 40
         y: 10