From d9ae10f5bc60837379d0ac014c76ce0e548e5cb1 Mon Sep 17 00:00:00 2001
From: pokamest <pokamest@gmail.com>
Date: Mon, 6 Sep 2021 12:29:56 +0300
Subject: [PATCH] qml ui fixes

---
 client/ui/pages_logic/StartPageLogic.cpp      | 33 ++-----------------
 client/ui/qml/Pages/PageSetupWizard.qml       | 12 +++----
 .../ui/qml/Pages/PageSetupWizardHighLevel.qml |  4 +--
 .../ui/qml/Pages/PageSetupWizardLowLevel.qml  |  2 +-
 .../ui/qml/Pages/PageSetupWizardVPNMode.qml   |  6 ++--
 5 files changed, 14 insertions(+), 43 deletions(-)

diff --git a/client/ui/pages_logic/StartPageLogic.cpp b/client/ui/pages_logic/StartPageLogic.cpp
index 41e344ad4..129f4cdc3 100644
--- a/client/ui/pages_logic/StartPageLogic.cpp
+++ b/client/ui/pages_logic/StartPageLogic.cpp
@@ -1,45 +1,16 @@
-//#include <QApplication>
-//#include <QClipboard>
-//#include <QDebug>
-//#include <QDesktopServices>
-//#include <QFileDialog>
-//#include <QHBoxLayout>
-//#include <QHostInfo>
-//#include <QItemSelectionModel>
-//#include <QJsonDocument>
-//#include <QJsonObject>
-//#include <QKeyEvent>
-//#include <QMenu>
-//#include <QMessageBox>
-//#include <QMetaEnum>
-//#include <QSysInfo>
-//#include <QThread>
-//#include <QTimer>
-//#include <QRegularExpression>
-//#include <QSaveFile>
-
-
-
-//#include "debug.h"
-//#include "defines.h"
 #include "StartPageLogic.h"
 #include "core/errorstrings.h"
-//#include "utils.h"
-//#include "vpnconnection.h"
-//#include <functional>
-
 #include "configurators/ssh_configurator.h"
+#include "../uilogic.h"
 
 using namespace amnezia;
 using namespace PageEnumNS;
 
-#include "../uilogic.h"
-
 
 StartPageLogic::StartPageLogic(UiLogic *uiLogic, QObject *parent):
     QObject(parent),
     m_uiLogic(uiLogic),
-    m_pushButtonNewServerConnectEnabled{},
+    m_pushButtonNewServerConnectEnabled{true},
     m_pushButtonNewServerConnectText{tr("Connect")},
     m_pushButtonNewServerConnectKeyChecked{false},
     m_lineEditStartExistingCodeText{},
diff --git a/client/ui/qml/Pages/PageSetupWizard.qml b/client/ui/qml/Pages/PageSetupWizard.qml
index 2000d1919..3db0ede61 100644
--- a/client/ui/qml/Pages/PageSetupWizard.qml
+++ b/client/ui/qml/Pages/PageSetupWizard.qml
@@ -89,9 +89,9 @@ Item {
             width: 331
             height: 25
             text: qsTr("High censorship level")
-            checked: UiLogic.radioButtonSetupWizardHighChecked
+            checked: WizardLogic.radioButtonSetupWizardHighChecked
             onCheckedChanged: {
-                UiLogic.radioButtonSetupWizardHighChecked = checked
+                WizardLogic.radioButtonSetupWizardHighChecked = checked
             }
         }
         RadioButtonType {
@@ -101,9 +101,9 @@ Item {
             width: 331
             height: 25
             text: qsTr("Low censorship level")
-            checked: UiLogic.radioButtonSetupWizardLowChecked
+            checked: WizardLogic.radioButtonSetupWizardLowChecked
             onCheckedChanged: {
-                UiLogic.radioButtonSetupWizardLowChecked = checked
+                WizardLogic.radioButtonSetupWizardLowChecked = checked
             }
         }
         RadioButtonType {
@@ -113,9 +113,9 @@ Item {
             width: 331
             height: 25
             text: qsTr("Medium censorship level")
-            checked: UiLogic.radioButtonSetupWizardMediumChecked
+            checked: WizardLogic.radioButtonSetupWizardMediumChecked
             onCheckedChanged: {
-                UiLogic.radioButtonSetupWizardMediumChecked = checked
+                WizardLogic.radioButtonSetupWizardMediumChecked = checked
             }
         }
     }
diff --git a/client/ui/qml/Pages/PageSetupWizardHighLevel.qml b/client/ui/qml/Pages/PageSetupWizardHighLevel.qml
index df88e83b7..a443819f5 100644
--- a/client/ui/qml/Pages/PageSetupWizardHighLevel.qml
+++ b/client/ui/qml/Pages/PageSetupWizardHighLevel.qml
@@ -63,7 +63,7 @@ Item {
             y: 360
             width: 301
             height: 41
-            text: UiLogic.lineEditSetupWizardHighWebsiteMaskingText
+            text: WizardLogic.lineEditSetupWizardHighWebsiteMaskingText
             onEditingFinished: {
                 let _text = website_masking.text
                 _text.replace("http://", "");
@@ -72,7 +72,7 @@ Item {
                     return
                 }
                 _text = _text.split("/").first();
-                UiLogic.lineEditSetupWizardHighWebsiteMaskingText = _text
+                WizardLogic.lineEditSetupWizardHighWebsiteMaskingText = _text
             }
             onAccepted: {
                 next_button.clicked()
diff --git a/client/ui/qml/Pages/PageSetupWizardLowLevel.qml b/client/ui/qml/Pages/PageSetupWizardLowLevel.qml
index 84caaa86f..08fff52cc 100644
--- a/client/ui/qml/Pages/PageSetupWizardLowLevel.qml
+++ b/client/ui/qml/Pages/PageSetupWizardLowLevel.qml
@@ -59,7 +59,7 @@ Item {
             height: 40
             text: qsTr("Start configuring")
             onClicked: {
-                UiLogic.onPushButtonSetupWizardLowFinishClicked()
+                WizardLogic.onPushButtonSetupWizardLowFinishClicked()
             }
         }
     }
diff --git a/client/ui/qml/Pages/PageSetupWizardVPNMode.qml b/client/ui/qml/Pages/PageSetupWizardVPNMode.qml
index c10f8b25d..23c31d466 100644
--- a/client/ui/qml/Pages/PageSetupWizardVPNMode.qml
+++ b/client/ui/qml/Pages/PageSetupWizardVPNMode.qml
@@ -41,9 +41,9 @@ Item {
             width: 301
             height: 71
             text: qsTr('Turn on mode "VPN for selected sites"')
-            checked: UiLogic.checkBoxSetupWizardVpnModeChecked
+            checked: WizardLogic.checkBoxSetupWizardVpnModeChecked
             onCheckedChanged: {
-                UiLogic.checkBoxSetupWizardVpnModeChecked = checked
+                WizardLogic.checkBoxSetupWizardVpnModeChecked = checked
             }
         }
         LabelType {
@@ -61,7 +61,7 @@ Item {
             height: 40
             text: qsTr("Start configuring")
             onClicked: {
-                UiLogic.onPushButtonSetupWizardVpnModeFinishClicked()
+                WizardLogic.onPushButtonSetupWizardVpnModeFinishClicked()
             }
         }
     }