diff --git a/client/ui/pages_logic/VpnLogic.cpp b/client/ui/pages_logic/VpnLogic.cpp index 3449034a..65bf3fc2 100644 --- a/client/ui/pages_logic/VpnLogic.cpp +++ b/client/ui/pages_logic/VpnLogic.cpp @@ -4,6 +4,7 @@ #include "vpnconnection.h" #include #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 index 3338f22d..811c7f62 100644 --- 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 index e77302a3..b1ef7d5f 100644 --- 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