From a9165aba25db9a7fdb2b570d422d419c4cd6044b Mon Sep 17 00:00:00 2001
From: pokamest <pokamest@gmail.com>
Date: Fri, 19 Nov 2021 13:57:00 +0300
Subject: [PATCH] VPN page fixes, TFTP page fix

---
 client/ui/pages_logic/VpnLogic.cpp             | 18 ++++++------------
 client/ui/pages_logic/VpnLogic.h               |  6 +++---
 .../protocols/OtherProtocolsLogic.cpp          |  4 +++-
 client/ui/qml/Pages/PageVPN.qml                | 16 +++-------------
 4 files changed, 15 insertions(+), 29 deletions(-)

diff --git a/client/ui/pages_logic/VpnLogic.cpp b/client/ui/pages_logic/VpnLogic.cpp
index dd0b10f3..b9faad95 100644
--- a/client/ui/pages_logic/VpnLogic.cpp
+++ b/client/ui/pages_logic/VpnLogic.cpp
@@ -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)
diff --git a/client/ui/pages_logic/VpnLogic.h b/client/ui/pages_logic/VpnLogic.h
index e3cce6a4..3a5d2811 100644
--- a/client/ui/pages_logic/VpnLogic.h
+++ b/client/ui/pages_logic/VpnLogic.h
@@ -29,9 +29,9 @@ class VpnLogic : public PageLogicBase
 public:
     Q_INVOKABLE void onUpdatePage() override;
 
-    Q_INVOKABLE void onRadioButtonVpnModeAllSitesToggled(bool checked);
-    Q_INVOKABLE void onRadioButtonVpnModeForwardSitesToggled(bool checked);
-    Q_INVOKABLE void onRadioButtonVpnModeExceptSitesToggled(bool checked);
+    Q_INVOKABLE void onRadioButtonVpnModeAllSitesClicked();
+    Q_INVOKABLE void onRadioButtonVpnModeForwardSitesClicked();
+    Q_INVOKABLE void onRadioButtonVpnModeExceptSitesClicked();
 
     Q_INVOKABLE void onPushButtonConnectClicked(bool checked);
 
diff --git a/client/ui/pages_logic/protocols/OtherProtocolsLogic.cpp b/client/ui/pages_logic/protocols/OtherProtocolsLogic.cpp
index 400cb5c1..98354ec6 100644
--- a/client/ui/pages_logic/protocols/OtherProtocolsLogic.cpp
+++ b/client/ui/pages_logic/protocols/OtherProtocolsLogic.cpp
@@ -90,7 +90,7 @@ void OtherProtocolsLogic::onPushButtonSftpMountDriveClicked()
 //            .arg(labelTftpPortText())
 //            .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 args = QString(
@@ -122,6 +122,8 @@ void OtherProtocolsLogic::onPushButtonSftpMountDriveClicked()
 
     //qDebug().noquote() << "onPushButtonSftpMountDriveClicked" << args;
 
+    set_pushButtonSftpMountEnabled(true);
+
 #endif
 }
 
diff --git a/client/ui/qml/Pages/PageVPN.qml b/client/ui/qml/Pages/PageVPN.qml
index 20fae41c..d4a17878 100644
--- a/client/ui/qml/Pages/PageVPN.qml
+++ b/client/ui/qml/Pages/PageVPN.qml
@@ -246,11 +246,7 @@ PageBase {
             height: 19
             checked: VpnLogic.radioButtonVpnModeAllSitesChecked
             text: qsTr("For all connections")
-            onCheckedChanged: {
-                VpnLogic.radioButtonVpnModeAllSitesChecked = checked
-                button_add_site.enabled = !checked
-                VpnLogic.onRadioButtonVpnModeAllSitesToggled(checked)
-            }
+            onClicked: VpnLogic.onRadioButtonVpnModeAllSitesClicked(true)
         }
         RadioButtonType {
             x: 0
@@ -259,10 +255,7 @@ PageBase {
             height: 19
             text: qsTr("Except selected sites")
             checked: VpnLogic.radioButtonVpnModeExceptSitesChecked
-            onCheckedChanged: {
-                VpnLogic.radioButtonVpnModeExceptSitesChecked = checked
-                VpnLogic.onRadioButtonVpnModeExceptSitesToggled(checked)
-            }
+            onClicked: VpnLogic.onRadioButtonVpnModeExceptSitesClicked(true)
         }
         RadioButtonType {
             x: 0
@@ -271,10 +264,7 @@ PageBase {
             height: 19
             text: qsTr("For selected sites")
             checked: VpnLogic.radioButtonVpnModeForwardSitesChecked
-            onCheckedChanged: {
-                VpnLogic.radioButtonVpnModeForwardSitesChecked = checked
-                VpnLogic.onRadioButtonVpnModeForwardSitesToggled(checked)
-            }
+            onClicked: VpnLogic.onRadioButtonVpnModeForwardSitesClicked(true)
         }
     }