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

VPN page fixes, TFTP page fix

Browse source
This commit is contained in:
pokamest 2021-11-19 13:57:00 +03:00
parent dde04ff979
commit a9165aba25
4 changed files with 15 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -55,25 +55,19 @@ void VpnLogic::onUpdatePage()
} }
void VpnLogic::onRadioButtonVpnModeAllSitesToggled(bool checked) void VpnLogic::onRadioButtonVpnModeAllSitesClicked()
{ {
if (checked) { m_settings.setRouteMode(Settings::VpnAllSites);
m_settings.setRouteMode(Settings::VpnAllSites);
}
} }
void VpnLogic::onRadioButtonVpnModeForwardSitesToggled(bool checked) void VpnLogic::onRadioButtonVpnModeForwardSitesClicked()
{ {
if (checked) { m_settings.setRouteMode(Settings::VpnOnlyForwardSites);
m_settings.setRouteMode(Settings::VpnOnlyForwardSites);
}
} }
void VpnLogic::onRadioButtonVpnModeExceptSitesToggled(bool checked) void VpnLogic::onRadioButtonVpnModeExceptSitesClicked()
{ {
if (checked) { m_settings.setRouteMode(Settings::VpnAllExceptSites);
m_settings.setRouteMode(Settings::VpnAllExceptSites);
}
} }
void VpnLogic::onBytesChanged(quint64 receivedData, quint64 sentData) void VpnLogic::onBytesChanged(quint64 receivedData, quint64 sentData)

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

@ -29,9 +29,9 @@ class VpnLogic : public PageLogicBase
public: public:
Q_INVOKABLE void onUpdatePage() override; Q_INVOKABLE void onUpdatePage() override;
Q_INVOKABLE void onRadioButtonVpnModeAllSitesToggled(bool checked); Q_INVOKABLE void onRadioButtonVpnModeAllSitesClicked();
Q_INVOKABLE void onRadioButtonVpnModeForwardSitesToggled(bool checked); Q_INVOKABLE void onRadioButtonVpnModeForwardSitesClicked();
Q_INVOKABLE void onRadioButtonVpnModeExceptSitesToggled(bool checked); Q_INVOKABLE void onRadioButtonVpnModeExceptSitesClicked();
Q_INVOKABLE void onPushButtonConnectClicked(bool checked); Q_INVOKABLE void onPushButtonConnectClicked(bool checked);

4
client/ui/pages_logic/protocols/OtherProtocolsLogic.cpp
View file

@ -90,7 +90,7 @@ void OtherProtocolsLogic::onPushButtonSftpMountDriveClicked()
// .arg(labelTftpPortText()) // .arg(labelTftpPortText())
// .arg(labelTftpPasswordText()); // .arg(labelTftpPasswordText());
p->setProgram("C:\\Program Files1\\SSHFS-Win\\bin\\sshfs.exe"); p->setProgram("C:\\Program Files\\SSHFS-Win\\bin\\sshfs.exe");
QString host = m_settings.serverCredentials(uiLogic()->selectedServerIndex).hostName; QString host = m_settings.serverCredentials(uiLogic()->selectedServerIndex).hostName;
QString args = QString( QString args = QString(
@ -122,6 +122,8 @@ void OtherProtocolsLogic::onPushButtonSftpMountDriveClicked()
//qDebug().noquote() << "onPushButtonSftpMountDriveClicked" << args; //qDebug().noquote() << "onPushButtonSftpMountDriveClicked" << args;
set_pushButtonSftpMountEnabled(true);
#endif #endif
} }

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

@ -246,11 +246,7 @@ PageBase {
height: 19 height: 19
checked: VpnLogic.radioButtonVpnModeAllSitesChecked checked: VpnLogic.radioButtonVpnModeAllSitesChecked
text: qsTr("For all connections") text: qsTr("For all connections")
onCheckedChanged: { onClicked: VpnLogic.onRadioButtonVpnModeAllSitesClicked(true)
VpnLogic.radioButtonVpnModeAllSitesChecked = checked
button_add_site.enabled = !checked
VpnLogic.onRadioButtonVpnModeAllSitesToggled(checked)
}
} }
RadioButtonType { RadioButtonType {
x: 0 x: 0
@ -259,10 +255,7 @@ PageBase {
height: 19 height: 19
text: qsTr("Except selected sites") text: qsTr("Except selected sites")
checked: VpnLogic.radioButtonVpnModeExceptSitesChecked checked: VpnLogic.radioButtonVpnModeExceptSitesChecked
onCheckedChanged: { onClicked: VpnLogic.onRadioButtonVpnModeExceptSitesClicked(true)
VpnLogic.radioButtonVpnModeExceptSitesChecked = checked
VpnLogic.onRadioButtonVpnModeExceptSitesToggled(checked)
}
} }
RadioButtonType { RadioButtonType {
x: 0 x: 0
@ -271,10 +264,7 @@ PageBase {
height: 19 height: 19
text: qsTr("For selected sites") text: qsTr("For selected sites")
checked: VpnLogic.radioButtonVpnModeForwardSitesChecked checked: VpnLogic.radioButtonVpnModeForwardSitesChecked
onCheckedChanged: { onClicked: VpnLogic.onRadioButtonVpnModeForwardSitesClicked(true)
VpnLogic.radioButtonVpnModeForwardSitesChecked = checked
VpnLogic.onRadioButtonVpnModeForwardSitesToggled(checked)
}
} }
} }