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

VPN modes ui fix

Browse source
This commit is contained in:
pokamest 2021-11-28 19:14:12 +03:00
parent 4c2941acf0
commit 4eef127744
3 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -13,7 +13,6 @@ VpnLogic::VpnLogic(UiLogic *logic, QObject *parent):
m_radioButtonVpnModeAllSitesChecked{true}, m_radioButtonVpnModeAllSitesChecked{true},
m_radioButtonVpnModeForwardSitesChecked{false}, m_radioButtonVpnModeForwardSitesChecked{false},
m_radioButtonVpnModeExceptSitesChecked{false}, m_radioButtonVpnModeExceptSitesChecked{false},
m_pushButtonVpnAddSiteEnabled{true},
m_labelSpeedReceivedText{tr("0 Mbps")}, m_labelSpeedReceivedText{tr("0 Mbps")},
m_labelSpeedSentText{tr("0 Mbps")}, m_labelSpeedSentText{tr("0 Mbps")},
@ -42,7 +41,6 @@ void VpnLogic::onUpdatePage()
set_radioButtonVpnModeAllSitesChecked(mode == Settings::VpnAllSites); set_radioButtonVpnModeAllSitesChecked(mode == Settings::VpnAllSites);
set_radioButtonVpnModeForwardSitesChecked(mode == Settings::VpnOnlyForwardSites); set_radioButtonVpnModeForwardSitesChecked(mode == Settings::VpnOnlyForwardSites);
set_radioButtonVpnModeExceptSitesChecked(mode == Settings::VpnAllExceptSites); set_radioButtonVpnModeExceptSitesChecked(mode == Settings::VpnAllExceptSites);
set_pushButtonVpnAddSiteEnabled(mode != Settings::VpnAllSites);
const QJsonObject &server = uiLogic()->m_settings.defaultServer(); const QJsonObject &server = uiLogic()->m_settings.defaultServer();
QString serverString = QString("%2 (%3)") QString serverString = QString("%2 (%3)")
@ -59,16 +57,19 @@ void VpnLogic::onUpdatePage()
void VpnLogic::onRadioButtonVpnModeAllSitesClicked() void VpnLogic::onRadioButtonVpnModeAllSitesClicked()
{ {
m_settings.setRouteMode(Settings::VpnAllSites); m_settings.setRouteMode(Settings::VpnAllSites);
onUpdatePage();
} }
void VpnLogic::onRadioButtonVpnModeForwardSitesClicked() void VpnLogic::onRadioButtonVpnModeForwardSitesClicked()
{ {
m_settings.setRouteMode(Settings::VpnOnlyForwardSites); m_settings.setRouteMode(Settings::VpnOnlyForwardSites);
onUpdatePage();
} }
void VpnLogic::onRadioButtonVpnModeExceptSitesClicked() void VpnLogic::onRadioButtonVpnModeExceptSitesClicked()
{ {
m_settings.setRouteMode(Settings::VpnAllExceptSites); m_settings.setRouteMode(Settings::VpnAllExceptSites);
onUpdatePage();
} }
void VpnLogic::onBytesChanged(quint64 receivedData, quint64 sentData) void VpnLogic::onBytesChanged(quint64 receivedData, quint64 sentData)

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

@ -20,7 +20,6 @@ class VpnLogic : public PageLogicBase
AUTO_PROPERTY(bool, pushButtonConnectVisible) AUTO_PROPERTY(bool, pushButtonConnectVisible)
AUTO_PROPERTY(bool, widgetVpnModeEnabled) AUTO_PROPERTY(bool, widgetVpnModeEnabled)
AUTO_PROPERTY(QString, labelErrorText) AUTO_PROPERTY(QString, labelErrorText)
AUTO_PROPERTY(bool, pushButtonVpnAddSiteEnabled)
AUTO_PROPERTY(bool, radioButtonVpnModeAllSitesChecked) AUTO_PROPERTY(bool, radioButtonVpnModeAllSitesChecked)
AUTO_PROPERTY(bool, radioButtonVpnModeForwardSitesChecked) AUTO_PROPERTY(bool, radioButtonVpnModeForwardSitesChecked)

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

@ -273,7 +273,7 @@ PageBase {
width: parent.width - 40 width: parent.width - 40
height: GC.isMobile() ? 0: 40 height: GC.isMobile() ? 0: 40
text: qsTr("+ Add site") text: qsTr("+ Add site")
enabled: VpnLogic.pushButtonVpnAddSiteEnabled enabled: ! VpnLogic.radioButtonVpnModeAllSitesChecked
background: Rectangle { background: Rectangle {
anchors.fill: parent anchors.fill: parent
radius: 4 radius: 4