AZEN-SGG/amnezia-client
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Version to main screen

Browse source
This commit is contained in:
pokamest 2021-12-14 12:50:57 +03:00
parent 313ceed1d0
commit 5aa47d35e7
3 changed files with 14 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

3
client/ui/pages_logic/VpnLogic.cpp
View file

@ -4,6 +4,7 @@
#include "vpnconnection.h" #include "vpnconnection.h"
#include <functional> #include <functional>
#include "../uilogic.h" #include "../uilogic.h"
#include "defines.h"
VpnLogic::VpnLogic(UiLogic *logic, QObject *parent): VpnLogic::VpnLogic(UiLogic *logic, QObject *parent):
@ -59,6 +60,8 @@ void VpnLogic::onUpdatePage()
else { else {
set_labelErrorText(""); set_labelErrorText("");
} }
QString ver = QString("v. %2").arg(QString(APP_MAJOR_VERSION));
set_labelVersionText(ver);
} }

1
client/ui/pages_logic/VpnLogic.h
View file

@ -22,6 +22,7 @@ class VpnLogic : public PageLogicBase
AUTO_PROPERTY(bool, isContainerWorkingOnPlatform) AUTO_PROPERTY(bool, isContainerWorkingOnPlatform)
AUTO_PROPERTY(QString, labelErrorText) AUTO_PROPERTY(QString, labelErrorText)
AUTO_PROPERTY(QString, labelVersionText)
AUTO_PROPERTY(bool, radioButtonVpnModeAllSitesChecked) AUTO_PROPERTY(bool, radioButtonVpnModeAllSitesChecked)
AUTO_PROPERTY(bool, radioButtonVpnModeForwardSitesChecked) AUTO_PROPERTY(bool, radioButtonVpnModeForwardSitesChecked)

10
client/ui/qml/Pages/PageVPN.qml
View file

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