Merge branch 'qt_migration' into feature/qt6-server-busy-notification

client/ui/pages_logic/AppSettingsLogic.cpp

@@ -1,6 +1,6 @@
 #include "AppSettingsLogic.h"
 
-#include "debug.h"
+#include "logger.h"
 #include "defines.h"
 #include "ui/qautostart.h"
 #include "ui/uilogic.h"
@@ -62,18 +62,18 @@ void AppSettingsLogic::onCheckBoxSaveLogsCheckedToggled(bool checked)
 
 void AppSettingsLogic::onPushButtonOpenLogsClicked()
 {
-    Debug::openLogsFolder();
+    Logger::openLogsFolder();
 }
 
 void AppSettingsLogic::onPushButtonExportLogsClicked()
 {
-    uiLogic()->saveTextFile(tr("Save log"), "AmneziaVPN.log", ".log", Debug::getLogFile());
+    uiLogic()->saveTextFile(tr("Save log"), "AmneziaVPN.log", ".log", Logger::getLogFile());
 }
 
 void AppSettingsLogic::onPushButtonClearLogsClicked()
 {
-    Debug::clearLogs();
-    Debug::clearServiceLogs();
+    Logger::clearLogs();
+    Logger::clearServiceLogs();
 }
 
 void AppSettingsLogic::onPushButtonBackupAppConfigClicked()

client/ui/pages_logic/VpnLogic.cpp

@@ -33,6 +33,8 @@ VpnLogic::VpnLogic(UiLogic *logic, QObject *parent):
     connect(this, &VpnLogic::connectToVpn, uiLogic()->m_vpnConnection, &VpnConnection::connectToVpn, Qt::QueuedConnection);
     connect(this, &VpnLogic::disconnectFromVpn, uiLogic()->m_vpnConnection, &VpnConnection::disconnectFromVpn, Qt::QueuedConnection);
 
+    connect(m_settings.get(), &Settings::saveLogsChanged, this, &VpnLogic::onUpdatePage);
+
     if (m_settings->isAutoConnect() && m_settings->defaultServerIndex() >= 0) {
         QTimer::singleShot(1000, this, [this](){
             set_pushButtonConnectEnabled(false);
@@ -88,6 +90,8 @@ void VpnLogic::onUpdatePage()
     }
     QString ver = QString("v. %2").arg(QString(APP_MAJOR_VERSION));
     set_labelVersionText(ver);
+
+    set_labelLogEnabledVisible(m_settings->isSaveLogs());
 }
 
 

client/ui/pages_logic/VpnLogic.h

@@ -34,6 +34,8 @@ class VpnLogic : public PageLogicBase
     AUTO_PROPERTY(bool, radioButtonVpnModeForwardSitesChecked)
     AUTO_PROPERTY(bool, radioButtonVpnModeExceptSitesChecked)
 
+    AUTO_PROPERTY(bool, labelLogEnabledVisible)
+
 public:
     Q_INVOKABLE void onUpdatePage() override;