From 8e61d77497e09180d0036d4c73ce5f387eb2604c Mon Sep 17 00:00:00 2001
From: "vladimir.kuznetsov" <nethiuswork@gmail.com>
Date: Thu, 23 Mar 2023 17:49:36 +0300
Subject: [PATCH 001/278] added new controls elements (BasicButtonType,
 ImageButtonType, LabelWithButtonType, TextFieldWithHeaderType)

---
 client/fonts/pt-root-ui_vf.ttf                | Bin 0 -> 266616 bytes
 client/images/controls/arrow-right.svg        |   4 +
 client/images/controls/chevron-right.svg      |   3 +
 client/resources.qrc                          |   8 ++
 client/ui/pages.h                             |   2 +-
 client/ui/qml/Controls2/BasicButtonType.qml   |  57 ++++++++++
 client/ui/qml/Controls2/ImageButtonType.qml   |  44 ++++++++
 .../ui/qml/Controls2/LabelWithButtonType.qml  |  43 ++++++++
 .../qml/Controls2/TextFieldWithHeaderType.qml |  68 ++++++++++++
 client/ui/qml/Pages/PageTest.qml              | 104 ++++++++++++++++++
 client/ui/qml/Pages/PageVPN.qml               |   2 +-
 11 files changed, 333 insertions(+), 2 deletions(-)
 create mode 100644 client/fonts/pt-root-ui_vf.ttf
 create mode 100644 client/images/controls/arrow-right.svg
 create mode 100644 client/images/controls/chevron-right.svg
 create mode 100644 client/ui/qml/Controls2/BasicButtonType.qml
 create mode 100644 client/ui/qml/Controls2/ImageButtonType.qml
 create mode 100644 client/ui/qml/Controls2/LabelWithButtonType.qml
 create mode 100644 client/ui/qml/Controls2/TextFieldWithHeaderType.qml
 create mode 100644 client/ui/qml/Pages/PageTest.qml

diff --git a/client/fonts/pt-root-ui_vf.ttf b/client/fonts/pt-root-ui_vf.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..34e6f1f9b241fbfdc7e430a84ccbc394aabe68fa
GIT binary patch
literal 266616
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
KPo&rZV+Q~OH^k-u

literal 0
HcmV?d00001

diff --git a/client/images/controls/arrow-right.svg b/client/images/controls/arrow-right.svg
new file mode 100644
index 00000000..69b21b89
--- /dev/null
+++ b/client/images/controls/arrow-right.svg
@@ -0,0 +1,4 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M5 12H19" stroke="#CBCBCB" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M12 5L19 12L12 19" stroke="#CBCBCB" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/client/images/controls/chevron-right.svg b/client/images/controls/chevron-right.svg
new file mode 100644
index 00000000..726eabac
--- /dev/null
+++ b/client/images/controls/chevron-right.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M9 18L15 12L9 6" stroke="#CBCBCB" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/client/resources.qrc b/client/resources.qrc
index 67937bda..7a157e5a 100644
--- a/client/resources.qrc
+++ b/client/resources.qrc
@@ -165,5 +165,13 @@
         <file>ui/qml/Controls/PopupWithQuestion.qml</file>
         <file>ui/qml/Pages/PageAdvancedServerSettings.qml</file>
         <file>ui/qml/Controls/PopupWarning.qml</file>
+        <file>ui/qml/Controls2/BasicButtonType.qml</file>
+        <file>ui/qml/Controls2/TextFieldWithHeaderType.qml</file>
+        <file>ui/qml/Pages/PageTest.qml</file>
+        <file>fonts/pt-root-ui_vf.ttf</file>
+        <file>ui/qml/Controls2/LabelWithButtonType.qml</file>
+        <file>images/controls/arrow-right.svg</file>
+        <file>images/controls/chevron-right.svg</file>
+        <file>ui/qml/Controls2/ImageButtonType.qml</file>
     </qresource>
 </RCC>
diff --git a/client/ui/pages.h b/client/ui/pages.h
index dfc9a509..a639d63b 100644
--- a/client/ui/pages.h
+++ b/client/ui/pages.h
@@ -24,7 +24,7 @@ enum class Page {Start = 0, NewServer, NewServerProtocols, Vpn,
            Wizard, WizardLow, WizardMedium, WizardHigh, WizardVpnMode, ServerConfiguringProgress,
            GeneralSettings, AppSettings, NetworkSettings, ServerSettings,
            ServerContainers, ServersList, ShareConnection,  Sites,
-           ProtocolSettings, ProtocolShare, QrDecoder, QrDecoderIos, About, ViewConfig, AdvancedServerSettings};
+           ProtocolSettings, ProtocolShare, QrDecoder, QrDecoderIos, About, ViewConfig, AdvancedServerSettings, Test};
 Q_ENUM_NS(Page)
 
 static void declareQmlPageEnum() {
diff --git a/client/ui/qml/Controls2/BasicButtonType.qml b/client/ui/qml/Controls2/BasicButtonType.qml
new file mode 100644
index 00000000..7133d236
--- /dev/null
+++ b/client/ui/qml/Controls2/BasicButtonType.qml
@@ -0,0 +1,57 @@
+import QtQuick
+import QtQuick.Controls
+
+Button {
+    id: root
+
+    property string hoveredColor: "#C1C2C5"
+    property string defaultColor: "#D7D8DB"
+    property string disabledColor: "#494B50"
+    property string pressedColor: "#979799"
+
+    property string textColor: "#0E0E11"
+
+    property string borderColor: "#D7D8DB"
+    property int borderWidth: 0
+
+    implicitWidth: 328
+    implicitHeight: 56
+
+    hoverEnabled: true
+
+    background: Rectangle {
+        id: background
+        anchors.fill: parent
+        radius: 16
+        color: {
+            if (root.enabled) {
+                if(root.pressed) {
+                    return pressedColor
+                }
+                return hovered ? hoveredColor : defaultColor
+            } else {
+                return disabledColor
+            }
+        }
+        border.color: borderColor
+        border.width: borderWidth
+    }
+
+    MouseArea {
+        anchors.fill: background
+        enabled: false
+        cursorShape: Qt.PointingHandCursor
+    }
+
+    contentItem: Text {
+        anchors.fill: background
+        font.family: "PT Root UI"
+        font.styleName: "normal"
+        font.weight: 400
+        font.pixelSize: 16
+        color: textColor
+        text: root.text
+        horizontalAlignment: Text.AlignHCenter
+        verticalAlignment: Text.AlignVCenter
+    }
+}
diff --git a/client/ui/qml/Controls2/ImageButtonType.qml b/client/ui/qml/Controls2/ImageButtonType.qml
new file mode 100644
index 00000000..be1bd0e4
--- /dev/null
+++ b/client/ui/qml/Controls2/ImageButtonType.qml
@@ -0,0 +1,44 @@
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+
+Button {
+    id: root
+
+    property string image
+
+    property string hoveredColor: Qt.rgba(255, 255, 255, 0.08)
+    property string defaultColor: Qt.rgba(255, 255, 255, 0)
+    property string pressedColor: Qt.rgba(255, 255, 255, 0.12)
+
+    property string imageColor: "#878B91"
+
+    implicitWidth: 40
+    implicitHeight: 40
+
+    hoverEnabled: true
+
+    icon.source: image
+    icon.color: imageColor
+
+    background: Rectangle {
+        id: background
+
+        anchors.fill: parent
+        radius: 12
+        color: {
+            if (root.enabled) {
+                if(root.pressed) {
+                    return pressedColor
+                }
+                return hovered ? hoveredColor : defaultColor
+            }
+        }
+    }
+
+    MouseArea {
+        anchors.fill: parent
+        enabled: false
+        cursorShape: Qt.PointingHandCursor
+    }
+}
diff --git a/client/ui/qml/Controls2/LabelWithButtonType.qml b/client/ui/qml/Controls2/LabelWithButtonType.qml
new file mode 100644
index 00000000..c49d1e06
--- /dev/null
+++ b/client/ui/qml/Controls2/LabelWithButtonType.qml
@@ -0,0 +1,43 @@
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+
+Item {
+    id: root
+
+    property string text
+
+    property var onClickedFunc
+    property alias buttonImage : button.image
+
+    implicitWidth: 360
+    implicitHeight: 72
+
+    RowLayout {
+        anchors.fill: parent
+
+        Text {
+            font.family: "PT Root UI"
+            font.styleName: "normal"
+            font.pixelSize: 18
+            color: "#d7d8db"
+            text: root.text
+            horizontalAlignment: Text.AlignLeft
+            verticalAlignment: Text.AlignVCenter
+        }
+
+        ImageButtonType {
+            id: button
+
+            image: buttonImage
+            onClicked: {
+                if (onClickedFunc && typeof onClickedFunc === "function") {
+                    onClickedFunc()
+                }
+            }
+
+            Layout.alignment: Qt.AlignRight
+        }
+    }
+
+}
diff --git a/client/ui/qml/Controls2/TextFieldWithHeaderType.qml b/client/ui/qml/Controls2/TextFieldWithHeaderType.qml
new file mode 100644
index 00000000..18f62344
--- /dev/null
+++ b/client/ui/qml/Controls2/TextFieldWithHeaderType.qml
@@ -0,0 +1,68 @@
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+
+Item {
+    id: root
+
+    property string headerText
+    property string textFieldText
+    property bool textFieldEditable: true
+
+    implicitWidth: 328
+    implicitHeight: 74
+
+    Rectangle {
+        id: backgroud
+        anchors.fill: parent
+        color: "#1c1d21"
+        radius: 16
+        border.color: "#d7d8db"
+        border.width: textField.focus ? 1 : 0
+    }
+
+    ColumnLayout {
+        anchors.fill: backgroud
+
+        Text {
+            text: root.headerText
+            color: "#878b91"
+            font.pixelSize: 13
+            font.weight: 400
+            font.family: "PT Root UI VF"
+            font.letterSpacing: 0.02
+
+            height: 16
+            Layout.fillWidth: true
+            Layout.rightMargin: 16
+            Layout.leftMargin: 16
+            Layout.topMargin: 16
+        }
+
+        TextField {
+            id: textField
+
+            enabled: root.textFieldEditable
+            text: root.textFieldText
+            color: "#d7d8db"
+            font.pixelSize: 16
+            font.weight: 400
+            font.family: "PT Root UI VF"
+
+            height: 24
+            Layout.fillWidth: true
+            Layout.rightMargin: 16
+            Layout.leftMargin: 16
+            Layout.bottomMargin: 16
+            topPadding: 0
+            rightPadding: 0
+            leftPadding: 0
+            bottomPadding: 0
+
+            background: Rectangle {
+                anchors.fill: parent
+                color: "#1c1d21"
+            }
+        }
+    }
+}
diff --git a/client/ui/qml/Pages/PageTest.qml b/client/ui/qml/Pages/PageTest.qml
new file mode 100644
index 00000000..11b3ff1d
--- /dev/null
+++ b/client/ui/qml/Pages/PageTest.qml
@@ -0,0 +1,104 @@
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+import PageEnum 1.0
+import "./"
+import "../Controls"
+import "../Controls2"
+import "../Config"
+
+PageBase {
+    id: root
+    page: PageEnum.Test
+    logic: ViewConfigLogic
+
+    Rectangle {
+        y: 0
+        anchors.fill: parent
+        color: "#0E0E11"
+    }
+
+    FlickableType {
+        id: fl
+        anchors.top: root.top
+        anchors.bottom: root.bottom
+        contentHeight: content.height
+
+        ColumnLayout {
+            id: content
+            enabled: true
+            anchors.top: parent.top
+            anchors.left: parent.left
+            anchors.right: parent.right
+            anchors.rightMargin: 15
+
+            BasicButtonType {
+                Layout.fillWidth: true
+                Layout.topMargin: 10
+                text: qsTr("Forget this server")
+
+//                onClicked: {
+//                    UiLogic.goToPage(PageEnum.Start)
+//                }
+            }
+
+            BasicButtonType {
+                Layout.fillWidth: true
+                Layout.topMargin: 10
+
+                defaultColor: "#0E0E11"
+                hoveredColor: Qt.rgba(255, 255, 255, 0.08)
+                pressedColor: Qt.rgba(255, 255, 255, 0.12)
+                disabledColor: "#878B91"
+                textColor: "#D7D8DB"
+                borderWidth: 1
+
+                text: qsTr("Forget this server")
+
+//                onClicked: {
+//                    UiLogic.goToPage(PageEnum.Start)
+//                }
+            }
+
+            TextFieldWithHeaderType {
+                Layout.fillWidth: true
+                Layout.topMargin: 10
+                headerText: "Server IP adress [:port]"
+            }
+
+            LabelWithButtonType {
+                id: ip
+                Layout.fillWidth: true
+                Layout.topMargin: 10
+
+                text: "IP, логин и пароль от сервера"
+                buttonImage: "qrc:/images/controls/chevron-right.svg"
+
+//                onClickedFunc: function() {
+//                    UiLogic.goToPage(PageEnum.Start)
+//                }
+            }
+            Rectangle {
+                Layout.fillWidth: true
+                height: 1
+                color: "#2C2D30"
+            }
+            LabelWithButtonType {
+                Layout.fillWidth: true
+                Layout.topMargin: 10
+
+                text: "QR-код, ключ или файл настроек"
+                buttonImage: "qrc:/images/controls/chevron-right.svg"
+
+//                onClickedFunc: function() {
+//                    UiLogic.goToPage(PageEnum.Start)
+//                }
+            }
+            Rectangle {
+                Layout.fillWidth: true
+                height: 1
+                color: "#2C2D30"
+            }
+        }
+    }
+}
diff --git a/client/ui/qml/Pages/PageVPN.qml b/client/ui/qml/Pages/PageVPN.qml
index 342fb129..0e6f5078 100644
--- a/client/ui/qml/Pages/PageVPN.qml
+++ b/client/ui/qml/Pages/PageVPN.qml
@@ -39,7 +39,7 @@ PageBase {
         label.text: qsTr("Donate")
 
         onClicked: {
-            UiLogic.goToPage(PageEnum.About)
+            UiLogic.goToPage(PageEnum.Test)
         }
     }
 

From 167d57408dea255c1e881356192dbd4698181c77 Mon Sep 17 00:00:00 2001
From: "vladimir.kuznetsov" <nethiuswork@gmail.com>
Date: Thu, 6 Apr 2023 16:33:53 +0300
Subject: [PATCH 002/278] added CardType component

- added transition for BasicButtonType
---
 client/resources.qrc                        |   1 +
 client/ui/qml/Controls2/BasicButtonType.qml |   4 +
 client/ui/qml/Controls2/CardType.qml        | 118 ++++++++++++++++++++
 client/ui/qml/Pages/PageTest.qml            |  20 +++-
 4 files changed, 142 insertions(+), 1 deletion(-)
 create mode 100644 client/ui/qml/Controls2/CardType.qml

diff --git a/client/resources.qrc b/client/resources.qrc
index 7a157e5a..9280e2b2 100644
--- a/client/resources.qrc
+++ b/client/resources.qrc
@@ -173,5 +173,6 @@
         <file>images/controls/arrow-right.svg</file>
         <file>images/controls/chevron-right.svg</file>
         <file>ui/qml/Controls2/ImageButtonType.qml</file>
+        <file>ui/qml/Controls2/CardType.qml</file>
     </qresource>
 </RCC>
diff --git a/client/ui/qml/Controls2/BasicButtonType.qml b/client/ui/qml/Controls2/BasicButtonType.qml
index 7133d236..cbb664e4 100644
--- a/client/ui/qml/Controls2/BasicButtonType.qml
+++ b/client/ui/qml/Controls2/BasicButtonType.qml
@@ -35,6 +35,10 @@ Button {
         }
         border.color: borderColor
         border.width: borderWidth
+
+        Behavior on color {
+            PropertyAnimation { duration: 200 }
+        }
     }
 
     MouseArea {
diff --git a/client/ui/qml/Controls2/CardType.qml b/client/ui/qml/Controls2/CardType.qml
new file mode 100644
index 00000000..cd7320be
--- /dev/null
+++ b/client/ui/qml/Controls2/CardType.qml
@@ -0,0 +1,118 @@
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+
+RadioButton {
+    id: root
+
+    property string headerText
+    property string bodyText
+    property string footerText
+
+    property string hoveredColor: Qt.rgba(255, 255, 255, 0)
+    property string defaultColor: Qt.rgba(255, 255, 255, 0.05)
+    property string disabledColor: Qt.rgba(255, 255, 255, 0)
+    property string pressedColor: Qt.rgba(255, 255, 255, 0.05)
+
+    property string textColor: "#0E0E11"
+
+    property string pressedBorderColor: Qt.rgba(251, 178, 106, 0.3)
+    property string hoveredBorderColor: Qt.rgba(251, 178, 106, 1)
+    property int borderWidth: 0
+
+    implicitWidth: content.implicitWidth
+    implicitHeight: content.implicitHeight
+
+    hoverEnabled: true
+
+    indicator: Rectangle {
+        anchors.fill: parent
+        radius: 16
+
+        color: {
+            if (root.enabled) {
+                if(root.checked) {
+                    return pressedColor
+                }
+                return hovered ? hoveredColor : defaultColor
+            } else {
+                return disabledColor
+            }
+        }
+        border.color: {
+            if (root.enabled) {
+                if(root.checked) {
+                    return pressedBorderColor
+                }
+                return hovered ? hoveredBorderColor : defaultColor
+            } else {
+                return disabledColor
+            }
+        }
+        border.width: {
+            if (root.enabled) {
+                if(root.checked) {
+                    return 1
+                }
+                return hovered ? 1 : 0
+            } else {
+                return 0
+            }
+        }
+
+        Behavior on color {
+            PropertyAnimation { duration: 200 }
+        }
+    }
+
+    ColumnLayout {
+        id: content
+        anchors.fill: parent
+        spacing: 16
+
+        Text {
+            text: root.headerText
+            color: "#878b91"
+            font.pixelSize: 25
+            font.weight: 700
+            font.family: "PT Root UI VF"
+
+            height: 30
+            Layout.fillWidth: true
+            Layout.rightMargin: 16
+            Layout.leftMargin: 16
+            Layout.topMargin: 16
+        }
+
+        Text {
+            text: root.bodyText
+            wrapMode: Text.WordWrap
+            color: "#878b91"
+            font.pixelSize: 16
+            font.weight: 400
+            font.family: "PT Root UI VF"
+
+            height: 24
+            Layout.fillWidth: true
+            Layout.rightMargin: 16
+            Layout.leftMargin: 16
+            Layout.bottomMargin: root.footerText !== "" ? 0 : 16
+        }
+
+        Text {
+            text: root.footerText
+            visible: root.footerText !== ""
+            enabled: root.footerText !== ""
+            color: "#878b91"
+            font.pixelSize: 13
+            font.weight: 400
+            font.family: "PT Root UI VF"
+
+            height: 16
+            Layout.fillWidth: true
+            Layout.rightMargin: 16
+            Layout.leftMargin: 16
+            Layout.bottomMargin: 16
+        }
+    }
+}
diff --git a/client/ui/qml/Pages/PageTest.qml b/client/ui/qml/Pages/PageTest.qml
index 11b3ff1d..dc3cc69b 100644
--- a/client/ui/qml/Pages/PageTest.qml
+++ b/client/ui/qml/Pages/PageTest.qml
@@ -46,7 +46,7 @@ PageBase {
                 Layout.fillWidth: true
                 Layout.topMargin: 10
 
-                defaultColor: "#0E0E11"
+                defaultColor: "transparent"
                 hoveredColor: Qt.rgba(255, 255, 255, 0.08)
                 pressedColor: Qt.rgba(255, 255, 255, 0.12)
                 disabledColor: "#878B91"
@@ -99,6 +99,24 @@ PageBase {
                 height: 1
                 color: "#2C2D30"
             }
+
+            CardType {
+                Layout.fillWidth: true
+                Layout.topMargin: 10
+
+                headerText: "Высокий"
+                bodyText: "Многие иностранные сайты и VPN-провайдеры заблокированы"
+                footerText: "футер"
+            }
+
+            CardType {
+                Layout.fillWidth: true
+                Layout.topMargin: 10
+
+                headerText: "Высокий"
+                bodyText: "Многие иностранные сайты и VPN-провайдеры заблокированы"
+                footerText: "футер"
+            }
         }
     }
 }

From c74c5e0c6d137209985baf2ecf735edc70e63171 Mon Sep 17 00:00:00 2001
From: "vladimir.kuznetsov" <nethiuswork@gmail.com>
Date: Fri, 7 Apr 2023 20:50:55 +0300
Subject: [PATCH 003/278] added CheckBoxType

- added hover effect to LabelWithButtonType
---
 client/images/controls/check.svg              |  3 +
 client/resources.qrc                          |  2 +
 client/ui/qml/Controls2/CardType.qml          | 19 ++---
 client/ui/qml/Controls2/CheckBoxType.qml      | 77 +++++++++++++++++++
 client/ui/qml/Controls2/ImageButtonType.qml   |  5 +-
 .../ui/qml/Controls2/LabelWithButtonType.qml  | 33 ++++++++
 client/ui/qml/Pages/PageTest.qml              |  4 +
 7 files changed, 133 insertions(+), 10 deletions(-)
 create mode 100644 client/images/controls/check.svg
 create mode 100644 client/ui/qml/Controls2/CheckBoxType.qml

diff --git a/client/images/controls/check.svg b/client/images/controls/check.svg
new file mode 100644
index 00000000..16b4c0da
--- /dev/null
+++ b/client/images/controls/check.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M20 6L9 17L4 12" stroke="#CBCBCB" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/client/resources.qrc b/client/resources.qrc
index 9280e2b2..bda89bf2 100644
--- a/client/resources.qrc
+++ b/client/resources.qrc
@@ -174,5 +174,7 @@
         <file>images/controls/chevron-right.svg</file>
         <file>ui/qml/Controls2/ImageButtonType.qml</file>
         <file>ui/qml/Controls2/CardType.qml</file>
+        <file>ui/qml/Controls2/CheckBoxType.qml</file>
+        <file>images/controls/check.svg</file>
     </qresource>
 </RCC>
diff --git a/client/ui/qml/Controls2/CardType.qml b/client/ui/qml/Controls2/CardType.qml
index cd7320be..31b51f31 100644
--- a/client/ui/qml/Controls2/CardType.qml
+++ b/client/ui/qml/Controls2/CardType.qml
@@ -9,15 +9,16 @@ RadioButton {
     property string bodyText
     property string footerText
 
-    property string hoveredColor: Qt.rgba(255, 255, 255, 0)
-    property string defaultColor: Qt.rgba(255, 255, 255, 0.05)
+    property string hoveredColor: Qt.rgba(255, 255, 255, 0.05)
+    property string defaultColor: Qt.rgba(255, 255, 255, 0)
     property string disabledColor: Qt.rgba(255, 255, 255, 0)
     property string pressedColor: Qt.rgba(255, 255, 255, 0.05)
 
     property string textColor: "#0E0E11"
 
     property string pressedBorderColor: Qt.rgba(251, 178, 106, 0.3)
-    property string hoveredBorderColor: Qt.rgba(251, 178, 106, 1)
+    property string hoveredBorderColor: "transparent"
+    property string defaultBodredColor: "#FBB26A"
     property int borderWidth: 0
 
     implicitWidth: content.implicitWidth
@@ -44,9 +45,9 @@ RadioButton {
                 if(root.checked) {
                     return pressedBorderColor
                 }
-                return hovered ? hoveredBorderColor : defaultColor
+                return hovered ? hoveredBorderColor : defaultBodredColor
             } else {
-                return disabledColor
+                return defaultBodredColor
             }
         }
         border.width: {
@@ -54,7 +55,7 @@ RadioButton {
                 if(root.checked) {
                     return 1
                 }
-                return hovered ? 1 : 0
+                return hovered ? 0 : 1
             } else {
                 return 0
             }
@@ -72,7 +73,7 @@ RadioButton {
 
         Text {
             text: root.headerText
-            color: "#878b91"
+            color: "#D7D8DB"
             font.pixelSize: 25
             font.weight: 700
             font.family: "PT Root UI VF"
@@ -87,7 +88,7 @@ RadioButton {
         Text {
             text: root.bodyText
             wrapMode: Text.WordWrap
-            color: "#878b91"
+            color: "#D7D8DB"
             font.pixelSize: 16
             font.weight: 400
             font.family: "PT Root UI VF"
@@ -103,7 +104,7 @@ RadioButton {
             text: root.footerText
             visible: root.footerText !== ""
             enabled: root.footerText !== ""
-            color: "#878b91"
+            color: "#878B91"
             font.pixelSize: 13
             font.weight: 400
             font.family: "PT Root UI VF"
diff --git a/client/ui/qml/Controls2/CheckBoxType.qml b/client/ui/qml/Controls2/CheckBoxType.qml
new file mode 100644
index 00000000..1cd46143
--- /dev/null
+++ b/client/ui/qml/Controls2/CheckBoxType.qml
@@ -0,0 +1,77 @@
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+
+Item {
+    id: root
+
+    implicitWidth: content.implicitWidth
+    implicitHeight: content.implicitHeight
+
+    RowLayout {
+        id: content
+
+        anchors.fill: parent
+
+        CheckBox {
+            id: checkBox
+
+            implicitWidth: 56
+            implicitHeight: 56
+
+            indicator: Image {
+                id: indicator
+                anchors.verticalCenter: checkBox.verticalCenter
+                anchors.horizontalCenter: checkBox.horizontalCenter
+                source: checkBox.checked ? "qrc:/images/controls/check.svg" : ""
+            }
+            Rectangle {
+                anchors.verticalCenter: checkBox.verticalCenter
+                anchors.horizontalCenter: checkBox.horizontalCenter
+                width: 24
+                height: 24
+                color: "transparent"
+                border.color: "#FBB26A"
+                border.width: 1
+                radius: 4
+            }
+            background: Rectangle {
+                id: background
+                color: Qt.rgba(255, 255, 255, 0.05)
+                radius: 16
+            }
+        }
+
+        ColumnLayout {
+            Text {
+                text: "Paragraph"
+                color: "#D7D8DB"
+                font.pixelSize: 18
+                font.weight: 400
+                font.family: "PT Root UI VF"
+
+                height: 22
+                Layout.fillWidth: true
+            }
+
+            Text {
+                text: "Caption"
+                color: "#878b91"
+                font.pixelSize: 13
+                font.weight: 400
+                font.family: "PT Root UI VF"
+                font.letterSpacing: 0.02
+
+                height: 16
+                Layout.fillWidth: true
+            }
+        }
+    }
+    MouseArea {
+        anchors.fill: parent
+        cursorShape: Qt.PointingHandCursor
+        onClicked: {
+            checkBox.checked = !checkBox.checked
+        }
+    }
+}
diff --git a/client/ui/qml/Controls2/ImageButtonType.qml b/client/ui/qml/Controls2/ImageButtonType.qml
index be1bd0e4..b6262906 100644
--- a/client/ui/qml/Controls2/ImageButtonType.qml
+++ b/client/ui/qml/Controls2/ImageButtonType.qml
@@ -8,7 +8,7 @@ Button {
     property string image
 
     property string hoveredColor: Qt.rgba(255, 255, 255, 0.08)
-    property string defaultColor: Qt.rgba(255, 255, 255, 0)
+    property string defaultColor: "transparent"
     property string pressedColor: Qt.rgba(255, 255, 255, 0.12)
 
     property string imageColor: "#878B91"
@@ -34,6 +34,9 @@ Button {
                 return hovered ? hoveredColor : defaultColor
             }
         }
+        Behavior on color {
+            PropertyAnimation { duration: 200 }
+        }
     }
 
     MouseArea {
diff --git a/client/ui/qml/Controls2/LabelWithButtonType.qml b/client/ui/qml/Controls2/LabelWithButtonType.qml
index c49d1e06..5da4db5f 100644
--- a/client/ui/qml/Controls2/LabelWithButtonType.qml
+++ b/client/ui/qml/Controls2/LabelWithButtonType.qml
@@ -29,6 +29,7 @@ Item {
         ImageButtonType {
             id: button
 
+            hoverEnabled: false
             image: buttonImage
             onClicked: {
                 if (onClickedFunc && typeof onClickedFunc === "function") {
@@ -37,7 +38,39 @@ Item {
             }
 
             Layout.alignment: Qt.AlignRight
+
+            Rectangle {
+                id: imageBackground
+                anchors.fill: button
+                radius: 12
+                color: "transparent"
+
+
+                Behavior on color {
+                    PropertyAnimation { duration: 200 }
+                }
+            }
         }
     }
+    MouseArea {
+        anchors.fill: parent
+        cursorShape: Qt.PointingHandCursor
+        hoverEnabled: true
 
+        onEntered: {
+            imageBackground.color = button.hoveredColor
+        }
+
+        onExited: {
+            imageBackground.color = button.defaultColor
+        }
+
+        onPressedChanged: {
+            imageBackground.color = pressed ? button.pressedColor : entered ? button.hoveredColor : button.defaultColor
+        }
+
+        onClicked: {
+            button.clicked()
+        }
+    }
 }
diff --git a/client/ui/qml/Pages/PageTest.qml b/client/ui/qml/Pages/PageTest.qml
index dc3cc69b..9f820389 100644
--- a/client/ui/qml/Pages/PageTest.qml
+++ b/client/ui/qml/Pages/PageTest.qml
@@ -117,6 +117,10 @@ PageBase {
                 bodyText: "Многие иностранные сайты и VPN-провайдеры заблокированы"
                 footerText: "футер"
             }
+
+            CheckBoxType {
+//                text: qsTr("Auto-negotiate encryption")
+            }
         }
     }
 }

From ec96c1b53437e77d12a48f31f8442dd83e0a20bb Mon Sep 17 00:00:00 2001
From: "vladimir.kuznetsov" <nethiuswork@gmail.com>
Date: Mon, 10 Apr 2023 06:43:36 +0300
Subject: [PATCH 004/278] added hover and pressed effects for CheckBoxType.qml

---
 client/ui/qml/Controls2/CheckBoxType.qml | 54 ++++++++++++++++++++++--
 1 file changed, 50 insertions(+), 4 deletions(-)

diff --git a/client/ui/qml/Controls2/CheckBoxType.qml b/client/ui/qml/Controls2/CheckBoxType.qml
index 1cd46143..c547a8e4 100644
--- a/client/ui/qml/Controls2/CheckBoxType.qml
+++ b/client/ui/qml/Controls2/CheckBoxType.qml
@@ -1,10 +1,24 @@
 import QtQuick
 import QtQuick.Controls
 import QtQuick.Layouts
+import Qt5Compat.GraphicalEffects
 
 Item {
     id: root
 
+    property string hoveredColor: Qt.rgba(255, 255, 255, 0.05)
+    property string defaultColor: "transparent"
+    property string pressedColor: Qt.rgba(255, 255, 255, 0.05)
+
+    property string defaultBorderColor: "#D7D8DB"
+    property string checkedBorderColor: "#FBB26A"
+
+    property string checkedImageColor: "#FBB26A"
+    property string hoveredImageColor: "#A85809"
+    property string defaultImageColor: "transparent"
+
+    property string imageSource: "qrc:/images/controls/check.svg"
+
     implicitWidth: content.implicitWidth
     implicitHeight: content.implicitHeight
 
@@ -23,22 +37,35 @@ Item {
                 id: indicator
                 anchors.verticalCenter: checkBox.verticalCenter
                 anchors.horizontalCenter: checkBox.horizontalCenter
-                source: checkBox.checked ? "qrc:/images/controls/check.svg" : ""
+                ColorOverlay {
+                    id: imageColor
+                    anchors.fill: indicator
+                    source: indicator
+                }
             }
+
             Rectangle {
+                id: imageBorder
+
                 anchors.verticalCenter: checkBox.verticalCenter
                 anchors.horizontalCenter: checkBox.horizontalCenter
                 width: 24
                 height: 24
                 color: "transparent"
-                border.color: "#FBB26A"
+                border.color: checkBox.checked ? checkedBorderColor : defaultBorderColor
                 border.width: 1
                 radius: 4
             }
+
             background: Rectangle {
-                id: background
-                color: Qt.rgba(255, 255, 255, 0.05)
+                id: checkBoxBackground
                 radius: 16
+
+                color: "transparent"
+
+                Behavior on color {
+                    PropertyAnimation { duration: 200 }
+                }
             }
         }
 
@@ -70,8 +97,27 @@ Item {
     MouseArea {
         anchors.fill: parent
         cursorShape: Qt.PointingHandCursor
+        hoverEnabled: true
+
+        onEntered: {
+            checkBoxBackground.color = hoveredColor
+        }
+
+        onExited: {
+            checkBoxBackground.color = defaultColor
+        }
+
+        onPressedChanged: {
+            indicator.source = pressed ? imageSource : ""
+            imageColor.color = pressed ? hoveredImageColor : defaultImageColor
+            checkBoxBackground.color = pressed ? pressedColor : entered ? hoveredColor : defaultColor
+        }
+
         onClicked: {
             checkBox.checked = !checkBox.checked
+            indicator.source = checkBox.checked ? imageSource : ""
+            imageColor.color = checkBox.checked ? checkedImageColor : defaultImageColor
+            imageBorder.border.color = checkBox.checked ? checkedBorderColor : defaultBorderColor
         }
     }
 }

From 905a3a30f37b299580dd94fdba818997085303be Mon Sep 17 00:00:00 2001
From: "vladimir.kuznetsov" <nethiuswork@gmail.com>
Date: Wed, 12 Apr 2023 19:13:41 +0300
Subject: [PATCH 005/278] added some new controls and started layout of
 pageStart and pageCredentials

---
 client/amnezia_application.cpp                |   2 +-
 client/images/amneziaBigLogo.png              | Bin 0 -> 25211 bytes
 client/images/amneziaBigLogo.svg              |   1 +
 client/images/controls/arrow-left.svg         |   4 +
 client/resources.qrc                          |  12 ++
 client/ui/pages.h                             |   2 +-
 client/ui/qml/Controls2/BodyTextType.qml      |  12 ++
 client/ui/qml/Controls2/DropDownType.qml      |   5 +
 client/ui/qml/Controls2/FlickableType.qml     |  23 +++
 client/ui/qml/Controls2/Header2TextType.qml   |  10 ++
 client/ui/qml/Controls2/HeaderTextType.qml    |  40 +++++
 .../qml/Controls2/TextFieldWithHeaderType.qml |   4 +
 client/ui/qml/PageLoader.qml                  |  57 ++++++
 client/ui/qml/Pages/PageTest.qml              |   1 -
 client/ui/qml/Pages2/PageCredentials.qml      |  83 +++++++++
 client/ui/qml/Pages2/PageStart.qml            | 163 ++++++++++++++++++
 client/ui/qml/main.qml                        |   1 -
 client/ui/qml/main2.qml                       | 142 +++++++++++++++
 18 files changed, 558 insertions(+), 4 deletions(-)
 create mode 100644 client/images/amneziaBigLogo.png
 create mode 100644 client/images/amneziaBigLogo.svg
 create mode 100644 client/images/controls/arrow-left.svg
 create mode 100644 client/ui/qml/Controls2/BodyTextType.qml
 create mode 100644 client/ui/qml/Controls2/DropDownType.qml
 create mode 100644 client/ui/qml/Controls2/FlickableType.qml
 create mode 100644 client/ui/qml/Controls2/Header2TextType.qml
 create mode 100644 client/ui/qml/Controls2/HeaderTextType.qml
 create mode 100644 client/ui/qml/PageLoader.qml
 create mode 100644 client/ui/qml/Pages2/PageCredentials.qml
 create mode 100644 client/ui/qml/Pages2/PageStart.qml
 create mode 100644 client/ui/qml/main2.qml

diff --git a/client/amnezia_application.cpp b/client/amnezia_application.cpp
index 588854d3..3fb76be2 100644
--- a/client/amnezia_application.cpp
+++ b/client/amnezia_application.cpp
@@ -92,7 +92,7 @@ void AmneziaApplication::init()
     m_engine = new QQmlApplicationEngine;
     m_uiLogic = new UiLogic(m_settings, m_configurator, m_serverController);
 
-    const QUrl url(QStringLiteral("qrc:/ui/qml/main.qml"));
+    const QUrl url(QStringLiteral("qrc:/ui/qml/main2.qml"));
     QObject::connect(m_engine, &QQmlApplicationEngine::objectCreated,
                      this, [url](QObject *obj, const QUrl &objUrl) {
         if (!obj && url == objUrl)
diff --git a/client/images/amneziaBigLogo.png b/client/images/amneziaBigLogo.png
new file mode 100644
index 0000000000000000000000000000000000000000..35a45f3b78807c74143c2fd3b430b8e406880448
GIT binary patch
literal 25211
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

literal 0
HcmV?d00001

diff --git a/client/images/amneziaBigLogo.svg b/client/images/amneziaBigLogo.svg
new file mode 100644
index 00000000..c50c7743
--- /dev/null
+++ b/client/images/amneziaBigLogo.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="360" height="301" fill="none"><g clip-path="url(#a)"><g filter="url(#b)"><path fill="url(#c)" d="M48 51.143h252v206.571H48z"/></g><mask id="d" width="245" height="65" x="48" y="179" maskUnits="userSpaceOnUse" style="mask-type:alpha"><g fill="#fff"><path d="M103.324 180.546c.347.454.561.802.641 1.042.027.08.04.174.04.281 0 .16-.04.334-.12.521-.081.24-.187.494-.321.761a5.131 5.131 0 0 1-.401.682c-.133.213-.28.467-.441.761-.16.267-.28.521-.36.762-.107.213-.214.4-.321.561-.08.16-.147.24-.2.24-.054 0-.174.134-.361.401a9.61 9.61 0 0 0-.601.882c-.214.374-.414.721-.602 1.042-.187.32-.32.548-.4.681-.08.107-.187.307-.32.601-.108.268-.228.548-.362.842-.133.321-.28.615-.44.882-.134.267-.254.454-.361.561-.107.107-.227.321-.361.641a46.55 46.55 0 0 0-.32 1.002c-.107.374-.214.695-.321.962-.107.267-.2.414-.28.441a.387.387 0 0 0-.201.16.76.76 0 0 0-.04.241c0 .214-.28.962-.842 2.244a99.418 99.418 0 0 1-1.964 4.289 48.185 48.185 0 0 0-.882 1.924c-.213.534-.32.828-.32.881 0 .08-.094.321-.28.722-.161.374-.361.788-.602 1.242a70.073 70.073 0 0 0-2.204 4.69c-.268.641-.401 1.015-.401 1.122 0 .053.04.133.12.24.08.107.174.187.28.241.188.107.281.2.281.28.027.054-.026.12-.16.201-.134.08-.2.16-.2.24 0 .054.04.107.12.16.187.134.28.254.28.361 0 .134-.16.267-.48.401a1.073 1.073 0 0 0-.361.24c-.107.107-.16.214-.16.321 0 .16-.068.241-.201.241a.75.75 0 0 1-.24-.041.365.365 0 0 0-.16-.04c-.135 0-.282.094-.442.281-.133.16-.347.561-.641 1.202-.214.428-.414.855-.601 1.283-.16.401-.268.695-.32.882a3.03 3.03 0 0 1-.201.521c-.08.16-.147.28-.2.36-.054.107-.215.481-.482 1.123-.267.641-.588 1.402-.962 2.284a88.704 88.704 0 0 1-1.002 2.445c-.294.748-.507 1.242-.64 1.483-.108.214-.201.454-.281.721-.08.241-.12.428-.12.562 0 .133-.027.293-.08.48a2.085 2.085 0 0 1-.121.481c-.08.134-.214.401-.4.802-.161.401-.348.842-.562 1.323-.347.855-.601 1.322-.761 1.402h-.04c-.027 0-.04-.026-.04-.08 0-.133.08-.454.24-.962.107-.347.16-.614.16-.801v-.08l-.04-.081c-.053 0-.133.134-.24.401a1.69 1.69 0 0 1-.28.441c-.108.16-.215.307-.322.441a6.769 6.769 0 0 0-.4.441c-.134.16-.24.307-.321.441-.107.187-.187.28-.24.28h-.12c-.027 0-.161-.147-.401-.441-.214-.213-.348-.44-.401-.681a1.177 1.177 0 0 1-.08-.441c0-.107.013-.227.04-.361v-.28c0-.187-.027-.401-.08-.641a2.823 2.823 0 0 0-.16-.682c-.161-.267-.241-.494-.241-.681a.38.38 0 0 1 .16-.321c.053-.107.093-.227.12-.36l.04-.201-.04-.16a.66.66 0 0 1-.04-.201c0-.16.094-.28.28-.36a.933.933 0 0 0 .241-.161.352.352 0 0 0 .04-.16v-.04c-.026-.027-.04-.053-.04-.08 0-.054.013-.094.04-.12a.932.932 0 0 1 .24-.161.356.356 0 0 0 .241-.2.774.774 0 0 0 .12-.401c0-.107.027-.227.08-.361.054-.16.12-.28.201-.36.107-.134.227-.441.36-.922.161-.508.281-1.015.361-1.523.08-.348.12-.615.12-.802a.444.444 0 0 0-.04-.2v-.04c0-.08.04-.201.12-.361.081-.16.201-.321.362-.481.24-.267.467-.601.68-1.002a7.87 7.87 0 0 0 .562-1.202c.08-.241.12-.428.12-.561a.448.448 0 0 0-.04-.201.355.355 0 0 1-.04-.16v-.04c.027-.054.094-.08.2-.08.107 0 .16-.027.16-.081 0-.026-.013-.053-.04-.08-.026-.026-.04-.066-.04-.12v-.12a.64.64 0 0 1 .161-.241c.107-.133.16-.253.16-.36a.385.385 0 0 0-.12-.281c-.133-.107-.334-.187-.601-.24h-.24c-.16 0-.348.013-.562.04-.187.026-.32.107-.4.24-.054.08-.214.147-.481.201-.188.026-.388.04-.602.04h-.32c-.374 0-.762.013-1.163.04a7.784 7.784 0 0 0-.961.12l-1.083.12c-.48.054-.962.08-1.442.08-1.524.081-2.552.201-3.087.361-.454.16-.681.388-.681.681 0 .054.013.107.04.161 0 .053-.027.093-.08.12a.442.442 0 0 1-.2.04h-.04c-.08 0-.148.04-.201.12a.947.947 0 0 0-.12.361 2.692 2.692 0 0 1-.24.842 2.593 2.593 0 0 1-.482.681c-.16.134-.307.2-.44.2h-.12c-.134 0-.308.081-.522.241-.187.16-.36.347-.52.561-.108.187-.161.334-.161.441v.12c0 .054-.04.12-.12.201-.08.08-.2.173-.361.28-.347.16-.521.361-.521.601 0 .08.013.147.04.201a.647.647 0 0 1 0 .32c0 .081-.04.121-.12.121-.08 0-.147.04-.2.12-.054.053-.08.133-.08.24 0 .107-.04.201-.121.281a.27.27 0 0 1-.24.12c-.108 0-.201.054-.281.16a.572.572 0 0 0-.08.321.795.795 0 0 1-.08.361c-.054.107-.12.16-.2.16a.652.652 0 0 0-.281.08 2.09 2.09 0 0 0-.321.201c-.107.107-.24.227-.4.36-.161.107-.308.214-.442.321-.16.107-.294.24-.4.401-.107.16-.16.294-.16.401 0 .133-.04.28-.121.44a.917.917 0 0 1-.32.321c-.134.107-.361.361-.682.762-.32.4-.668.855-1.042 1.362-.348.481-.655.922-.922 1.323-.267.401-.4.655-.4.761 0 .054-.028.094-.08.121h-.081a.682.682 0 0 1-.2-.04h-.12c-.188 0-.361.187-.522.561-.08.187-.187.387-.32.601-.134.187-.28.334-.441.441a2.293 2.293 0 0 0-.361.361c-.08.133-.12.24-.12.32 0 .107-.214.414-.642.922a40.234 40.234 0 0 1-1.603 1.683 44.795 44.795 0 0 0-1.643 1.804c-.508.561-.828.948-.962 1.162a3.91 3.91 0 0 1-.681.922c-.267.294-.521.494-.762.601a.605.605 0 0 1-.24.08.27.27 0 0 1-.24-.12c-.027-.08-.08-.12-.161-.12-.16 0-.414.174-.761.521-.401.427-.682.641-.842.641-.134 0-.2-.12-.2-.36a.887.887 0 0 0-.04-.281.273.273 0 0 0-.201-.08c-.107 0-.214-.16-.32-.481a3.676 3.676 0 0 1-.281-.922 1.856 1.856 0 0 1-.04-.361c0-.133.026-.254.08-.36.267-.428.855-1.176 1.763-2.245a106.847 106.847 0 0 1 2.726-3.086c.24-.24.44-.454.6-.641.135-.214.201-.348.201-.401 0-.027.094-.134.28-.321.161-.213.362-.441.602-.681.24-.241.441-.468.601-.681.16-.241.254-.401.28-.481 0-.134.134-.361.402-.682.294-.347.6-.668.922-.962.32-.294.534-.44.64-.44.054 0 .121-.041.201-.121a.592.592 0 0 0 .16-.28.61.61 0 0 1 .2-.241l.081-.04.12.04h.04c.027 0 .054-.013.08-.04v-.08c0-.08-.013-.16-.04-.24v-.121c0-.32.401-.922 1.203-1.803.347-.401.681-.762 1.002-1.082.347-.321.601-.521.761-.602.134-.053.268-.173.401-.36.134-.214.24-.441.32-.682.08-.24.174-.427.281-.561.107-.16.2-.24.28-.24h.081c.187 0 .4-.094.641-.281.24-.187.454-.414.642-.681.133-.214.2-.401.2-.561v-.161a.656.656 0 0 1-.04-.2c0-.267.133-.481.4-.641.161-.107.281-.227.361-.361.107-.134.16-.241.16-.321 0-.08.054-.187.161-.32.134-.161.28-.321.44-.481.322-.214.482-.361.482-.441v-.04c0-.054-.107-.107-.32-.161a1.416 1.416 0 0 0-.442-.08c-.16 0-.28.027-.36.08-.08.054-.2.107-.361.161-.134.026-.28.053-.441.08-.668.107-1.47.267-2.405.481a25.12 25.12 0 0 0-2.324.561c-.722.214-1.283.321-1.684.321-.347 0-.56-.081-.641-.241-.027-.08-.107-.133-.24-.16a.788.788 0 0 0-.361-.08c-.16 0-.36-.094-.601-.281a5.153 5.153 0 0 1-.642-.681c-.187-.241-.28-.441-.28-.601 0-.054.053-.121.16-.201a.887.887 0 0 1 .36-.16c.161-.054.295-.12.402-.201a.386.386 0 0 0 .08-.2v-.12c0-.054-.08-.08-.24-.08-.188 0-.281-.027-.281-.08v-.081c0-.053.093-.133.28-.24a3.94 3.94 0 0 1 .802-.281l1.122-.28c.428-.107.829-.201 1.203-.281.374-.08.841-.173 1.402-.28a20.975 20.975 0 0 1 1.603-.321c2.058-.374 3.661-.668 4.81-.882a55.134 55.134 0 0 0 2.485-.561c.534-.133.895-.267 1.082-.401.16-.107.32-.187.481-.24.16-.08.267-.12.32-.12h.04c.028 0 .054-.027.081-.081.027-.08.04-.187.04-.32 0-.134.053-.281.16-.441.134-.16.294-.307.481-.441.187-.107.321-.214.401-.321.107-.133.16-.227.16-.28v-.04c0-.134.08-.334.24-.601.188-.268.402-.521.642-.762.24-.267.414-.401.521-.401.16 0 .308-.093.441-.28.16-.187.267-.428.32-.722a.913.913 0 0 0 .121-.24c.08-.134.16-.281.24-.441.16-.267.348-.548.562-.842.24-.294.614-.735 1.122-1.322.16-.187.294-.361.4-.521.134-.187.201-.308.201-.361 0-.08.04-.134.12-.16a.789.789 0 0 1 .36-.081c.295 0 .495-.24.602-.721.054-.214.214-.508.481-.882.294-.401.641-.801 1.042-1.202.401-.401.735-.762 1.002-1.082.267-.321.401-.521.401-.601 0-.081.04-.174.12-.281.107-.107.227-.2.36-.281.135-.106.255-.213.362-.32.106-.134.16-.241.16-.321 0-.08.067-.2.2-.361.16-.187.348-.36.561-.521.214-.16.428-.36.642-.601.213-.24.374-.454.48-.641a2.31 2.31 0 0 1 .442-.601c.187-.187.374-.321.56-.401.161-.08.295-.174.401-.281.134-.107.2-.2.2-.28 0-.374 1.03-1.697 3.087-3.968a856.32 856.32 0 0 1 2.164-2.405c.535-.588.922-1.029 1.163-1.322.267-.294.507-.562.721-.802.32-.401.868-1.002 1.643-1.804a204.1 204.1 0 0 1 2.325-2.364c.775-.775 1.27-1.256 1.483-1.443.214-.134.601-.308 1.162-.521a23.556 23.556 0 0 1 1.764-.642c.588-.213.988-.32 1.202-.32.134 0 .307.107.521.32.241.214.481.481.722.802Zm-17.836 39.559c.027-.027.04-.067.04-.121v-.04c-.027-.053-.08-.08-.16-.08-.054 0-.107.027-.16.08-.054.054-.08.107-.08.161v.2c.026.027.053.04.08.04.053 0 .093-.013.12-.04.053-.053.107-.12.16-.2Zm6.052-23.687c.08-.107.134-.415.16-.922v-.561c0-.348-.013-.722-.04-1.123-.026-.187-.066-.28-.12-.28h-.04c-.08 0-.214.053-.4.16a2.294 2.294 0 0 0-.361.361c-.08.107-.12.2-.12.28 0 .081-.054.187-.161.321-.107.107-.24.187-.4.241-.268.133-.575.4-.923.801a7.047 7.047 0 0 0-.881 1.162c-.187.294-.281.521-.281.682v.08c.027.027.04.067.04.12a.302.302 0 0 1-.04.12c-.027.027-.094.041-.2.041-.187 0-.28.066-.28.2 0 .053.013.107.04.16a.66.66 0 0 1 .04.201c0 .053-.027.08-.08.08a.682.682 0 0 1-.201-.04h-.12c-.214 0-.441.173-.682.521a5.115 5.115 0 0 1-.52.681c-.188.214-.362.414-.522.601a1.61 1.61 0 0 0-.4.481.615.615 0 0 0-.08.241v.08c.026.053.04.107.04.16v.04c-.028.054-.081.08-.161.08-.16 0-.414.174-.762.521-.32.348-.628.735-.921 1.163-.294.401-.441.695-.441.882a.76.76 0 0 1-.28.601c-.161.133-.522.32-1.083.561a.704.704 0 0 0-.28.28c-.054.134-.08.268-.08.401a1.97 1.97 0 0 1-.201.641c-.08.188-.2.348-.36.481-.081.081-.161.121-.241.121-.054 0-.094-.014-.12-.04-.027-.027-.054-.04-.08-.04-.028 0-.04.026-.04.08l.04.16v.08c0 .08-.04.187-.121.321-.053.133-.16.267-.32.401l-.361.32c0-.026.053-.107.16-.24.107-.161.16-.281.16-.361 0-.053-.026-.08-.08-.08h-.04c-.134 0-.307.107-.521.321-.107.106-.16.213-.16.32 0 .08.053.147.16.201.08.08.12.173.12.28 0 .027-.013.08-.04.16-.027.081-.12.161-.28.241a.442.442 0 0 1-.44.04h-.082c-.053 0-.133.04-.24.12a.708.708 0 0 0-.28.281c-.107.16-.16.28-.16.36 0 .107.066.161.2.161.053 0 .08.027.08.08 0 .08-.107.24-.32.481-.135.16-.281.347-.442.561-.133.214-.24.401-.32.561-.107.134-.24.267-.401.401a.937.937 0 0 1-.441.2c-.16.027-.307.081-.441.161a.503.503 0 0 0-.2.28c-.027.027-.04.054-.04.08 0 .081.106.134.32.161h.24c.268 0 .669-.027 1.203-.08.534-.027 1.242-.054 2.124-.081.909-.053 1.79-.093 2.645-.12.695-.027 1.243-.04 1.644-.04.4-.027.695-.053.882-.08.187-.054.293-.12.32-.2a.575.575 0 0 0 .08-.321c0-.16.014-.294.04-.401.054-.107.12-.16.2-.16.108 0 .228-.147.362-.441a4.27 4.27 0 0 0 .28-1.042c0-.107.013-.227.04-.361a3.14 3.14 0 0 1 .16-.401c.027-.107.067-.254.12-.441l.161-.641c.08-.401.214-.601.4-.601.028 0 .068.013.121.04l.12.04c.107 0 .214-.053.321-.16.134-.107.227-.267.28-.481a.648.648 0 0 0 .08-.281c0-.107-.026-.2-.08-.28v-.361a.5.5 0 0 1 .12-.2c.08-.027.148-.121.201-.281.054-.16.08-.321.08-.481 0-.16.04-.334.12-.521.107-.214.228-.387.361-.521.16-.134.28-.281.361-.441.107-.16.16-.294.16-.401 0-.107.067-.28.2-.521.161-.24.348-.481.562-.721.294-.294.494-.575.601-.842.053-.187.08-.414.08-.681v-.561c0-.508.134-.855.401-1.042.134-.107.227-.201.28-.281.054-.053.08-.107.08-.16 0-.027-.013-.054-.04-.08-.026-.027-.04-.067-.04-.121v-.12c.027-.08.08-.174.16-.28.081-.107.161-.241.241-.401a1.71 1.71 0 0 0 .16-.481c.027-.16.054-.294.08-.401.054-.134.108-.214.161-.24ZM121.359 229.604v-.882l-.4.681c-.187.374-.361.588-.521.641a1.84 1.84 0 0 1-.361.04c-.214 0-.508-.08-.882-.24-.427-.16-.721-.361-.882-.601-.133-.241-.2-.641-.2-1.203v-.16c0-.508.134-.761.401-.761.16 0 .254-.081.28-.241.054-.16.08-.347.08-.561 0-.241-.013-.521-.04-.842a8.841 8.841 0 0 1-.04-.761c0-.641.094-1.002.281-1.082.107-.054.16-.107.16-.161a.65.65 0 0 0 .04-.2.348.348 0 0 0-.04-.16 1.305 1.305 0 0 1-.08-.481v-.241c.027-.32.094-.614.2-.882.134-.267.268-.4.401-.4.187 0 .281-.094.281-.281a.938.938 0 0 0-.08-.321v-.44c.026-.161.066-.268.12-.321.08-.054.147-.16.2-.321.054-.16.08-.334.08-.521s.027-.387.081-.601c.08-.24.173-.441.28-.601.107-.16.254-.441.441-.842.187-.427.374-.882.561-1.363.187-.48.361-.908.521-1.282.16-.374.267-.601.321-.681a.92.92 0 0 0 .2-.361c.08-.16.134-.321.16-.481a.92.92 0 0 0 .081-.321c0-.08-.027-.133-.081-.16-.08-.053-.267-.08-.561-.08-.454 0-.815.2-1.082.601a2.053 2.053 0 0 1-.481.481c-.16.107-.307.16-.441.16-.133 0-.28.054-.441.161-.16.106-.28.227-.36.36-.107.161-.428.468-.962.922-.535.454-1.149.949-1.844 1.483a96.14 96.14 0 0 0-2.004 1.523l-1.282 1.002a3.415 3.415 0 0 1-.962.521c-.321.107-.601.16-.842.16h-.16c-.241-.026-.361-.147-.361-.36 0-.161-.027-.241-.08-.241-.054 0-.134.054-.241.161a1.42 1.42 0 0 1-.44.24 1.84 1.84 0 0 1-.361.04h-.16c-.161-.027-.241-.093-.241-.2 0-.054-.107-.147-.321-.281a6.354 6.354 0 0 0-.761-.481c-.481-.214-.788-.387-.922-.521a.744.744 0 0 1-.16-.481l.04-.2a3.53 3.53 0 0 0-.04-.561.947.947 0 0 0-.161-.441c-.08-.08-.12-.147-.12-.201 0-.08.067-.12.201-.12.053 0 .08-.027.08-.08 0-.107-.08-.281-.241-.521a1.535 1.535 0 0 0-.36-.441c-.107-.133-.201-.2-.281-.2-.08 0-.2-.054-.361-.161a5.552 5.552 0 0 1-.441-.4 8.798 8.798 0 0 0-.521-.481 1.823 1.823 0 0 0-.481-.321c-.213-.107-.32-.2-.32-.281v-.16c0-.16.04-.374.12-.641.107-.267.16-.454.16-.561v-.08c-.026-.134-.133-.228-.32-.281-.161-.053-.334-.227-.521-.521a4.54 4.54 0 0 1-.441-.882c-.08-.32-.12-.588-.12-.801v-.161a.685.685 0 0 0 .04-.16c0-.053-.014-.08-.04-.08-.054 0-.121.04-.201.12-.08.107-.187.307-.32.601a7.574 7.574 0 0 0-.281 1.002c-.107.374-.227.735-.361 1.082-.133.348-.267.615-.401.802a11.5 11.5 0 0 0-.28.521c-.054.16-.08.281-.08.361 0 .08-.04.227-.121.441-.053.187-.133.4-.24.641-.107.24-.254.588-.441 1.042l-.481 1.363c-.16.481-.36 1.015-.601 1.603a14.606 14.606 0 0 1-.641 1.523c-.187.427-.388.908-.602 1.443-.213.534-.374.988-.48 1.362a9.37 9.37 0 0 1-.401 1.123 8.197 8.197 0 0 1-.361.881c-.187.375-.414.842-.681 1.403-.24.561-.428 1.056-.561 1.483a.504.504 0 0 1-.2.281c-.108.08-.201.12-.281.12a.534.534 0 0 0-.321.12c-.08.08-.147.174-.2.281-.08.214-.228.32-.441.32a.65.65 0 0 1-.2-.04h-.12c-.081 0-.161.014-.241.04-.134.027-.214.094-.24.201a.387.387 0 0 1-.201.16.352.352 0 0 1-.16.04h-.16c-.161-.08-.348-.307-.562-.681a5.495 5.495 0 0 1-.561-1.122c-.134-.374-.2-.642-.2-.802v-.08a.994.994 0 0 0 .12-.241v-.28c.026-.054.067-.12.12-.201a.61.61 0 0 1 .24-.2c.08-.053.147-.174.2-.361.054-.213.081-.441.081-.681 0-.214.04-.428.12-.641.08-.214.174-.374.28-.481.108-.08.201-.227.281-.441.08-.241.134-.508.16-.802.027-.267.067-.494.12-.681.081-.214.148-.334.201-.361.08-.026.147-.147.2-.36.054-.241.08-.522.08-.842 0-.454.054-.815.161-1.082.107-.268.347-.602.722-1.002.374-.401.587-.668.64-.802a.916.916 0 0 0 .081-.28.385.385 0 0 0-.12-.281.534.534 0 0 1-.12-.321v-.08c0-.107.053-.267.16-.481.107-.133.2-.254.28-.36.107-.107.188-.161.24-.161.054 0 .094-.027.121-.08a.494.494 0 0 0 .08-.281c0-.106.014-.187.04-.24.054-.08.107-.12.16-.12.08 0 .148-.174.201-.521.08-.348.147-.775.2-1.283.08-.695.16-1.175.241-1.443.107-.267.254-.414.44-.441a.907.907 0 0 0 .241-.16c.054-.053.08-.093.08-.12 0-.027-.013-.054-.04-.08-.026-.027-.04-.067-.04-.121 0-.106.054-.28.16-.521.108-.32.268-.654.482-1.002.213-.347.427-.641.64-.881.241-.267.362-.548.362-.842v-.16a.359.359 0 0 1-.04-.161c0-.294.227-.641.68-1.042.215-.213.428-.387.642-.521.214-.133.361-.2.441-.2.08 0 .16-.027.24-.08a.602.602 0 0 0 .241-.201c.053-.08.08-.133.08-.16h-.04c-.027 0-.08.027-.16.08a.384.384 0 0 1-.201.08c-.026 0-.04-.013-.04-.04 0-.026.027-.08.08-.16.054-.08.107-.12.161-.12a.298.298 0 0 1 .12-.04.35.35 0 0 1 .16.04c.027.026.054.04.08.04.081 0 .174-.04.281-.12a1.93 1.93 0 0 0 .441-.401c.427-.481.882-.722 1.363-.722.32 0 .668.121 1.042.361.294.214.641.655 1.042 1.323.401.668.761 1.376 1.082 2.124.321.748.508 1.363.561 1.844.027.293.067.614.12.961.054.321.12.575.201.762.053.214.106.441.16.681.053.241.08.441.08.602 0 .133.08.36.241.681.187.294.4.601.641.922.24.32.441.614.601.881.16.241.241.388.241.441 0 .161.093.241.28.241.107 0 .267-.04.481-.12.481-.187 1.096-.548 1.844-1.083.454-.347.895-.668 1.322-.961.455-.321.789-.548 1.002-.682a51.39 51.39 0 0 0 1.804-1.202 42.545 42.545 0 0 0 1.884-1.363c1.443-1.069 2.271-1.603 2.485-1.603.08 0 .213-.067.4-.201.187-.16.388-.347.602-.561.24-.213.547-.441.921-.681a8.413 8.413 0 0 1 1.123-.681 28.495 28.495 0 0 0 2.084-1.283 30.752 30.752 0 0 0 1.924-1.323c.08-.08.147-.12.2-.12h.12c.054 0 .094.014.12.04l.081.04c.053 0 .08-.053.08-.16 0-.214.788-.361 2.364-.441.268 0 .508.067.722.201.214.133.454.414.721.841l.762 1.042-.441 1.123a4.561 4.561 0 0 1-.441.881c-.16.294-.307.508-.441.642a2.07 2.07 0 0 0-.401.44.95.95 0 0 0-.12.401c0 .107-.053.281-.16.521-.08.214-.187.428-.321.642-.133.213-.254.44-.36.681-.081.24-.134.441-.161.601 0 .16-.04.321-.12.481a.586.586 0 0 1-.2.281c-.134.08-.375.427-.722 1.042a80.24 80.24 0 0 0-1.162 2.044 166.47 166.47 0 0 0-1.082 2.124c-.294.641-.441 1.029-.441 1.162 0 .08-.054.254-.161.521-.08.241-.173.508-.28.802a89.028 89.028 0 0 0-1.002 2.284 82.388 82.388 0 0 0-.922 2.445c-.267.722-.401 1.136-.401 1.243 0 .08-.04.267-.12.561-.08.267-.187.561-.321.882a39.546 39.546 0 0 0-.641 1.523c-.133.32-.227.574-.28.761a1.626 1.626 0 0 0-.081.521 1.875 1.875 0 0 1-.2.441c-.08.16-.187.321-.321.481l-.481.601-.04-.881ZM155.668 225.435a46.504 46.504 0 0 1-1.002-.601 18.541 18.541 0 0 1-.802-.561 6.634 6.634 0 0 0-.481-.281.725.725 0 0 0-.2-.08c-.054 0-.081.014-.081.04 0 .054-.013.08-.04.08-.053 0-.12-.04-.2-.12a6.201 6.201 0 0 1-.601-.601 23.332 23.332 0 0 1-.722-.842 7.203 7.203 0 0 1-.601-.841 5.173 5.173 0 0 0-.601-.842c-.187-.24-.347-.401-.481-.481-.107-.08-.214-.2-.321-.361-.08-.16-.12-.32-.12-.481 0-.801-.614-1.616-1.844-2.444a10.92 10.92 0 0 1-.681-.441c-.187-.161-.28-.268-.28-.321 0-.053-.067-.12-.201-.2a1.39 1.39 0 0 0-.441-.281 1.543 1.543 0 0 1-.401-.16c-.08-.08-.12-.134-.12-.161v-.12a1.65 1.65 0 0 0-.04-.28 3.146 3.146 0 0 0-.28-.642c-.134-.24-.228-.414-.281-.521a1.65 1.65 0 0 1-.04-.28c0-.027.013-.04.04-.04.053 0 .12-.054.2-.161.081-.133.134-.28.161-.441.026-.133.04-.267.04-.4a3.1 3.1 0 0 0-.321-1.363c-.107-.267-.214-.401-.32-.401-.081 0-.121-.013-.121-.04v-.2a.355.355 0 0 0 .04-.161v-.04c-.026-.026-.08-.04-.16-.04-.107 0-.16-.027-.16-.08 0-.08.053-.174.16-.281.08-.08.12-.16.12-.24a.35.35 0 0 0-.04-.16c-.026-.161-.133-.361-.32-.601a3.437 3.437 0 0 0-.441-.441c-.134-.134-.241-.201-.321-.201-.053 0-.174.147-.361.441a10.36 10.36 0 0 0-.601 1.122l-.721 1.363a71.79 71.79 0 0 1-.561 1.042c-.134.267-.254.521-.361.762-.08.24-.12.427-.12.561 0 .107-.067.267-.201.481a2.332 2.332 0 0 1-.441.601 3.472 3.472 0 0 0-.44.521c-.081.16-.121.28-.121.361v.12c0 .08-.026.174-.08.28-.107.134-.24.268-.401.401-.16.134-.294.281-.4.441-.107.16-.161.307-.161.441a.95.95 0 0 1-.12.401 1.056 1.056 0 0 1-.241.36c-.106.134-.36.548-.761 1.243a89.725 89.725 0 0 0-1.242 2.405c-1.363 2.672-2.232 4.008-2.606 4.008-.08 0-.133-.054-.16-.161-.053-.053-.134-.08-.24-.08a1.15 1.15 0 0 0-.241-.04c-.134 0-.267.014-.401.04-.133.027-.254.04-.36.04a.565.565 0 0 1-.321-.08c-.187-.107-.414-.361-.681-.761a24.103 24.103 0 0 1-.441-.762c-.134-.24-.201-.401-.201-.481 0-.16.107-.467.321-.922.187-.454.414-.935.681-1.443.241-.534.468-.988.682-1.362.24-.401.4-.601.481-.601.08 0 .16-.094.24-.281.107-.214.187-.481.241-.802a6.61 6.61 0 0 1 .24-.921c.134-.321.267-.588.401-.802.133-.187.24-.374.32-.561.107-.214.161-.374.161-.481 0-.107.04-.241.12-.401.107-.187.227-.361.361-.521.16-.134.28-.267.36-.401.107-.16.161-.28.161-.36 0-.081.08-.281.24-.602.161-.347.374-.734.642-1.162.24-.427.44-.802.601-1.122.16-.321.24-.521.24-.601 0-.054.014-.107.04-.161.054-.053.107-.08.161-.08.053 0 .133-.08.24-.24.107-.161.2-.361.281-.601.08-.241.2-.495.36-.762.187-.294.361-.534.521-.721.187-.187.308-.348.361-.481.08-.134.12-.214.12-.241v-.04c-.026-.027-.04-.053-.04-.08 0-.08.04-.187.12-.321.107-.214.254-.467.441-.761a5.38 5.38 0 0 0 .401-.722c.107-.213.16-.347.16-.4v-.041c-.026-.026-.04-.053-.04-.08 0-.026.027-.067.081-.12.08-.08.2-.16.36-.24.161-.081.321-.214.481-.401.187-.187.348-.388.481-.601.241-.455.521-.682.842-.682h.04a8.3 8.3 0 0 1 .641.04c.294.027.601.04.922.04.401.027.721.094.962.201.24.107.481.294.721.561.161.214.308.454.441.721.161.268.254.495.281.682.053.213.107.454.16.721.08.267.16.508.241.722.053.213.106.454.16.721.053.24.08.427.08.561 0 .134.013.267.04.401a.51.51 0 0 0 .12.24c.107.134.241.428.401.882.161.454.281.882.361 1.283.107.4.16.681.16.841v.121c0 .133.067.347.201.641.16.347.387.748.681 1.202.294.428.534.829.721 1.203.187.347.281.561.281.641 0 .08.053.214.16.401.107.187.227.374.361.561.16.187.347.454.561.801.214.348.414.695.601 1.042.882 1.604 1.924 2.766 3.127 3.487.561.321.881.495.961.521h.161c.026 0 .04-.013.04-.04a.725.725 0 0 0-.08-.2c-.027-.027-.04-.067-.04-.12a.65.65 0 0 1 .04-.201c.053-.133.147-.28.28-.441.134-.133.227-.307.281-.521.08-.24.12-.467.12-.681v-.2c0-.107.013-.227.04-.361a1.39 1.39 0 0 1 .281-.441.722.722 0 0 0 .24-.321c.08-.133.12-.24.12-.32 0-.08.027-.174.081-.281a.784.784 0 0 1 .28-.24 1.74 1.74 0 0 0 .441-.441c.134-.214.214-.388.24-.521a.912.912 0 0 0 .081-.281c0-.107-.04-.173-.121-.2-.026-.027-.04-.067-.04-.12 0-.081.027-.201.08-.361.107-.267.268-.588.481-.962.214-.401.455-.868.722-1.403.294-.534.548-1.042.761-1.523.508-.988.922-1.55 1.243-1.683a.851.851 0 0 0 .401-.281c.133-.16.227-.334.28-.521.054-.187.147-.427.281-.721.133-.321.28-.615.441-.882.16-.24.294-.468.4-.681.134-.241.201-.401.201-.481 0-.054.027-.12.08-.201a.522.522 0 0 1 .24-.24c.081-.054.187-.174.321-.361.16-.187.307-.387.441-.601.134-.214.307-.441.521-.681.24-.241.454-.441.641-.602.187-.16.361-.347.521-.561.161-.213.267-.414.321-.601.053-.16.174-.387.361-.681.187-.294.414-.588.681-.882.347-.374.641-.628.882-.761.267-.134.588-.201.962-.201h.28c.241 0 .428.027.561.08a.482.482 0 0 1 .321.321.699.699 0 0 0 .2.361c.134.107.268.187.401.24.321.08.481.267.481.561 0 .374-.28.949-.842 1.724a12.1 12.1 0 0 0-.641 1.122c-.187.374-.294.681-.32.922-.107.481-.334.975-.682 1.483-.32.481-.641.788-.962.921-.133.054-.294.201-.481.441-.16.241-.294.508-.4.802a5.68 5.68 0 0 1-.401.802c-.107.213-.187.32-.241.32-.053 0-.12.08-.2.241-.08.133-.134.294-.16.481-.054.213-.134.4-.241.561-.107.16-.214.267-.321.32-.106.054-.253.227-.44.521-.161.268-.334.588-.521.962a9.96 9.96 0 0 1-.481 1.042c-.161.268-.268.428-.321.481-.08.054-.307.428-.681 1.123a67.873 67.873 0 0 0-1.283 2.525 82.225 82.225 0 0 0-1.323 2.765c-.4.855-.694 1.496-.881 1.924-.374 1.015-.682 1.763-.922 2.244-.214.481-.361.735-.441.762a.308.308 0 0 1-.12.04c-.08 0-.161-.107-.241-.321-.027-.08-.08-.12-.16-.12s-.227.08-.441.241a.477.477 0 0 1-.08.12c-.16.133-.281.214-.361.24a.35.35 0 0 1-.16.04.604.604 0 0 1-.241-.08c-.16-.053-.4-.173-.721-.361a.515.515 0 0 0-.2-.12ZM165.487 229.283c0-.054-.04-.094-.12-.12a2.729 2.729 0 0 0-.321-.081 1.84 1.84 0 0 1-.361-.04 2.984 2.984 0 0 1-.4-.16c-.107-.08-.161-.16-.161-.24v-.081c0-.106.08-.28.241-.521.16-.267.24-.467.24-.601 0-.107-.026-.173-.08-.2-.16-.107-.24-.281-.24-.521v-.12c0-.294.12-.535.36-.722.107-.107.201-.227.281-.361.053-.16.08-.294.08-.4 0-.134.04-.268.12-.401.054-.134.134-.254.241-.361.107-.08.227-.24.361-.481.133-.24.24-.508.32-.801.08-.268.187-.495.321-.682.107-.187.2-.28.28-.28.161 0 .268-.081.321-.241.053-.187.08-.387.08-.601v-.241c0-.053.04-.106.12-.16.081-.08.187-.16.321-.24.16-.08.294-.187.401-.321.08-.16.12-.307.12-.441 0-.133.04-.24.12-.32.054-.107.121-.161.201-.161.347 0 .975-.828 1.883-2.485.107-.187.214-.347.321-.481.107-.133.187-.213.241-.24.053-.027.093-.107.12-.241.053-.133.08-.28.08-.441 0-.16.067-.374.2-.641.161-.267.348-.507.561-.721.214-.241.388-.468.521-.682.161-.213.241-.374.241-.481 0-.08.027-.16.08-.24.054-.08.107-.12.16-.12.081 0 .174-.054.281-.161a2.5 2.5 0 0 0 .281-.44 1.39 1.39 0 0 1 .28-.441c.134-.134.241-.201.321-.201.107 0 .173-.013.2-.04.027-.027.04-.053.04-.08a.298.298 0 0 0-.04-.12v-.12c0-.161.08-.415.241-.762.187-.454.454-.868.801-1.242.134-.161.267-.334.401-.521.16-.214.281-.415.361-.602.08-.187.227-.441.441-.761.213-.348.454-.695.721-1.042.241-.321.428-.588.561-.802.134-.24.201-.387.201-.441v-.04c0-.053.08-.133.24-.24a5.73 5.73 0 0 1 .762-.441c.32-.16.574-.307.761-.441.187-.134.281-.227.281-.281a.348.348 0 0 1-.04-.16c0-.08.04-.187.12-.321.133-.187.294-.36.481-.521.213-.16.401-.24.561-.24.133 0 .24.027.32.08.107.027.161.067.161.12 0 .054.04.094.12.121h.16c.107 0 .214-.014.321-.04l.2-.041c.294 0 .468.161.521.481a.54.54 0 0 0 .201.361c.107.08.254.12.441.12h.4c.294 0 .668-.026 1.123-.08a71.129 71.129 0 0 0 2.445-.28c2.11-.241 4.609-.441 7.494-.602 2.913-.16 5.077-.24 6.493-.24 1.417-.027 2.298-.04 2.646-.04 1.763 0 2.939.053 3.527.16.347.107.534.227.561.361.053.107.08.187.08.24 0 .134-.107.254-.321.361-.107.027-.16.054-.16.08 0 .027.053.04.16.04.08.027.147.094.201.201.08.08.12.187.12.32 0 .187-.067.321-.201.401-.106.08-.307.134-.601.161-.24.026-.427.08-.561.16-.133.053-.2.107-.2.16v.04c0 .187-.174.321-.521.401-.348.08-.695.12-1.042.12a7.58 7.58 0 0 1-.762-.04l-.401-.04-.36.04c-.241 0-.401.027-.481.08-.107.08-.334.147-.682.201-.347.053-.681.08-1.002.08h-1.202c-.294-.027-.454-.067-.481-.12 0-.054-.027-.081-.08-.081-.027 0-.067.041-.12.121-.054.08-.334.16-.842.24-.481.08-1.096.147-1.844.201-.721.026-1.563.08-2.525.16s-1.817.16-2.565.24a79.777 79.777 0 0 1-2.805.281c-.668.053-1.136.08-1.403.08h-.882a.615.615 0 0 1-.321-.16c-.133-.107-.227-.161-.28-.161-.027 0-.04.014-.04.041 0 .053.013.106.04.16 0 .427-.922.668-2.766.721h-.08c-.401 0-.721.04-.962.121-.24.08-.494.293-.761.641-.267.347-.655.935-1.163 1.763a.6.6 0 0 1-.12.161c-.133.24-.267.441-.401.601-.133.16-.227.24-.28.24-.08 0-.187.107-.321.321a6.952 6.952 0 0 0-.32.641c-.081.241-.121.428-.121.561 0 .081.241.121.722.121.401 0 .962-.027 1.683-.081a75.195 75.195 0 0 1 3.928-.16c1.523-.027 2.752-.04 3.687-.04.962 0 1.897.013 2.806.04 1.817.054 2.992.12 3.527.201.401.053.628.106.681.16.054.053.08.093.08.12 0 .054-.053.12-.16.2a.796.796 0 0 0-.24.281.656.656 0 0 0-.041.2v.121c0 .08-.053.173-.16.28-.08.107-.214.214-.401.321-.16.08-.294.16-.4.24-.081.08-.121.147-.121.201v.04l.04.04c0 .053-.066.107-.2.16-.16.054-.374.107-.641.161-.241.053-.441.08-.601.08-.241 0-.375-.067-.401-.201-.027-.107-.067-.16-.12-.16-.081 0-.174.08-.281.24-.107.107-.321.214-.641.321-.321.08-.642.147-.962.2a9.9 9.9 0 0 1-.802.041h-.32c-.294 0-.441-.054-.441-.161 0-.107-.067-.173-.201-.2a1.831 1.831 0 0 0-.36-.04h-.161c-.16.026-.267.107-.32.24-.027.08-.187.161-.481.241-.268.08-.762.16-1.483.24-.722.054-1.764.134-3.126.241-.989.08-1.991.173-3.006.28a68.92 68.92 0 0 0-2.365.281c-.561.08-1.002.173-1.323.28a2.27 2.27 0 0 0-.801.401c-.214.16-.481.414-.802.762-.294.32-.548.614-.761.881-.188.241-.281.388-.281.441-.027.161-.307.601-.842 1.323a46.35 46.35 0 0 1-1.723 2.284c-.267.321-.535.655-.802 1.002-.24.348-.414.628-.521.842-.16.294-.24.494-.24.601v.04c.026.054.227.081.601.081.187 0 .468-.014.842-.041.374-.053.734-.12 1.082-.2.374-.08 1.135-.214 2.284-.401 1.149-.187 2.418-.401 3.808-.641 1.389-.214 2.712-.414 3.968-.601 1.282-.214 2.204-.374 2.765-.481 5.211-.855 8.537-1.363 9.98-1.523 1.47-.16 2.458-.241 2.966-.241.775 0 1.216.094 1.323.281.106.107.16.187.16.24 0 .081-.094.121-.281.121-.213 0-.32.026-.32.08 0 .026.093.133.28.32.214.214.321.374.321.481.027.107.04.174.04.201 0 .107-.067.16-.2.16-.054 0-.161.054-.321.16a2.128 2.128 0 0 0-.401.321c-.401.321-1.256.588-2.565.802-1.309.187-2.031.4-2.164.641-.027.16-.187.24-.481.24-.134 0-.294-.013-.481-.04a1.922 1.922 0 0 0-.521-.08.911.911 0 0 0-.281.04 1.194 1.194 0 0 0-.561.321c-.32.294-.988.467-2.004.521-.427 0-.828.04-1.202.12-.348.054-.575.134-.682.241-.106.08-.36.147-.761.2-.374.053-.802.094-1.283.12-.507 0-.962.04-1.362.12-.374.054-.615.121-.722.201-.107.08-.28.16-.521.24-.214.054-.441.107-.681.161-.267.026-.668.093-1.203.2-.534.107-1.082.214-1.643.321-.775.187-1.256.28-1.443.28h-.32c-.214 0-.348-.053-.401-.16-.08-.107-.16-.16-.241-.16-.08-.027-.187.026-.32.16-.107.08-.214.147-.321.2a.65.65 0 0 1-.2.04h-.08c-.054 0-.174.027-.361.081-.16.053-.334.12-.521.2-.241.134-.468.2-.682.2a.838.838 0 0 1-.44-.12.69.69 0 0 0-.441-.16c-.161 0-.334.053-.521.16-.134.107-.401.187-.802.241-.401.053-.842.093-1.323.12-.454 0-1.015.013-1.683.04-.641.027-1.216.053-1.723.08h-1.283c-.347-.027-.534-.067-.561-.12Zm4.649-6.172.04-.121-.04-.04c0-.053-.04-.08-.12-.08a.272.272 0 0 0-.2.08c-.054.027-.081.08-.081.161 0 .08.014.147.041.2.026.027.053.04.08.04a.303.303 0 0 0 .12-.04c.053-.053.107-.12.16-.2ZM206.208 226.076c-.08-.053-.267-.093-.561-.12a7.888 7.888 0 0 0-.762-.04c-.213 0-.454.014-.721.04h-.682c-.374 0-.641-.013-.801-.04-.267-.053-.401-.147-.401-.28 0-.241-.267-.388-.801-.441-.321-.027-.535-.08-.642-.161-.107-.08-.16-.2-.16-.36v-.161c0-.267-.08-.4-.241-.4a.308.308 0 0 0-.12.04h-.12c0-.054.093-.147.281-.281.187-.16.307-.307.36-.441a.97.97 0 0 0 .08-.36c0-.107-.013-.228-.04-.361a1.737 1.737 0 0 1-.08-.441c0-.08.014-.134.04-.16.08-.081.281-.121.601-.121.294 0 .521-.066.682-.2.16-.16.334-.468.521-.922.187-.427.374-.721.561-.882.16-.187.414-.307.761-.36.562-.08 1.016-.414 1.363-1.002.16-.241.334-.441.521-.602.187-.16.334-.253.441-.28.107 0 .334-.094.681-.281.348-.187.722-.414 1.123-.681.427-.294.868-.574 1.322-.842.481-.267.882-.467 1.203-.601a12.51 12.51 0 0 0 1.122-.601c.454-.294.868-.601 1.242-.922a12.59 12.59 0 0 1 1.002-.721c.321-.214.508-.321.561-.321.161 0 .428-.08.802-.24.401-.187.788-.388 1.162-.602.374-.213.615-.387.722-.521.08-.107.227-.213.441-.32.213-.134.441-.254.681-.361.214-.107.508-.267.882-.481.401-.214.775-.441 1.122-.681.374-.267.775-.521 1.202-.762a8.042 8.042 0 0 1 1.123-.601c.32-.134.668-.321 1.042-.561.374-.267.694-.521.962-.762.24-.24.467-.441.681-.601.24-.16.401-.24.481-.24.214-.027.574-.161 1.082-.401.508-.241.975-.494 1.403-.762.454-.294.721-.521.801-.681a.655.655 0 0 1 .281-.321.92.92 0 0 1 .481-.12c.214 0 .494-.093.842-.28.347-.214.614-.428.801-.642.214-.213.321-.387.321-.521v-.08a.537.537 0 0 0-.361-.2 2.483 2.483 0 0 0-.401-.04l-.28.04c-.214.053-.321.12-.321.2 0 .08-.467.147-1.403.201-.908.026-2.03.04-3.366.04-1.363.026-2.579.053-3.648.08-1.068.026-1.736.067-2.004.12-.187.027-.334.04-.44.04-.241 0-.361-.067-.361-.2 0-.161-.347-.241-1.042-.241-.267 0-.575.014-.922.04h-.802c-1.416 0-2.124-.173-2.124-.521a.32.32 0 0 1 .04-.12v-.08c0-.16-.187-.294-.561-.401-.454-.107-.761-.307-.922-.601-.16-.294-.24-.548-.24-.762 0-.107.013-.213.04-.32.08-.321.321-.481.721-.481.241.026.455.04.642.04.4 0 .601-.054.601-.16 0-.054-.014-.094-.04-.121-.027-.026-.04-.067-.04-.12 0-.053.053-.107.16-.16.16-.08.494-.134 1.002-.161.534-.026 1.309-.04 2.325-.04h.761c1.416 0 2.124.067 2.124.201a.272.272 0 0 0 .281.28c.053 0 .107-.04.16-.12a.49.49 0 0 0 .08-.281c0-.106.067-.187.201-.24.16-.053.441-.08.841-.08.428-.027 1.042-.04 1.844-.04.828 0 1.456.013 1.884.04.454 0 .775.04.962.12.187.054.32.147.4.281.161.213.254.32.281.32.054 0 .08-.107.08-.32 0-.134.04-.241.12-.321a.612.612 0 0 1 .321-.16c.294-.027.601-.04.922-.04.321 0 .655.013 1.002.04.695 0 1.309.013 1.844.04.561.026.895.067 1.002.12h.36c.134 0 .281-.04.441-.12.187-.107.348-.161.481-.161.134 0 .241.041.321.121.214.133.641.254 1.282.36.642.107 1.163.174 1.563.201h.842c.508 0 .895-.04 1.162-.12.268-.081.495-.121.682-.121.187 0 .307.054.36.161.054.08.161.16.321.24.16.08.334.147.521.201.267.053.414.106.441.16.053.053.08.107.08.16 0 .08-.027.16-.08.241a.714.714 0 0 0-.08.32c0 .187.067.388.2.601.161.268.241.535.241.802 0 .882-.909 1.63-2.726 2.245-.213.08-.387.16-.521.24-.107.08-.16.174-.16.281v.12c0 .08-.027.12-.08.12a.298.298 0 0 1-.12-.04.355.355 0 0 0-.161-.04h-.04c-.027.027-.04.067-.04.12 0 .08-.04.147-.12.201a.498.498 0 0 1-.281.08c-.107 0-.2.026-.28.08-.054.053-.08.107-.08.16 0 .08-.041.147-.121.201a.453.453 0 0 1-.2.04h-.16c-.268 0-.615.12-1.042.36a8.608 8.608 0 0 0-1.403 1.082 4.798 4.798 0 0 1-.722.602c-.213.133-.374.2-.481.2-.08 0-.173.04-.28.12a1.086 1.086 0 0 0-.281.201c-.053.107-.2.24-.441.401-.24.16-.507.32-.801.48a8.703 8.703 0 0 1-.722.361 1.28 1.28 0 0 1-.32.08c-.027 0-.04-.013-.04-.04v-.04c-.027 0-.054.014-.081.04-.08.054-.173.161-.28.321a3.457 3.457 0 0 1-.241.28c-.026.027-.053.041-.08.041-.026 0-.04-.014-.04-.041 0-.026-.013-.04-.04-.04a.315.315 0 0 0-.12.04 1.738 1.738 0 0 0-.401.321c-.16.134-.347.254-.561.361-.187.08-.347.12-.481.12-.16 0-.387.094-.681.281-.268.16-.535.36-.802.601a5.58 5.58 0 0 1-.962.681 4.792 4.792 0 0 1-.962.441c-.294.08-.548.187-.761.321-.214.107-.348.213-.401.32a.79.79 0 0 1-.241.281.433.433 0 0 1-.24.08.5.5 0 0 0-.281.08c-.053.054-.08.107-.08.161 0 .08-.04.146-.12.2a.44.44 0 0 1-.2.04c-.081 0-.241.067-.481.2a4.18 4.18 0 0 0-.682.441c-.24.161-.441.281-.601.361-.16.08-.28.12-.361.12h-.12c-.08 0-.227.054-.441.161-.24.16-.534.36-.881.601-.802.588-1.417.881-1.844.881-.481 0-.869.214-1.162.642a2.072 2.072 0 0 1-.481.481c-.161.133-.308.213-.441.24a.775.775 0 0 0-.401.12.617.617 0 0 0-.241.201c-.053.08-.133.16-.24.24a.885.885 0 0 1-.281.121c-.106.026-.24.093-.4.2a1.66 1.66 0 0 0-.441.321c-.161.133-.348.24-.561.32-.187.08-.361.12-.521.12-.134 0-.308.067-.521.201-.187.107-.348.24-.481.401a2.072 2.072 0 0 1-.481.481 1.034 1.034 0 0 1-.481.24c-.134 0-.308.054-.521.16-.214.107-.414.214-.602.321-.267.187-.4.307-.4.361h.08c.133 0 .414-.027.842-.08.32-.054.681-.094 1.082-.121.4-.053.748-.093 1.042-.12.267-.027.588-.067.962-.12.4-.054.748-.094 1.042-.12.294-.054.775-.094 1.443-.121a54.073 54.073 0 0 1 2.164-.12c.748-.027 1.469-.053 2.164-.08.695-.053 1.189-.107 1.483-.16.428-.054 1.229-.121 2.405-.201 1.176-.08 2.405-.147 3.687-.2a75.711 75.711 0 0 1 3.006-.08c.294 0 .735.026 1.323.08.614.027 1.216.067 1.803.12 1.149.107 2.085.16 2.806.16.935 0 1.523-.08 1.763-.24a.718.718 0 0 1 .321-.08c.187 0 .401.08.641.24.214.134.428.214.642.241.213.026.4.04.561.04.267 0 .601-.014 1.002-.04.454-.027.801-.04 1.042-.04.214 0 .347.026.401.08.08.027.12.08.12.16v.12c0 .214.187.388.561.521.214.027.374.107.481.241.107.133.16.334.16.601v.2c0 .348-.067.615-.2.802a.415.415 0 0 1-.401.241.747.747 0 0 1-.24-.041.687.687 0 0 0-.201-.04c-.053 0-.08.027-.08.081l.04.08c.027.026.04.053.04.08 0 .133-.267.24-.801.321-.989.16-2.071.307-3.247.44-1.176.107-1.99.174-2.445.201a4.22 4.22 0 0 0-.601.04h-.761a3.221 3.221 0 0 1-.481-.12 4.887 4.887 0 0 0-.682-.04c-.267 0-.507.026-.721.08a2.66 2.66 0 0 1-1.443-.04c-.294-.107-.508-.147-.641-.121-.107 0-.174.054-.201.161-.053.133-.12.2-.2.2-.08 0-.174-.053-.281-.16-.133-.107-.253-.161-.36-.161-.081 0-.187.054-.321.161-.107.08-.321.147-.641.2-.294.027-.588.04-.882.04h-.441c-.454 0-.868.014-1.242.04-.374.027-.602.067-.682.121a.681.681 0 0 1-.2.04h-.08a.39.39 0 0 1-.241-.161c-.053-.107-.12-.16-.2-.16h-.12c-.107 0-.241.053-.401.16-.16.081-.388.134-.682.161a7.53 7.53 0 0 1-.721.04h-.321c-.347 0-.668.013-.962.04-.267 0-.44.027-.521.08-.16.08-.374.12-.641.12h-.561c-.267 0-.521-.013-.761-.04-.375-.053-.642-.133-.802-.24a.434.434 0 0 0-.321-.121c-.187 0-.427.094-.721.281-.374.24-.695.361-.962.361s-.468-.107-.601-.321c-.054-.08-.094-.12-.12-.12-.027 0-.054.067-.081.2v.04c0 .107-.213.161-.641.161-.321 0-.735-.027-1.242-.081a14.66 14.66 0 0 0-1.002-.04c-.642 0-1.042.067-1.203.201-.214.16-.561.254-1.042.28-.481.027-.868.04-1.162.04-.428 0-.869-.026-1.323-.08l-.2-.04-.281.04a2.199 2.199 0 0 0-.521.12c-.16.054-.307.081-.441.081-.106 0-.187-.027-.24-.081Zm-6.533-2.725a.447.447 0 0 1 .16-.16c.054-.054.094-.08.12-.08.054 0 .094.013.121.04.08.053.12.133.12.24-.027.08-.067.16-.12.241a.434.434 0 0 1-.321.12c-.053 0-.08-.027-.08-.08v-.321ZM244.724 227.84a2.462 2.462 0 0 0-.481-.16c-.24-.054-.48-.08-.721-.08-.214 0-.401-.014-.561-.041-.16-.053-.241-.12-.241-.2 0-.08.027-.134.081-.16.053-.054.106-.08.16-.08.08 0 .147-.041.2-.121a.487.487 0 0 0 .08-.28.428.428 0 0 0-.08-.241c-.08-.08-.147-.12-.2-.12-.107 0-.16-.027-.16-.08 0-.08.053-.174.16-.281.134-.187.561-.36 1.282-.521.722-.16 1.924-.347 3.608-.561a8.798 8.798 0 0 0 1.002-.16c.213-.054.334-.107.36-.16.054-.081.081-.147.081-.201 0-.08-.014-.16-.041-.24v-.201c0-.133.014-.267.041-.401a3.8 3.8 0 0 1 .12-.641c.08-.214.16-.467.24-.761.08-.294.147-.575.201-.842.026-.267.08-.494.16-.681.107-.187.2-.281.28-.281.214 0 .415-.214.602-.641.213-.454.374-1.029.481-1.724.053-.32.147-.627.28-.921.134-.321.294-.575.481-.762a3.68 3.68 0 0 0 .401-.561c.107-.187.16-.307.16-.361 0-.24.08-.507.241-.801.16-.321.334-.602.521-.842.187-.241.374-.387.561-.441.267-.08.401-.214.401-.401l-.04-.12v-.401c.053-.133.147-.267.28-.401.107-.133.201-.267.281-.4.08-.161.133-.294.16-.401.027-.535.08-.882.16-1.042.081-.161.227-.267.441-.321.161-.053.334-.227.521-.521a4.86 4.86 0 0 0 .481-.882c.134-.267.201-.44.201-.521 0-.08-.014-.133-.04-.16v-.04c0-.053.08-.174.24-.361.16-.214.374-.467.641-.761.615-.722.922-1.283.922-1.684a.647.647 0 0 0-.361-.601c-.213-.08-.4-.12-.561-.12h-.36c-.134 0-.268.013-.401.04-.187.027-.281.094-.281.2 0 .107-.093.174-.28.201H255.586c-.24-.027-.401-.094-.481-.201-.053-.08-.12-.12-.2-.12-.134 0-.281.054-.441.161-.187.133-.334.2-.441.2-.134 0-.254-.067-.361-.2a.906.906 0 0 0-.361-.201.772.772 0 0 0-.4-.12c-.107 0-.214-.013-.321-.04-.08-.054-.12-.12-.12-.201 0-.053-.04-.106-.12-.16-.054-.053-.134-.08-.241-.08-.214 0-.334-.067-.361-.2a1.785 1.785 0 0 1-.04-.281c0-.134.027-.281.08-.441.107-.24.268-.401.481-.481.268-.053.401-.12.401-.2 0-.054-.093-.147-.28-.281-.134-.08-.214-.16-.241-.24a.64.64 0 0 1-.04-.161c0-.026.013-.04.04-.04.107-.053.601-.107 1.483-.16.882-.08 1.964-.16 3.247-.24 1.282-.081 2.672-.161 4.168-.241 1.496-.107 2.752-.2 3.767-.281 1.871-.133 3.527-.2 4.97-.2h1.203c1.683.027 2.712.147 3.086.361.133.08.213.147.24.2l.04.08c0 .027-.013.04-.04.04-.08 0-.133.054-.16.161a.65.65 0 0 0-.04.2c0 .08.013.16.04.241a.65.65 0 0 1 .04.2c0 .134-.04.24-.12.321-.08.107-.254.187-.521.24-.321.08-.481.16-.481.241 0 .053.053.106.16.16.134.08.2.147.2.2 0 .054-.08.08-.24.08-.241.027-.641.067-1.202.121l-1.604.08c-.374.027-.561.093-.561.2 0 .027.014.054.04.08.027.027.04.054.04.081 0 .08-.093.12-.28.12-.16 0-.388-.027-.681-.08a3.533 3.533 0 0 0-.682-.08c-.294 0-.481.066-.561.2-.053.107-.134.16-.24.16-.107 0-.268-.053-.481-.16a1.27 1.27 0 0 0-.481-.16 2.493 2.493 0 0 0-.401-.04c-.107 0-.214.013-.321.04-.187.026-.387.053-.601.08-.214.026-.387.04-.521.04-.267.053-.494.361-.681.922a8.216 8.216 0 0 1-.481.962c-.214.374-.441.721-.682 1.042-.24.32-.454.641-.641.962-.187.32-.307.574-.361.761-.026.16-.093.321-.2.481-.08.134-.174.214-.281.241-.08.053-.173.16-.28.32-.08.16-.147.347-.201.561-.053.214-.12.414-.2.601-.08.187-.174.308-.281.361-.08.08-.267.361-.561.842a32.726 32.726 0 0 0-.881 1.723 89.342 89.342 0 0 1-1.123 2.165 48.193 48.193 0 0 1-.962 1.843c-1.042 1.844-1.883 3.46-2.525 4.85-.641 1.389-.961 2.231-.961 2.525v.08c.053.027.307.067.761.12.481.054 1.002.107 1.563.161.561.026 1.029.04 1.403.04h.761a16.788 16.788 0 0 1 2.285 0c.347.026.561.066.641.12.107.053.241.107.401.16.187.054.374.094.561.12.508.054.762.161.762.321 0 .054-.067.134-.201.241a.382.382 0 0 1-.32.16c-.134 0-.308-.054-.521-.16-.187-.107-.348-.161-.481-.161a.434.434 0 0 0-.321.12c-.053.054-.08.107-.08.161 0 .08.12.16.361.24.347.134.521.334.521.601v.041c0 .32-.187.547-.561.681a3.037 3.037 0 0 1-.602.12H259.193c-.454-.027-1.403-.04-2.845-.04a135.49 135.49 0 0 0-4.69 0c-1.683 0-3.153.013-4.409.04-1.229 0-1.897.014-2.004.04h-.24c-.08 0-.174-.04-.281-.12ZM292.66 197.86c.08.134.12.348.12.642 0 .24-.04.628-.12 1.162-.081.508-.361 1.496-.842 2.966-.214.668-.428 1.349-.641 2.044-.214.695-.388 1.256-.521 1.683-.134.401-.294.855-.481 1.363-.161.508-.321.949-.481 1.323-.134.347-.254.681-.361 1.002-.053.267-.08.467-.08.601v.28c0 .107-.013.228-.04.361a.713.713 0 0 1-.201.321c-.08.107-.187.36-.32.761-.134.401-.267.869-.401 1.403-.187.775-.281 1.309-.281 1.603v.12c0 .241.067.441.201.602.107.133.187.254.24.36a.65.65 0 0 1 .04.161v.12c0 .027.014.08.04.16.054.08.147.161.281.241.214.187.321.347.321.481 0 .187-.241.32-.722.4-.187.027-.32.081-.401.161-.08.053-.12.107-.12.16v.12c0 .054-.04.134-.12.241-.08.08-.2.147-.361.2-.24.08-.441.294-.601.642-.134.347-.294.961-.481 1.843-.24.989-.481 1.924-.721 2.806a84.429 84.429 0 0 1-1.123 3.567c-.267.801-.481 1.296-.641 1.483-.027.053-.053.08-.08.08-.053 0-.08-.094-.08-.281v-.681c0-.187-.014-.281-.04-.281-.107 0-.294.321-.561.962-.214.562-.455.869-.722.922h-.08c-.267 0-.615-.214-1.042-.641-.534-.508-.802-.949-.802-1.323 0-.16.054-.307.161-.441.107-.16.2-.494.28-1.002.08-.534.134-1.095.161-1.683.026-.294.04-.561.04-.801 0-.241-.014-.441-.04-.602a2.5 2.5 0 0 1-.041-.4.88.88 0 0 1 .041-.281c.053-.107.187-.187.4-.241.214-.08.348-.187.401-.32a.354.354 0 0 0 .04-.16c0-.134-.04-.321-.12-.562a3.616 3.616 0 0 0-.2-.641 5.991 5.991 0 0 0-.161-.401c-.026-.026-.107-.04-.24-.04-.161 0-.495.04-1.002.121-.481.053-1.163.173-2.044.36l-3.086.601-.962 1.283a18.14 18.14 0 0 1-.882 1.042 7.005 7.005 0 0 1-.641.641 1.8 1.8 0 0 0-.321.321c-.08.08-.12.16-.12.24v.041c0 .106-.054.267-.161.48-.08.188-.187.348-.32.481-.107.107-.201.161-.281.161h-.12c-.027 0-.08.026-.16.08a.606.606 0 0 0-.201.24c-.08.107-.12.201-.12.281v.08c0 .027.013.04.04.04 0 .054-.133.214-.401.481-.24.267-.587.628-1.042 1.082-.988.989-1.563 1.483-1.723 1.483-.027 0-.04-.013-.04-.04 0-.08.067-.24.2-.481a.68.68 0 0 0 .08-.2h-.04c-.053 0-.213.133-.481.401-.4.374-.801.561-1.202.561h-.2c-.294 0-.481-.054-.562-.161-.08-.133-.12-.414-.12-.841-.027-.615-.133-.962-.32-1.042-.027 0-.041-.014-.041-.04 0-.107.094-.308.281-.602.16-.294.428-.681.802-1.162a17.8 17.8 0 0 0 .921-1.282c.241-.375.361-.602.361-.682 0-.107.12-.254.361-.441a6.73 6.73 0 0 1 .681-.521c.214-.107.388-.16.521-.16h.241a.456.456 0 0 0 .16-.16l.04-.121a.308.308 0 0 0-.04-.12c-.027-.053-.08-.093-.16-.12-.054-.027-.107-.094-.161-.201a2.297 2.297 0 0 1-.04-.44v-.121c0-.133-.026-.28-.08-.44a1.42 1.42 0 0 0-.28-.522c-.161-.24-.241-.427-.241-.561v-.12c0-.08.12-.24.361-.481a2.8 2.8 0 0 0 .321-.361v-.08c0-.053-.027-.08-.081-.08h-.08a.35.35 0 0 1-.16-.04c-.054-.027-.094-.08-.12-.16 0-.054.093-.121.28-.201.161-.08.374-.133.641-.16.909-.107 1.617-.334 2.125-.681.534-.374 1.229-1.123 2.084-2.245.508-.641.962-1.175 1.363-1.603.427-.428.721-.668.881-.721.187-.027.281-.081.281-.161 0-.053-.014-.093-.04-.12v-.08c0-.134.12-.401.36-.802.241-.401.602-.908 1.083-1.523.481-.614.895-1.149 1.242-1.603.374-.454.588-.721.641-.802 3.982-5.424 6.199-8.136 6.654-8.136h.16c.107 0 .16-.026.16-.08a.35.35 0 0 0-.04-.16.354.354 0 0 1-.04-.16c0-.081.04-.201.12-.361.08-.187.214-.401.401-.641.321-.401.641-.749.962-1.043.321-.293.574-.467.762-.521a.315.315 0 0 1 .12-.04c.026 0 .04.027.04.08a.68.68 0 0 1-.04.201.298.298 0 0 0-.04.12c0 .027.013.04.04.04a.303.303 0 0 0 .12-.04c.08-.08.12-.16.12-.24v-.121a.65.65 0 0 0-.04-.2.35.35 0 0 1-.04-.16.65.65 0 0 1 .04-.201.705.705 0 0 1 .281-.28c.187-.161.32-.241.401-.241.08 0 .12.054.12.161 0 .053.026.093.08.12h.04c.053 0 .094-.014.12-.04a.565.565 0 0 1 .321-.08c.133 0 .334.053.601.16.294.08.628.254 1.002.521.374.24.641.494.802.761Zm-8.658 11.704c-.24-.107-.414-.161-.521-.161-.026 0-.053.014-.08.04-.026 0-.04.014-.04.041 0 .026.107.106.321.24.16.08.294.134.401.16h.24v-.04c0-.026-.027-.067-.08-.12-.027-.053-.107-.107-.241-.16Zm-.44 4.128c.133-.16.293-.454.481-.882.187-.454.334-.908.44-1.363.107-.374.161-.654.161-.841v-.12c0-.081-.027-.134-.08-.161a.447.447 0 0 0-.201-.04c-.08.027-.12.054-.12.08v.04c0 .054.013.094.04.121l.04.04c0 .16-.668.427-2.004.801a.383.383 0 0 0-.2.161.746.746 0 0 0-.04.24c0 .16-.067.361-.201.601a2.851 2.851 0 0 1-.481.642c-.16.16-.307.24-.441.24h-.16a.616.616 0 0 0-.441.2.535.535 0 0 0-.12.321c0 .08.013.16.04.241v.04c0 .106-.053.294-.16.561-.107.24-.281.521-.521.841-.241.348-.441.642-.602.882-.16.241-.24.388-.24.441h.802c.32-.027.788-.093 1.402-.2l2.205-.321v-1.042c0-.321.04-.615.12-.882.08-.294.174-.508.281-.641Z"/></g></mask><g mask="url(#d)"><path fill="#FCE8EC" d="M34.827 218.327c0-44.641 0-89.281-.038-133.922 0-1.288.265-1.553 1.554-1.553 89.395.037 178.828.037 268.222 0 1.289 0 1.554.265 1.554 1.553-.038 89.395-.038 178.828 0 268.223 0 1.288-.265 1.554-1.554 1.554-89.394-.038-178.827-.038-268.222 0-1.289 0-1.554-.266-1.554-1.554.038-44.792.038-89.547.038-134.301Zm2.463 12.316c0 38.843-.038 77.685-.038 116.49.758 1.478-2.008 4.623 1.63 4.623 79.428.076 158.857.076 238.285.038.682 0 2.009-.947 1.933-1.175-1.402-6.176 2.463-5.76 6.518-5.57 4.396.227 8.829-.038 13.263.076 1.592.038 1.971-.417 1.971-2.009-.076-17.962-.038-35.887-.038-53.849-.038-67.302-.038-134.604-.076-201.906-.303-.265-.568-.72-.872-.72-8.147 0-16.257 0-24.404.114-.417 0-1.213 1.288-1.213 1.932-.076 22.851 0 45.664.303 68.477.076 5.457-2.917 7.617-7.2 8.906-1.44.378-2.728.568-4.168.947-5.495 0-11.179-1.705-13.491 6.48-1.478 5.116-6.253 9.284-9.55 13.87-1.553 1.137-2.955 2.577-4.661 3.372-7.844 3.79-15.271-2.122-23.646-.947-9.247 1.288-15.321 3.827-15.624 13.566 0 .455 4.705 9.8-4.006 4.443-.379-.227-.91-.009-1.402-.009-6.329-4.206-13.908.114-20.388-3.069-.265-.493-.53-.986-.833-1.478.037-2.539.265-5.078.037-7.579-.341-3.525.152-5.533 4.548-4.775 2.615.455 6.859 1.326 7.806-1.554 3.449-10.421 8.64-19.933 13.112-29.823 2.577-5.723-3.373-11.217-4.093-17.053-.72-5.609-5.343-10.383-3.562-16.371 2.501-8.261 8.451-14.476 13.264-21.373l1.515-1.516c4.131-6.139 8.944-11.444 16.371-13.642 1.137-.606 3.638.493 3.259-1.895-.303-2.046-2.463-.985-3.676-.985-58.055.038-116.111.152-174.204-.19-6.784-.037-7.845 2.312-6.746 7.807v131.8c.038 1.515.076 3.031.076 4.547Zm200.883-110.919h-.265v-29.9c0-1.099.492-2.5-1.592-2.463-2.084.038-1.478 1.516-1.478 2.54-.151 19.439-.265 38.88-.417 58.32 0 2.16.91 3.562 2.88 4.32.152.076.834-.568.834-.834.038-10.686.038-21.335.038-31.983Z"/><path fill="#F18928" stroke="#F18928" stroke-width=".281" d="M300.667 87.438c.038 67.301.038 134.603.076 201.905 0 17.963 0 35.887.038 53.85 0 1.553-.379 2.046-1.97 2.008-4.434-.114-8.83.114-13.264-.076-4.093-.189-7.958-.606-6.518 5.571.076.265-1.25 1.175-1.932 1.175-79.429.038-158.857.038-238.286-.038-3.638 0-.91-3.146-1.63-4.623.418-.417.834-.834 1.213-1.251 4.13-4.585 8.262-9.171 12.354-13.756 14.666-.227 29.369-.303 44.035-.985 1.705-.076 2.084 5.419 4.168.796.72-1.592 2.046-2.881 3.069-4.321-.227 1.062-.985 2.426-.606 3.146 1.137 2.084 2.009-.265 2.577-.682 3.676-2.956 6.821.379 9.891 1.137 2.008.492 3.334 3.979 4.85 6.176 1.327 1.933 2.463 4.017 3.676 6.026.076-1.668.227-3.335.265-4.965.038-1.515-.151-3.031.038-4.547.607-4.775-.417-9.246 5.685-12.846 4.888-2.88 12.202-6.67 10.875-15.424-.568-3.714 0-7.579.076-11.406 3.79-2.729 7.617-5.495 11.407-8.224 5.343-4.585 11.52-7.541 18.189-9.587h.569c.303-.114.644-.265.947-.379 7.504.758 6.632-5.419 7.958-9.701 9.664-3.676 20.653 3.41 29.938-3.79 2.576-2.008 6.025-3.069 8.109-5.381 3.487-3.865 7.124-6.783 12.468-7.693 2.956-.492 7.73 1.44 8.564-2.349.872-3.941-.682-8.375-1.175-12.619 1.819-2.274 3.6-4.51 5.419-6.783 1.516-4.699 4.586-1.099 6.859-1.175 7.617-.341 8.83-7.314 12.392-11.71 6.556-8.109 10.497-17.773 13.718-27.474 3.07-9.133.19-18.796.19-28.27.038-23.23 0-46.421.038-69.651 0-.607.303-1.25.454-1.857.455.227.91.417 1.327.644-.304.114-.645.228-.948.341.114.114.19.227.303.38.19-.228.417-.456.607-.72 8.071-.38 16.029-.645 23.987-.873Z"/><path fill="#80C9C1" stroke="#80C9C1" stroke-width=".281" d="M37.147 226.096v-131.8c.189 0 .416-.038.606-.038 23.04 0 46.08.228 69.121-.151 6.29-.114 10.648 1.63 14.855 6.215 4.017 4.32 9.095 7.654 13.718 11.406 4.092 3.6 2.198 8.905 2.084 12.733-.303 11.027-.303 22.244-3.865 33.007-.872 2.69-.758 5.76-1.668 8.45-1.894 5.685 1.516 12.013-2.842 17.546-3.486 4.434-5.949 9.701-8.867 14.589-2.577 4.131-6.329 7.617-6.821 12.847-.266.076-.531.114-.796.189-5.609-1.099-12.316 5.003-16.902-2.69 0 0-.303.114-.34.189-1.365 4.282-5.837 4.434-8.754 5.192-12.885 3.373-26.224 3.221-39.374 2.274-8.488-.607-11.179 2.046-9.625 10.004-.152.038-.341.038-.53.038Z"/><path fill="#95C7DB" stroke="#95C7DB" stroke-width=".281" d="M120.326 198.014c2.918-4.889 5.381-10.156 8.868-14.59 4.358-5.533.947-11.861 2.842-17.546.909-2.69.758-5.722 1.667-8.45 3.524-10.725 3.524-21.979 3.866-33.007.113-3.865 1.97-9.133-2.085-12.733 5.533 2.539 12.96-.606 17.015 7.011 3.411 6.404 8.413-1.63 12.771-.114.796-2.577 2.994-4.358 3.069-7.579.076-2.539.796-8.109 3.866-7.314 9.511 2.501 19.023-.568 28.383 1.137-4.812 6.897-10.8 13.112-13.263 21.373-1.781 5.95 2.842 10.762 3.562 16.371.72 5.836 6.67 11.331 4.093 17.053-4.472 9.89-9.663 19.44-13.112 29.823-.947 2.88-5.192 2.009-7.806 1.554-4.434-.758-4.889 1.213-4.548 4.775.228 2.501 0 5.04-.038 7.579-5.343-.265-10.686-.379-15.991-.872-1.592-.151-3.108-1.212-4.662-1.857.758-1.515.038-3.903 2.615-4.395.265-.038.72-.986.607-1.175a118.353 118.353 0 0 0-4.624-5.95c-.038-.038-.947.455-1.288.834-6.897 7.958-14.779 13.074-25.807 8.072Z"/><path fill="#FEDAA5" stroke="#FEDAA5" stroke-width=".281" d="M193.727 247.241c.379-3.903 2.273-5.836 6.404-6.139 4.32-.303 1.591-4.396 2.728-6.594 2.615-5.116 4.396-10.762 4.131-16.749 1.667-.607 3.448-.986 4.926-1.895 5.154-3.183 8.83-7.996 15.462-9.815 3.637-1.023 7.351-.758 10.762-1.933 6.253-2.16 5.949-8.943 8.716-13.604 3.41-2.729 4.964-6.48 6.935-10.27 1.819-3.448-.948-10.042 5.987-10.383 2.046-.114 2.804-1.137 3.145-2.88 1.44-.379 2.911-.729 4.351-1.108 3.411 16.75-3.669 30.401-15.947 39.761-8.488 6.442-8.223 13.983-9.587 22.093-1.819 2.274-3.6 4.51-5.419 6.783-1.933 3.676-5.381 1.819-8.186 2.16-2.501.303-5.002-.417-7.313 1.516-7.769 6.556-16.788 9.853-27.095 9.057Z"/><path fill="#FFF1CF" stroke="#FFF1CF" stroke-linejoin="bevel" stroke-width=".281" d="M246.972 190.448c-2.766 4.661-2.517 11.467-8.769 13.665-3.411 1.175-7.141.9-10.779 1.923-6.631 1.819-10.317 6.645-15.471 9.828-1.477.91-3.326 1.296-4.956 1.902-5.419-3.297-10.835-6.694-16.292-9.991.493 0 1.137-.227 1.478 0 8.413 5.192 3.903-3.979 3.903-4.434.303-9.739 6.442-12.278 15.651-13.566 8.375-1.175 15.764 4.737 23.647.947 1.705-.833 3.107-2.236 4.661-3.372 2.311 1.023 4.654 2.075 6.927 3.098Z"/><path fill="#A29EA1" stroke="#A29EA1" stroke-width=".281" d="M178.405 266.323c-1.366 4.327-.455 10.477-7.972 9.718-.162-.446-.845.031-.949.417-.189 0-.475-.135-.665-.135-1.139-21.675-.208-43.368-3.776-64.892.304-3.379 2.429-5.353 5.315-6.757 6.491 3.227 14.083-1.101 20.423 3.075 5.428 3.302 10.748 6.704 16.214 10.007.266 5.998-1.409 11.517-4.029 16.679-1.139 2.202 1.595 6.302-2.733 6.606-4.138.265-6.036 2.239-6.415 6.149a2266.473 2266.473 0 0 0-15.413 19.133Z"/><path fill="#797AAA" stroke="#797AAA" stroke-width=".281" d="M37.147 226.094c.189 0 .378-.038.568-.038 23.268.834 46.535 1.933 69.765-.72-6.745 8.602-13.415 15.764-26.489 14.628-14.135-1.213-28.535.454-42.783.909-.341-3.411-.645-6.821-.986-10.232-.038-1.516-.075-3.031-.075-4.547Z"/><path fill="#F8B570" d="M241.74 227.726c1.364-8.11 1.099-15.651 9.588-22.093 12.278-9.36 19.364-23.003 15.916-39.752 4.282-1.289 7.086-3.146 7.01-8.602-.303-22.813-.113-45.664-.075-68.477 0-.682.757-1.933 1.212-1.933 8.148-.151 16.257-.151 24.405-.114.303 0 .568.455.871.72-7.958.228-15.916.493-23.874.72-.454-.227-.909-.416-1.326-.644-.152.607-.455 1.25-.455 1.857-.038 23.23 0 46.422-.038 69.652-.038 9.435 2.88 19.137-.189 28.269-3.259 9.702-7.162 19.365-13.718 27.475-3.562 4.395-4.775 11.406-12.392 11.709-2.349.114-5.419-3.486-6.935 1.213Z"/><path fill="#87ADD4" d="M170.47 204.632c-2.842 1.402-5.087 3.54-5.429 6.912-1.515 1.023-3.069 2.085-4.585 3.108-7.579-.228-15.12-.493-22.699-.72-1.516-.228-3.032-.493-4.548-.72-6.252-3.6-13.111-1.819-19.705-2.35.493-5.229 4.244-8.716 6.821-12.846 11.028 4.964 18.872-.152 25.845-8.11.341-.379 1.25-.872 1.288-.834a118.791 118.791 0 0 1 4.623 5.95c.114.189-.303 1.099-.606 1.175-2.577.492-1.819 2.88-2.615 4.396 1.554.644 3.07 1.705 4.661 1.856 5.306.455 10.799.527 16.143.792.265.492.541.899.806 1.391Z"/><path fill="#F8C9D1" stroke="#F8C9D1" stroke-width=".281" d="M246.858 190.549c-2.274-1.023-4.623-2.235-6.897-3.259 3.297-4.585 7.996-8.715 9.474-13.831 2.349-8.148 8.355-6.526 13.812-6.564-.342 1.743-1.345 2.888-3.391 2.964-6.935.341-4.055 6.972-5.874 10.421-1.932 3.827-3.714 7.541-7.124 10.269Z"/><path fill="#6E5EA6" stroke="#6E5EA6" stroke-width=".281" d="M38.356 345.919c-.227-.72-.644-1.44-.644-2.16-.038-31.984-.038-63.967 0-95.951 0-2.312.303-4.623.455-6.935 14.286-.417 28.649-2.122 42.784-.909 13.073 1.137 19.743-6.026 26.488-14.628.19-.038.417-.076.607-.151 2.652-.986 3.903.53 6.214 1.894 8.982 5.23 18.759 2.539 27.361-1.629 5.76-2.767 9.701-1.137 11.709 3.145 5.23 11.331 2.956 23.798 4.321 35.735 1.553 13.415-6.556 10.194-13.491 10.232-4.623.038-9.209.076-13.832-.038-.985-.038-2.122-.455-2.88-1.099-5.116-4.093-11.141.872-16.371-1.705-5.608-2.766-9.36 4.206-14.514 2.69-1.591-.454-2.766-3.524-4.13-3.486-8.186.152-16.447.19-23.382 5.874-2.993 2.463-8.033 2.994-8.26 7.92-.38 7.617-.304 15.272-.266 22.889.038 7.01.114 7.01 4.13 8.45.228.076.285.651.398.992-4.774 5.04-9.53 10.074-14.305 15.076-4.13 4.623-8.261 9.208-12.392 13.794Z"/><path fill="#797AAA" stroke="#797AAA" stroke-width=".281" d="M65.037 317.082c-.113-.341-.151-.909-.379-.985-4.016-1.44-4.092-1.402-4.13-8.451-.038-7.617-.076-15.272.265-22.889.227-4.926 5.268-5.457 8.261-7.92 6.935-5.684 15.196-5.76 23.382-5.874 1.326-.037 2.539 3.032 4.13 3.487 5.154 1.516 8.906-5.457 14.514-2.691 5.192 2.577 11.255-2.387 16.371 1.706.758.606 1.895 1.061 2.88 1.099 4.623.113 9.208.075 13.832.037 6.935-.037 15.006 3.184 13.49-10.231-1.364-11.937.91-24.405-4.32-35.735-1.97-4.283-5.949-5.912-11.709-3.146-8.603 4.169-18.379 6.859-27.361 1.63-2.311-1.365-3.562-2.88-6.214-1.895 1.553-4.699 3.102-9.47 4.656-14.169.265-.076.539-.118.804-.194 6.594.531 13.447-1.259 19.699 2.341 1.516.227 3.042.496 4.558.724 1.023 1.743 20.807 2.327 22.671.734 1.516-1.023 3.095-2.12 4.611-3.143 3.562 21.487 2.686 43.341 3.822 64.979-6.669 2.009-12.884 4.964-18.189 9.588-6.367-.266-12.885.113-19.1-.986-8.867-1.553-15.688 2.274-22.547 6.632-2.842 1.781-5.95 2.236-8.943 1.364-10.27-2.918-19.63 3.335-19.1 13.718.38 6.973-.53 11.104-8.867 8.754-1.706-.492-3.79.303-5.684.493-.455.303-.948.644-1.403 1.023Z"/><path fill="#F8B570" d="M193.727 247.243c10.307.833 19.326-2.502 27.133-9.057 2.311-1.933 4.813-1.213 7.314-1.516 2.804-.341 6.252 1.516 8.185-2.16.493 4.244 2.008 8.678 1.175 12.619-.834 3.827-5.609 1.857-8.565 2.349-5.343.91-8.981 3.79-12.467 7.693-2.122 2.35-5.571 3.411-8.11 5.381-9.284 7.238-20.274.114-29.937 3.79 5.04-6.367 10.156-12.733 15.272-19.099Z"/><path fill="#A29EA1" stroke="#A29EA1" stroke-width=".281" d="M112.708 211.053c-1.554 4.699-3.069 9.436-4.623 14.135-.19.038-.417.076-.606.152-23.23 2.69-46.498 1.553-69.766.72-1.553-7.921 1.175-10.573 9.626-10.005 13.15.91 26.489 1.061 39.373-2.273 2.918-.758 7.39-.948 8.754-5.192.038-.114.34-.19.34-.19 4.586 7.655 11.332 1.592 16.902 2.653Z"/><path fill="#7D89C1" stroke="#7D89C1" stroke-width=".281" d="M160.455 214.652c-1.629 1.667-21.638 1.023-22.699-.72 7.579.227 15.158.492 22.699.72Z"/><path fill="#7D89C1" d="M137.756 213.933c-1.515-.227-3.031-.493-4.547-.72 1.516.227 3.032.493 4.547.72Z"/></g><mask id="e" width="137" height="132" x="109" y="51" maskUnits="userSpaceOnUse" style="mask-type:alpha"><path fill="#fff" d="M245.377 98.035a.107.107 0 0 1-.01.187c-.583.29-1.16.596-1.757.86-4.586 2.037-8.974 4.408-12.703 7.815-1.275 1.164-2.427 2.486-3.506 3.839-1.024 1.282-1.366 2.853-1.351 4.483.003.251.04.503.081.779.043.28.284.492.567.492h4.958c.311 0 .565.252.547.563-.115 1.983-.818 3.694-2.024 5.128-1.635 1.941-2.301 4.248-3.072 6.563-1.123 3.376-1.199 6.856-.932 10.31.277 3.6-1.055 6.47-3.205 9.147-1.687 2.103-3.322 4.25-5.001 6.361-1.721 2.165-2.363 4.61-2.178 7.358.237 3.522 1.063 6.918 1.834 10.347.628 2.799.835 5.691 1.215 8.544.011.08.012.162.007.255-.019.394-.454.646-.82.499-.553-.221-1.056-.418-1.483-.723-2.143-1.528-3.463-3.707-4.542-6.047-.52-1.129-1.025-2.266-1.53-3.389a.576.576 0 0 0-.311-.295c-1.45-.574-1.878-.94-2.292-1.919a.575.575 0 0 0-.52-.36c-2.259-.024-4.506.203-6.67.953-3.878 1.342-7.762 2.67-11.583 4.154-4.26 1.655-8.668 1.99-13.105 1.455-4.248-.512-8.447-1.435-12.671-2.151-1.417-.24-2.852-.382-4.275-.597-.353-.053-.704-.191-1.028-.348-2.559-1.247-5.086-2.56-7.668-3.753-2.801-1.293-4.964-.37-6.001 2.5-.426 1.18-.679 2.42-1.092 3.604a107.63 107.63 0 0 1-2.017 5.381c-.5 1.221-1.438 1.863-2.817 2.071-.34.051-.62-.243-.592-.585.093-1.134.156-2.229.34-3.303.396-2.291 1.062-4.544 1.304-6.849.24-2.302.122-4.644.095-6.967-.004-.337-.315-.727-.579-.998-1.895-1.925-3.789-3.85-5.73-5.727-2.054-1.987-4.05-4.041-5.423-6.552-1.248-2.282-3.198-2.608-5.358-2.187-3.478.679-6.913 1.562-10.367 2.364-.863.201-1.72.426-2.578.641a.239.239 0 0 1-.269-.121.238.238 0 0 1 .038-.275c.412-.437.797-.849 1.259-1.234 2.614-2.173 5.288-4.278 7.871-6.488 1.541-1.319 2.978-2.765 4.403-4.212.287-.29.467-.847.438-1.264-.715-10.332 1.687-20.027 5.982-29.331 1.806-3.913 3.68-7.794 5.573-11.789.098-.205.311-.325.538-.346 1.549-.145 1.801-1.753 2.432-2.93.414-.771.722-1.598 1.06-2.464a.552.552 0 0 1 .897-.196l.615.585c.22.209.567.206.792.001.534-.488 1.081-.944 1.473-1.506 1.608-2.298 3.189-4.618 4.652-7.007.676-1.102 1.426-1.794 2.719-2.156 4.306-1.204 8.572-2.549 12.82-3.834.134-.04.268-.119.328-.245a.167.167 0 0 0 .014-.046c.315-2.542.522-2.755 3.093-3.177 2.738-.448 4.464-1.912 4.926-4.68.459-2.761.595-5.578.864-8.373.224-2.353.39-4.713.668-7.06.165-1.4.542-2.094 1.436-2.668.266-.17.613-.05.757.23.479.933 1.005 1.849 1.322 2.83.895 2.776 1.606 5.608 2.477 8.392.748 2.39 1.536 4.775 2.442 7.11 1.213 3.13 3.693 4.457 6.949 4.512 1.259.022 2.518.067 3.775.011 1.539-.066 2.969.27 4.202 1.154 3.333 2.39 6.697 4.744 9.904 7.297 2.404 1.915 4.601 4.09 6.992 6.263.143.13.342.173.533.141 1.155-.192 2.182.395 3.218 1.103a.558.558 0 0 1 .184.705l-.969 1.989a.59.59 0 0 0 .298.788c2.382 1.081 4.064 2.97 5.931 4.621.664.586 1.377 1.12 2.081 1.66 1.325 1.015 2.793 1.226 4.405.82 3.118-.785 6.234-1.581 9.374-2.262 2.436-.529 4.741-.82 7.303-.467.016.003.03.008.043.016Zm-65.883 67.736.003-.001c2.551 0 5.102.029 7.653-.018.682-.013 1.433-.113 2.03-.414 3.198-1.613 6.416-3.194 9.509-4.991 3.191-1.852 3.46-2.772 2.514-6.381-.853-3.25-2.427-6.189-4.093-9.063-1.97-3.403-3.506-6.887-3.604-10.915-.051-2.114-.66-4.141-1.666-6.038-.89-1.679-2.269-2.473-4.128-2.497-5.141-.067-10.175.548-15.072 2.205-12.658 4.287-20.368 14.699-20.581 27.698-.052 3.137 1.308 5.266 4.05 6.508 1.912.867 3.904 1.588 5.912 2.205 5.695 1.75 11.575 1.912 17.471 1.703l.002-.001Zm-45.168-33.484h.001c.517-.043.881-.045 1.234-.102 4.495-.735 8.683-2.378 12.729-4.388 1.281-.636 2.481-1.461 3.644-2.302.444-.322.82-.883.988-1.411 3.391-10.538 6.749-21.087 10.109-31.633.035-.11.062-.222.087-.338.065-.301-.131-.605-.438-.637-1.219-.13-2.279.273-3.293.873-3.929 2.322-7.584 5.019-10.908 8.14-4.872 4.571-8.992 9.688-11.435 16.003-1.944 5.027-2.655 10.253-2.72 15.795h.002Zm82.303-17.293v.001c-.357 0-.688-.049-1 .009-1.597.284-3.207.521-4.779.913-3.38.846-6.631 2.05-9.663 3.796-1.696.978-2.001 1.621-1.661 3.531.122.689.247 1.386.467 2.049 1.361 4.132 2.62 8.304 4.168 12.366 1.35 3.542 3.011 6.969 4.595 10.418.2.435.533.808.904 1.227.264.299.756.256.947-.094 1.728-3.158 3.024-6.198 3.84-9.44 2.012-7.982 2.334-16.12 2.263-24.296 0-.137-.044-.277-.082-.48h.001Zm-52.583 5.071c0 .002.001.003.002.003.232.031.407.075.582.075 3.593.002 7.162-.246 10.657-1.154 2.376-.616 4.63-1.51 6.676-2.894 1.594-1.08 2.329-2.562 2.047-4.461-.184-1.235-.4-2.49-.802-3.666-1.976-5.76-5.103-10.957-8.136-16.196-.464-.803-1.268-.779-1.766 0a6.301 6.301 0 0 0-.621 1.295c-.747 2.123-1.508 4.241-2.192 6.384-2.114 6.641-4.195 13.295-6.285 19.942-.064.202-.1.415-.162.672Zm22.287-30.217h-.001l-.262.274a.151.151 0 0 0-.035.153c1.537 4.736 3.008 9.495 4.646 14.197.613 1.762 1.557 3.421 2.465 5.062.828 1.499 2.145 2.049 3.911 1.89 4.362-.392 7.93-2.668 11.616-4.505a.539.539 0 0 0 .302-.432c.139-1.565-.305-2.851-1.206-3.986-.619-.779-1.243-1.577-1.983-2.234a50.247 50.247 0 0 0-16.575-9.828c-.913-.328-1.916-.4-2.877-.59h-.001Zm-44.062 62.705a.51.51 0 0 0 .277-.332c.969-3.398 1.939-6.757 2.871-10.128.12-.433.154-.888.197-1.391a.573.573 0 0 0-.607-.625c-2.899.225-5.536.779-7.738 2.665-.84.719-1.537 1.662-1.33 2.791.504 2.768 1.687 5.186 4.157 6.778.668.431 1.371.595 2.173.242Z"/></mask><g mask="url(#e)"><path fill="#FEDAA5" d="M160.126 157.84c-.124 1.711-.577 3.484-.309 5.113.68 4.123-2.391 3.793-4.679 4.019-2.495.248-4.577 2.742-7.339 1.32.124-.165.227-.309.35-.474 3.237-2.227 4.989-6.267 9.277-7.36.824-.185.783-2.659 2.7-2.618Z"/><path fill="#FCE8EC" d="M107.91 117.599c0-23.111 0-46.222-.019-69.334 0-.667.137-.804.804-.804 46.281.02 92.583.02 138.864 0 .667 0 .804.137.804.804-.019 46.282-.019 92.583 0 138.864 0 .667-.137.805-.804.805-46.281-.02-92.583-.02-138.864 0-.667 0-.804-.138-.804-.805.019-23.19.019-46.36.019-69.53Zm1.275 6.376c0 20.11-.019 40.22-.019 60.31.392.765-1.04 2.393.843 2.393 41.122.039 82.244.039 123.365.02.354 0 1.04-.491 1.001-.609-.726-3.197 1.275-2.982 3.374-2.884 2.276.118 4.572-.019 6.867.04.824.019 1.02-.216 1.02-1.04-.039-9.3-.019-18.579-.019-27.879-.02-34.843-.02-69.687-.04-104.53-.157-.138-.294-.373-.451-.373-4.218 0-8.416 0-12.634.059-.216 0-.628.667-.628 1-.04 11.83 0 23.641.157 35.452.039 2.825-1.511 3.943-3.728 4.61-.745.197-1.413.295-2.158.49-2.845 0-5.788-.882-6.984 3.356-.766 2.648-3.238 4.806-4.944 7.18-.805.589-1.531 1.335-2.414 1.747-4.061 1.961-7.906-1.099-12.242-.491-4.787.667-7.932 1.981-8.089 7.023 0 .236 2.436 5.074-2.074 2.301-.196-.118-.471-.005-.726-.005-3.276-2.178-7.2.059-10.555-1.589-.137-.255-.274-.51-.431-.765.019-1.315.137-2.629.019-3.924-.176-1.825.079-2.864 2.355-2.472 1.353.235 3.551.687 4.041-.804 1.786-5.396 4.473-10.32 6.788-15.44 1.334-2.963-1.746-5.808-2.118-8.83-.373-2.903-2.767-5.375-1.845-8.475 1.295-4.277 4.375-7.494 6.867-11.065l.785-.785c2.138-3.178 4.63-5.925 8.475-7.063.589-.313 1.884.256 1.687-.98-.156-1.06-1.275-.51-1.903-.51-30.056.02-60.112.078-90.189-.099-3.511-.02-4.061 1.197-3.492 4.042v68.235c.02.785.039 1.57.039 2.354ZM213.186 66.55h-.137V51.07c0-.568.255-1.294-.824-1.274-1.079.02-.765.784-.765 1.314-.079 10.065-.138 20.13-.216 30.194 0 1.118.471 1.844 1.491 2.236.079.04.432-.294.432-.431.019-5.533.019-11.046.019-16.559Z"/><path fill="#F18928" stroke="#F18928" stroke-width=".281" d="M245.54 49.836c.02 34.844.02 69.687.039 104.53 0 9.3 0 18.58.02 27.879 0 .805-.196 1.06-1.02 1.04-2.296-.059-4.571.059-6.867-.039-2.119-.098-4.12-.314-3.374 2.884.039.137-.648.608-1.001.608-41.122.02-82.243.02-123.365-.02-1.883 0-.471-1.628-.843-2.393.215-.216.431-.432.627-.648 2.139-2.374 4.277-4.747 6.396-7.121 7.593-.118 15.205-.157 22.798-.51.882-.04 1.079 2.805 2.158.412.372-.824 1.059-1.491 1.589-2.237-.118.549-.51 1.256-.314 1.628.589 1.079 1.04-.137 1.334-.353 1.903-1.53 3.532.196 5.121.589 1.039.255 1.726 2.06 2.511 3.198.687 1 1.275 2.079 1.903 3.119.039-.863.118-1.726.137-2.57.02-.785-.078-1.569.02-2.354.314-2.472-.216-4.787 2.943-6.651 2.531-1.491 6.317-3.453 5.63-7.985-.294-1.923 0-3.924.04-5.905 1.962-1.413 3.943-2.845 5.905-4.258 2.766-2.374 5.964-3.904 9.417-4.963h.294c.157-.059.334-.138.491-.197 3.885.393 3.433-2.805 4.12-5.022 5.003-1.903 10.692 1.766 15.499-1.962 1.334-1.04 3.119-1.589 4.199-2.786 1.805-2.001 3.688-3.512 6.454-3.983 1.531-.255 4.003.746 4.434-1.216.451-2.04-.353-4.336-.608-6.533.942-1.177 1.864-2.335 2.805-3.512.785-2.433 2.374-.569 3.552-.608 3.943-.177 4.571-3.787 6.415-6.062 3.394-4.199 5.434-9.202 7.102-14.224 1.589-4.729.098-9.731.098-14.636.02-12.027 0-24.033.02-36.06 0-.314.157-.647.235-.961.236.117.471.215.687.333-.157.059-.334.118-.491.177.059.059.099.117.157.196.098-.118.216-.235.314-.373 4.179-.196 8.299-.333 12.419-.451Z"/><path fill="#80C9C1" stroke="#80C9C1" stroke-width=".281" d="M109.111 121.621V53.386c.098 0 .216-.02.314-.02 11.929 0 23.857.118 35.785-.078 3.257-.059 5.513.844 7.691 3.217 2.08 2.237 4.709 3.963 7.102 5.906 2.119 1.864 1.138 4.61 1.079 6.592-.157 5.709-.157 11.516-2.001 17.088-.451 1.393-.392 2.982-.863 4.375-.981 2.943.785 6.22-1.472 9.084-1.804 2.295-3.08 5.022-4.59 7.553-1.334 2.138-3.277 3.943-3.532 6.651-.137.039-.274.059-.412.098-2.903-.569-6.376 2.59-8.75-1.393 0 0-.157.059-.177.098-.706 2.217-3.021 2.296-4.532 2.688-6.67 1.746-13.576 1.668-20.384 1.177-4.394-.314-5.787 1.06-4.983 5.18a1.246 1.246 0 0 1-.275.019Z"/><path fill="#95C7DB" stroke="#95C7DB" stroke-width=".281" d="M152.174 107.083c1.51-2.531 2.786-5.258 4.591-7.554 2.256-2.864.49-6.14 1.471-9.083.471-1.393.393-2.963.863-4.375 1.825-5.552 1.825-11.38 2.002-17.088.058-2.002 1.02-4.729-1.08-6.593 2.865 1.315 6.71-.313 8.809 3.63 1.766 3.316 4.356-.844 6.612-.059.412-1.334 1.55-2.256 1.589-3.924.039-1.314.412-4.198 2.001-3.786 4.925 1.295 9.849-.294 14.695.588-2.492 3.571-5.591 6.789-6.867 11.066-.922 3.08 1.472 5.571 1.845 8.475.372 3.021 3.453 5.866 2.118 8.829-2.315 5.12-5.002 10.064-6.788 15.44-.49 1.491-2.688 1.04-4.041.804-2.296-.392-2.531.628-2.355 2.472.118 1.295 0 2.61-.019 3.924-2.767-.137-5.533-.196-8.279-.451-.824-.079-1.609-.628-2.414-.962.393-.784.02-2.02 1.354-2.275.137-.02.373-.51.314-.609a61.742 61.742 0 0 0-2.394-3.08c-.019-.019-.49.236-.667.432-3.57 4.12-7.651 6.768-13.36 4.179Z"/><path fill="#87ADD4" stroke="#87ADD4" stroke-width=".281" d="M193.746 58.84c-4.846-.862-9.77.707-14.694-.588-1.609-.412-1.962 2.472-2.002 3.787-.058 1.667-1.177 2.59-1.589 3.924-2.256-.785-4.846 3.374-6.611.059-2.1-3.944-5.945-2.316-8.809-3.63-2.394-1.942-5.042-3.669-7.102-5.905-2.178-2.374-4.454-3.277-7.691-3.218-11.968.216-23.896.098-35.825.098.628-1.098-1.373-3.472 1.158-3.492 29.605-.098 59.23-.078 88.835 0 1.197 0 2.374.726 3.571 1.118-3.845 1.119-6.337 3.885-8.476 7.063-.255.255-.51.51-.765.785Z"/><path fill="#FEDAA5" stroke="#FEDAA5" stroke-width=".281" d="M190.178 132.568c.196-2.021 1.177-3.021 3.315-3.178 2.237-.157.824-2.276 1.413-3.414 1.354-2.648 2.276-5.572 2.138-8.671.864-.314 1.786-.511 2.551-.981 2.668-1.648 4.571-4.14 8.004-5.082 1.884-.529 3.807-.392 5.572-1 3.237-1.119 3.081-4.63 4.513-7.044 1.765-1.412 2.57-3.354 3.59-5.316.942-1.786-.49-5.2 3.1-5.376 1.059-.059 1.452-.589 1.628-1.491.746-.196 1.507-.377 2.253-.574 1.766 8.672-1.9 15.74-8.256 20.585-4.395 3.336-4.258 7.24-4.964 11.438l-2.805 3.512c-1.001 1.903-2.786.942-4.238 1.118-1.295.157-2.59-.215-3.787.785-4.022 3.394-8.691 5.101-14.027 4.689Z"/><path fill="#FFF1CF" stroke="#FFF1CF" stroke-linejoin="bevel" stroke-width=".281" d="M217.744 103.167c-1.432 2.413-1.303 5.937-4.54 7.074-1.766.609-3.697.466-5.58.996-3.434.942-5.342 3.44-8.01 5.088-.765.471-1.722.671-2.566.985-2.805-1.707-5.61-3.466-8.435-5.173.255 0 .589-.118.765 0 4.356 2.688 2.021-2.06 2.021-2.295.157-5.042 3.335-6.357 8.103-7.024 4.336-.608 8.161 2.453 12.242.491.883-.432 1.609-1.158 2.413-1.747 1.197.53 2.41 1.075 3.587 1.605Z"/><path fill="#A29EA1" stroke="#A29EA1" stroke-width=".281" d="M182.244 142.448c-.707 2.241-.236 5.424-4.127 5.031-.084-.231-.438.016-.491.217-.099 0-.247-.07-.345-.07-.589-11.222-.107-22.453-1.955-33.596.157-1.75 1.258-2.772 2.752-3.499 3.36 1.671 7.291-.57 10.573 1.592 2.81 1.71 5.565 3.471 8.395 5.181.137 3.105-.73 5.963-2.086 8.635-.59 1.14.825 3.263-1.415 3.42-2.142.138-3.125 1.16-3.322 3.184a1193.873 1193.873 0 0 0-7.979 9.905Z"/><path fill="#797AAA" stroke="#797AAA" stroke-width=".281" d="M109.111 121.621c.098 0 .197-.02.295-.02 12.046.432 24.092 1.001 36.118-.372-3.492 4.453-6.945 8.161-13.713 7.572-7.318-.627-14.774.236-22.15.471-.177-1.765-.334-3.531-.51-5.297-.02-.785-.04-1.569-.04-2.354Z"/><path fill="#F8B570" d="M215.033 122.465c.706-4.199.569-8.103 4.964-11.438 6.356-4.846 10.025-11.91 8.24-20.58 2.217-.668 3.669-1.63 3.629-4.454-.157-11.811-.058-23.641-.039-35.452 0-.353.393-1 .628-1 4.218-.079 8.417-.079 12.635-.06.157 0 .294.236.451.373-4.12.118-8.24.255-12.36.373-.236-.118-.471-.216-.687-.333-.078.314-.235.647-.235.96-.02 12.027 0 24.034-.02 36.06-.019 4.886 1.491 9.909-.098 14.637-1.687 5.022-3.708 10.025-7.102 14.224-1.844 2.275-2.472 5.905-6.416 6.062-1.216.059-2.805-1.805-3.59.628Z"/><path fill="#87ADD4" d="M178.135 110.508c-1.471.726-2.634 1.832-2.81 3.578-.785.53-1.59 1.079-2.374 1.609-3.924-.118-7.828-.255-11.752-.373-.785-.117-1.57-.255-2.354-.372-3.238-1.864-6.789-.942-10.202-1.217.255-2.707 2.197-4.512 3.531-6.651 5.709 2.57 9.77-.078 13.38-4.198.177-.196.648-.451.667-.432a61.742 61.742 0 0 1 2.394 3.08c.059.099-.157.569-.314.609-1.334.255-.942 1.491-1.354 2.275.805.334 1.589.883 2.413.962 2.747.235 5.591.272 8.358.41.137.255.28.465.417.72Z"/><path fill="#DDC4E0" d="M213.224 66.528c0 5.536-.029 11.224-.049 16.76 0 .157-.355.473-.434.433-1.004-.394-1.497-1.103-1.497-2.246.079-10.106.112-20.222.191-30.329 0-.532-.297-1.34.786-1.36 1.064-.02.861.712.88 1.283 0 5.181-.015 10.258-.015 15.44.039.02.079.02.138.02Z"/><path fill="#F8C9D1" stroke="#F8C9D1" stroke-width=".281" d="M217.684 103.218c-1.177-.529-2.394-1.157-3.571-1.687 1.707-2.374 4.14-4.512 4.905-7.161 1.216-4.218 4.326-3.379 7.151-3.398-.177.902-.696 1.495-1.756 1.534-3.59.177-2.099 3.61-3.041 5.395-1 1.982-1.922 3.905-3.688 5.317Z"/><path fill="#95C7DB" stroke="#95C7DB" stroke-width=".281" d="M202.987 50.993c-1.196-.393-2.373-1.118-3.57-1.118-29.605-.06-59.23-.099-88.836 0-2.53 0-.549 2.373-1.157 3.492-.098 0-.216.02-.314.02-.589-2.845-.039-4.062 3.473-4.042 30.056.177 60.132.098 90.189.137.647 0 1.746-.55 1.903.51.215 1.256-1.079.687-1.688 1Z"/><path fill="#9B8BC1" d="M109.131 123.977c.177 1.765.333 3.531.51 5.297-.078 1.196-.235 2.393-.235 3.59-.02 16.559-.02 33.117 0 49.676 0 .372.215.745.333 1.118-.216.216-.431.431-.628.647 0-20.109.02-40.219.02-60.328Z"/><path fill="#95C7DB" d="m193.748 58.84.785-.785c-.275.255-.53.51-.785.785Z"/><path fill="#6E5EA6" stroke="#6E5EA6" stroke-width=".281" d="M109.737 183.656c-.118-.372-.334-.745-.334-1.118-.019-16.559-.019-33.117 0-49.676 0-1.196.157-2.393.236-3.59 7.396-.216 14.832-1.099 22.15-.471 6.768.589 10.221-3.119 13.714-7.573.098-.019.215-.039.313-.078 1.374-.51 2.021.275 3.218.981 4.65 2.707 9.711 1.314 14.165-.844 2.982-1.432 5.022-.588 6.062 1.629 2.708 5.866 1.531 12.32 2.237 18.5.804 6.946-3.394 5.278-6.985 5.298-2.393.019-4.767.039-7.161-.02a2.603 2.603 0 0 1-1.491-.569c-2.648-2.119-5.768.451-8.475-.883-2.904-1.432-4.846 2.178-7.514 1.393-.824-.235-1.432-1.825-2.139-1.805-4.237.079-8.514.098-12.105 3.041-1.55 1.275-4.159 1.55-4.277 4.1-.196 3.944-.157 7.907-.137 11.85.02 3.63.059 3.63 2.139 4.375.117.04.147.337.205.514-2.472 2.609-4.934 5.215-7.406 7.805-2.138 2.393-4.277 4.767-6.415 7.141Z"/><path fill="#797AAA" stroke="#797AAA" stroke-width=".281" d="M123.55 168.727c-.059-.177-.078-.471-.196-.51-2.08-.746-2.119-.726-2.138-4.375-.02-3.944-.04-7.907.137-11.85.118-2.551 2.727-2.825 4.277-4.101 3.59-2.942 7.867-2.982 12.105-3.041.686-.019 1.314 1.57 2.138 1.805 2.668.785 4.611-2.825 7.514-1.393 2.688 1.335 5.827-1.236 8.476.883.392.314.981.55 1.491.569 2.393.059 4.767.039 7.161.02 3.59-.02 7.769 1.648 6.984-5.297-.706-6.18.471-12.635-2.236-18.501-1.021-2.217-3.081-3.061-6.063-1.628-4.453 2.158-9.515 3.551-14.165.843-1.196-.706-1.844-1.491-3.217-.981.804-2.433 1.606-4.902 2.411-7.335.137-.039.278-.061.416-.101 3.413.275 6.961-.652 10.199 1.212.784.118 1.575.257 2.359.375.53.902 10.772 1.205 11.737.38.785-.53 1.603-1.097 2.387-1.627 1.845 11.124 1.391 22.438 1.98 33.641-3.453 1.04-6.671 2.57-9.418 4.963-3.296-.137-6.67.059-9.888-.51-4.591-.804-8.122 1.177-11.673 3.434-1.471.922-3.08 1.157-4.63.706-5.317-1.511-10.163 1.726-9.888 7.102.196 3.61-.275 5.748-4.591 4.532-.883-.255-1.962.157-2.943.255-.235.157-.49.334-.726.53Z"/><path fill="#A29EA1" stroke="#A29EA1" stroke-width=".281" d="M124.297 168.177c.981-.098 2.06-.51 2.943-.255 4.336 1.216 4.787-.903 4.591-4.532-.275-5.376 4.551-8.613 9.888-7.102 1.55.451 3.158.216 4.63-.706 3.551-2.237 7.082-4.238 11.673-3.434 3.218.569 6.592.373 9.888.51-1.962 1.413-3.943 2.845-5.905 4.258-.687.412-1.354.824-2.041 1.216-1.805-.039-1.785 2.315-2.589 2.511-4.081 1.04-5.749 4.885-8.829 7.004-.314-.569-.53-.726-1.275-.314-1.158.628-2.492 1.197-3.787 1.256-5.925.255-11.83.334-17.755.392-.49.02-.961-.529-1.432-.804Z"/><path fill="#F8B570" d="M190.178 132.569c5.336.431 10.006-1.295 14.047-4.689 1.197-1.001 2.492-.628 3.787-.785 1.452-.177 3.237.785 4.237-1.118.256 2.197 1.04 4.492.609 6.533-.432 1.981-2.904.961-4.434 1.216-2.767.471-4.65 1.962-6.455 3.983-1.099 1.216-2.884 1.765-4.198 2.786-4.807 3.747-10.497.059-15.5 1.962 2.61-3.296 5.258-6.592 7.907-9.888Z"/><path fill="#B59259" stroke="#B59259" stroke-width=".281" d="M124.295 168.179c.482.285.959.821 1.43.802 5.925-.079 11.85-.156 17.755-.391 1.295-.059 2.626-.622 3.783-1.269.746-.412.991-.252 1.305.317-.118.157-.239.325-.357.482-1.844 2.021-3.669 4.061-5.513 6.082-.549.746-1.216 1.413-1.589 2.237-1.079 2.393-1.256-.452-2.158-.412-7.593.372-15.22.385-22.812.503 2.472-2.609 4.932-5.214 7.404-7.804.235-.196.497-.37.752-.547Z"/><path fill="#F8B570" d="M142.698 174.179c1.844-2.021 3.669-4.061 5.513-6.082 2.629 1.354 4.611-1.02 6.985-1.256 2.177-.216 5.101.098 4.453-3.825-.255-1.57.177-3.238.294-4.866.687-.412 1.354-.824 2.041-1.216-.02 1.962-.334 3.982-.039 5.905.686 4.532-3.1 6.494-5.631 7.985-3.159 1.864-2.629 4.179-2.943 6.651-.098.765 0 1.569-.02 2.354-.019.863-.098 1.727-.137 2.57-.628-1.04-1.216-2.119-1.903-3.119-.785-1.158-1.471-2.943-2.511-3.198-1.589-.393-3.218-2.099-5.121-.589-.274.216-.726 1.432-1.334.353-.157-.392.236-1.098.353-1.667Z"/><path fill="#A29EA1" stroke="#A29EA1" stroke-width=".281" d="M148.23 113.832c-.804 2.433-1.589 4.885-2.393 7.318-.098.02-.216.039-.314.079-12.027 1.393-24.073.804-36.119.372-.804-4.1.608-5.473 4.983-5.179 6.808.471 13.714.549 20.385-1.177 1.51-.392 3.825-.491 4.532-2.688.019-.059.176-.098.176-.098 2.374 3.963 5.866.824 8.75 1.373Z"/><path fill="#7D89C1" stroke="#7D89C1" stroke-width=".281" d="M172.951 115.697c-.844.863-11.202.53-11.752-.373 3.924.118 7.848.255 11.752.373Z"/><path fill="#7D89C1" d="M161.2 115.324c-.785-.118-1.57-.255-2.354-.373.784.118 1.569.255 2.354.373Z"/></g><path fill="#FEDAA5" d="M141.064 255.891v-2.453l-2.163-4.056h1.165l.83 1.623.672 1.389h.056l.68-1.389.83-1.623h1.138l-2.164 4.056v2.453h-1.044Zm6.393.112c-.41 0-.768-.075-1.072-.224a2.057 2.057 0 0 1-.746-.662 3.057 3.057 0 0 1-.429-1.054 6.574 6.574 0 0 1-.14-1.426c0-.529.047-1.001.14-1.418.093-.422.236-.777.429-1.063.199-.286.447-.503.746-.652.304-.156.662-.234 1.072-.234.41 0 .764.078 1.063.234.304.149.553.366.746.652.199.286.345.641.438 1.063.093.417.14.889.14 1.418 0 .534-.047 1.01-.14 1.426a2.95 2.95 0 0 1-.438 1.054 1.972 1.972 0 0 1-.746.662c-.299.149-.653.224-1.063.224Zm0-.868c.466 0 .796-.174.988-.522.193-.354.289-.833.289-1.436v-1.091c0-.596-.096-1.069-.289-1.417-.192-.354-.522-.531-.988-.531-.466 0-.796.177-.988.531-.193.348-.29.821-.29 1.417v1.101c0 .596.097 1.072.29 1.426.192.348.522.522.988.522Zm4.761-5.753v4c0 .268.006.51.019.728.018.217.065.404.139.559a.788.788 0 0 0 .336.345c.149.081.354.121.615.121.262 0 .467-.04.616-.121a.78.78 0 0 0 .335-.345c.075-.155.119-.342.131-.559.019-.218.028-.46.028-.728v-4h1.044v3.814c0 .466-.028.876-.084 1.231-.049.348-.152.64-.307.876-.156.23-.376.404-.662.522-.28.118-.647.178-1.101.178-.453 0-.823-.06-1.109-.178a1.443 1.443 0 0 1-.653-.522 2.222 2.222 0 0 1-.317-.876 8.933 8.933 0 0 1-.074-1.231v-3.814h1.044Zm6.001 6.509h-1.035v-6.509h2.434c.621 0 1.094.174 1.417.523.329.348.494.826.494 1.435 0 .498-.121.908-.364 1.231-.242.323-.59.522-1.044.597l1.501 2.723h-1.156l-1.38-2.63h-.867v2.63Zm1.249-3.469c.647 0 .97-.295.97-.886v-.401c0-.59-.323-.885-.97-.885h-1.249v2.172h1.249Zm11.471 3.581c-.41 0-.768-.075-1.072-.224a2.057 2.057 0 0 1-.746-.662 3.057 3.057 0 0 1-.429-1.054 6.574 6.574 0 0 1-.14-1.426c0-.529.047-1.001.14-1.418.093-.422.236-.777.429-1.063.199-.286.447-.503.746-.652.304-.156.662-.234 1.072-.234.41 0 .765.078 1.063.234.305.149.553.366.746.652.199.286.345.641.438 1.063.093.417.14.889.14 1.418 0 .534-.047 1.01-.14 1.426a2.95 2.95 0 0 1-.438 1.054 1.965 1.965 0 0 1-.746.662c-.298.149-.653.224-1.063.224Zm0-.868c.466 0 .796-.174.988-.522.193-.354.29-.833.29-1.436v-1.091c0-.596-.097-1.069-.29-1.417-.192-.354-.522-.531-.988-.531-.466 0-.796.177-.988.531-.193.348-.289.821-.289 1.417v1.101c0 .596.096 1.072.289 1.426.192.348.522.522.988.522Zm3.773.756-.466-6.509h.913l.233 3.786.103 1.669h.075l.736-3.879h1.035l.737 3.879h.074l.103-1.669.242-3.786h.877l-.466 6.509h-1.399l-.662-3.767h-.075l-.662 3.767h-1.398Zm6.84-5.007h-.084v5.007h-.914v-6.509h1.343l1.911 5.007h.084v-5.007h.914v6.509h-1.343l-1.911-5.007Zm12.142 5.007-1.837-6.509h1.128l.858 3.282.569 2.21h.056l.569-2.21.867-3.282h1.082l-1.837 6.509h-1.455Zm4.584 0v-6.509h2.434c.621 0 1.094.174 1.417.523.329.348.494.826.494 1.435 0 .61-.165 1.088-.494 1.436-.323.348-.796.523-1.417.523h-1.39v2.592h-1.044Zm1.044-3.46h1.231c.647 0 .97-.298.97-.895v-.401c0-.59-.323-.885-.97-.885h-1.231v2.181Zm5.712-1.547h-.084v5.007h-.913v-6.509h1.342l1.912 5.007h.084v-5.007h.913v6.509h-1.342l-1.912-5.007Z"/></g><defs><clipPath id="a"><path fill="#fff" d="M0 0h360v301H0z"/></clipPath><pattern id="c" width="1" height="1" patternContentUnits="objectBoundingBox"><use xlink:href="#f" transform="matrix(.00074 0 0 .0009 0 .029)"/></pattern><filter id="b" width="423.429" height="378.001" x="-37.714" y="-34.572" color-interpolation-filters="sRGB" filterUnits="userSpaceOnUse"><feFlood flood-opacity="0" result="BackgroundImageFix"/><feBlend in="SourceGraphic" in2="BackgroundImageFix" result="shape"/><feGaussianBlur result="effect1_foregroundBlur_1029_18281" stdDeviation="42.857"/></filter><image xlink:href="data:image/png;base64,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" id="f" width="1344" height="1038" data-name="image.png"/></defs></svg>
\ No newline at end of file
diff --git a/client/images/controls/arrow-left.svg b/client/images/controls/arrow-left.svg
new file mode 100644
index 00000000..98c9950b
--- /dev/null
+++ b/client/images/controls/arrow-left.svg
@@ -0,0 +1,4 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M19 12H5" stroke="#CBCBCB" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M12 19L5 12L12 5" stroke="#CBCBCB" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/client/resources.qrc b/client/resources.qrc
index bda89bf2..f95ef585 100644
--- a/client/resources.qrc
+++ b/client/resources.qrc
@@ -176,5 +176,17 @@
         <file>ui/qml/Controls2/CardType.qml</file>
         <file>ui/qml/Controls2/CheckBoxType.qml</file>
         <file>images/controls/check.svg</file>
+        <file>ui/qml/Controls2/DropDownType.qml</file>
+        <file>ui/qml/Pages2/PageStart.qml</file>
+        <file>ui/qml/main2.qml</file>
+        <file>ui/qml/PageLoader.qml</file>
+        <file>images/amneziaBigLogo.png</file>
+        <file>images/amneziaBigLogo.svg</file>
+        <file>ui/qml/Controls2/BodyTextType.qml</file>
+        <file>ui/qml/Controls2/FlickableType.qml</file>
+        <file>ui/qml/Controls2/Header2TextType.qml</file>
+        <file>ui/qml/Pages2/PageCredentials.qml</file>
+        <file>ui/qml/Controls2/HeaderTextType.qml</file>
+        <file>images/controls/arrow-left.svg</file>
     </qresource>
 </RCC>
diff --git a/client/ui/pages.h b/client/ui/pages.h
index a639d63b..c33289bb 100644
--- a/client/ui/pages.h
+++ b/client/ui/pages.h
@@ -24,7 +24,7 @@ enum class Page {Start = 0, NewServer, NewServerProtocols, Vpn,
            Wizard, WizardLow, WizardMedium, WizardHigh, WizardVpnMode, ServerConfiguringProgress,
            GeneralSettings, AppSettings, NetworkSettings, ServerSettings,
            ServerContainers, ServersList, ShareConnection,  Sites,
-           ProtocolSettings, ProtocolShare, QrDecoder, QrDecoderIos, About, ViewConfig, AdvancedServerSettings, Test};
+           ProtocolSettings, ProtocolShare, QrDecoder, QrDecoderIos, About, ViewConfig, AdvancedServerSettings, Test, Credentials};
 Q_ENUM_NS(Page)
 
 static void declareQmlPageEnum() {
diff --git a/client/ui/qml/Controls2/BodyTextType.qml b/client/ui/qml/Controls2/BodyTextType.qml
new file mode 100644
index 00000000..9d789385
--- /dev/null
+++ b/client/ui/qml/Controls2/BodyTextType.qml
@@ -0,0 +1,12 @@
+import QtQuick
+
+Text {
+    text: root.bodyText
+    wrapMode: Text.WordWrap
+    color: "#D7D8DB"
+    font.pixelSize: 16
+    font.weight: 400
+    font.family: "PT Root UI VF"
+
+    height: 24
+}
diff --git a/client/ui/qml/Controls2/DropDownType.qml b/client/ui/qml/Controls2/DropDownType.qml
new file mode 100644
index 00000000..5560aee7
--- /dev/null
+++ b/client/ui/qml/Controls2/DropDownType.qml
@@ -0,0 +1,5 @@
+import QtQuick
+
+Item {
+
+}
diff --git a/client/ui/qml/Controls2/FlickableType.qml b/client/ui/qml/Controls2/FlickableType.qml
new file mode 100644
index 00000000..b7c1203f
--- /dev/null
+++ b/client/ui/qml/Controls2/FlickableType.qml
@@ -0,0 +1,23 @@
+import QtQuick 2.12
+import QtQuick.Controls 2.12
+import "../Config"
+
+Flickable {
+    id: fl
+
+    clip: true
+    width: parent.width
+
+    anchors.bottom: parent.bottom
+    anchors.left: root.left
+    anchors.right: root.right
+    anchors.rightMargin: 1
+
+    Keys.onUpPressed: scrollBar.decrease()
+    Keys.onDownPressed: scrollBar.increase()
+
+    ScrollBar.vertical: ScrollBar {
+        id: scrollBar
+        policy: fl.height >= fl.contentHeight ? ScrollBar.AlwaysOff : ScrollBar.AlwaysOn
+    }
+}
diff --git a/client/ui/qml/Controls2/Header2TextType.qml b/client/ui/qml/Controls2/Header2TextType.qml
new file mode 100644
index 00000000..4bbbc0d6
--- /dev/null
+++ b/client/ui/qml/Controls2/Header2TextType.qml
@@ -0,0 +1,10 @@
+import QtQuick
+
+Text {
+    color: "#D7D8DB"
+    font.pixelSize: 25
+    font.weight: 700
+    font.family: "PT Root UI VF"
+
+    height: 30
+}
diff --git a/client/ui/qml/Controls2/HeaderTextType.qml b/client/ui/qml/Controls2/HeaderTextType.qml
new file mode 100644
index 00000000..60fa4e95
--- /dev/null
+++ b/client/ui/qml/Controls2/HeaderTextType.qml
@@ -0,0 +1,40 @@
+import QtQuick
+import QtQuick.Layouts
+
+ColumnLayout {
+    id: root
+
+    property string buttonImage
+    property string headerText
+    property var wrapMode
+
+    ImageButtonType {
+        id: button
+
+        Layout.leftMargin: -6
+
+        hoverEnabled: false
+        image: root.buttonImage
+        onClicked: {
+            if (onClickedFunc && typeof onClickedFunc === "function") {
+                onClickedFunc()
+            }
+        }
+    }
+
+    Text {
+        id: header
+
+        text: root.headerText
+
+        color: "#D7D8DB"
+        font.pixelSize: 36
+        font.weight: 700
+        font.family: "PT Root UI VF"
+        font.letterSpacing: -0.03
+
+        wrapMode: Text.WordWrap
+
+        height: 38
+    }
+}
diff --git a/client/ui/qml/Controls2/TextFieldWithHeaderType.qml b/client/ui/qml/Controls2/TextFieldWithHeaderType.qml
index 18f62344..dd0d2907 100644
--- a/client/ui/qml/Controls2/TextFieldWithHeaderType.qml
+++ b/client/ui/qml/Controls2/TextFieldWithHeaderType.qml
@@ -7,6 +7,7 @@ Item {
 
     property string headerText
     property string textFieldText
+    property string textFieldPlaceholderText
     property bool textFieldEditable: true
 
     implicitWidth: 328
@@ -45,6 +46,9 @@ Item {
             enabled: root.textFieldEditable
             text: root.textFieldText
             color: "#d7d8db"
+
+            placeholderText: textFieldPlaceholderText
+
             font.pixelSize: 16
             font.weight: 400
             font.family: "PT Root UI VF"
diff --git a/client/ui/qml/PageLoader.qml b/client/ui/qml/PageLoader.qml
new file mode 100644
index 00000000..5f2fc3c2
--- /dev/null
+++ b/client/ui/qml/PageLoader.qml
@@ -0,0 +1,57 @@
+import QtQuick
+
+import Qt.labs.folderlistmodel
+
+import PageType 1.0
+
+Item {
+    property var pages: ({})
+
+    signal finished()
+
+    FolderListModel {
+        id: folderModelPages
+        folder: "qrc:/ui/qml/Pages2/"
+        nameFilters: ["*.qml"]
+        showDirs: false
+
+        onStatusChanged: {
+            if (status == FolderListModel.Ready) {
+                for (var i = 0; i < folderModelPages.count; i++) {
+                    createPagesObjects(folderModelPages.get(i, "filePath"), PageType.Basic);
+                }
+                finished()
+            }
+        }
+
+        function createPagesObjects(file, type) {
+            if (file.indexOf("Base") !== -1) {
+                return; // skip Base Pages
+            }
+
+            var c = Qt.createComponent("qrc" + file);
+
+            var finishCreation = function(component) {
+                if (component.status === Component.Ready) {
+                    var obj = component.createObject(root);
+                    if (obj === null) {
+                        console.debug("Error creating object " + component.url);
+                    } else {
+                        obj.visible = false
+                        if (type === PageType.Basic) {
+                            pages[obj.page] = obj
+                        }
+                    }
+                } else if (component.status === Component.Error) {
+                    console.debug("Error loading component:", component.errorString());
+                }
+            }
+
+            if (c.status === Component.Ready) {
+                finishCreation(c);
+            } else {
+                console.debug("Warning: " + file + " page components are not ready " + c.errorString());
+            }
+        }
+    }
+}
diff --git a/client/ui/qml/Pages/PageTest.qml b/client/ui/qml/Pages/PageTest.qml
index 9f820389..4c571ae0 100644
--- a/client/ui/qml/Pages/PageTest.qml
+++ b/client/ui/qml/Pages/PageTest.qml
@@ -13,7 +13,6 @@ PageBase {
     logic: ViewConfigLogic
 
     Rectangle {
-        y: 0
         anchors.fill: parent
         color: "#0E0E11"
     }
diff --git a/client/ui/qml/Pages2/PageCredentials.qml b/client/ui/qml/Pages2/PageCredentials.qml
new file mode 100644
index 00000000..509ee6a6
--- /dev/null
+++ b/client/ui/qml/Pages2/PageCredentials.qml
@@ -0,0 +1,83 @@
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+
+import PageEnum 1.0
+
+import "./"
+import "../Pages"
+import "../Controls2"
+import "../Config"
+
+PageBase {
+    id: root
+    page: PageEnum.Credentials
+
+    FlickableType {
+        id: fl
+        anchors.top: root.top
+        anchors.bottom: root.bottom
+        contentHeight: content.height
+
+        ColumnLayout {
+            id: content
+
+            anchors.top: parent.top
+            anchors.left: parent.left
+            anchors.right: parent.right
+            anchors.rightMargin: 16
+            anchors.leftMargin: 16
+
+            spacing: 16
+
+            HeaderTextType {
+                Layout.fillWidth: true
+                Layout.bottomMargin: 16
+                Layout.topMargin: 66
+
+                Layout.preferredWidth: 328
+
+                buttonImage: "qrc:/images/controls/arrow-left.svg"
+
+                headerText: "Подключение к серверу"
+                wrapMode: Text.WordWrap
+            }
+
+            TextFieldWithHeaderType {
+                Layout.fillWidth: true
+                headerText: "Server IP adress [:port]"
+            }
+
+            TextFieldWithHeaderType {
+                Layout.fillWidth: true
+                headerText: "Login to connect via SSH"
+            }
+
+            TextFieldWithHeaderType {
+                Layout.fillWidth: true
+                headerText: "Password / Private key"
+            }
+
+            BasicButtonType {
+                Layout.fillWidth: true
+                Layout.topMargin: 40
+
+                text: qsTr("Настроить сервер простым образом")
+            }
+
+            BasicButtonType {
+                Layout.fillWidth: true
+                Layout.topMargin: 8
+
+                defaultColor: "transparent"
+                hoveredColor: Qt.rgba(255, 255, 255, 0.08)
+                pressedColor: Qt.rgba(255, 255, 255, 0.12)
+                disabledColor: "#878B91"
+                textColor: "#D7D8DB"
+                borderWidth: 1
+
+                text: qsTr("Выбрать протокол для установки")
+            }
+        }
+    }
+}
diff --git a/client/ui/qml/Pages2/PageStart.qml b/client/ui/qml/Pages2/PageStart.qml
new file mode 100644
index 00000000..6f8f0356
--- /dev/null
+++ b/client/ui/qml/Pages2/PageStart.qml
@@ -0,0 +1,163 @@
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+
+import PageEnum 1.0
+
+import "./"
+import "../Pages"
+import "../Controls2"
+import "../Config"
+
+PageBase {
+    id: root
+    page: PageEnum.Start
+
+    FlickableType {
+        id: fl
+        anchors.top: root.top
+        anchors.bottom: root.bottom
+        contentHeight: content.height
+
+        ColumnLayout {
+            id: content
+
+            anchors.top: parent.top
+            anchors.left: parent.left
+            anchors.right: parent.right
+
+            Image {
+                id: image
+                source: "qrc:/images/amneziaBigLogo.png"
+
+                Layout.alignment: Qt.AlignCenter
+                Layout.topMargin: 80
+                Layout.leftMargin: 8
+                Layout.rightMargin: 8
+                Layout.preferredWidth: 344
+                Layout.preferredHeight: 279
+            }
+
+            BodyTextType {
+                Layout.fillWidth: true
+                Layout.topMargin: 50
+                Layout.leftMargin: 16
+                Layout.rightMargin: 16
+
+                text: "Бесплатный сервис для создания личного VPN на вашем сервере. Помогаем получать доступ к заблокированному контенту, не раскрывая конфиденциальность даже провайдерам VPN."
+            }
+
+            BasicButtonType {
+                Layout.fillWidth: true
+                Layout.topMargin: 32
+                Layout.leftMargin: 16
+                Layout.rightMargin: 16
+
+                text: qsTr("У меня есть данные для подключения")
+
+                onClicked: {
+                    drawer.visible = true
+                }
+            }
+
+            BasicButtonType {
+                Layout.fillWidth: true
+                Layout.topMargin: 8
+                Layout.leftMargin: 16
+                Layout.rightMargin: 16
+
+                defaultColor: "transparent"
+                hoveredColor: Qt.rgba(255, 255, 255, 0.08)
+                pressedColor: Qt.rgba(255, 255, 255, 0.12)
+                disabledColor: "#878B91"
+                textColor: "#D7D8DB"
+                borderWidth: 1
+
+                text: qsTr("У меня ничего нет")
+
+//                onClicked: {
+//                    UiLogic.goToPage(PageEnum.Start)
+//                }
+            }
+        }
+
+        Drawer {
+            id: drawer
+
+            y: 0
+            x: 0
+            edge: Qt.BottomEdge
+            width: parent.width
+            height: parent.height * 0.4375
+
+            clip: true
+
+            background: Rectangle {
+                anchors.fill: parent
+                anchors.bottomMargin: -radius
+                radius: 16
+                color: "#1C1D21"
+            }
+
+            modal: true
+            //interactive: activeFocus
+
+//            onAboutToHide: {
+//                pageLoader.focus = true
+//            }
+//            onAboutToShow: {
+//                tfSshLog.focus = true
+//            }
+
+            ColumnLayout {
+                anchors.top: parent.top
+                anchors.left: parent.left
+                anchors.right: parent.right
+
+                anchors.rightMargin: 16
+                anchors.leftMargin: 16
+
+                Header2TextType {
+                    Layout.fillWidth: true
+                    Layout.topMargin: 24
+                    Layout.alignment: Qt.AlignHCenter
+
+                    text: "Данные для подключения"
+                }
+
+                LabelWithButtonType {
+                    id: ip
+                    Layout.fillWidth: true
+                    Layout.topMargin: 32
+
+                    text: "IP, логин и пароль от сервера"
+                    buttonImage: "qrc:/images/controls/chevron-right.svg"
+
+                    onClickedFunc: function() {
+                        UiLogic.goToPage(PageEnum.Credentials)
+                    }
+                }
+                Rectangle {
+                    Layout.fillWidth: true
+                    height: 1
+                    color: "#2C2D30"
+                }
+                LabelWithButtonType {
+                    Layout.fillWidth: true
+
+                    text: "QR-код, ключ или файл настроек"
+                    buttonImage: "qrc:/images/controls/chevron-right.svg"
+
+    //                onClickedFunc: function() {
+    //                    UiLogic.goToPage(PageEnum.Start)
+    //                }
+                }
+                Rectangle {
+                    Layout.fillWidth: true
+                    height: 1
+                    color: "#2C2D30"
+                }
+            }
+        }
+    }
+}
diff --git a/client/ui/qml/main.qml b/client/ui/qml/main.qml
index b8758384..5194073e 100644
--- a/client/ui/qml/main.qml
+++ b/client/ui/qml/main.qml
@@ -85,7 +85,6 @@ Window  {
     }
 
     Rectangle {
-        y: 0
         anchors.fill: parent
         color: "white"
     }
diff --git a/client/ui/qml/main2.qml b/client/ui/qml/main2.qml
new file mode 100644
index 00000000..deb64e89
--- /dev/null
+++ b/client/ui/qml/main2.qml
@@ -0,0 +1,142 @@
+import QtQuick
+import QtQuick.Window
+import QtQuick.Controls
+import QtQuick.Layouts
+
+import PageType 1.0
+
+import "Config"
+
+Window  {
+    id: root
+    visible: true
+    width: GC.screenWidth
+    height: GC.screenHeight
+    minimumWidth: GC.isDesktop() ? 360 : 0
+    minimumHeight: GC.isDesktop() ? 640 : 0
+    onClosing: function() {
+        console.debug("QML onClosing signal")
+        UiLogic.onCloseWindow()
+    }
+
+    title: "AmneziaVPN"
+
+    function gotoPage(type, page, reset, slide) {
+        let p_obj;
+        if (type === PageType.Basic) p_obj = pageLoader.pages[page]
+        else if (type === PageType.Proto) p_obj = protocolPages[page]
+        else if (type === PageType.ShareProto) p_obj = sharePages[page]
+        else return
+
+        if (pageStackView.depth > 0) {
+            pageStackView.currentItem.deactivated()
+        }
+
+        if (slide) {
+            pageStackView.push(p_obj, {}, StackView.PushTransition)
+        } else {
+            pageStackView.push(p_obj, {}, StackView.Immediate)
+        }
+
+//        if (reset) {
+//            p_obj.logic.onUpdatePage();
+//        }
+
+        p_obj.activated(reset)
+    }
+
+    function closePage() {
+        if (pageStackView.depth <= 1) {
+            return
+        }
+        pageStackView.currentItem.deactivated()
+        pageStackView.pop()
+    }
+
+    function setStartPage(page, slide) {
+        if (pageStackView.depth > 0) {
+            pageStackView.currentItem.deactivated()
+        }
+
+        pageStackView.clear()
+        if (slide) {
+            pageStackView.push(pages[page], {}, StackView.PushTransition)
+        } else {
+            pageStackView.push(pages[page], {}, StackView.Immediate)
+        }
+        if (page === PageEnum.Start) {
+            UiLogic.pushButtonBackFromStartVisible = !pageStackView.empty
+            UiLogic.onUpdatePage();
+        }
+    }
+
+    Rectangle {
+        anchors.fill: parent
+        color: "#0E0E11"
+    }
+
+    StackView {
+        id: pageStackView
+        anchors.fill: parent
+        focus: true
+
+        onCurrentItemChanged: function() {
+            UiLogic.currentPageValue = currentItem.page
+        }
+
+        onDepthChanged: function() {
+            UiLogic.pagesStackDepth = depth
+        }
+
+        Keys.onPressed: function(event) {
+            UiLogic.keyPressEvent(event.key)
+            event.accepted = true
+        }
+    }
+
+    Connections {
+        target: UiLogic
+        function onGoToPage(page, reset, slide) {
+            root.gotoPage(PageType.Basic, page, reset, slide)
+        }
+
+        function onGoToProtocolPage(protocol, reset, slide) {
+            root.gotoPage(PageType.Proto, protocol, reset, slide)
+        }
+
+        function onGoToShareProtocolPage(protocol, reset, slide) {
+            root.gotoPage(PageType.ShareProto, protocol, reset, slide)
+        }
+
+        function onClosePage() {
+            root.closePage()
+        }
+
+        function onSetStartPage(page, slide) {
+            root.setStartPage(page, slide)
+        }
+
+        function onShow() {
+            root.show()
+        }
+
+        function onHide() {
+            root.hide()
+        }
+
+        function onRaise() {
+            root.show()
+            root.raise()
+            root.requestActivate()
+        }
+    }
+
+    PageLoader {
+        id: pageLoader
+
+        onFinished: {
+            UiLogic.initalizeUiLogic()
+        }
+    }
+
+}

From 3d63d6c0f2c64c62b40bc53622b796b851588d2a Mon Sep 17 00:00:00 2001
From: "vladimir.kuznetsov" <nethiuswork@gmail.com>
Date: Fri, 14 Apr 2023 19:31:10 +0300
Subject: [PATCH 006/278] added PageSetupWizardCredentials and
 PageSetupWizardProtocols

- fixed hover and pressed effects for controls
---
 client/resources.qrc                          |   4 +-
 client/ui/pages.h                             |   4 +-
 client/ui/qml/Controls2/CardType.qml          |  38 ++++---
 client/ui/qml/Controls2/CheckBoxType.qml      |   4 +-
 client/ui/qml/Controls2/HeaderTextType.qml    |  66 ++++++++----
 client/ui/qml/Controls2/ImageButtonType.qml   |   4 +-
 .../ui/qml/Controls2/LabelWithButtonType.qml  |  44 ++++++--
 .../qml/Controls2/TextFieldWithHeaderType.qml |   8 +-
 ...als.qml => PageSetupWizardCredentials.qml} |  24 +++--
 client/ui/qml/Pages2/PageSetupWizardEasy.qml  |  74 +++++++++++++
 .../qml/Pages2/PageSetupWizardProtocols.qml   | 102 ++++++++++++++++++
 client/ui/qml/Pages2/PageStart.qml            |  10 +-
 12 files changed, 314 insertions(+), 68 deletions(-)
 rename client/ui/qml/Pages2/{PageCredentials.qml => PageSetupWizardCredentials.qml} (78%)
 create mode 100644 client/ui/qml/Pages2/PageSetupWizardEasy.qml
 create mode 100644 client/ui/qml/Pages2/PageSetupWizardProtocols.qml

diff --git a/client/resources.qrc b/client/resources.qrc
index f95ef585..f14c28ae 100644
--- a/client/resources.qrc
+++ b/client/resources.qrc
@@ -185,8 +185,10 @@
         <file>ui/qml/Controls2/BodyTextType.qml</file>
         <file>ui/qml/Controls2/FlickableType.qml</file>
         <file>ui/qml/Controls2/Header2TextType.qml</file>
-        <file>ui/qml/Pages2/PageCredentials.qml</file>
+        <file>ui/qml/Pages2/PageSetupWizardCredentials.qml</file>
         <file>ui/qml/Controls2/HeaderTextType.qml</file>
         <file>images/controls/arrow-left.svg</file>
+        <file>ui/qml/Pages2/PageSetupWizardProtocols.qml</file>
+        <file>ui/qml/Pages2/PageSetupWizardEasy.qml</file>
     </qresource>
 </RCC>
diff --git a/client/ui/pages.h b/client/ui/pages.h
index c33289bb..4aba79f2 100644
--- a/client/ui/pages.h
+++ b/client/ui/pages.h
@@ -24,7 +24,9 @@ enum class Page {Start = 0, NewServer, NewServerProtocols, Vpn,
            Wizard, WizardLow, WizardMedium, WizardHigh, WizardVpnMode, ServerConfiguringProgress,
            GeneralSettings, AppSettings, NetworkSettings, ServerSettings,
            ServerContainers, ServersList, ShareConnection,  Sites,
-           ProtocolSettings, ProtocolShare, QrDecoder, QrDecoderIos, About, ViewConfig, AdvancedServerSettings, Test, Credentials};
+           ProtocolSettings, ProtocolShare, QrDecoder, QrDecoderIos, About, ViewConfig, AdvancedServerSettings,
+
+           Test, WizardCredentials, WizardProtocols, WizardEasySetup};
 Q_ENUM_NS(Page)
 
 static void declareQmlPageEnum() {
diff --git a/client/ui/qml/Controls2/CardType.qml b/client/ui/qml/Controls2/CardType.qml
index 31b51f31..fa7ee514 100644
--- a/client/ui/qml/Controls2/CardType.qml
+++ b/client/ui/qml/Controls2/CardType.qml
@@ -9,16 +9,17 @@ RadioButton {
     property string bodyText
     property string footerText
 
-    property string hoveredColor: Qt.rgba(255, 255, 255, 0.05)
-    property string defaultColor: Qt.rgba(255, 255, 255, 0)
-    property string disabledColor: Qt.rgba(255, 255, 255, 0)
-    property string pressedColor: Qt.rgba(255, 255, 255, 0.05)
+    property string hoveredColor: Qt.rgba(1, 1, 1, 0.05)
+    property string defaultColor: Qt.rgba(1, 1, 1, 0)
+    property string disabledColor: Qt.rgba(1, 1, 1, 0)
+    property string pressedColor: Qt.rgba(1, 1, 1, 0.05)
+    property string selectedColor: Qt.rgba(1, 1, 1, 0)
 
     property string textColor: "#0E0E11"
 
-    property string pressedBorderColor: Qt.rgba(251, 178, 106, 0.3)
-    property string hoveredBorderColor: "transparent"
-    property string defaultBodredColor: "#FBB26A"
+    property string pressedBorderColor: Qt.rgba(251/255, 178/255, 106/255, 0.3)
+    property string selectedBorderColor: "#FBB26A"
+    property string defaultBodredColor: "transparent"
     property int borderWidth: 0
 
     implicitWidth: content.implicitWidth
@@ -32,30 +33,34 @@ RadioButton {
 
         color: {
             if (root.enabled) {
-                if(root.checked) {
-                    return pressedColor
+                if (root.hovered) {
+                    return hoveredColor
+                } else if (root.checked) {
+                    return selectedColor
                 }
-                return hovered ? hoveredColor : defaultColor
+                return defaultColor
             } else {
                 return disabledColor
             }
         }
+
         border.color: {
             if (root.enabled) {
-                if(root.checked) {
+                if (root.pressed) {
                     return pressedBorderColor
+                } else if (root.checked) {
+                    return selectedBorderColor
                 }
-                return hovered ? hoveredBorderColor : defaultBodredColor
-            } else {
-                return defaultBodredColor
             }
+            return defaultBodredColor
         }
+
         border.width: {
             if (root.enabled) {
                 if(root.checked) {
                     return 1
                 }
-                return hovered ? 0 : 1
+                return root.pressed ? 1 : 0
             } else {
                 return 0
             }
@@ -64,6 +69,9 @@ RadioButton {
         Behavior on color {
             PropertyAnimation { duration: 200 }
         }
+        Behavior on border.color {
+            PropertyAnimation { duration: 200 }
+        }
     }
 
     ColumnLayout {
diff --git a/client/ui/qml/Controls2/CheckBoxType.qml b/client/ui/qml/Controls2/CheckBoxType.qml
index c547a8e4..a432f7b8 100644
--- a/client/ui/qml/Controls2/CheckBoxType.qml
+++ b/client/ui/qml/Controls2/CheckBoxType.qml
@@ -6,9 +6,9 @@ import Qt5Compat.GraphicalEffects
 Item {
     id: root
 
-    property string hoveredColor: Qt.rgba(255, 255, 255, 0.05)
+    property string hoveredColor: Qt.rgba(1, 1, 1, 0.05)
     property string defaultColor: "transparent"
-    property string pressedColor: Qt.rgba(255, 255, 255, 0.05)
+    property string pressedColor: Qt.rgba(1, 1, 1, 0.05)
 
     property string defaultBorderColor: "#D7D8DB"
     property string checkedBorderColor: "#FBB26A"
diff --git a/client/ui/qml/Controls2/HeaderTextType.qml b/client/ui/qml/Controls2/HeaderTextType.qml
index 60fa4e95..b60ccce4 100644
--- a/client/ui/qml/Controls2/HeaderTextType.qml
+++ b/client/ui/qml/Controls2/HeaderTextType.qml
@@ -1,40 +1,64 @@
 import QtQuick
 import QtQuick.Layouts
 
-ColumnLayout {
+Item {
     id: root
 
     property string buttonImage
     property string headerText
-    property var wrapMode
+    property string descriptionText
 
-    ImageButtonType {
-        id: button
+    implicitWidth: content.implicitWidth
+    implicitHeight: content.implicitHeight
 
-        Layout.leftMargin: -6
+    ColumnLayout {
+        id: content
+        anchors.fill: parent
 
-        hoverEnabled: false
-        image: root.buttonImage
-        onClicked: {
-            if (onClickedFunc && typeof onClickedFunc === "function") {
-                onClickedFunc()
+        ImageButtonType {
+            id: backButton
+
+            Layout.leftMargin: -6
+
+            image: root.buttonImage
+            imageColor: "#D7D8DB"
+            onClicked: {
+                UiLogic.closePage()
             }
         }
-    }
 
-    Text {
-        id: header
+        Text {
+            id: header
 
-        text: root.headerText
+            text: root.headerText
 
-        color: "#D7D8DB"
-        font.pixelSize: 36
-        font.weight: 700
-        font.family: "PT Root UI VF"
-        font.letterSpacing: -0.03
+            color: "#D7D8DB"
+            font.pixelSize: 36
+            font.weight: 700
+            font.family: "PT Root UI VF"
+            font.letterSpacing: -0.03
 
-        wrapMode: Text.WordWrap
+            wrapMode: Text.WordWrap
 
-        height: 38
+            height: 38
+            Layout.fillWidth: true
+        }
+
+        Text {
+            id: description
+
+            text: root.descriptionText
+
+            color: "#878B91"
+            font.pixelSize: 16
+            font.weight: 400
+            font.family: "PT Root UI VF"
+            font.letterSpacing: -0.03
+
+            wrapMode: Text.WordWrap
+
+            height: 24
+            Layout.fillWidth: true
+        }
     }
 }
diff --git a/client/ui/qml/Controls2/ImageButtonType.qml b/client/ui/qml/Controls2/ImageButtonType.qml
index b6262906..72c78342 100644
--- a/client/ui/qml/Controls2/ImageButtonType.qml
+++ b/client/ui/qml/Controls2/ImageButtonType.qml
@@ -7,9 +7,9 @@ Button {
 
     property string image
 
-    property string hoveredColor: Qt.rgba(255, 255, 255, 0.08)
+    property string hoveredColor: Qt.rgba(1, 1, 1, 0.08)
     property string defaultColor: "transparent"
-    property string pressedColor: Qt.rgba(255, 255, 255, 0.12)
+    property string pressedColor: Qt.rgba(1, 1, 1, 0.12)
 
     property string imageColor: "#878B91"
 
diff --git a/client/ui/qml/Controls2/LabelWithButtonType.qml b/client/ui/qml/Controls2/LabelWithButtonType.qml
index 5da4db5f..60c48569 100644
--- a/client/ui/qml/Controls2/LabelWithButtonType.qml
+++ b/client/ui/qml/Controls2/LabelWithButtonType.qml
@@ -6,24 +6,48 @@ Item {
     id: root
 
     property string text
+    property string descriptionText
 
     property var onClickedFunc
     property alias buttonImage : button.image
 
-    implicitWidth: 360
-    implicitHeight: 72
+    implicitWidth: content.implicitWidth
+    implicitHeight: content.implicitHeight
 
     RowLayout {
+        id: content
         anchors.fill: parent
 
-        Text {
-            font.family: "PT Root UI"
-            font.styleName: "normal"
-            font.pixelSize: 18
-            color: "#d7d8db"
-            text: root.text
-            horizontalAlignment: Text.AlignLeft
-            verticalAlignment: Text.AlignVCenter
+        ColumnLayout {
+            Text {
+                font.family: "PT Root UI"
+                font.styleName: "normal"
+                font.pixelSize: 18
+                color: "#d7d8db"
+                text: root.text
+
+                Layout.fillWidth: true
+                height: 22
+
+                horizontalAlignment: Text.AlignLeft
+                verticalAlignment: Text.AlignVCenter
+            }
+
+            Text {
+                font.family: "PT Root UI"
+                font.styleName: "normal"
+                font.pixelSize: 13
+                font.letterSpacing: 0.02
+                color: "#878B91"
+                text: root.descriptionText
+                wrapMode: Text.WordWrap
+
+                Layout.fillWidth: true
+                height: 16
+
+                horizontalAlignment: Text.AlignLeft
+                verticalAlignment: Text.AlignVCenter
+            }
         }
 
         ImageButtonType {
diff --git a/client/ui/qml/Controls2/TextFieldWithHeaderType.qml b/client/ui/qml/Controls2/TextFieldWithHeaderType.qml
index dd0d2907..350306bb 100644
--- a/client/ui/qml/Controls2/TextFieldWithHeaderType.qml
+++ b/client/ui/qml/Controls2/TextFieldWithHeaderType.qml
@@ -18,8 +18,12 @@ Item {
         anchors.fill: parent
         color: "#1c1d21"
         radius: 16
-        border.color: "#d7d8db"
-        border.width: textField.focus ? 1 : 0
+        border.color: textField.focus ? "#d7d8db" : "#2C2D30"
+        border.width: 1
+
+        Behavior on border.color {
+            PropertyAnimation { duration: 200 }
+        }
     }
 
     ColumnLayout {
diff --git a/client/ui/qml/Pages2/PageCredentials.qml b/client/ui/qml/Pages2/PageSetupWizardCredentials.qml
similarity index 78%
rename from client/ui/qml/Pages2/PageCredentials.qml
rename to client/ui/qml/Pages2/PageSetupWizardCredentials.qml
index 509ee6a6..65c390ab 100644
--- a/client/ui/qml/Pages2/PageCredentials.qml
+++ b/client/ui/qml/Pages2/PageSetupWizardCredentials.qml
@@ -11,7 +11,7 @@ import "../Config"
 
 PageBase {
     id: root
-    page: PageEnum.Credentials
+    page: PageEnum.WizardCredentials
 
     FlickableType {
         id: fl
@@ -32,15 +32,11 @@ PageBase {
 
             HeaderTextType {
                 Layout.fillWidth: true
-                Layout.bottomMargin: 16
-                Layout.topMargin: 66
-
-                Layout.preferredWidth: 328
+                Layout.topMargin: 20
 
                 buttonImage: "qrc:/images/controls/arrow-left.svg"
 
                 headerText: "Подключение к серверу"
-                wrapMode: Text.WordWrap
             }
 
             TextFieldWithHeaderType {
@@ -60,23 +56,31 @@ PageBase {
 
             BasicButtonType {
                 Layout.fillWidth: true
-                Layout.topMargin: 40
+                Layout.topMargin: 24
 
                 text: qsTr("Настроить сервер простым образом")
+
+                onClicked: function() {
+                    UiLogic.goToPage(PageEnum.WizardEasySetup)
+                }
             }
 
             BasicButtonType {
                 Layout.fillWidth: true
-                Layout.topMargin: 8
+                Layout.topMargin: -8
 
                 defaultColor: "transparent"
-                hoveredColor: Qt.rgba(255, 255, 255, 0.08)
-                pressedColor: Qt.rgba(255, 255, 255, 0.12)
+                hoveredColor: Qt.rgba(1, 1, 1, 0.08)
+                pressedColor: Qt.rgba(1, 1, 1, 0.12)
                 disabledColor: "#878B91"
                 textColor: "#D7D8DB"
                 borderWidth: 1
 
                 text: qsTr("Выбрать протокол для установки")
+
+                onClicked: function() {
+                    UiLogic.goToPage(PageEnum.WizardProtocols)
+                }
             }
         }
     }
diff --git a/client/ui/qml/Pages2/PageSetupWizardEasy.qml b/client/ui/qml/Pages2/PageSetupWizardEasy.qml
new file mode 100644
index 00000000..80962974
--- /dev/null
+++ b/client/ui/qml/Pages2/PageSetupWizardEasy.qml
@@ -0,0 +1,74 @@
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+
+import PageEnum 1.0
+
+import "./"
+import "../Pages"
+import "../Controls2"
+import "../Config"
+
+PageBase {
+    id: root
+    page: PageEnum.WizardEasySetup
+
+    FlickableType {
+        id: fl
+        anchors.top: root.top
+        anchors.bottom: root.bottom
+        contentHeight: content.height
+
+        ColumnLayout {
+            id: content
+
+            anchors.top: parent.top
+            anchors.left: parent.left
+            anchors.right: parent.right
+            anchors.rightMargin: 16
+            anchors.leftMargin: 16
+
+            spacing: 16
+
+            HeaderTextType {
+                Layout.fillWidth: true
+                Layout.topMargin: 20
+
+                buttonImage: "qrc:/images/controls/arrow-left.svg"
+
+                headerText: "Какой уровень контроля интернета в вашем регионе?"
+            }
+
+            CardType {
+                Layout.fillWidth: true
+
+                headerText: "Высокий"
+                bodyText: "Многие иностранные сайты и VPN-провайдеры заблокированы"
+            }
+
+            CardType {
+                Layout.fillWidth: true
+
+                checked: true
+
+                headerText: "Средний"
+                bodyText: "Некоторые иностранные сайты заблокированы, но VPN-провайдеры не блокируются"
+            }
+
+            CardType {
+                Layout.fillWidth: true
+
+                headerText: "Низкий"
+                bodyText: "Хочу просто повысить уровень приватности"
+            }
+
+            BasicButtonType {
+                Layout.fillWidth: true
+                Layout.topMargin: 24
+                Layout.bottomMargin: 32
+
+                text: qsTr("Продолжить")
+            }
+        }
+    }
+}
diff --git a/client/ui/qml/Pages2/PageSetupWizardProtocols.qml b/client/ui/qml/Pages2/PageSetupWizardProtocols.qml
new file mode 100644
index 00000000..b2fb7d57
--- /dev/null
+++ b/client/ui/qml/Pages2/PageSetupWizardProtocols.qml
@@ -0,0 +1,102 @@
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+
+import SortFilterProxyModel 0.2
+
+import PageEnum 1.0
+import ProtocolEnum 1.0
+
+import "./"
+import "../Pages"
+import "../Controls2"
+import "../Config"
+
+PageBase {
+    id: root
+    page: PageEnum.WizardProtocols
+
+    SortFilterProxyModel {
+        id: containersModel
+        sourceModel: UiLogic.containersModel
+        filters: [
+            ValueFilter {
+                roleName: "is_installed_role"
+                value: false
+            },
+            ValueFilter {
+                roleName: "service_type_role"
+                value: ProtocolEnum.Vpn
+            }
+        ]
+    }
+
+    FlickableType {
+        id: fl
+        anchors.top: root.top
+        anchors.bottom: root.bottom
+        contentHeight: content.height
+
+        Column {
+            id: content
+
+            anchors.top: parent.top
+            anchors.left: parent.left
+            anchors.right: parent.right
+            anchors.rightMargin: 16
+            anchors.leftMargin: 16
+            anchors.topMargin: 20
+
+            spacing: 16
+
+            HeaderTextType {
+                width: parent.width
+                buttonImage: "qrc:/images/controls/arrow-left.svg"
+
+                headerText: "Протокол подключения"
+                descriptionText: "Выберите более приоритетный для вас. Позже можно будет установить остальные протоколы и доп сервисы, вроде DNS-прокси и SFTP."
+            }
+
+            ListView {
+                id: containers
+                width: parent.width
+                height: containers.contentItem.height
+                currentIndex: -1
+                clip: true
+                interactive: false
+                model: containersModel
+
+                delegate: Item {
+                    implicitWidth: containers.width
+                    implicitHeight: delegateContent.implicitHeight
+
+                    ColumnLayout {
+                        id: delegateContent
+
+                        anchors.top: parent.top
+                        anchors.left: parent.left
+                        anchors.right: parent.right
+
+                        LabelWithButtonType {
+                            id: container
+                            Layout.fillWidth: true
+                            Layout.topMargin: 16
+                            Layout.bottomMargin: 16
+
+                            text: name_role
+                            descriptionText: desc_role
+                            buttonImage: "qrc:/images/controls/chevron-right.svg"
+
+                        }
+
+                        Rectangle {
+                            Layout.fillWidth: true
+                            height: 1
+                            color: "#2C2D30"
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/client/ui/qml/Pages2/PageStart.qml b/client/ui/qml/Pages2/PageStart.qml
index 6f8f0356..5d303cb8 100644
--- a/client/ui/qml/Pages2/PageStart.qml
+++ b/client/ui/qml/Pages2/PageStart.qml
@@ -31,7 +31,7 @@ PageBase {
                 source: "qrc:/images/amneziaBigLogo.png"
 
                 Layout.alignment: Qt.AlignCenter
-                Layout.topMargin: 80
+                Layout.topMargin: 32
                 Layout.leftMargin: 8
                 Layout.rightMargin: 8
                 Layout.preferredWidth: 344
@@ -67,8 +67,8 @@ PageBase {
                 Layout.rightMargin: 16
 
                 defaultColor: "transparent"
-                hoveredColor: Qt.rgba(255, 255, 255, 0.08)
-                pressedColor: Qt.rgba(255, 255, 255, 0.12)
+                hoveredColor: Qt.rgba(1, 1, 1, 0.08)
+                pressedColor: Qt.rgba(1, 1, 1, 0.12)
                 disabledColor: "#878B91"
                 textColor: "#D7D8DB"
                 borderWidth: 1
@@ -123,6 +123,7 @@ PageBase {
                     Layout.alignment: Qt.AlignHCenter
 
                     text: "Данные для подключения"
+                    wrapMode: Text.WordWrap
                 }
 
                 LabelWithButtonType {
@@ -134,7 +135,8 @@ PageBase {
                     buttonImage: "qrc:/images/controls/chevron-right.svg"
 
                     onClickedFunc: function() {
-                        UiLogic.goToPage(PageEnum.Credentials)
+                        UiLogic.goToPage(PageEnum.WizardCredentials)
+                        drawer.visible = false
                     }
                 }
                 Rectangle {

From a9ebf534c691e86536b652359e5bb8ab11f3f0d6 Mon Sep 17 00:00:00 2001
From: "vladimir.kuznetsov" <nethiuswork@gmail.com>
Date: Tue, 25 Apr 2023 08:04:20 +0300
Subject: [PATCH 007/278] added DropDown component

---
 client/images/controls/chevron-down.svg       |   3 +
 client/images/controls/chevron-up.svg         |   3 +
 client/resources.qrc                          |   2 +
 client/ui/pages.h                             |   2 +-
 client/ui/qml/Controls2/CardType.qml          |   1 -
 client/ui/qml/Controls2/DropDownType.qml      | 222 ++++++++++++++++++
 client/ui/qml/Controls2/FlickableType.qml     |   4 +-
 .../ui/qml/Controls2/LabelWithButtonType.qml  |   4 +-
 client/ui/qml/Pages2/PageStart.qml            |  35 ++-
 client/ui/qml/main2.qml                       |   2 +-
 10 files changed, 261 insertions(+), 17 deletions(-)
 create mode 100644 client/images/controls/chevron-down.svg
 create mode 100644 client/images/controls/chevron-up.svg

diff --git a/client/images/controls/chevron-down.svg b/client/images/controls/chevron-down.svg
new file mode 100644
index 00000000..3f453815
--- /dev/null
+++ b/client/images/controls/chevron-down.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M6 9L12 15L18 9" stroke="#CBCBCB" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/client/images/controls/chevron-up.svg b/client/images/controls/chevron-up.svg
new file mode 100644
index 00000000..b51628d2
--- /dev/null
+++ b/client/images/controls/chevron-up.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M18 15L12 9L6 15" stroke="#CBCBCB" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/client/resources.qrc b/client/resources.qrc
index d8cd40c5..3d009107 100644
--- a/client/resources.qrc
+++ b/client/resources.qrc
@@ -196,5 +196,7 @@
         <file>images/controls/arrow-left.svg</file>
         <file>ui/qml/Pages2/PageSetupWizardProtocols.qml</file>
         <file>ui/qml/Pages2/PageSetupWizardEasy.qml</file>
+        <file>images/controls/chevron-down.svg</file>
+        <file>images/controls/chevron-up.svg</file>
     </qresource>
 </RCC>
diff --git a/client/ui/pages.h b/client/ui/pages.h
index 808725d2..9c5db53c 100644
--- a/client/ui/pages.h
+++ b/client/ui/pages.h
@@ -26,7 +26,7 @@ enum class Page {Start = 0, NewServer, NewServerProtocols, Vpn,
            GeneralSettings, AppSettings, NetworkSettings, ServerSettings,
            ServerContainers, ServersList, ShareConnection,  Sites,
            ProtocolSettings, ProtocolShare, QrDecoder, QrDecoderIos, About, ViewConfig,
-           AdvancedServerSettings, ClientManagement, ClientInfo
+           AdvancedServerSettings, ClientManagement, ClientInfo,
 
            Test, WizardCredentials, WizardProtocols, WizardEasySetup};
 Q_ENUM_NS(Page)
diff --git a/client/ui/qml/Controls2/CardType.qml b/client/ui/qml/Controls2/CardType.qml
index fa7ee514..4b94cb1a 100644
--- a/client/ui/qml/Controls2/CardType.qml
+++ b/client/ui/qml/Controls2/CardType.qml
@@ -111,7 +111,6 @@ RadioButton {
         Text {
             text: root.footerText
             visible: root.footerText !== ""
-            enabled: root.footerText !== ""
             color: "#878B91"
             font.pixelSize: 13
             font.weight: 400
diff --git a/client/ui/qml/Controls2/DropDownType.qml b/client/ui/qml/Controls2/DropDownType.qml
index 5560aee7..ea02ac3c 100644
--- a/client/ui/qml/Controls2/DropDownType.qml
+++ b/client/ui/qml/Controls2/DropDownType.qml
@@ -1,5 +1,227 @@
 import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
 
 Item {
+    id: root
 
+    property string text
+    property string descriptionText
+
+    property var onClickedFunc
+    property string buttonImage: "qrc:/images/controls/chevron-down.svg"
+
+    property string defaultColor: "#1C1D21"
+
+    property string borderColor: "#494B50"
+
+    property alias menuModel: menuContent.model
+
+    width: buttonContent.implicitWidth
+    height: buttonContent.implicitHeight
+
+    Rectangle {
+        id: buttonBackground
+        anchors.fill: buttonContent
+
+        radius: 16
+        color: defaultColor
+        border.color: borderColor
+
+        Behavior on border.width {
+            PropertyAnimation { duration: 200 }
+        }
+    }
+
+    RowLayout {
+        id: buttonContent
+        anchors.fill: parent
+        anchors.rightMargin: 16
+        anchors.leftMargin: 16
+
+        ColumnLayout {
+            Layout.leftMargin: 16
+            Layout.rightMargin: 16
+            Layout.topMargin: 16
+            Layout.bottomMargin: 16
+
+            Text {
+                visible: root.descriptionText !== ""
+
+                font.family: "PT Root UI"
+                font.styleName: "normal"
+                font.pixelSize: 13
+                font.letterSpacing: 0.02
+                color: "#878B91"
+                text: root.descriptionText
+                wrapMode: Text.WordWrap
+
+                Layout.fillWidth: true
+                height: 16   
+
+                horizontalAlignment: Text.AlignLeft
+                verticalAlignment: Text.AlignVCenter
+            }
+
+            Text {
+                font.family: "PT Root UI"
+                font.styleName: "normal"
+                font.pixelSize: 16
+                color: "#d7d8db"
+                text: root.text
+
+                Layout.fillWidth: true
+                height: 24
+
+                horizontalAlignment: Text.AlignLeft
+                verticalAlignment: Text.AlignVCenter
+            }
+        }
+
+        ImageButtonType {
+            id: button
+
+            Layout.rightMargin: 16
+
+            hoverEnabled: false
+            image: buttonImage
+            onClicked: {
+                if (onClickedFunc && typeof onClickedFunc === "function") {
+                    onClickedFunc()
+                }
+            }
+
+            Layout.alignment: Qt.AlignRight
+        }
+    }
+
+    MouseArea {
+        anchors.fill: parent
+        cursorShape: Qt.PointingHandCursor
+        hoverEnabled: true
+
+        onEntered: {
+            buttonBackground.border.width = 1
+        }
+
+        onExited: {
+            buttonBackground.border.width = 0
+        }
+
+        onClicked: {
+            menu.visible = true
+        }
+    }
+
+    Drawer {
+        id: menu
+
+        edge: Qt.BottomEdge
+        width: parent.width
+        height: parent.height * 0.8
+
+        clip: true
+        modal: true
+
+        background: Rectangle {
+            anchors.fill: parent
+            anchors.bottomMargin: -radius
+            radius: 16
+            color: "#1C1D21"
+        }
+
+        Overlay.modal: Rectangle {
+            color: Qt.rgba(14/255, 14/255, 17/255, 0.8)
+        }
+
+        Column {
+            anchors.top: parent.top
+            anchors.left: parent.left
+            anchors.right: parent.right
+            anchors.topMargin: 16
+
+            spacing: 16
+
+            Header2TextType {
+                width: parent.width
+
+                text: "Данные для подключения"
+                wrapMode: Text.WordWrap
+
+                leftPadding: 16
+                rightPadding: 16
+            }
+
+            ButtonGroup {
+                id: radioButtonGroup
+            }
+
+            ListView {
+                id: menuContent
+                width: parent.width
+                height: menuContent.contentItem.height
+
+                currentIndex: -1
+
+                clip: true
+                interactive: false
+
+                delegate: Item {
+                    implicitWidth: menuContent.width
+                    implicitHeight: radioButton.implicitHeight
+
+                    RadioButton {
+                        id: radioButton
+
+                        implicitWidth: parent.width
+                        implicitHeight: radioButtonContent.implicitHeight
+
+                        hoverEnabled: true
+
+                        ButtonGroup.group: radioButtonGroup
+
+                        indicator: Rectangle {
+                            anchors.fill: parent
+                            color: radioButton.hovered ? "#2C2D30" : "#1C1D21"
+                        }
+
+                        RowLayout {
+                            id: radioButtonContent
+                            anchors.fill: parent
+
+                            anchors.rightMargin: 16
+                            anchors.leftMargin: 16
+
+                            z: 1
+
+                            Text {
+                                id: text
+
+                                text: modelData
+                                color: "#D7D8DB"
+                                font.pixelSize: 16
+                                font.weight: 400
+                                font.family: "PT Root UI VF"
+
+                                height: 24
+
+                                Layout.fillWidth: true
+                                Layout.topMargin: 20
+                                Layout.bottomMargin: 20
+                            }
+
+                            Image {
+                                source: "qrc:/images/controls/check.svg"
+                                visible: radioButton.checked
+                                width: 24
+                                height: 24
+
+                                Layout.rightMargin: 8
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
 }
diff --git a/client/ui/qml/Controls2/FlickableType.qml b/client/ui/qml/Controls2/FlickableType.qml
index b7c1203f..073be058 100644
--- a/client/ui/qml/Controls2/FlickableType.qml
+++ b/client/ui/qml/Controls2/FlickableType.qml
@@ -9,8 +9,8 @@ Flickable {
     width: parent.width
 
     anchors.bottom: parent.bottom
-    anchors.left: root.left
-    anchors.right: root.right
+    anchors.left: parent.left
+    anchors.right: parent.right
     anchors.rightMargin: 1
 
     Keys.onUpPressed: scrollBar.decrease()
diff --git a/client/ui/qml/Controls2/LabelWithButtonType.qml b/client/ui/qml/Controls2/LabelWithButtonType.qml
index 60c48569..92606940 100644
--- a/client/ui/qml/Controls2/LabelWithButtonType.qml
+++ b/client/ui/qml/Controls2/LabelWithButtonType.qml
@@ -9,7 +9,7 @@ Item {
     property string descriptionText
 
     property var onClickedFunc
-    property alias buttonImage : button.image
+    property alias buttonImage: button.image
 
     implicitWidth: content.implicitWidth
     implicitHeight: content.implicitHeight
@@ -42,6 +42,8 @@ Item {
                 text: root.descriptionText
                 wrapMode: Text.WordWrap
 
+                visible: root.descriptionText !== ""
+
                 Layout.fillWidth: true
                 height: 16
 
diff --git a/client/ui/qml/Pages2/PageStart.qml b/client/ui/qml/Pages2/PageStart.qml
index 5d303cb8..f87e0c6e 100644
--- a/client/ui/qml/Pages2/PageStart.qml
+++ b/client/ui/qml/Pages2/PageStart.qml
@@ -79,18 +79,37 @@ PageBase {
 //                    UiLogic.goToPage(PageEnum.Start)
 //                }
             }
+
+            DropDownType {
+                Layout.fillWidth: true
+
+                text: "IP, логин и пароль от сервера"
+                descriptionText: "IP, логин и пароль от сервера"
+
+                menuModel: [
+                    qsTr("SHA512"),
+                    qsTr("SHA384"),
+                    qsTr("SHA256"),
+                    qsTr("SHA3-512"),
+                    qsTr("SHA3-384"),
+                    qsTr("SHA3-256"),
+                    qsTr("whirlpool"),
+                    qsTr("BLAKE2b512"),
+                    qsTr("BLAKE2s256"),
+                    qsTr("SHA1")
+                ]
+            }
         }
 
         Drawer {
             id: drawer
 
-            y: 0
-            x: 0
             edge: Qt.BottomEdge
             width: parent.width
             height: parent.height * 0.4375
 
             clip: true
+            modal: true
 
             background: Rectangle {
                 anchors.fill: parent
@@ -99,15 +118,9 @@ PageBase {
                 color: "#1C1D21"
             }
 
-            modal: true
-            //interactive: activeFocus
-
-//            onAboutToHide: {
-//                pageLoader.focus = true
-//            }
-//            onAboutToShow: {
-//                tfSshLog.focus = true
-//            }
+            Overlay.modal: Rectangle {
+                color: Qt.rgba(14/255, 14/255, 17/255, 0.8)
+            }
 
             ColumnLayout {
                 anchors.top: parent.top
diff --git a/client/ui/qml/main2.qml b/client/ui/qml/main2.qml
index deb64e89..c7e06eaa 100644
--- a/client/ui/qml/main2.qml
+++ b/client/ui/qml/main2.qml
@@ -135,7 +135,7 @@ Window  {
         id: pageLoader
 
         onFinished: {
-            UiLogic.initalizeUiLogic()
+            UiLogic.initializeUiLogic()
         }
     }
 

From 904e173037b300274aca344a45952a93e349111f Mon Sep 17 00:00:00 2001
From: "vladimir.kuznetsov" <nethiuswork@gmail.com>
Date: Wed, 26 Apr 2023 08:30:02 +0300
Subject: [PATCH 008/278] added HorizontalRadioButton and VerticalRadioButton
 components

---
 client/resources.qrc                          |   8 +-
 client/ui/qml/Controls2/CheckBoxType.qml      |   8 +-
 client/ui/qml/Controls2/DropDownType.qml      |   2 +
 .../{HeaderTextType.qml => HeaderType.qml}    |   0
 .../qml/Controls2/HorizontalRadioButton.qml   |  95 +++++++++
 .../{ => TextTypes}/BodyTextType.qml          |   0
 .../{ => TextTypes}/Header2TextType.qml       |   0
 .../ui/qml/Controls2/VerticalRadioButton.qml  | 180 ++++++++++++++++++
 .../qml/Pages2/PageSetupWizardCredentials.qml |   2 +-
 client/ui/qml/Pages2/PageSetupWizardEasy.qml  |   2 +-
 .../qml/Pages2/PageSetupWizardProtocols.qml   |   2 +-
 client/ui/qml/Pages2/PageStart.qml            |  39 ++++
 12 files changed, 330 insertions(+), 8 deletions(-)
 rename client/ui/qml/Controls2/{HeaderTextType.qml => HeaderType.qml} (100%)
 create mode 100644 client/ui/qml/Controls2/HorizontalRadioButton.qml
 rename client/ui/qml/Controls2/{ => TextTypes}/BodyTextType.qml (100%)
 rename client/ui/qml/Controls2/{ => TextTypes}/Header2TextType.qml (100%)
 create mode 100644 client/ui/qml/Controls2/VerticalRadioButton.qml

diff --git a/client/resources.qrc b/client/resources.qrc
index 3d009107..5fe682a9 100644
--- a/client/resources.qrc
+++ b/client/resources.qrc
@@ -188,15 +188,17 @@
         <file>ui/qml/PageLoader.qml</file>
         <file>images/amneziaBigLogo.png</file>
         <file>images/amneziaBigLogo.svg</file>
-        <file>ui/qml/Controls2/BodyTextType.qml</file>
         <file>ui/qml/Controls2/FlickableType.qml</file>
-        <file>ui/qml/Controls2/Header2TextType.qml</file>
         <file>ui/qml/Pages2/PageSetupWizardCredentials.qml</file>
-        <file>ui/qml/Controls2/HeaderTextType.qml</file>
+        <file>ui/qml/Controls2/HeaderType.qml</file>
         <file>images/controls/arrow-left.svg</file>
         <file>ui/qml/Pages2/PageSetupWizardProtocols.qml</file>
         <file>ui/qml/Pages2/PageSetupWizardEasy.qml</file>
         <file>images/controls/chevron-down.svg</file>
         <file>images/controls/chevron-up.svg</file>
+        <file>ui/qml/Controls2/TextTypes/BodyTextType.qml</file>
+        <file>ui/qml/Controls2/TextTypes/Header2TextType.qml</file>
+        <file>ui/qml/Controls2/HorizontalRadioButton.qml</file>
+        <file>ui/qml/Controls2/VerticalRadioButton.qml</file>
     </qresource>
 </RCC>
diff --git a/client/ui/qml/Controls2/CheckBoxType.qml b/client/ui/qml/Controls2/CheckBoxType.qml
index a432f7b8..92357c52 100644
--- a/client/ui/qml/Controls2/CheckBoxType.qml
+++ b/client/ui/qml/Controls2/CheckBoxType.qml
@@ -6,6 +6,9 @@ import Qt5Compat.GraphicalEffects
 Item {
     id: root
 
+    property string text
+    property string descriptionText
+
     property string hoveredColor: Qt.rgba(1, 1, 1, 0.05)
     property string defaultColor: "transparent"
     property string pressedColor: Qt.rgba(1, 1, 1, 0.05)
@@ -71,7 +74,7 @@ Item {
 
         ColumnLayout {
             Text {
-                text: "Paragraph"
+                text: root.text
                 color: "#D7D8DB"
                 font.pixelSize: 18
                 font.weight: 400
@@ -82,7 +85,7 @@ Item {
             }
 
             Text {
-                text: "Caption"
+                text: root.descriptionText
                 color: "#878b91"
                 font.pixelSize: 13
                 font.weight: 400
@@ -94,6 +97,7 @@ Item {
             }
         }
     }
+
     MouseArea {
         anchors.fill: parent
         cursorShape: Qt.PointingHandCursor
diff --git a/client/ui/qml/Controls2/DropDownType.qml b/client/ui/qml/Controls2/DropDownType.qml
index ea02ac3c..8abb03d2 100644
--- a/client/ui/qml/Controls2/DropDownType.qml
+++ b/client/ui/qml/Controls2/DropDownType.qml
@@ -2,6 +2,8 @@ import QtQuick
 import QtQuick.Controls
 import QtQuick.Layouts
 
+import "TextTypes"
+
 Item {
     id: root
 
diff --git a/client/ui/qml/Controls2/HeaderTextType.qml b/client/ui/qml/Controls2/HeaderType.qml
similarity index 100%
rename from client/ui/qml/Controls2/HeaderTextType.qml
rename to client/ui/qml/Controls2/HeaderType.qml
diff --git a/client/ui/qml/Controls2/HorizontalRadioButton.qml b/client/ui/qml/Controls2/HorizontalRadioButton.qml
new file mode 100644
index 00000000..6f00d210
--- /dev/null
+++ b/client/ui/qml/Controls2/HorizontalRadioButton.qml
@@ -0,0 +1,95 @@
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+
+RadioButton {
+    id: root
+
+    property string hoveredColor: Qt.rgba(1, 1, 1, 0.05)
+    property string defaultColor: Qt.rgba(1, 1, 1, 0)
+    property string disabledColor: Qt.rgba(1, 1, 1, 0)
+    property string selectedColor: Qt.rgba(1, 1, 1, 0)
+
+    property string textColor: "#0E0E11"
+
+    property string pressedBorderColor: "#494B50"
+    property string selectedBorderColor: "#FBB26A"
+    property string defaultBodredColor: "transparent"
+    property int borderWidth: 0
+
+    implicitWidth: content.implicitWidth
+    implicitHeight: content.implicitHeight
+
+    hoverEnabled: true
+
+    indicator: Rectangle {
+        anchors.fill: parent
+        radius: 16
+
+        color: {
+            if (root.enabled) {
+                if (root.hovered) {
+                    return hoveredColor
+                } else if (root.checked) {
+                    return selectedColor
+                }
+                return defaultColor
+            } else {
+                return disabledColor
+            }
+        }
+
+        border.color: {
+            if (root.enabled) {
+                if (root.pressed) {
+                    return pressedBorderColor
+                } else if (root.checked) {
+                    return selectedBorderColor
+                }
+            }
+            return defaultBodredColor
+        }
+
+        border.width: {
+            if (root.enabled) {
+                if(root.checked) {
+                    return 1
+                }
+                return root.pressed ? 1 : 0
+            } else {
+                return 0
+            }
+        }
+
+        Behavior on color {
+            PropertyAnimation { duration: 200 }
+        }
+        Behavior on border.color {
+            PropertyAnimation { duration: 200 }
+        }
+    }
+
+    ColumnLayout {
+        id: content
+        anchors.fill: parent
+        spacing: 16
+
+        Text {
+            text: root.text
+            wrapMode: Text.WordWrap
+            color: "#D7D8DB"
+            font.pixelSize: 16
+            font.weight: 400
+            font.family: "PT Root UI VF"
+
+            height: 24
+            Layout.fillWidth: true
+            Layout.rightMargin: 16
+            Layout.leftMargin: 16
+            Layout.topMargin: 16
+            Layout.bottomMargin: 16
+
+            horizontalAlignment: Qt.AlignHCenter
+        }
+    }
+}
diff --git a/client/ui/qml/Controls2/BodyTextType.qml b/client/ui/qml/Controls2/TextTypes/BodyTextType.qml
similarity index 100%
rename from client/ui/qml/Controls2/BodyTextType.qml
rename to client/ui/qml/Controls2/TextTypes/BodyTextType.qml
diff --git a/client/ui/qml/Controls2/Header2TextType.qml b/client/ui/qml/Controls2/TextTypes/Header2TextType.qml
similarity index 100%
rename from client/ui/qml/Controls2/Header2TextType.qml
rename to client/ui/qml/Controls2/TextTypes/Header2TextType.qml
diff --git a/client/ui/qml/Controls2/VerticalRadioButton.qml b/client/ui/qml/Controls2/VerticalRadioButton.qml
new file mode 100644
index 00000000..e6c374f7
--- /dev/null
+++ b/client/ui/qml/Controls2/VerticalRadioButton.qml
@@ -0,0 +1,180 @@
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+import Qt5Compat.GraphicalEffects
+
+RadioButton {
+    id: root
+
+    property string descriptionText
+
+    property string hoveredColor: Qt.rgba(1, 1, 1, 0.05)
+    property string defaultColor: Qt.rgba(1, 1, 1, 0)
+    property string disabledColor: Qt.rgba(1, 1, 1, 0)
+    property string selectedColor: Qt.rgba(1, 1, 1, 0)
+
+    property string textColor: "#0E0E11"
+
+    property string pressedBorderColor: Qt.rgba(251/255, 178/255, 106/255, 0.3)
+    property string selectedBorderColor: "#FBB26A"
+    property string defaultBodredColor: "transparent"
+    property int borderWidth: 0
+
+    property string defaultCircleBorderColor: "#878B91"
+    property string selectedCircleBorderColor: "#A85809"
+    property string pressedCircleBorderColor: Qt.rgba(251/255, 178/255, 106/255, 0.3)
+
+    property string defaultInnerCircleColor: "#FBB26A"
+
+    hoverEnabled: true
+
+    indicator: Rectangle {
+        implicitWidth: 56
+        implicitHeight: 56
+        radius: 16
+
+        color: {
+            if (root.enabled) {
+                if (root.hovered || contentMouseArea.entered) {
+                    return hoveredColor
+                } else if (root.checked) {
+                    return selectedColor
+                }
+                return defaultColor
+            } else {
+                return disabledColor
+            }
+        }
+
+        Behavior on color {
+            PropertyAnimation { duration: 200 }
+        }
+
+        Rectangle {
+            width: 24
+            height: 24
+            radius: 16
+
+            anchors.centerIn: parent
+
+            color: "transparent"
+            border.color: {
+                if (root.enabled) {
+                    if (root.pressed) {
+                        return pressedCircleBorderColor
+                    } else if (root.checked) {
+                        return selectedCircleBorderColor
+                    }
+                }
+                return defaultCircleBorderColor
+            }
+
+            border.width: 1
+
+            Behavior on border.color {
+                PropertyAnimation { duration: 200 }
+            }
+
+            Rectangle {
+                id: innerCircle
+
+                width: 12
+                height: 12
+                radius: 16
+
+                anchors.centerIn: parent
+
+                color: "transparent"
+                border.color: defaultInnerCircleColor
+                border.width: {
+                    if (root.enabled) {
+                        if(root.checked) {
+                            return 6
+                        }
+                        return root.pressed ? 6 : 0
+                    } else {
+                        return 0
+                    }
+                }
+
+                Behavior on border.width {
+                    PropertyAnimation { duration: 200 }
+                }
+            }
+
+            DropShadow {
+                anchors.fill: innerCircle
+                horizontalOffset: 0
+                verticalOffset: 0
+                radius: 12
+                samples: 13
+                color: "#FBB26A"
+                source: innerCircle
+            }
+        }
+    }
+
+    contentItem: ColumnLayout {
+        id: content
+        anchors.left: indicator.right
+        anchors.top: parent.top
+        anchors.leftMargin: 8
+        spacing: 16
+
+        Text {
+            text: root.text
+            wrapMode: Text.WordWrap
+            color: "#D7D8DB"
+            font.pixelSize: 16
+            font.weight: 400
+            font.family: "PT Root UI VF"
+
+            height: 24
+            Layout.fillWidth: true
+        }
+
+        Text {
+            font.family: "PT Root UI"
+            font.styleName: "normal"
+            font.pixelSize: 13
+            font.letterSpacing: 0.02
+            color: "#878B91"
+            text: root.descriptionText
+            wrapMode: Text.WordWrap
+
+            visible: root.descriptionText !== ""
+
+            Layout.fillWidth: true
+            height: 16
+        }
+    }
+
+    MouseArea {
+        id: contentMouseArea
+
+        anchors.fill: content
+        cursorShape: Qt.PointingHandCursor
+        hoverEnabled: true
+
+//            onEntered: {
+//                checkBoxBackground.color = hoveredColor
+//            }
+
+//            onExited: {
+//                checkBoxBackground.color = defaultColor
+//            }
+
+//            onPressedChanged: {
+//                indicator.source = pressed ? imageSource : ""
+//                imageColor.color = pressed ? hoveredImageColor : defaultImageColor
+//                checkBoxBackground.color = pressed ? pressedColor : entered ? hoveredColor : defaultColor
+//            }
+
+//            onClicked: {
+//                checkBox.checked = !checkBox.checked
+//                indicator.source = checkBox.checked ? imageSource : ""
+//                imageColor.color = checkBox.checked ? checkedImageColor : defaultImageColor
+//                imageBorder.border.color = checkBox.checked ? checkedBorderColor : defaultBorderColor
+//            }
+    }
+}
diff --git a/client/ui/qml/Pages2/PageSetupWizardCredentials.qml b/client/ui/qml/Pages2/PageSetupWizardCredentials.qml
index 65c390ab..20472de2 100644
--- a/client/ui/qml/Pages2/PageSetupWizardCredentials.qml
+++ b/client/ui/qml/Pages2/PageSetupWizardCredentials.qml
@@ -30,7 +30,7 @@ PageBase {
 
             spacing: 16
 
-            HeaderTextType {
+            HeaderType {
                 Layout.fillWidth: true
                 Layout.topMargin: 20
 
diff --git a/client/ui/qml/Pages2/PageSetupWizardEasy.qml b/client/ui/qml/Pages2/PageSetupWizardEasy.qml
index 80962974..b4121592 100644
--- a/client/ui/qml/Pages2/PageSetupWizardEasy.qml
+++ b/client/ui/qml/Pages2/PageSetupWizardEasy.qml
@@ -30,7 +30,7 @@ PageBase {
 
             spacing: 16
 
-            HeaderTextType {
+            HeaderType {
                 Layout.fillWidth: true
                 Layout.topMargin: 20
 
diff --git a/client/ui/qml/Pages2/PageSetupWizardProtocols.qml b/client/ui/qml/Pages2/PageSetupWizardProtocols.qml
index b2fb7d57..a50da64b 100644
--- a/client/ui/qml/Pages2/PageSetupWizardProtocols.qml
+++ b/client/ui/qml/Pages2/PageSetupWizardProtocols.qml
@@ -49,7 +49,7 @@ PageBase {
 
             spacing: 16
 
-            HeaderTextType {
+            HeaderType {
                 width: parent.width
                 buttonImage: "qrc:/images/controls/arrow-left.svg"
 
diff --git a/client/ui/qml/Pages2/PageStart.qml b/client/ui/qml/Pages2/PageStart.qml
index f87e0c6e..0cac1b82 100644
--- a/client/ui/qml/Pages2/PageStart.qml
+++ b/client/ui/qml/Pages2/PageStart.qml
@@ -8,6 +8,7 @@ import "./"
 import "../Pages"
 import "../Controls2"
 import "../Config"
+import "../Controls2/TextTypes"
 
 PageBase {
     id: root
@@ -99,6 +100,44 @@ PageBase {
                     qsTr("SHA1")
                 ]
             }
+            CheckBoxType {
+//                text: qsTr("Auto-negotiate encryption")
+            }
+            CheckBoxType {
+                text: qsTr("Auto-negotiate encryption")
+                descriptionText: "dssaa"
+            }
+
+            Rectangle {
+                implicitWidth: buttonGroup.implicitWidth
+                implicitHeight: buttonGroup.implicitHeight
+
+                Layout.leftMargin: 16
+                Layout.rightMargin: 16
+
+                color: "#1C1D21"
+                radius: 16
+                RowLayout {
+                    id: buttonGroup
+
+                    spacing: 0
+                    HorizontalRadioButton {
+                        implicitWidth: (root.width - 32) / 2
+                        text: "ddsasdasd"
+                    }
+                    HorizontalRadioButton {
+                        implicitWidth: (root.width - 32) / 2
+                        text: "ddsasdasd"
+                    }
+                }
+            }
+
+            VerticalRadioButton {
+                text: "dsasd"
+            }
+            VerticalRadioButton {
+                text: "dsasd"
+            }
         }
 
         Drawer {

From cfc17cf290d89f004874518211d2d0f0b0d6937a Mon Sep 17 00:00:00 2001
From: "vladimir.kuznetsov" <nethiuswork@gmail.com>
Date: Wed, 26 Apr 2023 18:37:56 +0300
Subject: [PATCH 009/278] added mousearea to VerticalRadioButton

---
 client/ui/qml/Controls2/CheckBoxType.qml      |  7 +--
 .../ui/qml/Controls2/VerticalRadioButton.qml  | 50 +++++++------------
 client/ui/qml/Pages2/PageStart.qml            |  7 +++
 3 files changed, 30 insertions(+), 34 deletions(-)

diff --git a/client/ui/qml/Controls2/CheckBoxType.qml b/client/ui/qml/Controls2/CheckBoxType.qml
index 92357c52..98f6c5fe 100644
--- a/client/ui/qml/Controls2/CheckBoxType.qml
+++ b/client/ui/qml/Controls2/CheckBoxType.qml
@@ -17,7 +17,7 @@ Item {
     property string checkedBorderColor: "#FBB26A"
 
     property string checkedImageColor: "#FBB26A"
-    property string hoveredImageColor: "#A85809"
+    property string pressedImageColor: "#A85809"
     property string defaultImageColor: "transparent"
 
     property string imageSource: "qrc:/images/controls/check.svg"
@@ -40,6 +40,7 @@ Item {
                 id: indicator
                 anchors.verticalCenter: checkBox.verticalCenter
                 anchors.horizontalCenter: checkBox.horizontalCenter
+
                 ColorOverlay {
                     id: imageColor
                     anchors.fill: indicator
@@ -112,8 +113,8 @@ Item {
         }
 
         onPressedChanged: {
-            indicator.source = pressed ? imageSource : ""
-            imageColor.color = pressed ? hoveredImageColor : defaultImageColor
+            indicator.source = pressed ? imageSource : checkBox.checked ? imageSource : ""
+            imageColor.color = pressed ? pressedImageColor : checkBox.checked ? checkedImageColor : defaultImageColor
             checkBoxBackground.color = pressed ? pressedColor : entered ? hoveredColor : defaultColor
         }
 
diff --git a/client/ui/qml/Controls2/VerticalRadioButton.qml b/client/ui/qml/Controls2/VerticalRadioButton.qml
index e6c374f7..058cf9ef 100644
--- a/client/ui/qml/Controls2/VerticalRadioButton.qml
+++ b/client/ui/qml/Controls2/VerticalRadioButton.qml
@@ -26,16 +26,21 @@ RadioButton {
 
     property string defaultInnerCircleColor: "#FBB26A"
 
+    implicitWidth: background.implicitWidth + content.implicitWidth
+    implicitHeight: background.implicitWidth
+
     hoverEnabled: true
 
     indicator: Rectangle {
+        id: background
+
         implicitWidth: 56
         implicitHeight: 56
         radius: 16
 
         color: {
             if (root.enabled) {
-                if (root.hovered || contentMouseArea.entered) {
+                if (root.hovered) {
                     return hoveredColor
                 } else if (root.checked) {
                     return selectedColor
@@ -51,6 +56,8 @@ RadioButton {
         }
 
         Rectangle {
+            id: outerCircle
+
             width: 24
             height: 24
             radius: 16
@@ -114,12 +121,14 @@ RadioButton {
         }
     }
 
-    contentItem: ColumnLayout {
+    contentItem: Item {}
+
+    ColumnLayout {
         id: content
-        anchors.left: indicator.right
-        anchors.top: parent.top
-        anchors.leftMargin: 8
-        spacing: 16
+        anchors.fill: parent
+        anchors.leftMargin: 8 + background.width
+        anchors.topMargin: 4
+        anchors.bottomMargin: 4
 
         Text {
             text: root.text
@@ -150,31 +159,10 @@ RadioButton {
     }
 
     MouseArea {
-        id: contentMouseArea
-
-        anchors.fill: content
+        anchors.fill: root
         cursorShape: Qt.PointingHandCursor
-        hoverEnabled: true
-
-//            onEntered: {
-//                checkBoxBackground.color = hoveredColor
-//            }
-
-//            onExited: {
-//                checkBoxBackground.color = defaultColor
-//            }
-
-//            onPressedChanged: {
-//                indicator.source = pressed ? imageSource : ""
-//                imageColor.color = pressed ? hoveredImageColor : defaultImageColor
-//                checkBoxBackground.color = pressed ? pressedColor : entered ? hoveredColor : defaultColor
-//            }
-
-//            onClicked: {
-//                checkBox.checked = !checkBox.checked
-//                indicator.source = checkBox.checked ? imageSource : ""
-//                imageColor.color = checkBox.checked ? checkedImageColor : defaultImageColor
-//                imageBorder.border.color = checkBox.checked ? checkedBorderColor : defaultBorderColor
-//            }
+        enabled: false
     }
 }
+
+
diff --git a/client/ui/qml/Pages2/PageStart.qml b/client/ui/qml/Pages2/PageStart.qml
index 0cac1b82..331a6aec 100644
--- a/client/ui/qml/Pages2/PageStart.qml
+++ b/client/ui/qml/Pages2/PageStart.qml
@@ -121,6 +121,7 @@ PageBase {
                     id: buttonGroup
 
                     spacing: 0
+
                     HorizontalRadioButton {
                         implicitWidth: (root.width - 32) / 2
                         text: "ddsasdasd"
@@ -134,9 +135,15 @@ PageBase {
 
             VerticalRadioButton {
                 text: "dsasd"
+                descriptionText: "asd"
+                checked: true
+
+                Layout.fillWidth: true
             }
             VerticalRadioButton {
                 text: "dsasd"
+
+                Layout.fillWidth: true
             }
         }
 

From c7acd63ea7a64d21dd8e0a888ef6a6e4d604b318 Mon Sep 17 00:00:00 2001
From: "vladimir.kuznetsov" <nethiuswork@gmail.com>
Date: Sat, 29 Apr 2023 19:09:16 +0300
Subject: [PATCH 010/278] added SwitcherType and TabButtonType

- change CheckBoxType root type
- added PageTest
---
 client/resources.qrc                          |   4 +-
 client/ui/qml/Controls2/CheckBoxType.qml      | 137 ++++-----
 client/ui/qml/Controls2/HeaderType.qml        |   4 +
 client/ui/qml/Controls2/SwitcherType.qml      |  83 +++++
 client/ui/qml/Controls2/TabButtonType.qml     |  56 ++++
 .../ui/qml/Controls2/VerticalRadioButton.qml  |   9 +-
 client/ui/qml/Pages/PageTest.qml              | 125 --------
 client/ui/qml/Pages2/PageStart.qml            |  69 +----
 client/ui/qml/Pages2/PageTest.qml             | 285 ++++++++++++++++++
 9 files changed, 492 insertions(+), 280 deletions(-)
 create mode 100644 client/ui/qml/Controls2/SwitcherType.qml
 create mode 100644 client/ui/qml/Controls2/TabButtonType.qml
 delete mode 100644 client/ui/qml/Pages/PageTest.qml
 create mode 100644 client/ui/qml/Pages2/PageTest.qml

diff --git a/client/resources.qrc b/client/resources.qrc
index 5fe682a9..1d79af1c 100644
--- a/client/resources.qrc
+++ b/client/resources.qrc
@@ -173,7 +173,6 @@
         <file>server_scripts/check_user_in_sudo.sh</file>
         <file>ui/qml/Controls2/BasicButtonType.qml</file>
         <file>ui/qml/Controls2/TextFieldWithHeaderType.qml</file>
-        <file>ui/qml/Pages/PageTest.qml</file>
         <file>fonts/pt-root-ui_vf.ttf</file>
         <file>ui/qml/Controls2/LabelWithButtonType.qml</file>
         <file>images/controls/arrow-right.svg</file>
@@ -200,5 +199,8 @@
         <file>ui/qml/Controls2/TextTypes/Header2TextType.qml</file>
         <file>ui/qml/Controls2/HorizontalRadioButton.qml</file>
         <file>ui/qml/Controls2/VerticalRadioButton.qml</file>
+        <file>ui/qml/Controls2/SwitcherType.qml</file>
+        <file>ui/qml/Pages2/PageTest.qml</file>
+        <file>ui/qml/Controls2/TabButtonType.qml</file>
     </qresource>
 </RCC>
diff --git a/client/ui/qml/Controls2/CheckBoxType.qml b/client/ui/qml/Controls2/CheckBoxType.qml
index 98f6c5fe..1a22f326 100644
--- a/client/ui/qml/Controls2/CheckBoxType.qml
+++ b/client/ui/qml/Controls2/CheckBoxType.qml
@@ -3,10 +3,9 @@ import QtQuick.Controls
 import QtQuick.Layouts
 import Qt5Compat.GraphicalEffects
 
-Item {
+CheckBox {
     id: root
 
-    property string text
     property string descriptionText
 
     property string hoveredColor: Qt.rgba(1, 1, 1, 0.05)
@@ -22,107 +21,87 @@ Item {
 
     property string imageSource: "qrc:/images/controls/check.svg"
 
-    implicitWidth: content.implicitWidth
-    implicitHeight: content.implicitHeight
+    hoverEnabled: true
 
-    RowLayout {
-        id: content
+    indicator: Rectangle {
+        id: checkBoxBackground
 
-        anchors.fill: parent
+        implicitWidth: 56
+        implicitHeight: 56
+        radius: 16
 
-        CheckBox {
-            id: checkBox
+        color:  {
+            if (root.hovered) {
+                return hoveredColor
+            }
+            return defaultColor
+        }
 
-            implicitWidth: 56
-            implicitHeight: 56
+        Behavior on color {
+            PropertyAnimation { duration: 200 }
+        }
 
-            indicator: Image {
+        Rectangle {
+            id: imageBorder
+
+            anchors.centerIn: parent
+            width: 24
+            height: 24
+            color: "transparent"
+            border.color: root.checked ? checkedBorderColor : defaultBorderColor
+            border.width: 1
+            radius: 4
+
+            Image {
                 id: indicator
-                anchors.verticalCenter: checkBox.verticalCenter
-                anchors.horizontalCenter: checkBox.horizontalCenter
+                anchors.centerIn: parent
+
+                source: root.pressed ? imageSource : root.checked ? imageSource : ""
 
                 ColorOverlay {
                     id: imageColor
                     anchors.fill: indicator
                     source: indicator
-                }
-            }
 
-            Rectangle {
-                id: imageBorder
-
-                anchors.verticalCenter: checkBox.verticalCenter
-                anchors.horizontalCenter: checkBox.horizontalCenter
-                width: 24
-                height: 24
-                color: "transparent"
-                border.color: checkBox.checked ? checkedBorderColor : defaultBorderColor
-                border.width: 1
-                radius: 4
-            }
-
-            background: Rectangle {
-                id: checkBoxBackground
-                radius: 16
-
-                color: "transparent"
-
-                Behavior on color {
-                    PropertyAnimation { duration: 200 }
+                    color: root.pressed ? pressedImageColor : root.checked ? checkedImageColor : defaultImageColor
                 }
             }
         }
+    }
 
-        ColumnLayout {
-            Text {
-                text: root.text
-                color: "#D7D8DB"
-                font.pixelSize: 18
-                font.weight: 400
-                font.family: "PT Root UI VF"
+    contentItem: ColumnLayout {
+        anchors.fill: parent
+        anchors.leftMargin: 8 + checkBoxBackground.width
 
-                height: 22
-                Layout.fillWidth: true
-            }
+        Text {
+            text: root.text
+            color: "#D7D8DB"
+            font.pixelSize: 18
+            font.weight: 400
+            font.family: "PT Root UI VF"
 
-            Text {
-                text: root.descriptionText
-                color: "#878b91"
-                font.pixelSize: 13
-                font.weight: 400
-                font.family: "PT Root UI VF"
-                font.letterSpacing: 0.02
+            height: 22
+            Layout.fillWidth: true
+        }
 
-                height: 16
-                Layout.fillWidth: true
-            }
+        Text {
+            text: root.descriptionText
+            color: "#878b91"
+            font.pixelSize: 13
+            font.weight: 400
+            font.family: "PT Root UI VF"
+            font.letterSpacing: 0.02
+
+            height: 16
+            Layout.fillWidth: true
         }
     }
 
     MouseArea {
         anchors.fill: parent
         cursorShape: Qt.PointingHandCursor
-        hoverEnabled: true
-
-        onEntered: {
-            checkBoxBackground.color = hoveredColor
-        }
-
-        onExited: {
-            checkBoxBackground.color = defaultColor
-        }
-
-        onPressedChanged: {
-            indicator.source = pressed ? imageSource : checkBox.checked ? imageSource : ""
-            imageColor.color = pressed ? pressedImageColor : checkBox.checked ? checkedImageColor : defaultImageColor
-            checkBoxBackground.color = pressed ? pressedColor : entered ? hoveredColor : defaultColor
-        }
-
-        onClicked: {
-            checkBox.checked = !checkBox.checked
-            indicator.source = checkBox.checked ? imageSource : ""
-            imageColor.color = checkBox.checked ? checkedImageColor : defaultImageColor
-            imageBorder.border.color = checkBox.checked ? checkedBorderColor : defaultBorderColor
-        }
+        enabled: false
     }
 }
+
+
diff --git a/client/ui/qml/Controls2/HeaderType.qml b/client/ui/qml/Controls2/HeaderType.qml
index b60ccce4..6e10e75c 100644
--- a/client/ui/qml/Controls2/HeaderType.qml
+++ b/client/ui/qml/Controls2/HeaderType.qml
@@ -22,6 +22,9 @@ Item {
 
             image: root.buttonImage
             imageColor: "#D7D8DB"
+
+            visible: image ? true : false
+
             onClicked: {
                 UiLogic.closePage()
             }
@@ -58,6 +61,7 @@ Item {
             wrapMode: Text.WordWrap
 
             height: 24
+            Layout.topMargin: 16
             Layout.fillWidth: true
         }
     }
diff --git a/client/ui/qml/Controls2/SwitcherType.qml b/client/ui/qml/Controls2/SwitcherType.qml
new file mode 100644
index 00000000..b593ece8
--- /dev/null
+++ b/client/ui/qml/Controls2/SwitcherType.qml
@@ -0,0 +1,83 @@
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+
+Switch {
+    id: root
+
+    property string checkedIndicatorColor: "#412102"
+    property string defaultIndicatorColor: "transparent"
+    property string checkedIndicatorBorderColor: "#412102"
+    property string defaultIndicatorBorderColor: "#494B50"
+
+    property string checkedInnerCircleColor: "#FBB26A"
+    property string defaultInnerCircleColor: "#D7D8DB"
+
+    property string hoveredIndicatorBackgroundColor: Qt.rgba(1, 1, 1, 0.08)
+    property string defaultIndicatorBackgroundColor: "transparent"
+
+    indicator: Rectangle {
+        implicitWidth: 52
+        implicitHeight: 32
+        x: content.width - width
+        radius: 16
+        color: root.checked ? checkedIndicatorColor : defaultIndicatorColor
+        border.color: root.checked ? checkedIndicatorBorderColor : defaultIndicatorBorderColor
+
+        Behavior on color {
+            PropertyAnimation { duration: 200 }
+        }
+        Behavior on border.color {
+            PropertyAnimation { duration: 200 }
+        }
+
+        Rectangle {
+            id: innerCircle
+
+            anchors.verticalCenter: parent.verticalCenter
+            x: root.checked ? parent.width - width - 4 : 8
+            width: root.checked ? 24 : 16
+            height: root.checked ? 24 : 16
+            radius: 23
+            color: root.checked ? checkedInnerCircleColor : defaultInnerCircleColor
+
+            Behavior on x {
+                PropertyAnimation { duration: 200 }
+            }
+        }
+
+        Rectangle {
+            anchors.centerIn: innerCircle
+            width: 40
+            height: 40
+            radius: 23
+            color: hovered ? hoveredIndicatorBackgroundColor : defaultIndicatorBackgroundColor
+
+            Behavior on color {
+                PropertyAnimation { duration: 200 }
+            }
+        }
+    }
+
+    contentItem: ColumnLayout {
+        id: content
+
+        Text {
+            text: root.text
+            color: "#D7D8DB"
+            font.pixelSize: 18
+            font.weight: 400
+            font.family: "PT Root UI VF"
+
+            height: 22
+            Layout.fillWidth: true
+            Layout.bottomMargin: 16
+        }
+    }
+
+    MouseArea {
+        anchors.fill: parent
+        cursorShape: Qt.PointingHandCursor
+        enabled: false
+    }
+}
diff --git a/client/ui/qml/Controls2/TabButtonType.qml b/client/ui/qml/Controls2/TabButtonType.qml
new file mode 100644
index 00000000..f39edefd
--- /dev/null
+++ b/client/ui/qml/Controls2/TabButtonType.qml
@@ -0,0 +1,56 @@
+import QtQuick
+import QtQuick.Controls
+
+TabButton {
+    id: root
+
+    property string hoveredColor: "#412102"
+    property string defaultColor: "#2C2D30"
+    property string selectedColor: "#FBB26A"
+
+    property string textColor: "#D7D8DB"
+
+    property bool isSelected: false
+
+    implicitHeight: 48
+
+    hoverEnabled: true
+
+    background: Rectangle {
+        id: background
+
+        anchors.fill: parent
+        color: "transparent"
+
+        Rectangle {
+            width: parent.width
+            height: 1
+            y: parent.height - height
+            color: {
+                if(root.isSelected) {
+                    return selectedColor
+                }
+                return hovered ? hoveredColor : defaultColor
+            }
+
+            Behavior on color {
+                PropertyAnimation { duration: 200 }
+            }
+        }
+    }
+
+    contentItem: Text {
+        anchors.fill: background
+        height: 24
+
+        font.family: "PT Root UI"
+        font.styleName: "normal"
+        font.weight: 500
+        font.pixelSize: 16
+        color: textColor
+        text: root.text
+
+        horizontalAlignment: Text.AlignHCenter
+        verticalAlignment: Text.AlignVCenter
+    }
+}
diff --git a/client/ui/qml/Controls2/VerticalRadioButton.qml b/client/ui/qml/Controls2/VerticalRadioButton.qml
index 058cf9ef..edcd1c29 100644
--- a/client/ui/qml/Controls2/VerticalRadioButton.qml
+++ b/client/ui/qml/Controls2/VerticalRadioButton.qml
@@ -26,9 +26,6 @@ RadioButton {
 
     property string defaultInnerCircleColor: "#FBB26A"
 
-    implicitWidth: background.implicitWidth + content.implicitWidth
-    implicitHeight: background.implicitWidth
-
     hoverEnabled: true
 
     indicator: Rectangle {
@@ -121,14 +118,10 @@ RadioButton {
         }
     }
 
-    contentItem: Item {}
-
-    ColumnLayout {
+    contentItem: ColumnLayout {
         id: content
         anchors.fill: parent
         anchors.leftMargin: 8 + background.width
-        anchors.topMargin: 4
-        anchors.bottomMargin: 4
 
         Text {
             text: root.text
diff --git a/client/ui/qml/Pages/PageTest.qml b/client/ui/qml/Pages/PageTest.qml
deleted file mode 100644
index 4c571ae0..00000000
--- a/client/ui/qml/Pages/PageTest.qml
+++ /dev/null
@@ -1,125 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-import QtQuick.Layouts
-import PageEnum 1.0
-import "./"
-import "../Controls"
-import "../Controls2"
-import "../Config"
-
-PageBase {
-    id: root
-    page: PageEnum.Test
-    logic: ViewConfigLogic
-
-    Rectangle {
-        anchors.fill: parent
-        color: "#0E0E11"
-    }
-
-    FlickableType {
-        id: fl
-        anchors.top: root.top
-        anchors.bottom: root.bottom
-        contentHeight: content.height
-
-        ColumnLayout {
-            id: content
-            enabled: true
-            anchors.top: parent.top
-            anchors.left: parent.left
-            anchors.right: parent.right
-            anchors.rightMargin: 15
-
-            BasicButtonType {
-                Layout.fillWidth: true
-                Layout.topMargin: 10
-                text: qsTr("Forget this server")
-
-//                onClicked: {
-//                    UiLogic.goToPage(PageEnum.Start)
-//                }
-            }
-
-            BasicButtonType {
-                Layout.fillWidth: true
-                Layout.topMargin: 10
-
-                defaultColor: "transparent"
-                hoveredColor: Qt.rgba(255, 255, 255, 0.08)
-                pressedColor: Qt.rgba(255, 255, 255, 0.12)
-                disabledColor: "#878B91"
-                textColor: "#D7D8DB"
-                borderWidth: 1
-
-                text: qsTr("Forget this server")
-
-//                onClicked: {
-//                    UiLogic.goToPage(PageEnum.Start)
-//                }
-            }
-
-            TextFieldWithHeaderType {
-                Layout.fillWidth: true
-                Layout.topMargin: 10
-                headerText: "Server IP adress [:port]"
-            }
-
-            LabelWithButtonType {
-                id: ip
-                Layout.fillWidth: true
-                Layout.topMargin: 10
-
-                text: "IP, логин и пароль от сервера"
-                buttonImage: "qrc:/images/controls/chevron-right.svg"
-
-//                onClickedFunc: function() {
-//                    UiLogic.goToPage(PageEnum.Start)
-//                }
-            }
-            Rectangle {
-                Layout.fillWidth: true
-                height: 1
-                color: "#2C2D30"
-            }
-            LabelWithButtonType {
-                Layout.fillWidth: true
-                Layout.topMargin: 10
-
-                text: "QR-код, ключ или файл настроек"
-                buttonImage: "qrc:/images/controls/chevron-right.svg"
-
-//                onClickedFunc: function() {
-//                    UiLogic.goToPage(PageEnum.Start)
-//                }
-            }
-            Rectangle {
-                Layout.fillWidth: true
-                height: 1
-                color: "#2C2D30"
-            }
-
-            CardType {
-                Layout.fillWidth: true
-                Layout.topMargin: 10
-
-                headerText: "Высокий"
-                bodyText: "Многие иностранные сайты и VPN-провайдеры заблокированы"
-                footerText: "футер"
-            }
-
-            CardType {
-                Layout.fillWidth: true
-                Layout.topMargin: 10
-
-                headerText: "Высокий"
-                bodyText: "Многие иностранные сайты и VPN-провайдеры заблокированы"
-                footerText: "футер"
-            }
-
-            CheckBoxType {
-//                text: qsTr("Auto-negotiate encryption")
-            }
-        }
-    }
-}
diff --git a/client/ui/qml/Pages2/PageStart.qml b/client/ui/qml/Pages2/PageStart.qml
index 331a6aec..8d8fbb9d 100644
--- a/client/ui/qml/Pages2/PageStart.qml
+++ b/client/ui/qml/Pages2/PageStart.qml
@@ -76,75 +76,10 @@ PageBase {
 
                 text: qsTr("У меня ничего нет")
 
-//                onClicked: {
-//                    UiLogic.goToPage(PageEnum.Start)
-//                }
-            }
-
-            DropDownType {
-                Layout.fillWidth: true
-
-                text: "IP, логин и пароль от сервера"
-                descriptionText: "IP, логин и пароль от сервера"
-
-                menuModel: [
-                    qsTr("SHA512"),
-                    qsTr("SHA384"),
-                    qsTr("SHA256"),
-                    qsTr("SHA3-512"),
-                    qsTr("SHA3-384"),
-                    qsTr("SHA3-256"),
-                    qsTr("whirlpool"),
-                    qsTr("BLAKE2b512"),
-                    qsTr("BLAKE2s256"),
-                    qsTr("SHA1")
-                ]
-            }
-            CheckBoxType {
-//                text: qsTr("Auto-negotiate encryption")
-            }
-            CheckBoxType {
-                text: qsTr("Auto-negotiate encryption")
-                descriptionText: "dssaa"
-            }
-
-            Rectangle {
-                implicitWidth: buttonGroup.implicitWidth
-                implicitHeight: buttonGroup.implicitHeight
-
-                Layout.leftMargin: 16
-                Layout.rightMargin: 16
-
-                color: "#1C1D21"
-                radius: 16
-                RowLayout {
-                    id: buttonGroup
-
-                    spacing: 0
-
-                    HorizontalRadioButton {
-                        implicitWidth: (root.width - 32) / 2
-                        text: "ddsasdasd"
-                    }
-                    HorizontalRadioButton {
-                        implicitWidth: (root.width - 32) / 2
-                        text: "ddsasdasd"
-                    }
+                onClicked: {
+                    UiLogic.goToPage(PageEnum.Test)
                 }
             }
-
-            VerticalRadioButton {
-                text: "dsasd"
-                descriptionText: "asd"
-                checked: true
-
-                Layout.fillWidth: true
-            }
-            VerticalRadioButton {
-                text: "dsasd"
-
-                Layout.fillWidth: true
-            }
         }
 
         Drawer {
diff --git a/client/ui/qml/Pages2/PageTest.qml b/client/ui/qml/Pages2/PageTest.qml
new file mode 100644
index 00000000..af9ef286
--- /dev/null
+++ b/client/ui/qml/Pages2/PageTest.qml
@@ -0,0 +1,285 @@
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+import PageEnum 1.0
+
+import "./"
+import "../Pages"
+import "../Controls2"
+import "../Config"
+import "../Controls2/TextTypes"
+
+PageBase {
+    id: root
+    page: PageEnum.Test
+    logic: ViewConfigLogic
+
+    ColumnLayout {
+        id: content
+        anchors.top: parent.top
+        anchors.left: parent.left
+        anchors.right: parent.right
+
+        HeaderType {
+            id: header
+
+            Layout.rightMargin: 16
+            Layout.leftMargin: 16
+            Layout.topMargin: 20
+            Layout.bottomMargin: 32
+            Layout.fillWidth: true
+
+            buttonImage: "qrc:/images/controls/arrow-left.svg"
+            headerText: "Server 1"
+            descriptionText: "root 192.168.111.111"
+        }
+
+        Item {
+            Layout.fillWidth: true
+
+            TabBar {
+                id: tabBar
+
+                anchors {
+                    top: parent.top
+                    right: parent.right
+                    left: parent.left
+                }
+
+                background: Rectangle {
+                    color: "transparent"
+                }
+
+                TabButtonType {
+                    id: bb
+                    isSelected: tabBar.currentIndex === 0
+                    text: qsTr("Протоколы")
+                }
+                TabButtonType {
+                    isSelected: tabBar.currentIndex === 1
+                    text: qsTr("Сервисы")
+                }
+                TabButtonType {
+                    isSelected: tabBar.currentIndex === 2
+                    text: qsTr("Данные")
+                }
+            }
+
+            StackLayout {
+                id: stackLayout
+                currentIndex: tabBar.currentIndex
+
+                anchors.top: tabBar.bottom
+                anchors.topMargin: 16
+
+                width: parent.width
+                height: root.height - header.implicitHeight - tabBar.implicitHeight - 100
+
+                Item {
+                    id: protocolsTab
+
+                    FlickableType {
+                        anchors.top: parent.top
+                        anchors.bottom: parent.bottom
+                        contentHeight: protocolsTabContent.height
+
+                        ColumnLayout {
+                            id: protocolsTabContent
+                            anchors.top: parent.top
+                            anchors.left: parent.left
+                            anchors.right: parent.right
+
+                            BasicButtonType {
+                                Layout.fillWidth: true
+                                Layout.leftMargin: 16
+                                Layout.rightMargin: 16
+                                text: qsTr("Forget this server")
+                            }
+
+                            BasicButtonType {
+                                Layout.fillWidth: true
+                                Layout.leftMargin: 16
+                                Layout.rightMargin: 16
+
+                                defaultColor: "transparent"
+                                hoveredColor: Qt.rgba(255, 255, 255, 0.08)
+                                pressedColor: Qt.rgba(255, 255, 255, 0.12)
+                                disabledColor: "#878B91"
+                                textColor: "#D7D8DB"
+                                borderWidth: 1
+
+                                text: qsTr("Forget this server")
+                            }
+
+                            TextFieldWithHeaderType {
+                                Layout.fillWidth: true
+                                Layout.leftMargin: 16
+                                Layout.rightMargin: 16
+                                headerText: "Server IP adress [:port]"
+                            }
+
+                            LabelWithButtonType {
+                                id: ip
+                                Layout.fillWidth: true
+                                Layout.leftMargin: 16
+                                Layout.rightMargin: 16
+
+                                text: "IP, логин и пароль от сервера"
+                                buttonImage: "qrc:/images/controls/chevron-right.svg"
+                            }
+
+                            Rectangle {
+                                Layout.fillWidth: true
+                                Layout.leftMargin: 16
+                                Layout.rightMargin: 16
+                                height: 1
+                                color: "#2C2D30"
+                            }
+
+                            LabelWithButtonType {
+                                Layout.fillWidth: true
+                                Layout.leftMargin: 16
+                                Layout.rightMargin: 16
+
+                                text: "QR-код, ключ или файл настроек"
+                                buttonImage: "qrc:/images/controls/chevron-right.svg"
+                            }
+
+                            Rectangle {
+                                Layout.fillWidth: true
+                                Layout.leftMargin: 16
+                                Layout.rightMargin: 16
+                                height: 1
+                                color: "#2C2D30"
+                            }
+
+                            CardType {
+                                Layout.fillWidth: true
+                                Layout.leftMargin: 16
+                                Layout.rightMargin: 16
+
+                                headerText: "Высокий"
+                                bodyText: "Многие иностранные сайты и VPN-провайдеры заблокированы"
+                                footerText: "футер"
+                            }
+
+                            CardType {
+                                Layout.fillWidth: true
+                                Layout.leftMargin: 16
+                                Layout.rightMargin: 16
+
+                                headerText: "Высокий"
+                                bodyText: "Многие иностранные сайты и VPN-провайдеры заблокированы"
+                                footerText: "футер"
+                            }
+
+                            DropDownType {
+                                Layout.fillWidth: true
+
+                                text: "IP, логин и пароль от сервера"
+                                descriptionText: "IP, логин и пароль от сервера"
+
+                                menuModel: [
+                                    qsTr("SHA512"),
+                                    qsTr("SHA384"),
+                                    qsTr("SHA256"),
+                                    qsTr("SHA3-512"),
+                                    qsTr("SHA3-384"),
+                                    qsTr("SHA3-256"),
+                                    qsTr("whirlpool"),
+                                    qsTr("BLAKE2b512"),
+                                    qsTr("BLAKE2s256"),
+                                    qsTr("SHA1")
+                                ]
+                            }
+                        }
+                    }
+                }
+
+                Item {
+                    id: servicesTab
+
+                    FlickableType {
+                        anchors.top: parent.top
+                        anchors.bottom: parent.bottom
+                        contentHeight: servicesTabContent.height
+
+                        ColumnLayout {
+                            id: servicesTabContent
+                            anchors.top: parent.top
+                            anchors.left: parent.left
+                            anchors.right: parent.right
+
+                            CheckBoxType {
+                                Layout.leftMargin: 16
+                                Layout.rightMargin: 16
+                                Layout.fillWidth: true
+                                text: qsTr("Auto-negotiate encryption")
+                            }
+                            CheckBoxType {
+                                Layout.leftMargin: 16
+                                Layout.rightMargin: 16
+                                Layout.fillWidth: true
+                                text: qsTr("Auto-negotiate encryption")
+                                descriptionText: qsTr("Auto-negotiate encryption")
+                            }
+
+                            Rectangle {
+                                implicitWidth: buttonGroup.implicitWidth
+                                implicitHeight: buttonGroup.implicitHeight
+
+                                Layout.leftMargin: 16
+                                Layout.rightMargin: 16
+
+                                color: "#1C1D21"
+                                radius: 16
+
+                                RowLayout {
+                                    id: buttonGroup
+
+                                    spacing: 0
+
+                                    HorizontalRadioButton {
+                                        implicitWidth: (root.width - 32) / 2
+                                        text: "UDP"
+                                    }
+
+                                    HorizontalRadioButton {
+                                        implicitWidth: (root.width - 32) / 2
+                                        text: "TCP"
+                                    }
+                                }
+                            }
+
+                            VerticalRadioButton {
+                                text: "Раздельное туннелирование"
+                                descriptionText: "Позволяет подключаться к одним сайтам через защищенное соединение, а к другим в обход него"
+                                checked: true
+
+                                Layout.fillWidth: true
+                                Layout.leftMargin: 16
+                                Layout.rightMargin: 16
+                            }
+
+                            VerticalRadioButton {
+                                text: "Раздельное туннелирование"
+
+                                Layout.fillWidth: true
+                                Layout.leftMargin: 16
+                                Layout.rightMargin: 16
+                            }
+
+                            SwitcherType {
+                                text: "Auto-negotiate encryption"
+
+                                Layout.fillWidth: true
+                                Layout.leftMargin: 16
+                                Layout.rightMargin: 16
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+}

From 68b27451f28dfc1ad634852c1dc53fc15b2b90f5 Mon Sep 17 00:00:00 2001
From: "vladimir.kuznetsov" <nethiuswork@gmail.com>
Date: Mon, 1 May 2023 07:29:09 +0300
Subject: [PATCH 011/278] Added scroll bar for DropDownType

---
 client/ui/qml/Controls2/DropDownType.qml | 143 +++++++++++++----------
 1 file changed, 79 insertions(+), 64 deletions(-)

diff --git a/client/ui/qml/Controls2/DropDownType.qml b/client/ui/qml/Controls2/DropDownType.qml
index 8abb03d2..696aa48a 100644
--- a/client/ui/qml/Controls2/DropDownType.qml
+++ b/client/ui/qml/Controls2/DropDownType.qml
@@ -19,7 +19,6 @@ Item {
 
     property alias menuModel: menuContent.model
 
-    width: buttonContent.implicitWidth
     height: buttonContent.implicitHeight
 
     Rectangle {
@@ -136,89 +135,105 @@ Item {
             color: Qt.rgba(14/255, 14/255, 17/255, 0.8)
         }
 
-        Column {
+        Header2TextType {
+            id: header
+            width: parent.width
+
+            text: "Данные для подключения"
+            wrapMode: Text.WordWrap
+
             anchors.top: parent.top
             anchors.left: parent.left
             anchors.right: parent.right
             anchors.topMargin: 16
+            anchors.leftMargin: 16
+            anchors.rightMargin: 16
+        }
 
-            spacing: 16
+        FlickableType {
+            anchors.top: header.bottom
+            anchors.topMargin: 16
+            contentHeight: col.implicitHeight
 
-            Header2TextType {
-                width: parent.width
+            Column {
+                id: col
+                anchors.top: parent.top
+                anchors.left: parent.left
+                anchors.right: parent.right
 
-                text: "Данные для подключения"
-                wrapMode: Text.WordWrap
+                spacing: 16
 
-                leftPadding: 16
-                rightPadding: 16
-            }
+                ButtonGroup {
+                    id: radioButtonGroup
+                }
 
-            ButtonGroup {
-                id: radioButtonGroup
-            }
+                ListView {
+                    id: menuContent
+                    width: parent.width
+                    height: menuContent.contentItem.height
 
-            ListView {
-                id: menuContent
-                width: parent.width
-                height: menuContent.contentItem.height
+                    currentIndex: -1
 
-                currentIndex: -1
+                    clip: true
+                    interactive: false
 
-                clip: true
-                interactive: false
+                    delegate: Item {
+                        implicitWidth: menuContent.width
+                        implicitHeight: radioButton.implicitHeight
 
-                delegate: Item {
-                    implicitWidth: menuContent.width
-                    implicitHeight: radioButton.implicitHeight
+                        RadioButton {
+                            id: radioButton
 
-                    RadioButton {
-                        id: radioButton
+                            implicitWidth: parent.width
+                            implicitHeight: radioButtonContent.implicitHeight
 
-                        implicitWidth: parent.width
-                        implicitHeight: radioButtonContent.implicitHeight
+                            hoverEnabled: true
 
-                        hoverEnabled: true
+                            ButtonGroup.group: radioButtonGroup
 
-                        ButtonGroup.group: radioButtonGroup
-
-                        indicator: Rectangle {
-                            anchors.fill: parent
-                            color: radioButton.hovered ? "#2C2D30" : "#1C1D21"
-                        }
-
-                        RowLayout {
-                            id: radioButtonContent
-                            anchors.fill: parent
-
-                            anchors.rightMargin: 16
-                            anchors.leftMargin: 16
-
-                            z: 1
-
-                            Text {
-                                id: text
-
-                                text: modelData
-                                color: "#D7D8DB"
-                                font.pixelSize: 16
-                                font.weight: 400
-                                font.family: "PT Root UI VF"
-
-                                height: 24
-
-                                Layout.fillWidth: true
-                                Layout.topMargin: 20
-                                Layout.bottomMargin: 20
+                            indicator: Rectangle {
+                                anchors.fill: parent
+                                color: radioButton.hovered ? "#2C2D30" : "#1C1D21"
                             }
 
-                            Image {
-                                source: "qrc:/images/controls/check.svg"
-                                visible: radioButton.checked
-                                width: 24
-                                height: 24
+                            RowLayout {
+                                id: radioButtonContent
+                                anchors.fill: parent
 
-                                Layout.rightMargin: 8
+                                anchors.rightMargin: 16
+                                anchors.leftMargin: 16
+
+                                z: 1
+
+                                Text {
+                                    id: text
+
+                                    text: modelData
+                                    color: "#D7D8DB"
+                                    font.pixelSize: 16
+                                    font.weight: 400
+                                    font.family: "PT Root UI VF"
+
+                                    height: 24
+
+                                    Layout.fillWidth: true
+                                    Layout.topMargin: 20
+                                    Layout.bottomMargin: 20
+                                }
+
+                                Image {
+                                    source: "qrc:/images/controls/check.svg"
+                                    visible: radioButton.checked
+                                    width: 24
+                                    height: 24
+
+                                    Layout.rightMargin: 8
+                                }
+                            }
+
+                            onClicked: {
+                                root.text = modelData
+                                menu.visible = false
                             }
                         }
                     }

From 4f36349630a1ee350c63bb2717c4f75c9973ddf1 Mon Sep 17 00:00:00 2001
From: "vladimir.kuznetsov" <nethiuswork@gmail.com>
Date: Wed, 3 May 2023 19:06:16 +0300
Subject: [PATCH 012/278] changed the way to create qml pages, now the page is
 created when you go to it

- added PageSetupWizardConfigSource, PageSetupWizardInstalling, PageSetupWizardProtocolSettings, PageSetupWizardTextKey
---
 client/amnezia_application.cpp                |   6 +
 client/amnezia_application.h                  |   2 +
 client/images/controls/folder-open.svg        |   3 +
 client/images/controls/qr-code.svg            |  14 +++
 client/images/controls/text-cursor.svg        |   5 +
 client/resources.qrc                          |   7 ++
 client/ui/models/containers_model.cpp         |  10 ++
 client/ui/models/containers_model.h           |   4 +
 client/ui/pages.h                             |   4 +-
 .../ui/pages_logic/ServerContainersLogic.cpp  |   4 +-
 client/ui/qml/Controls2/BasicButtonType.qml   |   1 -
 .../ui/qml/Controls2/LabelWithButtonType.qml  |  10 ++
 .../qml/Controls2/TextFieldWithHeaderType.qml | 103 ++++++++++------
 client/ui/qml/PageLoader.qml                  |  58 +--------
 .../Pages2/PageSetupWizardConfigSource.qml    | 114 ++++++++++++++++++
 .../qml/Pages2/PageSetupWizardCredentials.qml |   6 +-
 client/ui/qml/Pages2/PageSetupWizardEasy.qml  |   2 +-
 .../qml/Pages2/PageSetupWizardInstalling.qml  |  46 +++++++
 .../PageSetupWizardProtocolSettings.qml       |  96 +++++++++++++++
 .../qml/Pages2/PageSetupWizardProtocols.qml   |  12 +-
 .../ui/qml/Pages2/PageSetupWizardTextKey.qml  |  74 ++++++++++++
 client/ui/qml/Pages2/PageStart.qml            |  13 +-
 client/ui/qml/main2.qml                       |  56 ++-------
 client/ui/uilogic.cpp                         |   8 +-
 client/ui/uilogic.h                           |   3 +-
 25 files changed, 503 insertions(+), 158 deletions(-)
 create mode 100644 client/images/controls/folder-open.svg
 create mode 100644 client/images/controls/qr-code.svg
 create mode 100644 client/images/controls/text-cursor.svg
 create mode 100644 client/ui/qml/Pages2/PageSetupWizardConfigSource.qml
 create mode 100644 client/ui/qml/Pages2/PageSetupWizardInstalling.qml
 create mode 100644 client/ui/qml/Pages2/PageSetupWizardProtocolSettings.qml
 create mode 100644 client/ui/qml/Pages2/PageSetupWizardTextKey.qml

diff --git a/client/amnezia_application.cpp b/client/amnezia_application.cpp
index 231b94e4..b4255a0c 100644
--- a/client/amnezia_application.cpp
+++ b/client/amnezia_application.cpp
@@ -99,6 +99,10 @@ void AmneziaApplication::init()
     }, Qt::QueuedConnection);
 
     m_engine->rootContext()->setContextProperty("Debug", &Logger::Instance());
+
+    m_containersModel.reset(new ContainersModel(m_settings, this));
+    m_engine->rootContext()->setContextProperty("ContainersModel", m_containersModel.get());
+
     m_uiLogic->registerPagesLogic();
 
 #if defined(Q_OS_IOS)
@@ -180,6 +184,8 @@ void AmneziaApplication::loadFonts()
     QFontDatabase::addApplicationFont(":/fonts/Lato-Regular.ttf");
     QFontDatabase::addApplicationFont(":/fonts/Lato-Thin.ttf");
     QFontDatabase::addApplicationFont(":/fonts/Lato-ThinItalic.ttf");
+
+    QFontDatabase::addApplicationFont(":/fonts/pt-root-ui_vf.ttf");
 }
 
 void AmneziaApplication::loadTranslator()
diff --git a/client/amnezia_application.h b/client/amnezia_application.h
index 1ac6e772..abdb1f2a 100644
--- a/client/amnezia_application.h
+++ b/client/amnezia_application.h
@@ -56,6 +56,8 @@ private:
     QTranslator* m_translator;
     QCommandLineParser m_parser;
 
+    QScopedPointer<ContainersModel> m_containersModel;
+
 };
 
 #endif // AMNEZIA_APPLICATION_H
diff --git a/client/images/controls/folder-open.svg b/client/images/controls/folder-open.svg
new file mode 100644
index 00000000..f126e5c5
--- /dev/null
+++ b/client/images/controls/folder-open.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M6 14L7.45 11.1C7.61696 10.7687 7.87281 10.4903 8.18893 10.296C8.50504 10.1018 8.86897 9.99927 9.24 10H20C20.3055 9.99946 20.6071 10.0689 20.8816 10.2031C21.1561 10.3372 21.3963 10.5325 21.5836 10.7739C21.7709 11.0152 21.9004 11.2963 21.9622 11.5956C22.024 11.8948 22.0164 12.2042 21.94 12.5L20.39 18.5C20.279 18.9299 20.0281 19.3106 19.6769 19.5822C19.3256 19.8538 18.894 20.0008 18.45 20H4C3.46957 20 2.96086 19.7893 2.58579 19.4142C2.21071 19.0391 2 18.5304 2 18V5C2 3.9 2.9 3 4 3H7.93C8.25941 3.0017 8.58331 3.08475 8.8729 3.24176C9.1625 3.39877 9.40882 3.62488 9.59 3.9L10.41 5.1C10.5912 5.37512 10.8375 5.60123 11.1271 5.75824C11.4167 5.91525 11.7406 5.9983 12.07 6H18C18.5304 6 19.0391 6.21071 19.4142 6.58579C19.7893 6.96086 20 7.46957 20 8V10" stroke="#CBCBCB" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/client/images/controls/qr-code.svg b/client/images/controls/qr-code.svg
new file mode 100644
index 00000000..a8f760fe
--- /dev/null
+++ b/client/images/controls/qr-code.svg
@@ -0,0 +1,14 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M7 3H4C3.44772 3 3 3.44772 3 4V7C3 7.55228 3.44772 8 4 8H7C7.55228 8 8 7.55228 8 7V4C8 3.44772 7.55228 3 7 3Z" stroke="#CBCBCB" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M20 3H17C16.4477 3 16 3.44772 16 4V7C16 7.55228 16.4477 8 17 8H20C20.5523 8 21 7.55228 21 7V4C21 3.44772 20.5523 3 20 3Z" stroke="#CBCBCB" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M7 16H4C3.44772 16 3 16.4477 3 17V20C3 20.5523 3.44772 21 4 21H7C7.55228 21 8 20.5523 8 20V17C8 16.4477 7.55228 16 7 16Z" stroke="#CBCBCB" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M21 16H18C17.4696 16 16.9609 16.2107 16.5858 16.5858C16.2107 16.9609 16 17.4696 16 18V21" stroke="#CBCBCB" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M21 21V21.01" stroke="#CBCBCB" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M12 7V10C12 10.5304 11.7893 11.0391 11.4142 11.4142C11.0391 11.7893 10.5304 12 10 12H7" stroke="#CBCBCB" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M3 12H3.01" stroke="#CBCBCB" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M12 3H12.01" stroke="#CBCBCB" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M12 16V16.01" stroke="#CBCBCB" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M16 12H17" stroke="#CBCBCB" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M21 12V12.01" stroke="#CBCBCB" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M12 21V20" stroke="#CBCBCB" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/client/images/controls/text-cursor.svg b/client/images/controls/text-cursor.svg
new file mode 100644
index 00000000..17876d77
--- /dev/null
+++ b/client/images/controls/text-cursor.svg
@@ -0,0 +1,5 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M17 22H16C14.9391 22 13.9217 21.5786 13.1716 20.8284C12.4214 20.0783 12 19.0609 12 18V6C12 4.93913 12.4214 3.92172 13.1716 3.17157C13.9217 2.42143 14.9391 2 16 2H17" stroke="#CBCBCB" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M7 22H8C9.06087 22 10.0783 21.5786 10.8284 20.8284C11.5786 20.0783 12 19.0609 12 18V17" stroke="#CBCBCB" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M7 2H8C9.06087 2 10.0783 2.42143 10.8284 3.17157C11.5786 3.92172 12 4.93913 12 6V7" stroke="#CBCBCB" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/client/resources.qrc b/client/resources.qrc
index 1d79af1c..20eed74d 100644
--- a/client/resources.qrc
+++ b/client/resources.qrc
@@ -202,5 +202,12 @@
         <file>ui/qml/Controls2/SwitcherType.qml</file>
         <file>ui/qml/Pages2/PageTest.qml</file>
         <file>ui/qml/Controls2/TabButtonType.qml</file>
+        <file>ui/qml/Pages2/PageSetupWizardProtocolSettings.qml</file>
+        <file>ui/qml/Pages2/PageSetupWizardInstalling.qml</file>
+        <file>ui/qml/Pages2/PageSetupWizardConfigSource.qml</file>
+        <file>images/controls/folder-open.svg</file>
+        <file>images/controls/qr-code.svg</file>
+        <file>images/controls/text-cursor.svg</file>
+        <file>ui/qml/Pages2/PageSetupWizardTextKey.qml</file>
     </qresource>
 </RCC>
diff --git a/client/ui/models/containers_model.cpp b/client/ui/models/containers_model.cpp
index 5468452e..f56613c7 100644
--- a/client/ui/models/containers_model.cpp
+++ b/client/ui/models/containers_model.cpp
@@ -56,4 +56,14 @@ void ContainersModel::setSelectedServerIndex(int index)
     endResetModel();
 }
 
+void ContainersModel::setCurrentlyInstalledContainerIndex(int index)
+{
+//    beginResetModel();
+    m_currentlyInstalledContainerIndex = createIndex(index, 0);
+//    endResetModel();
+}
 
+QString ContainersModel::getCurrentlyInstalledContainerName()
+{
+    return data(m_currentlyInstalledContainerIndex, NameRole).toString();
+}
diff --git a/client/ui/models/containers_model.h b/client/ui/models/containers_model.h
index 36206855..9c409fc0 100644
--- a/client/ui/models/containers_model.h
+++ b/client/ui/models/containers_model.h
@@ -27,12 +27,16 @@ public:
 
     QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
     Q_INVOKABLE void setSelectedServerIndex(int index);
+    Q_INVOKABLE void setCurrentlyInstalledContainerIndex(int index);
+
+    Q_INVOKABLE QString getCurrentlyInstalledContainerName();
 
 protected:
     QHash<int, QByteArray> roleNames() const override;
 
 private:
     int m_selectedServerIndex;
+    QModelIndex m_currentlyInstalledContainerIndex;
     std::shared_ptr<Settings> m_settings;
 };
 
diff --git a/client/ui/pages.h b/client/ui/pages.h
index 9c5db53c..32ac775d 100644
--- a/client/ui/pages.h
+++ b/client/ui/pages.h
@@ -28,7 +28,9 @@ enum class Page {Start = 0, NewServer, NewServerProtocols, Vpn,
            ProtocolSettings, ProtocolShare, QrDecoder, QrDecoderIos, About, ViewConfig,
            AdvancedServerSettings, ClientManagement, ClientInfo,
 
-           Test, WizardCredentials, WizardProtocols, WizardEasySetup};
+           PageStart, PageTest, PageSetupWizardCredentials, PageSetupWizardProtocols, PageSetupWizardEasy,
+           PageSetupWizardProtocolSettings, PageSetupWizardInstalling, PageSetupWizardConfigSource,
+           PageSetupWizardTextKey};
 Q_ENUM_NS(Page)
 
 static void declareQmlPageEnum() {
diff --git a/client/ui/pages_logic/ServerContainersLogic.cpp b/client/ui/pages_logic/ServerContainersLogic.cpp
index 80bf362c..2b556dcc 100644
--- a/client/ui/pages_logic/ServerContainersLogic.cpp
+++ b/client/ui/pages_logic/ServerContainersLogic.cpp
@@ -22,8 +22,8 @@ ServerContainersLogic::ServerContainersLogic(UiLogic *logic, QObject *parent):
 
 void ServerContainersLogic::onUpdatePage()
 {
-    ContainersModel *c_model = qobject_cast<ContainersModel *>(uiLogic()->containersModel());
-    c_model->setSelectedServerIndex(uiLogic()->m_selectedServerIndex);
+//    ContainersModel *c_model = qobject_cast<ContainersModel *>(uiLogic()->containersModel());
+//    c_model->setSelectedServerIndex(uiLogic()->m_selectedServerIndex);
 
     ProtocolsModel *p_model = qobject_cast<ProtocolsModel *>(uiLogic()->protocolsModel());
     p_model->setSelectedServerIndex(uiLogic()->m_selectedServerIndex);
diff --git a/client/ui/qml/Controls2/BasicButtonType.qml b/client/ui/qml/Controls2/BasicButtonType.qml
index cbb664e4..da5d2abf 100644
--- a/client/ui/qml/Controls2/BasicButtonType.qml
+++ b/client/ui/qml/Controls2/BasicButtonType.qml
@@ -14,7 +14,6 @@ Button {
     property string borderColor: "#D7D8DB"
     property int borderWidth: 0
 
-    implicitWidth: 328
     implicitHeight: 56
 
     hoverEnabled: true
diff --git a/client/ui/qml/Controls2/LabelWithButtonType.qml b/client/ui/qml/Controls2/LabelWithButtonType.qml
index 92606940..b6d113bb 100644
--- a/client/ui/qml/Controls2/LabelWithButtonType.qml
+++ b/client/ui/qml/Controls2/LabelWithButtonType.qml
@@ -9,7 +9,9 @@ Item {
     property string descriptionText
 
     property var onClickedFunc
+
     property alias buttonImage: button.image
+    property string iconImage
 
     implicitWidth: content.implicitWidth
     implicitHeight: content.implicitHeight
@@ -18,6 +20,13 @@ Item {
         id: content
         anchors.fill: parent
 
+        Image {
+            id: icon
+            source: iconImage
+            visible: iconImage ? true : false
+            Layout.rightMargin: visible ? 16 : 0
+        }
+
         ColumnLayout {
             Text {
                 font.family: "PT Root UI"
@@ -25,6 +34,7 @@ Item {
                 font.pixelSize: 18
                 color: "#d7d8db"
                 text: root.text
+                wrapMode: Text.WordWrap
 
                 Layout.fillWidth: true
                 height: 22
diff --git a/client/ui/qml/Controls2/TextFieldWithHeaderType.qml b/client/ui/qml/Controls2/TextFieldWithHeaderType.qml
index 350306bb..3458f741 100644
--- a/client/ui/qml/Controls2/TextFieldWithHeaderType.qml
+++ b/client/ui/qml/Controls2/TextFieldWithHeaderType.qml
@@ -10,7 +10,11 @@ Item {
     property string textFieldPlaceholderText
     property bool textFieldEditable: true
 
-    implicitWidth: 328
+    property string buttonText
+    property var clickedFunc
+
+    property alias textField: textField
+
     implicitHeight: 74
 
     Rectangle {
@@ -26,50 +30,77 @@ Item {
         }
     }
 
-    ColumnLayout {
+    RowLayout {
         anchors.fill: backgroud
+        ColumnLayout {
 
-        Text {
-            text: root.headerText
-            color: "#878b91"
-            font.pixelSize: 13
-            font.weight: 400
-            font.family: "PT Root UI VF"
-            font.letterSpacing: 0.02
+            Text {
+                text: root.headerText
+                color: "#878b91"
+                font.pixelSize: 13
+                font.weight: 400
+                font.family: "PT Root UI VF"
+                font.letterSpacing: 0.02
 
-            height: 16
-            Layout.fillWidth: true
-            Layout.rightMargin: 16
-            Layout.leftMargin: 16
-            Layout.topMargin: 16
+                height: 16
+                Layout.fillWidth: true
+                Layout.rightMargin: 16
+                Layout.leftMargin: 16
+                Layout.topMargin: 16
+            }
+
+            TextField {
+                id: textField
+
+                enabled: root.textFieldEditable
+                text: root.textFieldText
+                color: "#d7d8db"
+
+                placeholderText: textFieldPlaceholderText
+                placeholderTextColor: "#494B50"
+
+                selectionColor:  "#412102"
+                selectedTextColor: "#D7D8DB"
+
+                font.pixelSize: 16
+                font.weight: 400
+                font.family: "PT Root UI VF"
+
+                height: 24
+                Layout.fillWidth: true
+                Layout.rightMargin: 16
+                Layout.leftMargin: 16
+                Layout.bottomMargin: 16
+                topPadding: 0
+                rightPadding: 0
+                leftPadding: 0
+                bottomPadding: 0
+
+                background: Rectangle {
+                    anchors.fill: parent
+                    color: "#1c1d21"
+                }
+            }
         }
 
-        TextField {
-            id: textField
+        BasicButtonType {
+            visible: root.buttonText !== ""
 
-            enabled: root.textFieldEditable
-            text: root.textFieldText
-            color: "#d7d8db"
+            defaultColor: "transparent"
+            hoveredColor: Qt.rgba(1, 1, 1, 0.08)
+            pressedColor: Qt.rgba(1, 1, 1, 0.12)
+            disabledColor: "#878B91"
+            textColor: "#D7D8DB"
+            borderWidth: 0
 
-            placeholderText: textFieldPlaceholderText
+            text: buttonText
 
-            font.pixelSize: 16
-            font.weight: 400
-            font.family: "PT Root UI VF"
+            Layout.rightMargin: 24
 
-            height: 24
-            Layout.fillWidth: true
-            Layout.rightMargin: 16
-            Layout.leftMargin: 16
-            Layout.bottomMargin: 16
-            topPadding: 0
-            rightPadding: 0
-            leftPadding: 0
-            bottomPadding: 0
-
-            background: Rectangle {
-                anchors.fill: parent
-                color: "#1c1d21"
+            onClicked: {
+                if (clickedFunc && typeof clickedFunc === "function") {
+                    clickedFunc()
+                }
             }
         }
     }
diff --git a/client/ui/qml/PageLoader.qml b/client/ui/qml/PageLoader.qml
index 5f2fc3c2..a44fa4b5 100644
--- a/client/ui/qml/PageLoader.qml
+++ b/client/ui/qml/PageLoader.qml
@@ -1,57 +1,7 @@
 import QtQuick
+import QtQuick.Controls
 
-import Qt.labs.folderlistmodel
-
-import PageType 1.0
-
-Item {
-    property var pages: ({})
-
-    signal finished()
-
-    FolderListModel {
-        id: folderModelPages
-        folder: "qrc:/ui/qml/Pages2/"
-        nameFilters: ["*.qml"]
-        showDirs: false
-
-        onStatusChanged: {
-            if (status == FolderListModel.Ready) {
-                for (var i = 0; i < folderModelPages.count; i++) {
-                    createPagesObjects(folderModelPages.get(i, "filePath"), PageType.Basic);
-                }
-                finished()
-            }
-        }
-
-        function createPagesObjects(file, type) {
-            if (file.indexOf("Base") !== -1) {
-                return; // skip Base Pages
-            }
-
-            var c = Qt.createComponent("qrc" + file);
-
-            var finishCreation = function(component) {
-                if (component.status === Component.Ready) {
-                    var obj = component.createObject(root);
-                    if (obj === null) {
-                        console.debug("Error creating object " + component.url);
-                    } else {
-                        obj.visible = false
-                        if (type === PageType.Basic) {
-                            pages[obj.page] = obj
-                        }
-                    }
-                } else if (component.status === Component.Error) {
-                    console.debug("Error loading component:", component.errorString());
-                }
-            }
-
-            if (c.status === Component.Ready) {
-                finishCreation(c);
-            } else {
-                console.debug("Warning: " + file + " page components are not ready " + c.errorString());
-            }
-        }
-    }
+StackView {
+    id: stackView
+    initialItem: "PageStart"
 }
diff --git a/client/ui/qml/Pages2/PageSetupWizardConfigSource.qml b/client/ui/qml/Pages2/PageSetupWizardConfigSource.qml
new file mode 100644
index 00000000..26f25a15
--- /dev/null
+++ b/client/ui/qml/Pages2/PageSetupWizardConfigSource.qml
@@ -0,0 +1,114 @@
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+import QtQuick.Dialogs
+
+import PageEnum 1.0
+
+import "./"
+import "../Pages"
+import "../Controls2"
+import "../Controls2/TextTypes"
+import "../Config"
+
+PageBase {
+    id: root
+    page: PageEnum.PageSetupWizardInstalling
+
+    FlickableType {
+        id: fl
+        anchors.top: root.top
+        anchors.bottom: root.bottom
+        contentHeight: content.height
+
+        ColumnLayout {
+            id: content
+
+            anchors.top: parent.top
+            anchors.left: parent.left
+            anchors.right: parent.right
+            anchors.rightMargin: 16
+            anchors.leftMargin: 16
+
+            spacing: 16
+
+            HeaderType {
+                Layout.fillWidth: true
+                Layout.topMargin: 20
+
+                buttonImage: "qrc:/images/controls/arrow-left.svg"
+
+                headerText: "Подключение к серверу"
+                descriptionText: "Не используйте код подключения из публичных источников. Его могли создать, чтобы перехватывать ваши данные.\n
+Всё в порядке, если код передал друг."
+            }
+
+            Header2TextType {
+                Layout.fillWidth: true
+                Layout.topMargin: 32
+
+                text: "Что у вас есть?"
+            }
+
+            LabelWithButtonType {
+                Layout.fillWidth: true
+                Layout.topMargin: 16
+
+                text: "Файл с настройками подключения"
+                buttonImage: "qrc:/images/controls/chevron-right.svg"
+                iconImage: "qrc:/images/controls/folder-open.svg"
+
+                onClickedFunc: function() {
+                    onClicked: fileDialog.open()
+                }
+
+                FileDialog {
+                    id: fileDialog
+//                    currentFolder: StandardPaths.standardLocations(StandardPaths.PicturesLocation)[0]
+                    onAccepted: {
+
+                    }
+                }
+            }
+            Rectangle {
+                Layout.fillWidth: true
+                height: 1
+                color: "#2C2D30"
+            }
+
+            //todo ifdef mobile platforms>
+            LabelWithButtonType {
+                Layout.fillWidth: true
+
+                text: "QR-код"
+                buttonImage: "qrc:/images/controls/chevron-right.svg"
+                iconImage: "qrc:/images/controls/qr-code.svg"
+
+                onClickedFunc: function() {
+                }
+            }
+            Rectangle {
+                Layout.fillWidth: true
+                height: 1
+                color: "#2C2D30"
+            }
+
+            LabelWithButtonType {
+                Layout.fillWidth: true
+
+                text: "Ключ в виде текста"
+                buttonImage: "qrc:/images/controls/chevron-right.svg"
+                iconImage: "qrc:/images/controls/text-cursor.svg"
+
+                onClickedFunc: function() {
+                    UiLogic.goToPage(PageEnum.PageSetupWizardTextKey)
+                }
+            }
+            Rectangle {
+                Layout.fillWidth: true
+                height: 1
+                color: "#2C2D30"
+            }
+        }
+    }
+}
diff --git a/client/ui/qml/Pages2/PageSetupWizardCredentials.qml b/client/ui/qml/Pages2/PageSetupWizardCredentials.qml
index 20472de2..a6e98fee 100644
--- a/client/ui/qml/Pages2/PageSetupWizardCredentials.qml
+++ b/client/ui/qml/Pages2/PageSetupWizardCredentials.qml
@@ -11,7 +11,7 @@ import "../Config"
 
 PageBase {
     id: root
-    page: PageEnum.WizardCredentials
+    page: PageEnum.PageSetupWizardCredentials
 
     FlickableType {
         id: fl
@@ -61,7 +61,7 @@ PageBase {
                 text: qsTr("Настроить сервер простым образом")
 
                 onClicked: function() {
-                    UiLogic.goToPage(PageEnum.WizardEasySetup)
+                    UiLogic.goToPage(PageEnum.PageSetupWizardEasy)
                 }
             }
 
@@ -79,7 +79,7 @@ PageBase {
                 text: qsTr("Выбрать протокол для установки")
 
                 onClicked: function() {
-                    UiLogic.goToPage(PageEnum.WizardProtocols)
+                    UiLogic.goToPage(PageEnum.PageSetupWizardProtocols)
                 }
             }
         }
diff --git a/client/ui/qml/Pages2/PageSetupWizardEasy.qml b/client/ui/qml/Pages2/PageSetupWizardEasy.qml
index b4121592..8c75a1df 100644
--- a/client/ui/qml/Pages2/PageSetupWizardEasy.qml
+++ b/client/ui/qml/Pages2/PageSetupWizardEasy.qml
@@ -11,7 +11,7 @@ import "../Config"
 
 PageBase {
     id: root
-    page: PageEnum.WizardEasySetup
+    page: PageEnum.PageSetupWizardEasy
 
     FlickableType {
         id: fl
diff --git a/client/ui/qml/Pages2/PageSetupWizardInstalling.qml b/client/ui/qml/Pages2/PageSetupWizardInstalling.qml
new file mode 100644
index 00000000..3445b533
--- /dev/null
+++ b/client/ui/qml/Pages2/PageSetupWizardInstalling.qml
@@ -0,0 +1,46 @@
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+
+import PageEnum 1.0
+
+import "./"
+import "../Pages"
+import "../Controls2"
+import "../Controls2/TextTypes"
+import "../Config"
+
+PageBase {
+    id: root
+    page: PageEnum.PageSetupWizardInstalling
+
+    FlickableType {
+        id: fl
+        anchors.top: root.top
+        anchors.bottom: root.bottom
+        contentHeight: content.height
+
+        ColumnLayout {
+            id: content
+
+            anchors.top: parent.top
+            anchors.left: parent.left
+            anchors.right: parent.right
+            anchors.rightMargin: 16
+            anchors.leftMargin: 16
+
+            spacing: 16
+
+            HeaderType {
+                Layout.fillWidth: true
+                Layout.topMargin: 20
+
+                //TODO remove later
+                buttonImage: "qrc:/images/controls/arrow-left.svg"
+
+                headerText: "Установка"
+                descriptionText: ContainersModel.getCurrentlyInstalledContainerName()
+            }
+        }
+    }
+}
diff --git a/client/ui/qml/Pages2/PageSetupWizardProtocolSettings.qml b/client/ui/qml/Pages2/PageSetupWizardProtocolSettings.qml
new file mode 100644
index 00000000..9b6e788f
--- /dev/null
+++ b/client/ui/qml/Pages2/PageSetupWizardProtocolSettings.qml
@@ -0,0 +1,96 @@
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+
+import PageEnum 1.0
+
+import "./"
+import "../Pages"
+import "../Controls2"
+import "../Controls2/TextTypes"
+import "../Config"
+
+PageBase {
+    id: root
+    page: PageEnum.PageSetupWizardProtocolSettings
+
+    FlickableType {
+        id: fl
+        anchors.top: root.top
+        anchors.bottom: root.bottom
+        contentHeight: content.height
+
+        ColumnLayout {
+            id: content
+
+            anchors.top: parent.top
+            anchors.left: parent.left
+            anchors.right: parent.right
+            anchors.rightMargin: 16
+            anchors.leftMargin: 16
+
+            spacing: 16
+
+            HeaderType {
+                Layout.fillWidth: true
+                Layout.topMargin: 20
+
+                buttonImage: "qrc:/images/controls/arrow-left.svg"
+
+                headerText: "Установка " + ContainersModel.getCurrentlyInstalledContainerName()
+                descriptionText: "Эти настройки можно будет изменить позже"
+            }
+
+            BodyTextType {
+                Layout.topMargin: 16
+
+                text: "Network protocol"
+            }
+
+            //TODO move to separete control
+            Rectangle {
+                implicitWidth: buttonGroup.implicitWidth
+                implicitHeight: buttonGroup.implicitHeight
+
+                color: "#1C1D21"
+                radius: 16
+
+                RowLayout {
+                    id: buttonGroup
+
+                    spacing: 0
+
+                    HorizontalRadioButton {
+                        implicitWidth: (root.width - 32) / 2
+                        text: "UDP"
+                    }
+
+                    HorizontalRadioButton {
+                        implicitWidth: (root.width - 32) / 2
+                        text: "TCP"
+                    }
+                }
+            }
+
+            TextFieldWithHeaderType {
+                Layout.fillWidth: true
+                headerText: "Port"
+            }
+        }
+    }
+
+    BasicButtonType {
+        anchors.bottom: parent.bottom
+        anchors.left: parent.left
+        anchors.right: parent.right
+        anchors.rightMargin: 16
+        anchors.leftMargin: 16
+        anchors.bottomMargin: 32
+
+        text: qsTr("Установить")
+
+        onClicked: function() {
+            UiLogic.goToPage(PageEnum.PageSetupWizardInstalling)
+        }
+    }
+}
diff --git a/client/ui/qml/Pages2/PageSetupWizardProtocols.qml b/client/ui/qml/Pages2/PageSetupWizardProtocols.qml
index a50da64b..ad4efbc2 100644
--- a/client/ui/qml/Pages2/PageSetupWizardProtocols.qml
+++ b/client/ui/qml/Pages2/PageSetupWizardProtocols.qml
@@ -14,11 +14,11 @@ import "../Config"
 
 PageBase {
     id: root
-    page: PageEnum.WizardProtocols
+    page: PageEnum.PageSetupWizardProtocols
 
     SortFilterProxyModel {
-        id: containersModel
-        sourceModel: UiLogic.containersModel
+        id: proxyContainersModel
+        sourceModel: ContainersModel
         filters: [
             ValueFilter {
                 roleName: "is_installed_role"
@@ -64,7 +64,7 @@ PageBase {
                 currentIndex: -1
                 clip: true
                 interactive: false
-                model: containersModel
+                model: proxyContainersModel
 
                 delegate: Item {
                     implicitWidth: containers.width
@@ -87,6 +87,10 @@ PageBase {
                             descriptionText: desc_role
                             buttonImage: "qrc:/images/controls/chevron-right.svg"
 
+                            onClickedFunc: function() {
+                                ContainersModel.setCurrentlyInstalledContainerIndex(proxyContainersModel.mapToSource(index))
+                                UiLogic.goToPage(PageEnum.PageSetupWizardProtocolSettings)
+                            }
                         }
 
                         Rectangle {
diff --git a/client/ui/qml/Pages2/PageSetupWizardTextKey.qml b/client/ui/qml/Pages2/PageSetupWizardTextKey.qml
new file mode 100644
index 00000000..9fddc573
--- /dev/null
+++ b/client/ui/qml/Pages2/PageSetupWizardTextKey.qml
@@ -0,0 +1,74 @@
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+
+import PageEnum 1.0
+
+import "./"
+import "../Pages"
+import "../Controls2"
+import "../Controls2/TextTypes"
+import "../Config"
+
+PageBase {
+    id: root
+    page: PageEnum.PageSetupWizardInstalling
+
+    FlickableType {
+        id: fl
+        anchors.top: root.top
+        anchors.bottom: root.bottom
+        contentHeight: content.height
+
+        ColumnLayout {
+            id: content
+
+            anchors.top: parent.top
+            anchors.left: parent.left
+            anchors.right: parent.right
+            anchors.rightMargin: 16
+            anchors.leftMargin: 16
+
+            spacing: 16
+
+            HeaderType {
+                Layout.fillWidth: true
+                Layout.topMargin: 20
+
+                buttonImage: "qrc:/images/controls/arrow-left.svg"
+
+                headerText: "Ключ для подключения"
+                descriptionText: "Строка, которая начинается с vpn://..."
+            }
+
+            TextFieldWithHeaderType {
+                Layout.fillWidth: true
+                Layout.topMargin: 32
+
+                headerText: "Ключ"
+                textFieldPlaceholderText: "vpn://"
+                buttonText: "Вставить"
+
+                clickedFunc: function() {
+                    textField.text = ""
+                    textField.paste()
+                }
+            }
+        }
+    }
+
+    BasicButtonType {
+        anchors.bottom: parent.bottom
+        anchors.left: parent.left
+        anchors.right: parent.right
+        anchors.rightMargin: 16
+        anchors.leftMargin: 16
+        anchors.bottomMargin: 32
+
+        text: qsTr("Подключиться")
+
+        onClicked: function() {
+//            UiLogic.goToPage(PageEnum.PageSetupWizardInstalling)
+        }
+    }
+}
diff --git a/client/ui/qml/Pages2/PageStart.qml b/client/ui/qml/Pages2/PageStart.qml
index 8d8fbb9d..e04ebbb6 100644
--- a/client/ui/qml/Pages2/PageStart.qml
+++ b/client/ui/qml/Pages2/PageStart.qml
@@ -12,7 +12,7 @@ import "../Controls2/TextTypes"
 
 PageBase {
     id: root
-    page: PageEnum.Start
+    page: PageEnum.PageStart
 
     FlickableType {
         id: fl
@@ -77,7 +77,7 @@ PageBase {
                 text: qsTr("У меня ничего нет")
 
                 onClicked: {
-                    UiLogic.goToPage(PageEnum.Test)
+                    UiLogic.goToPage(PageEnum.PageTest)
                 }
             }
         }
@@ -129,7 +129,7 @@ PageBase {
                     buttonImage: "qrc:/images/controls/chevron-right.svg"
 
                     onClickedFunc: function() {
-                        UiLogic.goToPage(PageEnum.WizardCredentials)
+                        UiLogic.goToPage(PageEnum.PageSetupWizardCredentials)
                         drawer.visible = false
                     }
                 }
@@ -144,9 +144,10 @@ PageBase {
                     text: "QR-код, ключ или файл настроек"
                     buttonImage: "qrc:/images/controls/chevron-right.svg"
 
-    //                onClickedFunc: function() {
-    //                    UiLogic.goToPage(PageEnum.Start)
-    //                }
+                    onClickedFunc: function() {
+                        UiLogic.goToPage(PageEnum.PageSetupWizardConfigSource)
+                        drawer.visible = false
+                    }
                 }
                 Rectangle {
                     Layout.fillWidth: true
diff --git a/client/ui/qml/main2.qml b/client/ui/qml/main2.qml
index c7e06eaa..6261e9a7 100644
--- a/client/ui/qml/main2.qml
+++ b/client/ui/qml/main2.qml
@@ -14,6 +14,7 @@ Window  {
     height: GC.screenHeight
     minimumWidth: GC.isDesktop() ? 360 : 0
     minimumHeight: GC.isDesktop() ? 640 : 0
+
     onClosing: function() {
         console.debug("QML onClosing signal")
         UiLogic.onCloseWindow()
@@ -21,28 +22,18 @@ Window  {
 
     title: "AmneziaVPN"
 
-    function gotoPage(type, page, reset, slide) {
-        let p_obj;
-        if (type === PageType.Basic) p_obj = pageLoader.pages[page]
-        else if (type === PageType.Proto) p_obj = protocolPages[page]
-        else if (type === PageType.ShareProto) p_obj = sharePages[page]
-        else return
-
+    function gotoPage(page, reset, slide) {
         if (pageStackView.depth > 0) {
             pageStackView.currentItem.deactivated()
         }
 
         if (slide) {
-            pageStackView.push(p_obj, {}, StackView.PushTransition)
+            pageStackView.push(UiLogic.pageEnumToString(page), {}, StackView.PushTransition)
         } else {
-            pageStackView.push(p_obj, {}, StackView.Immediate)
+            pageStackView.push(UiLogic.pageEnumToString(page), {}, StackView.Immediate)
         }
 
-//        if (reset) {
-//            p_obj.logic.onUpdatePage();
-//        }
-
-        p_obj.activated(reset)
+        pageStackView.currentItem.activated(reset)
     }
 
     function closePage() {
@@ -60,9 +51,9 @@ Window  {
 
         pageStackView.clear()
         if (slide) {
-            pageStackView.push(pages[page], {}, StackView.PushTransition)
+            pageStackView.push(UiLogic.pageEnumToString(page), {}, StackView.PushTransition)
         } else {
-            pageStackView.push(pages[page], {}, StackView.Immediate)
+            pageStackView.push(UiLogic.pageEnumToString(page), {}, StackView.Immediate)
         }
         if (page === PageEnum.Start) {
             UiLogic.pushButtonBackFromStartVisible = !pageStackView.empty
@@ -79,33 +70,12 @@ Window  {
         id: pageStackView
         anchors.fill: parent
         focus: true
-
-        onCurrentItemChanged: function() {
-            UiLogic.currentPageValue = currentItem.page
-        }
-
-        onDepthChanged: function() {
-            UiLogic.pagesStackDepth = depth
-        }
-
-        Keys.onPressed: function(event) {
-            UiLogic.keyPressEvent(event.key)
-            event.accepted = true
-        }
     }
 
     Connections {
         target: UiLogic
         function onGoToPage(page, reset, slide) {
-            root.gotoPage(PageType.Basic, page, reset, slide)
-        }
-
-        function onGoToProtocolPage(protocol, reset, slide) {
-            root.gotoPage(PageType.Proto, protocol, reset, slide)
-        }
-
-        function onGoToShareProtocolPage(protocol, reset, slide) {
-            root.gotoPage(PageType.ShareProto, protocol, reset, slide)
+            root.gotoPage(page, reset, slide)
         }
 
         function onClosePage() {
@@ -118,6 +88,7 @@ Window  {
 
         function onShow() {
             root.show()
+            UiLogic.initializeUiLogic()
         }
 
         function onHide() {
@@ -130,13 +101,4 @@ Window  {
             root.requestActivate()
         }
     }
-
-    PageLoader {
-        id: pageLoader
-
-        onFinished: {
-            UiLogic.initializeUiLogic()
-        }
-    }
-
 }
diff --git a/client/ui/uilogic.cpp b/client/ui/uilogic.cpp
index d47c1186..63371420 100644
--- a/client/ui/uilogic.cpp
+++ b/client/ui/uilogic.cpp
@@ -84,7 +84,6 @@ UiLogic::UiLogic(std::shared_ptr<Settings> settings, std::shared_ptr<VpnConfigur
     m_settings(settings),
     m_configurator(configurator)
 {
-    m_containersModel = new ContainersModel(settings, this);
     m_protocolsModel = new ProtocolsModel(settings, this);
     m_clientManagementModel = new ClientManagementModel(this);
     m_vpnConnection = new VpnConnection(settings, configurator);
@@ -155,7 +154,7 @@ void UiLogic::initializeUiLogic()
         emit goToPage(Page::Vpn, true, false);
     }
     else {
-        emit goToPage(Page::Start, true, false);
+        emit goToPage(Page::PageStart, true, false);
     }
 
     m_selectedServerIndex = m_settings->defaultServerIndex();
@@ -619,3 +618,8 @@ bool UiLogic::isContainerAlreadyAddedToGui(DockerContainer container)
     return false;
 }
 
+QString UiLogic::pageEnumToString(Page page) {
+    QMetaEnum metaEnum = QMetaEnum::fromType<Page>();
+    QString pageName = metaEnum.valueToKey(static_cast<int>(page));
+    return "Pages2/" + pageName + ".qml";
+}
diff --git a/client/ui/uilogic.h b/client/ui/uilogic.h
index 3b7797a8..4b392066 100644
--- a/client/ui/uilogic.h
+++ b/client/ui/uilogic.h
@@ -67,7 +67,6 @@ class UiLogic : public QObject
     AUTO_PROPERTY(int, pagesStackDepth)
     AUTO_PROPERTY(int, currentPageValue)
 
-    READONLY_PROPERTY(QObject *, containersModel)
     READONLY_PROPERTY(QObject *, protocolsModel)
     READONLY_PROPERTY(QObject *, clientManagementModel)
 
@@ -124,6 +123,8 @@ public:
 
     Q_INVOKABLE amnezia::ErrorCode addAlreadyInstalledContainersGui(bool &isServerCreated);
 
+    Q_INVOKABLE QString pageEnumToString(PageEnumNS::Page page);
+
     void shareTempFile(const QString &suggestedName, QString ext, const QString& data);
     static QString getOpenFileName(QWidget *parent = nullptr,
                                    const QString &caption = QString(),

From 1c8dbae35913d6eb4b0f55203665f8db63246027 Mon Sep 17 00:00:00 2001
From: "vladimir.kuznetsov" <nethiuswork@gmail.com>
Date: Sat, 6 May 2023 06:52:23 +0300
Subject: [PATCH 013/278] added PageHome, PageSettings, PageShare, PageStart

- renamed old PageStart to PageSetupWizardStart
- added various text types
- moved servers model to "global" scope
---
 client/amnezia_application.cpp                |   3 +
 client/amnezia_application.h                  |   3 +
 client/images/controls/home.svg               |   4 +
 client/images/controls/settings-2.svg         |   6 +
 client/images/controls/share-2.svg            |   7 +
 client/resources.qrc                          |  16 +-
 client/ui/models/servers_model.cpp            |  35 ++-
 client/ui/models/servers_model.h              |  11 +-
 client/ui/pages.h                             |   6 +-
 client/ui/pages_logic/ServerListLogic.cpp     |   4 +-
 client/ui/qml/Controls2/DropDownType.qml      |  61 ++--
 client/ui/qml/Controls2/Header2Type.qml       |  56 ++++
 client/ui/qml/Controls2/HeaderType.qml        |  32 +--
 .../ui/qml/Controls2/TabImageButtonType.qml   |  24 ++
 .../Controls2/TextTypes/ButtonTextType.qml    |  12 +
 .../Controls2/TextTypes/Header1TextType.qml   |  14 +
 .../Controls2/TextTypes/Header2TextType.qml   |   4 +-
 .../qml/Controls2/TextTypes/LabelTextType.qml |  13 +
 ...BodyTextType.qml => ParagraphTextType.qml} |   6 +-
 client/ui/qml/PageLoader.qml                  |   2 +-
 client/ui/qml/Pages2/PageHome.qml             | 266 ++++++++++++++++++
 client/ui/qml/Pages2/PageSettings.qml         |   5 +
 .../Pages2/PageSetupWizardConfigSource.qml    |   3 +-
 .../PageSetupWizardProtocolSettings.qml       |   2 +-
 client/ui/qml/Pages2/PageSetupWizardStart.qml | 163 +++++++++++
 client/ui/qml/Pages2/PageShare.qml            |   5 +
 client/ui/qml/Pages2/PageStart.qml            | 194 ++++---------
 client/ui/uilogic.cpp                         |   4 +-
 28 files changed, 735 insertions(+), 226 deletions(-)
 create mode 100644 client/images/controls/home.svg
 create mode 100644 client/images/controls/settings-2.svg
 create mode 100644 client/images/controls/share-2.svg
 create mode 100644 client/ui/qml/Controls2/Header2Type.qml
 create mode 100644 client/ui/qml/Controls2/TabImageButtonType.qml
 create mode 100644 client/ui/qml/Controls2/TextTypes/ButtonTextType.qml
 create mode 100644 client/ui/qml/Controls2/TextTypes/Header1TextType.qml
 create mode 100644 client/ui/qml/Controls2/TextTypes/LabelTextType.qml
 rename client/ui/qml/Controls2/TextTypes/{BodyTextType.qml => ParagraphTextType.qml} (87%)
 create mode 100644 client/ui/qml/Pages2/PageHome.qml
 create mode 100644 client/ui/qml/Pages2/PageSettings.qml
 create mode 100644 client/ui/qml/Pages2/PageSetupWizardStart.qml
 create mode 100644 client/ui/qml/Pages2/PageShare.qml

diff --git a/client/amnezia_application.cpp b/client/amnezia_application.cpp
index b4255a0c..2cd61679 100644
--- a/client/amnezia_application.cpp
+++ b/client/amnezia_application.cpp
@@ -103,6 +103,9 @@ void AmneziaApplication::init()
     m_containersModel.reset(new ContainersModel(m_settings, this));
     m_engine->rootContext()->setContextProperty("ContainersModel", m_containersModel.get());
 
+    m_serversModel.reset(new ServersModel(m_settings, this));
+    m_engine->rootContext()->setContextProperty("ServersModel", m_serversModel.get());
+
     m_uiLogic->registerPagesLogic();
 
 #if defined(Q_OS_IOS)
diff --git a/client/amnezia_application.h b/client/amnezia_application.h
index abdb1f2a..d15864e1 100644
--- a/client/amnezia_application.h
+++ b/client/amnezia_application.h
@@ -12,6 +12,8 @@
 
 #include "ui/uilogic.h"
 #include "configurators/vpn_configurator.h"
+#include "ui/models/servers_model.h"
+#include "ui/models/containers_model.h"
 
 #define amnApp (static_cast<AmneziaApplication *>(QCoreApplication::instance()))
 
@@ -57,6 +59,7 @@ private:
     QCommandLineParser m_parser;
 
     QScopedPointer<ContainersModel> m_containersModel;
+    QScopedPointer<ServersModel> m_serversModel;
 
 };
 
diff --git a/client/images/controls/home.svg b/client/images/controls/home.svg
new file mode 100644
index 00000000..5ade1d33
--- /dev/null
+++ b/client/images/controls/home.svg
@@ -0,0 +1,4 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M3 9L12 2L21 9V20C21 20.5304 20.7893 21.0391 20.4142 21.4142C20.0391 21.7893 19.5304 22 19 22H5C4.46957 22 3.96086 21.7893 3.58579 21.4142C3.21071 21.0391 3 20.5304 3 20V9Z" stroke="#CBCBCB" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M9 22V12H15V22" stroke="#CBCBCB" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/client/images/controls/settings-2.svg b/client/images/controls/settings-2.svg
new file mode 100644
index 00000000..9f1cf974
--- /dev/null
+++ b/client/images/controls/settings-2.svg
@@ -0,0 +1,6 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M20 7H11" stroke="#CBCBCB" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M14 17H5" stroke="#CBCBCB" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M17 20C18.6569 20 20 18.6569 20 17C20 15.3431 18.6569 14 17 14C15.3431 14 14 15.3431 14 17C14 18.6569 15.3431 20 17 20Z" stroke="#CBCBCB" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M7 10C8.65685 10 10 8.65685 10 7C10 5.34315 8.65685 4 7 4C5.34315 4 4 5.34315 4 7C4 8.65685 5.34315 10 7 10Z" stroke="#CBCBCB" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/client/images/controls/share-2.svg b/client/images/controls/share-2.svg
new file mode 100644
index 00000000..b0aa6331
--- /dev/null
+++ b/client/images/controls/share-2.svg
@@ -0,0 +1,7 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M18 8C19.6569 8 21 6.65685 21 5C21 3.34315 19.6569 2 18 2C16.3431 2 15 3.34315 15 5C15 6.65685 16.3431 8 18 8Z" stroke="#CBCBCB" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M6 15C7.65685 15 9 13.6569 9 12C9 10.3431 7.65685 9 6 9C4.34315 9 3 10.3431 3 12C3 13.6569 4.34315 15 6 15Z" stroke="#CBCBCB" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M18 22C19.6569 22 21 20.6569 21 19C21 17.3431 19.6569 16 18 16C16.3431 16 15 17.3431 15 19C15 20.6569 16.3431 22 18 22Z" stroke="#CBCBCB" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M8.58997 13.5098L15.42 17.4898" stroke="#CBCBCB" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M15.41 6.50977L8.58997 10.4898" stroke="#CBCBCB" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/client/resources.qrc b/client/resources.qrc
index 20eed74d..f5817eb0 100644
--- a/client/resources.qrc
+++ b/client/resources.qrc
@@ -182,7 +182,7 @@
         <file>ui/qml/Controls2/CheckBoxType.qml</file>
         <file>images/controls/check.svg</file>
         <file>ui/qml/Controls2/DropDownType.qml</file>
-        <file>ui/qml/Pages2/PageStart.qml</file>
+        <file>ui/qml/Pages2/PageSetupWizardStart.qml</file>
         <file>ui/qml/main2.qml</file>
         <file>ui/qml/PageLoader.qml</file>
         <file>images/amneziaBigLogo.png</file>
@@ -195,7 +195,7 @@
         <file>ui/qml/Pages2/PageSetupWizardEasy.qml</file>
         <file>images/controls/chevron-down.svg</file>
         <file>images/controls/chevron-up.svg</file>
-        <file>ui/qml/Controls2/TextTypes/BodyTextType.qml</file>
+        <file>ui/qml/Controls2/TextTypes/ParagraphTextType.qml</file>
         <file>ui/qml/Controls2/TextTypes/Header2TextType.qml</file>
         <file>ui/qml/Controls2/HorizontalRadioButton.qml</file>
         <file>ui/qml/Controls2/VerticalRadioButton.qml</file>
@@ -209,5 +209,17 @@
         <file>images/controls/qr-code.svg</file>
         <file>images/controls/text-cursor.svg</file>
         <file>ui/qml/Pages2/PageSetupWizardTextKey.qml</file>
+        <file>ui/qml/Pages2/PageStart.qml</file>
+        <file>ui/qml/Controls2/TabImageButtonType.qml</file>
+        <file>images/controls/home.svg</file>
+        <file>images/controls/settings-2.svg</file>
+        <file>images/controls/share-2.svg</file>
+        <file>ui/qml/Pages2/PageHome.qml</file>
+        <file>ui/qml/Pages2/PageSettings.qml</file>
+        <file>ui/qml/Pages2/PageShare.qml</file>
+        <file>ui/qml/Controls2/TextTypes/Header1TextType.qml</file>
+        <file>ui/qml/Controls2/TextTypes/LabelTextType.qml</file>
+        <file>ui/qml/Controls2/TextTypes/ButtonTextType.qml</file>
+        <file>ui/qml/Controls2/Header2Type.qml</file>
     </qresource>
 </RCC>
diff --git a/client/ui/models/servers_model.cpp b/client/ui/models/servers_model.cpp
index c4b0efb3..94d3ced4 100644
--- a/client/ui/models/servers_model.cpp
+++ b/client/ui/models/servers_model.cpp
@@ -1,29 +1,42 @@
 #include "servers_model.h"
 
-ServersModel::ServersModel(QObject *parent) :
-    QAbstractListModel(parent)
+ServersModel::ServersModel(std::shared_ptr<Settings> settings, QObject *parent) : m_settings(settings), QAbstractListModel(parent)
 {
-
+    const QJsonArray &servers = m_settings->serversArray();
+    int defaultServer = m_settings->defaultServerIndex();
+    QVector<ServerModelContent> serverListContent;
+    for(int i = 0; i < servers.size(); i++) {
+        ServerModelContent c;
+        auto server = servers.at(i).toObject();
+        c.desc = server.value(config_key::description).toString();
+        c.address = server.value(config_key::hostName).toString();
+        if (c.desc.isEmpty()) {
+            c.desc = c.address;
+        }
+        c.isDefault = (i == defaultServer);
+        serverListContent.push_back(c);
+    }
+    setContent(serverListContent);
 }
 
 void ServersModel::clearData()
 {
     beginResetModel();
-    content.clear();
+    m_content.clear();
     endResetModel();
 }
 
-void ServersModel::setContent(const std::vector<ServerModelContent> &data)
+void ServersModel::setContent(const QVector<ServerModelContent> &data)
 {
     beginResetModel();
-    content = data;
+    m_content = data;
     endResetModel();
 }
 
 int ServersModel::rowCount(const QModelIndex &parent) const
 {
     Q_UNUSED(parent);
-    return static_cast<int>(content.size());
+    return static_cast<int>(m_content.size());
 }
 
 QHash<int, QByteArray> ServersModel::roleNames() const {
@@ -37,17 +50,17 @@ QHash<int, QByteArray> ServersModel::roleNames() const {
 QVariant ServersModel::data(const QModelIndex &index, int role) const
 {
     if (!index.isValid() || index.row() < 0
-            || index.row() >= static_cast<int>(content.size())) {
+            || index.row() >= static_cast<int>(m_content.size())) {
         return QVariant();
     }
     if (role == DescRole) {
-        return content[index.row()].desc;
+        return m_content[index.row()].desc;
     }
     if (role == AddressRole) {
-        return content[index.row()].address;
+        return m_content[index.row()].address;
     }
     if (role == IsDefaultRole) {
-        return content[index.row()].isDefault;
+        return m_content[index.row()].isDefault;
     }
     return QVariant();
 }
diff --git a/client/ui/models/servers_model.h b/client/ui/models/servers_model.h
index 7f2e3ad1..e60aea6b 100644
--- a/client/ui/models/servers_model.h
+++ b/client/ui/models/servers_model.h
@@ -2,8 +2,8 @@
 #define SERVERSMODEL_H
 
 #include <QAbstractListModel>
-#include <vector>
-#include <utility>
+
+#include "settings.h"
 
 struct ServerModelContent {
     QString desc;
@@ -15,7 +15,7 @@ class ServersModel : public QAbstractListModel
 {
     Q_OBJECT
 public:
-    ServersModel(QObject *parent = nullptr);
+    ServersModel(std::shared_ptr<Settings> settings, QObject *parent = nullptr);
 public:
     enum SiteRoles {
         DescRole = Qt::UserRole + 1,
@@ -24,7 +24,7 @@ public:
     };
 
     void clearData();
-    void setContent(const std::vector<ServerModelContent>& data);
+    void setContent(const QVector<ServerModelContent>& data);
     int rowCount(const QModelIndex &parent = QModelIndex()) const override;
 
     QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
@@ -33,7 +33,8 @@ protected:
     QHash<int, QByteArray> roleNames() const override;
 
 private:
-    std::vector<ServerModelContent> content;
+    QVector<ServerModelContent> m_content;
+    std::shared_ptr<Settings> m_settings;
 };
 
 #endif // SERVERSMODEL_H
diff --git a/client/ui/pages.h b/client/ui/pages.h
index 32ac775d..b2e191c7 100644
--- a/client/ui/pages.h
+++ b/client/ui/pages.h
@@ -28,9 +28,11 @@ enum class Page {Start = 0, NewServer, NewServerProtocols, Vpn,
            ProtocolSettings, ProtocolShare, QrDecoder, QrDecoderIos, About, ViewConfig,
            AdvancedServerSettings, ClientManagement, ClientInfo,
 
-           PageStart, PageTest, PageSetupWizardCredentials, PageSetupWizardProtocols, PageSetupWizardEasy,
+           PageSetupWizardStart, PageTest, PageSetupWizardCredentials, PageSetupWizardProtocols, PageSetupWizardEasy,
            PageSetupWizardProtocolSettings, PageSetupWizardInstalling, PageSetupWizardConfigSource,
-           PageSetupWizardTextKey};
+           PageSetupWizardTextKey,
+
+           PageStart, PageHome, PageSettings, PageShare};
 Q_ENUM_NS(Page)
 
 static void declareQmlPageEnum() {
diff --git a/client/ui/pages_logic/ServerListLogic.cpp b/client/ui/pages_logic/ServerListLogic.cpp
index 79d13c8b..4a17e202 100644
--- a/client/ui/pages_logic/ServerListLogic.cpp
+++ b/client/ui/pages_logic/ServerListLogic.cpp
@@ -6,7 +6,7 @@
 
 ServerListLogic::ServerListLogic(UiLogic *logic, QObject *parent):
     PageLogicBase(logic, parent),
-    m_serverListModel{new ServersModel(this)}
+    m_serverListModel{new ServersModel(m_settings, this)}
 {
 
 }
@@ -33,7 +33,7 @@ void ServerListLogic::onUpdatePage()
 {
     const QJsonArray &servers = m_settings->serversArray();
     int defaultServer = m_settings->defaultServerIndex();
-    std::vector<ServerModelContent> serverListContent;
+    QVector<ServerModelContent> serverListContent;
     for(int i = 0; i < servers.size(); i++) {
         ServerModelContent c;
         auto server = servers.at(i).toObject();
diff --git a/client/ui/qml/Controls2/DropDownType.qml b/client/ui/qml/Controls2/DropDownType.qml
index 696aa48a..6f511194 100644
--- a/client/ui/qml/Controls2/DropDownType.qml
+++ b/client/ui/qml/Controls2/DropDownType.qml
@@ -12,14 +12,20 @@ Item {
 
     property var onClickedFunc
     property string buttonImage: "qrc:/images/controls/chevron-down.svg"
+    property string buttonImageColor: "#494B50"
+
 
     property string defaultColor: "#1C1D21"
 
+    property string textColor: "#d7d8db"
+
     property string borderColor: "#494B50"
+    property int borderWidth: 1
 
     property alias menuModel: menuContent.model
 
-    height: buttonContent.implicitHeight
+    implicitWidth: buttonContent.implicitWidth
+    implicitHeight: buttonContent.implicitHeight
 
     Rectangle {
         id: buttonBackground
@@ -28,6 +34,7 @@ Item {
         radius: 16
         color: defaultColor
         border.color: borderColor
+        border.width: borderWidth
 
         Behavior on border.width {
             PropertyAnimation { duration: 200 }
@@ -37,72 +44,55 @@ Item {
     RowLayout {
         id: buttonContent
         anchors.fill: parent
-        anchors.rightMargin: 16
-        anchors.leftMargin: 16
+
+        spacing: 0
 
         ColumnLayout {
             Layout.leftMargin: 16
-            Layout.rightMargin: 16
-            Layout.topMargin: 16
-            Layout.bottomMargin: 16
 
-            Text {
+            LabelTextType {
+                horizontalAlignment: Text.AlignHCenter
+                verticalAlignment: Text.AlignVCenter
+
                 visible: root.descriptionText !== ""
 
-                font.family: "PT Root UI"
-                font.styleName: "normal"
-                font.pixelSize: 13
-                font.letterSpacing: 0.02
                 color: "#878B91"
                 text: root.descriptionText
-                wrapMode: Text.WordWrap
-
-                Layout.fillWidth: true
-                height: 16   
-
-                horizontalAlignment: Text.AlignLeft
-                verticalAlignment: Text.AlignVCenter
             }
 
-            Text {
-                font.family: "PT Root UI"
-                font.styleName: "normal"
-                font.pixelSize: 16
-                color: "#d7d8db"
-                text: root.text
-
-                Layout.fillWidth: true
-                height: 24
-
-                horizontalAlignment: Text.AlignLeft
+            ButtonTextType {
+                horizontalAlignment: Text.AlignHCenter
                 verticalAlignment: Text.AlignVCenter
+
+                color: root.textColor
+                text: root.text
             }
         }
 
         ImageButtonType {
             id: button
 
+            Layout.leftMargin: 4
             Layout.rightMargin: 16
 
             hoverEnabled: false
             image: buttonImage
+            imageColor: buttonImageColor
             onClicked: {
                 if (onClickedFunc && typeof onClickedFunc === "function") {
                     onClickedFunc()
                 }
             }
-
-            Layout.alignment: Qt.AlignRight
         }
     }
 
     MouseArea {
-        anchors.fill: parent
+        anchors.fill: buttonContent
         cursorShape: Qt.PointingHandCursor
         hoverEnabled: true
 
         onEntered: {
-            buttonBackground.border.width = 1
+            buttonBackground.border.width = borderWidth
         }
 
         onExited: {
@@ -119,7 +109,7 @@ Item {
 
         edge: Qt.BottomEdge
         width: parent.width
-        height: parent.height * 0.8
+        height: parent.height * 0.9
 
         clip: true
         modal: true
@@ -129,6 +119,9 @@ Item {
             anchors.bottomMargin: -radius
             radius: 16
             color: "#1C1D21"
+
+            border.color: borderColor
+            border.width: 1
         }
 
         Overlay.modal: Rectangle {
diff --git a/client/ui/qml/Controls2/Header2Type.qml b/client/ui/qml/Controls2/Header2Type.qml
new file mode 100644
index 00000000..e0173a73
--- /dev/null
+++ b/client/ui/qml/Controls2/Header2Type.qml
@@ -0,0 +1,56 @@
+import QtQuick
+import QtQuick.Layouts
+
+import "TextTypes"
+
+Item {
+    id: root
+
+    property string buttonImage
+    property string headerText
+    property string descriptionText
+
+    implicitWidth: content.implicitWidth
+    implicitHeight: content.implicitHeight
+
+    ColumnLayout {
+        id: content
+        anchors.fill: parent
+
+        ImageButtonType {
+            id: backButton
+
+            Layout.leftMargin: -6
+
+            image: root.buttonImage
+            imageColor: "#D7D8DB"
+
+            visible: image ? true : false
+
+            onClicked: {
+                UiLogic.closePage()
+            }
+        }
+
+        Header2TextType {
+            id: header
+
+            Layout.fillWidth: true
+
+            text: root.headerText
+        }
+
+        ParagraphTextType {
+            id: description
+
+            Layout.topMargin: 16
+            Layout.fillWidth: true
+
+            text: root.descriptionText
+
+            color: "#878B91"
+
+            visible: root.descriptionText !== ""
+        }
+    }
+}
diff --git a/client/ui/qml/Controls2/HeaderType.qml b/client/ui/qml/Controls2/HeaderType.qml
index 6e10e75c..407f67f0 100644
--- a/client/ui/qml/Controls2/HeaderType.qml
+++ b/client/ui/qml/Controls2/HeaderType.qml
@@ -1,6 +1,8 @@
 import QtQuick
 import QtQuick.Layouts
 
+import "TextTypes"
+
 Item {
     id: root
 
@@ -30,39 +32,23 @@ Item {
             }
         }
 
-        Text {
+        Header1TextType {
             id: header
 
-            text: root.headerText
-
-            color: "#D7D8DB"
-            font.pixelSize: 36
-            font.weight: 700
-            font.family: "PT Root UI VF"
-            font.letterSpacing: -0.03
-
-            wrapMode: Text.WordWrap
-
-            height: 38
             Layout.fillWidth: true
+
+            text: root.headerText
         }
 
-        Text {
+        ParagraphTextType {
             id: description
 
+            Layout.topMargin: 16
+            Layout.fillWidth: true
+
             text: root.descriptionText
 
             color: "#878B91"
-            font.pixelSize: 16
-            font.weight: 400
-            font.family: "PT Root UI VF"
-            font.letterSpacing: -0.03
-
-            wrapMode: Text.WordWrap
-
-            height: 24
-            Layout.topMargin: 16
-            Layout.fillWidth: true
         }
     }
 }
diff --git a/client/ui/qml/Controls2/TabImageButtonType.qml b/client/ui/qml/Controls2/TabImageButtonType.qml
new file mode 100644
index 00000000..06b77e6a
--- /dev/null
+++ b/client/ui/qml/Controls2/TabImageButtonType.qml
@@ -0,0 +1,24 @@
+import QtQuick
+import QtQuick.Controls
+
+TabButton {
+    id: root
+
+    property string hoveredColor: "#412102"
+    property string defaultColor: "#D7D8DB"
+    property string selectedColor: "#FBB26A"
+
+    property string image
+
+    property bool isSelected: false
+
+    hoverEnabled: true
+
+    icon.source: image
+    icon.color: isSelected ? selectedColor : defaultColor
+
+    background: Rectangle {
+        anchors.fill: parent
+        color: "transparent"
+    }
+}
diff --git a/client/ui/qml/Controls2/TextTypes/ButtonTextType.qml b/client/ui/qml/Controls2/TextTypes/ButtonTextType.qml
new file mode 100644
index 00000000..93a36578
--- /dev/null
+++ b/client/ui/qml/Controls2/TextTypes/ButtonTextType.qml
@@ -0,0 +1,12 @@
+import QtQuick
+
+Text {
+    height: 24
+
+    color: "#D7D8DB"
+    font.pixelSize: 16
+    font.weight: 500
+    font.family: "PT Root UI VF"
+
+    wrapMode: Text.WordWrap
+}
diff --git a/client/ui/qml/Controls2/TextTypes/Header1TextType.qml b/client/ui/qml/Controls2/TextTypes/Header1TextType.qml
new file mode 100644
index 00000000..dbc04b6a
--- /dev/null
+++ b/client/ui/qml/Controls2/TextTypes/Header1TextType.qml
@@ -0,0 +1,14 @@
+import QtQuick
+
+Text {
+    height: 38
+
+    color: "#D7D8DB"
+    font.pixelSize: 36
+    font.weight: 700
+    font.family: "PT Root UI VF"
+    font.letterSpacing: -0.03
+
+    wrapMode: Text.WordWrap
+}
+
diff --git a/client/ui/qml/Controls2/TextTypes/Header2TextType.qml b/client/ui/qml/Controls2/TextTypes/Header2TextType.qml
index 4bbbc0d6..1400ceb2 100644
--- a/client/ui/qml/Controls2/TextTypes/Header2TextType.qml
+++ b/client/ui/qml/Controls2/TextTypes/Header2TextType.qml
@@ -1,10 +1,12 @@
 import QtQuick
 
 Text {
+    height: 30
+
     color: "#D7D8DB"
     font.pixelSize: 25
     font.weight: 700
     font.family: "PT Root UI VF"
 
-    height: 30
+    wrapMode: Text.WordWrap
 }
diff --git a/client/ui/qml/Controls2/TextTypes/LabelTextType.qml b/client/ui/qml/Controls2/TextTypes/LabelTextType.qml
new file mode 100644
index 00000000..38649022
--- /dev/null
+++ b/client/ui/qml/Controls2/TextTypes/LabelTextType.qml
@@ -0,0 +1,13 @@
+import QtQuick
+
+Text {
+    height: 16
+
+    color: "#878B91"
+    font.pixelSize: 13
+    font.weight: 400
+    font.family: "PT Root UI VF"
+    font.letterSpacing: 0.02
+
+    wrapMode: Text.WordWrap
+}
diff --git a/client/ui/qml/Controls2/TextTypes/BodyTextType.qml b/client/ui/qml/Controls2/TextTypes/ParagraphTextType.qml
similarity index 87%
rename from client/ui/qml/Controls2/TextTypes/BodyTextType.qml
rename to client/ui/qml/Controls2/TextTypes/ParagraphTextType.qml
index 9d789385..269830bc 100644
--- a/client/ui/qml/Controls2/TextTypes/BodyTextType.qml
+++ b/client/ui/qml/Controls2/TextTypes/ParagraphTextType.qml
@@ -1,12 +1,12 @@
 import QtQuick
 
 Text {
-    text: root.bodyText
-    wrapMode: Text.WordWrap
+    height: 24
+
     color: "#D7D8DB"
     font.pixelSize: 16
     font.weight: 400
     font.family: "PT Root UI VF"
 
-    height: 24
+    wrapMode: Text.WordWrap
 }
diff --git a/client/ui/qml/PageLoader.qml b/client/ui/qml/PageLoader.qml
index a44fa4b5..86f9e5a1 100644
--- a/client/ui/qml/PageLoader.qml
+++ b/client/ui/qml/PageLoader.qml
@@ -3,5 +3,5 @@ import QtQuick.Controls
 
 StackView {
     id: stackView
-    initialItem: "PageStart"
+    initialItem: "PageSetupWizardStart"
 }
diff --git a/client/ui/qml/Pages2/PageHome.qml b/client/ui/qml/Pages2/PageHome.qml
new file mode 100644
index 00000000..ad1b7d38
--- /dev/null
+++ b/client/ui/qml/Pages2/PageHome.qml
@@ -0,0 +1,266 @@
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+
+import PageEnum 1.0
+
+import "./"
+import "../Pages"
+import "../Controls2"
+import "../Controls2/TextTypes"
+import "../Config"
+
+PageBase {
+    id: root
+    page: PageEnum.PageHome
+
+    property string defaultColor: "#1C1D21"
+
+    property string borderColor: "#2C2D30"
+
+    property string currentServerName: menuContent.currentItem.delegateData.desc
+    property string currentServerDescription: menuContent.currentItem.delegateData.address
+
+    Rectangle {
+        id: buttonBackground
+        anchors.fill: buttonContent
+        anchors.bottomMargin: -radius
+
+        radius: 16
+        color: defaultColor
+        border.color: borderColor
+        border.width: 1
+
+        Rectangle {
+            width: parent.width
+            height: 1
+            y: parent.height - height - parent.radius
+
+            color: borderColor
+        }
+    }
+
+    ColumnLayout {
+        id: buttonContent
+        anchors.right: parent.right
+        anchors.left: parent.left
+        anchors.bottom: parent.bottom
+
+        RowLayout {
+            Layout.topMargin: 24
+            Layout.alignment: Qt.AlignHCenter | Qt.AlignVCenter
+
+            Header1TextType {
+                text: currentServerName
+            }
+
+            Image {
+                Layout.preferredWidth: 18
+                Layout.preferredHeight: 18
+
+                source: "qrc:/images/controls/chevron-down.svg"
+            }
+        }
+
+        LabelTextType {
+            Layout.bottomMargin: 44
+            Layout.alignment: Qt.AlignHCenter | Qt.AlignVCenter
+
+            text: currentServerDescription
+        }
+    }
+
+    MouseArea {
+        anchors.fill: buttonBackground
+        cursorShape: Qt.PointingHandCursor
+        hoverEnabled: true
+
+        onClicked: {
+            menu.visible = true
+        }
+    }
+
+    Drawer {
+        id: menu
+
+        edge: Qt.BottomEdge
+        width: parent.width
+        height: parent.height * 0.90
+
+        clip: true
+        modal: true
+
+        background: Rectangle {
+            anchors.fill: parent
+            anchors.bottomMargin: -radius
+            radius: 16
+
+            color: "#1C1D21"
+            border.color: borderColor
+            border.width: 1
+        }
+
+        Overlay.modal: Rectangle {
+            color: Qt.rgba(14/255, 14/255, 17/255, 0.8)
+        }
+
+        ColumnLayout {
+            id: menuHeader
+            anchors.top: parent.top
+            anchors.right: parent.right
+            anchors.left: parent.left
+
+            Header1TextType {
+                Layout.topMargin: 24
+                Layout.alignment: Qt.AlignHCenter | Qt.AlignVCenter
+
+                text: currentServerName
+            }
+
+            LabelTextType {
+                Layout.bottomMargin: 24
+                Layout.alignment: Qt.AlignHCenter | Qt.AlignVCenter
+
+                text: currentServerDescription
+            }
+
+            RowLayout {
+
+                Layout.alignment: Qt.AlignHCenter | Qt.AlignVCenter
+                spacing: 8
+
+                DropDownType {
+                    implicitHeight: 40
+
+                    borderWidth: 0
+                    buttonImageColor: "#0E0E11"
+
+                    defaultColor: "#D7D8DB"
+
+                    textColor: "#0E0E11"
+                    text: "testtesttest"
+                }
+
+                BasicButtonType {
+                    implicitHeight: 40
+
+                    text: "Amnezia DNS"
+                }
+            }
+
+            Header2Type {
+                Layout.leftMargin: 16
+                Layout.rightMargin: 16
+
+                headerText: "Серверы"
+            }
+        }
+
+
+//        Header2TextType {
+//            id: menuHeader
+//            width: parent.width
+
+//            text: "Данные для подключения"
+//            wrapMode: Text.WordWrap
+
+//            anchors.top: parent.top
+//            anchors.left: parent.left
+//            anchors.right: parent.right
+//            anchors.topMargin: 16
+//            anchors.leftMargin: 16
+//            anchors.rightMargin: 16
+//        }
+
+        FlickableType {
+            anchors.top: menuHeader.bottom
+            anchors.topMargin: 16
+            contentHeight: col.implicitHeight
+
+            Column {
+                id: col
+                anchors.top: parent.top
+                anchors.left: parent.left
+                anchors.right: parent.right
+
+                spacing: 16
+
+                ButtonGroup {
+                    id: radioButtonGroup
+                }
+
+                ListView {
+                    id: menuContent
+                    width: parent.width
+                    height: menuContent.contentItem.height
+
+                    model: ServersModel
+                    currentIndex: 0
+
+                    clip: true
+                    interactive: false
+
+                    delegate: Item {
+                        id: menuContentDelegate
+
+                        property variant delegateData: model
+
+                        implicitWidth: menuContent.width
+                        implicitHeight: radioButton.implicitHeight
+
+                        RadioButton {
+                            id: radioButton
+
+                            implicitWidth: parent.width
+                            implicitHeight: radioButtonContent.implicitHeight
+
+                            hoverEnabled: true
+
+                            ButtonGroup.group: radioButtonGroup
+
+                            indicator: Rectangle {
+                                anchors.fill: parent
+                                color: radioButton.hovered ? "#2C2D30" : "#1C1D21"
+                            }
+
+                            RowLayout {
+                                id: radioButtonContent
+                                anchors.fill: parent
+
+                                anchors.rightMargin: 16
+                                anchors.leftMargin: 16
+
+                                z: 1
+
+                                Text {
+                                    id: text
+
+                                    text: desc
+                                    color: "#D7D8DB"
+                                    font.pixelSize: 16
+                                    font.weight: 400
+                                    font.family: "PT Root UI VF"
+
+                                    height: 24
+
+                                    Layout.fillWidth: true
+                                    Layout.topMargin: 20
+                                    Layout.bottomMargin: 20
+                                }
+
+                                Image {
+                                    source: "qrc:/images/controls/check.svg"
+                                    visible: radioButton.checked
+                                    width: 24
+                                    height: 24
+
+                                    Layout.rightMargin: 8
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/client/ui/qml/Pages2/PageSettings.qml b/client/ui/qml/Pages2/PageSettings.qml
new file mode 100644
index 00000000..5560aee7
--- /dev/null
+++ b/client/ui/qml/Pages2/PageSettings.qml
@@ -0,0 +1,5 @@
+import QtQuick
+
+Item {
+
+}
diff --git a/client/ui/qml/Pages2/PageSetupWizardConfigSource.qml b/client/ui/qml/Pages2/PageSetupWizardConfigSource.qml
index 26f25a15..a6ba52bb 100644
--- a/client/ui/qml/Pages2/PageSetupWizardConfigSource.qml
+++ b/client/ui/qml/Pages2/PageSetupWizardConfigSource.qml
@@ -64,7 +64,6 @@ PageBase {
 
                 FileDialog {
                     id: fileDialog
-//                    currentFolder: StandardPaths.standardLocations(StandardPaths.PicturesLocation)[0]
                     onAccepted: {
 
                     }
@@ -76,7 +75,7 @@ PageBase {
                 color: "#2C2D30"
             }
 
-            //todo ifdef mobile platforms>
+            //todo ifdef mobile platforms
             LabelWithButtonType {
                 Layout.fillWidth: true
 
diff --git a/client/ui/qml/Pages2/PageSetupWizardProtocolSettings.qml b/client/ui/qml/Pages2/PageSetupWizardProtocolSettings.qml
index 9b6e788f..17c22b04 100644
--- a/client/ui/qml/Pages2/PageSetupWizardProtocolSettings.qml
+++ b/client/ui/qml/Pages2/PageSetupWizardProtocolSettings.qml
@@ -41,7 +41,7 @@ PageBase {
                 descriptionText: "Эти настройки можно будет изменить позже"
             }
 
-            BodyTextType {
+            ParagraphTextType {
                 Layout.topMargin: 16
 
                 text: "Network protocol"
diff --git a/client/ui/qml/Pages2/PageSetupWizardStart.qml b/client/ui/qml/Pages2/PageSetupWizardStart.qml
new file mode 100644
index 00000000..0167ed1f
--- /dev/null
+++ b/client/ui/qml/Pages2/PageSetupWizardStart.qml
@@ -0,0 +1,163 @@
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+
+import PageEnum 1.0
+
+import "./"
+import "../Pages"
+import "../Controls2"
+import "../Config"
+import "../Controls2/TextTypes"
+
+PageBase {
+    id: root
+    page: PageEnum.PageSetupWizardStart
+
+    FlickableType {
+        id: fl
+        anchors.top: root.top
+        anchors.bottom: root.bottom
+        contentHeight: content.height
+
+        ColumnLayout {
+            id: content
+
+            anchors.top: parent.top
+            anchors.left: parent.left
+            anchors.right: parent.right
+
+            Image {
+                id: image
+                source: "qrc:/images/amneziaBigLogo.png"
+
+                Layout.alignment: Qt.AlignCenter
+                Layout.topMargin: 32
+                Layout.leftMargin: 8
+                Layout.rightMargin: 8
+                Layout.preferredWidth: 344
+                Layout.preferredHeight: 279
+            }
+
+            ParagraphTextType {
+                Layout.fillWidth: true
+                Layout.topMargin: 50
+                Layout.leftMargin: 16
+                Layout.rightMargin: 16
+
+                text: "Бесплатный сервис для создания личного VPN на вашем сервере. Помогаем получать доступ к заблокированному контенту, не раскрывая конфиденциальность даже провайдерам VPN."
+            }
+
+            BasicButtonType {
+                Layout.fillWidth: true
+                Layout.topMargin: 32
+                Layout.leftMargin: 16
+                Layout.rightMargin: 16
+
+                text: qsTr("У меня есть данные для подключения")
+
+                onClicked: {
+                    drawer.visible = true
+                }
+            }
+
+            BasicButtonType {
+                Layout.fillWidth: true
+                Layout.topMargin: 8
+                Layout.leftMargin: 16
+                Layout.rightMargin: 16
+
+                defaultColor: "transparent"
+                hoveredColor: Qt.rgba(1, 1, 1, 0.08)
+                pressedColor: Qt.rgba(1, 1, 1, 0.12)
+                disabledColor: "#878B91"
+                textColor: "#D7D8DB"
+                borderWidth: 1
+
+                text: qsTr("У меня ничего нет")
+
+                onClicked: {
+                    UiLogic.goToPage(PageEnum.PageTest)
+                }
+            }
+        }
+
+        Drawer {
+            id: drawer
+
+            edge: Qt.BottomEdge
+            width: parent.width
+            height: parent.height * 0.4375
+
+            clip: true
+            modal: true
+
+            background: Rectangle {
+                anchors.fill: parent
+                anchors.bottomMargin: -radius
+                radius: 16
+                color: "#1C1D21"
+
+                border.color: borderColor
+                border.width: 1
+            }
+
+            Overlay.modal: Rectangle {
+                color: Qt.rgba(14/255, 14/255, 17/255, 0.8)
+            }
+
+            ColumnLayout {
+                anchors.top: parent.top
+                anchors.left: parent.left
+                anchors.right: parent.right
+
+                anchors.rightMargin: 16
+                anchors.leftMargin: 16
+
+                Header2TextType {
+                    Layout.fillWidth: true
+                    Layout.topMargin: 24
+                    Layout.alignment: Qt.AlignHCenter
+
+                    text: "Данные для подключения"
+                    wrapMode: Text.WordWrap
+                }
+
+                LabelWithButtonType {
+                    id: ip
+                    Layout.fillWidth: true
+                    Layout.topMargin: 32
+
+                    text: "IP, логин и пароль от сервера"
+                    buttonImage: "qrc:/images/controls/chevron-right.svg"
+
+                    onClickedFunc: function() {
+                        UiLogic.goToPage(PageEnum.PageSetupWizardCredentials)
+                        drawer.visible = false
+                    }
+                }
+                Rectangle {
+                    Layout.fillWidth: true
+                    height: 1
+                    color: "#2C2D30"
+                }
+                LabelWithButtonType {
+                    Layout.fillWidth: true
+
+                    text: "QR-код, ключ или файл настроек"
+                    buttonImage: "qrc:/images/controls/chevron-right.svg"
+
+                    onClickedFunc: function() {
+                        UiLogic.goToPage(PageEnum.PageSetupWizardConfigSource)
+                        drawer.visible = false
+                    }
+                }
+                Rectangle {
+                    Layout.fillWidth: true
+                    height: 1
+                    color: "#2C2D30"
+                }
+            }
+        }
+    }
+}
diff --git a/client/ui/qml/Pages2/PageShare.qml b/client/ui/qml/Pages2/PageShare.qml
new file mode 100644
index 00000000..5560aee7
--- /dev/null
+++ b/client/ui/qml/Pages2/PageShare.qml
@@ -0,0 +1,5 @@
+import QtQuick
+
+Item {
+
+}
diff --git a/client/ui/qml/Pages2/PageStart.qml b/client/ui/qml/Pages2/PageStart.qml
index e04ebbb6..9e94ed28 100644
--- a/client/ui/qml/Pages2/PageStart.qml
+++ b/client/ui/qml/Pages2/PageStart.qml
@@ -7,154 +7,74 @@ import PageEnum 1.0
 import "./"
 import "../Pages"
 import "../Controls2"
-import "../Config"
 import "../Controls2/TextTypes"
+import "../Config"
 
 PageBase {
     id: root
     page: PageEnum.PageStart
 
-    FlickableType {
-        id: fl
-        anchors.top: root.top
-        anchors.bottom: root.bottom
-        contentHeight: content.height
+    StackLayout {
+        id: stackLayout
+        currentIndex: tabBar.currentIndex
 
-        ColumnLayout {
-            id: content
+        anchors.top: parent.top
+        anchors.right: parent.right
+        anchors.left: parent.left
+        anchors.bottom: tabBar.top
 
-            anchors.top: parent.top
-            anchors.left: parent.left
-            anchors.right: parent.right
-
-            Image {
-                id: image
-                source: "qrc:/images/amneziaBigLogo.png"
-
-                Layout.alignment: Qt.AlignCenter
-                Layout.topMargin: 32
-                Layout.leftMargin: 8
-                Layout.rightMargin: 8
-                Layout.preferredWidth: 344
-                Layout.preferredHeight: 279
-            }
-
-            BodyTextType {
-                Layout.fillWidth: true
-                Layout.topMargin: 50
-                Layout.leftMargin: 16
-                Layout.rightMargin: 16
-
-                text: "Бесплатный сервис для создания личного VPN на вашем сервере. Помогаем получать доступ к заблокированному контенту, не раскрывая конфиденциальность даже провайдерам VPN."
-            }
-
-            BasicButtonType {
-                Layout.fillWidth: true
-                Layout.topMargin: 32
-                Layout.leftMargin: 16
-                Layout.rightMargin: 16
-
-                text: qsTr("У меня есть данные для подключения")
-
-                onClicked: {
-                    drawer.visible = true
-                }
-            }
-
-            BasicButtonType {
-                Layout.fillWidth: true
-                Layout.topMargin: 8
-                Layout.leftMargin: 16
-                Layout.rightMargin: 16
-
-                defaultColor: "transparent"
-                hoveredColor: Qt.rgba(1, 1, 1, 0.08)
-                pressedColor: Qt.rgba(1, 1, 1, 0.12)
-                disabledColor: "#878B91"
-                textColor: "#D7D8DB"
-                borderWidth: 1
-
-                text: qsTr("У меня ничего нет")
-
-                onClicked: {
-                    UiLogic.goToPage(PageEnum.PageTest)
-                }
-            }
+        width: {
+            console.log(parent.width)
+            return parent.width
+        }
+        height: {
+            console.log(root.height - tabBar.implicitHeight)
+            return root.height - tabBar.implicitHeight
         }
 
-        Drawer {
-            id: drawer
+        PageHome {
+        }
 
-            edge: Qt.BottomEdge
-            width: parent.width
-            height: parent.height * 0.4375
-
-            clip: true
-            modal: true
-
-            background: Rectangle {
-                anchors.fill: parent
-                anchors.bottomMargin: -radius
-                radius: 16
-                color: "#1C1D21"
-            }
-
-            Overlay.modal: Rectangle {
-                color: Qt.rgba(14/255, 14/255, 17/255, 0.8)
-            }
-
-            ColumnLayout {
-                anchors.top: parent.top
-                anchors.left: parent.left
-                anchors.right: parent.right
-
-                anchors.rightMargin: 16
-                anchors.leftMargin: 16
-
-                Header2TextType {
-                    Layout.fillWidth: true
-                    Layout.topMargin: 24
-                    Layout.alignment: Qt.AlignHCenter
-
-                    text: "Данные для подключения"
-                    wrapMode: Text.WordWrap
-                }
-
-                LabelWithButtonType {
-                    id: ip
-                    Layout.fillWidth: true
-                    Layout.topMargin: 32
-
-                    text: "IP, логин и пароль от сервера"
-                    buttonImage: "qrc:/images/controls/chevron-right.svg"
-
-                    onClickedFunc: function() {
-                        UiLogic.goToPage(PageEnum.PageSetupWizardCredentials)
-                        drawer.visible = false
-                    }
-                }
-                Rectangle {
-                    Layout.fillWidth: true
-                    height: 1
-                    color: "#2C2D30"
-                }
-                LabelWithButtonType {
-                    Layout.fillWidth: true
-
-                    text: "QR-код, ключ или файл настроек"
-                    buttonImage: "qrc:/images/controls/chevron-right.svg"
-
-                    onClickedFunc: function() {
-                        UiLogic.goToPage(PageEnum.PageSetupWizardConfigSource)
-                        drawer.visible = false
-                    }
-                }
-                Rectangle {
-                    Layout.fillWidth: true
-                    height: 1
-                    color: "#2C2D30"
-                }
-            }
+        PageSetupWizardEasy {
         }
     }
+
+    TabBar {
+        id: tabBar
+
+        anchors.right: parent.right
+        anchors.left: parent.left
+        anchors.bottom: parent.bottom
+
+        topPadding: 8
+        bottomPadding: 34
+        leftPadding: 96
+        rightPadding: 96
+
+        background: Rectangle {
+            color: "#1C1D21"
+        }
+
+
+        TabImageButtonType {
+            isSelected: tabBar.currentIndex === 0
+            image: "qrc:/images/controls/home.svg"
+        }
+        TabImageButtonType {
+            isSelected: tabBar.currentIndex === 1
+            image: "qrc:/images/controls/share-2.svg"
+        }
+        TabImageButtonType {
+            isSelected: tabBar.currentIndex === 2
+            image: "qrc:/images/controls/settings-2.svg"
+        }
+    }
+
+    MouseArea {
+        anchors.fill: tabBar
+        anchors.leftMargin: 96
+        anchors.rightMargin: 96
+        cursorShape: Qt.PointingHandCursor
+        enabled: false
+    }
 }
diff --git a/client/ui/uilogic.cpp b/client/ui/uilogic.cpp
index 63371420..bb2f90b2 100644
--- a/client/ui/uilogic.cpp
+++ b/client/ui/uilogic.cpp
@@ -151,10 +151,10 @@ void UiLogic::initializeUiLogic()
 
     if (m_settings->serversCount() > 0) {
         if (m_settings->defaultServerIndex() < 0) m_settings->setDefaultServer(0);
-        emit goToPage(Page::Vpn, true, false);
+        emit goToPage(Page::PageStart, true, false);
     }
     else {
-        emit goToPage(Page::PageStart, true, false);
+        emit goToPage(Page::PageSetupWizardStart, true, false);
     }
 
     m_selectedServerIndex = m_settings->defaultServerIndex();

From b66f4bf2bee3a31fe1cbb7036a33893127a90686 Mon Sep 17 00:00:00 2001
From: Vladimir Kuznetsov <nethius@Vladimirs-MacBook-Pro.local>
Date: Thu, 11 May 2023 14:50:50 +0800
Subject: [PATCH 014/278] added display of protocols on PageHome

---
 client/amnezia_application.cpp                |   1 -
 client/images/controls/plus.svg               |   4 +
 client/resources.qrc                          |   1 +
 client/ui/models/servers_model.cpp            |  50 ++++---
 client/ui/models/servers_model.h              |   5 +-
 client/ui/pages_logic/ServerListLogic.cpp     |   2 +-
 client/ui/qml/Controls2/BasicButtonType.qml   |   2 +-
 client/ui/qml/Controls2/DropDownType.qml      |  80 +++--------
 client/ui/qml/Controls2/Header2Type.qml       |  38 +++++-
 client/ui/qml/Controls2/HeaderType.qml        |  42 +++++-
 .../ui/qml/Controls2/LabelWithButtonType.qml  |   4 +-
 client/ui/qml/Controls2/TabButtonType.qml     |   2 +-
 .../ui/qml/Controls2/VerticalRadioButton.qml  |   2 +-
 client/ui/qml/Pages2/PageHome.qml             | 126 +++++++++++++++---
 .../Pages2/PageSetupWizardConfigSource.qml    |   2 +-
 .../qml/Pages2/PageSetupWizardCredentials.qml |   2 +-
 client/ui/qml/Pages2/PageSetupWizardEasy.qml  |   2 +-
 .../qml/Pages2/PageSetupWizardInstalling.qml  |   2 +-
 .../PageSetupWizardProtocolSettings.qml       |   2 +-
 .../qml/Pages2/PageSetupWizardProtocols.qml   |   2 +-
 .../ui/qml/Pages2/PageSetupWizardTextKey.qml  |   2 +-
 client/ui/qml/Pages2/PageTest.qml             |   2 +-
 22 files changed, 237 insertions(+), 138 deletions(-)
 create mode 100644 client/images/controls/plus.svg

diff --git a/client/amnezia_application.cpp b/client/amnezia_application.cpp
index 2cd61679..dea868e4 100644
--- a/client/amnezia_application.cpp
+++ b/client/amnezia_application.cpp
@@ -187,7 +187,6 @@ void AmneziaApplication::loadFonts()
     QFontDatabase::addApplicationFont(":/fonts/Lato-Regular.ttf");
     QFontDatabase::addApplicationFont(":/fonts/Lato-Thin.ttf");
     QFontDatabase::addApplicationFont(":/fonts/Lato-ThinItalic.ttf");
-
     QFontDatabase::addApplicationFont(":/fonts/pt-root-ui_vf.ttf");
 }
 
diff --git a/client/images/controls/plus.svg b/client/images/controls/plus.svg
new file mode 100644
index 00000000..96d0b71d
--- /dev/null
+++ b/client/images/controls/plus.svg
@@ -0,0 +1,4 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M12 5V19" stroke="#CBCBCB" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M5 12H19" stroke="#CBCBCB" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/client/resources.qrc b/client/resources.qrc
index f5817eb0..307c992d 100644
--- a/client/resources.qrc
+++ b/client/resources.qrc
@@ -221,5 +221,6 @@
         <file>ui/qml/Controls2/TextTypes/LabelTextType.qml</file>
         <file>ui/qml/Controls2/TextTypes/ButtonTextType.qml</file>
         <file>ui/qml/Controls2/Header2Type.qml</file>
+        <file>images/controls/plus.svg</file>
     </qresource>
 </RCC>
diff --git a/client/ui/models/servers_model.cpp b/client/ui/models/servers_model.cpp
index 94d3ced4..89287b7f 100644
--- a/client/ui/models/servers_model.cpp
+++ b/client/ui/models/servers_model.cpp
@@ -2,41 +2,34 @@
 
 ServersModel::ServersModel(std::shared_ptr<Settings> settings, QObject *parent) : m_settings(settings), QAbstractListModel(parent)
 {
+    refresh();
+}
+
+void ServersModel::refresh()
+{
+    beginResetModel();
     const QJsonArray &servers = m_settings->serversArray();
     int defaultServer = m_settings->defaultServerIndex();
     QVector<ServerModelContent> serverListContent;
     for(int i = 0; i < servers.size(); i++) {
-        ServerModelContent c;
+        ServerModelContent content;
         auto server = servers.at(i).toObject();
-        c.desc = server.value(config_key::description).toString();
-        c.address = server.value(config_key::hostName).toString();
-        if (c.desc.isEmpty()) {
-            c.desc = c.address;
+        content.desc = server.value(config_key::description).toString();
+        content.address = server.value(config_key::hostName).toString();
+        if (content.desc.isEmpty()) {
+            content.desc = content.address;
         }
-        c.isDefault = (i == defaultServer);
-        serverListContent.push_back(c);
+        content.isDefault = (i == defaultServer);
+        serverListContent.push_back(content);
     }
-    setContent(serverListContent);
-}
-
-void ServersModel::clearData()
-{
-    beginResetModel();
-    m_content.clear();
-    endResetModel();
-}
-
-void ServersModel::setContent(const QVector<ServerModelContent> &data)
-{
-    beginResetModel();
-    m_content = data;
+    m_data = serverListContent;
     endResetModel();
 }
 
 int ServersModel::rowCount(const QModelIndex &parent) const
 {
     Q_UNUSED(parent);
-    return static_cast<int>(m_content.size());
+    return static_cast<int>(m_data.size());
 }
 
 QHash<int, QByteArray> ServersModel::roleNames() const {
@@ -50,19 +43,24 @@ QHash<int, QByteArray> ServersModel::roleNames() const {
 QVariant ServersModel::data(const QModelIndex &index, int role) const
 {
     if (!index.isValid() || index.row() < 0
-            || index.row() >= static_cast<int>(m_content.size())) {
+            || index.row() >= static_cast<int>(m_data.size())) {
         return QVariant();
     }
     if (role == DescRole) {
-        return m_content[index.row()].desc;
+        return m_data[index.row()].desc;
     }
     if (role == AddressRole) {
-        return m_content[index.row()].address;
+        return m_data[index.row()].address;
     }
     if (role == IsDefaultRole) {
-        return m_content[index.row()].isDefault;
+        return m_data[index.row()].isDefault;
     }
     return QVariant();
 }
 
+void ServersModel::setDefaultServerIndex(int index)
+{
+
+}
+
 
diff --git a/client/ui/models/servers_model.h b/client/ui/models/servers_model.h
index e60aea6b..c8c32b56 100644
--- a/client/ui/models/servers_model.h
+++ b/client/ui/models/servers_model.h
@@ -23,8 +23,7 @@ public:
         IsDefaultRole
     };
 
-    void clearData();
-    void setContent(const QVector<ServerModelContent>& data);
+    void refresh();
     int rowCount(const QModelIndex &parent = QModelIndex()) const override;
 
     QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
@@ -33,7 +32,7 @@ protected:
     QHash<int, QByteArray> roleNames() const override;
 
 private:
-    QVector<ServerModelContent> m_content;
+    QVector<ServerModelContent> m_data;
     std::shared_ptr<Settings> m_settings;
 };
 
diff --git a/client/ui/pages_logic/ServerListLogic.cpp b/client/ui/pages_logic/ServerListLogic.cpp
index 4a17e202..56a682b8 100644
--- a/client/ui/pages_logic/ServerListLogic.cpp
+++ b/client/ui/pages_logic/ServerListLogic.cpp
@@ -45,5 +45,5 @@ void ServerListLogic::onUpdatePage()
         c.isDefault = (i == defaultServer);
         serverListContent.push_back(c);
     }
-    qobject_cast<ServersModel*>(m_serverListModel)->setContent(serverListContent);
+//    qobject_cast<ServersModel*>(m_serverListModel)->setContent(serverListContent);
 }
diff --git a/client/ui/qml/Controls2/BasicButtonType.qml b/client/ui/qml/Controls2/BasicButtonType.qml
index da5d2abf..266beefe 100644
--- a/client/ui/qml/Controls2/BasicButtonType.qml
+++ b/client/ui/qml/Controls2/BasicButtonType.qml
@@ -48,7 +48,7 @@ Button {
 
     contentItem: Text {
         anchors.fill: background
-        font.family: "PT Root UI"
+        font.family: "PT Root UI VF"
         font.styleName: "normal"
         font.weight: 400
         font.pixelSize: 16
diff --git a/client/ui/qml/Controls2/DropDownType.qml b/client/ui/qml/Controls2/DropDownType.qml
index 6f511194..ea6ca5fc 100644
--- a/client/ui/qml/Controls2/DropDownType.qml
+++ b/client/ui/qml/Controls2/DropDownType.qml
@@ -10,6 +10,9 @@ Item {
     property string text
     property string descriptionText
 
+    property string headerText
+    property string headerBackButtonImage
+
     property var onClickedFunc
     property string buttonImage: "qrc:/images/controls/chevron-down.svg"
     property string buttonImageColor: "#494B50"
@@ -22,7 +25,10 @@ Item {
     property string borderColor: "#494B50"
     property int borderWidth: 1
 
-    property alias menuModel: menuContent.model
+    property Component menuDelegate
+    property variant menuModel
+
+    property alias menuVisible: menu.visible
 
     implicitWidth: buttonContent.implicitWidth
     implicitHeight: buttonContent.implicitHeight
@@ -128,12 +134,13 @@ Item {
             color: Qt.rgba(14/255, 14/255, 17/255, 0.8)
         }
 
-        Header2TextType {
+        Header2Type {
             id: header
-            width: parent.width
 
-            text: "Данные для подключения"
-            wrapMode: Text.WordWrap
+            headerText: root.headerText
+            backButtonImage: root.headerBackButtonImage
+
+            width: parent.width
 
             anchors.top: parent.top
             anchors.left: parent.left
@@ -170,64 +177,13 @@ Item {
                     clip: true
                     interactive: false
 
-                    delegate: Item {
-                        implicitWidth: menuContent.width
-                        implicitHeight: radioButton.implicitHeight
+                    model: root.menuModel
 
-                        RadioButton {
-                            id: radioButton
-
-                            implicitWidth: parent.width
-                            implicitHeight: radioButtonContent.implicitHeight
-
-                            hoverEnabled: true
-
-                            ButtonGroup.group: radioButtonGroup
-
-                            indicator: Rectangle {
-                                anchors.fill: parent
-                                color: radioButton.hovered ? "#2C2D30" : "#1C1D21"
-                            }
-
-                            RowLayout {
-                                id: radioButtonContent
-                                anchors.fill: parent
-
-                                anchors.rightMargin: 16
-                                anchors.leftMargin: 16
-
-                                z: 1
-
-                                Text {
-                                    id: text
-
-                                    text: modelData
-                                    color: "#D7D8DB"
-                                    font.pixelSize: 16
-                                    font.weight: 400
-                                    font.family: "PT Root UI VF"
-
-                                    height: 24
-
-                                    Layout.fillWidth: true
-                                    Layout.topMargin: 20
-                                    Layout.bottomMargin: 20
-                                }
-
-                                Image {
-                                    source: "qrc:/images/controls/check.svg"
-                                    visible: radioButton.checked
-                                    width: 24
-                                    height: 24
-
-                                    Layout.rightMargin: 8
-                                }
-                            }
-
-                            onClicked: {
-                                root.text = modelData
-                                menu.visible = false
-                            }
+                    delegate: Row {
+                        Loader {
+                            id: loader
+                            sourceComponent: root.menuDelegate
+                            property QtObject modelData: model
                         }
                     }
                 }
diff --git a/client/ui/qml/Controls2/Header2Type.qml b/client/ui/qml/Controls2/Header2Type.qml
index e0173a73..5c2f0c9b 100644
--- a/client/ui/qml/Controls2/Header2Type.qml
+++ b/client/ui/qml/Controls2/Header2Type.qml
@@ -6,7 +6,12 @@ import "TextTypes"
 Item {
     id: root
 
-    property string buttonImage
+    property string backButtonImage
+    property string actionButtonImage
+
+    property var backButtonFunction
+    property var actionButtonFunction
+
     property string headerText
     property string descriptionText
 
@@ -22,22 +27,41 @@ Item {
 
             Layout.leftMargin: -6
 
-            image: root.buttonImage
+            image: root.backButtonImage
             imageColor: "#D7D8DB"
 
             visible: image ? true : false
 
             onClicked: {
-                UiLogic.closePage()
+                if (backButtonFunction && typeof backButtonFunction === "function") {
+                    backButtonFunction()
+                }
             }
         }
 
-        Header2TextType {
-            id: header
+        RowLayout {
+            Header2TextType {
+                id: header
 
-            Layout.fillWidth: true
+                Layout.fillWidth: true
 
-            text: root.headerText
+                text: root.headerText
+            }
+
+            ImageButtonType {
+                id: headerActionButton
+
+                image: root.actionButtonImage
+                imageColor: "#D7D8DB"
+
+                visible: image ? true : false
+
+                onClicked: {
+                    if (actionButtonImage && typeof actionButtonImage === "function") {
+                        actionButtonImage()
+                    }
+                }
+            }
         }
 
         ParagraphTextType {
diff --git a/client/ui/qml/Controls2/HeaderType.qml b/client/ui/qml/Controls2/HeaderType.qml
index 407f67f0..a051d2d8 100644
--- a/client/ui/qml/Controls2/HeaderType.qml
+++ b/client/ui/qml/Controls2/HeaderType.qml
@@ -6,7 +6,12 @@ import "TextTypes"
 Item {
     id: root
 
-    property string buttonImage
+    property string backButtonImage
+    property string actionButtonImage
+
+    property var backButtonFunction
+    property var actionButtonFunction
+
     property string headerText
     property string descriptionText
 
@@ -22,22 +27,43 @@ Item {
 
             Layout.leftMargin: -6
 
-            image: root.buttonImage
+            image: root.backButtonImage
             imageColor: "#D7D8DB"
 
             visible: image ? true : false
 
             onClicked: {
-                UiLogic.closePage()
+                if (backButtonFunction && typeof backButtonFunction === "function") {
+                    backButtonFunction()
+                }
             }
         }
 
-        Header1TextType {
-            id: header
+        RowLayout {
+            Header1TextType {
+                id: header
 
-            Layout.fillWidth: true
+                Layout.fillWidth: true
 
-            text: root.headerText
+                text: root.headerText
+            }
+
+            ImageButtonType {
+                id: headerActionButton
+
+                Layout.alignment: Qt.AlignRight
+
+                image: root.actionButtonImage
+                imageColor: "#D7D8DB"
+
+                visible: image ? true : false
+
+                onClicked: {
+                    if (actionButtonImage && typeof actionButtonImage === "function") {
+                        actionButtonImage()
+                    }
+                }
+            }
         }
 
         ParagraphTextType {
@@ -49,6 +75,8 @@ Item {
             text: root.descriptionText
 
             color: "#878B91"
+
+            visible: root.descriptionText !== ""
         }
     }
 }
diff --git a/client/ui/qml/Controls2/LabelWithButtonType.qml b/client/ui/qml/Controls2/LabelWithButtonType.qml
index b6d113bb..d8e195f1 100644
--- a/client/ui/qml/Controls2/LabelWithButtonType.qml
+++ b/client/ui/qml/Controls2/LabelWithButtonType.qml
@@ -29,7 +29,7 @@ Item {
 
         ColumnLayout {
             Text {
-                font.family: "PT Root UI"
+                font.family: "PT Root UI VF"
                 font.styleName: "normal"
                 font.pixelSize: 18
                 color: "#d7d8db"
@@ -44,7 +44,7 @@ Item {
             }
 
             Text {
-                font.family: "PT Root UI"
+                font.family: "PT Root UI VF"
                 font.styleName: "normal"
                 font.pixelSize: 13
                 font.letterSpacing: 0.02
diff --git a/client/ui/qml/Controls2/TabButtonType.qml b/client/ui/qml/Controls2/TabButtonType.qml
index f39edefd..4699dfcd 100644
--- a/client/ui/qml/Controls2/TabButtonType.qml
+++ b/client/ui/qml/Controls2/TabButtonType.qml
@@ -43,7 +43,7 @@ TabButton {
         anchors.fill: background
         height: 24
 
-        font.family: "PT Root UI"
+        font.family: "PT Root UI VF"
         font.styleName: "normal"
         font.weight: 500
         font.pixelSize: 16
diff --git a/client/ui/qml/Controls2/VerticalRadioButton.qml b/client/ui/qml/Controls2/VerticalRadioButton.qml
index edcd1c29..420051cd 100644
--- a/client/ui/qml/Controls2/VerticalRadioButton.qml
+++ b/client/ui/qml/Controls2/VerticalRadioButton.qml
@@ -136,7 +136,7 @@ RadioButton {
         }
 
         Text {
-            font.family: "PT Root UI"
+            font.family: "PT Root UI VF"
             font.styleName: "normal"
             font.pixelSize: 13
             font.letterSpacing: 0.02
diff --git a/client/ui/qml/Pages2/PageHome.qml b/client/ui/qml/Pages2/PageHome.qml
index ad1b7d38..3f81f168 100644
--- a/client/ui/qml/Pages2/PageHome.qml
+++ b/client/ui/qml/Pages2/PageHome.qml
@@ -2,7 +2,10 @@ import QtQuick
 import QtQuick.Controls
 import QtQuick.Layouts
 
+import SortFilterProxyModel 0.2
+
 import PageEnum 1.0
+import ProtocolEnum 1.0
 
 import "./"
 import "../Pages"
@@ -125,11 +128,27 @@ PageBase {
             }
 
             RowLayout {
-
                 Layout.alignment: Qt.AlignHCenter | Qt.AlignVCenter
                 spacing: 8
 
+                SortFilterProxyModel {
+                    id: proxyContainersModel
+                    sourceModel: ContainersModel
+                    filters: [
+                        ValueFilter {
+                            roleName: "service_type_role"
+                            value: ProtocolEnum.Vpn
+                        },
+                        ValueFilter {
+                            roleName: "is_installed_role"
+                            value: true
+                        }
+                    ]
+                }
+
                 DropDownType {
+                    id: protocolsDropDown
+
                     implicitHeight: 40
 
                     borderWidth: 0
@@ -138,7 +157,83 @@ PageBase {
                     defaultColor: "#D7D8DB"
 
                     textColor: "#0E0E11"
-                    text: "testtesttest"
+                    headerText: "Протокол подключения"
+                    headerBackButtonImage: "qrc:/images/controls/arrow-left.svg"
+
+                    menuModel: proxyContainersModel
+
+                    menuDelegate: Item {
+                        implicitWidth: menuContent.width
+                        implicitHeight: radioButton.implicitHeight
+
+                        RadioButton {
+                            id: radioButton
+
+                            implicitWidth: parent.width
+                            implicitHeight: radioButtonContent.implicitHeight
+
+                            hoverEnabled: true
+
+                            ButtonGroup.group: radioButtonGroup
+
+                            indicator: Rectangle {
+                                anchors.fill: parent
+                                color: radioButton.hovered ? "#2C2D30" : "#1C1D21"
+                            }
+
+                            RowLayout {
+                                id: radioButtonContent
+                                anchors.fill: parent
+
+                                anchors.rightMargin: 16
+                                anchors.leftMargin: 16
+
+                                z: 1
+
+                                Text {
+                                    id: text
+
+                                    // todo remove dirty hack?
+                                    text: {
+                                        if (modelData !== null) {
+                                            return modelData.name_role
+                                        } else
+                                            return ""
+                                    }
+                                    color: "#D7D8DB"
+                                    font.pixelSize: 16
+                                    font.weight: 400
+                                    font.family: "PT Root UI VF"
+
+                                    height: 24
+
+                                    Layout.fillWidth: true
+                                    Layout.topMargin: 20
+                                    Layout.bottomMargin: 20
+                                }
+
+                                Image {
+                                    source: "qrc:/images/controls/check.svg"
+                                    visible: radioButton.checked
+                                    width: 24
+                                    height: 24
+
+                                    Layout.rightMargin: 8
+                                }
+                            }
+
+                            onClicked: {
+                                protocolsDropDown.text = text.text
+                                protocolsDropDown.menuVisible = false
+                            }
+                        }
+
+                        Component.onCompleted: {
+                            if (modelData !== null && modelData.default_role) {
+                                protocolsDropDown.text = modelData.name_role
+                            }
+                        }
+                    }
                 }
 
                 BasicButtonType {
@@ -149,29 +244,17 @@ PageBase {
             }
 
             Header2Type {
+                Layout.fillWidth: true
+                Layout.topMargin: 48
                 Layout.leftMargin: 16
                 Layout.rightMargin: 16
 
+                actionButtonImage: "qrc:/images/controls/plus.svg"
+
                 headerText: "Серверы"
             }
         }
 
-
-//        Header2TextType {
-//            id: menuHeader
-//            width: parent.width
-
-//            text: "Данные для подключения"
-//            wrapMode: Text.WordWrap
-
-//            anchors.top: parent.top
-//            anchors.left: parent.left
-//            anchors.right: parent.right
-//            anchors.topMargin: 16
-//            anchors.leftMargin: 16
-//            anchors.rightMargin: 16
-//        }
-
         FlickableType {
             anchors.top: menuHeader.bottom
             anchors.topMargin: 16
@@ -257,6 +340,13 @@ PageBase {
                                     Layout.rightMargin: 8
                                 }
                             }
+
+                            onClicked: {
+                                console.log(index)
+                                ContainersModel.setSelectedServerIndex(index)
+                                root.currentServerName = desc
+                                root.currentServerDescription = address
+                            }
                         }
                     }
                 }
diff --git a/client/ui/qml/Pages2/PageSetupWizardConfigSource.qml b/client/ui/qml/Pages2/PageSetupWizardConfigSource.qml
index a6ba52bb..5445d1f3 100644
--- a/client/ui/qml/Pages2/PageSetupWizardConfigSource.qml
+++ b/client/ui/qml/Pages2/PageSetupWizardConfigSource.qml
@@ -36,7 +36,7 @@ PageBase {
                 Layout.fillWidth: true
                 Layout.topMargin: 20
 
-                buttonImage: "qrc:/images/controls/arrow-left.svg"
+                backButtonImage: "qrc:/images/controls/arrow-left.svg"
 
                 headerText: "Подключение к серверу"
                 descriptionText: "Не используйте код подключения из публичных источников. Его могли создать, чтобы перехватывать ваши данные.\n
diff --git a/client/ui/qml/Pages2/PageSetupWizardCredentials.qml b/client/ui/qml/Pages2/PageSetupWizardCredentials.qml
index a6e98fee..506c1cde 100644
--- a/client/ui/qml/Pages2/PageSetupWizardCredentials.qml
+++ b/client/ui/qml/Pages2/PageSetupWizardCredentials.qml
@@ -34,7 +34,7 @@ PageBase {
                 Layout.fillWidth: true
                 Layout.topMargin: 20
 
-                buttonImage: "qrc:/images/controls/arrow-left.svg"
+                backButtonImage: "qrc:/images/controls/arrow-left.svg"
 
                 headerText: "Подключение к серверу"
             }
diff --git a/client/ui/qml/Pages2/PageSetupWizardEasy.qml b/client/ui/qml/Pages2/PageSetupWizardEasy.qml
index 8c75a1df..94e22fe3 100644
--- a/client/ui/qml/Pages2/PageSetupWizardEasy.qml
+++ b/client/ui/qml/Pages2/PageSetupWizardEasy.qml
@@ -34,7 +34,7 @@ PageBase {
                 Layout.fillWidth: true
                 Layout.topMargin: 20
 
-                buttonImage: "qrc:/images/controls/arrow-left.svg"
+                backButtonImage: "qrc:/images/controls/arrow-left.svg"
 
                 headerText: "Какой уровень контроля интернета в вашем регионе?"
             }
diff --git a/client/ui/qml/Pages2/PageSetupWizardInstalling.qml b/client/ui/qml/Pages2/PageSetupWizardInstalling.qml
index 3445b533..a7418257 100644
--- a/client/ui/qml/Pages2/PageSetupWizardInstalling.qml
+++ b/client/ui/qml/Pages2/PageSetupWizardInstalling.qml
@@ -36,7 +36,7 @@ PageBase {
                 Layout.topMargin: 20
 
                 //TODO remove later
-                buttonImage: "qrc:/images/controls/arrow-left.svg"
+                backButtonImage: "qrc:/images/controls/arrow-left.svg"
 
                 headerText: "Установка"
                 descriptionText: ContainersModel.getCurrentlyInstalledContainerName()
diff --git a/client/ui/qml/Pages2/PageSetupWizardProtocolSettings.qml b/client/ui/qml/Pages2/PageSetupWizardProtocolSettings.qml
index 17c22b04..78856444 100644
--- a/client/ui/qml/Pages2/PageSetupWizardProtocolSettings.qml
+++ b/client/ui/qml/Pages2/PageSetupWizardProtocolSettings.qml
@@ -35,7 +35,7 @@ PageBase {
                 Layout.fillWidth: true
                 Layout.topMargin: 20
 
-                buttonImage: "qrc:/images/controls/arrow-left.svg"
+                backButtonImage: "qrc:/images/controls/arrow-left.svg"
 
                 headerText: "Установка " + ContainersModel.getCurrentlyInstalledContainerName()
                 descriptionText: "Эти настройки можно будет изменить позже"
diff --git a/client/ui/qml/Pages2/PageSetupWizardProtocols.qml b/client/ui/qml/Pages2/PageSetupWizardProtocols.qml
index ad4efbc2..50107615 100644
--- a/client/ui/qml/Pages2/PageSetupWizardProtocols.qml
+++ b/client/ui/qml/Pages2/PageSetupWizardProtocols.qml
@@ -51,7 +51,7 @@ PageBase {
 
             HeaderType {
                 width: parent.width
-                buttonImage: "qrc:/images/controls/arrow-left.svg"
+                backButtonImage: "qrc:/images/controls/arrow-left.svg"
 
                 headerText: "Протокол подключения"
                 descriptionText: "Выберите более приоритетный для вас. Позже можно будет установить остальные протоколы и доп сервисы, вроде DNS-прокси и SFTP."
diff --git a/client/ui/qml/Pages2/PageSetupWizardTextKey.qml b/client/ui/qml/Pages2/PageSetupWizardTextKey.qml
index 9fddc573..d295f1b9 100644
--- a/client/ui/qml/Pages2/PageSetupWizardTextKey.qml
+++ b/client/ui/qml/Pages2/PageSetupWizardTextKey.qml
@@ -35,7 +35,7 @@ PageBase {
                 Layout.fillWidth: true
                 Layout.topMargin: 20
 
-                buttonImage: "qrc:/images/controls/arrow-left.svg"
+                backButtonImage: "qrc:/images/controls/arrow-left.svg"
 
                 headerText: "Ключ для подключения"
                 descriptionText: "Строка, которая начинается с vpn://..."
diff --git a/client/ui/qml/Pages2/PageTest.qml b/client/ui/qml/Pages2/PageTest.qml
index af9ef286..2336e46e 100644
--- a/client/ui/qml/Pages2/PageTest.qml
+++ b/client/ui/qml/Pages2/PageTest.qml
@@ -29,7 +29,7 @@ PageBase {
             Layout.bottomMargin: 32
             Layout.fillWidth: true
 
-            buttonImage: "qrc:/images/controls/arrow-left.svg"
+            backButtonImage: "qrc:/images/controls/arrow-left.svg"
             headerText: "Server 1"
             descriptionText: "root 192.168.111.111"
         }

From e3e7503a7c00afeaa4d4b8d8f6d9494bf30440db Mon Sep 17 00:00:00 2001
From: "vladimir.kuznetsov" <nethiuswork@gmail.com>
Date: Fri, 12 May 2023 11:36:09 +0800
Subject: [PATCH 015/278] added saving the selected server and protocol to the
 config

---
 client/ui/models/containers_model.cpp    |  37 ++++---
 client/ui/models/containers_model.h      |   1 +
 client/ui/models/servers_model.cpp       | 118 ++++++++++++++---------
 client/ui/models/servers_model.h         |  13 ++-
 client/ui/qml/Controls2/DropDownType.qml |   6 ++
 client/ui/qml/Pages2/PageHome.qml        |  82 +++++++++-------
 6 files changed, 160 insertions(+), 97 deletions(-)

diff --git a/client/ui/models/containers_model.cpp b/client/ui/models/containers_model.cpp
index f56613c7..c7aa0ec1 100644
--- a/client/ui/models/containers_model.cpp
+++ b/client/ui/models/containers_model.cpp
@@ -1,10 +1,8 @@
 #include "containers_model.h"
 
-ContainersModel::ContainersModel(std::shared_ptr<Settings> settings, QObject *parent) :
-    m_settings(settings),
-    QAbstractListModel(parent)
+ContainersModel::ContainersModel(std::shared_ptr<Settings> settings, QObject *parent) : m_settings(settings), QAbstractListModel(parent)
 {
-
+    setSelectedServerIndex(m_settings->defaultServerIndex());
 }
 
 int ContainersModel::rowCount(const QModelIndex &parent) const
@@ -13,14 +11,19 @@ int ContainersModel::rowCount(const QModelIndex &parent) const
     return ContainerProps::allContainers().size();
 }
 
-QHash<int, QByteArray> ContainersModel::roleNames() const {
-    QHash<int, QByteArray> roles;
-    roles[NameRole] = "name_role";
-    roles[DescRole] = "desc_role";
-    roles[DefaultRole] = "default_role";
-    roles[ServiceTypeRole] = "service_type_role";
-    roles[IsInstalledRole] = "is_installed_role";
-    return roles;
+bool ContainersModel::setData(const QModelIndex &index, const QVariant &value, int role)
+{
+    if (!index.isValid() || index.row() < 0 || index.row() >= ContainerProps::allContainers().size()) {
+        return false;
+    }
+
+    if (role == DefaultRole) {
+        DockerContainer container = ContainerProps::allContainers().at(index.row());
+        m_settings->setDefaultContainer(m_selectedServerIndex, container);
+    }
+
+    emit dataChanged(index, index);
+    return true;
 }
 
 QVariant ContainersModel::data(const QModelIndex &index, int role) const
@@ -67,3 +70,13 @@ QString ContainersModel::getCurrentlyInstalledContainerName()
 {
     return data(m_currentlyInstalledContainerIndex, NameRole).toString();
 }
+
+QHash<int, QByteArray> ContainersModel::roleNames() const {
+    QHash<int, QByteArray> roles;
+    roles[NameRole] = "name_role";
+    roles[DescRole] = "desc_role";
+    roles[DefaultRole] = "default_role";
+    roles[ServiceTypeRole] = "service_type_role";
+    roles[IsInstalledRole] = "is_installed_role";
+    return roles;
+}
diff --git a/client/ui/models/containers_model.h b/client/ui/models/containers_model.h
index 9c409fc0..ba0fea57 100644
--- a/client/ui/models/containers_model.h
+++ b/client/ui/models/containers_model.h
@@ -25,6 +25,7 @@ public:
 
     int rowCount(const QModelIndex &parent = QModelIndex()) const override;
 
+    bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole) override;
     QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
     Q_INVOKABLE void setSelectedServerIndex(int index);
     Q_INVOKABLE void setCurrentlyInstalledContainerIndex(int index);
diff --git a/client/ui/models/servers_model.cpp b/client/ui/models/servers_model.cpp
index 89287b7f..44ed2619 100644
--- a/client/ui/models/servers_model.cpp
+++ b/client/ui/models/servers_model.cpp
@@ -2,34 +2,83 @@
 
 ServersModel::ServersModel(std::shared_ptr<Settings> settings, QObject *parent) : m_settings(settings), QAbstractListModel(parent)
 {
-    refresh();
-}
 
-void ServersModel::refresh()
-{
-    beginResetModel();
-    const QJsonArray &servers = m_settings->serversArray();
-    int defaultServer = m_settings->defaultServerIndex();
-    QVector<ServerModelContent> serverListContent;
-    for(int i = 0; i < servers.size(); i++) {
-        ServerModelContent content;
-        auto server = servers.at(i).toObject();
-        content.desc = server.value(config_key::description).toString();
-        content.address = server.value(config_key::hostName).toString();
-        if (content.desc.isEmpty()) {
-            content.desc = content.address;
-        }
-        content.isDefault = (i == defaultServer);
-        serverListContent.push_back(content);
-    }
-    m_data = serverListContent;
-    endResetModel();
 }
 
 int ServersModel::rowCount(const QModelIndex &parent) const
 {
     Q_UNUSED(parent);
-    return static_cast<int>(m_data.size());
+    return static_cast<int>(m_settings->serversCount());
+}
+
+bool ServersModel::setData(const QModelIndex &index, const QVariant &value, int role)
+{
+    if (!index.isValid() || index.row() < 0
+        || index.row() >= static_cast<int>(m_settings->serversCount())) {
+        return false;
+    }
+//    if (role == DescRole) {
+//        return m_data[index.row()].desc;
+//    }
+//    if (role == AddressRole) {
+//        return m_data[index.row()].address;
+//    }
+//    if (role == IsDefaultRole) {
+//        return m_data[index.row()].isDefault;
+//    }
+}
+
+QVariant ServersModel::data(const QModelIndex &index, int role) const
+{
+    if (!index.isValid() || index.row() < 0 || index.row() >= static_cast<int>(m_settings->serversCount())) {
+        return QVariant();
+    }
+
+    const QJsonArray &servers = m_settings->serversArray();
+    const QJsonObject server = servers.at(index.row()).toObject();
+
+    if (role == DescRole) {
+        auto description = server.value(config_key::description).toString();
+        if (description.isEmpty()) {
+            return server.value(config_key::hostName).toString();
+        }
+        return description;
+    }
+    if (role == AddressRole) {
+        return server.value(config_key::hostName).toString();
+    }
+    if (role == IsDefaultRole) {
+        return index.row() == m_settings->defaultServerIndex();
+    }
+    return QVariant();
+
+
+//    if (!index.isValid() || index.row() < 0
+//            || index.row() >= static_cast<int>(m_data.size())) {
+//        return QVariant();
+//    }
+//    if (role == DescRole) {
+//        return m_data[index.row()].desc;
+//    }
+//    if (role == AddressRole) {
+//        return m_data[index.row()].address;
+//    }
+//    if (role == IsDefaultRole) {
+//        return m_data[index.row()].isDefault;
+//    }
+//    return QVariant();
+}
+
+void ServersModel::setDefaultServerIndex(int index)
+{
+//    beginResetModel();
+    m_settings->setDefaultServer(index);
+    //    endResetModel();
+}
+
+int ServersModel::getDefaultServerIndex()
+{
+    return m_settings->defaultServerIndex();
 }
 
 QHash<int, QByteArray> ServersModel::roleNames() const {
@@ -39,28 +88,3 @@ QHash<int, QByteArray> ServersModel::roleNames() const {
     roles[IsDefaultRole] = "is_default";
     return roles;
 }
-
-QVariant ServersModel::data(const QModelIndex &index, int role) const
-{
-    if (!index.isValid() || index.row() < 0
-            || index.row() >= static_cast<int>(m_data.size())) {
-        return QVariant();
-    }
-    if (role == DescRole) {
-        return m_data[index.row()].desc;
-    }
-    if (role == AddressRole) {
-        return m_data[index.row()].address;
-    }
-    if (role == IsDefaultRole) {
-        return m_data[index.row()].isDefault;
-    }
-    return QVariant();
-}
-
-void ServersModel::setDefaultServerIndex(int index)
-{
-
-}
-
-
diff --git a/client/ui/models/servers_model.h b/client/ui/models/servers_model.h
index c8c32b56..cd46846b 100644
--- a/client/ui/models/servers_model.h
+++ b/client/ui/models/servers_model.h
@@ -15,24 +15,27 @@ class ServersModel : public QAbstractListModel
 {
     Q_OBJECT
 public:
-    ServersModel(std::shared_ptr<Settings> settings, QObject *parent = nullptr);
-public:
-    enum SiteRoles {
+    enum ServersModelRoles {
         DescRole = Qt::UserRole + 1,
         AddressRole,
         IsDefaultRole
     };
 
-    void refresh();
+    ServersModel(std::shared_ptr<Settings> settings, QObject *parent = nullptr);
+
     int rowCount(const QModelIndex &parent = QModelIndex()) const override;
 
+    bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole) override;
     QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
 
+public slots:
+    void setDefaultServerIndex(int index);
+    int getDefaultServerIndex();
+
 protected:
     QHash<int, QByteArray> roleNames() const override;
 
 private:
-    QVector<ServerModelContent> m_data;
     std::shared_ptr<Settings> m_settings;
 };
 
diff --git a/client/ui/qml/Controls2/DropDownType.qml b/client/ui/qml/Controls2/DropDownType.qml
index ea6ca5fc..64013ba4 100644
--- a/client/ui/qml/Controls2/DropDownType.qml
+++ b/client/ui/qml/Controls2/DropDownType.qml
@@ -17,6 +17,7 @@ Item {
     property string buttonImage: "qrc:/images/controls/chevron-down.svg"
     property string buttonImageColor: "#494B50"
 
+    property int buttonMaximumWidth
 
     property string defaultColor: "#1C1D21"
 
@@ -70,8 +71,13 @@ Item {
                 horizontalAlignment: Text.AlignHCenter
                 verticalAlignment: Text.AlignVCenter
 
+                Layout.maximumWidth: buttonMaximumWidth ? buttonMaximumWidth : implicitWidth
+
                 color: root.textColor
                 text: root.text
+
+                wrapMode: Text.NoWrap
+                elide: Text.ElideRight
             }
         }
 
diff --git a/client/ui/qml/Pages2/PageHome.qml b/client/ui/qml/Pages2/PageHome.qml
index 3f81f168..f4f4d13c 100644
--- a/client/ui/qml/Pages2/PageHome.qml
+++ b/client/ui/qml/Pages2/PageHome.qml
@@ -21,8 +21,8 @@ PageBase {
 
     property string borderColor: "#2C2D30"
 
-    property string currentServerName: menuContent.currentItem.delegateData.desc
-    property string currentServerDescription: menuContent.currentItem.delegateData.address
+    property string currentServerName: serversMenuContent.currentItem.delegateData.desc
+    property string currentServerDescription: serversMenuContent.currentItem.delegateData.address
 
     Rectangle {
         id: buttonBackground
@@ -108,7 +108,7 @@ PageBase {
         }
 
         ColumnLayout {
-            id: menuHeader
+            id: serversMenuHeader
             anchors.top: parent.top
             anchors.right: parent.right
             anchors.left: parent.left
@@ -147,12 +147,13 @@ PageBase {
                 }
 
                 DropDownType {
-                    id: protocolsDropDown
+                    id: containersDropDown
 
                     implicitHeight: 40
 
                     borderWidth: 0
                     buttonImageColor: "#0E0E11"
+                    buttonMaximumWidth: 150
 
                     defaultColor: "#D7D8DB"
 
@@ -162,27 +163,38 @@ PageBase {
 
                     menuModel: proxyContainersModel
 
+                    ButtonGroup {
+                        id: containersRadioButtonGroup
+                    }
+
                     menuDelegate: Item {
-                        implicitWidth: menuContent.width
-                        implicitHeight: radioButton.implicitHeight
+                        implicitWidth: root.width
+                        implicitHeight: containerRadioButton.implicitHeight
 
                         RadioButton {
-                            id: radioButton
+                            id: containerRadioButton
 
                             implicitWidth: parent.width
-                            implicitHeight: radioButtonContent.implicitHeight
+                            implicitHeight: containerRadioButtonContent.implicitHeight
 
                             hoverEnabled: true
 
-                            ButtonGroup.group: radioButtonGroup
+                            ButtonGroup.group: containersRadioButtonGroup
+
+                            checked: {
+                                if (modelData !== null) {
+                                    return modelData.default_role
+                                }
+                                return false
+                            }
 
                             indicator: Rectangle {
                                 anchors.fill: parent
-                                color: radioButton.hovered ? "#2C2D30" : "#1C1D21"
+                                color: containerRadioButton.hovered ? "#2C2D30" : "#1C1D21"
                             }
 
                             RowLayout {
-                                id: radioButtonContent
+                                id: containerRadioButtonContent
                                 anchors.fill: parent
 
                                 anchors.rightMargin: 16
@@ -191,7 +203,7 @@ PageBase {
                                 z: 1
 
                                 Text {
-                                    id: text
+                                    id: containerRadioButtonText
 
                                     // todo remove dirty hack?
                                     text: {
@@ -214,7 +226,7 @@ PageBase {
 
                                 Image {
                                     source: "qrc:/images/controls/check.svg"
-                                    visible: radioButton.checked
+                                    visible: containerRadioButton.checked
                                     width: 24
                                     height: 24
 
@@ -223,14 +235,16 @@ PageBase {
                             }
 
                             onClicked: {
-                                protocolsDropDown.text = text.text
-                                protocolsDropDown.menuVisible = false
+                                modelData.default_role = true
+
+                                containersDropDown.text = containerRadioButtonText.text
+                                containersDropDown.menuVisible = false
                             }
                         }
 
                         Component.onCompleted: {
                             if (modelData !== null && modelData.default_role) {
-                                protocolsDropDown.text = modelData.name_role
+                                containersDropDown.text = modelData.name_role
                             }
                         }
                     }
@@ -256,7 +270,7 @@ PageBase {
         }
 
         FlickableType {
-            anchors.top: menuHeader.bottom
+            anchors.top: serversMenuHeader.bottom
             anchors.topMargin: 16
             contentHeight: col.implicitHeight
 
@@ -269,45 +283,46 @@ PageBase {
                 spacing: 16
 
                 ButtonGroup {
-                    id: radioButtonGroup
+                    id: serversRadioButtonGroup
                 }
 
                 ListView {
-                    id: menuContent
+                    id: serversMenuContent
                     width: parent.width
-                    height: menuContent.contentItem.height
+                    height: serversMenuContent.contentItem.height
 
                     model: ServersModel
-                    currentIndex: 0
+                    currentIndex: ServersModel.getDefaultServerIndex()
 
                     clip: true
-                    interactive: false
 
                     delegate: Item {
                         id: menuContentDelegate
 
                         property variant delegateData: model
 
-                        implicitWidth: menuContent.width
-                        implicitHeight: radioButton.implicitHeight
+                        implicitWidth: serversMenuContent.width
+                        implicitHeight: serverRadioButton.implicitHeight
 
                         RadioButton {
-                            id: radioButton
+                            id: serverRadioButton
 
                             implicitWidth: parent.width
-                            implicitHeight: radioButtonContent.implicitHeight
+                            implicitHeight: serverRadioButtonContent.implicitHeight
 
                             hoverEnabled: true
 
-                            ButtonGroup.group: radioButtonGroup
+                            checked: index === serversMenuContent.currentIndex
+
+                            ButtonGroup.group: serversRadioButtonGroup
 
                             indicator: Rectangle {
                                 anchors.fill: parent
-                                color: radioButton.hovered ? "#2C2D30" : "#1C1D21"
+                                color: serverRadioButton.hovered ? "#2C2D30" : "#1C1D21"
                             }
 
                             RowLayout {
-                                id: radioButtonContent
+                                id: serverRadioButtonContent
                                 anchors.fill: parent
 
                                 anchors.rightMargin: 16
@@ -316,7 +331,7 @@ PageBase {
                                 z: 1
 
                                 Text {
-                                    id: text
+                                    id: serverRadioButtonText
 
                                     text: desc
                                     color: "#D7D8DB"
@@ -333,7 +348,7 @@ PageBase {
 
                                 Image {
                                     source: "qrc:/images/controls/check.svg"
-                                    visible: radioButton.checked
+                                    visible: serverRadioButton.checked
                                     width: 24
                                     height: 24
 
@@ -342,10 +357,11 @@ PageBase {
                             }
 
                             onClicked: {
-                                console.log(index)
-                                ContainersModel.setSelectedServerIndex(index)
                                 root.currentServerName = desc
                                 root.currentServerDescription = address
+
+                                ServersModel.setDefaultServerIndex(index)
+                                ContainersModel.setSelectedServerIndex(index)
                             }
                         }
                     }

From 35d4222c7a87f6374fe324514ef0018cc96fe92a Mon Sep 17 00:00:00 2001
From: "vladimir.kuznetsov" <nethiuswork@gmail.com>
Date: Fri, 12 May 2023 23:54:31 +0800
Subject: [PATCH 016/278] added connectionController and ConnectionButton.qml

---
 client/CMakeLists.txt                         |  5 ++
 client/amnezia_application.cpp                | 12 +++-
 client/amnezia_application.h                  | 10 ++-
 client/resources.qrc                          |  1 +
 .../ui/controllers/connectionController.cpp   | 71 +++++++++++++++++++
 client/ui/controllers/connectionController.h  | 33 +++++++++
 client/ui/models/containers_model.cpp         | 48 +++++++------
 client/ui/models/containers_model.h           | 10 ++-
 client/ui/models/servers_model.cpp            | 27 ++-----
 client/ui/models/servers_model.h              |  1 +
 client/ui/qml/Components/ConnectButton.qml    | 40 +++++++++++
 .../Controls2/TextTypes/ButtonTextType.qml    |  2 +-
 .../Controls2/TextTypes/Header1TextType.qml   |  2 +-
 .../Controls2/TextTypes/Header2TextType.qml   |  2 +-
 .../qml/Controls2/TextTypes/LabelTextType.qml |  2 +-
 .../Controls2/TextTypes/ParagraphTextType.qml |  2 +-
 client/ui/qml/Pages2/PageHome.qml             | 25 ++++---
 17 files changed, 233 insertions(+), 60 deletions(-)
 create mode 100644 client/ui/controllers/connectionController.cpp
 create mode 100644 client/ui/controllers/connectionController.h
 create mode 100644 client/ui/qml/Components/ConnectButton.qml

diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt
index 9b110666..d86431d5 100644
--- a/client/CMakeLists.txt
+++ b/client/CMakeLists.txt
@@ -128,17 +128,22 @@ file(GLOB CONFIGURATORS_CPP CONFIGURE_DEPENDS ${CMAKE_CURRENT_LIST_DIR}/configur
 file(GLOB UI_MODELS_H CONFIGURE_DEPENDS ${CMAKE_CURRENT_LIST_DIR}/ui/models/*.h)
 file(GLOB UI_MODELS_CPP CONFIGURE_DEPENDS ${CMAKE_CURRENT_LIST_DIR}/ui/models/*.cpp)
 
+file(GLOB UI_CONTROLLERS_H CONFIGURE_DEPENDS ${CMAKE_CURRENT_LIST_DIR}/ui/controllers/*.h)
+file(GLOB UI_CONTROLLERS_CPP CONFIGURE_DEPENDS ${CMAKE_CURRENT_LIST_DIR}/ui/controllers/*.cpp)
+
 set(HEADERS ${HEADERS}
     ${COMMON_FILES_H}
     ${PAGE_LOGIC_H}
     ${CONFIGURATORS_H}
     ${UI_MODELS_H}
+    ${UI_CONTROLLERS_H}
 )
 set(SOURCES ${SOURCES}
     ${COMMON_FILES_CPP}
     ${PAGE_LOGIC_CPP}
     ${CONFIGURATORS_CPP}
     ${UI_MODELS_CPP}
+    ${UI_CONTROLLERS_CPP}
 )
 
 qt6_add_resources(QRC ${QRC} ${CMAKE_CURRENT_LIST_DIR}/resources.qrc)
diff --git a/client/amnezia_application.cpp b/client/amnezia_application.cpp
index dea868e4..6fadcabb 100644
--- a/client/amnezia_application.cpp
+++ b/client/amnezia_application.cpp
@@ -5,7 +5,6 @@
 #include <QTimer>
 #include <QTranslator>
 
-
 #include "core/servercontroller.h"
 #include "logger.h"
 #include "defines.h"
@@ -100,12 +99,23 @@ void AmneziaApplication::init()
 
     m_engine->rootContext()->setContextProperty("Debug", &Logger::Instance());
 
+    //
     m_containersModel.reset(new ContainersModel(m_settings, this));
     m_engine->rootContext()->setContextProperty("ContainersModel", m_containersModel.get());
 
     m_serversModel.reset(new ServersModel(m_settings, this));
     m_engine->rootContext()->setContextProperty("ServersModel", m_serversModel.get());
 
+    m_vpnConnection.reset(new VpnConnection(m_settings, m_configurator));
+
+    m_connectionController.reset(new ConnectionController(m_serversModel, m_containersModel));
+    connect(m_connectionController.get(), &ConnectionController::connectToVpn,
+            m_vpnConnection.get(), &VpnConnection::connectToVpn, Qt::QueuedConnection);
+    connect(m_connectionController.get(), &ConnectionController::disconnectFromVpn,
+            m_vpnConnection.get(), &VpnConnection::disconnectFromVpn, Qt::QueuedConnection);
+    m_engine->rootContext()->setContextProperty("ConnectionController", m_connectionController.get());
+
+    //
     m_uiLogic->registerPagesLogic();
 
 #if defined(Q_OS_IOS)
diff --git a/client/amnezia_application.h b/client/amnezia_application.h
index d15864e1..322a440c 100644
--- a/client/amnezia_application.h
+++ b/client/amnezia_application.h
@@ -9,11 +9,13 @@
 #include <QQmlContext>
 
 #include "settings.h"
+#include "vpnconnection.h"
 
 #include "ui/uilogic.h"
 #include "configurators/vpn_configurator.h"
 #include "ui/models/servers_model.h"
 #include "ui/models/containers_model.h"
+#include "ui/controllers/connectionController.h"
 
 #define amnApp (static_cast<AmneziaApplication *>(QCoreApplication::instance()))
 
@@ -58,8 +60,12 @@ private:
     QTranslator* m_translator;
     QCommandLineParser m_parser;
 
-    QScopedPointer<ContainersModel> m_containersModel;
-    QScopedPointer<ServersModel> m_serversModel;
+    QSharedPointer<ContainersModel> m_containersModel;
+    QSharedPointer<ServersModel> m_serversModel;
+
+    QScopedPointer<VpnConnection> m_vpnConnection;
+
+    QScopedPointer<ConnectionController> m_connectionController;
 
 };
 
diff --git a/client/resources.qrc b/client/resources.qrc
index 307c992d..1ea7bf38 100644
--- a/client/resources.qrc
+++ b/client/resources.qrc
@@ -222,5 +222,6 @@
         <file>ui/qml/Controls2/TextTypes/ButtonTextType.qml</file>
         <file>ui/qml/Controls2/Header2Type.qml</file>
         <file>images/controls/plus.svg</file>
+        <file>ui/qml/Components/ConnectButton.qml</file>
     </qresource>
 </RCC>
diff --git a/client/ui/controllers/connectionController.cpp b/client/ui/controllers/connectionController.cpp
new file mode 100644
index 00000000..41dbed64
--- /dev/null
+++ b/client/ui/controllers/connectionController.cpp
@@ -0,0 +1,71 @@
+#include "connectionController.h"
+
+#include <QApplication>
+
+ConnectionController::ConnectionController(const QSharedPointer<ServersModel> &serversModel,
+                                           const QSharedPointer<ContainersModel> &containersModel,
+                                           QObject *parent) : QObject(parent), m_serversModel(serversModel), m_containersModel(containersModel)
+{
+
+}
+
+bool ConnectionController::onConnectionButtonClicked()
+{
+    if (!isConnected) {
+        openVpnConnection();
+    } else {
+        closeVpnConnection();
+    }
+}
+
+bool ConnectionController::openVpnConnection()
+{
+    int serverIndex = m_serversModel->getDefaultServerIndex();
+    QModelIndex serverModelIndex = m_serversModel->index(serverIndex);
+    ServerCredentials credentials = qvariant_cast<ServerCredentials>(m_serversModel->data(serverModelIndex,
+                                                                                          ServersModel::ServersModelRoles::CredentialsRole));
+
+    DockerContainer container = m_containersModel->getDefaultContainer();
+    QModelIndex containerModelIndex = m_containersModel->index(container);
+    const QJsonObject &containerConfig = qvariant_cast<QJsonObject>(m_containersModel->data(containerModelIndex,
+                                                                                            ContainersModel::ContainersModelRoles::ConfigRole));
+
+    //todo error handling
+    qApp->processEvents();
+    emit connectToVpn(serverIndex, credentials, container, containerConfig);
+    isConnected = true;
+
+
+//    int serverIndex = m_settings->defaultServerIndex();
+//    ServerCredentials credentials = m_settings->serverCredentials(serverIndex);
+//    DockerContainer container = m_settings->defaultContainer(serverIndex);
+
+//    if (m_settings->containers(serverIndex).isEmpty()) {
+//        set_labelErrorText(tr("VPN Protocols is not installed.\n Please install VPN container at first"));
+//        set_pushButtonConnectChecked(false);
+//        return;
+//    }
+
+//    if (container == DockerContainer::None) {
+//        set_labelErrorText(tr("VPN Protocol not chosen"));
+//        set_pushButtonConnectChecked(false);
+//        return;
+//    }
+
+
+//    const QJsonObject &containerConfig = m_settings->containerConfig(serverIndex, container);
+
+//    set_labelErrorText("");
+//    set_pushButtonConnectChecked(true);
+//    set_pushButtonConnectEnabled(false);
+
+//    qApp->processEvents();
+
+//    emit connectToVpn(serverIndex, credentials, container, containerConfig);
+}
+
+bool ConnectionController::closeVpnConnection()
+{
+    emit disconnectFromVpn();
+}
+
diff --git a/client/ui/controllers/connectionController.h b/client/ui/controllers/connectionController.h
new file mode 100644
index 00000000..125e9204
--- /dev/null
+++ b/client/ui/controllers/connectionController.h
@@ -0,0 +1,33 @@
+#ifndef CONNECTIONCONTROLLER_H
+#define CONNECTIONCONTROLLER_H
+
+#include "ui/models/servers_model.h"
+#include "ui/models/containers_model.h"
+
+class ConnectionController : public QObject
+{
+    Q_OBJECT
+
+public:
+    explicit ConnectionController(const QSharedPointer<ServersModel> &serversModel,
+                                  const QSharedPointer<ContainersModel> &containersModel,
+                                  QObject *parent = nullptr);
+
+public slots:
+    bool onConnectionButtonClicked();
+
+signals:
+    void connectToVpn(int serverIndex, const ServerCredentials &credentials, DockerContainer container, const QJsonObject &containerConfig);
+    void disconnectFromVpn();
+
+private:
+    bool openVpnConnection();
+    bool closeVpnConnection();
+
+    QSharedPointer<ServersModel> m_serversModel;
+    QSharedPointer<ContainersModel> m_containersModel;
+
+    bool isConnected = false;
+};
+
+#endif // CONNECTIONCONTROLLER_H
diff --git a/client/ui/models/containers_model.cpp b/client/ui/models/containers_model.cpp
index c7aa0ec1..db7572e6 100644
--- a/client/ui/models/containers_model.cpp
+++ b/client/ui/models/containers_model.cpp
@@ -17,7 +17,7 @@ bool ContainersModel::setData(const QModelIndex &index, const QVariant &value, i
         return false;
     }
 
-    if (role == DefaultRole) {
+    if (role == IsDefaultRole) {
         DockerContainer container = ContainerProps::allContainers().at(index.row());
         m_settings->setDefaultContainer(m_selectedServerIndex, container);
     }
@@ -33,22 +33,23 @@ QVariant ContainersModel::data(const QModelIndex &index, int role) const
         return QVariant();
     }
 
-    DockerContainer c = ContainerProps::allContainers().at(index.row());
-    if (role == NameRole) {
-        return ContainerProps::containerHumanNames().value(c);
-    }
-    if (role == DescRole) {
-        return ContainerProps::containerDescriptions().value(c);
-    }
-    if (role == DefaultRole) {
-        return c == m_settings->defaultContainer(m_selectedServerIndex);
-    }
-    if (role == ServiceTypeRole) {
-        return ContainerProps::containerService(c);
-    }
-    if (role == IsInstalledRole) {
-        return m_settings->containers(m_selectedServerIndex).contains(c);
+    DockerContainer container = ContainerProps::allContainers().at(index.row());
+
+    switch (role) {
+        case NameRole:
+            return ContainerProps::containerHumanNames().value(container);
+        case DescRole:
+            return ContainerProps::containerDescriptions().value(container);
+        case ConfigRole:
+            return m_settings->containerConfig(m_selectedServerIndex, container);
+        case ServiceTypeRole:
+            return ContainerProps::containerService(container);
+        case IsInstalledRole:
+            return m_settings->containers(m_selectedServerIndex).contains(container);
+        case IsDefaultRole:
+            return container == m_settings->defaultContainer(m_selectedServerIndex);
     }
+
     return QVariant();
 }
 
@@ -71,12 +72,17 @@ QString ContainersModel::getCurrentlyInstalledContainerName()
     return data(m_currentlyInstalledContainerIndex, NameRole).toString();
 }
 
+DockerContainer ContainersModel::getDefaultContainer()
+{
+    return m_settings->defaultContainer(m_selectedServerIndex);
+}
+
 QHash<int, QByteArray> ContainersModel::roleNames() const {
     QHash<int, QByteArray> roles;
-    roles[NameRole] = "name_role";
-    roles[DescRole] = "desc_role";
-    roles[DefaultRole] = "default_role";
-    roles[ServiceTypeRole] = "service_type_role";
-    roles[IsInstalledRole] = "is_installed_role";
+    roles[NameRole] = "name";
+    roles[DescRole] = "description";
+    roles[ServiceTypeRole] = "serviceType";
+    roles[IsInstalledRole] = "isInstalled";
+    roles[IsDefaultRole] = "isDefault";
     return roles;
 }
diff --git a/client/ui/models/containers_model.h b/client/ui/models/containers_model.h
index ba0fea57..c56511db 100644
--- a/client/ui/models/containers_model.h
+++ b/client/ui/models/containers_model.h
@@ -15,12 +15,13 @@ class ContainersModel : public QAbstractListModel
 public:
     ContainersModel(std::shared_ptr<Settings> settings, QObject *parent = nullptr);
 public:
-    enum SiteRoles {
+    enum ContainersModelRoles {
         NameRole = Qt::UserRole + 1,
         DescRole,
-        DefaultRole,
         ServiceTypeRole,
-        IsInstalledRole
+        ConfigRole,
+        IsInstalledRole,
+        IsDefaultRole
     };
 
     int rowCount(const QModelIndex &parent = QModelIndex()) const override;
@@ -32,6 +33,9 @@ public:
 
     Q_INVOKABLE QString getCurrentlyInstalledContainerName();
 
+public slots:
+    DockerContainer getDefaultContainer();
+
 protected:
     QHash<int, QByteArray> roleNames() const override;
 
diff --git a/client/ui/models/servers_model.cpp b/client/ui/models/servers_model.cpp
index 44ed2619..dccf59b9 100644
--- a/client/ui/models/servers_model.cpp
+++ b/client/ui/models/servers_model.cpp
@@ -37,36 +37,23 @@ QVariant ServersModel::data(const QModelIndex &index, int role) const
     const QJsonArray &servers = m_settings->serversArray();
     const QJsonObject server = servers.at(index.row()).toObject();
 
-    if (role == DescRole) {
+    switch (role) {
+    case DescRole: {
         auto description = server.value(config_key::description).toString();
         if (description.isEmpty()) {
             return server.value(config_key::hostName).toString();
         }
         return description;
     }
-    if (role == AddressRole) {
+    case AddressRole:
         return server.value(config_key::hostName).toString();
-    }
-    if (role == IsDefaultRole) {
+    case CredentialsRole:
+        return QVariant::fromValue(m_settings->serverCredentials(index.row()));
+    case IsDefaultRole:
         return index.row() == m_settings->defaultServerIndex();
     }
+
     return QVariant();
-
-
-//    if (!index.isValid() || index.row() < 0
-//            || index.row() >= static_cast<int>(m_data.size())) {
-//        return QVariant();
-//    }
-//    if (role == DescRole) {
-//        return m_data[index.row()].desc;
-//    }
-//    if (role == AddressRole) {
-//        return m_data[index.row()].address;
-//    }
-//    if (role == IsDefaultRole) {
-//        return m_data[index.row()].isDefault;
-//    }
-//    return QVariant();
 }
 
 void ServersModel::setDefaultServerIndex(int index)
diff --git a/client/ui/models/servers_model.h b/client/ui/models/servers_model.h
index cd46846b..30c8b5a2 100644
--- a/client/ui/models/servers_model.h
+++ b/client/ui/models/servers_model.h
@@ -18,6 +18,7 @@ public:
     enum ServersModelRoles {
         DescRole = Qt::UserRole + 1,
         AddressRole,
+        CredentialsRole,
         IsDefaultRole
     };
 
diff --git a/client/ui/qml/Components/ConnectButton.qml b/client/ui/qml/Components/ConnectButton.qml
new file mode 100644
index 00000000..5457cf55
--- /dev/null
+++ b/client/ui/qml/Components/ConnectButton.qml
@@ -0,0 +1,40 @@
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+
+Button {
+    id: root
+
+    implicitHeight: 190
+    implicitWidth: 190
+
+    background: Rectangle {
+        id: background
+
+        radius: parent.width * 0.5
+
+        color: "transparent"
+
+        border.width: 2
+        border.color: "white"
+    }
+
+    contentItem: Text {
+        height: 24
+
+        font.family: "PT Root UI VF"
+        font.weight: 700
+        font.pixelSize: 20
+
+        color: "#D7D8DB"
+        text: root.text
+
+        horizontalAlignment: Text.AlignHCenter
+        verticalAlignment: Text.AlignVCenter
+    }
+
+    onClicked: {
+        background.color = "red"
+        ConnectionController.onConnectionButtonClicked()
+    }
+}
diff --git a/client/ui/qml/Controls2/TextTypes/ButtonTextType.qml b/client/ui/qml/Controls2/TextTypes/ButtonTextType.qml
index 93a36578..d26594d6 100644
--- a/client/ui/qml/Controls2/TextTypes/ButtonTextType.qml
+++ b/client/ui/qml/Controls2/TextTypes/ButtonTextType.qml
@@ -5,7 +5,7 @@ Text {
 
     color: "#D7D8DB"
     font.pixelSize: 16
-    font.weight: 500
+    font.weight: Font.Medium
     font.family: "PT Root UI VF"
 
     wrapMode: Text.WordWrap
diff --git a/client/ui/qml/Controls2/TextTypes/Header1TextType.qml b/client/ui/qml/Controls2/TextTypes/Header1TextType.qml
index dbc04b6a..99addc7b 100644
--- a/client/ui/qml/Controls2/TextTypes/Header1TextType.qml
+++ b/client/ui/qml/Controls2/TextTypes/Header1TextType.qml
@@ -5,7 +5,7 @@ Text {
 
     color: "#D7D8DB"
     font.pixelSize: 36
-    font.weight: 700
+    font.weight: Font.Bold
     font.family: "PT Root UI VF"
     font.letterSpacing: -0.03
 
diff --git a/client/ui/qml/Controls2/TextTypes/Header2TextType.qml b/client/ui/qml/Controls2/TextTypes/Header2TextType.qml
index 1400ceb2..ed96f6f1 100644
--- a/client/ui/qml/Controls2/TextTypes/Header2TextType.qml
+++ b/client/ui/qml/Controls2/TextTypes/Header2TextType.qml
@@ -5,7 +5,7 @@ Text {
 
     color: "#D7D8DB"
     font.pixelSize: 25
-    font.weight: 700
+    font.weight: Font.Bold
     font.family: "PT Root UI VF"
 
     wrapMode: Text.WordWrap
diff --git a/client/ui/qml/Controls2/TextTypes/LabelTextType.qml b/client/ui/qml/Controls2/TextTypes/LabelTextType.qml
index 38649022..a2ffa18b 100644
--- a/client/ui/qml/Controls2/TextTypes/LabelTextType.qml
+++ b/client/ui/qml/Controls2/TextTypes/LabelTextType.qml
@@ -5,7 +5,7 @@ Text {
 
     color: "#878B91"
     font.pixelSize: 13
-    font.weight: 400
+    font.weight: Font.Normal
     font.family: "PT Root UI VF"
     font.letterSpacing: 0.02
 
diff --git a/client/ui/qml/Controls2/TextTypes/ParagraphTextType.qml b/client/ui/qml/Controls2/TextTypes/ParagraphTextType.qml
index 269830bc..74b155ab 100644
--- a/client/ui/qml/Controls2/TextTypes/ParagraphTextType.qml
+++ b/client/ui/qml/Controls2/TextTypes/ParagraphTextType.qml
@@ -5,7 +5,7 @@ Text {
 
     color: "#D7D8DB"
     font.pixelSize: 16
-    font.weight: 400
+    font.weight: Font.Normal
     font.family: "PT Root UI VF"
 
     wrapMode: Text.WordWrap
diff --git a/client/ui/qml/Pages2/PageHome.qml b/client/ui/qml/Pages2/PageHome.qml
index f4f4d13c..40eba148 100644
--- a/client/ui/qml/Pages2/PageHome.qml
+++ b/client/ui/qml/Pages2/PageHome.qml
@@ -12,6 +12,7 @@ import "../Pages"
 import "../Controls2"
 import "../Controls2/TextTypes"
 import "../Config"
+import "../Components"
 
 PageBase {
     id: root
@@ -24,6 +25,12 @@ PageBase {
     property string currentServerName: serversMenuContent.currentItem.delegateData.desc
     property string currentServerDescription: serversMenuContent.currentItem.delegateData.address
 
+    ConnectButton {
+        anchors.centerIn: parent
+
+        text: "Подключиться"
+    }
+
     Rectangle {
         id: buttonBackground
         anchors.fill: buttonContent
@@ -136,11 +143,11 @@ PageBase {
                     sourceModel: ContainersModel
                     filters: [
                         ValueFilter {
-                            roleName: "service_type_role"
+                            roleName: "serviceType"
                             value: ProtocolEnum.Vpn
                         },
                         ValueFilter {
-                            roleName: "is_installed_role"
+                            roleName: "isInstalled"
                             value: true
                         }
                     ]
@@ -153,7 +160,7 @@ PageBase {
 
                     borderWidth: 0
                     buttonImageColor: "#0E0E11"
-                    buttonMaximumWidth: 150
+                    buttonMaximumWidth: 150 //todo make it dynamic
 
                     defaultColor: "#D7D8DB"
 
@@ -183,7 +190,7 @@ PageBase {
 
                             checked: {
                                 if (modelData !== null) {
-                                    return modelData.default_role
+                                    return modelData.isDefault
                                 }
                                 return false
                             }
@@ -208,7 +215,7 @@ PageBase {
                                     // todo remove dirty hack?
                                     text: {
                                         if (modelData !== null) {
-                                            return modelData.name_role
+                                            return modelData.name
                                         } else
                                             return ""
                                     }
@@ -235,7 +242,7 @@ PageBase {
                             }
 
                             onClicked: {
-                                modelData.default_role = true
+                                modelData.isDefault = true
 
                                 containersDropDown.text = containerRadioButtonText.text
                                 containersDropDown.menuVisible = false
@@ -243,14 +250,16 @@ PageBase {
                         }
 
                         Component.onCompleted: {
-                            if (modelData !== null && modelData.default_role) {
-                                containersDropDown.text = modelData.name_role
+                            if (modelData !== null && modelData.isDefault) {
+                                containersDropDown.text = modelData.name
                             }
                         }
                     }
                 }
 
                 BasicButtonType {
+                    id: dnsButton
+
                     implicitHeight: 40
 
                     text: "Amnezia DNS"

From 116fa6777b400261f71aa9126e956febe09d37f2 Mon Sep 17 00:00:00 2001
From: "vladimir.kuznetsov" <nethiuswork@gmail.com>
Date: Sun, 14 May 2023 21:11:19 +0800
Subject: [PATCH 017/278] added logic to the connect to vpn button

---
 client/3rd/qtkeychain                         |  2 +-
 client/amnezia_application.cpp                |  8 +-
 client/images/connectionOff.svg               | 18 ++++
 client/images/connectionOn.svg                | 17 ++++
 client/images/connectionProgress.svg          | 30 +++++++
 client/protocols/openvpnovercloakprotocol.cpp |  4 +-
 client/protocols/openvpnprotocol.cpp          | 20 ++---
 client/protocols/shadowsocksvpnprotocol.cpp   |  4 +-
 client/protocols/vpnprotocol.cpp              | 34 +++----
 client/protocols/vpnprotocol.h                | 40 +++++++--
 client/protocols/wireguardprotocol.cpp        | 14 +--
 client/resources.qrc                          |  3 +
 .../ui/controllers/connectionController.cpp   | 10 ++-
 client/ui/controllers/connectionController.h  |  6 +-
 client/ui/notificationhandler.cpp             |  8 +-
 client/ui/notificationhandler.h               |  2 +-
 client/ui/pages_logic/SitesLogic.cpp          |  4 +-
 client/ui/pages_logic/VpnLogic.cpp            | 22 ++---
 client/ui/pages_logic/VpnLogic.h              |  2 +-
 client/ui/qml/Components/ConnectButton.qml    | 88 +++++++++++++++++--
 client/ui/qml/Pages2/PageHome.qml             |  2 -
 client/ui/qml/Pages2/PageStart.qml            | 10 +--
 client/ui/systemtray_notificationhandler.cpp  | 22 ++---
 client/ui/systemtray_notificationhandler.h    |  4 +-
 client/ui/uilogic.cpp                         |  6 +-
 client/vpnconnection.cpp                      | 32 +++----
 client/vpnconnection.h                        |  6 +-
 27 files changed, 293 insertions(+), 125 deletions(-)
 create mode 100644 client/images/connectionOff.svg
 create mode 100644 client/images/connectionOn.svg
 create mode 100644 client/images/connectionProgress.svg

diff --git a/client/3rd/qtkeychain b/client/3rd/qtkeychain
index c6f0b663..8bbaa6d8 160000
--- a/client/3rd/qtkeychain
+++ b/client/3rd/qtkeychain
@@ -1 +1 @@
-Subproject commit c6f0b66318f8da6917fb4681103f7303b1836194
+Subproject commit 8bbaa6d8302cf0747d9786ace4dd13c7fb746502
diff --git a/client/amnezia_application.cpp b/client/amnezia_application.cpp
index 6fadcabb..a8231fce 100644
--- a/client/amnezia_application.cpp
+++ b/client/amnezia_application.cpp
@@ -109,6 +109,9 @@ void AmneziaApplication::init()
     m_vpnConnection.reset(new VpnConnection(m_settings, m_configurator));
 
     m_connectionController.reset(new ConnectionController(m_serversModel, m_containersModel));
+
+    connect(m_vpnConnection.get(), &VpnConnection::connectionStateChanged,
+            m_connectionController.get(), &ConnectionController::connectionStateChanged);
     connect(m_connectionController.get(), &ConnectionController::connectToVpn,
             m_vpnConnection.get(), &VpnConnection::connectToVpn, Qt::QueuedConnection);
     connect(m_connectionController.get(), &ConnectionController::disconnectFromVpn,
@@ -156,7 +159,6 @@ void AmneziaApplication::init()
 
 void AmneziaApplication::registerTypes()
 {
-    qRegisterMetaType<VpnProtocol::VpnConnectionState>("VpnProtocol::VpnConnectionState");
     qRegisterMetaType<ServerCredentials>("ServerCredentials");
 
     qRegisterMetaType<DockerContainer>("DockerContainer");
@@ -164,7 +166,6 @@ void AmneziaApplication::registerTypes()
     qRegisterMetaType<Proto>("Proto");
     qRegisterMetaType<ServiceType>("ServiceType");
     qRegisterMetaType<Page>("Page");
-    qRegisterMetaType<VpnProtocol::VpnConnectionState>("ConnectionState");
 
     qRegisterMetaType<PageProtocolLogicBase *>("PageProtocolLogicBase *");
 
@@ -181,6 +182,9 @@ void AmneziaApplication::registerTypes()
 
     m_protocolProps = new ProtocolProps;
     qmlRegisterSingletonInstance("ProtocolProps", 1, 0, "ProtocolProps", m_protocolProps);
+
+    //
+    Vpn::declareQmlVpnConnectionStateEnum();
 }
 
 void AmneziaApplication::loadFonts()
diff --git a/client/images/connectionOff.svg b/client/images/connectionOff.svg
new file mode 100644
index 00000000..27905ff9
--- /dev/null
+++ b/client/images/connectionOff.svg
@@ -0,0 +1,18 @@
+<svg width="280" height="280" viewBox="0 0 280 280" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g filter="url(#filter0_f_1379_19114)">
+<circle cx="140" cy="140" r="107.5" stroke="#FBB36A"/>
+</g>
+<circle cx="140" cy="140" r="107" stroke="#FBB36A" stroke-width="2"/>
+<circle cx="140" cy="140" r="107" stroke="url(#paint0_linear_1379_19114)" stroke-width="2"/>
+<defs>
+<filter id="filter0_f_1379_19114" x="2" y="2" width="276" height="276" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feGaussianBlur stdDeviation="15" result="effect1_foregroundBlur_1379_19114"/>
+</filter>
+<linearGradient id="paint0_linear_1379_19114" x1="-2.43527" y1="89.3291" x2="192.652" y2="11.9798" gradientUnits="userSpaceOnUse">
+<stop stop-color="#E0AA84"/>
+<stop offset="1" stop-color="#DF7D37"/>
+</linearGradient>
+</defs>
+</svg>
diff --git a/client/images/connectionOn.svg b/client/images/connectionOn.svg
new file mode 100644
index 00000000..ef317622
--- /dev/null
+++ b/client/images/connectionOn.svg
@@ -0,0 +1,17 @@
+<svg width="280" height="280" viewBox="0 0 280 280" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g filter="url(#filter0_d_1379_19118)">
+<path d="M140 235C127.524 235 115.171 232.543 103.645 227.769C92.1191 222.994 81.6464 215.997 72.8248 207.175C64.0033 198.354 57.0056 187.881 52.2314 176.355C47.4572 164.829 45 152.476 45 140C45 127.524 47.4572 115.171 52.2314 103.645C57.0056 92.1191 64.0033 81.6464 72.8249 72.8248C81.6464 64.0033 92.1191 57.0056 103.645 52.2314C115.171 47.4572 127.524 45 140 45C152.476 45 164.829 47.4572 176.355 52.2314C187.881 57.0056 198.354 64.0033 207.175 72.8249C215.997 81.6464 222.994 92.1192 227.769 103.645C232.543 115.171 235 127.524 235 140C235 152.476 232.543 164.829 227.769 176.355C222.994 187.881 215.997 198.354 207.175 207.175C198.354 215.997 187.881 222.994 176.355 227.769C164.829 232.543 152.476 235 140 235L140 235Z" stroke="#D7D8DB" stroke-width="2" stroke-linecap="round"/>
+</g>
+<defs>
+<filter id="filter0_d_1379_19118" x="38" y="38" width="204" height="204" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="3"/>
+<feComposite in2="hardAlpha" operator="out"/>
+<feColorMatrix type="matrix" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 0.2 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_1379_19118"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_1379_19118" result="shape"/>
+</filter>
+</defs>
+</svg>
diff --git a/client/images/connectionProgress.svg b/client/images/connectionProgress.svg
new file mode 100644
index 00000000..8c4024c9
--- /dev/null
+++ b/client/images/connectionProgress.svg
@@ -0,0 +1,30 @@
+<svg width="280" height="280" viewBox="0 0 280 280" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g opacity="0.1" filter="url(#filter0_d_1379_19115)">
+<path d="M235 140C235 152.476 232.543 164.829 227.769 176.355C222.994 187.881 215.997 198.354 207.175 207.175C198.354 215.997 187.881 222.994 176.355 227.769C164.829 232.543 152.476 235 140 235C127.524 235 115.171 232.543 103.645 227.769C92.1191 222.994 81.6464 215.997 72.8249 207.175C64.0033 198.354 57.0056 187.881 52.2314 176.355C47.4572 164.829 45 152.476 45 140C45 127.524 47.4572 115.171 52.2314 103.645C57.0056 92.1191 64.0033 81.6464 72.8249 72.8248C81.6464 64.0033 92.1192 57.0056 103.645 52.2314C115.171 47.4572 127.524 45 140 45C152.476 45 164.829 47.4573 176.355 52.2314C187.881 57.0056 198.354 64.0033 207.175 72.8249C215.997 81.6464 222.994 92.1192 227.769 103.645C232.543 115.171 235 127.524 235 140L235 140Z" stroke="#FBB36A"/>
+</g>
+<g filter="url(#filter1_d_1379_19115)">
+<path d="M140 235C126.016 235 112.204 231.913 99.551 225.959C86.8977 220.004 75.7151 211.33 66.8012 200.555C57.8874 189.78 51.4623 177.17 47.9846 163.626C44.5069 150.081 44.0623 135.935 46.6827 122.199C49.3031 108.462 54.9237 95.4738 63.1434 84.1604C71.363 72.847 81.979 63.4878 94.2334 56.7509C106.488 50.014 120.078 46.0655 134.035 45.1875C147.991 44.3094 161.97 46.5233 174.972 51.6712" stroke="#D7D8DB" stroke-width="2" stroke-linecap="round"/>
+</g>
+<defs>
+<filter id="filter0_d_1379_19115" x="38.5" y="38.5" width="203" height="203" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="3"/>
+<feComposite in2="hardAlpha" operator="out"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.984314 0 0 0 0 0.717647 0 0 0 0 0.317647 0 0 0 1 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_1379_19115"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_1379_19115" result="shape"/>
+</filter>
+<filter id="filter1_d_1379_19115" x="38" y="38" width="143.973" height="204" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="3"/>
+<feComposite in2="hardAlpha" operator="out"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.988235 0 0 0 0 0.301961 0 0 0 0 0.0705883 0 0 0 0.49 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_1379_19115"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_1379_19115" result="shape"/>
+</filter>
+</defs>
+</svg>
diff --git a/client/protocols/openvpnovercloakprotocol.cpp b/client/protocols/openvpnovercloakprotocol.cpp
index 55939895..52bcae4b 100644
--- a/client/protocols/openvpnovercloakprotocol.cpp
+++ b/client/protocols/openvpnovercloakprotocol.cpp
@@ -66,7 +66,7 @@ ErrorCode OpenVpnOverCloakProtocol::start()
 
     m_errorHandlerConnection = connect(&m_ckProcess, QOverload<int, QProcess::ExitStatus>::of(&QProcess::finished), this, [this](int exitCode, QProcess::ExitStatus exitStatus){
         qDebug().noquote() << "OpenVpnOverCloakProtocol finished, exitCode, exiStatus" << exitCode << exitStatus;
-        setConnectionState(VpnProtocol::Disconnected);
+        setConnectionState(Vpn::ConnectionState::Disconnected);
         if (exitStatus != QProcess::NormalExit){
             emit protocolError(amnezia::ErrorCode::CloakExecutableCrashed);
             stop();
@@ -81,7 +81,7 @@ ErrorCode OpenVpnOverCloakProtocol::start()
     m_ckProcess.waitForStarted();
 
     if (m_ckProcess.state() == QProcess::ProcessState::Running) {
-        setConnectionState(VpnConnectionState::Connecting);
+        setConnectionState(Vpn::ConnectionState::Connecting);
 
         return OpenVpnProtocol::start();
     }
diff --git a/client/protocols/openvpnprotocol.cpp b/client/protocols/openvpnprotocol.cpp
index 150e84be..273d7b76 100644
--- a/client/protocols/openvpnprotocol.cpp
+++ b/client/protocols/openvpnprotocol.cpp
@@ -45,16 +45,16 @@ void OpenVpnProtocol::stop()
 
     // TODO: need refactoring
     // sendTermSignal() will even return true while server connected ???
-    if ((m_connectionState == VpnProtocol::Preparing) ||
-            (m_connectionState == VpnProtocol::Connecting) ||
-            (m_connectionState == VpnProtocol::Connected) ||
-            (m_connectionState == VpnProtocol::Reconnecting)) {
+    if ((m_connectionState == Vpn::ConnectionState::Preparing) ||
+            (m_connectionState == Vpn::ConnectionState::Connecting) ||
+            (m_connectionState == Vpn::ConnectionState::Connected) ||
+            (m_connectionState == Vpn::ConnectionState::Reconnecting)) {
         if (!sendTermSignal()) {
             killOpenVpnProcess();
         }
         m_managementServer.stop();
         qApp->processEvents();
-        setConnectionState(VpnProtocol::Disconnecting);
+        setConnectionState(Vpn::ConnectionState::Disconnecting);
     }
 }
 
@@ -175,7 +175,7 @@ ErrorCode OpenVpnProtocol::start()
         return lastError();
     }
 
-    setConnectionState(VpnConnectionState::Connecting);
+    setConnectionState(Vpn::ConnectionState::Connecting);
 
     m_openVpnProcess = IpcClient::CreatePrivilegedProcess();
 
@@ -208,7 +208,7 @@ ErrorCode OpenVpnProtocol::start()
     });
 
     connect(m_openVpnProcess.data(), &PrivilegedProcess::finished, this, [&]() {
-        setConnectionState(VpnConnectionState::Disconnected);
+        setConnectionState(Vpn::ConnectionState::Disconnected);
     });
 
     m_openVpnProcess->start();
@@ -256,14 +256,14 @@ void OpenVpnProtocol::onReadyReadDataFromManagementServer()
             if (line.contains("CONNECTED,SUCCESS")) {
                 sendByteCount();
                 stopTimeoutTimer();
-                setConnectionState(VpnProtocol::Connected);
+                setConnectionState(Vpn::ConnectionState::Connected);
                 continue;
             } else if (line.contains("EXITING,SIGTER")) {
                 //openVpnStateSigTermHandler();
-                setConnectionState(VpnProtocol::Disconnecting);
+                setConnectionState(Vpn::ConnectionState::Disconnecting);
                 continue;
             } else if (line.contains("RECONNECTING")) {
-                setConnectionState(VpnProtocol::Reconnecting);
+                setConnectionState(Vpn::ConnectionState::Reconnecting);
                 continue;
             }
         }
diff --git a/client/protocols/shadowsocksvpnprotocol.cpp b/client/protocols/shadowsocksvpnprotocol.cpp
index 82ae08b8..0ffc2768 100644
--- a/client/protocols/shadowsocksvpnprotocol.cpp
+++ b/client/protocols/shadowsocksvpnprotocol.cpp
@@ -66,7 +66,7 @@ ErrorCode ShadowSocksVpnProtocol::start()
 
     connect(&m_ssProcess, QOverload<int, QProcess::ExitStatus>::of(&QProcess::finished), this, [this](int exitCode, QProcess::ExitStatus exitStatus){
         qDebug().noquote() << "ShadowSocksVpnProtocol finished, exitCode, exiStatus" << exitCode << exitStatus;
-        setConnectionState(VpnProtocol::Disconnected);
+        setConnectionState(Vpn::ConnectionState::Disconnected);
         if (exitStatus != QProcess::NormalExit){
             emit protocolError(amnezia::ErrorCode::ShadowSocksExecutableCrashed);
             stop();
@@ -81,7 +81,7 @@ ErrorCode ShadowSocksVpnProtocol::start()
     m_ssProcess.waitForStarted();
 
     if (m_ssProcess.state() == QProcess::ProcessState::Running) {
-        setConnectionState(VpnConnectionState::Connecting);
+        setConnectionState(Vpn::ConnectionState::Connecting);
 
         return OpenVpnProtocol::start();
     }
diff --git a/client/protocols/vpnprotocol.cpp b/client/protocols/vpnprotocol.cpp
index a8f392e9..841d307c 100644
--- a/client/protocols/vpnprotocol.cpp
+++ b/client/protocols/vpnprotocol.cpp
@@ -18,7 +18,7 @@
 
 VpnProtocol::VpnProtocol(const QJsonObject &configuration, QObject* parent)
     : QObject(parent),
-      m_connectionState(VpnConnectionState::Unknown),
+      m_connectionState(Vpn::ConnectionState::Unknown),
       m_rawConfig(configuration),
       m_timeoutTimer(new QTimer(this)),
       m_receivedBytes(0),
@@ -32,7 +32,7 @@ void VpnProtocol::setLastError(ErrorCode lastError)
 {
     m_lastError = lastError;
     if (lastError){
-        setConnectionState(VpnConnectionState::Error);
+        setConnectionState(Vpn::ConnectionState::Error);
     }
     qCritical().noquote() << "VpnProtocol error, code" << m_lastError << errorString(m_lastError);
 }
@@ -60,7 +60,7 @@ void VpnProtocol::stopTimeoutTimer()
     m_timeoutTimer->stop();
 }
 
-VpnProtocol::VpnConnectionState VpnProtocol::connectionState() const
+Vpn::ConnectionState VpnProtocol::connectionState() const
 {
     return m_connectionState;
 }
@@ -76,19 +76,19 @@ void VpnProtocol::setBytesChanged(quint64 receivedBytes, quint64 sentBytes)
     m_sentBytes = sentBytes;
 }
 
-void VpnProtocol::setConnectionState(VpnProtocol::VpnConnectionState state)
+void VpnProtocol::setConnectionState(Vpn::ConnectionState state)
 {
     qDebug() << "VpnProtocol::setConnectionState" << textConnectionState(state);
 
     if (m_connectionState == state) {
         return;
     }
-    if (m_connectionState == VpnConnectionState::Disconnected && state == VpnConnectionState::Disconnecting) {
+    if (m_connectionState == Vpn::ConnectionState::Disconnected && state == Vpn::ConnectionState::Disconnecting) {
         return;
     }
 
     m_connectionState = state;
-    if (m_connectionState == VpnConnectionState::Disconnected) {
+    if (m_connectionState == Vpn::ConnectionState::Disconnected) {
         m_receivedBytes = 0;
         m_sentBytes = 0;
     }
@@ -124,17 +124,17 @@ QString VpnProtocol::routeGateway() const
     return m_routeGateway;
 }
 
-QString VpnProtocol::textConnectionState(VpnConnectionState connectionState)
+QString VpnProtocol::textConnectionState(Vpn::ConnectionState connectionState)
 {
     switch (connectionState) {
-    case VpnConnectionState::Unknown: return tr("Unknown");
-    case VpnConnectionState::Disconnected: return tr("Disconnected");
-    case VpnConnectionState::Preparing: return tr("Preparing");
-    case VpnConnectionState::Connecting: return tr("Connecting...");
-    case VpnConnectionState::Connected: return tr("Connected");
-    case VpnConnectionState::Disconnecting: return tr("Disconnecting...");
-    case VpnConnectionState::Reconnecting: return tr("Reconnecting...");
-    case VpnConnectionState::Error: return tr("Error");
+    case Vpn::ConnectionState::Unknown: return tr("Unknown");
+    case Vpn::ConnectionState::Disconnected: return tr("Disconnected");
+    case Vpn::ConnectionState::Preparing: return tr("Preparing");
+    case Vpn::ConnectionState::Connecting: return tr("Connecting...");
+    case Vpn::ConnectionState::Connected: return tr("Connected");
+    case Vpn::ConnectionState::Disconnecting: return tr("Disconnecting...");
+    case Vpn::ConnectionState::Reconnecting: return tr("Reconnecting...");
+    case Vpn::ConnectionState::Error: return tr("Error");
     default:
         ;
     }
@@ -149,10 +149,10 @@ QString VpnProtocol::textConnectionState() const
 
 bool VpnProtocol::isConnected() const
 {
-    return m_connectionState == VpnConnectionState::Connected;
+    return m_connectionState == Vpn::ConnectionState::Connected;
 }
 
 bool VpnProtocol::isDisconnected() const
 {
-    return m_connectionState == VpnConnectionState::Disconnected;
+    return m_connectionState == Vpn::ConnectionState::Disconnected;
 }
diff --git a/client/protocols/vpnprotocol.h b/client/protocols/vpnprotocol.h
index 4b6876d5..bb71a5de 100644
--- a/client/protocols/vpnprotocol.h
+++ b/client/protocols/vpnprotocol.h
@@ -12,6 +12,33 @@ using namespace amnezia;
 
 class QTimer;
 
+//todo change name
+namespace Vpn
+{
+    Q_NAMESPACE
+    enum ConnectionState {
+        Unknown,
+        Disconnected,
+        Preparing,
+        Connecting,
+        Connected,
+        Disconnecting,
+        Reconnecting,
+        Error
+    };
+    Q_ENUM_NS(ConnectionState)
+
+    static void declareQmlVpnConnectionStateEnum() {
+        qmlRegisterUncreatableMetaObject(
+            Vpn::staticMetaObject,
+            "ConnectionState",
+            1, 0,
+            "ConnectionState",
+            "Error: only enums"
+            );
+    }
+}
+
 class VpnProtocol : public QObject
 {
     Q_OBJECT
@@ -20,10 +47,7 @@ public:
     explicit VpnProtocol(const QJsonObject& configuration, QObject* parent = nullptr);
     virtual ~VpnProtocol() override = default;
 
-    enum VpnConnectionState {Unknown, Disconnected, Preparing, Connecting, Connected, Disconnecting, Reconnecting, Error};
-    Q_ENUM(VpnConnectionState)
-
-    static QString textConnectionState(VpnConnectionState connectionState);
+    static QString textConnectionState(Vpn::ConnectionState connectionState);
 
     virtual ErrorCode prepare() { return ErrorCode::NoError; }
 
@@ -32,7 +56,7 @@ public:
     virtual ErrorCode start() = 0;
     virtual void stop() = 0;
 
-    VpnConnectionState connectionState() const;
+    Vpn::ConnectionState connectionState() const;
     ErrorCode lastError() const;
     QString textConnectionState() const;
     void setLastError(ErrorCode lastError);
@@ -44,7 +68,7 @@ public:
 
 signals:
     void bytesChanged(quint64 receivedBytes, quint64 sentBytes);
-    void connectionStateChanged(VpnProtocol::VpnConnectionState state);
+    void connectionStateChanged(Vpn::ConnectionState state);
     void timeoutTimerEvent();
     void protocolError(amnezia::ErrorCode e);
 
@@ -52,13 +76,13 @@ public slots:
     virtual void onTimeout(); // todo: remove?
 
     void setBytesChanged(quint64 receivedBytes, quint64 sentBytes);
-    void setConnectionState(VpnProtocol::VpnConnectionState state);
+    void setConnectionState(Vpn::ConnectionState state);
 
 protected:
     void startTimeoutTimer();
     void stopTimeoutTimer();
 
-    VpnConnectionState m_connectionState;
+    Vpn::ConnectionState m_connectionState;
 
     QString m_routeGateway;
     QString m_vpnLocalAddress;
diff --git a/client/protocols/wireguardprotocol.cpp b/client/protocols/wireguardprotocol.cpp
index 666bf80d..4f66f5a1 100644
--- a/client/protocols/wireguardprotocol.cpp
+++ b/client/protocols/wireguardprotocol.cpp
@@ -51,7 +51,7 @@ void WireguardProtocol::stop()
 
     connect(m_wireguardStopProcess.data(), &PrivilegedProcess::errorOccurred, this, [this](QProcess::ProcessError error) {
         qDebug() << "WireguardProtocol::WireguardProtocol Stop errorOccurred" << error;
-        setConnectionState(VpnConnectionState::Disconnected);
+        setConnectionState(Vpn::ConnectionState::Disconnected);
     });
 
     connect(m_wireguardStopProcess.data(), &PrivilegedProcess::stateChanged, this, [this](QProcess::ProcessState newState) {
@@ -62,12 +62,12 @@ void WireguardProtocol::stop()
     if (IpcClient::Interface()) {
         QRemoteObjectPendingReply<bool> result = IpcClient::Interface()->isWireguardRunning();
         if (result.returnValue()) {
-            setConnectionState(VpnProtocol::Disconnected);
+            setConnectionState(Vpn::ConnectionState::Disconnected);
             return;
         }
     } else {
         qCritical() << "IPC client not initialized";
-        setConnectionState(VpnProtocol::Disconnected);
+        setConnectionState(Vpn::ConnectionState::Disconnected);
         return;
     }
 #endif
@@ -75,7 +75,7 @@ void WireguardProtocol::stop()
     m_wireguardStopProcess->start();
     m_wireguardStopProcess->waitForFinished(10000);
 
-    setConnectionState(VpnProtocol::Disconnected);
+    setConnectionState(Vpn::ConnectionState::Disconnected);
 #endif
 }
 
@@ -156,7 +156,7 @@ ErrorCode WireguardProtocol::start()
         return lastError();
     }
 
-    setConnectionState(VpnConnectionState::Connecting);
+    setConnectionState(Vpn::ConnectionState::Connecting);
 
     m_wireguardStartProcess = IpcClient::CreatePrivilegedProcess();
 
@@ -179,7 +179,7 @@ ErrorCode WireguardProtocol::start()
 
     connect(m_wireguardStartProcess.data(), &PrivilegedProcess::errorOccurred, this, [this](QProcess::ProcessError error) {
         qDebug() << "WireguardProtocol::WireguardProtocol errorOccurred" << error;
-        setConnectionState(VpnConnectionState::Disconnected);
+        setConnectionState(Vpn::ConnectionState::Disconnected);
     });
 
     connect(m_wireguardStartProcess.data(), &PrivilegedProcess::stateChanged, this, [this](QProcess::ProcessState newState) {
@@ -187,7 +187,7 @@ ErrorCode WireguardProtocol::start()
     });
 
     connect(m_wireguardStartProcess.data(), &PrivilegedProcess::finished, this, [this]() {
-        setConnectionState(VpnConnectionState::Connected);
+        setConnectionState(Vpn::ConnectionState::Connected);
     });
 
     connect(m_wireguardStartProcess.data(), &PrivilegedProcess::readyRead, this, [this]() {
diff --git a/client/resources.qrc b/client/resources.qrc
index 1ea7bf38..f75c8132 100644
--- a/client/resources.qrc
+++ b/client/resources.qrc
@@ -223,5 +223,8 @@
         <file>ui/qml/Controls2/Header2Type.qml</file>
         <file>images/controls/plus.svg</file>
         <file>ui/qml/Components/ConnectButton.qml</file>
+        <file>images/connectionProgress.svg</file>
+        <file>images/connectionOff.svg</file>
+        <file>images/connectionOn.svg</file>
     </qresource>
 </RCC>
diff --git a/client/ui/controllers/connectionController.cpp b/client/ui/controllers/connectionController.cpp
index 41dbed64..ce52a2c8 100644
--- a/client/ui/controllers/connectionController.cpp
+++ b/client/ui/controllers/connectionController.cpp
@@ -11,13 +11,18 @@ ConnectionController::ConnectionController(const QSharedPointer<ServersModel> &s
 
 bool ConnectionController::onConnectionButtonClicked()
 {
-    if (!isConnected) {
+    if (!isConnected()) {
         openVpnConnection();
     } else {
         closeVpnConnection();
     }
 }
 
+bool ConnectionController::isConnected()
+{
+    return m_isConnected;
+}
+
 bool ConnectionController::openVpnConnection()
 {
     int serverIndex = m_serversModel->getDefaultServerIndex();
@@ -33,7 +38,7 @@ bool ConnectionController::openVpnConnection()
     //todo error handling
     qApp->processEvents();
     emit connectToVpn(serverIndex, credentials, container, containerConfig);
-    isConnected = true;
+    m_isConnected = true;
 
 
 //    int serverIndex = m_settings->defaultServerIndex();
@@ -67,5 +72,6 @@ bool ConnectionController::openVpnConnection()
 bool ConnectionController::closeVpnConnection()
 {
     emit disconnectFromVpn();
+    m_isConnected = false;
 }
 
diff --git a/client/ui/controllers/connectionController.h b/client/ui/controllers/connectionController.h
index 125e9204..8282a582 100644
--- a/client/ui/controllers/connectionController.h
+++ b/client/ui/controllers/connectionController.h
@@ -3,6 +3,7 @@
 
 #include "ui/models/servers_model.h"
 #include "ui/models/containers_model.h"
+#include "protocols/vpnprotocol.h"
 
 class ConnectionController : public QObject
 {
@@ -16,9 +17,12 @@ public:
 public slots:
     bool onConnectionButtonClicked();
 
+    bool isConnected();
+
 signals:
     void connectToVpn(int serverIndex, const ServerCredentials &credentials, DockerContainer container, const QJsonObject &containerConfig);
     void disconnectFromVpn();
+    void connectionStateChanged(Vpn::ConnectionState state);
 
 private:
     bool openVpnConnection();
@@ -27,7 +31,7 @@ private:
     QSharedPointer<ServersModel> m_serversModel;
     QSharedPointer<ContainersModel> m_containersModel;
 
-    bool isConnected = false;
+    bool m_isConnected = false;
 };
 
 #endif // CONNECTIONCONTROLLER_H
diff --git a/client/ui/notificationhandler.cpp b/client/ui/notificationhandler.cpp
index 779569d7..f932eb17 100644
--- a/client/ui/notificationhandler.cpp
+++ b/client/ui/notificationhandler.cpp
@@ -52,9 +52,9 @@ NotificationHandler::~NotificationHandler() {
     s_instance = nullptr;
 }
 
-void NotificationHandler::setConnectionState(VpnProtocol::VpnConnectionState state)
+void NotificationHandler::setConnectionState(Vpn::ConnectionState state)
 {
-    if (state != VpnProtocol::Connected && state != VpnProtocol::Disconnected) {
+    if (state != Vpn::ConnectionState::Connected && state != Vpn::ConnectionState::Disconnected) {
         return;
     }
 
@@ -62,14 +62,14 @@ void NotificationHandler::setConnectionState(VpnProtocol::VpnConnectionState sta
     QString message;
 
     switch (state) {
-    case VpnProtocol::VpnConnectionState::Connected:
+    case Vpn::ConnectionState::Connected:
         m_connected = true;
 
         title = tr("AmneziaVPN");
         message = tr("VPN Connected");
         break;
 
-    case VpnProtocol::VpnConnectionState::Disconnected:
+    case Vpn::ConnectionState::Disconnected:
         if (m_connected) {
             m_connected = false;
             title = tr("AmneziaVPN");
diff --git a/client/ui/notificationhandler.h b/client/ui/notificationhandler.h
index b87e9575..9a2182de 100644
--- a/client/ui/notificationhandler.h
+++ b/client/ui/notificationhandler.h
@@ -31,7 +31,7 @@ public:
     void messageClickHandle();
 
 public slots:
-    virtual void setConnectionState(VpnProtocol::VpnConnectionState state);
+    virtual void setConnectionState(Vpn::ConnectionState state);
 
 signals:
     void notificationShown(const QString& title, const QString& message);
diff --git a/client/ui/pages_logic/SitesLogic.cpp b/client/ui/pages_logic/SitesLogic.cpp
index 17357073..bf926e56 100644
--- a/client/ui/pages_logic/SitesLogic.cpp
+++ b/client/ui/pages_logic/SitesLogic.cpp
@@ -116,14 +116,14 @@ void SitesLogic::onPushButtonSitesDeleteClicked(QStringList items)
         if (!ok || row < 0 || row >= siteModel->rowCount()) return;
         sites.append(siteModel->data(row, 0).toString());
 
-        if (uiLogic()->m_vpnConnection->connectionState() == VpnProtocol::Connected) {
+        if (uiLogic()->m_vpnConnection->connectionState() == Vpn::ConnectionState::Connected) {
             ips.append(siteModel->data(row, 1).toString());
         }
     }
 
     m_settings->removeVpnSites(mode, sites);
 
-    if (uiLogic()->m_vpnConnection->connectionState() == VpnProtocol::Connected) {
+    if (uiLogic()->m_vpnConnection->connectionState() == Vpn::ConnectionState::Connected) {
         uiLogic()->m_vpnConnection->deleteRoutes(ips);
         uiLogic()->m_vpnConnection->flushDns();
     }
diff --git a/client/ui/pages_logic/VpnLogic.cpp b/client/ui/pages_logic/VpnLogic.cpp
index d3df1a08..4db54244 100644
--- a/client/ui/pages_logic/VpnLogic.cpp
+++ b/client/ui/pages_logic/VpnLogic.cpp
@@ -42,7 +42,7 @@ VpnLogic::VpnLogic(UiLogic *logic, QObject *parent):
         });
     }
     else {
-        onConnectionStateChanged(VpnProtocol::Disconnected);
+        onConnectionStateChanged(Vpn::ConnectionState::Disconnected);
     }
 }
 
@@ -119,7 +119,7 @@ void VpnLogic::onBytesChanged(quint64 receivedData, quint64 sentData)
     set_labelSpeedSentText(VpnConnection::bytesPerSecToText(sentData));
 }
 
-void VpnLogic::onConnectionStateChanged(VpnProtocol::VpnConnectionState state)
+void VpnLogic::onConnectionStateChanged(Vpn::ConnectionState state)
 {
     qDebug() << "VpnLogic::onConnectionStateChanged" << VpnProtocol::textConnectionState(state);
     if (uiLogic()->m_vpnConnection == NULL) {
@@ -134,50 +134,50 @@ void VpnLogic::onConnectionStateChanged(VpnProtocol::VpnConnectionState state)
     set_labelStateText(VpnProtocol::textConnectionState(state));
 
     switch (state) {
-    case VpnProtocol::Disconnected:
+    case Vpn::ConnectionState::Disconnected:
         onBytesChanged(0,0);
         pbConnectChecked = false;
         pbConnectEnabled = true;
         pbConnectVisible = true;
         rbModeEnabled = true;
         break;
-    case VpnProtocol::Preparing:
+    case Vpn::ConnectionState::Preparing:
         pbConnectChecked = true;
         pbConnectEnabled = false;
         pbConnectVisible = false;
         rbModeEnabled = false;
         break;
-    case VpnProtocol::Connecting:
+    case Vpn::ConnectionState::Connecting:
         pbConnectChecked = true;
         pbConnectEnabled = false;
         pbConnectVisible = false;
         rbModeEnabled = false;
         break;
-    case VpnProtocol::Connected:
+    case Vpn::ConnectionState::Connected:
         pbConnectChecked = true;
         pbConnectEnabled = true;
         pbConnectVisible = true;
         rbModeEnabled = false;
         break;
-    case VpnProtocol::Disconnecting:
+    case Vpn::ConnectionState::Disconnecting:
         pbConnectChecked = false;
         pbConnectEnabled = false;
         pbConnectVisible = false;
         rbModeEnabled = false;
         break;
-    case VpnProtocol::Reconnecting:
+    case Vpn::ConnectionState::Reconnecting:
         pbConnectChecked = true;
         pbConnectEnabled = true;
         pbConnectVisible = false;
         rbModeEnabled = false;
         break;
-    case VpnProtocol::Error:
+    case Vpn::ConnectionState::Error:
         pbConnectChecked = false;
         pbConnectEnabled = true;
         pbConnectVisible = true;
         rbModeEnabled = true;
         break;
-    case VpnProtocol::Unknown:
+    case Vpn::ConnectionState::Unknown:
         pbConnectChecked = false;
         pbConnectEnabled = true;
         pbConnectVisible = true;
@@ -241,6 +241,6 @@ void VpnLogic::onConnectWorker(int serverIndex, const ServerCredentials &credent
 
 void VpnLogic::onDisconnect()
 {
-    onConnectionStateChanged(VpnProtocol::Disconnected);
+    onConnectionStateChanged(Vpn::ConnectionState::Disconnected);
     emit disconnectFromVpn();
 }
diff --git a/client/ui/pages_logic/VpnLogic.h b/client/ui/pages_logic/VpnLogic.h
index f7b21be2..a0f7763b 100644
--- a/client/ui/pages_logic/VpnLogic.h
+++ b/client/ui/pages_logic/VpnLogic.h
@@ -58,7 +58,7 @@ public slots:
     void onDisconnect();
 
     void onBytesChanged(quint64 receivedBytes, quint64 sentBytes);
-    void onConnectionStateChanged(VpnProtocol::VpnConnectionState state);
+    void onConnectionStateChanged(Vpn::ConnectionState state);
     void onVpnProtocolError(amnezia::ErrorCode errorCode);
 
 signals:
diff --git a/client/ui/qml/Components/ConnectButton.qml b/client/ui/qml/Components/ConnectButton.qml
index 5457cf55..bce652d8 100644
--- a/client/ui/qml/Components/ConnectButton.qml
+++ b/client/ui/qml/Components/ConnectButton.qml
@@ -2,21 +2,40 @@ import QtQuick
 import QtQuick.Controls
 import QtQuick.Layouts
 
+import ConnectionState 1.0
+
 Button {
     id: root
 
-    implicitHeight: 190
-    implicitWidth: 190
+    property var isConnected: ConnectionController.isConnected
 
-    background: Rectangle {
-        id: background
+    text: "Подключиться"
 
-        radius: parent.width * 0.5
+//    implicitHeight: 190
+//    implicitWidth: 190
 
-        color: "transparent"
+//    color: "transparent"
 
-        border.width: 2
-        border.color: "white"
+    background: Image {
+        id: border
+
+        source: connectionProccess.running ? "/images/connectionProgress.svg" :
+                                             ConnectionController.isConnected() ? "/images/connectionOff.svg" : "/images/connectionOn.svg"
+
+        RotationAnimator {
+            id: connectionProccess
+
+            target: border
+            running: false
+            from: 0
+            to: 360
+            loops: Animation.Infinite
+            duration: 1250
+        }
+
+        Behavior on source {
+            PropertyAnimation { duration: 200 }
+        }
     }
 
     contentItem: Text {
@@ -34,7 +53,58 @@ Button {
     }
 
     onClicked: {
-        background.color = "red"
         ConnectionController.onConnectionButtonClicked()
+        console.log(connectionProccess.from)
+    }
+
+    Connections {
+        target: ConnectionController
+        function onConnectionStateChanged(state) {
+            switch(state) {
+            case ConnectionState.Unknown: {
+                console.log("Unknown")
+                break
+            }
+            case ConnectionState.Disconnected: {
+                console.log("Disconnected")
+                connectionProccess.running = false
+                root.text = "Подключиться"
+                break
+            }
+            case ConnectionState.Preparing: {
+                console.log("Preparing")
+                break
+            }
+            case ConnectionState.Connecting: {
+                console.log("Connecting")
+                connectionProccess.running = true
+                root.text = "Подключение..."
+                break
+            }
+            case ConnectionState.Connected: {
+                console.log("Connected")
+                connectionProccess.running = false
+                root.text = "Подключено"
+                break
+            }
+            case ConnectionState.Disconnecting: {
+                console.log("Disconnecting")
+                connectionProccess.running = true
+                root.text = "Отключение..."
+                break
+            }
+            case ConnectionState.Reconnecting: {
+                console.log("Reconnecting")
+                connectionProccess.running = true
+                root.text = "Переподключение..."
+                break
+            }
+            case ConnectionState.Error: {
+                console.log("Error")
+                connectionProccess.running = false
+                break
+            }
+            }
+        }
     }
 }
diff --git a/client/ui/qml/Pages2/PageHome.qml b/client/ui/qml/Pages2/PageHome.qml
index 40eba148..5dd0aaae 100644
--- a/client/ui/qml/Pages2/PageHome.qml
+++ b/client/ui/qml/Pages2/PageHome.qml
@@ -27,8 +27,6 @@ PageBase {
 
     ConnectButton {
         anchors.centerIn: parent
-
-        text: "Подключиться"
     }
 
     Rectangle {
diff --git a/client/ui/qml/Pages2/PageStart.qml b/client/ui/qml/Pages2/PageStart.qml
index 9e94ed28..220c6f19 100644
--- a/client/ui/qml/Pages2/PageStart.qml
+++ b/client/ui/qml/Pages2/PageStart.qml
@@ -23,14 +23,8 @@ PageBase {
         anchors.left: parent.left
         anchors.bottom: tabBar.top
 
-        width: {
-            console.log(parent.width)
-            return parent.width
-        }
-        height: {
-            console.log(root.height - tabBar.implicitHeight)
-            return root.height - tabBar.implicitHeight
-        }
+        width: parent.width
+        height: root.height - tabBar.implicitHeight
 
         PageHome {
         }
diff --git a/client/ui/systemtray_notificationhandler.cpp b/client/ui/systemtray_notificationhandler.cpp
index e142caf5..25ff9f6c 100644
--- a/client/ui/systemtray_notificationhandler.cpp
+++ b/client/ui/systemtray_notificationhandler.cpp
@@ -45,13 +45,13 @@ SystemTrayNotificationHandler::SystemTrayNotificationHandler(QObject* parent) :
     });
 
     m_systemTrayIcon.setContextMenu(&m_menu);
-    setTrayState(VpnProtocol::Disconnected);
+    setTrayState(Vpn::ConnectionState::Disconnected);
 }
 
 SystemTrayNotificationHandler::~SystemTrayNotificationHandler() {
 }
 
-void SystemTrayNotificationHandler::setConnectionState(VpnProtocol::VpnConnectionState state)
+void SystemTrayNotificationHandler::setConnectionState(Vpn::ConnectionState state)
 {
     setTrayState(state);
     NotificationHandler::setConnectionState(state);
@@ -73,47 +73,47 @@ void SystemTrayNotificationHandler::onTrayActivated(QSystemTrayIcon::ActivationR
 #endif
 }
 
-void SystemTrayNotificationHandler::setTrayState(VpnProtocol::VpnConnectionState state)
+void SystemTrayNotificationHandler::setTrayState(Vpn::ConnectionState state)
 {
     QString resourcesPath = ":/images/tray/%1";
 
     switch (state) {
-    case VpnProtocol::Disconnected:
+    case Vpn::ConnectionState::Disconnected:
         setTrayIcon(QString(resourcesPath).arg(DisconnectedTrayIconName));
         m_trayActionConnect->setEnabled(true);
         m_trayActionDisconnect->setEnabled(false);
         break;
-    case VpnProtocol::Preparing:
+    case Vpn::ConnectionState::Preparing:
         setTrayIcon(QString(resourcesPath).arg(DisconnectedTrayIconName));
         m_trayActionConnect->setEnabled(false);
         m_trayActionDisconnect->setEnabled(true);
         break;
-    case VpnProtocol::Connecting:
+    case Vpn::ConnectionState::Connecting:
         setTrayIcon(QString(resourcesPath).arg(DisconnectedTrayIconName));
         m_trayActionConnect->setEnabled(false);
         m_trayActionDisconnect->setEnabled(true);
         break;
-    case VpnProtocol::Connected:
+    case Vpn::ConnectionState::Connected:
         setTrayIcon(QString(resourcesPath).arg(ConnectedTrayIconName));
         m_trayActionConnect->setEnabled(false);
         m_trayActionDisconnect->setEnabled(true);
         break;
-    case VpnProtocol::Disconnecting:
+    case Vpn::ConnectionState::Disconnecting:
         setTrayIcon(QString(resourcesPath).arg(DisconnectedTrayIconName));
         m_trayActionConnect->setEnabled(false);
         m_trayActionDisconnect->setEnabled(true);
         break;
-    case VpnProtocol::Reconnecting:
+    case Vpn::ConnectionState::Reconnecting:
         setTrayIcon(QString(resourcesPath).arg(DisconnectedTrayIconName));
         m_trayActionConnect->setEnabled(false);
         m_trayActionDisconnect->setEnabled(true);
         break;
-    case VpnProtocol::Error:
+    case Vpn::ConnectionState::Error:
         setTrayIcon(QString(resourcesPath).arg(ErrorTrayIconName));
         m_trayActionConnect->setEnabled(true);
         m_trayActionDisconnect->setEnabled(false);
         break;
-    case VpnProtocol::Unknown:
+    case Vpn::ConnectionState::Unknown:
     default:
         m_trayActionConnect->setEnabled(false);
         m_trayActionDisconnect->setEnabled(true);
diff --git a/client/ui/systemtray_notificationhandler.h b/client/ui/systemtray_notificationhandler.h
index 46563bde..96134f14 100644
--- a/client/ui/systemtray_notificationhandler.h
+++ b/client/ui/systemtray_notificationhandler.h
@@ -17,7 +17,7 @@ public:
     explicit SystemTrayNotificationHandler(QObject* parent);
     ~SystemTrayNotificationHandler();
 
-    void setConnectionState(VpnProtocol::VpnConnectionState state) override;
+    void setConnectionState(Vpn::ConnectionState state) override;
 
 protected:
     virtual void notify(Message type, const QString& title,
@@ -26,7 +26,7 @@ protected:
 private:
     void showHideWindow();
 
-    void setTrayState(VpnProtocol::VpnConnectionState state);
+    void setTrayState(Vpn::ConnectionState state);
     void onTrayActivated(QSystemTrayIcon::ActivationReason reason);
 
     void setTrayIcon(const QString &iconPath);
diff --git a/client/ui/uilogic.cpp b/client/ui/uilogic.cpp
index bb2f90b2..929d84d6 100644
--- a/client/ui/uilogic.cpp
+++ b/client/ui/uilogic.cpp
@@ -107,7 +107,7 @@ UiLogic::~UiLogic()
     emit hide();
 
 #ifdef AMNEZIA_DESKTOP
-    if (m_vpnConnection->connectionState() != VpnProtocol::VpnConnectionState::Disconnected) {
+    if (m_vpnConnection->connectionState() != Vpn::ConnectionState::Disconnected) {
         m_vpnConnection->disconnectFromVpn();
         for (int i = 0; i < 50; i++) {
             qApp->processEvents(QEventLoop::ExcludeUserInputEvents);
@@ -131,13 +131,13 @@ void UiLogic::initializeUiLogic()
 #ifdef Q_OS_ANDROID
     connect(AndroidController::instance(), &AndroidController::initialized, [this](bool status, bool connected, const QDateTime& connectionDate) {
         if (connected) {
-            pageLogic<VpnLogic>()->onConnectionStateChanged(VpnProtocol::Connected);
+            pageLogic<VpnLogic>()->onConnectionStateChanged(Vpn::ConnectionState::Connected);
             m_vpnConnection->restoreConnection();
         }
     });
     if (!AndroidController::instance()->initialize(pageLogic<StartPageLogic>())) {
          qCritical() << QString("Init failed") ;
-         emit VpnProtocol::Error;
+         emit Vpn::ConnectionState::Error;
          return;
     }
 #endif
diff --git a/client/vpnconnection.cpp b/client/vpnconnection.cpp
index 57d20127..468a6d96 100644
--- a/client/vpnconnection.cpp
+++ b/client/vpnconnection.cpp
@@ -50,12 +50,12 @@ void VpnConnection::onBytesChanged(quint64 receivedBytes, quint64 sentBytes)
     emit bytesChanged(receivedBytes, sentBytes);
 }
 
-void VpnConnection::onConnectionStateChanged(VpnProtocol::VpnConnectionState state)
+void VpnConnection::onConnectionStateChanged(Vpn::ConnectionState state)
 {
 
 #ifdef AMNEZIA_DESKTOP
     if (IpcClient::Interface()) {
-        if (state == VpnProtocol::Connected){
+        if (state == Vpn::ConnectionState::Connected){
             IpcClient::Interface()->resetIpStack();
             IpcClient::Interface()->flushDns();
 
@@ -85,7 +85,7 @@ void VpnConnection::onConnectionStateChanged(VpnProtocol::VpnConnectionState sta
 
 
         }
-        else if (state == VpnProtocol::Error) {
+        else if (state == Vpn::ConnectionState::Error) {
             IpcClient::Interface()->flushDns();
 
             if (m_settings->routeMode() == Settings::VpnOnlyForwardSites) {
@@ -96,7 +96,7 @@ void VpnConnection::onConnectionStateChanged(VpnProtocol::VpnConnectionState sta
 #endif
 
 #ifdef Q_OS_IOS
-    if (state == VpnProtocol::Connected){
+    if (state == Vpn::ConnectionState::Connected){
         m_isIOSConnected = true;
         checkIOSStatus();
     }
@@ -179,7 +179,7 @@ QSharedPointer<VpnProtocol> VpnConnection::vpnProtocol() const
 void VpnConnection::addRoutes(const QStringList &ips)
 {
 #ifdef AMNEZIA_DESKTOP
-    if (connectionState() == VpnProtocol::Connected && IpcClient::Interface()) {
+    if (connectionState() == Vpn::ConnectionState::Connected && IpcClient::Interface()) {
         if (m_settings->routeMode() == Settings::VpnOnlyForwardSites) {
             IpcClient::Interface()->routeAddList(m_vpnProtocol->vpnGateway(), ips);
         }
@@ -193,7 +193,7 @@ void VpnConnection::addRoutes(const QStringList &ips)
 void VpnConnection::deleteRoutes(const QStringList &ips)
 {
 #ifdef AMNEZIA_DESKTOP
-    if (connectionState() == VpnProtocol::Connected && IpcClient::Interface()) {
+    if (connectionState() == Vpn::ConnectionState::Connected && IpcClient::Interface()) {
         if (m_settings->routeMode() == Settings::VpnOnlyForwardSites) {
             IpcClient::Interface()->routeDeleteList(vpnProtocol()->vpnGateway(), ips);
         }
@@ -319,14 +319,14 @@ void VpnConnection::connectToVpn(int serverIndex,
         if (!IpcClient::init(m_IpcClient)) {
             qWarning() << "Error occurred when init IPC client";
             emit serviceIsNotReady();
-            emit connectionStateChanged(VpnProtocol::Error);
+            emit connectionStateChanged(Vpn::ConnectionState::Error);
             return;
         }
     }
 #endif
 
     m_remoteAddress = credentials.hostName;
-    emit connectionStateChanged(VpnProtocol::Connecting);
+    emit connectionStateChanged(Vpn::ConnectionState::Connecting);
 
     if (m_vpnProtocol) {
         disconnect(m_vpnProtocol.data(), &VpnProtocol::protocolError, this, &VpnConnection::vpnProtocolError);
@@ -338,14 +338,14 @@ void VpnConnection::connectToVpn(int serverIndex,
 
     m_vpnConfiguration = createVpnConfiguration(serverIndex, credentials, container, containerConfig);
     if (e) {
-        emit connectionStateChanged(VpnProtocol::Error);
+        emit connectionStateChanged(Vpn::ConnectionState::Error);
         return;
     }
     
 #if !defined (Q_OS_ANDROID) && !defined (Q_OS_IOS)
     m_vpnProtocol.reset(VpnProtocol::factory(container, m_vpnConfiguration));
     if (!m_vpnProtocol) {
-        emit VpnProtocol::Error;
+        emit Vpn::ConnectionState::Error;
         return;
     }
     m_vpnProtocol->prepare();
@@ -362,7 +362,7 @@ void VpnConnection::connectToVpn(int serverIndex,
   //  IOSVpnProtocol *iosVpnProtocol = new IOSVpnProtocol(proto, m_vpnConfiguration);
     if (!iosVpnProtocol->initialize()) {
          qDebug() << QString("Init failed") ;
-         emit VpnProtocol::Error;
+         emit Vpn::ConnectionState::Error;
          return;
     }
     m_vpnProtocol.reset(iosVpnProtocol);
@@ -371,12 +371,12 @@ void VpnConnection::connectToVpn(int serverIndex,
     createProtocolConnections();
 
     e = m_vpnProtocol.data()->start();
-    if (e) emit VpnProtocol::Error;
+    if (e) emit Vpn::ConnectionState::Error;
 }
 
 void VpnConnection::createProtocolConnections() {
     connect(m_vpnProtocol.data(), &VpnProtocol::protocolError, this, &VpnConnection::vpnProtocolError);
-    connect(m_vpnProtocol.data(), SIGNAL(connectionStateChanged(VpnProtocol::VpnConnectionState)), this, SLOT(onConnectionStateChanged(VpnProtocol::VpnConnectionState)));
+    connect(m_vpnProtocol.data(), SIGNAL(connectionStateChanged(Vpn::ConnectionState)), this, SLOT(onConnectionStateChanged(Vpn::ConnectionState)));
     connect(m_vpnProtocol.data(), SIGNAL(bytesChanged(quint64, quint64)), this, SLOT(onBytesChanged(quint64, quint64)));
 }
 
@@ -433,7 +433,7 @@ void VpnConnection::disconnectFromVpn()
 #endif
 
     if (!m_vpnProtocol.data()) {
-        emit connectionStateChanged(VpnProtocol::Disconnected);
+        emit connectionStateChanged(Vpn::ConnectionState::Disconnected);
 #ifdef Q_OS_ANDROID
         AndroidController::instance()->stop();
 #endif
@@ -442,9 +442,9 @@ void VpnConnection::disconnectFromVpn()
     m_vpnProtocol.data()->stop();
 }
 
-VpnProtocol::VpnConnectionState VpnConnection::connectionState()
+Vpn::ConnectionState VpnConnection::connectionState()
 {
-    if (!m_vpnProtocol) return VpnProtocol::Disconnected;
+    if (!m_vpnProtocol) return Vpn::ConnectionState::Disconnected;
     return m_vpnProtocol->connectionState();
 }
 
diff --git a/client/vpnconnection.h b/client/vpnconnection.h
index 8dea7478..3a3a3047 100644
--- a/client/vpnconnection.h
+++ b/client/vpnconnection.h
@@ -54,7 +54,7 @@ public:
     bool isConnected() const;
     bool isDisconnected() const;
 
-    VpnProtocol::VpnConnectionState connectionState();
+    Vpn::ConnectionState connectionState();
     QSharedPointer<VpnProtocol> vpnProtocol() const;
 
     void addRoutes(const QStringList &ips);
@@ -76,14 +76,14 @@ public slots:
 
 signals:
     void bytesChanged(quint64 receivedBytes, quint64 sentBytes);
-    void connectionStateChanged(VpnProtocol::VpnConnectionState state);
+    void connectionStateChanged(Vpn::ConnectionState state);
     void vpnProtocolError(amnezia::ErrorCode error);
 
     void serviceIsNotReady();
 
 protected slots:
     void onBytesChanged(quint64 receivedBytes, quint64 sentBytes);
-    void onConnectionStateChanged(VpnProtocol::VpnConnectionState state);
+    void onConnectionStateChanged(Vpn::ConnectionState state);
 
 #ifdef Q_OS_IOS
     void checkIOSStatus();

From 03a0e2084ae35810821ec9910057f72cc9408d9d Mon Sep 17 00:00:00 2001
From: "vladimir.kuznetsov" <nethiuswork@gmail.com>
Date: Mon, 15 May 2023 13:38:17 +0800
Subject: [PATCH 018/278] added PageLoader and pageController

---
 client/amnezia_application.cpp                |  4 +
 client/amnezia_application.h                  |  3 +
 client/images/controls/download.svg           |  5 +
 client/resources.qrc                          |  1 +
 client/ui/controllers/pageController.cpp      | 25 +++++
 client/ui/controllers/pageController.h        | 50 ++++++++++
 client/ui/models/servers_model.cpp            |  8 +-
 client/ui/models/servers_model.h              |  3 +-
 client/ui/qml/Components/ConnectButton.qml    | 94 +++++++++----------
 client/ui/qml/Controls2/DropDownType.qml      |  5 +
 client/ui/qml/Controls2/Header2Type.qml       |  2 +
 client/ui/qml/Controls2/HeaderType.qml        |  2 +
 client/ui/qml/PageLoader.qml                  | 32 ++++++-
 client/ui/qml/Pages2/PageHome.qml             | 84 +++++++++++++----
 .../Pages2/PageSetupWizardConfigSource.qml    |  6 +-
 .../qml/Pages2/PageSetupWizardCredentials.qml |  8 +-
 client/ui/qml/Pages2/PageSetupWizardEasy.qml  |  4 +-
 .../qml/Pages2/PageSetupWizardInstalling.qml  |  4 +-
 .../PageSetupWizardProtocolSettings.qml       |  6 +-
 .../qml/Pages2/PageSetupWizardProtocols.qml   |  6 +-
 client/ui/qml/Pages2/PageSetupWizardStart.qml | 10 +-
 .../ui/qml/Pages2/PageSetupWizardTextKey.qml  |  6 +-
 client/ui/qml/Pages2/PageStart.qml            |  4 +-
 client/ui/qml/Pages2/PageTest.qml             |  5 +-
 client/ui/qml/main2.qml                       | 73 +-------------
 client/ui/uilogic.cpp                         |  6 --
 client/ui/uilogic.h                           |  2 -
 27 files changed, 265 insertions(+), 193 deletions(-)
 create mode 100644 client/images/controls/download.svg
 create mode 100644 client/ui/controllers/pageController.cpp
 create mode 100644 client/ui/controllers/pageController.h

diff --git a/client/amnezia_application.cpp b/client/amnezia_application.cpp
index a8231fce..4b7f31b7 100644
--- a/client/amnezia_application.cpp
+++ b/client/amnezia_application.cpp
@@ -118,6 +118,9 @@ void AmneziaApplication::init()
             m_vpnConnection.get(), &VpnConnection::disconnectFromVpn, Qt::QueuedConnection);
     m_engine->rootContext()->setContextProperty("ConnectionController", m_connectionController.get());
 
+    m_pageController.reset(new PageController(m_serversModel));
+    m_engine->rootContext()->setContextProperty("PageController", m_pageController.get());
+
     //
     m_uiLogic->registerPagesLogic();
 
@@ -185,6 +188,7 @@ void AmneziaApplication::registerTypes()
 
     //
     Vpn::declareQmlVpnConnectionStateEnum();
+    PageLoader::declareQmlPageEnum();
 }
 
 void AmneziaApplication::loadFonts()
diff --git a/client/amnezia_application.h b/client/amnezia_application.h
index 322a440c..e2113908 100644
--- a/client/amnezia_application.h
+++ b/client/amnezia_application.h
@@ -13,9 +13,11 @@
 
 #include "ui/uilogic.h"
 #include "configurators/vpn_configurator.h"
+
 #include "ui/models/servers_model.h"
 #include "ui/models/containers_model.h"
 #include "ui/controllers/connectionController.h"
+#include "ui/controllers/pageController.h"
 
 #define amnApp (static_cast<AmneziaApplication *>(QCoreApplication::instance()))
 
@@ -66,6 +68,7 @@ private:
     QScopedPointer<VpnConnection> m_vpnConnection;
 
     QScopedPointer<ConnectionController> m_connectionController;
+    QScopedPointer<PageController> m_pageController;
 
 };
 
diff --git a/client/images/controls/download.svg b/client/images/controls/download.svg
new file mode 100644
index 00000000..1e592887
--- /dev/null
+++ b/client/images/controls/download.svg
@@ -0,0 +1,5 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M21 15V19C21 19.5304 20.7893 20.0391 20.4142 20.4142C20.0391 20.7893 19.5304 21 19 21H5C4.46957 21 3.96086 20.7893 3.58579 20.4142C3.21071 20.0391 3 19.5304 3 19V15" stroke="#CBCBCB" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M7 10L12 15L17 10" stroke="#CBCBCB" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M12 15V3" stroke="#CBCBCB" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/client/resources.qrc b/client/resources.qrc
index f75c8132..77e7d86f 100644
--- a/client/resources.qrc
+++ b/client/resources.qrc
@@ -226,5 +226,6 @@
         <file>images/connectionProgress.svg</file>
         <file>images/connectionOff.svg</file>
         <file>images/connectionOn.svg</file>
+        <file>images/controls/download.svg</file>
     </qresource>
 </RCC>
diff --git a/client/ui/controllers/pageController.cpp b/client/ui/controllers/pageController.cpp
new file mode 100644
index 00000000..10120767
--- /dev/null
+++ b/client/ui/controllers/pageController.cpp
@@ -0,0 +1,25 @@
+#include "pageController.h"
+
+PageController::PageController(const QSharedPointer<ServersModel> &serversModel,
+                               QObject *parent) : QObject(parent), m_serversModel(serversModel)
+{
+}
+
+void PageController::setStartPage()
+{
+    if (m_serversModel->getServersCount()) {
+        if (m_serversModel->getDefaultServerIndex() < 0) {
+            m_serversModel->setDefaultServerIndex(0);
+        }
+        emit goToPage(PageLoader::PageEnum::PageStart, false);
+    } else {
+        emit goToPage(PageLoader::PageEnum::PageSetupWizardStart, false);
+    }
+}
+
+QString PageController::getPagePath(PageLoader::PageEnum page)
+{
+    QMetaEnum metaEnum = QMetaEnum::fromType<PageLoader::PageEnum>();
+    QString pageName = metaEnum.valueToKey(static_cast<int>(page));
+    return "Pages2/" + pageName + ".qml";
+}
diff --git a/client/ui/controllers/pageController.h b/client/ui/controllers/pageController.h
new file mode 100644
index 00000000..9bfd6bda
--- /dev/null
+++ b/client/ui/controllers/pageController.h
@@ -0,0 +1,50 @@
+#ifndef PAGECONTROLLER_H
+#define PAGECONTROLLER_H
+
+#include <QObject>
+#include <QQmlEngine>
+
+#include "ui/models/servers_model.h"
+
+namespace PageLoader
+{
+    Q_NAMESPACE
+    enum class PageEnum { PageStart = 0, PageHome, PageSettings, PageShare,
+
+                          PageSetupWizardStart, PageTest, PageSetupWizardCredentials, PageSetupWizardProtocols, PageSetupWizardEasy,
+                          PageSetupWizardProtocolSettings, PageSetupWizardInstalling, PageSetupWizardConfigSource,
+                          PageSetupWizardTextKey
+    };
+    Q_ENUM_NS(PageEnum)
+
+    static void declareQmlPageEnum() {
+        qmlRegisterUncreatableMetaObject(
+            PageLoader::staticMetaObject,
+            "PageEnum",
+            1, 0,
+            "PageEnum",
+            "Error: only enums"
+            );
+    }
+}
+
+class PageController : public QObject
+{
+    Q_OBJECT
+public:
+    explicit PageController(const QSharedPointer<ServersModel> &serversModel,
+                            QObject *parent = nullptr);
+
+public slots:
+    void setStartPage();
+    QString getPagePath(PageLoader::PageEnum page);
+
+signals:
+    void goToPage(PageLoader::PageEnum page, bool slide = true);
+    void closePage();
+
+private:
+    QSharedPointer<ServersModel> m_serversModel;
+};
+
+#endif // PAGECONTROLLER_H
diff --git a/client/ui/models/servers_model.cpp b/client/ui/models/servers_model.cpp
index dccf59b9..8f39e140 100644
--- a/client/ui/models/servers_model.cpp
+++ b/client/ui/models/servers_model.cpp
@@ -56,6 +56,7 @@ QVariant ServersModel::data(const QModelIndex &index, int role) const
     return QVariant();
 }
 
+//todo mode to setData?
 void ServersModel::setDefaultServerIndex(int index)
 {
 //    beginResetModel();
@@ -63,11 +64,16 @@ void ServersModel::setDefaultServerIndex(int index)
     //    endResetModel();
 }
 
-int ServersModel::getDefaultServerIndex()
+const int ServersModel::getDefaultServerIndex()
 {
     return m_settings->defaultServerIndex();
 }
 
+const int ServersModel::getServersCount()
+{
+    return m_settings->serversCount();
+}
+
 QHash<int, QByteArray> ServersModel::roleNames() const {
     QHash<int, QByteArray> roles;
     roles[DescRole] = "desc";
diff --git a/client/ui/models/servers_model.h b/client/ui/models/servers_model.h
index 30c8b5a2..9fb5ac1a 100644
--- a/client/ui/models/servers_model.h
+++ b/client/ui/models/servers_model.h
@@ -31,7 +31,8 @@ public:
 
 public slots:
     void setDefaultServerIndex(int index);
-    int getDefaultServerIndex();
+    const int getDefaultServerIndex();
+    const int getServersCount();
 
 protected:
     QHash<int, QByteArray> roleNames() const override;
diff --git a/client/ui/qml/Components/ConnectButton.qml b/client/ui/qml/Components/ConnectButton.qml
index bce652d8..8bf39f03 100644
--- a/client/ui/qml/Components/ConnectButton.qml
+++ b/client/ui/qml/Components/ConnectButton.qml
@@ -7,15 +7,8 @@ import ConnectionState 1.0
 Button {
     id: root
 
-    property var isConnected: ConnectionController.isConnected
-
     text: "Подключиться"
 
-//    implicitHeight: 190
-//    implicitWidth: 190
-
-//    color: "transparent"
-
     background: Image {
         id: border
 
@@ -54,56 +47,55 @@ Button {
 
     onClicked: {
         ConnectionController.onConnectionButtonClicked()
-        console.log(connectionProccess.from)
     }
 
     Connections {
         target: ConnectionController
         function onConnectionStateChanged(state) {
             switch(state) {
-            case ConnectionState.Unknown: {
-                console.log("Unknown")
-                break
-            }
-            case ConnectionState.Disconnected: {
-                console.log("Disconnected")
-                connectionProccess.running = false
-                root.text = "Подключиться"
-                break
-            }
-            case ConnectionState.Preparing: {
-                console.log("Preparing")
-                break
-            }
-            case ConnectionState.Connecting: {
-                console.log("Connecting")
-                connectionProccess.running = true
-                root.text = "Подключение..."
-                break
-            }
-            case ConnectionState.Connected: {
-                console.log("Connected")
-                connectionProccess.running = false
-                root.text = "Подключено"
-                break
-            }
-            case ConnectionState.Disconnecting: {
-                console.log("Disconnecting")
-                connectionProccess.running = true
-                root.text = "Отключение..."
-                break
-            }
-            case ConnectionState.Reconnecting: {
-                console.log("Reconnecting")
-                connectionProccess.running = true
-                root.text = "Переподключение..."
-                break
-            }
-            case ConnectionState.Error: {
-                console.log("Error")
-                connectionProccess.running = false
-                break
-            }
+                case ConnectionState.Unknown: {
+                    console.log("Unknown")
+                    break
+                }
+                case ConnectionState.Disconnected: {
+                    console.log("Disconnected")
+                    connectionProccess.running = false
+                    root.text = "Подключиться"
+                    break
+                }
+                case ConnectionState.Preparing: {
+                    console.log("Preparing")
+                    break
+                }
+                case ConnectionState.Connecting: {
+                    console.log("Connecting")
+                    connectionProccess.running = true
+                    root.text = "Подключение..."
+                    break
+                }
+                case ConnectionState.Connected: {
+                    console.log("Connected")
+                    connectionProccess.running = false
+                    root.text = "Подключено"
+                    break
+                }
+                case ConnectionState.Disconnecting: {
+                    console.log("Disconnecting")
+                    connectionProccess.running = true
+                    root.text = "Отключение..."
+                    break
+                }
+                case ConnectionState.Reconnecting: {
+                    console.log("Reconnecting")
+                    connectionProccess.running = true
+                    root.text = "Переподключение..."
+                    break
+                }
+                case ConnectionState.Error: {
+                    console.log("Error")
+                    connectionProccess.running = false
+                    break
+                }
             }
         }
     }
diff --git a/client/ui/qml/Controls2/DropDownType.qml b/client/ui/qml/Controls2/DropDownType.qml
index 64013ba4..eab189f3 100644
--- a/client/ui/qml/Controls2/DropDownType.qml
+++ b/client/ui/qml/Controls2/DropDownType.qml
@@ -154,6 +154,10 @@ Item {
             anchors.topMargin: 16
             anchors.leftMargin: 16
             anchors.rightMargin: 16
+
+            backButtonFunction: function() {
+                root.menuVisible = false
+            }
         }
 
         FlickableType {
@@ -190,6 +194,7 @@ Item {
                             id: loader
                             sourceComponent: root.menuDelegate
                             property QtObject modelData: model
+                            property var delegateIndex: index
                         }
                     }
                 }
diff --git a/client/ui/qml/Controls2/Header2Type.qml b/client/ui/qml/Controls2/Header2Type.qml
index 5c2f0c9b..ef463acd 100644
--- a/client/ui/qml/Controls2/Header2Type.qml
+++ b/client/ui/qml/Controls2/Header2Type.qml
@@ -35,6 +35,8 @@ Item {
             onClicked: {
                 if (backButtonFunction && typeof backButtonFunction === "function") {
                     backButtonFunction()
+                } else {
+                    PageController.closePage()
                 }
             }
         }
diff --git a/client/ui/qml/Controls2/HeaderType.qml b/client/ui/qml/Controls2/HeaderType.qml
index a051d2d8..6c4e7847 100644
--- a/client/ui/qml/Controls2/HeaderType.qml
+++ b/client/ui/qml/Controls2/HeaderType.qml
@@ -35,6 +35,8 @@ Item {
             onClicked: {
                 if (backButtonFunction && typeof backButtonFunction === "function") {
                     backButtonFunction()
+                } else {
+                    PageController.closePage()
                 }
             }
         }
diff --git a/client/ui/qml/PageLoader.qml b/client/ui/qml/PageLoader.qml
index 86f9e5a1..b3d53a05 100644
--- a/client/ui/qml/PageLoader.qml
+++ b/client/ui/qml/PageLoader.qml
@@ -3,5 +3,35 @@ import QtQuick.Controls
 
 StackView {
     id: stackView
-    initialItem: "PageSetupWizardStart"
+
+    function gotoPage(page, slide) {
+        if (slide) {
+            stackView.push(PageController.getPagePath(page), {}, StackView.PushTransition)
+        } else {
+            stackView.push(PageController.getPagePath(page), {}, StackView.Immediate)
+        }
+    }
+
+    function closePage() {
+        if (stackView.depth <= 1) {
+            return
+        }
+
+        stackView.pop()
+    }
+
+    Connections {
+        target: PageController
+        function onGoToPage(page, slide) {
+            stackView.gotoPage(page, slide)
+        }
+
+        function onClosePage() {
+            stackView.closePage()
+        }
+    }
+
+    Component.onCompleted: {
+        PageController.setStartPage()
+    }
 }
diff --git a/client/ui/qml/Pages2/PageHome.qml b/client/ui/qml/Pages2/PageHome.qml
index 5dd0aaae..8edd6b12 100644
--- a/client/ui/qml/Pages2/PageHome.qml
+++ b/client/ui/qml/Pages2/PageHome.qml
@@ -8,15 +8,13 @@ import PageEnum 1.0
 import ProtocolEnum 1.0
 
 import "./"
-import "../Pages"
 import "../Controls2"
 import "../Controls2/TextTypes"
 import "../Config"
 import "../Components"
 
-PageBase {
+Item {
     id: root
-    page: PageEnum.PageHome
 
     property string defaultColor: "#1C1D21"
 
@@ -143,10 +141,6 @@ PageBase {
                         ValueFilter {
                             roleName: "serviceType"
                             value: ProtocolEnum.Vpn
-                        },
-                        ValueFilter {
-                            roleName: "isInstalled"
-                            value: true
                         }
                     ]
                 }
@@ -196,6 +190,19 @@ PageBase {
                             indicator: Rectangle {
                                 anchors.fill: parent
                                 color: containerRadioButton.hovered ? "#2C2D30" : "#1C1D21"
+
+                                Behavior on color {
+                                    PropertyAnimation { duration: 200 }
+                                }
+                            }
+
+                            checkable: {
+                                if (modelData !== null) {
+                                    if (modelData.isInstalled) {
+                                        return true
+                                    }
+                                }
+                                return false
                             }
 
                             RowLayout {
@@ -207,10 +214,33 @@ PageBase {
 
                                 z: 1
 
+                                Image {
+                                    source: {
+                                        if (modelData !== null) {
+                                            if (modelData.isInstalled) {
+                                                return "qrc:/images/controls/check.svg"
+                                            }
+                                        }
+                                        return "qrc:/images/controls/download.svg"
+                                    }
+                                    visible: {
+                                        if (modelData !== null) {
+                                            if (modelData.isInstalled) {
+                                                return containerRadioButton.checked
+                                            }
+                                        }
+                                        return true
+                                    }
+
+                                    width: 24
+                                    height: 24
+
+                                    Layout.rightMargin: 8
+                                }
+
                                 Text {
                                     id: containerRadioButtonText
 
-                                    // todo remove dirty hack?
                                     text: {
                                         if (modelData !== null) {
                                             return modelData.name
@@ -228,22 +258,26 @@ PageBase {
                                     Layout.topMargin: 20
                                     Layout.bottomMargin: 20
                                 }
-
-                                Image {
-                                    source: "qrc:/images/controls/check.svg"
-                                    visible: containerRadioButton.checked
-                                    width: 24
-                                    height: 24
-
-                                    Layout.rightMargin: 8
-                                }
                             }
 
                             onClicked: {
-                                modelData.isDefault = true
+                                if (checked) {
+                                    modelData.isDefault = true
 
-                                containersDropDown.text = containerRadioButtonText.text
-                                containersDropDown.menuVisible = false
+                                    containersDropDown.text = containerRadioButtonText.text
+                                    containersDropDown.menuVisible = false
+                                } else {
+                                    ContainersModel.setCurrentlyInstalledContainerIndex(proxyContainersModel.mapToSource(delegateIndex))
+                                    PageController.goToPage(PageEnum.PageSetupWizardProtocolSettings)
+                                    containersDropDown.menuVisible = false
+                                    menu.visible = false
+                                }
+                            }
+
+                            MouseArea {
+                                anchors.fill: containerRadioButton
+                                cursorShape: Qt.PointingHandCursor
+                                enabled: false
                             }
                         }
 
@@ -326,6 +360,10 @@ PageBase {
                             indicator: Rectangle {
                                 anchors.fill: parent
                                 color: serverRadioButton.hovered ? "#2C2D30" : "#1C1D21"
+
+                                Behavior on color {
+                                    PropertyAnimation { duration: 200 }
+                                }
                             }
 
                             RowLayout {
@@ -370,6 +408,12 @@ PageBase {
                                 ServersModel.setDefaultServerIndex(index)
                                 ContainersModel.setSelectedServerIndex(index)
                             }
+
+                            MouseArea {
+                                anchors.fill: serverRadioButton
+                                cursorShape: Qt.PointingHandCursor
+                                enabled: false
+                            }
                         }
                     }
                 }
diff --git a/client/ui/qml/Pages2/PageSetupWizardConfigSource.qml b/client/ui/qml/Pages2/PageSetupWizardConfigSource.qml
index 5445d1f3..db2730ac 100644
--- a/client/ui/qml/Pages2/PageSetupWizardConfigSource.qml
+++ b/client/ui/qml/Pages2/PageSetupWizardConfigSource.qml
@@ -6,14 +6,12 @@ import QtQuick.Dialogs
 import PageEnum 1.0
 
 import "./"
-import "../Pages"
 import "../Controls2"
 import "../Controls2/TextTypes"
 import "../Config"
 
-PageBase {
+Item {
     id: root
-    page: PageEnum.PageSetupWizardInstalling
 
     FlickableType {
         id: fl
@@ -100,7 +98,7 @@ PageBase {
                 iconImage: "qrc:/images/controls/text-cursor.svg"
 
                 onClickedFunc: function() {
-                    UiLogic.goToPage(PageEnum.PageSetupWizardTextKey)
+                    PageController.goToPage(PageEnum.PageSetupWizardTextKey)
                 }
             }
             Rectangle {
diff --git a/client/ui/qml/Pages2/PageSetupWizardCredentials.qml b/client/ui/qml/Pages2/PageSetupWizardCredentials.qml
index 506c1cde..479e4bfa 100644
--- a/client/ui/qml/Pages2/PageSetupWizardCredentials.qml
+++ b/client/ui/qml/Pages2/PageSetupWizardCredentials.qml
@@ -5,13 +5,11 @@ import QtQuick.Layouts
 import PageEnum 1.0
 
 import "./"
-import "../Pages"
 import "../Controls2"
 import "../Config"
 
-PageBase {
+Item {
     id: root
-    page: PageEnum.PageSetupWizardCredentials
 
     FlickableType {
         id: fl
@@ -61,7 +59,7 @@ PageBase {
                 text: qsTr("Настроить сервер простым образом")
 
                 onClicked: function() {
-                    UiLogic.goToPage(PageEnum.PageSetupWizardEasy)
+                    PageController.goToPage(PageEnum.PageSetupWizardEasy)
                 }
             }
 
@@ -79,7 +77,7 @@ PageBase {
                 text: qsTr("Выбрать протокол для установки")
 
                 onClicked: function() {
-                    UiLogic.goToPage(PageEnum.PageSetupWizardProtocols)
+                    PageController.goToPage(PageEnum.PageSetupWizardProtocols)
                 }
             }
         }
diff --git a/client/ui/qml/Pages2/PageSetupWizardEasy.qml b/client/ui/qml/Pages2/PageSetupWizardEasy.qml
index 94e22fe3..664f4de7 100644
--- a/client/ui/qml/Pages2/PageSetupWizardEasy.qml
+++ b/client/ui/qml/Pages2/PageSetupWizardEasy.qml
@@ -5,13 +5,11 @@ import QtQuick.Layouts
 import PageEnum 1.0
 
 import "./"
-import "../Pages"
 import "../Controls2"
 import "../Config"
 
-PageBase {
+Item {
     id: root
-    page: PageEnum.PageSetupWizardEasy
 
     FlickableType {
         id: fl
diff --git a/client/ui/qml/Pages2/PageSetupWizardInstalling.qml b/client/ui/qml/Pages2/PageSetupWizardInstalling.qml
index a7418257..fa0d5a14 100644
--- a/client/ui/qml/Pages2/PageSetupWizardInstalling.qml
+++ b/client/ui/qml/Pages2/PageSetupWizardInstalling.qml
@@ -5,14 +5,12 @@ import QtQuick.Layouts
 import PageEnum 1.0
 
 import "./"
-import "../Pages"
 import "../Controls2"
 import "../Controls2/TextTypes"
 import "../Config"
 
-PageBase {
+Item {
     id: root
-    page: PageEnum.PageSetupWizardInstalling
 
     FlickableType {
         id: fl
diff --git a/client/ui/qml/Pages2/PageSetupWizardProtocolSettings.qml b/client/ui/qml/Pages2/PageSetupWizardProtocolSettings.qml
index 78856444..6c3b64b9 100644
--- a/client/ui/qml/Pages2/PageSetupWizardProtocolSettings.qml
+++ b/client/ui/qml/Pages2/PageSetupWizardProtocolSettings.qml
@@ -5,14 +5,12 @@ import QtQuick.Layouts
 import PageEnum 1.0
 
 import "./"
-import "../Pages"
 import "../Controls2"
 import "../Controls2/TextTypes"
 import "../Config"
 
-PageBase {
+Item {
     id: root
-    page: PageEnum.PageSetupWizardProtocolSettings
 
     FlickableType {
         id: fl
@@ -90,7 +88,7 @@ PageBase {
         text: qsTr("Установить")
 
         onClicked: function() {
-            UiLogic.goToPage(PageEnum.PageSetupWizardInstalling)
+            PageController.goToPage(PageEnum.PageSetupWizardInstalling)
         }
     }
 }
diff --git a/client/ui/qml/Pages2/PageSetupWizardProtocols.qml b/client/ui/qml/Pages2/PageSetupWizardProtocols.qml
index 50107615..24a86a07 100644
--- a/client/ui/qml/Pages2/PageSetupWizardProtocols.qml
+++ b/client/ui/qml/Pages2/PageSetupWizardProtocols.qml
@@ -8,13 +8,11 @@ import PageEnum 1.0
 import ProtocolEnum 1.0
 
 import "./"
-import "../Pages"
 import "../Controls2"
 import "../Config"
 
-PageBase {
+Item {
     id: root
-    page: PageEnum.PageSetupWizardProtocols
 
     SortFilterProxyModel {
         id: proxyContainersModel
@@ -89,7 +87,7 @@ PageBase {
 
                             onClickedFunc: function() {
                                 ContainersModel.setCurrentlyInstalledContainerIndex(proxyContainersModel.mapToSource(index))
-                                UiLogic.goToPage(PageEnum.PageSetupWizardProtocolSettings)
+                                PageController.goToPage(PageEnum.PageSetupWizardProtocolSettings)
                             }
                         }
 
diff --git a/client/ui/qml/Pages2/PageSetupWizardStart.qml b/client/ui/qml/Pages2/PageSetupWizardStart.qml
index 0167ed1f..5f1a0479 100644
--- a/client/ui/qml/Pages2/PageSetupWizardStart.qml
+++ b/client/ui/qml/Pages2/PageSetupWizardStart.qml
@@ -5,14 +5,12 @@ import QtQuick.Layouts
 import PageEnum 1.0
 
 import "./"
-import "../Pages"
 import "../Controls2"
 import "../Config"
 import "../Controls2/TextTypes"
 
-PageBase {
+Item {
     id: root
-    page: PageEnum.PageSetupWizardStart
 
     FlickableType {
         id: fl
@@ -77,7 +75,7 @@ PageBase {
                 text: qsTr("У меня ничего нет")
 
                 onClicked: {
-                    UiLogic.goToPage(PageEnum.PageTest)
+                    PageController.goToPage(PageEnum.PageTest)
                 }
             }
         }
@@ -132,7 +130,7 @@ PageBase {
                     buttonImage: "qrc:/images/controls/chevron-right.svg"
 
                     onClickedFunc: function() {
-                        UiLogic.goToPage(PageEnum.PageSetupWizardCredentials)
+                        PageController.goToPage(PageEnum.PageSetupWizardCredentials)
                         drawer.visible = false
                     }
                 }
@@ -148,7 +146,7 @@ PageBase {
                     buttonImage: "qrc:/images/controls/chevron-right.svg"
 
                     onClickedFunc: function() {
-                        UiLogic.goToPage(PageEnum.PageSetupWizardConfigSource)
+                        PageController.goToPage(PageEnum.PageSetupWizardConfigSource)
                         drawer.visible = false
                     }
                 }
diff --git a/client/ui/qml/Pages2/PageSetupWizardTextKey.qml b/client/ui/qml/Pages2/PageSetupWizardTextKey.qml
index d295f1b9..f94b9ff4 100644
--- a/client/ui/qml/Pages2/PageSetupWizardTextKey.qml
+++ b/client/ui/qml/Pages2/PageSetupWizardTextKey.qml
@@ -5,14 +5,12 @@ import QtQuick.Layouts
 import PageEnum 1.0
 
 import "./"
-import "../Pages"
 import "../Controls2"
 import "../Controls2/TextTypes"
 import "../Config"
 
-PageBase {
+Item {
     id: root
-    page: PageEnum.PageSetupWizardInstalling
 
     FlickableType {
         id: fl
@@ -68,7 +66,7 @@ PageBase {
         text: qsTr("Подключиться")
 
         onClicked: function() {
-//            UiLogic.goToPage(PageEnum.PageSetupWizardInstalling)
+//            PageController.goToPage(PageEnum.PageSetupWizardInstalling)
         }
     }
 }
diff --git a/client/ui/qml/Pages2/PageStart.qml b/client/ui/qml/Pages2/PageStart.qml
index 220c6f19..ade0980d 100644
--- a/client/ui/qml/Pages2/PageStart.qml
+++ b/client/ui/qml/Pages2/PageStart.qml
@@ -5,14 +5,12 @@ import QtQuick.Layouts
 import PageEnum 1.0
 
 import "./"
-import "../Pages"
 import "../Controls2"
 import "../Controls2/TextTypes"
 import "../Config"
 
-PageBase {
+Item {
     id: root
-    page: PageEnum.PageStart
 
     StackLayout {
         id: stackLayout
diff --git a/client/ui/qml/Pages2/PageTest.qml b/client/ui/qml/Pages2/PageTest.qml
index 2336e46e..53ec99fc 100644
--- a/client/ui/qml/Pages2/PageTest.qml
+++ b/client/ui/qml/Pages2/PageTest.qml
@@ -4,15 +4,12 @@ import QtQuick.Layouts
 import PageEnum 1.0
 
 import "./"
-import "../Pages"
 import "../Controls2"
 import "../Config"
 import "../Controls2/TextTypes"
 
-PageBase {
+Item {
     id: root
-    page: PageEnum.Test
-    logic: ViewConfigLogic
 
     ColumnLayout {
         id: content
diff --git a/client/ui/qml/main2.qml b/client/ui/qml/main2.qml
index 6261e9a7..b10d749f 100644
--- a/client/ui/qml/main2.qml
+++ b/client/ui/qml/main2.qml
@@ -22,83 +22,14 @@ Window  {
 
     title: "AmneziaVPN"
 
-    function gotoPage(page, reset, slide) {
-        if (pageStackView.depth > 0) {
-            pageStackView.currentItem.deactivated()
-        }
-
-        if (slide) {
-            pageStackView.push(UiLogic.pageEnumToString(page), {}, StackView.PushTransition)
-        } else {
-            pageStackView.push(UiLogic.pageEnumToString(page), {}, StackView.Immediate)
-        }
-
-        pageStackView.currentItem.activated(reset)
-    }
-
-    function closePage() {
-        if (pageStackView.depth <= 1) {
-            return
-        }
-        pageStackView.currentItem.deactivated()
-        pageStackView.pop()
-    }
-
-    function setStartPage(page, slide) {
-        if (pageStackView.depth > 0) {
-            pageStackView.currentItem.deactivated()
-        }
-
-        pageStackView.clear()
-        if (slide) {
-            pageStackView.push(UiLogic.pageEnumToString(page), {}, StackView.PushTransition)
-        } else {
-            pageStackView.push(UiLogic.pageEnumToString(page), {}, StackView.Immediate)
-        }
-        if (page === PageEnum.Start) {
-            UiLogic.pushButtonBackFromStartVisible = !pageStackView.empty
-            UiLogic.onUpdatePage();
-        }
-    }
-
     Rectangle {
         anchors.fill: parent
         color: "#0E0E11"
     }
 
-    StackView {
-        id: pageStackView
+    PageLoader {
+        id: pageLoader
         anchors.fill: parent
         focus: true
     }
-
-    Connections {
-        target: UiLogic
-        function onGoToPage(page, reset, slide) {
-            root.gotoPage(page, reset, slide)
-        }
-
-        function onClosePage() {
-            root.closePage()
-        }
-
-        function onSetStartPage(page, slide) {
-            root.setStartPage(page, slide)
-        }
-
-        function onShow() {
-            root.show()
-            UiLogic.initializeUiLogic()
-        }
-
-        function onHide() {
-            root.hide()
-        }
-
-        function onRaise() {
-            root.show()
-            root.raise()
-            root.requestActivate()
-        }
-    }
 }
diff --git a/client/ui/uilogic.cpp b/client/ui/uilogic.cpp
index 929d84d6..3ad74645 100644
--- a/client/ui/uilogic.cpp
+++ b/client/ui/uilogic.cpp
@@ -617,9 +617,3 @@ bool UiLogic::isContainerAlreadyAddedToGui(DockerContainer container)
     }
     return false;
 }
-
-QString UiLogic::pageEnumToString(Page page) {
-    QMetaEnum metaEnum = QMetaEnum::fromType<Page>();
-    QString pageName = metaEnum.valueToKey(static_cast<int>(page));
-    return "Pages2/" + pageName + ".qml";
-}
diff --git a/client/ui/uilogic.h b/client/ui/uilogic.h
index 4b392066..081b8e5a 100644
--- a/client/ui/uilogic.h
+++ b/client/ui/uilogic.h
@@ -123,8 +123,6 @@ public:
 
     Q_INVOKABLE amnezia::ErrorCode addAlreadyInstalledContainersGui(bool &isServerCreated);
 
-    Q_INVOKABLE QString pageEnumToString(PageEnumNS::Page page);
-
     void shareTempFile(const QString &suggestedName, QString ext, const QString& data);
     static QString getOpenFileName(QWidget *parent = nullptr,
                                    const QString &caption = QString(),

From acca85b99a1bf3d0cc71e5508dc1b1edee71dad5 Mon Sep 17 00:00:00 2001
From: "vladimir.kuznetsov" <nethiuswork@gmail.com>
Date: Wed, 17 May 2023 23:28:27 +0800
Subject: [PATCH 019/278] added installController with logic for
 server/container installation

---
 client/amnezia_application.cpp                |   3 +
 client/resources.qrc                          |   1 +
 .../ui/controllers/connectionController.cpp   |   2 +-
 client/ui/controllers/installController.cpp   |  82 ++++++++
 client/ui/controllers/installController.h     |  40 ++++
 client/ui/models/containers_model.cpp         |  53 +++--
 client/ui/models/containers_model.h           |  16 +-
 client/ui/models/servers_model.cpp            |  21 +-
 client/ui/models/servers_model.h              |   9 +-
 client/ui/qml/Components/ConnectButton.qml    |   2 +
 client/ui/qml/Controls2/DropDownType.qml      |  64 +++---
 client/ui/qml/Controls2/Header2Type.qml       |   4 +-
 client/ui/qml/Controls2/ProgressBarType.qml   |  19 ++
 client/ui/qml/Pages2/PageHome.qml             |  39 ++--
 .../qml/Pages2/PageSetupWizardCredentials.qml |  10 +
 .../qml/Pages2/PageSetupWizardInstalling.qml  | 105 ++++++++--
 .../PageSetupWizardProtocolSettings.qml       | 194 +++++++++++++-----
 .../qml/Pages2/PageSetupWizardProtocols.qml   |   4 -
 client/ui/qml/Pages2/PageSetupWizardStart.qml |   2 +-
 19 files changed, 519 insertions(+), 151 deletions(-)
 create mode 100644 client/ui/controllers/installController.cpp
 create mode 100644 client/ui/controllers/installController.h
 create mode 100644 client/ui/qml/Controls2/ProgressBarType.qml

diff --git a/client/amnezia_application.cpp b/client/amnezia_application.cpp
index 4b7f31b7..df4a4ec1 100644
--- a/client/amnezia_application.cpp
+++ b/client/amnezia_application.cpp
@@ -121,6 +121,9 @@ void AmneziaApplication::init()
     m_pageController.reset(new PageController(m_serversModel));
     m_engine->rootContext()->setContextProperty("PageController", m_pageController.get());
 
+    m_installController.reset(new InstallController(m_serversModel, m_containersModel, m_settings));
+    m_engine->rootContext()->setContextProperty("InstallController", m_installController.get());
+
     //
     m_uiLogic->registerPagesLogic();
 
diff --git a/client/resources.qrc b/client/resources.qrc
index 77e7d86f..a50a23c5 100644
--- a/client/resources.qrc
+++ b/client/resources.qrc
@@ -227,5 +227,6 @@
         <file>images/connectionOff.svg</file>
         <file>images/connectionOn.svg</file>
         <file>images/controls/download.svg</file>
+        <file>ui/qml/Controls2/ProgressBarType.qml</file>
     </qresource>
 </RCC>
diff --git a/client/ui/controllers/connectionController.cpp b/client/ui/controllers/connectionController.cpp
index ce52a2c8..58fef373 100644
--- a/client/ui/controllers/connectionController.cpp
+++ b/client/ui/controllers/connectionController.cpp
@@ -33,7 +33,7 @@ bool ConnectionController::openVpnConnection()
     DockerContainer container = m_containersModel->getDefaultContainer();
     QModelIndex containerModelIndex = m_containersModel->index(container);
     const QJsonObject &containerConfig = qvariant_cast<QJsonObject>(m_containersModel->data(containerModelIndex,
-                                                                                            ContainersModel::ContainersModelRoles::ConfigRole));
+                                                                                            ContainersModel::Roles::ConfigRole));
 
     //todo error handling
     qApp->processEvents();
diff --git a/client/ui/controllers/installController.cpp b/client/ui/controllers/installController.cpp
new file mode 100644
index 00000000..ae753382
--- /dev/null
+++ b/client/ui/controllers/installController.cpp
@@ -0,0 +1,82 @@
+#include "installController.h"
+
+#include <QJsonObject>
+
+#include "core/servercontroller.h"
+
+InstallController::InstallController(const QSharedPointer<ServersModel> &serversModel,
+                                    const QSharedPointer<ContainersModel> &containersModel,
+                                    const std::shared_ptr<Settings> &settings,
+                                    QObject *parent) : QObject(parent), m_serversModel(serversModel), m_containersModel(containersModel),  m_settings(settings)
+{
+
+}
+
+ErrorCode InstallController::install(DockerContainer container, int port, TransportProto transportProto)
+{
+    Proto mainProto = ContainerProps::defaultProtocol(container);
+
+    QJsonObject containerConfig {
+        { config_key::port, QString::number(port) },
+        { config_key::transport_proto, ProtocolProps::transportProtoToString(transportProto, mainProto) }
+    };
+    QJsonObject config {
+        { config_key::container, ContainerProps::containerToString(container) },
+        { ProtocolProps::protoToString(mainProto), containerConfig }
+    };
+
+    if (m_shouldCreateServer) {
+        return installServer(container, config);
+    } else {
+        return installContainer(container, config);
+    }
+}
+
+ErrorCode InstallController::installServer(DockerContainer container, QJsonObject& config)
+{
+    //todo check if container already installed
+    ServerController serverController(m_settings);
+    ErrorCode errorCode = serverController.setupContainer(m_currentlyInstalledServerCredentials, container, config);
+    if (errorCode == ErrorCode::NoError) {
+        QJsonObject server;
+        server.insert(config_key::hostName, m_currentlyInstalledServerCredentials.hostName);
+        server.insert(config_key::userName, m_currentlyInstalledServerCredentials.userName);
+        server.insert(config_key::password, m_currentlyInstalledServerCredentials.password);
+        server.insert(config_key::port, m_currentlyInstalledServerCredentials.port);
+        server.insert(config_key::description, m_settings->nextAvailableServerName());
+
+        server.insert(config_key::containers, QJsonArray{ config });
+        server.insert(config_key::defaultContainer, ContainerProps::containerToString(container));
+
+        m_settings->addServer(server);
+        m_settings->setDefaultServer(m_settings->serversCount() - 1);
+    }
+
+    return errorCode;
+}
+
+ErrorCode InstallController::installContainer(DockerContainer container, QJsonObject& config)
+{
+    //todo check if container already installed
+    ServerCredentials serverCredentials = m_serversModel->getCurrentlyProcessedServerCredentials();
+
+    ServerController serverController(m_settings);
+    ErrorCode errorCode = serverController.setupContainer(serverCredentials, container, config);
+    if (errorCode == ErrorCode::NoError) {
+        m_containersModel->setData(m_containersModel->index(container), config, ContainersModel::Roles::ConfigRole);
+        emit installContainerFinished();
+    }
+
+    //todo error processing
+    return errorCode;
+}
+
+void InstallController::setCurrentlyInstalledServerCredentials(const QString &hostName, const QString &userName, const QString &password, const int &port)
+{
+    m_currentlyInstalledServerCredentials = { hostName, userName, password, port };
+}
+
+void InstallController::setShouldCreateServer(bool shouldCreateServer)
+{
+    m_shouldCreateServer = shouldCreateServer;
+}
diff --git a/client/ui/controllers/installController.h b/client/ui/controllers/installController.h
new file mode 100644
index 00000000..f9cd9fb0
--- /dev/null
+++ b/client/ui/controllers/installController.h
@@ -0,0 +1,40 @@
+#ifndef INSTALLCONTROLLER_H
+#define INSTALLCONTROLLER_H
+
+#include <QObject>
+
+#include "core/defs.h"
+#include "containers/containers_defs.h"
+#include "ui/models/servers_model.h"
+#include "ui/models/containers_model.h"
+
+class InstallController : public QObject
+{
+    Q_OBJECT
+public:
+    explicit InstallController(const QSharedPointer<ServersModel> &serversModel,
+                               const QSharedPointer<ContainersModel> &containersModel,
+                               const std::shared_ptr<Settings> &settings,
+                               QObject *parent = nullptr);
+
+public slots:
+    ErrorCode install(DockerContainer container, int port, TransportProto transportProto);
+    void setCurrentlyInstalledServerCredentials(const QString &hostName, const QString &userName, const QString &password, const int &port);
+    void setShouldCreateServer(bool shouldCreateServer);
+
+signals:
+    void installContainerFinished();
+private:
+    ErrorCode installServer(DockerContainer container, QJsonObject& config);
+    ErrorCode installContainer(DockerContainer container, QJsonObject& config);
+
+    QSharedPointer<ServersModel> m_serversModel;
+    QSharedPointer<ContainersModel> m_containersModel;
+    std::shared_ptr<Settings> m_settings;
+
+    ServerCredentials m_currentlyInstalledServerCredentials;
+
+    bool m_shouldCreateServer;
+};
+
+#endif // INSTALLCONTROLLER_H
diff --git a/client/ui/models/containers_model.cpp b/client/ui/models/containers_model.cpp
index db7572e6..a814a838 100644
--- a/client/ui/models/containers_model.cpp
+++ b/client/ui/models/containers_model.cpp
@@ -2,7 +2,6 @@
 
 ContainersModel::ContainersModel(std::shared_ptr<Settings> settings, QObject *parent) : m_settings(settings), QAbstractListModel(parent)
 {
-    setSelectedServerIndex(m_settings->defaultServerIndex());
 }
 
 int ContainersModel::rowCount(const QModelIndex &parent) const
@@ -17,9 +16,23 @@ bool ContainersModel::setData(const QModelIndex &index, const QVariant &value, i
         return false;
     }
 
-    if (role == IsDefaultRole) {
-        DockerContainer container = ContainerProps::allContainers().at(index.row());
-        m_settings->setDefaultContainer(m_selectedServerIndex, container);
+    DockerContainer container = ContainerProps::allContainers().at(index.row());
+
+    switch (role) {
+    case NameRole:
+//        return ContainerProps::containerHumanNames().value(container);
+    case DescRole:
+//        return ContainerProps::containerDescriptions().value(container);
+    case ConfigRole:
+        m_settings->setContainerConfig(m_currentlyProcessedServerIndex, container, value.toJsonObject());
+    case ServiceTypeRole:
+//        return ContainerProps::containerService(container);
+    case DockerContainerRole:
+//        return container;
+    case IsInstalledRole:
+//        return m_settings->containers(m_currentlyProcessedServerIndex).contains(container);
+    case IsDefaultRole:
+        m_settings->setDefaultContainer(m_currentlyProcessedServerIndex, container);
     }
 
     emit dataChanged(index, index);
@@ -41,40 +54,42 @@ QVariant ContainersModel::data(const QModelIndex &index, int role) const
         case DescRole:
             return ContainerProps::containerDescriptions().value(container);
         case ConfigRole:
-            return m_settings->containerConfig(m_selectedServerIndex, container);
+            return m_settings->containerConfig(m_currentlyProcessedServerIndex, container);
         case ServiceTypeRole:
             return ContainerProps::containerService(container);
+        case DockerContainerRole:
+            return container;
         case IsInstalledRole:
-            return m_settings->containers(m_selectedServerIndex).contains(container);
+            return m_settings->containers(m_currentlyProcessedServerIndex).contains(container);
+        case IsCurrentlyInstalled:
+            return container == static_cast<DockerContainer>(m_currentlyInstalledContainerIndex);
         case IsDefaultRole:
-            return container == m_settings->defaultContainer(m_selectedServerIndex);
+            return container == m_settings->defaultContainer(m_currentlyProcessedServerIndex);
     }
 
     return QVariant();
 }
 
-void ContainersModel::setSelectedServerIndex(int index)
+void ContainersModel::setCurrentlyProcessedServerIndex(int index)
 {
     beginResetModel();
-    m_selectedServerIndex = index;
+    m_currentlyProcessedServerIndex = index;
     endResetModel();
 }
 
 void ContainersModel::setCurrentlyInstalledContainerIndex(int index)
 {
-//    beginResetModel();
-    m_currentlyInstalledContainerIndex = createIndex(index, 0);
-//    endResetModel();
-}
-
-QString ContainersModel::getCurrentlyInstalledContainerName()
-{
-    return data(m_currentlyInstalledContainerIndex, NameRole).toString();
+    m_currentlyInstalledContainerIndex = index;
 }
 
 DockerContainer ContainersModel::getDefaultContainer()
 {
-    return m_settings->defaultContainer(m_selectedServerIndex);
+    return m_settings->defaultContainer(m_currentlyProcessedServerIndex);
+}
+
+int ContainersModel::getCurrentlyInstalledContainerIndex()
+{
+    return m_currentlyInstalledContainerIndex;
 }
 
 QHash<int, QByteArray> ContainersModel::roleNames() const {
@@ -82,7 +97,9 @@ QHash<int, QByteArray> ContainersModel::roleNames() const {
     roles[NameRole] = "name";
     roles[DescRole] = "description";
     roles[ServiceTypeRole] = "serviceType";
+    roles[DockerContainerRole] = "dockerContainer";
     roles[IsInstalledRole] = "isInstalled";
+    roles[IsCurrentlyInstalled] = "isCurrentlyInstalled";
     roles[IsDefaultRole] = "isDefault";
     return roles;
 }
diff --git a/client/ui/models/containers_model.h b/client/ui/models/containers_model.h
index c56511db..15012925 100644
--- a/client/ui/models/containers_model.h
+++ b/client/ui/models/containers_model.h
@@ -15,12 +15,14 @@ class ContainersModel : public QAbstractListModel
 public:
     ContainersModel(std::shared_ptr<Settings> settings, QObject *parent = nullptr);
 public:
-    enum ContainersModelRoles {
+    enum Roles {
         NameRole = Qt::UserRole + 1,
         DescRole,
         ServiceTypeRole,
         ConfigRole,
+        DockerContainerRole,
         IsInstalledRole,
+        IsCurrentlyInstalled,
         IsDefaultRole
     };
 
@@ -28,20 +30,20 @@ public:
 
     bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole) override;
     QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
-    Q_INVOKABLE void setSelectedServerIndex(int index);
-    Q_INVOKABLE void setCurrentlyInstalledContainerIndex(int index);
-
-    Q_INVOKABLE QString getCurrentlyInstalledContainerName();
 
 public slots:
     DockerContainer getDefaultContainer();
 
+    void setCurrentlyProcessedServerIndex(int index);
+    void setCurrentlyInstalledContainerIndex(int index);
+    int getCurrentlyInstalledContainerIndex();
+
 protected:
     QHash<int, QByteArray> roleNames() const override;
 
 private:
-    int m_selectedServerIndex;
-    QModelIndex m_currentlyInstalledContainerIndex;
+    int m_currentlyProcessedServerIndex;
+    int m_currentlyInstalledContainerIndex;
     std::shared_ptr<Settings> m_settings;
 };
 
diff --git a/client/ui/models/servers_model.cpp b/client/ui/models/servers_model.cpp
index 8f39e140..fe973811 100644
--- a/client/ui/models/servers_model.cpp
+++ b/client/ui/models/servers_model.cpp
@@ -38,14 +38,14 @@ QVariant ServersModel::data(const QModelIndex &index, int role) const
     const QJsonObject server = servers.at(index.row()).toObject();
 
     switch (role) {
-    case DescRole: {
+    case NameRole: {
         auto description = server.value(config_key::description).toString();
         if (description.isEmpty()) {
             return server.value(config_key::hostName).toString();
         }
         return description;
     }
-    case AddressRole:
+    case HostNameRole:
         return server.value(config_key::hostName).toString();
     case CredentialsRole:
         return QVariant::fromValue(m_settings->serverCredentials(index.row()));
@@ -74,10 +74,21 @@ const int ServersModel::getServersCount()
     return m_settings->serversCount();
 }
 
+void ServersModel::setCurrentlyProcessedServerIndex(int index)
+{
+    m_currenlyProcessedServerIndex = index;
+}
+
+ServerCredentials ServersModel::getCurrentlyProcessedServerCredentials()
+{
+    return qvariant_cast<ServerCredentials>(data(index(m_currenlyProcessedServerIndex), CredentialsRole));
+}
+
 QHash<int, QByteArray> ServersModel::roleNames() const {
     QHash<int, QByteArray> roles;
-    roles[DescRole] = "desc";
-    roles[AddressRole] = "address";
-    roles[IsDefaultRole] = "is_default";
+    roles[NameRole] = "name";
+    roles[HostNameRole] = "hostName";
+    roles[CredentialsRole] = "credentials";
+    roles[IsDefaultRole] = "isDefault";
     return roles;
 }
diff --git a/client/ui/models/servers_model.h b/client/ui/models/servers_model.h
index 9fb5ac1a..08b44976 100644
--- a/client/ui/models/servers_model.h
+++ b/client/ui/models/servers_model.h
@@ -16,8 +16,8 @@ class ServersModel : public QAbstractListModel
     Q_OBJECT
 public:
     enum ServersModelRoles {
-        DescRole = Qt::UserRole + 1,
-        AddressRole,
+        NameRole = Qt::UserRole + 1,
+        HostNameRole,
         CredentialsRole,
         IsDefaultRole
     };
@@ -34,11 +34,16 @@ public slots:
     const int getDefaultServerIndex();
     const int getServersCount();
 
+    void setCurrentlyProcessedServerIndex(int index);
+    ServerCredentials getCurrentlyProcessedServerCredentials();
+
 protected:
     QHash<int, QByteArray> roleNames() const override;
 
 private:
     std::shared_ptr<Settings> m_settings;
+
+    int m_currenlyProcessedServerIndex;
 };
 
 #endif // SERVERSMODEL_H
diff --git a/client/ui/qml/Components/ConnectButton.qml b/client/ui/qml/Components/ConnectButton.qml
index 8bf39f03..5002d5bd 100644
--- a/client/ui/qml/Components/ConnectButton.qml
+++ b/client/ui/qml/Components/ConnectButton.qml
@@ -65,6 +65,8 @@ Button {
                 }
                 case ConnectionState.Preparing: {
                     console.log("Preparing")
+                    connectionProccess.running = true
+                    root.text = "Подключение..."
                     break
                 }
                 case ConnectionState.Connecting: {
diff --git a/client/ui/qml/Controls2/DropDownType.qml b/client/ui/qml/Controls2/DropDownType.qml
index eab189f3..e2a3531f 100644
--- a/client/ui/qml/Controls2/DropDownType.qml
+++ b/client/ui/qml/Controls2/DropDownType.qml
@@ -8,40 +8,38 @@ Item {
     id: root
 
     property string text
+    property string textColor: "#d7d8db"
+
     property string descriptionText
 
     property string headerText
     property string headerBackButtonImage
 
-    property var onClickedFunc
-    property string buttonImage: "qrc:/images/controls/chevron-down.svg"
-    property string buttonImageColor: "#494B50"
+    property var onRootButtonClicked
+    property string rootButtonImage: "qrc:/images/controls/chevron-down.svg"
+    property string rootButtonImageColor: "#494B50"
+    property string rootButtonDefaultColor: "#1C1D21"
+    property int rootButtonMaximumWidth
 
-    property int buttonMaximumWidth
-
-    property string defaultColor: "#1C1D21"
-
-    property string textColor: "#d7d8db"
-
-    property string borderColor: "#494B50"
-    property int borderWidth: 1
+    property string rootButtonBorderColor: "#494B50"
+    property int rootButtonBorderWidth: 1
 
     property Component menuDelegate
     property variant menuModel
 
     property alias menuVisible: menu.visible
 
-    implicitWidth: buttonContent.implicitWidth
-    implicitHeight: buttonContent.implicitHeight
+    implicitWidth: rootButtonContent.implicitWidth
+    implicitHeight: rootButtonContent.implicitHeight
 
     Rectangle {
-        id: buttonBackground
-        anchors.fill: buttonContent
+        id: rootButtonBackground
+        anchors.fill: rootButtonContent
 
         radius: 16
-        color: defaultColor
-        border.color: borderColor
-        border.width: borderWidth
+        color: rootButtonDefaultColor
+        border.color: rootButtonBorderColor
+        border.width: rootButtonBorderWidth
 
         Behavior on border.width {
             PropertyAnimation { duration: 200 }
@@ -49,7 +47,7 @@ Item {
     }
 
     RowLayout {
-        id: buttonContent
+        id: rootButtonContent
         anchors.fill: parent
 
         spacing: 0
@@ -71,7 +69,7 @@ Item {
                 horizontalAlignment: Text.AlignHCenter
                 verticalAlignment: Text.AlignVCenter
 
-                Layout.maximumWidth: buttonMaximumWidth ? buttonMaximumWidth : implicitWidth
+                Layout.maximumWidth: rootButtonMaximumWidth ? rootButtonMaximumWidth : implicitWidth
 
                 color: root.textColor
                 text: root.text
@@ -81,38 +79,36 @@ Item {
             }
         }
 
+        //todo change to image type
         ImageButtonType {
-            id: button
-
             Layout.leftMargin: 4
             Layout.rightMargin: 16
 
             hoverEnabled: false
-            image: buttonImage
-            imageColor: buttonImageColor
-            onClicked: {
-                if (onClickedFunc && typeof onClickedFunc === "function") {
-                    onClickedFunc()
-                }
-            }
+            image: rootButtonImage
+            imageColor: rootButtonImageColor
         }
     }
 
     MouseArea {
-        anchors.fill: buttonContent
+        anchors.fill: rootButtonContent
         cursorShape: Qt.PointingHandCursor
         hoverEnabled: true
 
         onEntered: {
-            buttonBackground.border.width = borderWidth
+            rootButtonBackground.border.width = rootButtonBorderWidth
         }
 
         onExited: {
-            buttonBackground.border.width = 0
+            rootButtonBackground.border.width = 0
         }
 
         onClicked: {
-            menu.visible = true
+            if (onRootButtonClicked && typeof onRootButtonClicked === "function") {
+                onRootButtonClicked()
+            } else {
+                menu.visible = true
+            }
         }
     }
 
@@ -132,7 +128,7 @@ Item {
             radius: 16
             color: "#1C1D21"
 
-            border.color: borderColor
+            border.color: "#494B50"
             border.width: 1
         }
 
diff --git a/client/ui/qml/Controls2/Header2Type.qml b/client/ui/qml/Controls2/Header2Type.qml
index ef463acd..f985d523 100644
--- a/client/ui/qml/Controls2/Header2Type.qml
+++ b/client/ui/qml/Controls2/Header2Type.qml
@@ -59,8 +59,8 @@ Item {
                 visible: image ? true : false
 
                 onClicked: {
-                    if (actionButtonImage && typeof actionButtonImage === "function") {
-                        actionButtonImage()
+                    if (actionButtonFunction && typeof actionButtonFunction === "function") {
+                        actionButtonFunction()
                     }
                 }
             }
diff --git a/client/ui/qml/Controls2/ProgressBarType.qml b/client/ui/qml/Controls2/ProgressBarType.qml
new file mode 100644
index 00000000..f2f2370a
--- /dev/null
+++ b/client/ui/qml/Controls2/ProgressBarType.qml
@@ -0,0 +1,19 @@
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+
+ProgressBar {
+    id: root
+
+    implicitHeight: 4
+
+    background: Rectangle {
+        color: "#412102"
+    }
+
+    contentItem: Rectangle {
+        width: root.visualPosition * root.width
+        height: root.height
+        color: "#FBB26A"
+    }
+}
diff --git a/client/ui/qml/Pages2/PageHome.qml b/client/ui/qml/Pages2/PageHome.qml
index 8edd6b12..a29a4089 100644
--- a/client/ui/qml/Pages2/PageHome.qml
+++ b/client/ui/qml/Pages2/PageHome.qml
@@ -20,8 +20,10 @@ Item {
 
     property string borderColor: "#2C2D30"
 
-    property string currentServerName: serversMenuContent.currentItem.delegateData.desc
-    property string currentServerDescription: serversMenuContent.currentItem.delegateData.address
+    property string currentServerName: serversMenuContent.currentItem.delegateData.name
+    property string currentServerHostName: serversMenuContent.currentItem.delegateData.hostName
+
+    property string currentContainerName
 
     ConnectButton {
         anchors.centerIn: parent
@@ -72,7 +74,7 @@ Item {
             Layout.bottomMargin: 44
             Layout.alignment: Qt.AlignHCenter | Qt.AlignVCenter
 
-            text: currentServerDescription
+            text: currentContainerName + " | " + currentServerHostName
         }
     }
 
@@ -127,7 +129,7 @@ Item {
                 Layout.bottomMargin: 24
                 Layout.alignment: Qt.AlignHCenter | Qt.AlignVCenter
 
-                text: currentServerDescription
+                text: currentServerHostName
             }
 
             RowLayout {
@@ -150,16 +152,21 @@ Item {
 
                     implicitHeight: 40
 
-                    borderWidth: 0
-                    buttonImageColor: "#0E0E11"
-                    buttonMaximumWidth: 150 //todo make it dynamic
-
-                    defaultColor: "#D7D8DB"
+                    rootButtonBorderWidth: 0
+                    rootButtonImageColor: "#0E0E11"
+                    rootButtonMaximumWidth: 150 //todo make it dynamic
+                    rootButtonDefaultColor: "#D7D8DB"
 
                     textColor: "#0E0E11"
                     headerText: "Протокол подключения"
                     headerBackButtonImage: "qrc:/images/controls/arrow-left.svg"
 
+                    onRootButtonClicked: function() {
+                        ServersModel.setCurrentlyProcessedServerIndex(serversMenuContent.currentIndex)
+                        ContainersModel.setCurrentlyProcessedServerIndex(serversMenuContent.currentIndex)
+                        containersDropDown.menuVisible = true
+                    }
+
                     menuModel: proxyContainersModel
 
                     ButtonGroup {
@@ -265,9 +272,11 @@ Item {
                                     modelData.isDefault = true
 
                                     containersDropDown.text = containerRadioButtonText.text
+                                    root.currentContainerName = containerRadioButtonText.text
                                     containersDropDown.menuVisible = false
                                 } else {
                                     ContainersModel.setCurrentlyInstalledContainerIndex(proxyContainersModel.mapToSource(delegateIndex))
+                                    InstallController.setShouldCreateServer(false)
                                     PageController.goToPage(PageEnum.PageSetupWizardProtocolSettings)
                                     containersDropDown.menuVisible = false
                                     menu.visible = false
@@ -307,6 +316,10 @@ Item {
                 actionButtonImage: "qrc:/images/controls/plus.svg"
 
                 headerText: "Серверы"
+
+                actionButtonFunction: function() {
+                    PageController.goToPage(PageEnum.PageSetupWizardStart)
+                }
             }
         }
 
@@ -378,7 +391,7 @@ Item {
                                 Text {
                                     id: serverRadioButtonText
 
-                                    text: desc
+                                    text: name
                                     color: "#D7D8DB"
                                     font.pixelSize: 16
                                     font.weight: 400
@@ -402,11 +415,11 @@ Item {
                             }
 
                             onClicked: {
-                                root.currentServerName = desc
-                                root.currentServerDescription = address
+                                serversMenuContent.currentIndex = index
+                                root.currentServerName = name
+                                root.currentServerHostName = hostName
 
                                 ServersModel.setDefaultServerIndex(index)
-                                ContainersModel.setSelectedServerIndex(index)
                             }
 
                             MouseArea {
diff --git a/client/ui/qml/Pages2/PageSetupWizardCredentials.qml b/client/ui/qml/Pages2/PageSetupWizardCredentials.qml
index 479e4bfa..def76b89 100644
--- a/client/ui/qml/Pages2/PageSetupWizardCredentials.qml
+++ b/client/ui/qml/Pages2/PageSetupWizardCredentials.qml
@@ -38,18 +38,25 @@ Item {
             }
 
             TextFieldWithHeaderType {
+                id: hostname
+
                 Layout.fillWidth: true
                 headerText: "Server IP adress [:port]"
             }
 
             TextFieldWithHeaderType {
+                id: username
+
                 Layout.fillWidth: true
                 headerText: "Login to connect via SSH"
             }
 
             TextFieldWithHeaderType {
+                id: secretData
+
                 Layout.fillWidth: true
                 headerText: "Password / Private key"
+                textField.echoMode: TextInput.Password
             }
 
             BasicButtonType {
@@ -77,6 +84,9 @@ Item {
                 text: qsTr("Выбрать протокол для установки")
 
                 onClicked: function() {
+                    InstallController.setShouldCreateServer(true)
+                    InstallController.setCurrentlyInstalledServerCredentials(hostname.textField.text, username.textField.text, secretData.textField.text)
+
                     PageController.goToPage(PageEnum.PageSetupWizardProtocols)
                 }
             }
diff --git a/client/ui/qml/Pages2/PageSetupWizardInstalling.qml b/client/ui/qml/Pages2/PageSetupWizardInstalling.qml
index fa0d5a14..c2c761cc 100644
--- a/client/ui/qml/Pages2/PageSetupWizardInstalling.qml
+++ b/client/ui/qml/Pages2/PageSetupWizardInstalling.qml
@@ -2,6 +2,8 @@ import QtQuick
 import QtQuick.Controls
 import QtQuick.Layouts
 
+import SortFilterProxyModel 0.2
+
 import PageEnum 1.0
 
 import "./"
@@ -12,32 +14,111 @@ import "../Config"
 Item {
     id: root
 
+    property real progressBarValue: 0
+
+    SortFilterProxyModel {
+        id: proxyContainersModel
+        sourceModel: ContainersModel
+        filters: [
+            ValueFilter {
+                roleName: "isCurrentlyInstalled"
+                value: true
+            }
+        ]
+    }
+
     FlickableType {
         id: fl
-        anchors.top: root.top
-        anchors.bottom: root.bottom
+        anchors.fill: parent
         contentHeight: content.height
 
-        ColumnLayout {
+        Column {
             id: content
 
             anchors.top: parent.top
             anchors.left: parent.left
             anchors.right: parent.right
-            anchors.rightMargin: 16
-            anchors.leftMargin: 16
 
             spacing: 16
 
-            HeaderType {
-                Layout.fillWidth: true
-                Layout.topMargin: 20
+            ListView {
+                // todo change id naming
+                id: container
+                width: parent.width
+                height: container.contentItem.height
+                currentIndex: -1
+                clip: true
+                interactive: false
+                model: proxyContainersModel
 
-                //TODO remove later
-                backButtonImage: "qrc:/images/controls/arrow-left.svg"
+                delegate: Item {
+                    implicitWidth: container.width
+                    implicitHeight: delegateContent.implicitHeight
 
-                headerText: "Установка"
-                descriptionText: ContainersModel.getCurrentlyInstalledContainerName()
+                    ColumnLayout {
+                        id: delegateContent
+
+                        anchors.fill: parent
+                        anchors.rightMargin: 16
+                        anchors.leftMargin: 16
+
+                        HeaderType {
+                            Layout.fillWidth: true
+                            Layout.topMargin: 20
+
+                            headerText: "Установка"
+                            descriptionText: name
+                        }
+
+                        ProgressBarType {
+                            id: progressBar
+
+                            Layout.fillWidth: true
+                            Layout.topMargin: 32
+
+                            value: progressBarValue
+
+                            Timer {
+                                id: timer
+
+                                interval: 300
+                                repeat: true
+                                running: true
+                                onTriggered: {
+                                    progressBarValue += 0.001
+                                }
+                            }
+                        }
+
+                        ParagraphTextType {
+                            Layout.fillWidth: true
+                            Layout.topMargin: 8
+
+                            text: "Обычно это занимает не больше 5 минут"
+                        }
+                    }
+                }
+            }
+        }
+
+        Timer {
+            id: closePageTimer
+
+            interval: 1000
+            repeat: false
+            running: false
+            onTriggered: {
+                // todo go to root installing page
+                PageController.goToPage(PageEnum.PageHome)
+            }
+        }
+
+        Connections {
+            target: InstallController
+
+            function onInstallContainerFinished() {
+                progressBarValue = 1
+                closePageTimer.start()
             }
         }
     }
diff --git a/client/ui/qml/Pages2/PageSetupWizardProtocolSettings.qml b/client/ui/qml/Pages2/PageSetupWizardProtocolSettings.qml
index 6c3b64b9..9499f5a5 100644
--- a/client/ui/qml/Pages2/PageSetupWizardProtocolSettings.qml
+++ b/client/ui/qml/Pages2/PageSetupWizardProtocolSettings.qml
@@ -2,7 +2,11 @@ import QtQuick
 import QtQuick.Controls
 import QtQuick.Layouts
 
+import SortFilterProxyModel 0.2
+
 import PageEnum 1.0
+import ContainerProps 1.0
+import ProtocolProps 1.0
 
 import "./"
 import "../Controls2"
@@ -12,83 +16,169 @@ import "../Config"
 Item {
     id: root
 
+    SortFilterProxyModel {
+        id: proxyContainersModel
+        sourceModel: ContainersModel
+        filters: [
+            ValueFilter {
+                roleName: "isCurrentlyInstalled"
+                value: true
+            }
+        ]
+    }
+
     FlickableType {
         id: fl
-        anchors.top: root.top
-        anchors.bottom: root.bottom
+        anchors.fill: parent
         contentHeight: content.height
 
-        ColumnLayout {
+        Column {
             id: content
 
             anchors.top: parent.top
             anchors.left: parent.left
             anchors.right: parent.right
-            anchors.rightMargin: 16
-            anchors.leftMargin: 16
 
             spacing: 16
 
-            HeaderType {
-                Layout.fillWidth: true
-                Layout.topMargin: 20
+            ListView {
+                // todo change id naming
+                id: containers
+                width: parent.width
+                height: containers.contentItem.height
+                currentIndex: -1
+                clip: true
+                interactive: false
+                model: proxyContainersModel
 
-                backButtonImage: "qrc:/images/controls/arrow-left.svg"
+                delegate: Item {
+                    implicitWidth: containers.width
+                    implicitHeight: delegateContent.implicitHeight
 
-                headerText: "Установка " + ContainersModel.getCurrentlyInstalledContainerName()
-                descriptionText: "Эти настройки можно будет изменить позже"
-            }
+                    ColumnLayout {
+                        id: delegateContent
 
-            ParagraphTextType {
-                Layout.topMargin: 16
+                        anchors.fill: parent
+                        anchors.rightMargin: 16
+                        anchors.leftMargin: 16
 
-                text: "Network protocol"
-            }
+                        HeaderType {
+                            id: header
 
-            //TODO move to separete control
-            Rectangle {
-                implicitWidth: buttonGroup.implicitWidth
-                implicitHeight: buttonGroup.implicitHeight
+                            Layout.fillWidth: true
+                            Layout.topMargin: 20
 
-                color: "#1C1D21"
-                radius: 16
+                            backButtonImage: "qrc:/images/controls/arrow-left.svg"
 
-                RowLayout {
-                    id: buttonGroup
+                            headerText: "Установка " + name
+                            descriptionText: "Эти настройки можно будет изменить позже"
+                        }
 
-                    spacing: 0
+                        ParagraphTextType {
+                            id: transportProtoHeader
 
-                    HorizontalRadioButton {
-                        implicitWidth: (root.width - 32) / 2
-                        text: "UDP"
-                    }
+                            Layout.topMargin: 16
 
-                    HorizontalRadioButton {
-                        implicitWidth: (root.width - 32) / 2
-                        text: "TCP"
+                            text: "Network protocol"
+                        }
+
+                        Rectangle {
+                            id: transportProtoBackground
+
+                            implicitWidth: transportProtoButtonGroup.implicitWidth
+                            implicitHeight: transportProtoButtonGroup.implicitHeight
+
+                            color: "#1C1D21"
+                            radius: 16
+
+                            RowLayout {
+                                id: transportProtoButtonGroup
+
+                                property int currentIndex
+                                spacing: 0
+
+                                HorizontalRadioButton {
+                                    checked: transportProtoButtonGroup.currentIndex === 0
+
+                                    implicitWidth: (root.width - 32) / 2
+                                    text: "UDP"
+
+                                    hoverEnabled: !transportProtoButtonMouseArea.enabled
+
+                                    onClicked: {
+                                        transportProtoButtonGroup.currentIndex = 0
+                                    }
+                                }
+
+                                HorizontalRadioButton {
+                                    checked: transportProtoButtonGroup.currentIndex === 1
+
+                                    implicitWidth: (root.width - 32) / 2
+                                    text: "TCP"
+
+                                    hoverEnabled: !transportProtoButtonMouseArea.enabled
+
+                                    onClicked: {
+                                        transportProtoButtonGroup.currentIndex = 1
+                                    }
+                                }    
+                            }
+
+                            MouseArea {
+                                id: transportProtoButtonMouseArea
+
+                                anchors.fill: parent
+                            }
+                        }
+
+                        TextFieldWithHeaderType {
+                            id: port
+
+                            Layout.fillWidth: true
+                            headerText: "Port"
+                        }
+
+                        Rectangle {
+                            // todo make it dynamic
+                            implicitHeight: root.height - port.implicitHeight -
+                                            transportProtoBackground.implicitHeight - transportProtoHeader.implicitHeight -
+                                            header.implicitHeight - installButton.implicitHeight - 100
+
+                            color: "transparent"
+                        }
+
+                        BasicButtonType {
+                            id: installButton
+
+                            Layout.fillWidth: true
+                            Layout.bottomMargin: 32
+
+                            text: qsTr("Установить")
+
+                            onClicked: function() {
+                                PageController.goToPage(PageEnum.PageSetupWizardInstalling);
+
+                                InstallController.install(dockerContainer, port.textFieldText, transportProtoButtonGroup.currentIndex)
+                            }
+                        }
+
+                        Component.onCompleted: {
+                            //todo move to protocols model?
+                            var defaultContainerProto =  ContainerProps.defaultProtocol(dockerContainer)
+
+                            if (ProtocolProps.defaultPort(defaultContainerProto) < 0) {
+                                port.visible = false
+                            } else {
+                                port.textFieldText = ProtocolProps.defaultPort(defaultContainerProto)
+                            }
+                            transportProtoButtonGroup.currentIndex = ProtocolProps.defaultTransportProto(defaultContainerProto)
+
+                            port.enabled = ProtocolProps.defaultPortChangeable(defaultContainerProto)
+                            transportProtoButtonMouseArea.enabled = !ProtocolProps.defaultTransportProtoChangeable(defaultContainerProto)
+                        }
                     }
                 }
             }
-
-            TextFieldWithHeaderType {
-                Layout.fillWidth: true
-                headerText: "Port"
-            }
-        }
-    }
-
-    BasicButtonType {
-        anchors.bottom: parent.bottom
-        anchors.left: parent.left
-        anchors.right: parent.right
-        anchors.rightMargin: 16
-        anchors.leftMargin: 16
-        anchors.bottomMargin: 32
-
-        text: qsTr("Установить")
-
-        onClicked: function() {
-            PageController.goToPage(PageEnum.PageSetupWizardInstalling)
         }
     }
 }
diff --git a/client/ui/qml/Pages2/PageSetupWizardProtocols.qml b/client/ui/qml/Pages2/PageSetupWizardProtocols.qml
index 24a86a07..11b09edd 100644
--- a/client/ui/qml/Pages2/PageSetupWizardProtocols.qml
+++ b/client/ui/qml/Pages2/PageSetupWizardProtocols.qml
@@ -18,10 +18,6 @@ Item {
         id: proxyContainersModel
         sourceModel: ContainersModel
         filters: [
-            ValueFilter {
-                roleName: "is_installed_role"
-                value: false
-            },
             ValueFilter {
                 roleName: "service_type_role"
                 value: ProtocolEnum.Vpn
diff --git a/client/ui/qml/Pages2/PageSetupWizardStart.qml b/client/ui/qml/Pages2/PageSetupWizardStart.qml
index 5f1a0479..8293b210 100644
--- a/client/ui/qml/Pages2/PageSetupWizardStart.qml
+++ b/client/ui/qml/Pages2/PageSetupWizardStart.qml
@@ -96,7 +96,7 @@ Item {
                 radius: 16
                 color: "#1C1D21"
 
-                border.color: borderColor
+                border.color: "#2C2D30"
                 border.width: 1
             }
 

From 04791139494edf5ee9240cb01041afa2d4822068 Mon Sep 17 00:00:00 2001
From: "vladimir.kuznetsov" <nethiuswork@gmail.com>
Date: Mon, 22 May 2023 00:10:51 +0800
Subject: [PATCH 020/278] moved ContainersPageHomeListView and
 ConnectionTypeSelectionDrawer to separate components

---
 client/amnezia_application.h                  |   2 +
 client/containers/containers_defs.cpp         |  30 ++++
 client/containers/containers_defs.h           |   4 +
 client/core/defs.h                            |   4 +-
 client/core/sshclient.cpp                     |   8 +-
 client/resources.qrc                          |   2 +
 client/settings.cpp                           |   4 +-
 client/ui/controllers/installController.cpp   |  16 +-
 client/ui/controllers/installController.h     |   2 +-
 client/ui/models/containers_model.cpp         |  24 ++-
 client/ui/models/containers_model.h           |  16 +-
 client/ui/pages_logic/StartPageLogic.cpp      |   8 +-
 .../ConnectionTypeSelectionDrawer.qml         |  87 +++++++++
 .../Components/ContainersPageHomeListView.qml | 119 +++++++++++++
 client/ui/qml/Controls2/DropDownType.qml      |  30 +---
 client/ui/qml/Pages2/PageHome.qml             | 168 +++---------------
 .../qml/Pages2/PageSetupWizardCredentials.qml |   5 +-
 client/ui/qml/Pages2/PageSetupWizardEasy.qml  | 109 +++++++++---
 .../qml/Pages2/PageSetupWizardInstalling.qml  |   2 +-
 .../PageSetupWizardProtocolSettings.qml       |   1 -
 .../qml/Pages2/PageSetupWizardProtocols.qml   |  11 +-
 client/ui/qml/Pages2/PageSetupWizardStart.qml |  81 +--------
 client/ui/uilogic.cpp                         |   4 +-
 23 files changed, 443 insertions(+), 294 deletions(-)
 create mode 100644 client/ui/qml/Components/ConnectionTypeSelectionDrawer.qml
 create mode 100644 client/ui/qml/Components/ContainersPageHomeListView.qml

diff --git a/client/amnezia_application.h b/client/amnezia_application.h
index e2113908..97b16f13 100644
--- a/client/amnezia_application.h
+++ b/client/amnezia_application.h
@@ -18,6 +18,7 @@
 #include "ui/models/containers_model.h"
 #include "ui/controllers/connectionController.h"
 #include "ui/controllers/pageController.h"
+#include "ui/controllers/installController.h"
 
 #define amnApp (static_cast<AmneziaApplication *>(QCoreApplication::instance()))
 
@@ -69,6 +70,7 @@ private:
 
     QScopedPointer<ConnectionController> m_connectionController;
     QScopedPointer<PageController> m_pageController;
+    QScopedPointer<InstallController> m_installController;
 
 };
 
diff --git a/client/containers/containers_defs.cpp b/client/containers/containers_defs.cpp
index cca77e7d..7c7c000b 100644
--- a/client/containers/containers_defs.cpp
+++ b/client/containers/containers_defs.cpp
@@ -188,3 +188,33 @@ QStringList ContainerProps::fixedPortsForContainer(DockerContainer c)
     default:                             return {};
     }
 }
+
+bool ContainerProps::isEasySetupContainer(DockerContainer container)
+{
+    switch (container) {
+    case DockerContainer::OpenVpn :      return true;
+    case DockerContainer::Cloak :        return true;
+    case DockerContainer::ShadowSocks :  return true;
+    default:                             return false;
+    }
+}
+
+QString ContainerProps::easySetupHeader(DockerContainer container)
+{
+    switch (container) {
+    case DockerContainer::OpenVpn :      return tr("Low");
+    case DockerContainer::Cloak :        return tr("High");
+    case DockerContainer::ShadowSocks :  return tr("Medium");
+    default:                             return "";
+    }
+}
+
+QString ContainerProps::easySetupDescription(DockerContainer container)
+{
+    switch (container) {
+    case DockerContainer::OpenVpn :      return tr("Many foreign websites and VPN providers are blocked");
+    case DockerContainer::Cloak :        return tr("Some foreign sites are blocked, but VPN providers are not blocked");
+    case DockerContainer::ShadowSocks :  return tr("I just want to increase the level of privacy");
+    default:                             return "";
+    }
+}
diff --git a/client/containers/containers_defs.h b/client/containers/containers_defs.h
index ff230c3e..d4a35d26 100644
--- a/client/containers/containers_defs.h
+++ b/client/containers/containers_defs.h
@@ -57,6 +57,10 @@ public:
 
     Q_INVOKABLE static bool isSupportedByCurrentPlatform(amnezia::DockerContainer c);
     Q_INVOKABLE static QStringList fixedPortsForContainer(amnezia::DockerContainer c);
+
+    static bool isEasySetupContainer(amnezia::DockerContainer container);
+    static QString easySetupHeader(amnezia::DockerContainer container);
+    static QString easySetupDescription(amnezia::DockerContainer container);
 };
 
 
diff --git a/client/core/defs.h b/client/core/defs.h
index 452038a5..3a3ff565 100644
--- a/client/core/defs.h
+++ b/client/core/defs.h
@@ -12,10 +12,10 @@ struct ServerCredentials
 {
     QString hostName;
     QString userName;
-    QString password;
+    QString secretData;
     int port = 22;
 
-    bool isValid() const { return !hostName.isEmpty() && !userName.isEmpty() && !password.isEmpty() && port > 0; }
+    bool isValid() const { return !hostName.isEmpty() && !userName.isEmpty() && !secretData.isEmpty() && port > 0; }
 };
 
 enum ErrorCode
diff --git a/client/core/sshclient.cpp b/client/core/sshclient.cpp
index 795af965..0367dc1f 100644
--- a/client/core/sshclient.cpp
+++ b/client/core/sshclient.cpp
@@ -55,10 +55,10 @@ namespace libssh {
             std::string authUsername = credentials.userName.toStdString();
 
             int authResult = SSH_ERROR;
-            if (credentials.password.contains("BEGIN") && credentials.password.contains("PRIVATE KEY")) {
+            if (credentials.secretData.contains("BEGIN") && credentials.secretData.contains("PRIVATE KEY")) {
                 ssh_key privateKey = nullptr;
                 ssh_key publicKey = nullptr;
-                authResult = ssh_pki_import_privkey_base64(credentials.password.toStdString().c_str(), nullptr, callback, nullptr, &privateKey);
+                authResult = ssh_pki_import_privkey_base64(credentials.secretData.toStdString().c_str(), nullptr, callback, nullptr, &privateKey);
                 if (authResult == SSH_OK) {
                     authResult = ssh_pki_export_privkey_to_pubkey(privateKey, &publicKey);
                 }
@@ -86,7 +86,7 @@ namespace libssh {
                     return errorCode;
                 }
             } else {
-                authResult = ssh_userauth_password(m_session, authUsername.c_str(), credentials.password.toStdString().c_str());
+                authResult = ssh_userauth_password(m_session, authUsername.c_str(), credentials.secretData.toStdString().c_str());
                 if (authResult != SSH_OK) {
                     qDebug() << ssh_get_error(m_session);
                     return fromLibsshErrorCode(ssh_get_error_code(m_session));
@@ -354,7 +354,7 @@ namespace libssh {
 
         ssh_key privateKey = nullptr;
         m_passphraseCallback = passphraseCallback;
-        authResult = ssh_pki_import_privkey_base64(credentials.password.toStdString().c_str(), nullptr, callback, nullptr, &privateKey);
+        authResult = ssh_pki_import_privkey_base64(credentials.secretData.toStdString().c_str(), nullptr, callback, nullptr, &privateKey);
         if (authResult == SSH_OK) {
             char* key = new char[65535];
 
diff --git a/client/resources.qrc b/client/resources.qrc
index a50a23c5..ff7139a8 100644
--- a/client/resources.qrc
+++ b/client/resources.qrc
@@ -228,5 +228,7 @@
         <file>images/connectionOn.svg</file>
         <file>images/controls/download.svg</file>
         <file>ui/qml/Controls2/ProgressBarType.qml</file>
+        <file>ui/qml/Components/ConnectionTypeSelectionDrawer.qml</file>
+        <file>ui/qml/Components/ContainersPageHomeListView.qml</file>
     </qresource>
 </RCC>
diff --git a/client/settings.cpp b/client/settings.cpp
index 135e87ba..a978d408 100644
--- a/client/settings.cpp
+++ b/client/settings.cpp
@@ -185,7 +185,7 @@ bool Settings::haveAuthData(int serverIndex) const
 {
     if (serverIndex < 0) return false;
     ServerCredentials cred = serverCredentials(serverIndex);
-    return (!cred.hostName.isEmpty() && !cred.userName.isEmpty() && !cred.password.isEmpty());
+    return (!cred.hostName.isEmpty() && !cred.userName.isEmpty() && !cred.secretData.isEmpty());
 }
 
 QString Settings::nextAvailableServerName() const
@@ -321,7 +321,7 @@ ServerCredentials Settings::serverCredentials(int index) const
     ServerCredentials credentials;
     credentials.hostName = s.value(config_key::hostName).toString();
     credentials.userName = s.value(config_key::userName).toString();
-    credentials.password = s.value(config_key::password).toString();
+    credentials.secretData = s.value(config_key::password).toString();
     credentials.port = s.value(config_key::port).toInt();
 
     return credentials;
diff --git a/client/ui/controllers/installController.cpp b/client/ui/controllers/installController.cpp
index ae753382..3e4809e6 100644
--- a/client/ui/controllers/installController.cpp
+++ b/client/ui/controllers/installController.cpp
@@ -41,7 +41,7 @@ ErrorCode InstallController::installServer(DockerContainer container, QJsonObjec
         QJsonObject server;
         server.insert(config_key::hostName, m_currentlyInstalledServerCredentials.hostName);
         server.insert(config_key::userName, m_currentlyInstalledServerCredentials.userName);
-        server.insert(config_key::password, m_currentlyInstalledServerCredentials.password);
+        server.insert(config_key::password, m_currentlyInstalledServerCredentials.secretData);
         server.insert(config_key::port, m_currentlyInstalledServerCredentials.port);
         server.insert(config_key::description, m_settings->nextAvailableServerName());
 
@@ -50,8 +50,12 @@ ErrorCode InstallController::installServer(DockerContainer container, QJsonObjec
 
         m_settings->addServer(server);
         m_settings->setDefaultServer(m_settings->serversCount() - 1);
+
+        //todo change to server finished
+        emit installContainerFinished();
     }
 
+    //todo error processing
     return errorCode;
 }
 
@@ -71,9 +75,15 @@ ErrorCode InstallController::installContainer(DockerContainer container, QJsonOb
     return errorCode;
 }
 
-void InstallController::setCurrentlyInstalledServerCredentials(const QString &hostName, const QString &userName, const QString &password, const int &port)
+void InstallController::setCurrentlyInstalledServerCredentials(const QString &hostName, const QString &userName, const QString &secretData)
 {
-    m_currentlyInstalledServerCredentials = { hostName, userName, password, port };
+    m_currentlyInstalledServerCredentials.hostName = hostName;
+    if (m_currentlyInstalledServerCredentials.hostName.contains(":")) {
+        m_currentlyInstalledServerCredentials.port = m_currentlyInstalledServerCredentials.hostName.split(":").at(1).toInt();
+        m_currentlyInstalledServerCredentials.hostName = m_currentlyInstalledServerCredentials.hostName.split(":").at(0);
+    }
+    m_currentlyInstalledServerCredentials.userName = userName;
+    m_currentlyInstalledServerCredentials.secretData = secretData;
 }
 
 void InstallController::setShouldCreateServer(bool shouldCreateServer)
diff --git a/client/ui/controllers/installController.h b/client/ui/controllers/installController.h
index f9cd9fb0..c0d6ad20 100644
--- a/client/ui/controllers/installController.h
+++ b/client/ui/controllers/installController.h
@@ -19,7 +19,7 @@ public:
 
 public slots:
     ErrorCode install(DockerContainer container, int port, TransportProto transportProto);
-    void setCurrentlyInstalledServerCredentials(const QString &hostName, const QString &userName, const QString &password, const int &port);
+    void setCurrentlyInstalledServerCredentials(const QString &hostName, const QString &userName, const QString &secretData);
     void setShouldCreateServer(bool shouldCreateServer);
 
 signals:
diff --git a/client/ui/models/containers_model.cpp b/client/ui/models/containers_model.cpp
index a814a838..6a999011 100644
--- a/client/ui/models/containers_model.cpp
+++ b/client/ui/models/containers_model.cpp
@@ -33,6 +33,7 @@ bool ContainersModel::setData(const QModelIndex &index, const QVariant &value, i
 //        return m_settings->containers(m_currentlyProcessedServerIndex).contains(container);
     case IsDefaultRole:
         m_settings->setDefaultContainer(m_currentlyProcessedServerIndex, container);
+        emit defaultContainerChanged();
     }
 
     emit dataChanged(index, index);
@@ -59,12 +60,20 @@ QVariant ContainersModel::data(const QModelIndex &index, int role) const
             return ContainerProps::containerService(container);
         case DockerContainerRole:
             return container;
+        case IsEasySetupContainerRole:
+            return ContainerProps::isEasySetupContainer(container);
+        case EasySetupHeaderRole:
+            return ContainerProps::easySetupHeader(container);
+        case EasySetupDescriptionRole:
+            return ContainerProps::easySetupDescription(container);
         case IsInstalledRole:
             return m_settings->containers(m_currentlyProcessedServerIndex).contains(container);
-        case IsCurrentlyInstalled:
+        case IsCurrentlyInstalledRole:
             return container == static_cast<DockerContainer>(m_currentlyInstalledContainerIndex);
         case IsDefaultRole:
             return container == m_settings->defaultContainer(m_currentlyProcessedServerIndex);
+        case IsSupportedRole:
+            return ContainerProps::isSupportedByCurrentPlatform(container);
     }
 
     return QVariant();
@@ -87,6 +96,11 @@ DockerContainer ContainersModel::getDefaultContainer()
     return m_settings->defaultContainer(m_currentlyProcessedServerIndex);
 }
 
+QString ContainersModel::getDefaultContainerName()
+{
+    return ContainerProps::containerHumanNames().value(getDefaultContainer());
+}
+
 int ContainersModel::getCurrentlyInstalledContainerIndex()
 {
     return m_currentlyInstalledContainerIndex;
@@ -98,8 +112,14 @@ QHash<int, QByteArray> ContainersModel::roleNames() const {
     roles[DescRole] = "description";
     roles[ServiceTypeRole] = "serviceType";
     roles[DockerContainerRole] = "dockerContainer";
+
+    roles[IsEasySetupContainerRole] = "isEasySetupContainer";
+    roles[EasySetupHeaderRole] = "easySetupHeader";
+    roles[EasySetupDescriptionRole] = "easySetupDescription";
+
     roles[IsInstalledRole] = "isInstalled";
-    roles[IsCurrentlyInstalled] = "isCurrentlyInstalled";
+    roles[IsCurrentlyInstalledRole] = "isCurrentlyInstalled";
     roles[IsDefaultRole] = "isDefault";
+    roles[IsSupportedRole] = "isSupported";
     return roles;
 }
diff --git a/client/ui/models/containers_model.h b/client/ui/models/containers_model.h
index 15012925..36b5567a 100644
--- a/client/ui/models/containers_model.h
+++ b/client/ui/models/containers_model.h
@@ -14,16 +14,22 @@ class ContainersModel : public QAbstractListModel
     Q_OBJECT
 public:
     ContainersModel(std::shared_ptr<Settings> settings, QObject *parent = nullptr);
-public:
+
     enum Roles {
         NameRole = Qt::UserRole + 1,
         DescRole,
         ServiceTypeRole,
         ConfigRole,
         DockerContainerRole,
+
+        IsEasySetupContainerRole,
+        EasySetupHeaderRole,
+        EasySetupDescriptionRole,
+
         IsInstalledRole,
-        IsCurrentlyInstalled,
-        IsDefaultRole
+        IsCurrentlyInstalledRole,
+        IsDefaultRole,
+        IsSupportedRole
     };
 
     int rowCount(const QModelIndex &parent = QModelIndex()) const override;
@@ -31,8 +37,12 @@ public:
     bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole) override;
     QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
 
+signals:
+    void defaultContainerChanged();
+
 public slots:
     DockerContainer getDefaultContainer();
+    QString getDefaultContainerName();
 
     void setCurrentlyProcessedServerIndex(int index);
     void setCurrentlyInstalledContainerIndex(int index);
diff --git a/client/ui/pages_logic/StartPageLogic.cpp b/client/ui/pages_logic/StartPageLogic.cpp
index 8d9c33f6..86d972d1 100644
--- a/client/ui/pages_logic/StartPageLogic.cpp
+++ b/client/ui/pages_logic/StartPageLogic.cpp
@@ -123,9 +123,9 @@ void StartPageLogic::onPushButtonConnect()
             key = m_configurator->sshConfigurator->convertOpenSShKey(key);
         }
 
-        serverCredentials.password = key;
+        serverCredentials.secretData = key;
     } else {
-        serverCredentials.password = lineEditPasswordText();
+        serverCredentials.secretData = lineEditPasswordText();
     }
 
     set_pushButtonConnectEnabled(false);
@@ -147,7 +147,7 @@ void StartPageLogic::onPushButtonConnect()
         QString decryptedPrivateKey;
         errorCode = serverController.getDecryptedPrivateKey(serverCredentials, decryptedPrivateKey, passphraseCallback);
         if (errorCode == ErrorCode::NoError) {
-            serverCredentials.password = decryptedPrivateKey;
+            serverCredentials.secretData = decryptedPrivateKey;
         }
     }
 
@@ -220,7 +220,7 @@ bool StartPageLogic::importConnection(const QJsonObject &profile)
     credentials.hostName = profile.value(config_key::hostName).toString();
     credentials.port = profile.value(config_key::port).toInt();
     credentials.userName = profile.value(config_key::userName).toString();
-    credentials.password = profile.value(config_key::password).toString();
+    credentials.secretData = profile.value(config_key::password).toString();
 
     if (credentials.isValid() || profile.contains(config_key::containers)) {
         // check config
diff --git a/client/ui/qml/Components/ConnectionTypeSelectionDrawer.qml b/client/ui/qml/Components/ConnectionTypeSelectionDrawer.qml
new file mode 100644
index 00000000..3ae5b278
--- /dev/null
+++ b/client/ui/qml/Components/ConnectionTypeSelectionDrawer.qml
@@ -0,0 +1,87 @@
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+
+import PageEnum 1.0
+
+import "../Controls2"
+import "../Controls2/TextTypes"
+import "../Config"
+
+Drawer {
+    id: root
+
+    edge: Qt.BottomEdge
+    width: parent.width
+    height: parent.height * 0.4375
+
+    clip: true
+    modal: true
+
+    background: Rectangle {
+        anchors.fill: parent
+        anchors.bottomMargin: -radius
+        radius: 16
+        color: "#1C1D21"
+
+        border.color: "#2C2D30"
+        border.width: 1
+    }
+
+    Overlay.modal: Rectangle {
+        color: Qt.rgba(14/255, 14/255, 17/255, 0.8)
+    }
+
+    ColumnLayout {
+        anchors.top: parent.top
+        anchors.left: parent.left
+        anchors.right: parent.right
+
+        anchors.rightMargin: 16
+        anchors.leftMargin: 16
+
+        Header2TextType {
+            Layout.fillWidth: true
+            Layout.topMargin: 24
+            Layout.alignment: Qt.AlignHCenter
+
+            text: "Данные для подключения"
+            wrapMode: Text.WordWrap
+        }
+
+        LabelWithButtonType {
+            id: ip
+            Layout.fillWidth: true
+            Layout.topMargin: 32
+
+            text: "IP, логин и пароль от сервера"
+            buttonImage: "qrc:/images/controls/chevron-right.svg"
+
+            onClickedFunc: function() {
+                PageController.goToPage(PageEnum.PageSetupWizardCredentials)
+                root.visible = false
+            }
+        }
+        Rectangle {
+            Layout.fillWidth: true
+            height: 1
+            color: "#2C2D30"
+        }
+        LabelWithButtonType {
+            Layout.fillWidth: true
+
+            text: "QR-код, ключ или файл настроек"
+            buttonImage: "qrc:/images/controls/chevron-right.svg"
+
+            onClickedFunc: function() {
+                PageController.goToPage(PageEnum.PageSetupWizardConfigSource)
+                root.visible = false
+            }
+        }
+        Rectangle {
+            Layout.fillWidth: true
+            height: 1
+            color: "#2C2D30"
+        }
+    }
+}
diff --git a/client/ui/qml/Components/ContainersPageHomeListView.qml b/client/ui/qml/Components/ContainersPageHomeListView.qml
new file mode 100644
index 00000000..b3d34b62
--- /dev/null
+++ b/client/ui/qml/Components/ContainersPageHomeListView.qml
@@ -0,0 +1,119 @@
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+
+import SortFilterProxyModel 0.2
+
+import PageEnum 1.0
+import ProtocolEnum 1.0
+
+import "../Controls2"
+import "../Controls2/TextTypes"
+
+
+ListView {
+    id: menuContent
+
+    property var rootWidth
+
+    width: rootWidth
+    height: menuContent.contentItem.height
+
+    clip: true
+
+    ButtonGroup {
+        id: containersRadioButtonGroup
+    }
+
+    delegate: Item {
+        implicitWidth: rootWidth
+        implicitHeight: containerRadioButton.implicitHeight
+
+        RadioButton {
+            id: containerRadioButton
+
+            implicitWidth: parent.width
+            implicitHeight: containerRadioButtonContent.implicitHeight
+
+            hoverEnabled: true
+
+            ButtonGroup.group: containersRadioButtonGroup
+
+            checked: isDefault
+
+            indicator: Rectangle {
+                anchors.fill: parent
+                color: containerRadioButton.hovered ? "#2C2D30" : "#1C1D21"
+
+                Behavior on color {
+                    PropertyAnimation { duration: 200 }
+                }
+            }
+
+            checkable: isInstalled
+
+            RowLayout {
+                id: containerRadioButtonContent
+                anchors.fill: parent
+
+                anchors.rightMargin: 16
+                anchors.leftMargin: 16
+
+                z: 1
+
+                Image {
+                    source: isInstalled ? "qrc:/images/controls/check.svg" : "qrc:/images/controls/download.svg"
+                    visible: isInstalled ? containerRadioButton.checked : true
+
+                    width: 24
+                    height: 24
+
+                    Layout.rightMargin: 8
+                }
+
+                Text {
+                    id: containerRadioButtonText
+
+                    text: name
+                    color: "#D7D8DB"
+                    font.pixelSize: 16
+                    font.weight: 400
+                    font.family: "PT Root UI VF"
+
+                    height: 24
+
+                    Layout.fillWidth: true
+                    Layout.topMargin: 20
+                    Layout.bottomMargin: 20
+                }
+            }
+
+            onClicked: {
+                if (checked) {
+                    isDefault = true
+                    menuContent.currentIndex = index
+                    containersDropDown.menuVisible = false
+                } else {
+                    ContainersModel.setCurrentlyInstalledContainerIndex(proxyContainersModel.mapToSource(index))
+                    InstallController.setShouldCreateServer(false)
+                    PageController.goToPage(PageEnum.PageSetupWizardProtocolSettings)
+                    containersDropDown.menuVisible = false
+                    menu.visible = false
+                }
+            }
+
+            MouseArea {
+                anchors.fill: containerRadioButton
+                cursorShape: Qt.PointingHandCursor
+                enabled: false
+            }
+        }
+
+        Component.onCompleted: {
+            if (isDefault) {
+                root.currentContainerName = name
+            }
+        }
+    }
+}
+
diff --git a/client/ui/qml/Controls2/DropDownType.qml b/client/ui/qml/Controls2/DropDownType.qml
index e2a3531f..2b8986b5 100644
--- a/client/ui/qml/Controls2/DropDownType.qml
+++ b/client/ui/qml/Controls2/DropDownType.qml
@@ -24,8 +24,7 @@ Item {
     property string rootButtonBorderColor: "#494B50"
     property int rootButtonBorderWidth: 1
 
-    property Component menuDelegate
-    property variant menuModel
+    property Component listView
 
     property alias menuVisible: menu.visible
 
@@ -169,30 +168,9 @@ Item {
 
                 spacing: 16
 
-                ButtonGroup {
-                    id: radioButtonGroup
-                }
-
-                ListView {
-                    id: menuContent
-                    width: parent.width
-                    height: menuContent.contentItem.height
-
-                    currentIndex: -1
-
-                    clip: true
-                    interactive: false
-
-                    model: root.menuModel
-
-                    delegate: Row {
-                        Loader {
-                            id: loader
-                            sourceComponent: root.menuDelegate
-                            property QtObject modelData: model
-                            property var delegateIndex: index
-                        }
-                    }
+                Loader {
+                    id: listViewLoader
+                    sourceComponent: root.listView
                 }
             }
         }
diff --git a/client/ui/qml/Pages2/PageHome.qml b/client/ui/qml/Pages2/PageHome.qml
index a29a4089..a04b1744 100644
--- a/client/ui/qml/Pages2/PageHome.qml
+++ b/client/ui/qml/Pages2/PageHome.qml
@@ -6,6 +6,7 @@ import SortFilterProxyModel 0.2
 
 import PageEnum 1.0
 import ProtocolEnum 1.0
+import ContainerProps 1.0
 
 import "./"
 import "../Controls2"
@@ -22,21 +23,28 @@ Item {
 
     property string currentServerName: serversMenuContent.currentItem.delegateData.name
     property string currentServerHostName: serversMenuContent.currentItem.delegateData.hostName
-
     property string currentContainerName
 
     ConnectButton {
         anchors.centerIn: parent
     }
 
+    Connections {
+        target: ContainersModel
+
+        function onDefaultContainerChanged() {
+            root.currentContainerName = ContainersModel.getDefaultContainerName()
+        }
+    }
+
     Rectangle {
         id: buttonBackground
         anchors.fill: buttonContent
         anchors.bottomMargin: -radius
 
         radius: 16
-        color: defaultColor
-        border.color: borderColor
+        color: root.defaultColor
+        border.color: root.borderColor
         border.width: 1
 
         Rectangle {
@@ -44,7 +52,7 @@ Item {
             height: 1
             y: parent.height - height - parent.radius
 
-            color: borderColor
+            color: root.borderColor
         }
     }
 
@@ -59,7 +67,7 @@ Item {
             Layout.alignment: Qt.AlignHCenter | Qt.AlignVCenter
 
             Header1TextType {
-                text: currentServerName
+                text: root.currentServerName
             }
 
             Image {
@@ -74,7 +82,7 @@ Item {
             Layout.bottomMargin: 44
             Layout.alignment: Qt.AlignHCenter | Qt.AlignVCenter
 
-            text: currentContainerName + " | " + currentServerHostName
+            text: root.currentContainerName + " | " + root.currentServerHostName
         }
     }
 
@@ -104,7 +112,7 @@ Item {
             radius: 16
 
             color: "#1C1D21"
-            border.color: borderColor
+            border.color: root.borderColor
             border.width: 1
         }
 
@@ -122,14 +130,14 @@ Item {
                 Layout.topMargin: 24
                 Layout.alignment: Qt.AlignHCenter | Qt.AlignVCenter
 
-                text: currentServerName
+                text: root.currentServerName
             }
 
             LabelTextType {
                 Layout.bottomMargin: 24
                 Layout.alignment: Qt.AlignHCenter | Qt.AlignVCenter
 
-                text: currentServerHostName
+                text: root.currentServerHostName
             }
 
             RowLayout {
@@ -157,6 +165,7 @@ Item {
                     rootButtonMaximumWidth: 150 //todo make it dynamic
                     rootButtonDefaultColor: "#D7D8DB"
 
+                    text: root.currentContainerName
                     textColor: "#0E0E11"
                     headerText: "Протокол подключения"
                     headerBackButtonImage: "qrc:/images/controls/arrow-left.svg"
@@ -167,134 +176,11 @@ Item {
                         containersDropDown.menuVisible = true
                     }
 
-                    menuModel: proxyContainersModel
+                    listView: ContainersPageHomeListView {
+                        rootWidth: root.width
 
-                    ButtonGroup {
-                        id: containersRadioButtonGroup
-                    }
-
-                    menuDelegate: Item {
-                        implicitWidth: root.width
-                        implicitHeight: containerRadioButton.implicitHeight
-
-                        RadioButton {
-                            id: containerRadioButton
-
-                            implicitWidth: parent.width
-                            implicitHeight: containerRadioButtonContent.implicitHeight
-
-                            hoverEnabled: true
-
-                            ButtonGroup.group: containersRadioButtonGroup
-
-                            checked: {
-                                if (modelData !== null) {
-                                    return modelData.isDefault
-                                }
-                                return false
-                            }
-
-                            indicator: Rectangle {
-                                anchors.fill: parent
-                                color: containerRadioButton.hovered ? "#2C2D30" : "#1C1D21"
-
-                                Behavior on color {
-                                    PropertyAnimation { duration: 200 }
-                                }
-                            }
-
-                            checkable: {
-                                if (modelData !== null) {
-                                    if (modelData.isInstalled) {
-                                        return true
-                                    }
-                                }
-                                return false
-                            }
-
-                            RowLayout {
-                                id: containerRadioButtonContent
-                                anchors.fill: parent
-
-                                anchors.rightMargin: 16
-                                anchors.leftMargin: 16
-
-                                z: 1
-
-                                Image {
-                                    source: {
-                                        if (modelData !== null) {
-                                            if (modelData.isInstalled) {
-                                                return "qrc:/images/controls/check.svg"
-                                            }
-                                        }
-                                        return "qrc:/images/controls/download.svg"
-                                    }
-                                    visible: {
-                                        if (modelData !== null) {
-                                            if (modelData.isInstalled) {
-                                                return containerRadioButton.checked
-                                            }
-                                        }
-                                        return true
-                                    }
-
-                                    width: 24
-                                    height: 24
-
-                                    Layout.rightMargin: 8
-                                }
-
-                                Text {
-                                    id: containerRadioButtonText
-
-                                    text: {
-                                        if (modelData !== null) {
-                                            return modelData.name
-                                        } else
-                                            return ""
-                                    }
-                                    color: "#D7D8DB"
-                                    font.pixelSize: 16
-                                    font.weight: 400
-                                    font.family: "PT Root UI VF"
-
-                                    height: 24
-
-                                    Layout.fillWidth: true
-                                    Layout.topMargin: 20
-                                    Layout.bottomMargin: 20
-                                }
-                            }
-
-                            onClicked: {
-                                if (checked) {
-                                    modelData.isDefault = true
-
-                                    containersDropDown.text = containerRadioButtonText.text
-                                    root.currentContainerName = containerRadioButtonText.text
-                                    containersDropDown.menuVisible = false
-                                } else {
-                                    ContainersModel.setCurrentlyInstalledContainerIndex(proxyContainersModel.mapToSource(delegateIndex))
-                                    InstallController.setShouldCreateServer(false)
-                                    PageController.goToPage(PageEnum.PageSetupWizardProtocolSettings)
-                                    containersDropDown.menuVisible = false
-                                    menu.visible = false
-                                }
-                            }
-
-                            MouseArea {
-                                anchors.fill: containerRadioButton
-                                cursorShape: Qt.PointingHandCursor
-                                enabled: false
-                            }
-                        }
-
-                        Component.onCompleted: {
-                            if (modelData !== null && modelData.isDefault) {
-                                containersDropDown.text = modelData.name
-                            }
-                        }
+                        model: proxyContainersModel
+                        currentIndex: ContainersModel.getDefaultContainer()
                     }
                 }
 
@@ -318,9 +204,14 @@ Item {
                 headerText: "Серверы"
 
                 actionButtonFunction: function() {
-                    PageController.goToPage(PageEnum.PageSetupWizardStart)
+                    menu.visible = false
+                    connectionTypeSelection.visible = true
                 }
             }
+
+            ConnectionTypeSelectionDrawer {
+                id: connectionTypeSelection
+            }
         }
 
         FlickableType {
@@ -416,10 +307,9 @@ Item {
 
                             onClicked: {
                                 serversMenuContent.currentIndex = index
-                                root.currentServerName = name
-                                root.currentServerHostName = hostName
 
                                 ServersModel.setDefaultServerIndex(index)
+                                ContainersModel.setCurrentlyProcessedServerIndex(index)
                             }
 
                             MouseArea {
diff --git a/client/ui/qml/Pages2/PageSetupWizardCredentials.qml b/client/ui/qml/Pages2/PageSetupWizardCredentials.qml
index def76b89..20c6e735 100644
--- a/client/ui/qml/Pages2/PageSetupWizardCredentials.qml
+++ b/client/ui/qml/Pages2/PageSetupWizardCredentials.qml
@@ -41,7 +41,7 @@ Item {
                 id: hostname
 
                 Layout.fillWidth: true
-                headerText: "Server IP adress [:port]"
+                headerText: "Server IP address [:port]"
             }
 
             TextFieldWithHeaderType {
@@ -66,6 +66,9 @@ Item {
                 text: qsTr("Настроить сервер простым образом")
 
                 onClicked: function() {
+                    InstallController.setShouldCreateServer(true)
+                    InstallController.setCurrentlyInstalledServerCredentials(hostname.textField.text, username.textField.text, secretData.textField.text)
+
                     PageController.goToPage(PageEnum.PageSetupWizardEasy)
                 }
             }
diff --git a/client/ui/qml/Pages2/PageSetupWizardEasy.qml b/client/ui/qml/Pages2/PageSetupWizardEasy.qml
index 664f4de7..9f53a240 100644
--- a/client/ui/qml/Pages2/PageSetupWizardEasy.qml
+++ b/client/ui/qml/Pages2/PageSetupWizardEasy.qml
@@ -2,7 +2,11 @@ import QtQuick
 import QtQuick.Controls
 import QtQuick.Layouts
 
+import SortFilterProxyModel 0.2
+
 import PageEnum 1.0
+import ContainerProps 1.0
+import ProtocolProps 1.0
 
 import "./"
 import "../Controls2"
@@ -11,13 +15,28 @@ import "../Config"
 Item {
     id: root
 
+    SortFilterProxyModel {
+        id: proxyContainersModel
+        sourceModel: ContainersModel
+        filters: [
+            ValueFilter {
+                roleName: "isEasySetupContainer"
+                value: true
+            }
+        ]
+        sorters: RoleSorter {
+            roleName: "dockerContainer"
+            sortOrder: Qt.DescendingOrder
+        }
+    }
+
     FlickableType {
         id: fl
         anchors.top: root.top
         anchors.bottom: root.bottom
         contentHeight: content.height
 
-        ColumnLayout {
+        Column {
             id: content
 
             anchors.top: parent.top
@@ -25,47 +44,91 @@ Item {
             anchors.right: parent.right
             anchors.rightMargin: 16
             anchors.leftMargin: 16
+            anchors.topMargin: 20
 
             spacing: 16
 
             HeaderType {
-                Layout.fillWidth: true
-                Layout.topMargin: 20
+                implicitWidth: parent.width
+                anchors.topMargin: 20
 
                 backButtonImage: "qrc:/images/controls/arrow-left.svg"
 
-                headerText: "Какой уровень контроля интернета в вашем регионе?"
+                headerText: qsTr("What is the level of Internet control in your region?")
             }
 
-            CardType {
-                Layout.fillWidth: true
+            ListView {
+                id: containers
+                width: parent.width
+                height: containers.contentItem.height
+                spacing: 16
 
-                headerText: "Высокий"
-                bodyText: "Многие иностранные сайты и VPN-провайдеры заблокированы"
-            }
+                currentIndex: 1
+                clip: true
+                interactive: false
+                model: proxyContainersModel
 
-            CardType {
-                Layout.fillWidth: true
+                property int dockerContainer
+                property int containerDefaultPort
+                property int containerDefaultTransportProto
 
-                checked: true
+                delegate: Item {
+                    implicitWidth: containers.width
+                    implicitHeight: delegateContent.implicitHeight
 
-                headerText: "Средний"
-                bodyText: "Некоторые иностранные сайты заблокированы, но VPN-провайдеры не блокируются"
-            }
+                    ColumnLayout {
+                        id: delegateContent
 
-            CardType {
-                Layout.fillWidth: true
+                        anchors.top: parent.top
+                        anchors.left: parent.left
+                        anchors.right: parent.right
 
-                headerText: "Низкий"
-                bodyText: "Хочу просто повысить уровень приватности"
+                        CardType {
+                            id: card
+
+                            Layout.fillWidth: true
+
+                            headerText: easySetupHeader
+                            bodyText: easySetupDescription
+
+                            ButtonGroup.group: buttonGroup
+
+                            onClicked: function() {
+                                var defaultContainerProto =  ContainerProps.defaultProtocol(dockerContainer)
+
+                                containers.dockerContainer = dockerContainer
+                                containers.containerDefaultPort = ProtocolProps.defaultPort(defaultContainerProto)
+                                containers.containerDefaultTransportProto = ProtocolProps.defaultTransportProto(defaultContainerProto)
+                            }
+                        }
+                    }
+
+                    Component.onCompleted: {
+                        if (index === containers.currentIndex) {
+                            card.checked = true
+                            card.clicked()
+                        }
+                    }
+                }
+
+                ButtonGroup {
+                    id: buttonGroup
+                }
             }
 
             BasicButtonType {
-                Layout.fillWidth: true
-                Layout.topMargin: 24
-                Layout.bottomMargin: 32
+                implicitWidth: parent.width
+                anchors.topMargin: 24
+                anchors.bottomMargin: 32
 
-                text: qsTr("Продолжить")
+                text: qsTr("Continue")
+
+                onClicked: function() {
+                    PageController.goToPage(PageEnum.PageSetupWizardInstalling);
+                    InstallController.install(containers.dockerContainer,
+                                              containers.containerDefaultPort,
+                                              containers.containerDefaultTransportProto)
+                }
             }
         }
     }
diff --git a/client/ui/qml/Pages2/PageSetupWizardInstalling.qml b/client/ui/qml/Pages2/PageSetupWizardInstalling.qml
index c2c761cc..b4f44fd9 100644
--- a/client/ui/qml/Pages2/PageSetupWizardInstalling.qml
+++ b/client/ui/qml/Pages2/PageSetupWizardInstalling.qml
@@ -109,7 +109,7 @@ Item {
             running: false
             onTriggered: {
                 // todo go to root installing page
-                PageController.goToPage(PageEnum.PageHome)
+                PageController.goToPage(PageEnum.PageStart)
             }
         }
 
diff --git a/client/ui/qml/Pages2/PageSetupWizardProtocolSettings.qml b/client/ui/qml/Pages2/PageSetupWizardProtocolSettings.qml
index 9499f5a5..e7917627 100644
--- a/client/ui/qml/Pages2/PageSetupWizardProtocolSettings.qml
+++ b/client/ui/qml/Pages2/PageSetupWizardProtocolSettings.qml
@@ -157,7 +157,6 @@ Item {
 
                             onClicked: function() {
                                 PageController.goToPage(PageEnum.PageSetupWizardInstalling);
-
                                 InstallController.install(dockerContainer, port.textFieldText, transportProtoButtonGroup.currentIndex)
                             }
                         }
diff --git a/client/ui/qml/Pages2/PageSetupWizardProtocols.qml b/client/ui/qml/Pages2/PageSetupWizardProtocols.qml
index 11b09edd..f7cd382f 100644
--- a/client/ui/qml/Pages2/PageSetupWizardProtocols.qml
+++ b/client/ui/qml/Pages2/PageSetupWizardProtocols.qml
@@ -19,9 +19,14 @@ Item {
         sourceModel: ContainersModel
         filters: [
             ValueFilter {
-                roleName: "service_type_role"
+                roleName: "serviceType"
                 value: ProtocolEnum.Vpn
+            },
+            ValueFilter {
+                roleName: "isSupported"
+                value: true
             }
+
         ]
     }
 
@@ -77,8 +82,8 @@ Item {
                             Layout.topMargin: 16
                             Layout.bottomMargin: 16
 
-                            text: name_role
-                            descriptionText: desc_role
+                            text: name
+                            descriptionText: description
                             buttonImage: "qrc:/images/controls/chevron-right.svg"
 
                             onClickedFunc: function() {
diff --git a/client/ui/qml/Pages2/PageSetupWizardStart.qml b/client/ui/qml/Pages2/PageSetupWizardStart.qml
index 8293b210..b7d56ce5 100644
--- a/client/ui/qml/Pages2/PageSetupWizardStart.qml
+++ b/client/ui/qml/Pages2/PageSetupWizardStart.qml
@@ -8,6 +8,7 @@ import "./"
 import "../Controls2"
 import "../Config"
 import "../Controls2/TextTypes"
+import "../Components"
 
 Item {
     id: root
@@ -55,7 +56,7 @@ Item {
                 text: qsTr("У меня есть данные для подключения")
 
                 onClicked: {
-                    drawer.visible = true
+                    connectionTypeSelection.visible = true
                 }
             }
 
@@ -80,82 +81,8 @@ Item {
             }
         }
 
-        Drawer {
-            id: drawer
-
-            edge: Qt.BottomEdge
-            width: parent.width
-            height: parent.height * 0.4375
-
-            clip: true
-            modal: true
-
-            background: Rectangle {
-                anchors.fill: parent
-                anchors.bottomMargin: -radius
-                radius: 16
-                color: "#1C1D21"
-
-                border.color: "#2C2D30"
-                border.width: 1
-            }
-
-            Overlay.modal: Rectangle {
-                color: Qt.rgba(14/255, 14/255, 17/255, 0.8)
-            }
-
-            ColumnLayout {
-                anchors.top: parent.top
-                anchors.left: parent.left
-                anchors.right: parent.right
-
-                anchors.rightMargin: 16
-                anchors.leftMargin: 16
-
-                Header2TextType {
-                    Layout.fillWidth: true
-                    Layout.topMargin: 24
-                    Layout.alignment: Qt.AlignHCenter
-
-                    text: "Данные для подключения"
-                    wrapMode: Text.WordWrap
-                }
-
-                LabelWithButtonType {
-                    id: ip
-                    Layout.fillWidth: true
-                    Layout.topMargin: 32
-
-                    text: "IP, логин и пароль от сервера"
-                    buttonImage: "qrc:/images/controls/chevron-right.svg"
-
-                    onClickedFunc: function() {
-                        PageController.goToPage(PageEnum.PageSetupWizardCredentials)
-                        drawer.visible = false
-                    }
-                }
-                Rectangle {
-                    Layout.fillWidth: true
-                    height: 1
-                    color: "#2C2D30"
-                }
-                LabelWithButtonType {
-                    Layout.fillWidth: true
-
-                    text: "QR-код, ключ или файл настроек"
-                    buttonImage: "qrc:/images/controls/chevron-right.svg"
-
-                    onClickedFunc: function() {
-                        PageController.goToPage(PageEnum.PageSetupWizardConfigSource)
-                        drawer.visible = false
-                    }
-                }
-                Rectangle {
-                    Layout.fillWidth: true
-                    height: 1
-                    color: "#2C2D30"
-                }
-            }
+        ConnectionTypeSelectionDrawer {
+            id: connectionTypeSelection
         }
     }
 }
diff --git a/client/ui/uilogic.cpp b/client/ui/uilogic.cpp
index 3ad74645..1cb43ee8 100644
--- a/client/ui/uilogic.cpp
+++ b/client/ui/uilogic.cpp
@@ -350,7 +350,7 @@ void UiLogic::installServer(QPair<DockerContainer, QJsonObject> &container)
                     QJsonObject server;
                     server.insert(config_key::hostName, m_installCredentials.hostName);
                     server.insert(config_key::userName, m_installCredentials.userName);
-                    server.insert(config_key::password, m_installCredentials.password);
+                    server.insert(config_key::password, m_installCredentials.secretData);
                     server.insert(config_key::port, m_installCredentials.port);
                     server.insert(config_key::description, m_settings->nextAvailableServerName());
 
@@ -574,7 +574,7 @@ ErrorCode UiLogic::addAlreadyInstalledContainersGui(bool &isServerCreated)
         if (createNewServer) {
             server.insert(config_key::hostName, installCredentials.hostName);
             server.insert(config_key::userName, installCredentials.userName);
-            server.insert(config_key::password, installCredentials.password);
+            server.insert(config_key::password, installCredentials.secretData);
             server.insert(config_key::port, installCredentials.port);
             server.insert(config_key::description, m_settings->nextAvailableServerName());
         }

From ca6b7fbeb260fd1c61cf959eec7d16c806ba228d Mon Sep 17 00:00:00 2001
From: "vladimir.kuznetsov" <nethiuswork@gmail.com>
Date: Mon, 22 May 2023 22:11:20 +0800
Subject: [PATCH 021/278] added importController

---
 client/amnezia_application.cpp                |   3 +
 client/amnezia_application.h                  |   2 +
 client/ui/controllers/importController.cpp    | 204 ++++++++++++++++++
 client/ui/controllers/importController.h      |  37 ++++
 .../Pages2/PageSetupWizardConfigSource.qml    |  12 +-
 client/ui/qml/Pages2/PageSetupWizardEasy.qml  |   1 +
 6 files changed, 258 insertions(+), 1 deletion(-)
 create mode 100644 client/ui/controllers/importController.cpp
 create mode 100644 client/ui/controllers/importController.h

diff --git a/client/amnezia_application.cpp b/client/amnezia_application.cpp
index df4a4ec1..9fdddc86 100644
--- a/client/amnezia_application.cpp
+++ b/client/amnezia_application.cpp
@@ -124,6 +124,9 @@ void AmneziaApplication::init()
     m_installController.reset(new InstallController(m_serversModel, m_containersModel, m_settings));
     m_engine->rootContext()->setContextProperty("InstallController", m_installController.get());
 
+    m_importController.reset(new ImportController(m_serversModel, m_containersModel, m_settings));
+    m_engine->rootContext()->setContextProperty("ImportController", m_importController.get());
+
     //
     m_uiLogic->registerPagesLogic();
 
diff --git a/client/amnezia_application.h b/client/amnezia_application.h
index 97b16f13..f4156d15 100644
--- a/client/amnezia_application.h
+++ b/client/amnezia_application.h
@@ -19,6 +19,7 @@
 #include "ui/controllers/connectionController.h"
 #include "ui/controllers/pageController.h"
 #include "ui/controllers/installController.h"
+#include "ui/controllers/importController.h"
 
 #define amnApp (static_cast<AmneziaApplication *>(QCoreApplication::instance()))
 
@@ -71,6 +72,7 @@ private:
     QScopedPointer<ConnectionController> m_connectionController;
     QScopedPointer<PageController> m_pageController;
     QScopedPointer<InstallController> m_installController;
+    QScopedPointer<ImportController> m_importController;
 
 };
 
diff --git a/client/ui/controllers/importController.cpp b/client/ui/controllers/importController.cpp
new file mode 100644
index 00000000..ea1e7ad6
--- /dev/null
+++ b/client/ui/controllers/importController.cpp
@@ -0,0 +1,204 @@
+#include "importController.h"
+
+#include <QFile>
+
+namespace {
+    enum class ConfigTypes {
+        Amnezia,
+        OpenVpn,
+        WireGuard
+    };
+
+    ConfigTypes checkConfigFormat(const QString &config)
+    {
+        const QString openVpnConfigPatternCli = "client";
+        const QString openVpnConfigPatternProto1 = "proto tcp";
+        const QString openVpnConfigPatternProto2 = "proto udp";
+        const QString openVpnConfigPatternDriver1 = "dev tun";
+        const QString openVpnConfigPatternDriver2 = "dev tap";
+
+        const QString wireguardConfigPatternSectionInterface = "[Interface]";
+        const QString wireguardConfigPatternSectionPeer = "[Peer]";
+
+        if (config.contains(openVpnConfigPatternCli) &&
+            (config.contains(openVpnConfigPatternProto1) || config.contains(openVpnConfigPatternProto2)) &&
+            (config.contains(openVpnConfigPatternDriver1) || config.contains(openVpnConfigPatternDriver2))) {
+            return ConfigTypes::OpenVpn;
+        } else if (config.contains(wireguardConfigPatternSectionInterface) && config.contains(wireguardConfigPatternSectionPeer)) {
+            return ConfigTypes::WireGuard;
+        }
+        return ConfigTypes::Amnezia;
+    }
+}
+
+ImportController::ImportController(const QSharedPointer<ServersModel> &serversModel,
+                                   const QSharedPointer<ContainersModel> &containersModel,
+                                   const std::shared_ptr<Settings> &settings,
+                                   QObject *parent) : QObject(parent), m_serversModel(serversModel), m_containersModel(containersModel),  m_settings(settings)
+{
+
+}
+
+bool ImportController::importFromFile(const QUrl &fileUrl)
+{
+    QFile file(fileUrl.toLocalFile());
+    if (file.open(QIODevice::ReadOnly)) {
+        QByteArray data = file.readAll();
+
+        auto configFormat = checkConfigFormat(data);
+        if (configFormat == ConfigTypes::OpenVpn) {
+            return importOpenVpnConfig(data);
+        } else if (configFormat == ConfigTypes::WireGuard) {
+            return importWireGuardConfig(data);
+        } else {
+            return importAmneziaConfig(data);
+        }
+    }
+    return false;
+}
+
+bool ImportController::import(const QJsonObject &config)
+{
+    ServerCredentials credentials;
+    credentials.hostName = config.value(config_key::hostName).toString();
+    credentials.port = config.value(config_key::port).toInt();
+    credentials.userName = config.value(config_key::userName).toString();
+    credentials.secretData = config.value(config_key::password).toString();
+
+    if (credentials.isValid() || config.contains(config_key::containers)) {
+        m_settings->addServer(config);
+
+        if (config.value(config_key::containers).toArray().isEmpty()) {
+            m_settings->setDefaultServer(m_settings->serversCount() - 1);
+        }
+
+        emit importFinished();
+    } else {
+        qDebug() << "Failed to import profile";
+        qDebug().noquote() << QJsonDocument(config).toJson();
+        return false;
+    }
+
+    return true;
+}
+
+bool ImportController::importAmneziaConfig(QString data)
+{
+    data.replace("vpn://", "");
+    QByteArray ba = QByteArray::fromBase64(data.toUtf8(), QByteArray::Base64UrlEncoding | QByteArray::OmitTrailingEquals);
+
+    QByteArray ba_uncompressed = qUncompress(ba);
+    if (!ba_uncompressed.isEmpty()) {
+        ba = ba_uncompressed;
+    }
+
+    QJsonObject config;
+    config = QJsonDocument::fromJson(ba).object();
+    if (!config.isEmpty()) {
+        return import(config);
+    }
+
+    return false;
+}
+
+//bool ImportController::importConnectionFromQr(const QByteArray &data)
+//{
+//    QJsonObject dataObj = QJsonDocument::fromJson(data).object();
+//    if (!dataObj.isEmpty()) {
+//        return importConnection(dataObj);
+//    }
+
+//    QByteArray ba_uncompressed = qUncompress(data);
+//    if (!ba_uncompressed.isEmpty()) {
+//        return importConnection(QJsonDocument::fromJson(ba_uncompressed).object());
+//    }
+
+//    return false;
+//}
+
+bool ImportController::importOpenVpnConfig(const QString &data)
+{
+    QJsonObject openVpnConfig;
+    openVpnConfig[config_key::config] = data;
+
+    QJsonObject lastConfig;
+    lastConfig[config_key::last_config] = QString(QJsonDocument(openVpnConfig).toJson());
+    lastConfig[config_key::isThirdPartyConfig] = true;
+
+    QJsonObject containers;
+    containers.insert(config_key::container, QJsonValue("amnezia-openvpn"));
+    containers.insert(config_key::openvpn, QJsonValue(lastConfig));
+
+    QJsonArray arr;
+    arr.push_back(containers);
+
+    QString hostName;
+    const static QRegularExpression hostNameRegExp("remote (.*) [0-9]*");
+    QRegularExpressionMatch hostNameMatch = hostNameRegExp.match(data);
+    if (hostNameMatch.hasMatch()) {
+        hostName = hostNameMatch.captured(1);
+    }
+
+    QJsonObject config;
+    config[config_key::containers] = arr;
+    config[config_key::defaultContainer] = "amnezia-openvpn";
+    config[config_key::description] = m_settings->nextAvailableServerName();
+
+
+    const static QRegularExpression dnsRegExp("dhcp-option DNS (\\b\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}\\b)");
+    QRegularExpressionMatchIterator dnsMatch = dnsRegExp.globalMatch(data);
+    if (dnsMatch.hasNext()) {
+        config[config_key::dns1] = dnsMatch.next().captured(1);
+    }
+    if (dnsMatch.hasNext()) {
+        config[config_key::dns2] = dnsMatch.next().captured(1);
+    }
+
+    config[config_key::hostName] = hostName;
+
+    return import(config);
+}
+
+bool ImportController::importWireGuardConfig(const QString &data)
+{
+    QJsonObject lastConfig;
+    lastConfig[config_key::config] = data;
+
+    const static QRegularExpression hostNameAndPortRegExp("Endpoint = (.*):([0-9]*)");
+    QRegularExpressionMatch hostNameAndPortMatch = hostNameAndPortRegExp.match(data);
+    QString hostName;
+    QString port;
+    if (hostNameAndPortMatch.hasMatch()) {
+        hostName = hostNameAndPortMatch.captured(1);
+        port = hostNameAndPortMatch.captured(2);
+    }
+
+    QJsonObject wireguardConfig;
+    wireguardConfig[config_key::last_config] = QString(QJsonDocument(lastConfig).toJson());
+    wireguardConfig[config_key::isThirdPartyConfig] = true;
+    wireguardConfig[config_key::port] = port;
+    wireguardConfig[config_key::transport_proto] = "udp";
+
+    QJsonObject containers;
+    containers.insert(config_key::container, QJsonValue("amnezia-wireguard"));
+    containers.insert(config_key::wireguard, QJsonValue(wireguardConfig));
+
+    QJsonArray arr;
+    arr.push_back(containers);
+
+    QJsonObject config;
+    config[config_key::containers] = arr;
+    config[config_key::defaultContainer] = "amnezia-wireguard";
+    config[config_key::description] = m_settings->nextAvailableServerName();
+
+    const static QRegularExpression dnsRegExp("DNS = (\\b\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}\\b).*(\\b\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}\\b)");
+    QRegularExpressionMatch dnsMatch = dnsRegExp.match(data);
+    if (dnsMatch.hasMatch()) {
+        config[config_key::dns1] = dnsMatch.captured(1);
+        config[config_key::dns2] = dnsMatch.captured(2);
+    }
+
+    config[config_key::hostName] = hostName;
+
+    return import(config);
+}
diff --git a/client/ui/controllers/importController.h b/client/ui/controllers/importController.h
new file mode 100644
index 00000000..7dd548d8
--- /dev/null
+++ b/client/ui/controllers/importController.h
@@ -0,0 +1,37 @@
+#ifndef IMPORTCONTROLLER_H
+#define IMPORTCONTROLLER_H
+
+#include <QObject>
+
+#include "core/defs.h"
+#include "containers/containers_defs.h"
+#include "ui/models/servers_model.h"
+#include "ui/models/containers_model.h"
+
+class ImportController : public QObject
+{
+    Q_OBJECT
+public:
+    explicit ImportController(const QSharedPointer<ServersModel> &serversModel,
+                              const QSharedPointer<ContainersModel> &containersModel,
+                              const std::shared_ptr<Settings> &settings,
+                              QObject *parent = nullptr);
+
+public slots:
+    bool importFromFile(const QUrl &fileUrl);
+
+signals:
+    void importFinished();
+private:
+    bool import(const QJsonObject &config);
+    bool importAmneziaConfig(QString data);
+    bool importOpenVpnConfig(const QString &data);
+    bool importWireGuardConfig(const QString &data);
+
+    QSharedPointer<ServersModel> m_serversModel;
+    QSharedPointer<ContainersModel> m_containersModel;
+    std::shared_ptr<Settings> m_settings;
+
+};
+
+#endif // IMPORTCONTROLLER_H
diff --git a/client/ui/qml/Pages2/PageSetupWizardConfigSource.qml b/client/ui/qml/Pages2/PageSetupWizardConfigSource.qml
index db2730ac..5f2bf2f3 100644
--- a/client/ui/qml/Pages2/PageSetupWizardConfigSource.qml
+++ b/client/ui/qml/Pages2/PageSetupWizardConfigSource.qml
@@ -13,6 +13,14 @@ import "../Config"
 Item {
     id: root
 
+    Connections {
+        target: ImportController
+
+        function onImportFinished() {
+
+        }
+    }
+
     FlickableType {
         id: fl
         anchors.top: root.top
@@ -63,7 +71,7 @@ Item {
                 FileDialog {
                     id: fileDialog
                     onAccepted: {
-
+                        ImportController.importFromFile(selectedFile)
                     }
                 }
             }
@@ -84,6 +92,7 @@ Item {
                 onClickedFunc: function() {
                 }
             }
+
             Rectangle {
                 Layout.fillWidth: true
                 height: 1
@@ -101,6 +110,7 @@ Item {
                     PageController.goToPage(PageEnum.PageSetupWizardTextKey)
                 }
             }
+
             Rectangle {
                 Layout.fillWidth: true
                 height: 1
diff --git a/client/ui/qml/Pages2/PageSetupWizardEasy.qml b/client/ui/qml/Pages2/PageSetupWizardEasy.qml
index 9f53a240..9555c915 100644
--- a/client/ui/qml/Pages2/PageSetupWizardEasy.qml
+++ b/client/ui/qml/Pages2/PageSetupWizardEasy.qml
@@ -124,6 +124,7 @@ Item {
                 text: qsTr("Continue")
 
                 onClicked: function() {
+                    ContainersModel.setCurrentlyInstalledContainerIndex(containers.dockerContainer)
                     PageController.goToPage(PageEnum.PageSetupWizardInstalling);
                     InstallController.install(containers.dockerContainer,
                                               containers.containerDefaultPort,

From e00656d757646e5fa9c7339fde611969e04d8deb Mon Sep 17 00:00:00 2001
From: "vladimir.kuznetsov" <nethiuswork@gmail.com>
Date: Thu, 25 May 2023 15:40:17 +0800
Subject: [PATCH 022/278] added PageSettings and PageSettingsServersList. -
 replaced PageLoader with PageType with stackView property. - added error
 handling when installing a server/container

---
 client/images/controls/settings.svg           |   4 +
 client/resources.qrc                          |   8 +-
 client/ui/controllers/installController.cpp   |  22 ++--
 client/ui/controllers/installController.h     |   9 +-
 client/ui/controllers/pageController.cpp      |   8 +-
 client/ui/controllers/pageController.h        |   6 +-
 client/ui/models/servers_model.cpp            |  10 +-
 client/ui/models/servers_model.h              |   6 +-
 client/ui/pages.h                             |  21 ++--
 .../ConnectionTypeSelectionDrawer.qml         |   8 +-
 .../Components/ContainersPageHomeListView.qml |   2 +-
 client/ui/qml/Controls2/Header2Type.qml       |   2 +-
 client/ui/qml/Controls2/HeaderType.qml        |   6 +-
 .../ui/qml/Controls2/LabelWithButtonType.qml  |   6 +-
 client/ui/qml/Controls2/PageType.qml          |  31 +++++
 client/ui/qml/Controls2/PopupType.qml         |  61 ++++++++++
 .../Controls2/TextTypes/CaptionTextType.qml   |  13 ++
 client/ui/qml/PageLoader.qml                  |  37 ------
 client/ui/qml/Pages2/PageHome.qml             |  35 ++++--
 client/ui/qml/Pages2/PageSettings.qml         |  68 ++++++++++-
 .../ui/qml/Pages2/PageSettingsServersList.qml | 111 ++++++++++++++++++
 .../Pages2/PageSetupWizardConfigSource.qml    |  12 +-
 .../qml/Pages2/PageSetupWizardCredentials.qml |   6 +-
 client/ui/qml/Pages2/PageSetupWizardEasy.qml  |  11 +-
 .../qml/Pages2/PageSetupWizardInstalling.qml  |  32 ++---
 .../PageSetupWizardProtocolSettings.qml       |   4 +-
 .../qml/Pages2/PageSetupWizardProtocols.qml   |   6 +-
 client/ui/qml/Pages2/PageSetupWizardStart.qml |  36 +++++-
 .../ui/qml/Pages2/PageSetupWizardTextKey.qml  |   4 +-
 client/ui/qml/Pages2/PageStart.qml            |  39 +++++-
 client/ui/qml/main2.qml                       |   4 +-
 31 files changed, 486 insertions(+), 142 deletions(-)
 create mode 100644 client/images/controls/settings.svg
 create mode 100644 client/ui/qml/Controls2/PageType.qml
 create mode 100644 client/ui/qml/Controls2/PopupType.qml
 create mode 100644 client/ui/qml/Controls2/TextTypes/CaptionTextType.qml
 delete mode 100644 client/ui/qml/PageLoader.qml
 create mode 100644 client/ui/qml/Pages2/PageSettingsServersList.qml

diff --git a/client/images/controls/settings.svg b/client/images/controls/settings.svg
new file mode 100644
index 00000000..0693fb4e
--- /dev/null
+++ b/client/images/controls/settings.svg
@@ -0,0 +1,4 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M12.22 2H11.78C11.2496 2 10.7409 2.21071 10.3658 2.58579C9.99072 2.96086 9.78 3.46957 9.78 4V4.18C9.77964 4.53073 9.68706 4.87519 9.51154 5.17884C9.33602 5.48248 9.08374 5.73464 8.78 5.91L8.35 6.16C8.04596 6.33554 7.70108 6.42795 7.35 6.42795C6.99893 6.42795 6.65404 6.33554 6.35 6.16L6.2 6.08C5.74107 5.81526 5.19584 5.74344 4.684 5.88031C4.17217 6.01717 3.73555 6.35154 3.47 6.81L3.25 7.19C2.98526 7.64893 2.91345 8.19416 3.05031 8.706C3.18717 9.21783 3.52154 9.65445 3.98 9.92L4.13 10.02C4.43228 10.1945 4.68362 10.4451 4.85905 10.7468C5.03448 11.0486 5.1279 11.391 5.13 11.74V12.25C5.1314 12.6024 5.03965 12.949 4.86405 13.2545C4.68844 13.5601 4.43521 13.8138 4.13 13.99L3.98 14.08C3.52154 14.3456 3.18717 14.7822 3.05031 15.294C2.91345 15.8058 2.98526 16.3511 3.25 16.81L3.47 17.19C3.73555 17.6485 4.17217 17.9828 4.684 18.1197C5.19584 18.2566 5.74107 18.1847 6.2 17.92L6.35 17.84C6.65404 17.6645 6.99893 17.5721 7.35 17.5721C7.70108 17.5721 8.04596 17.6645 8.35 17.84L8.78 18.09C9.08374 18.2654 9.33602 18.5175 9.51154 18.8212C9.68706 19.1248 9.77964 19.4693 9.78 19.82V20C9.78 20.5304 9.99072 21.0391 10.3658 21.4142C10.7409 21.7893 11.2496 22 11.78 22H12.22C12.7504 22 13.2591 21.7893 13.6342 21.4142C14.0093 21.0391 14.22 20.5304 14.22 20V19.82C14.2204 19.4693 14.3129 19.1248 14.4885 18.8212C14.664 18.5175 14.9163 18.2654 15.22 18.09L15.65 17.84C15.954 17.6645 16.2989 17.5721 16.65 17.5721C17.0011 17.5721 17.346 17.6645 17.65 17.84L17.8 17.92C18.2589 18.1847 18.8042 18.2566 19.316 18.1197C19.8278 17.9828 20.2645 17.6485 20.53 17.19L20.75 16.8C21.0147 16.3411 21.0866 15.7958 20.9497 15.284C20.8128 14.7722 20.4785 14.3356 20.02 14.07L19.87 13.99C19.5648 13.8138 19.3116 13.5601 19.136 13.2545C18.9604 12.949 18.8686 12.6024 18.87 12.25V11.75C18.8686 11.3976 18.9604 11.051 19.136 10.7455C19.3116 10.4399 19.5648 10.1862 19.87 10.01L20.02 9.92C20.4785 9.65445 20.8128 9.21783 20.9497 8.706C21.0866 8.19416 21.0147 7.64893 20.75 7.19L20.53 6.81C20.2645 6.35154 19.8278 6.01717 19.316 5.88031C18.8042 5.74344 18.2589 5.81526 17.8 6.08L17.65 6.16C17.346 6.33554 17.0011 6.42795 16.65 6.42795C16.2989 6.42795 15.954 6.33554 15.65 6.16L15.22 5.91C14.9163 5.73464 14.664 5.48248 14.4885 5.17884C14.3129 4.87519 14.2204 4.53073 14.22 4.18V4C14.22 3.46957 14.0093 2.96086 13.6342 2.58579C13.2591 2.21071 12.7504 2 12.22 2V2Z" stroke="#CBCBCB" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M12 15C13.6569 15 15 13.6569 15 12C15 10.3431 13.6569 9 12 9C10.3431 9 9 10.3431 9 12C9 13.6569 10.3431 15 12 15Z" stroke="#CBCBCB" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/client/resources.qrc b/client/resources.qrc
index ff7139a8..ca1674af 100644
--- a/client/resources.qrc
+++ b/client/resources.qrc
@@ -184,7 +184,6 @@
         <file>ui/qml/Controls2/DropDownType.qml</file>
         <file>ui/qml/Pages2/PageSetupWizardStart.qml</file>
         <file>ui/qml/main2.qml</file>
-        <file>ui/qml/PageLoader.qml</file>
         <file>images/amneziaBigLogo.png</file>
         <file>images/amneziaBigLogo.svg</file>
         <file>ui/qml/Controls2/FlickableType.qml</file>
@@ -215,7 +214,7 @@
         <file>images/controls/settings-2.svg</file>
         <file>images/controls/share-2.svg</file>
         <file>ui/qml/Pages2/PageHome.qml</file>
-        <file>ui/qml/Pages2/PageSettings.qml</file>
+        <file>ui/qml/Pages2/PageSettingsServersList.qml</file>
         <file>ui/qml/Pages2/PageShare.qml</file>
         <file>ui/qml/Controls2/TextTypes/Header1TextType.qml</file>
         <file>ui/qml/Controls2/TextTypes/LabelTextType.qml</file>
@@ -230,5 +229,10 @@
         <file>ui/qml/Controls2/ProgressBarType.qml</file>
         <file>ui/qml/Components/ConnectionTypeSelectionDrawer.qml</file>
         <file>ui/qml/Components/ContainersPageHomeListView.qml</file>
+        <file>ui/qml/Controls2/TextTypes/CaptionTextType.qml</file>
+        <file>images/controls/settings.svg</file>
+        <file>ui/qml/Pages2/PageSettings.qml</file>
+        <file>ui/qml/Controls2/PageType.qml</file>
+        <file>ui/qml/Controls2/PopupType.qml</file>
     </qresource>
 </RCC>
diff --git a/client/ui/controllers/installController.cpp b/client/ui/controllers/installController.cpp
index 3e4809e6..31f58a2a 100644
--- a/client/ui/controllers/installController.cpp
+++ b/client/ui/controllers/installController.cpp
@@ -3,6 +3,7 @@
 #include <QJsonObject>
 
 #include "core/servercontroller.h"
+#include "core/errorstrings.h"
 
 InstallController::InstallController(const QSharedPointer<ServersModel> &serversModel,
                                     const QSharedPointer<ContainersModel> &containersModel,
@@ -12,7 +13,7 @@ InstallController::InstallController(const QSharedPointer<ServersModel> &servers
 
 }
 
-ErrorCode InstallController::install(DockerContainer container, int port, TransportProto transportProto)
+void InstallController::install(DockerContainer container, int port, TransportProto transportProto)
 {
     Proto mainProto = ContainerProps::defaultProtocol(container);
 
@@ -26,13 +27,13 @@ ErrorCode InstallController::install(DockerContainer container, int port, Transp
     };
 
     if (m_shouldCreateServer) {
-        return installServer(container, config);
+        installServer(container, config);
     } else {
-        return installContainer(container, config);
+        installContainer(container, config);
     }
 }
 
-ErrorCode InstallController::installServer(DockerContainer container, QJsonObject& config)
+void InstallController::installServer(DockerContainer container, QJsonObject& config)
 {
     //todo check if container already installed
     ServerController serverController(m_settings);
@@ -51,15 +52,14 @@ ErrorCode InstallController::installServer(DockerContainer container, QJsonObjec
         m_settings->addServer(server);
         m_settings->setDefaultServer(m_settings->serversCount() - 1);
 
-        //todo change to server finished
-        emit installContainerFinished();
+        emit installServerFinished();
+        return;
     }
 
-    //todo error processing
-    return errorCode;
+    emit installationErrorOccurred(errorString(errorCode));
 }
 
-ErrorCode InstallController::installContainer(DockerContainer container, QJsonObject& config)
+void InstallController::installContainer(DockerContainer container, QJsonObject& config)
 {
     //todo check if container already installed
     ServerCredentials serverCredentials = m_serversModel->getCurrentlyProcessedServerCredentials();
@@ -69,10 +69,10 @@ ErrorCode InstallController::installContainer(DockerContainer container, QJsonOb
     if (errorCode == ErrorCode::NoError) {
         m_containersModel->setData(m_containersModel->index(container), config, ContainersModel::Roles::ConfigRole);
         emit installContainerFinished();
+        return;
     }
 
-    //todo error processing
-    return errorCode;
+    emit installationErrorOccurred(errorString(errorCode));
 }
 
 void InstallController::setCurrentlyInstalledServerCredentials(const QString &hostName, const QString &userName, const QString &secretData)
diff --git a/client/ui/controllers/installController.h b/client/ui/controllers/installController.h
index c0d6ad20..d9e1ad95 100644
--- a/client/ui/controllers/installController.h
+++ b/client/ui/controllers/installController.h
@@ -18,15 +18,18 @@ public:
                                QObject *parent = nullptr);
 
 public slots:
-    ErrorCode install(DockerContainer container, int port, TransportProto transportProto);
+    void install(DockerContainer container, int port, TransportProto transportProto);
     void setCurrentlyInstalledServerCredentials(const QString &hostName, const QString &userName, const QString &secretData);
     void setShouldCreateServer(bool shouldCreateServer);
 
 signals:
     void installContainerFinished();
+    void installServerFinished();
+
+    void installationErrorOccurred(QString errorMessage);
 private:
-    ErrorCode installServer(DockerContainer container, QJsonObject& config);
-    ErrorCode installContainer(DockerContainer container, QJsonObject& config);
+    void installServer(DockerContainer container, QJsonObject& config);
+    void installContainer(DockerContainer container, QJsonObject& config);
 
     QSharedPointer<ServersModel> m_serversModel;
     QSharedPointer<ContainersModel> m_containersModel;
diff --git a/client/ui/controllers/pageController.cpp b/client/ui/controllers/pageController.cpp
index 10120767..63c3ba58 100644
--- a/client/ui/controllers/pageController.cpp
+++ b/client/ui/controllers/pageController.cpp
@@ -5,15 +5,15 @@ PageController::PageController(const QSharedPointer<ServersModel> &serversModel,
 {
 }
 
-void PageController::setStartPage()
+QString PageController::getInitialPage()
 {
     if (m_serversModel->getServersCount()) {
         if (m_serversModel->getDefaultServerIndex() < 0) {
             m_serversModel->setDefaultServerIndex(0);
         }
-        emit goToPage(PageLoader::PageEnum::PageStart, false);
+        return getPagePath(PageLoader::PageEnum::PageStart);
     } else {
-        emit goToPage(PageLoader::PageEnum::PageSetupWizardStart, false);
+        return getPagePath(PageLoader::PageEnum::PageSetupWizardStart);
     }
 }
 
@@ -21,5 +21,5 @@ QString PageController::getPagePath(PageLoader::PageEnum page)
 {
     QMetaEnum metaEnum = QMetaEnum::fromType<PageLoader::PageEnum>();
     QString pageName = metaEnum.valueToKey(static_cast<int>(page));
-    return "Pages2/" + pageName + ".qml";
+    return "qrc:/ui/qml/Pages2/" + pageName + ".qml";
 }
diff --git a/client/ui/controllers/pageController.h b/client/ui/controllers/pageController.h
index 9bfd6bda..f37edca9 100644
--- a/client/ui/controllers/pageController.h
+++ b/client/ui/controllers/pageController.h
@@ -36,12 +36,12 @@ public:
                             QObject *parent = nullptr);
 
 public slots:
-    void setStartPage();
+    QString getInitialPage();
     QString getPagePath(PageLoader::PageEnum page);
 
 signals:
-    void goToPage(PageLoader::PageEnum page, bool slide = true);
-    void closePage();
+    void goToPageHome();
+    void showErrorMessage(QString errorMessage);
 
 private:
     QSharedPointer<ServersModel> m_serversModel;
diff --git a/client/ui/models/servers_model.cpp b/client/ui/models/servers_model.cpp
index fe973811..884009e8 100644
--- a/client/ui/models/servers_model.cpp
+++ b/client/ui/models/servers_model.cpp
@@ -51,6 +51,8 @@ QVariant ServersModel::data(const QModelIndex &index, int role) const
         return QVariant::fromValue(m_settings->serverCredentials(index.row()));
     case IsDefaultRole:
         return index.row() == m_settings->defaultServerIndex();
+    case IsCurrentlyProcessedRole:
+        return index.row() == m_currenlyProcessedServerIndex;
     }
 
     return QVariant();
@@ -59,7 +61,7 @@ QVariant ServersModel::data(const QModelIndex &index, int role) const
 //todo mode to setData?
 void ServersModel::setDefaultServerIndex(int index)
 {
-//    beginResetModel();
+    //    beginResetModel();
     m_settings->setDefaultServer(index);
     //    endResetModel();
 }
@@ -84,11 +86,17 @@ ServerCredentials ServersModel::getCurrentlyProcessedServerCredentials()
     return qvariant_cast<ServerCredentials>(data(index(m_currenlyProcessedServerIndex), CredentialsRole));
 }
 
+void ServersModel::addServer()
+{
+
+}
+
 QHash<int, QByteArray> ServersModel::roleNames() const {
     QHash<int, QByteArray> roles;
     roles[NameRole] = "name";
     roles[HostNameRole] = "hostName";
     roles[CredentialsRole] = "credentials";
     roles[IsDefaultRole] = "isDefault";
+    roles[IsCurrentlyProcessedRole] = "isCurrentlyProcessed";
     return roles;
 }
diff --git a/client/ui/models/servers_model.h b/client/ui/models/servers_model.h
index 08b44976..ae1ec8d9 100644
--- a/client/ui/models/servers_model.h
+++ b/client/ui/models/servers_model.h
@@ -19,7 +19,8 @@ public:
         NameRole = Qt::UserRole + 1,
         HostNameRole,
         CredentialsRole,
-        IsDefaultRole
+        IsDefaultRole,
+        IsCurrentlyProcessedRole
     };
 
     ServersModel(std::shared_ptr<Settings> settings, QObject *parent = nullptr);
@@ -32,11 +33,14 @@ public:
 public slots:
     void setDefaultServerIndex(int index);
     const int getDefaultServerIndex();
+
     const int getServersCount();
 
     void setCurrentlyProcessedServerIndex(int index);
     ServerCredentials getCurrentlyProcessedServerCredentials();
 
+    void addServer();
+
 protected:
     QHash<int, QByteArray> roleNames() const override;
 
diff --git a/client/ui/pages.h b/client/ui/pages.h
index b2e191c7..82c0d409 100644
--- a/client/ui/pages.h
+++ b/client/ui/pages.h
@@ -21,18 +21,19 @@ public:
 namespace PageEnumNS
 {
 Q_NAMESPACE
-enum class Page {Start = 0, NewServer, NewServerProtocols, Vpn,
-           Wizard, WizardLow, WizardMedium, WizardHigh, WizardVpnMode, ServerConfiguringProgress,
-           GeneralSettings, AppSettings, NetworkSettings, ServerSettings,
-           ServerContainers, ServersList, ShareConnection,  Sites,
-           ProtocolSettings, ProtocolShare, QrDecoder, QrDecoderIos, About, ViewConfig,
-           AdvancedServerSettings, ClientManagement, ClientInfo,
+enum class Page { Start = 0, NewServer, NewServerProtocols, Vpn,
+                  Wizard, WizardLow, WizardMedium, WizardHigh, WizardVpnMode, ServerConfiguringProgress,
+                  GeneralSettings, AppSettings, NetworkSettings, ServerSettings,
+                  ServerContainers, ServersList, ShareConnection,  Sites,
+                  ProtocolSettings, ProtocolShare, QrDecoder, QrDecoderIos, About, ViewConfig,
+                  AdvancedServerSettings, ClientManagement, ClientInfo,
 
-           PageSetupWizardStart, PageTest, PageSetupWizardCredentials, PageSetupWizardProtocols, PageSetupWizardEasy,
-           PageSetupWizardProtocolSettings, PageSetupWizardInstalling, PageSetupWizardConfigSource,
-           PageSetupWizardTextKey,
+                  PageSetupWizardStart, PageTest, PageSetupWizardCredentials, PageSetupWizardProtocols, PageSetupWizardEasy,
+                  PageSetupWizardProtocolSettings, PageSetupWizardInstalling, PageSetupWizardConfigSource, PageSetupWizardTextKey,
 
-           PageStart, PageHome, PageSettings, PageShare};
+                  PageSettings, PageSettingsServersList,
+
+                  PageStart, PageHome, PageShare};
 Q_ENUM_NS(Page)
 
 static void declareQmlPageEnum() {
diff --git a/client/ui/qml/Components/ConnectionTypeSelectionDrawer.qml b/client/ui/qml/Components/ConnectionTypeSelectionDrawer.qml
index 3ae5b278..20029eb0 100644
--- a/client/ui/qml/Components/ConnectionTypeSelectionDrawer.qml
+++ b/client/ui/qml/Components/ConnectionTypeSelectionDrawer.qml
@@ -57,8 +57,8 @@ Drawer {
             text: "IP, логин и пароль от сервера"
             buttonImage: "qrc:/images/controls/chevron-right.svg"
 
-            onClickedFunc: function() {
-                PageController.goToPage(PageEnum.PageSetupWizardCredentials)
+            clickedFunction: function() {
+                goToPage(PageEnum.PageSetupWizardCredentials)
                 root.visible = false
             }
         }
@@ -73,8 +73,8 @@ Drawer {
             text: "QR-код, ключ или файл настроек"
             buttonImage: "qrc:/images/controls/chevron-right.svg"
 
-            onClickedFunc: function() {
-                PageController.goToPage(PageEnum.PageSetupWizardConfigSource)
+            clickedFunction: function() {
+                goToPage(PageEnum.PageSetupWizardConfigSource)
                 root.visible = false
             }
         }
diff --git a/client/ui/qml/Components/ContainersPageHomeListView.qml b/client/ui/qml/Components/ContainersPageHomeListView.qml
index b3d34b62..309b4217 100644
--- a/client/ui/qml/Components/ContainersPageHomeListView.qml
+++ b/client/ui/qml/Components/ContainersPageHomeListView.qml
@@ -96,7 +96,7 @@ ListView {
                 } else {
                     ContainersModel.setCurrentlyInstalledContainerIndex(proxyContainersModel.mapToSource(index))
                     InstallController.setShouldCreateServer(false)
-                    PageController.goToPage(PageEnum.PageSetupWizardProtocolSettings)
+                    goToPage(PageEnum.PageSetupWizardProtocolSettings)
                     containersDropDown.menuVisible = false
                     menu.visible = false
                 }
diff --git a/client/ui/qml/Controls2/Header2Type.qml b/client/ui/qml/Controls2/Header2Type.qml
index f985d523..ce9d804a 100644
--- a/client/ui/qml/Controls2/Header2Type.qml
+++ b/client/ui/qml/Controls2/Header2Type.qml
@@ -36,7 +36,7 @@ Item {
                 if (backButtonFunction && typeof backButtonFunction === "function") {
                     backButtonFunction()
                 } else {
-                    PageController.closePage()
+                    closePage()
                 }
             }
         }
diff --git a/client/ui/qml/Controls2/HeaderType.qml b/client/ui/qml/Controls2/HeaderType.qml
index 6c4e7847..2c0fbd85 100644
--- a/client/ui/qml/Controls2/HeaderType.qml
+++ b/client/ui/qml/Controls2/HeaderType.qml
@@ -36,7 +36,7 @@ Item {
                 if (backButtonFunction && typeof backButtonFunction === "function") {
                     backButtonFunction()
                 } else {
-                    PageController.closePage()
+                    closePage()
                 }
             }
         }
@@ -61,8 +61,8 @@ Item {
                 visible: image ? true : false
 
                 onClicked: {
-                    if (actionButtonImage && typeof actionButtonImage === "function") {
-                        actionButtonImage()
+                    if (actionButtonFunction && typeof actionButtonFunction === "function") {
+                        actionButtonFunction()
                     }
                 }
             }
diff --git a/client/ui/qml/Controls2/LabelWithButtonType.qml b/client/ui/qml/Controls2/LabelWithButtonType.qml
index d8e195f1..2530f583 100644
--- a/client/ui/qml/Controls2/LabelWithButtonType.qml
+++ b/client/ui/qml/Controls2/LabelWithButtonType.qml
@@ -8,7 +8,7 @@ Item {
     property string text
     property string descriptionText
 
-    property var onClickedFunc
+    property var clickedFunction
 
     property alias buttonImage: button.image
     property string iconImage
@@ -68,8 +68,8 @@ Item {
             hoverEnabled: false
             image: buttonImage
             onClicked: {
-                if (onClickedFunc && typeof onClickedFunc === "function") {
-                    onClickedFunc()
+                if (clickedFunction && typeof clickedFunction === "function") {
+                    clickedFunction()
                 }
             }
 
diff --git a/client/ui/qml/Controls2/PageType.qml b/client/ui/qml/Controls2/PageType.qml
new file mode 100644
index 00000000..4eb51753
--- /dev/null
+++ b/client/ui/qml/Controls2/PageType.qml
@@ -0,0 +1,31 @@
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+
+Item {
+    id: root
+
+    property StackView stackView: StackView.view
+
+    function goToPage(page, slide = true) {
+        if (slide) {
+            root.stackView.push(PageController.getPagePath(page), {}, StackView.PushTransition)
+        } else {
+            root.stackView.push(PageController.getPagePath(page), {}, StackView.Immediate)
+        }
+    }
+
+    function closePage() {
+        if (root.stackView.depth <= 1) {
+            return
+        }
+
+        root.stackView.pop()
+    }
+
+    function goToStartPage() {
+        while (root.stackView.depth > 1) {
+            root.stackView.pop()
+        }
+    }
+}
diff --git a/client/ui/qml/Controls2/PopupType.qml b/client/ui/qml/Controls2/PopupType.qml
new file mode 100644
index 00000000..dd92d5fe
--- /dev/null
+++ b/client/ui/qml/Controls2/PopupType.qml
@@ -0,0 +1,61 @@
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+
+import "TextTypes"
+
+Popup {
+    id: root
+
+    property string popupErrorMessageText
+    property bool closeButtonVisible: true
+
+    leftMargin: 25
+    rightMargin: 25
+    bottomMargin: 70
+
+    width: parent.width - leftMargin - rightMargin
+
+    anchors.centerIn: parent
+    modal: true
+    closePolicy: Popup.CloseOnEscape
+
+    Overlay.modal: Rectangle {
+        color: Qt.rgba(14/255, 14/255, 17/255, 0.8)
+    }
+
+    background: Rectangle {
+        anchors.fill: parent
+
+        color: Qt.rgba(215/255, 216/255, 219/255, 0.95)
+        radius: 4
+    }
+
+    contentItem: RowLayout {
+        width: parent.width
+
+        CaptionTextType {
+            horizontalAlignment: Text.AlignHCenter
+            Layout.fillWidth: true
+
+            text: root.popupErrorMessageText
+        }
+
+        BasicButtonType {
+            visible: closeButtonVisible
+
+            defaultColor: Qt.rgba(215/255, 216/255, 219/255, 0.95)
+            hoveredColor: "#C1C2C5"
+            pressedColor: "#AEB0B7"
+            disabledColor: "#494B50"
+
+            textColor: "#0E0E11"
+            borderWidth: 0
+
+            text: "Close"
+            onClicked: {
+                root.close()
+            }
+        }
+    }
+}
diff --git a/client/ui/qml/Controls2/TextTypes/CaptionTextType.qml b/client/ui/qml/Controls2/TextTypes/CaptionTextType.qml
new file mode 100644
index 00000000..15cc96c1
--- /dev/null
+++ b/client/ui/qml/Controls2/TextTypes/CaptionTextType.qml
@@ -0,0 +1,13 @@
+import QtQuick
+
+Text {
+    height: 16
+
+    color: "#0E0E11"
+    font.pixelSize: 13
+    font.weight: Font.Normal
+    font.family: "PT Root UI VF"
+    font.letterSpacing: 0.02
+
+    wrapMode: Text.WordWrap
+}
diff --git a/client/ui/qml/PageLoader.qml b/client/ui/qml/PageLoader.qml
deleted file mode 100644
index b3d53a05..00000000
--- a/client/ui/qml/PageLoader.qml
+++ /dev/null
@@ -1,37 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-
-StackView {
-    id: stackView
-
-    function gotoPage(page, slide) {
-        if (slide) {
-            stackView.push(PageController.getPagePath(page), {}, StackView.PushTransition)
-        } else {
-            stackView.push(PageController.getPagePath(page), {}, StackView.Immediate)
-        }
-    }
-
-    function closePage() {
-        if (stackView.depth <= 1) {
-            return
-        }
-
-        stackView.pop()
-    }
-
-    Connections {
-        target: PageController
-        function onGoToPage(page, slide) {
-            stackView.gotoPage(page, slide)
-        }
-
-        function onClosePage() {
-            stackView.closePage()
-        }
-    }
-
-    Component.onCompleted: {
-        PageController.setStartPage()
-    }
-}
diff --git a/client/ui/qml/Pages2/PageHome.qml b/client/ui/qml/Pages2/PageHome.qml
index a04b1744..d5455849 100644
--- a/client/ui/qml/Pages2/PageHome.qml
+++ b/client/ui/qml/Pages2/PageHome.qml
@@ -14,7 +14,7 @@ import "../Controls2/TextTypes"
 import "../Config"
 import "../Components"
 
-Item {
+PageType {
     id: root
 
     property string defaultColor: "#1C1D21"
@@ -37,6 +37,21 @@ Item {
         }
     }
 
+    Connections {
+        target: InstallController
+
+        function onInstallContainerFinished() {
+            goToStartPage()
+            menu.visible = true
+            containersDropDown.menuVisible = true
+        }
+
+        function onInstallServerFinished() {
+            goToStartPage()
+            menu.visible = true
+        }
+    }
+
     Rectangle {
         id: buttonBackground
         anchors.fill: buttonContent
@@ -279,6 +294,15 @@ Item {
 
                                 z: 1
 
+                                Image {
+                                    source: "qrc:/images/controls/check.svg"
+                                    visible: serverRadioButton.checked
+                                    width: 24
+                                    height: 24
+
+                                    Layout.rightMargin: 8
+                                }
+
                                 Text {
                                     id: serverRadioButtonText
 
@@ -295,13 +319,10 @@ Item {
                                     Layout.bottomMargin: 20
                                 }
 
-                                Image {
-                                    source: "qrc:/images/controls/check.svg"
-                                    visible: serverRadioButton.checked
-                                    width: 24
-                                    height: 24
+                                ImageButtonType {
+                                    image: "qrc:/images/controls/settings.svg"
 
-                                    Layout.rightMargin: 8
+//                                    onClicked:
                                 }
                             }
 
diff --git a/client/ui/qml/Pages2/PageSettings.qml b/client/ui/qml/Pages2/PageSettings.qml
index 5560aee7..9d5b7442 100644
--- a/client/ui/qml/Pages2/PageSettings.qml
+++ b/client/ui/qml/Pages2/PageSettings.qml
@@ -1,5 +1,71 @@
 import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
 
-Item {
+import SortFilterProxyModel 0.2
 
+import PageEnum 1.0
+import ContainerProps 1.0
+import ProtocolProps 1.0
+
+import "./"
+import "../Controls2"
+import "../Controls2/TextTypes"
+import "../Config"
+
+PageType {
+    id: root
+
+    SortFilterProxyModel {
+        id: proxyServersModel
+        sourceModel: ServersModel
+        filters: [
+            ValueFilter {
+                roleName: "isCurrentlyProcessed"
+                value: true
+            }
+        ]
+    }
+
+    FlickableType {
+        id: fl
+        anchors.fill: parent
+        contentHeight: content.height
+
+        ColumnLayout {
+            id: content
+
+            anchors.top: parent.top
+            anchors.left: parent.left
+            anchors.right: parent.right
+
+            spacing: 16
+
+            Repeater {
+                model: proxyServersModel
+
+                delegate: HeaderType {
+                    id: header
+
+                    Layout.fillWidth: true
+                    Layout.topMargin: 20
+                    Layout.leftMargin: 16
+                    Layout.rightMargin: 16
+
+                    actionButtonImage: "qrc:/images/controls/plus.svg"
+                    backButtonImage: "qrc:/images/controls/arrow-left.svg"
+
+                    headerText: name
+
+                    actionButtonFunction: function() {
+                        connectionTypeSelection.visible = true
+                    }
+
+                    backButtonFunction: function() {
+                        closePage()
+                    }
+                }
+            }
+        }
+    }
 }
diff --git a/client/ui/qml/Pages2/PageSettingsServersList.qml b/client/ui/qml/Pages2/PageSettingsServersList.qml
new file mode 100644
index 00000000..79e24f75
--- /dev/null
+++ b/client/ui/qml/Pages2/PageSettingsServersList.qml
@@ -0,0 +1,111 @@
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+
+import SortFilterProxyModel 0.2
+
+import PageEnum 1.0
+import ProtocolEnum 1.0
+import ContainerProps 1.0
+
+import "./"
+import "../Controls2"
+import "../Controls2/TextTypes"
+import "../Config"
+import "../Components"
+
+PageType {
+    id: root
+
+    HeaderType {
+        id: header
+
+        anchors.top: parent.top
+        anchors.left: parent.left
+        anchors.right: parent.right
+
+        anchors.topMargin: 20
+        anchors.leftMargin: 16
+        anchors.rightMargin: 16
+
+        actionButtonImage: "qrc:/images/controls/plus.svg"
+        backButtonImage: "qrc:/images/controls/arrow-left.svg"
+
+        headerText: "Серверы"
+
+        actionButtonFunction: function() {
+            connectionTypeSelection.visible = true
+        }
+
+        backButtonFunction: function() {
+            PageController.goToPageHome()
+        }
+    }
+
+    ConnectionTypeSelectionDrawer {
+        id: connectionTypeSelection
+    }
+
+    FlickableType {
+        anchors.top: header.bottom
+        anchors.topMargin: 16
+        contentHeight: col.implicitHeight
+
+        Column {
+            id: col
+            anchors.top: parent.top
+            anchors.left: parent.left
+            anchors.right: parent.right
+
+            anchors.leftMargin: 16
+            anchors.rightMargin: 16
+
+            spacing: 16
+
+            ListView {
+                id: servers
+                width: parent.width
+                height: servers.contentItem.height
+
+                model: ServersModel
+
+                clip: true
+
+                delegate: Item {
+                    implicitWidth: servers.width
+                    implicitHeight: delegateContent.implicitHeight
+
+                    ColumnLayout {
+                        id: delegateContent
+
+                        anchors.top: parent.top
+                        anchors.left: parent.left
+                        anchors.right: parent.right
+
+                        LabelWithButtonType {
+                            id: server
+                            Layout.fillWidth: true
+                            Layout.topMargin: 16
+                            Layout.bottomMargin: 16
+
+                            text: name
+                            descriptionText: hostName
+                            buttonImage: "qrc:/images/controls/chevron-right.svg"
+
+                            clickedFunction: function() {
+                                ServersModel.setCurrentlyProcessedServerIndex(index)
+                                goToPage(PageEnum.PageSettings)
+                            }
+                        }
+
+                        Rectangle {
+                            Layout.fillWidth: true
+                            height: 1
+                            color: "#2C2D30"
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/client/ui/qml/Pages2/PageSetupWizardConfigSource.qml b/client/ui/qml/Pages2/PageSetupWizardConfigSource.qml
index 5f2bf2f3..53a40889 100644
--- a/client/ui/qml/Pages2/PageSetupWizardConfigSource.qml
+++ b/client/ui/qml/Pages2/PageSetupWizardConfigSource.qml
@@ -10,7 +10,7 @@ import "../Controls2"
 import "../Controls2/TextTypes"
 import "../Config"
 
-Item {
+PageType {
     id: root
 
     Connections {
@@ -44,7 +44,7 @@ Item {
 
                 backButtonImage: "qrc:/images/controls/arrow-left.svg"
 
-                headerText: "Подключение к серверу"
+                headerText: "Подключение к серверу"
                 descriptionText: "Не используйте код подключения из публичных источников. Его могли создать, чтобы перехватывать ваши данные.\n
 Всё в порядке, если код передал друг."
             }
@@ -64,7 +64,7 @@ Item {
                 buttonImage: "qrc:/images/controls/chevron-right.svg"
                 iconImage: "qrc:/images/controls/folder-open.svg"
 
-                onClickedFunc: function() {
+                clickedFunction: function() {
                     onClicked: fileDialog.open()
                 }
 
@@ -89,7 +89,7 @@ Item {
                 buttonImage: "qrc:/images/controls/chevron-right.svg"
                 iconImage: "qrc:/images/controls/qr-code.svg"
 
-                onClickedFunc: function() {
+                clickedFunction: function() {
                 }
             }
 
@@ -106,8 +106,8 @@ Item {
                 buttonImage: "qrc:/images/controls/chevron-right.svg"
                 iconImage: "qrc:/images/controls/text-cursor.svg"
 
-                onClickedFunc: function() {
-                    PageController.goToPage(PageEnum.PageSetupWizardTextKey)
+                clickedFunction: function() {
+                    goToPage(PageEnum.PageSetupWizardTextKey)
                 }
             }
 
diff --git a/client/ui/qml/Pages2/PageSetupWizardCredentials.qml b/client/ui/qml/Pages2/PageSetupWizardCredentials.qml
index 20c6e735..95463c3e 100644
--- a/client/ui/qml/Pages2/PageSetupWizardCredentials.qml
+++ b/client/ui/qml/Pages2/PageSetupWizardCredentials.qml
@@ -8,7 +8,7 @@ import "./"
 import "../Controls2"
 import "../Config"
 
-Item {
+PageType {
     id: root
 
     FlickableType {
@@ -69,7 +69,7 @@ Item {
                     InstallController.setShouldCreateServer(true)
                     InstallController.setCurrentlyInstalledServerCredentials(hostname.textField.text, username.textField.text, secretData.textField.text)
 
-                    PageController.goToPage(PageEnum.PageSetupWizardEasy)
+                    goToPage(PageEnum.PageSetupWizardEasy)
                 }
             }
 
@@ -90,7 +90,7 @@ Item {
                     InstallController.setShouldCreateServer(true)
                     InstallController.setCurrentlyInstalledServerCredentials(hostname.textField.text, username.textField.text, secretData.textField.text)
 
-                    PageController.goToPage(PageEnum.PageSetupWizardProtocols)
+                    goToPage(PageEnum.PageSetupWizardProtocols)
                 }
             }
         }
diff --git a/client/ui/qml/Pages2/PageSetupWizardEasy.qml b/client/ui/qml/Pages2/PageSetupWizardEasy.qml
index 9555c915..8707c19b 100644
--- a/client/ui/qml/Pages2/PageSetupWizardEasy.qml
+++ b/client/ui/qml/Pages2/PageSetupWizardEasy.qml
@@ -12,7 +12,7 @@ import "./"
 import "../Controls2"
 import "../Config"
 
-Item {
+PageType {
     id: root
 
     SortFilterProxyModel {
@@ -34,7 +34,7 @@ Item {
         id: fl
         anchors.top: root.top
         anchors.bottom: root.bottom
-        contentHeight: content.height
+        contentHeight: content.implicitHeight + buttonContinue.anchors.bottomMargin
 
         Column {
             id: content
@@ -49,8 +49,9 @@ Item {
             spacing: 16
 
             HeaderType {
+                id: header
+
                 implicitWidth: parent.width
-                anchors.topMargin: 20
 
                 backButtonImage: "qrc:/images/controls/arrow-left.svg"
 
@@ -117,6 +118,8 @@ Item {
             }
 
             BasicButtonType {
+                id: buttonContinue
+
                 implicitWidth: parent.width
                 anchors.topMargin: 24
                 anchors.bottomMargin: 32
@@ -125,7 +128,7 @@ Item {
 
                 onClicked: function() {
                     ContainersModel.setCurrentlyInstalledContainerIndex(containers.dockerContainer)
-                    PageController.goToPage(PageEnum.PageSetupWizardInstalling);
+                    goToPage(PageEnum.PageSetupWizardInstalling);
                     InstallController.install(containers.dockerContainer,
                                               containers.containerDefaultPort,
                                               containers.containerDefaultTransportProto)
diff --git a/client/ui/qml/Pages2/PageSetupWizardInstalling.qml b/client/ui/qml/Pages2/PageSetupWizardInstalling.qml
index b4f44fd9..fd8aac6b 100644
--- a/client/ui/qml/Pages2/PageSetupWizardInstalling.qml
+++ b/client/ui/qml/Pages2/PageSetupWizardInstalling.qml
@@ -11,11 +11,20 @@ import "../Controls2"
 import "../Controls2/TextTypes"
 import "../Config"
 
-Item {
+PageType {
     id: root
 
     property real progressBarValue: 0
 
+    Connections {
+        target: InstallController
+
+        function onInstallationErrorOccurred(errorMessage) {
+            closePage()
+            PageController.showErrorMessage(errorMessage)
+        }
+    }
+
     SortFilterProxyModel {
         id: proxyContainersModel
         sourceModel: ContainersModel
@@ -100,26 +109,5 @@ Item {
                 }
             }
         }
-
-        Timer {
-            id: closePageTimer
-
-            interval: 1000
-            repeat: false
-            running: false
-            onTriggered: {
-                // todo go to root installing page
-                PageController.goToPage(PageEnum.PageStart)
-            }
-        }
-
-        Connections {
-            target: InstallController
-
-            function onInstallContainerFinished() {
-                progressBarValue = 1
-                closePageTimer.start()
-            }
-        }
     }
 }
diff --git a/client/ui/qml/Pages2/PageSetupWizardProtocolSettings.qml b/client/ui/qml/Pages2/PageSetupWizardProtocolSettings.qml
index e7917627..fa3ac838 100644
--- a/client/ui/qml/Pages2/PageSetupWizardProtocolSettings.qml
+++ b/client/ui/qml/Pages2/PageSetupWizardProtocolSettings.qml
@@ -13,7 +13,7 @@ import "../Controls2"
 import "../Controls2/TextTypes"
 import "../Config"
 
-Item {
+PageType {
     id: root
 
     SortFilterProxyModel {
@@ -156,7 +156,7 @@ Item {
                             text: qsTr("Установить")
 
                             onClicked: function() {
-                                PageController.goToPage(PageEnum.PageSetupWizardInstalling);
+                                goToPage(PageEnum.PageSetupWizardInstalling);
                                 InstallController.install(dockerContainer, port.textFieldText, transportProtoButtonGroup.currentIndex)
                             }
                         }
diff --git a/client/ui/qml/Pages2/PageSetupWizardProtocols.qml b/client/ui/qml/Pages2/PageSetupWizardProtocols.qml
index f7cd382f..bffe09cb 100644
--- a/client/ui/qml/Pages2/PageSetupWizardProtocols.qml
+++ b/client/ui/qml/Pages2/PageSetupWizardProtocols.qml
@@ -11,7 +11,7 @@ import "./"
 import "../Controls2"
 import "../Config"
 
-Item {
+PageType {
     id: root
 
     SortFilterProxyModel {
@@ -86,9 +86,9 @@ Item {
                             descriptionText: description
                             buttonImage: "qrc:/images/controls/chevron-right.svg"
 
-                            onClickedFunc: function() {
+                            clickedFunction: function() {
                                 ContainersModel.setCurrentlyInstalledContainerIndex(proxyContainersModel.mapToSource(index))
-                                PageController.goToPage(PageEnum.PageSetupWizardProtocolSettings)
+                                goToPage(PageEnum.PageSetupWizardProtocolSettings)
                             }
                         }
 
diff --git a/client/ui/qml/Pages2/PageSetupWizardStart.qml b/client/ui/qml/Pages2/PageSetupWizardStart.qml
index b7d56ce5..4d0f4c5c 100644
--- a/client/ui/qml/Pages2/PageSetupWizardStart.qml
+++ b/client/ui/qml/Pages2/PageSetupWizardStart.qml
@@ -10,9 +10,27 @@ import "../Config"
 import "../Controls2/TextTypes"
 import "../Components"
 
-Item {
+PageType {
     id: root
 
+    Connections {
+        target: PageController
+
+        function onShowErrorMessage(errorMessage) {
+            popupErrorMessage.popupErrorMessageText = errorMessage
+            popupErrorMessage.open()
+        }
+    }
+
+    Connections {
+        target: InstallController
+
+        function onInstallServerFinished() {
+            goToStartPage()
+//            goToPage(PageEnum.PageStart)
+        }
+    }
+
     FlickableType {
         id: fl
         anchors.top: root.top
@@ -44,7 +62,7 @@ Item {
                 Layout.leftMargin: 16
                 Layout.rightMargin: 16
 
-                text: "Бесплатный сервис для создания личного VPN на вашем сервере. Помогаем получать доступ к заблокированному контенту, не раскрывая конфиденциальность даже провайдерам VPN."
+                text: "Бесплатный сервис для создания личного VPN на вашем сервере. Помогаем получать доступ к заблокированному контенту, не раскрывая конфиденциальность даже провайдерам VPN."
             }
 
             BasicButtonType {
@@ -76,7 +94,7 @@ Item {
                 text: qsTr("У меня ничего нет")
 
                 onClicked: {
-                    PageController.goToPage(PageEnum.PageTest)
+                    goToPage(PageEnum.PageTest)
                 }
             }
         }
@@ -85,4 +103,16 @@ Item {
             id: connectionTypeSelection
         }
     }
+
+    Item {
+        anchors.right: parent.right
+        anchors.left: parent.left
+        anchors.bottom: parent.bottom
+
+        implicitHeight: popupErrorMessage.height
+
+        PopupType {
+            id: popupErrorMessage
+        }
+    }
 }
diff --git a/client/ui/qml/Pages2/PageSetupWizardTextKey.qml b/client/ui/qml/Pages2/PageSetupWizardTextKey.qml
index f94b9ff4..43dbda0e 100644
--- a/client/ui/qml/Pages2/PageSetupWizardTextKey.qml
+++ b/client/ui/qml/Pages2/PageSetupWizardTextKey.qml
@@ -9,7 +9,7 @@ import "../Controls2"
 import "../Controls2/TextTypes"
 import "../Config"
 
-Item {
+PageType {
     id: root
 
     FlickableType {
@@ -66,7 +66,7 @@ Item {
         text: qsTr("Подключиться")
 
         onClicked: function() {
-//            PageController.goToPage(PageEnum.PageSetupWizardInstalling)
+//            goToPage(PageEnum.PageSetupWizardInstalling)
         }
     }
 }
diff --git a/client/ui/qml/Pages2/PageStart.qml b/client/ui/qml/Pages2/PageStart.qml
index ade0980d..19ea3bc4 100644
--- a/client/ui/qml/Pages2/PageStart.qml
+++ b/client/ui/qml/Pages2/PageStart.qml
@@ -9,9 +9,22 @@ import "../Controls2"
 import "../Controls2/TextTypes"
 import "../Config"
 
-Item {
+PageType {
     id: root
 
+    Connections {
+        target: PageController
+
+        function onGoToPageHome() {
+            tabBar.currentIndex = 0
+        }
+
+        function onShowErrorMessage(errorMessage) {
+            popupErrorMessage.popupErrorMessageText = errorMessage
+            popupErrorMessage.open()
+        }
+    }
+
     StackLayout {
         id: stackLayout
         currentIndex: tabBar.currentIndex
@@ -24,10 +37,18 @@ Item {
         width: parent.width
         height: root.height - tabBar.implicitHeight
 
-        PageHome {
+        StackView {
+            id: homeStackView
+            initialItem: "PageHome.qml" //PageController.getPagePath(PageEnum.PageSettingsServersList)
         }
 
-        PageSetupWizardEasy {
+        Item {
+
+        }
+
+        StackView {
+            id: settingsStackView
+            initialItem: "PageSettingsServersList.qml" //PageController.getPagePath(PageEnum.PageSettingsServersList)
         }
     }
 
@@ -69,4 +90,16 @@ Item {
         cursorShape: Qt.PointingHandCursor
         enabled: false
     }
+
+    Item {
+        anchors.right: parent.right
+        anchors.left: parent.left
+        anchors.bottom: parent.bottom
+
+        implicitHeight: popupErrorMessage.height
+
+        PopupType {
+            id: popupErrorMessage
+        }
+    }
 }
diff --git a/client/ui/qml/main2.qml b/client/ui/qml/main2.qml
index b10d749f..5ca1b345 100644
--- a/client/ui/qml/main2.qml
+++ b/client/ui/qml/main2.qml
@@ -27,9 +27,9 @@ Window  {
         color: "#0E0E11"
     }
 
-    PageLoader {
-        id: pageLoader
+    StackView {
         anchors.fill: parent
         focus: true
+        initialItem: PageController.getInitialPage()
     }
 }

From 1e180489a40b89265c7789edbfb3813985d201e0 Mon Sep 17 00:00:00 2001
From: "vladimir.kuznetsov" <nethiuswork@gmail.com>
Date: Sat, 27 May 2023 22:46:41 +0800
Subject: [PATCH 023/278] added display of vpn containers and services on the
 settings page - added PageSettingsData and implementation of 'remove all
 containers'  button

---
 client/images/controls/edit-3.svg             |   4 +
 client/resources.qrc                          |   5 +
 client/ui/models/containers_model.cpp         |  18 +++
 client/ui/models/containers_model.h           |   2 +
 .../ConnectionTypeSelectionDrawer.qml         |  22 ++--
 .../Components/ContainersPageHomeListView.qml |   1 -
 .../PageSettingsContainersListView.qml        | 107 ++++++++++++++++++
 client/ui/qml/Controls2/DividerType.qml       |   8 ++
 .../ui/qml/Controls2/LabelWithButtonType.qml  |  58 +++++++---
 .../Controls2/TextTypes/ListItemTitleType.qml |  12 ++
 client/ui/qml/Pages2/PageHome.qml             |  19 +---
 client/ui/qml/Pages2/PageSettings.qml         |  95 ++++++++++++++--
 client/ui/qml/Pages2/PageSettingsData.qml     |  67 +++++++++++
 .../ui/qml/Pages2/PageSettingsServersList.qml |  13 +--
 .../Pages2/PageSetupWizardConfigSource.qml    |  27 ++---
 .../qml/Pages2/PageSetupWizardInstalling.qml  |   8 ++
 .../qml/Pages2/PageSetupWizardProtocols.qml   |  10 +-
 client/ui/qml/Pages2/PageSetupWizardStart.qml |   3 +-
 client/ui/qml/Pages2/PageStart.qml            |  16 ++-
 19 files changed, 393 insertions(+), 102 deletions(-)
 create mode 100644 client/images/controls/edit-3.svg
 create mode 100644 client/ui/qml/Components/PageSettingsContainersListView.qml
 create mode 100644 client/ui/qml/Controls2/DividerType.qml
 create mode 100644 client/ui/qml/Controls2/TextTypes/ListItemTitleType.qml
 create mode 100644 client/ui/qml/Pages2/PageSettingsData.qml

diff --git a/client/images/controls/edit-3.svg b/client/images/controls/edit-3.svg
new file mode 100644
index 00000000..4e1dc071
--- /dev/null
+++ b/client/images/controls/edit-3.svg
@@ -0,0 +1,4 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M12 20H21" stroke="#CBCBCB" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M16.5 3.49998C16.8978 3.10216 17.4374 2.87866 18 2.87866C18.2786 2.87866 18.5544 2.93353 18.8118 3.04014C19.0692 3.14674 19.303 3.303 19.5 3.49998C19.697 3.69697 19.8532 3.93082 19.9598 4.18819C20.0665 4.44556 20.1213 4.72141 20.1213 4.99998C20.1213 5.27856 20.0665 5.55441 19.9598 5.81178C19.8532 6.06915 19.697 6.303 19.5 6.49998L7 19L3 20L4 16L16.5 3.49998Z" stroke="#CBCBCB" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/client/resources.qrc b/client/resources.qrc
index ca1674af..ca02df7d 100644
--- a/client/resources.qrc
+++ b/client/resources.qrc
@@ -234,5 +234,10 @@
         <file>ui/qml/Pages2/PageSettings.qml</file>
         <file>ui/qml/Controls2/PageType.qml</file>
         <file>ui/qml/Controls2/PopupType.qml</file>
+        <file>images/controls/edit-3.svg</file>
+        <file>ui/qml/Pages2/PageSettingsData.qml</file>
+        <file>ui/qml/Components/PageSettingsContainersListView.qml</file>
+        <file>ui/qml/Controls2/TextTypes/ListItemTitleType.qml</file>
+        <file>ui/qml/Controls2/DividerType.qml</file>
     </qresource>
 </RCC>
diff --git a/client/ui/models/containers_model.cpp b/client/ui/models/containers_model.cpp
index 6a999011..4dc7010e 100644
--- a/client/ui/models/containers_model.cpp
+++ b/client/ui/models/containers_model.cpp
@@ -1,5 +1,7 @@
 #include "containers_model.h"
 
+#include "core/servercontroller.h"
+
 ContainersModel::ContainersModel(std::shared_ptr<Settings> settings, QObject *parent) : m_settings(settings), QAbstractListModel(parent)
 {
 }
@@ -106,6 +108,22 @@ int ContainersModel::getCurrentlyInstalledContainerIndex()
     return m_currentlyInstalledContainerIndex;
 }
 
+void ContainersModel::removeAllContainers()
+{
+
+    ServerController serverController(m_settings);
+    auto errorCode = serverController.removeAllContainers(m_settings->serverCredentials(m_currentlyProcessedServerIndex));
+
+    if (errorCode == ErrorCode::NoError) {
+    beginResetModel();
+        m_settings->setContainers(m_currentlyProcessedServerIndex, {});
+        m_settings->setDefaultContainer(m_currentlyProcessedServerIndex, DockerContainer::None);
+        endResetModel();
+    }
+
+    //todo process errors
+}
+
 QHash<int, QByteArray> ContainersModel::roleNames() const {
     QHash<int, QByteArray> roles;
     roles[NameRole] = "name";
diff --git a/client/ui/models/containers_model.h b/client/ui/models/containers_model.h
index 36b5567a..642b6680 100644
--- a/client/ui/models/containers_model.h
+++ b/client/ui/models/containers_model.h
@@ -48,6 +48,8 @@ public slots:
     void setCurrentlyInstalledContainerIndex(int index);
     int getCurrentlyInstalledContainerIndex();
 
+    void removeAllContainers();
+
 protected:
     QHash<int, QByteArray> roleNames() const override;
 
diff --git a/client/ui/qml/Components/ConnectionTypeSelectionDrawer.qml b/client/ui/qml/Components/ConnectionTypeSelectionDrawer.qml
index 20029eb0..2e6b3f2e 100644
--- a/client/ui/qml/Components/ConnectionTypeSelectionDrawer.qml
+++ b/client/ui/qml/Components/ConnectionTypeSelectionDrawer.qml
@@ -37,12 +37,11 @@ Drawer {
         anchors.left: parent.left
         anchors.right: parent.right
 
-        anchors.rightMargin: 16
-        anchors.leftMargin: 16
-
         Header2TextType {
             Layout.fillWidth: true
             Layout.topMargin: 24
+            Layout.rightMargin: 16
+            Layout.leftMargin: 16
             Layout.alignment: Qt.AlignHCenter
 
             text: "Данные для подключения"
@@ -52,7 +51,7 @@ Drawer {
         LabelWithButtonType {
             id: ip
             Layout.fillWidth: true
-            Layout.topMargin: 32
+            Layout.topMargin: 16
 
             text: "IP, логин и пароль от сервера"
             buttonImage: "qrc:/images/controls/chevron-right.svg"
@@ -62,11 +61,9 @@ Drawer {
                 root.visible = false
             }
         }
-        Rectangle {
-            Layout.fillWidth: true
-            height: 1
-            color: "#2C2D30"
-        }
+
+        DividerType {}
+
         LabelWithButtonType {
             Layout.fillWidth: true
 
@@ -78,10 +75,7 @@ Drawer {
                 root.visible = false
             }
         }
-        Rectangle {
-            Layout.fillWidth: true
-            height: 1
-            color: "#2C2D30"
-        }
+
+        DividerType {}
     }
 }
diff --git a/client/ui/qml/Components/ContainersPageHomeListView.qml b/client/ui/qml/Components/ContainersPageHomeListView.qml
index 309b4217..f8b5101e 100644
--- a/client/ui/qml/Components/ContainersPageHomeListView.qml
+++ b/client/ui/qml/Components/ContainersPageHomeListView.qml
@@ -116,4 +116,3 @@ ListView {
         }
     }
 }
-
diff --git a/client/ui/qml/Components/PageSettingsContainersListView.qml b/client/ui/qml/Components/PageSettingsContainersListView.qml
new file mode 100644
index 00000000..2a59b8b2
--- /dev/null
+++ b/client/ui/qml/Components/PageSettingsContainersListView.qml
@@ -0,0 +1,107 @@
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+
+import SortFilterProxyModel 0.2
+
+import PageEnum 1.0
+import ProtocolEnum 1.0
+
+import "../Controls2"
+import "../Controls2/TextTypes"
+
+
+ListView {
+    id: root
+
+    height: root.contentItem.height
+
+    clip: true
+
+    ButtonGroup {
+        id: containersRadioButtonGroup
+    }
+
+    delegate: Item {
+        implicitWidth: parent.width
+        implicitHeight: containerRadioButton.implicitHeight
+
+        RadioButton {
+            id: containerRadioButton
+
+            implicitWidth: parent.width
+            implicitHeight: containerRadioButtonContent.implicitHeight
+
+            hoverEnabled: true
+
+            ButtonGroup.group: containersRadioButtonGroup
+
+            checked: isDefault
+
+            indicator: Rectangle {
+                anchors.fill: parent
+                color: containerRadioButton.hovered ? Qt.rgba(1, 1, 1, 0.08) : "transparent"
+
+                Behavior on color {
+                    PropertyAnimation { duration: 200 }
+                }
+            }
+
+            checkable: isInstalled
+
+            RowLayout {
+                id: containerRadioButtonContent
+                anchors.fill: parent
+
+                anchors.rightMargin: 16
+                anchors.leftMargin: 16
+
+                z: 1
+
+                ColumnLayout {
+                    Layout.topMargin: 20
+                    Layout.bottomMargin: 20
+
+                    ListItemTitleType {
+                        Layout.fillWidth: true
+
+                        text: name
+                    }
+
+                    CaptionTextType {
+                        Layout.fillWidth: true
+
+                        text: description
+                        color: "#878B91"
+                    }
+                }
+
+                Image {
+                    source: isInstalled ? "qrc:/images/controls/chevron-right.svg" : "qrc:/images/controls/download.svg"
+
+                    width: 24
+                    height: 24
+
+                    Layout.rightMargin: 8
+                }
+            }
+
+            onClicked: {
+                if (isInstalled) {
+//                    isDefault = true
+//                    root.currentIndex = index
+                } else {
+                    ContainersModel.setCurrentlyInstalledContainerIndex(root.model.mapToSource(index))
+                    InstallController.setShouldCreateServer(false)
+                    goToPage(PageEnum.PageSetupWizardProtocolSettings)
+                }
+            }
+
+            MouseArea {
+                anchors.fill: containerRadioButton
+                cursorShape: Qt.PointingHandCursor
+                enabled: false
+            }
+        }
+    }
+}
diff --git a/client/ui/qml/Controls2/DividerType.qml b/client/ui/qml/Controls2/DividerType.qml
new file mode 100644
index 00000000..6341807a
--- /dev/null
+++ b/client/ui/qml/Controls2/DividerType.qml
@@ -0,0 +1,8 @@
+import QtQuick
+import QtQuick.Layouts
+
+Rectangle {
+    Layout.fillWidth: true
+    height: 1
+    color: "#2C2D30"
+}
diff --git a/client/ui/qml/Controls2/LabelWithButtonType.qml b/client/ui/qml/Controls2/LabelWithButtonType.qml
index 2530f583..e4e711a6 100644
--- a/client/ui/qml/Controls2/LabelWithButtonType.qml
+++ b/client/ui/qml/Controls2/LabelWithButtonType.qml
@@ -2,6 +2,8 @@ import QtQuick
 import QtQuick.Controls
 import QtQuick.Layouts
 
+import "TextTypes"
+
 Item {
     id: root
 
@@ -13,12 +15,16 @@ Item {
     property alias buttonImage: button.image
     property string iconImage
 
+    property string textColor: "#d7d8db"
+
     implicitWidth: content.implicitWidth
     implicitHeight: content.implicitHeight
 
     RowLayout {
         id: content
         anchors.fill: parent
+        anchors.leftMargin: 16
+        anchors.rightMargin: 16
 
         Image {
             id: icon
@@ -28,34 +34,28 @@ Item {
         }
 
         ColumnLayout {
-            Text {
-                font.family: "PT Root UI VF"
-                font.styleName: "normal"
-                font.pixelSize: 18
-                color: "#d7d8db"
+            ListItemTitleType {
                 text: root.text
-                wrapMode: Text.WordWrap
+                color: textColor
 
                 Layout.fillWidth: true
-                height: 22
+                Layout.topMargin: 16
+                Layout.bottomMargin: description.visible ? 0 : 16
 
                 horizontalAlignment: Text.AlignLeft
                 verticalAlignment: Text.AlignVCenter
             }
 
-            Text {
-                font.family: "PT Root UI VF"
-                font.styleName: "normal"
-                font.pixelSize: 13
-                font.letterSpacing: 0.02
+            CaptionTextType {
+                id: description
+
                 color: "#878B91"
                 text: root.descriptionText
-                wrapMode: Text.WordWrap
 
                 visible: root.descriptionText !== ""
 
                 Layout.fillWidth: true
-                height: 16
+                Layout.bottomMargin: 16
 
                 horizontalAlignment: Text.AlignLeft
                 verticalAlignment: Text.AlignVCenter
@@ -88,21 +88,45 @@ Item {
             }
         }
     }
+
+    Rectangle {
+        id: background
+        anchors.fill: root
+        color: "transparent"
+
+
+        Behavior on color {
+            PropertyAnimation { duration: 200 }
+        }
+    }
+
     MouseArea {
         anchors.fill: parent
         cursorShape: Qt.PointingHandCursor
         hoverEnabled: true
 
         onEntered: {
-            imageBackground.color = button.hoveredColor
+            if (buttonImage) {
+                imageBackground.color = button.hoveredColor
+            } else {
+                background.color = button.hoveredColor
+            }
         }
 
         onExited: {
-            imageBackground.color = button.defaultColor
+            if (buttonImage) {
+                imageBackground.color = button.defaultColor
+            } else {
+                background.color = button.defaultColor
+            }
         }
 
         onPressedChanged: {
-            imageBackground.color = pressed ? button.pressedColor : entered ? button.hoveredColor : button.defaultColor
+            if (buttonImage) {
+                imageBackground.color = pressed ? button.pressedColor : entered ? button.hoveredColor : button.defaultColor
+            } else {
+                background.color = pressed ? button.pressedColor : entered ? button.hoveredColor : button.defaultColor
+            }
         }
 
         onClicked: {
diff --git a/client/ui/qml/Controls2/TextTypes/ListItemTitleType.qml b/client/ui/qml/Controls2/TextTypes/ListItemTitleType.qml
new file mode 100644
index 00000000..23069db2
--- /dev/null
+++ b/client/ui/qml/Controls2/TextTypes/ListItemTitleType.qml
@@ -0,0 +1,12 @@
+import QtQuick
+
+Text {
+    height: 21.6
+
+    color: "#D7D8DB"
+    font.pixelSize: 18
+    font.weight: Font.Normal
+    font.family: "PT Root UI VF"
+
+    wrapMode: Text.WordWrap
+}
diff --git a/client/ui/qml/Pages2/PageHome.qml b/client/ui/qml/Pages2/PageHome.qml
index d5455849..1fba3bff 100644
--- a/client/ui/qml/Pages2/PageHome.qml
+++ b/client/ui/qml/Pages2/PageHome.qml
@@ -37,21 +37,6 @@ PageType {
         }
     }
 
-    Connections {
-        target: InstallController
-
-        function onInstallContainerFinished() {
-            goToStartPage()
-            menu.visible = true
-            containersDropDown.menuVisible = true
-        }
-
-        function onInstallServerFinished() {
-            goToStartPage()
-            menu.visible = true
-        }
-    }
-
     Rectangle {
         id: buttonBackground
         anchors.fill: buttonContent
@@ -166,6 +151,10 @@ PageType {
                         ValueFilter {
                             roleName: "serviceType"
                             value: ProtocolEnum.Vpn
+                        },
+                        ValueFilter {
+                            roleName: "isSupported"
+                            value: true
                         }
                     ]
                 }
diff --git a/client/ui/qml/Pages2/PageSettings.qml b/client/ui/qml/Pages2/PageSettings.qml
index 9d5b7442..57c252b4 100644
--- a/client/ui/qml/Pages2/PageSettings.qml
+++ b/client/ui/qml/Pages2/PageSettings.qml
@@ -5,6 +5,7 @@ import QtQuick.Layouts
 import SortFilterProxyModel 0.2
 
 import PageEnum 1.0
+import ProtocolEnum 1.0
 import ContainerProps 1.0
 import ProtocolProps 1.0
 
@@ -12,6 +13,7 @@ import "./"
 import "../Controls2"
 import "../Controls2/TextTypes"
 import "../Config"
+import "../Components"
 
 PageType {
     id: root
@@ -27,35 +29,28 @@ PageType {
         ]
     }
 
-    FlickableType {
-        id: fl
-        anchors.fill: parent
-        contentHeight: content.height
-
         ColumnLayout {
             id: content
 
-            anchors.top: parent.top
-            anchors.left: parent.left
-            anchors.right: parent.right
+            anchors.fill: parent
 
             spacing: 16
 
             Repeater {
+                id: header
                 model: proxyServersModel
 
                 delegate: HeaderType {
-                    id: header
-
                     Layout.fillWidth: true
                     Layout.topMargin: 20
                     Layout.leftMargin: 16
                     Layout.rightMargin: 16
 
-                    actionButtonImage: "qrc:/images/controls/plus.svg"
+                    actionButtonImage: "qrc:/images/controls/edit-3.svg"
                     backButtonImage: "qrc:/images/controls/arrow-left.svg"
 
                     headerText: name
+                    descriptionText: hostName
 
                     actionButtonFunction: function() {
                         connectionTypeSelection.visible = true
@@ -66,6 +61,82 @@ PageType {
                     }
                 }
             }
+
+            TabBar {
+                id: tabBar
+
+                Layout.fillWidth: true
+
+                background: Rectangle {
+                    color: "transparent"
+                }
+
+                TabButtonType {
+                    isSelected: tabBar.currentIndex === 0
+                    text: qsTr("Protocols")
+                }
+                TabButtonType {
+                    isSelected: tabBar.currentIndex === 1
+                    text: qsTr("Services")
+                }
+                TabButtonType {
+                    isSelected: tabBar.currentIndex === 2
+                    text: qsTr("Data")
+                }
+            }
+
+            StackLayout {
+                id: stackLayout
+                currentIndex: tabBar.currentIndex
+
+                Layout.fillWidth: true
+                height: root.height
+
+                StackView {
+                    id: protocolsStackView
+                    initialItem: PageSettingsContainersListView {
+                        model: SortFilterProxyModel {
+                            sourceModel: ContainersModel
+                            filters: [
+                                ValueFilter {
+                                    roleName: "serviceType"
+                                    value: ProtocolEnum.Vpn
+                                },
+                                ValueFilter {
+                                    roleName: "isSupported"
+                                    value: true
+                                }
+                            ]
+                        }
+                    }
+                }
+
+                StackView {
+                    id: servicesStackView
+                    initialItem: PageSettingsContainersListView {
+                        model: SortFilterProxyModel {
+                            sourceModel: ContainersModel
+                            filters: [
+                                ValueFilter {
+                                    roleName: "serviceType"
+                                    value: ProtocolEnum.Other
+                                },
+                                ValueFilter {
+                                    roleName: "isSupported"
+                                    value: true
+                                }
+                            ]
+                        }
+                    }
+                }
+
+                StackView {
+                    id: dataStackView
+                    initialItem: PageSettingsData {
+
+                    }
+                }
+            }
         }
-    }
+//    }
 }
diff --git a/client/ui/qml/Pages2/PageSettingsData.qml b/client/ui/qml/Pages2/PageSettingsData.qml
new file mode 100644
index 00000000..74293aa5
--- /dev/null
+++ b/client/ui/qml/Pages2/PageSettingsData.qml
@@ -0,0 +1,67 @@
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+
+import SortFilterProxyModel 0.2
+
+import PageEnum 1.0
+import ProtocolEnum 1.0
+
+import "../Controls2"
+import "../Controls2/TextTypes"
+
+PageType {
+    id: root
+
+    FlickableType {
+        id: fl
+        anchors.top: root.top
+        anchors.bottom: root.bottom
+        contentHeight: content.height
+
+        ColumnLayout {
+            id: content
+
+            anchors.top: parent.top
+            anchors.left: parent.left
+            anchors.right: parent.right
+
+            LabelWithButtonType {
+                Layout.fillWidth: true
+
+                text: "Clear Amnezia cache"
+                descriptionText: "May be needed when changing other settings"
+
+                clickedFunction: function() {
+                }
+            }
+
+            DividerType {}
+
+            LabelWithButtonType {
+                Layout.fillWidth: true
+
+                text: "Remove server from application"
+                textColor: "#EB5757"
+
+                clickedFunction: function() {
+                }
+            }
+
+            DividerType {}
+
+            LabelWithButtonType {
+                Layout.fillWidth: true
+
+                text: "Clear server from Amnezia software"
+                textColor: "#EB5757"
+
+                clickedFunction: function() {
+                    ContainersModel.removeAllContainers()
+                }
+            }
+
+            DividerType {}
+        }
+    }
+}
diff --git a/client/ui/qml/Pages2/PageSettingsServersList.qml b/client/ui/qml/Pages2/PageSettingsServersList.qml
index 79e24f75..2344b7e8 100644
--- a/client/ui/qml/Pages2/PageSettingsServersList.qml
+++ b/client/ui/qml/Pages2/PageSettingsServersList.qml
@@ -57,11 +57,6 @@ PageType {
             anchors.left: parent.left
             anchors.right: parent.right
 
-            anchors.leftMargin: 16
-            anchors.rightMargin: 16
-
-            spacing: 16
-
             ListView {
                 id: servers
                 width: parent.width
@@ -85,8 +80,6 @@ PageType {
                         LabelWithButtonType {
                             id: server
                             Layout.fillWidth: true
-                            Layout.topMargin: 16
-                            Layout.bottomMargin: 16
 
                             text: name
                             descriptionText: hostName
@@ -98,11 +91,7 @@ PageType {
                             }
                         }
 
-                        Rectangle {
-                            Layout.fillWidth: true
-                            height: 1
-                            color: "#2C2D30"
-                        }
+                        DividerType {}
                     }
                 }
             }
diff --git a/client/ui/qml/Pages2/PageSetupWizardConfigSource.qml b/client/ui/qml/Pages2/PageSetupWizardConfigSource.qml
index 53a40889..25b88f76 100644
--- a/client/ui/qml/Pages2/PageSetupWizardConfigSource.qml
+++ b/client/ui/qml/Pages2/PageSetupWizardConfigSource.qml
@@ -33,14 +33,12 @@ PageType {
             anchors.top: parent.top
             anchors.left: parent.left
             anchors.right: parent.right
-            anchors.rightMargin: 16
-            anchors.leftMargin: 16
-
-            spacing: 16
 
             HeaderType {
                 Layout.fillWidth: true
                 Layout.topMargin: 20
+                Layout.rightMargin: 16
+                Layout.leftMargin: 16
 
                 backButtonImage: "qrc:/images/controls/arrow-left.svg"
 
@@ -52,6 +50,8 @@ PageType {
             Header2TextType {
                 Layout.fillWidth: true
                 Layout.topMargin: 32
+                Layout.rightMargin: 16
+                Layout.leftMargin: 16
 
                 text: "Что у вас есть?"
             }
@@ -75,11 +75,8 @@ PageType {
                     }
                 }
             }
-            Rectangle {
-                Layout.fillWidth: true
-                height: 1
-                color: "#2C2D30"
-            }
+
+            DividerType {}
 
             //todo ifdef mobile platforms
             LabelWithButtonType {
@@ -93,11 +90,7 @@ PageType {
                 }
             }
 
-            Rectangle {
-                Layout.fillWidth: true
-                height: 1
-                color: "#2C2D30"
-            }
+            DividerType {}
 
             LabelWithButtonType {
                 Layout.fillWidth: true
@@ -111,11 +104,7 @@ PageType {
                 }
             }
 
-            Rectangle {
-                Layout.fillWidth: true
-                height: 1
-                color: "#2C2D30"
-            }
+            DividerType {}
         }
     }
 }
diff --git a/client/ui/qml/Pages2/PageSetupWizardInstalling.qml b/client/ui/qml/Pages2/PageSetupWizardInstalling.qml
index fd8aac6b..006743d9 100644
--- a/client/ui/qml/Pages2/PageSetupWizardInstalling.qml
+++ b/client/ui/qml/Pages2/PageSetupWizardInstalling.qml
@@ -23,6 +23,14 @@ PageType {
             closePage()
             PageController.showErrorMessage(errorMessage)
         }
+
+        function onInstallContainerFinished() {
+            goToStartPage()
+        }
+
+        function onInstallServerFinished() {
+            goToStartPage()
+        }
     }
 
     SortFilterProxyModel {
diff --git a/client/ui/qml/Pages2/PageSetupWizardProtocols.qml b/client/ui/qml/Pages2/PageSetupWizardProtocols.qml
index bffe09cb..cdacaf04 100644
--- a/client/ui/qml/Pages2/PageSetupWizardProtocols.qml
+++ b/client/ui/qml/Pages2/PageSetupWizardProtocols.qml
@@ -75,12 +75,12 @@ PageType {
                         anchors.top: parent.top
                         anchors.left: parent.left
                         anchors.right: parent.right
+                        anchors.rightMargin: -16
+                        anchors.leftMargin: -16
 
                         LabelWithButtonType {
                             id: container
                             Layout.fillWidth: true
-                            Layout.topMargin: 16
-                            Layout.bottomMargin: 16
 
                             text: name
                             descriptionText: description
@@ -92,11 +92,7 @@ PageType {
                             }
                         }
 
-                        Rectangle {
-                            Layout.fillWidth: true
-                            height: 1
-                            color: "#2C2D30"
-                        }
+                        DividerType {}
                     }
                 }
             }
diff --git a/client/ui/qml/Pages2/PageSetupWizardStart.qml b/client/ui/qml/Pages2/PageSetupWizardStart.qml
index 4d0f4c5c..804e145c 100644
--- a/client/ui/qml/Pages2/PageSetupWizardStart.qml
+++ b/client/ui/qml/Pages2/PageSetupWizardStart.qml
@@ -26,8 +26,9 @@ PageType {
         target: InstallController
 
         function onInstallServerFinished() {
+            //todo add smt like changeStartPage
             goToStartPage()
-//            goToPage(PageEnum.PageStart)
+            goToPage(PageEnum.PageStart)
         }
     }
 
diff --git a/client/ui/qml/Pages2/PageStart.qml b/client/ui/qml/Pages2/PageStart.qml
index 19ea3bc4..c50d4591 100644
--- a/client/ui/qml/Pages2/PageStart.qml
+++ b/client/ui/qml/Pages2/PageStart.qml
@@ -38,8 +38,9 @@ PageType {
         height: root.height - tabBar.implicitHeight
 
         StackView {
-            id: homeStackView
-            initialItem: "PageHome.qml" //PageController.getPagePath(PageEnum.PageSettingsServersList)
+            initialItem: PageHome {
+                id: pageHome
+            }
         }
 
         Item {
@@ -47,8 +48,9 @@ PageType {
         }
 
         StackView {
-            id: settingsStackView
-            initialItem: "PageSettingsServersList.qml" //PageController.getPagePath(PageEnum.PageSettingsServersList)
+            initialItem: PageSettingsServersList {
+                id: pageSettingsServersList
+            }
         }
     }
 
@@ -72,6 +74,9 @@ PageType {
         TabImageButtonType {
             isSelected: tabBar.currentIndex === 0
             image: "qrc:/images/controls/home.svg"
+            onClicked: {
+                pageSettingsServersList.goToStartPage()
+            }
         }
         TabImageButtonType {
             isSelected: tabBar.currentIndex === 1
@@ -80,6 +85,9 @@ PageType {
         TabImageButtonType {
             isSelected: tabBar.currentIndex === 2
             image: "qrc:/images/controls/settings-2.svg"
+            onClicked: {
+                pageHome.goToStartPage()
+            }
         }
     }
 

From de0cd976debb0691e69b77e1f0cc62b4e17d12de Mon Sep 17 00:00:00 2001
From: "vladimir.kuznetsov" <nethiuswork@gmail.com>
Date: Thu, 1 Jun 2023 11:25:33 +0800
Subject: [PATCH 024/278] added page transition effects - added functionality
 for buttons on PageSettingsServerData page

---
 client/amnezia_application.cpp                |   2 +-
 client/images/controls/amnezia.svg            |   3 +
 client/images/controls/app.svg                |   6 +
 client/images/controls/radio.svg              |   7 +
 client/images/controls/save.svg               |   5 +
 client/images/controls/server.svg             |   6 +
 client/resources.qrc                          |  18 +-
 .../ui/controllers/connectionController.cpp   |   1 -
 client/ui/controllers/installController.cpp   |   5 +-
 client/ui/controllers/pageController.cpp      |   3 +-
 client/ui/controllers/pageController.h        |   7 +-
 client/ui/models/containers_model.cpp         |  11 +-
 client/ui/models/containers_model.h           |   1 +
 client/ui/models/servers_model.cpp            |  51 ++++--
 client/ui/models/servers_model.h              |   5 +-
 client/ui/pages.h                             |   9 +-
 client/ui/qml/Components/ConnectButton.qml    |  14 +-
 .../ConnectionTypeSelectionDrawer.qml         |   6 +-
 ...istView.qml => HomeContainersListView.qml} |  59 +-----
 ...iew.qml => SettingsContainersListView.qml} |   3 +-
 client/ui/qml/Controls2/DrawerType.qml        |  20 +++
 client/ui/qml/Controls2/DropDownType.qml      |   6 +-
 client/ui/qml/Controls2/PageType.qml          |   5 +-
 client/ui/qml/Controls2/StackViewType.qml     |  61 +++++++
 client/ui/qml/Controls2/SwitcherType.qml      |   1 +
 .../ui/qml/Controls2/VerticalRadioButton.qml  |  61 +++++--
 client/ui/qml/Pages2/PageHome.qml             | 121 ++++++-------
 client/ui/qml/Pages2/PageSettings.qml         | 169 +++++++-----------
 ...ngsData.qml => PageSettingsServerData.qml} |  13 ++
 .../ui/qml/Pages2/PageSettingsServerInfo.qml  | 134 ++++++++++++++
 .../Pages2/PageSettingsServerProtocols.qml    |  38 ++++
 .../qml/Pages2/PageSettingsServerServices.qml |  38 ++++
 .../ui/qml/Pages2/PageSettingsServersList.qml |   7 +-
 .../qml/Pages2/PageSetupWizardInstalling.qml  |  16 ++
 client/ui/qml/Pages2/PageSetupWizardStart.qml |  10 --
 client/ui/qml/Pages2/PageStart.qml            |  31 ++--
 client/ui/qml/main2.qml                       |  24 ++-
 client/ui/uilogic.cpp                         |  14 +-
 38 files changed, 656 insertions(+), 335 deletions(-)
 create mode 100644 client/images/controls/amnezia.svg
 create mode 100644 client/images/controls/app.svg
 create mode 100644 client/images/controls/radio.svg
 create mode 100644 client/images/controls/save.svg
 create mode 100644 client/images/controls/server.svg
 rename client/ui/qml/Components/{ContainersPageHomeListView.qml => HomeContainersListView.qml} (52%)
 rename client/ui/qml/Components/{PageSettingsContainersListView.qml => SettingsContainersListView.qml} (97%)
 create mode 100644 client/ui/qml/Controls2/DrawerType.qml
 create mode 100644 client/ui/qml/Controls2/StackViewType.qml
 rename client/ui/qml/Pages2/{PageSettingsData.qml => PageSettingsServerData.qml} (67%)
 create mode 100644 client/ui/qml/Pages2/PageSettingsServerInfo.qml
 create mode 100644 client/ui/qml/Pages2/PageSettingsServerProtocols.qml
 create mode 100644 client/ui/qml/Pages2/PageSettingsServerServices.qml

diff --git a/client/amnezia_application.cpp b/client/amnezia_application.cpp
index 9fdddc86..c8bdcf3b 100644
--- a/client/amnezia_application.cpp
+++ b/client/amnezia_application.cpp
@@ -179,7 +179,7 @@ void AmneziaApplication::registerTypes()
     qRegisterMetaType<PageProtocolLogicBase *>("PageProtocolLogicBase *");
 
 
-    declareQmlPageEnum();
+//    declareQmlPageEnum();
     declareQmlProtocolEnum();
     declareQmlContainerEnum();
 
diff --git a/client/images/controls/amnezia.svg b/client/images/controls/amnezia.svg
new file mode 100644
index 00000000..0a6017dd
--- /dev/null
+++ b/client/images/controls/amnezia.svg
@@ -0,0 +1,3 @@
+<svg width="23" height="22" viewBox="0 0 23 22" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M22.973 7.90646C22.9848 7.91397 22.9838 7.93152 22.9713 7.93772C22.8729 7.98639 22.7756 8.03755 22.6749 8.08191C21.9013 8.42301 21.1611 8.82021 20.5322 9.39094C20.3172 9.58601 20.1228 9.80746 19.9407 10.0341C19.768 10.2489 19.7103 10.5119 19.7129 10.785C19.7143 10.9076 19.8304 10.998 19.953 10.998H20.2141C20.5118 10.998 20.7653 11.2477 20.6607 11.5265C20.6026 11.6813 20.5181 11.823 20.4093 11.9514C20.1336 12.2765 20.0212 12.6629 19.8913 13.0509C19.7017 13.6164 19.689 14.1994 19.7339 14.7779C19.7808 15.3809 19.556 15.8617 19.1934 16.3102C18.9087 16.6625 18.633 17.0221 18.3498 17.3759C18.0595 17.7385 17.9512 18.148 17.9823 18.6084C18.0224 19.1984 18.1618 19.7673 18.2917 20.3417C18.3978 20.8106 18.4326 21.2951 18.4966 21.773C18.5084 21.859 18.4012 21.9161 18.3205 21.8838C18.2426 21.8526 18.1712 21.8221 18.1093 21.7782C17.7478 21.5222 17.5253 21.1573 17.3433 20.7653C17.2834 20.6362 17.2247 20.5065 17.1664 20.3774C17.1041 20.2395 16.9409 20.1267 16.8147 20.0431C16.6193 19.9136 16.4687 19.7595 16.2346 19.7741C15.9632 19.791 15.6946 19.836 15.4332 19.9259C14.7792 20.1507 14.124 20.3733 13.4793 20.6219C12.7609 20.8991 12.0173 20.9552 11.2689 20.8656C10.5523 20.7798 9.84393 20.6252 9.13145 20.5052C8.89246 20.4651 8.65047 20.4413 8.41036 20.4052C8.3508 20.3963 8.29161 20.3733 8.23692 20.3469C7.80539 20.1381 7.37911 19.9181 6.94345 19.7182C6.47109 19.5016 6.10624 19.6562 5.9313 20.137C5.85938 20.3346 5.81668 20.5424 5.747 20.7408C5.64062 21.0436 5.52936 21.3457 5.40687 21.6422C5.3986 21.6622 5.38963 21.6813 5.37994 21.6995C5.2153 22.0089 4.82935 21.6832 4.88918 21.3379C4.95586 20.954 5.06824 20.5765 5.10907 20.1905C5.14953 19.8048 5.12967 19.4124 5.12518 19.0234C5.12443 18.9669 5.07199 18.9015 5.02741 18.8562C4.70788 18.5337 4.38835 18.2112 4.06096 17.8968C3.71446 17.5639 3.3777 17.2198 3.14621 16.7992C2.93568 16.4169 2.60679 16.3622 2.24231 16.4328C1.6557 16.5465 1.07621 16.6944 0.493713 16.8289C0.348032 16.8626 0.203333 16.9002 0.0583917 16.9362C0.0405883 16.9407 0.0220705 16.9324 0.0134824 16.9162C0.00542974 16.901 0.0080028 16.8823 0.0198447 16.8698C0.0893208 16.7966 0.154218 16.7277 0.232247 16.6632C0.673143 16.2991 1.12415 15.9465 1.5598 15.5764C1.81977 15.3553 2.06213 15.113 2.30262 14.8708C2.35094 14.8221 2.38129 14.7288 2.37642 14.659C2.2558 12.9282 2.66111 11.3041 3.38557 9.74541C3.63033 9.21861 3.88264 8.69521 4.13803 8.16263C4.26833 7.89091 4.59961 7.71583 4.72594 7.44224C4.75976 7.36899 4.78925 7.29092 4.82663 7.22174C4.88343 7.11657 4.92842 7.00517 4.97397 6.88913C5.01339 6.78871 5.13931 6.75973 5.21776 6.83379C5.27813 6.89079 5.37454 6.89163 5.43641 6.83627C5.5124 6.76826 5.58665 6.70149 5.64249 6.62203C5.9137 6.23709 6.18041 5.84844 6.42726 5.44826C6.54114 5.26359 6.66775 5.14766 6.88577 5.0871C7.60961 4.88602 8.32662 4.66172 9.04067 4.44712C9.06823 4.43884 9.10299 4.42461 9.10598 4.39599C9.15917 3.97017 9.19401 3.9345 9.62779 3.86391C10.0897 3.78885 10.3807 3.54362 10.4586 3.0799C10.5362 2.61731 10.559 2.14542 10.6043 1.67725C10.6422 1.28301 10.6703 0.887669 10.7171 0.494553C10.7574 0.155742 11.2046 0.235846 11.3101 0.56032C11.461 1.02515 11.5809 1.49964 11.7278 1.96595C11.854 2.3665 11.987 2.76593 12.1398 3.15719C12.3443 3.68147 12.7628 3.90366 13.3119 3.91295C13.5243 3.91667 13.7367 3.9241 13.9487 3.91481C14.2083 3.90366 14.4495 3.96014 14.6574 4.10802C15.2197 4.50857 15.7872 4.9028 16.3281 5.33047C16.6762 5.60587 16.9986 5.91341 17.338 6.22528C17.4671 6.34389 17.6561 6.36971 17.8238 6.4207C17.8846 6.43919 17.944 6.46737 18.0029 6.50108C18.1244 6.57062 18.1629 6.72324 18.1012 6.84888C18.0276 6.99874 18.0987 7.18206 18.242 7.26769C18.5512 7.45243 18.7938 7.71312 19.0585 7.94555C19.1705 8.04364 19.2908 8.13319 19.4095 8.22348C19.6332 8.39366 19.8808 8.42896 20.1527 8.36096C20.6786 8.22943 21.2042 8.09603 21.7339 7.98196C22.1447 7.89342 22.5336 7.84447 22.9659 7.90384C22.9684 7.90419 22.9709 7.90509 22.973 7.90646ZM11.8598 19.2536C11.8599 19.2535 11.8601 19.2534 11.8603 19.2534C12.2906 19.2534 12.7209 19.2582 13.1512 19.2504C13.2662 19.2482 13.3928 19.2315 13.4936 19.1809C14.033 18.9108 14.5758 18.6459 15.0976 18.3449C15.6359 18.0347 15.6812 17.8805 15.5216 17.2759C15.3778 16.7316 15.1122 16.2393 14.8313 15.7577C14.499 15.1877 14.2398 14.604 14.2233 13.9292C14.2147 13.5751 14.112 13.2355 13.9423 12.9178C13.7921 12.6366 13.5595 12.5035 13.246 12.4995C12.3788 12.4883 11.5296 12.5912 10.7036 12.8688C8.56844 13.587 7.26785 15.3311 7.23189 17.5089C7.22327 18.0343 7.45253 18.391 7.91515 18.5991C8.23767 18.7443 8.57368 18.8651 8.91231 18.9684C9.87306 19.2615 10.8649 19.2887 11.8594 19.2538C11.8595 19.2538 11.8597 19.2537 11.8598 19.2536ZM4.24072 13.6443C4.24075 13.6443 4.2408 13.6442 4.24086 13.6442C4.32809 13.6372 4.3895 13.6368 4.44904 13.6272C5.20721 13.5042 5.9137 13.2288 6.5962 12.8922C6.81235 12.7856 7.01463 12.6473 7.21091 12.5065C7.28583 12.4526 7.34914 12.3586 7.37761 12.2702C7.94961 10.5049 8.51599 8.73773 9.08275 6.97093C9.10831 6.89098 9.04979 6.806 8.96588 6.80382C8.78418 6.7991 8.62296 6.86293 8.46805 6.95384C7.80539 7.34287 7.18881 7.79469 6.62805 8.31749C5.80619 9.08328 5.11132 9.94048 4.69927 10.9983C4.37121 11.8404 4.25132 12.716 4.2404 13.6442C4.2404 13.6444 4.24064 13.6445 4.24072 13.6443ZM18.1238 10.7474C18.1238 10.7474 18.1238 10.7475 18.1237 10.7475C18.0635 10.7475 18.0077 10.7394 17.955 10.749C17.6857 10.7966 17.4141 10.8363 17.1489 10.9021C16.5787 11.0437 16.0303 11.2454 15.519 11.5378C15.2328 11.7017 15.1815 11.8095 15.2388 12.1294C15.2594 12.2449 15.2804 12.3616 15.3175 12.4727C15.5471 13.1649 15.7595 13.8638 16.0206 14.5442C16.2483 15.1376 16.5285 15.7116 16.7956 16.2894C16.8757 16.4621 17.1418 16.4215 17.229 16.2523C17.4605 15.8032 17.6377 15.363 17.7557 14.8979C18.0951 13.5606 18.1494 12.1974 18.1374 10.8278C18.1374 10.8048 18.13 10.7815 18.1236 10.7474C18.1236 10.7474 18.1237 10.7473 18.1238 10.7474ZM9.25394 11.597C9.25394 11.5972 9.25408 11.5973 9.25427 11.5973C9.29344 11.6025 9.32295 11.6099 9.35246 11.6099C9.95855 11.6103 10.5605 11.5687 11.1501 11.4167C11.5509 11.3134 11.9312 11.1637 12.2762 10.9318C12.5451 10.7509 12.6691 10.5027 12.6215 10.1846C12.5904 9.97764 12.5541 9.76733 12.4863 9.5704C12.1529 8.60545 11.6255 7.73487 11.1138 6.85723C11.0355 6.72273 10.8999 6.72682 10.816 6.85723C10.7729 6.92449 10.7377 6.9988 10.7111 7.07423C10.5852 7.42982 10.4568 7.78466 10.3414 8.14359C9.98477 9.25606 9.63378 10.3708 9.28129 11.4843C9.27043 11.5181 9.26443 11.5538 9.25395 11.5969C9.25395 11.5969 9.25394 11.5969 9.25394 11.597ZM13.0134 6.535C13.0134 6.53489 13.0132 6.53484 13.0132 6.53492L12.969 6.58078C12.9624 6.58765 12.9601 6.5976 12.9631 6.60665C13.2224 7.39992 13.4706 8.19714 13.7468 8.98482C13.8502 9.27984 14.0094 9.55777 14.1626 9.83273C14.3023 10.0839 14.5245 10.1761 14.8223 10.1493C15.435 10.0946 15.9549 9.82113 16.4707 9.55344C16.6923 9.43841 16.872 9.21592 16.8013 8.97639C16.767 8.86015 16.7087 8.75387 16.6293 8.6545C16.5248 8.52408 16.4195 8.39031 16.2948 8.28033C15.4707 7.55243 14.5368 7.00363 13.4988 6.63392C13.3449 6.57894 13.1756 6.56705 13.0134 6.53511C13.0134 6.5351 13.0134 6.53505 13.0134 6.535ZM5.31378 17.0491C5.50246 17.1181 5.64787 16.9129 5.70345 16.7198C5.84151 16.2402 5.97899 15.7643 6.11186 15.2869C6.16065 15.1122 5.989 14.9498 5.80902 14.9726C5.41175 15.0229 5.04886 15.1309 4.73748 15.3958C4.59588 15.5162 4.47826 15.6741 4.51309 15.8632C4.59813 16.3269 4.79779 16.732 5.21433 16.9987C5.24689 17.0196 5.27996 17.0367 5.31378 17.0491Z" fill="#CCCAC8"/>
+</svg>
diff --git a/client/images/controls/app.svg b/client/images/controls/app.svg
new file mode 100644
index 00000000..87775cd1
--- /dev/null
+++ b/client/images/controls/app.svg
@@ -0,0 +1,6 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M17 10C18.6569 10 20 8.65685 20 7C20 5.34315 18.6569 4 17 4C15.3431 4 14 5.34315 14 7C14 8.65685 15.3431 10 17 10Z" stroke="#D7D8DB" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<rect x="4" y="4" width="6" height="6" rx="1" stroke="#D7D8DB" stroke-width="2"/>
+<rect x="14" y="14" width="6" height="6" rx="1" stroke="#D7D8DB" stroke-width="2"/>
+<path d="M7.18963 13.8523L10.8078 20H2.91364L7.18963 13.8523Z" stroke="#D7D8DB" stroke-width="2"/>
+</svg>
diff --git a/client/images/controls/radio.svg b/client/images/controls/radio.svg
new file mode 100644
index 00000000..27731814
--- /dev/null
+++ b/client/images/controls/radio.svg
@@ -0,0 +1,7 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M12 14C13.1046 14 14 13.1046 14 12C14 10.8954 13.1046 10 12 10C10.8954 10 10 10.8954 10 12C10 13.1046 10.8954 14 12 14Z" stroke="#CBCBCB" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M4.93006 19.0702C3.05535 17.1949 2.0022 14.6518 2.0022 12.0002C2.0022 9.34853 3.05535 6.80545 4.93006 4.93018" stroke="#CBCBCB" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M7.75993 16.24C7.20263 15.6818 6.76087 15.0191 6.45993 14.29C5.85157 12.8205 5.85157 11.1695 6.45993 9.7C6.76087 8.97087 7.20263 8.30823 7.75993 7.75" stroke="#CBCBCB" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M16.24 7.75977C16.8028 8.33271 17.2449 9.01281 17.54 9.75977C18.1483 11.2293 18.1483 12.8802 17.54 14.3498C17.2391 15.0789 16.7973 15.7415 16.24 16.2998" stroke="#CBCBCB" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M19.0701 4.93018C20.9448 6.80545 21.9979 9.34853 21.9979 12.0002C21.9979 14.6518 20.9448 17.1949 19.0701 19.0702" stroke="#CBCBCB" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/client/images/controls/save.svg b/client/images/controls/save.svg
new file mode 100644
index 00000000..442ff72c
--- /dev/null
+++ b/client/images/controls/save.svg
@@ -0,0 +1,5 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M19 21H5C4.46957 21 3.96086 20.7893 3.58579 20.4142C3.21071 20.0391 3 19.5304 3 19V5C3 4.46957 3.21071 3.96086 3.58579 3.58579C3.96086 3.21071 4.46957 3 5 3H16L21 8V19C21 19.5304 20.7893 20.0391 20.4142 20.4142C20.0391 20.7893 19.5304 21 19 21Z" stroke="#CBCBCB" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M17 21V13H7V21" stroke="#CBCBCB" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M7 3V8H15" stroke="#CBCBCB" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/client/images/controls/server.svg b/client/images/controls/server.svg
new file mode 100644
index 00000000..52aad656
--- /dev/null
+++ b/client/images/controls/server.svg
@@ -0,0 +1,6 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M20 2H4C2.89543 2 2 2.89543 2 4V8C2 9.10457 2.89543 10 4 10H20C21.1046 10 22 9.10457 22 8V4C22 2.89543 21.1046 2 20 2Z" stroke="#CBCBCB" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M20 14H4C2.89543 14 2 14.8954 2 16V20C2 21.1046 2.89543 22 4 22H20C21.1046 22 22 21.1046 22 20V16C22 14.8954 21.1046 14 20 14Z" stroke="#CBCBCB" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M6 6H6.01" stroke="#CBCBCB" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M6 18H6.01" stroke="#CBCBCB" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/client/resources.qrc b/client/resources.qrc
index ca02df7d..db53165c 100644
--- a/client/resources.qrc
+++ b/client/resources.qrc
@@ -228,16 +228,26 @@
         <file>images/controls/download.svg</file>
         <file>ui/qml/Controls2/ProgressBarType.qml</file>
         <file>ui/qml/Components/ConnectionTypeSelectionDrawer.qml</file>
-        <file>ui/qml/Components/ContainersPageHomeListView.qml</file>
+        <file>ui/qml/Components/HomeContainersListView.qml</file>
         <file>ui/qml/Controls2/TextTypes/CaptionTextType.qml</file>
         <file>images/controls/settings.svg</file>
-        <file>ui/qml/Pages2/PageSettings.qml</file>
+        <file>ui/qml/Pages2/PageSettingsServerInfo.qml</file>
         <file>ui/qml/Controls2/PageType.qml</file>
         <file>ui/qml/Controls2/PopupType.qml</file>
         <file>images/controls/edit-3.svg</file>
-        <file>ui/qml/Pages2/PageSettingsData.qml</file>
-        <file>ui/qml/Components/PageSettingsContainersListView.qml</file>
+        <file>ui/qml/Pages2/PageSettingsServerData.qml</file>
+        <file>ui/qml/Components/SettingsContainersListView.qml</file>
         <file>ui/qml/Controls2/TextTypes/ListItemTitleType.qml</file>
         <file>ui/qml/Controls2/DividerType.qml</file>
+        <file>ui/qml/Controls2/DrawerType.qml</file>
+        <file>ui/qml/Controls2/StackViewType.qml</file>
+        <file>ui/qml/Pages2/PageSettings.qml</file>
+        <file>images/controls/amnezia.svg</file>
+        <file>images/controls/app.svg</file>
+        <file>images/controls/radio.svg</file>
+        <file>images/controls/save.svg</file>
+        <file>images/controls/server.svg</file>
+        <file>ui/qml/Pages2/PageSettingsServerProtocols.qml</file>
+        <file>ui/qml/Pages2/PageSettingsServerServices.qml</file>
     </qresource>
 </RCC>
diff --git a/client/ui/controllers/connectionController.cpp b/client/ui/controllers/connectionController.cpp
index 58fef373..617fd5ee 100644
--- a/client/ui/controllers/connectionController.cpp
+++ b/client/ui/controllers/connectionController.cpp
@@ -74,4 +74,3 @@ bool ConnectionController::closeVpnConnection()
     emit disconnectFromVpn();
     m_isConnected = false;
 }
-
diff --git a/client/ui/controllers/installController.cpp b/client/ui/controllers/installController.cpp
index 31f58a2a..15a24c31 100644
--- a/client/ui/controllers/installController.cpp
+++ b/client/ui/controllers/installController.cpp
@@ -49,8 +49,9 @@ void InstallController::installServer(DockerContainer container, QJsonObject& co
         server.insert(config_key::containers, QJsonArray{ config });
         server.insert(config_key::defaultContainer, ContainerProps::containerToString(container));
 
-        m_settings->addServer(server);
-        m_settings->setDefaultServer(m_settings->serversCount() - 1);
+        m_serversModel->addServer(server);
+        auto newServerIndex = m_serversModel->index(m_serversModel->getServersCount() - 1);
+        m_serversModel->setData(newServerIndex, true, ServersModel::ServersModelRoles::IsDefaultRole);
 
         emit installServerFinished();
         return;
diff --git a/client/ui/controllers/pageController.cpp b/client/ui/controllers/pageController.cpp
index 63c3ba58..e49177a5 100644
--- a/client/ui/controllers/pageController.cpp
+++ b/client/ui/controllers/pageController.cpp
@@ -9,7 +9,8 @@ QString PageController::getInitialPage()
 {
     if (m_serversModel->getServersCount()) {
         if (m_serversModel->getDefaultServerIndex() < 0) {
-            m_serversModel->setDefaultServerIndex(0);
+            auto defaultServerIndex = m_serversModel->index(0);
+            m_serversModel->setData(defaultServerIndex, true, ServersModel::ServersModelRoles::IsDefaultRole);
         }
         return getPagePath(PageLoader::PageEnum::PageStart);
     } else {
diff --git a/client/ui/controllers/pageController.h b/client/ui/controllers/pageController.h
index f37edca9..1d041deb 100644
--- a/client/ui/controllers/pageController.h
+++ b/client/ui/controllers/pageController.h
@@ -9,7 +9,10 @@
 namespace PageLoader
 {
     Q_NAMESPACE
-    enum class PageEnum { PageStart = 0, PageHome, PageSettings, PageShare,
+    enum class PageEnum { PageStart = 0, PageHome, PageShare,
+
+                          PageSettingsServersList, PageSettings, PageSettingsServerData, PageSettingsServerInfo,
+                          PageSettingsServerProtocols, PageSettingsServerServices,
 
                           PageSetupWizardStart, PageTest, PageSetupWizardCredentials, PageSetupWizardProtocols, PageSetupWizardEasy,
                           PageSetupWizardProtocolSettings, PageSetupWizardInstalling, PageSetupWizardConfigSource,
@@ -41,6 +44,8 @@ public slots:
 
 signals:
     void goToPageHome();
+    void restorePageHomeState(bool isContainerInstalled = false);
+    void replaceStartPage();
     void showErrorMessage(QString errorMessage);
 
 private:
diff --git a/client/ui/models/containers_model.cpp b/client/ui/models/containers_model.cpp
index 4dc7010e..b240878d 100644
--- a/client/ui/models/containers_model.cpp
+++ b/client/ui/models/containers_model.cpp
@@ -86,6 +86,7 @@ void ContainersModel::setCurrentlyProcessedServerIndex(int index)
     beginResetModel();
     m_currentlyProcessedServerIndex = index;
     endResetModel();
+    emit defaultContainerChanged();
 }
 
 void ContainersModel::setCurrentlyInstalledContainerIndex(int index)
@@ -115,7 +116,7 @@ void ContainersModel::removeAllContainers()
     auto errorCode = serverController.removeAllContainers(m_settings->serverCredentials(m_currentlyProcessedServerIndex));
 
     if (errorCode == ErrorCode::NoError) {
-    beginResetModel();
+        beginResetModel();
         m_settings->setContainers(m_currentlyProcessedServerIndex, {});
         m_settings->setDefaultContainer(m_currentlyProcessedServerIndex, DockerContainer::None);
         endResetModel();
@@ -124,6 +125,14 @@ void ContainersModel::removeAllContainers()
     //todo process errors
 }
 
+void ContainersModel::clearCachedProfiles()
+{
+    const auto &containers = m_settings->containers(m_currentlyProcessedServerIndex);
+    for (DockerContainer container : containers.keys()) {
+        m_settings->clearLastConnectionConfig(m_currentlyProcessedServerIndex, container);
+    }
+}
+
 QHash<int, QByteArray> ContainersModel::roleNames() const {
     QHash<int, QByteArray> roles;
     roles[NameRole] = "name";
diff --git a/client/ui/models/containers_model.h b/client/ui/models/containers_model.h
index 642b6680..3ce7bd6b 100644
--- a/client/ui/models/containers_model.h
+++ b/client/ui/models/containers_model.h
@@ -49,6 +49,7 @@ public slots:
     int getCurrentlyInstalledContainerIndex();
 
     void removeAllContainers();
+    void clearCachedProfiles();
 
 protected:
     QHash<int, QByteArray> roleNames() const override;
diff --git a/client/ui/models/servers_model.cpp b/client/ui/models/servers_model.cpp
index 884009e8..d05bb695 100644
--- a/client/ui/models/servers_model.cpp
+++ b/client/ui/models/servers_model.cpp
@@ -17,15 +17,14 @@ bool ServersModel::setData(const QModelIndex &index, const QVariant &value, int
         || index.row() >= static_cast<int>(m_settings->serversCount())) {
         return false;
     }
-//    if (role == DescRole) {
-//        return m_data[index.row()].desc;
-//    }
-//    if (role == AddressRole) {
-//        return m_data[index.row()].address;
-//    }
-//    if (role == IsDefaultRole) {
-//        return m_data[index.row()].isDefault;
-//    }
+
+    switch (role) {
+        case IsDefaultRole: m_settings->setDefaultServer(index.row());
+        default: return true;
+    }
+
+    emit dataChanged(index, index);
+    return true;
 }
 
 QVariant ServersModel::data(const QModelIndex &index, int role) const
@@ -58,14 +57,6 @@ QVariant ServersModel::data(const QModelIndex &index, int role) const
     return QVariant();
 }
 
-//todo mode to setData?
-void ServersModel::setDefaultServerIndex(int index)
-{
-    //    beginResetModel();
-    m_settings->setDefaultServer(index);
-    //    endResetModel();
-}
-
 const int ServersModel::getDefaultServerIndex()
 {
     return m_settings->defaultServerIndex();
@@ -81,14 +72,38 @@ void ServersModel::setCurrentlyProcessedServerIndex(int index)
     m_currenlyProcessedServerIndex = index;
 }
 
+bool ServersModel::isDefaultServerCurrentlyProcessed()
+{
+    return m_settings->defaultServerIndex() == m_currenlyProcessedServerIndex;
+}
+
 ServerCredentials ServersModel::getCurrentlyProcessedServerCredentials()
 {
     return qvariant_cast<ServerCredentials>(data(index(m_currenlyProcessedServerIndex), CredentialsRole));
 }
 
-void ServersModel::addServer()
+void ServersModel::addServer(const QJsonObject &server)
 {
+    beginResetModel();
+    m_settings->addServer(server);
+    endResetModel();
+}
 
+void ServersModel::removeServer()
+{
+    beginResetModel();
+    m_settings->removeServer(m_currenlyProcessedServerIndex);
+
+    if (m_settings->defaultServerIndex() == m_currenlyProcessedServerIndex) {
+        m_settings->setDefaultServer(0);
+    } else if (m_settings->defaultServerIndex() > m_currenlyProcessedServerIndex) {
+        m_settings->setDefaultServer(m_settings->defaultServerIndex() - 1);
+    }
+
+    if (m_settings->serversCount() == 0) {
+        m_settings->setDefaultServer(-1);
+    }
+    endResetModel();
 }
 
 QHash<int, QByteArray> ServersModel::roleNames() const {
diff --git a/client/ui/models/servers_model.h b/client/ui/models/servers_model.h
index ae1ec8d9..54ac5ef4 100644
--- a/client/ui/models/servers_model.h
+++ b/client/ui/models/servers_model.h
@@ -31,15 +31,16 @@ public:
     QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
 
 public slots:
-    void setDefaultServerIndex(int index);
     const int getDefaultServerIndex();
+    bool isDefaultServerCurrentlyProcessed();
 
     const int getServersCount();
 
     void setCurrentlyProcessedServerIndex(int index);
     ServerCredentials getCurrentlyProcessedServerCredentials();
 
-    void addServer();
+    void addServer(const QJsonObject &server);
+    void removeServer();
 
 protected:
     QHash<int, QByteArray> roleNames() const override;
diff --git a/client/ui/pages.h b/client/ui/pages.h
index 82c0d409..f3d045b2 100644
--- a/client/ui/pages.h
+++ b/client/ui/pages.h
@@ -26,14 +26,7 @@ enum class Page { Start = 0, NewServer, NewServerProtocols, Vpn,
                   GeneralSettings, AppSettings, NetworkSettings, ServerSettings,
                   ServerContainers, ServersList, ShareConnection,  Sites,
                   ProtocolSettings, ProtocolShare, QrDecoder, QrDecoderIos, About, ViewConfig,
-                  AdvancedServerSettings, ClientManagement, ClientInfo,
-
-                  PageSetupWizardStart, PageTest, PageSetupWizardCredentials, PageSetupWizardProtocols, PageSetupWizardEasy,
-                  PageSetupWizardProtocolSettings, PageSetupWizardInstalling, PageSetupWizardConfigSource, PageSetupWizardTextKey,
-
-                  PageSettings, PageSettingsServersList,
-
-                  PageStart, PageHome, PageShare};
+                  AdvancedServerSettings, ClientManagement, ClientInfo};
 Q_ENUM_NS(Page)
 
 static void declareQmlPageEnum() {
diff --git a/client/ui/qml/Components/ConnectButton.qml b/client/ui/qml/Components/ConnectButton.qml
index 5002d5bd..73accef4 100644
--- a/client/ui/qml/Components/ConnectButton.qml
+++ b/client/ui/qml/Components/ConnectButton.qml
@@ -7,7 +7,7 @@ import ConnectionState 1.0
 Button {
     id: root
 
-    text: "Подключиться"
+    text: qsTr("Connect")
 
     background: Image {
         id: border
@@ -60,37 +60,37 @@ Button {
                 case ConnectionState.Disconnected: {
                     console.log("Disconnected")
                     connectionProccess.running = false
-                    root.text = "Подключиться"
+                    root.text = qsTr("Connect")
                     break
                 }
                 case ConnectionState.Preparing: {
                     console.log("Preparing")
                     connectionProccess.running = true
-                    root.text = "Подключение..."
+                    root.text = qsTr("Connection...")
                     break
                 }
                 case ConnectionState.Connecting: {
                     console.log("Connecting")
                     connectionProccess.running = true
-                    root.text = "Подключение..."
+                    root.text = qsTr("Connection...")
                     break
                 }
                 case ConnectionState.Connected: {
                     console.log("Connected")
                     connectionProccess.running = false
-                    root.text = "Подключено"
+                    root.text = qsTr("Connected")
                     break
                 }
                 case ConnectionState.Disconnecting: {
                     console.log("Disconnecting")
                     connectionProccess.running = true
-                    root.text = "Отключение..."
+                    root.text = qsTr("Disconnection...")
                     break
                 }
                 case ConnectionState.Reconnecting: {
                     console.log("Reconnecting")
                     connectionProccess.running = true
-                    root.text = "Переподключение..."
+                    root.text = qsTr("Reconnection...")
                     break
                 }
                 case ConnectionState.Error: {
diff --git a/client/ui/qml/Components/ConnectionTypeSelectionDrawer.qml b/client/ui/qml/Components/ConnectionTypeSelectionDrawer.qml
index 2e6b3f2e..d80d5e5a 100644
--- a/client/ui/qml/Components/ConnectionTypeSelectionDrawer.qml
+++ b/client/ui/qml/Components/ConnectionTypeSelectionDrawer.qml
@@ -8,16 +8,12 @@ import "../Controls2"
 import "../Controls2/TextTypes"
 import "../Config"
 
-Drawer {
+DrawerType {
     id: root
 
-    edge: Qt.BottomEdge
     width: parent.width
     height: parent.height * 0.4375
 
-    clip: true
-    modal: true
-
     background: Rectangle {
         anchors.fill: parent
         anchors.bottomMargin: -radius
diff --git a/client/ui/qml/Components/ContainersPageHomeListView.qml b/client/ui/qml/Components/HomeContainersListView.qml
similarity index 52%
rename from client/ui/qml/Components/ContainersPageHomeListView.qml
rename to client/ui/qml/Components/HomeContainersListView.qml
index f8b5101e..c3e98fbb 100644
--- a/client/ui/qml/Components/ContainersPageHomeListView.qml
+++ b/client/ui/qml/Components/HomeContainersListView.qml
@@ -29,64 +29,23 @@ ListView {
         implicitWidth: rootWidth
         implicitHeight: containerRadioButton.implicitHeight
 
-        RadioButton {
+        VerticalRadioButton {
             id: containerRadioButton
 
-            implicitWidth: parent.width
-            implicitHeight: containerRadioButtonContent.implicitHeight
+            anchors.fill: parent
+            anchors.rightMargin: 16
+            anchors.leftMargin: 16
 
-            hoverEnabled: true
+            text: name
+            descriptionText: description
 
             ButtonGroup.group: containersRadioButtonGroup
 
-            checked: isDefault
-
-            indicator: Rectangle {
-                anchors.fill: parent
-                color: containerRadioButton.hovered ? "#2C2D30" : "#1C1D21"
-
-                Behavior on color {
-                    PropertyAnimation { duration: 200 }
-                }
-            }
+            imageSource: "qrc:/images/controls/download.svg"
+            showImage: !isInstalled
 
             checkable: isInstalled
-
-            RowLayout {
-                id: containerRadioButtonContent
-                anchors.fill: parent
-
-                anchors.rightMargin: 16
-                anchors.leftMargin: 16
-
-                z: 1
-
-                Image {
-                    source: isInstalled ? "qrc:/images/controls/check.svg" : "qrc:/images/controls/download.svg"
-                    visible: isInstalled ? containerRadioButton.checked : true
-
-                    width: 24
-                    height: 24
-
-                    Layout.rightMargin: 8
-                }
-
-                Text {
-                    id: containerRadioButtonText
-
-                    text: name
-                    color: "#D7D8DB"
-                    font.pixelSize: 16
-                    font.weight: 400
-                    font.family: "PT Root UI VF"
-
-                    height: 24
-
-                    Layout.fillWidth: true
-                    Layout.topMargin: 20
-                    Layout.bottomMargin: 20
-                }
-            }
+            checked: isDefault
 
             onClicked: {
                 if (checked) {
diff --git a/client/ui/qml/Components/PageSettingsContainersListView.qml b/client/ui/qml/Components/SettingsContainersListView.qml
similarity index 97%
rename from client/ui/qml/Components/PageSettingsContainersListView.qml
rename to client/ui/qml/Components/SettingsContainersListView.qml
index 2a59b8b2..5175fd49 100644
--- a/client/ui/qml/Components/PageSettingsContainersListView.qml
+++ b/client/ui/qml/Components/SettingsContainersListView.qml
@@ -14,6 +14,7 @@ import "../Controls2/TextTypes"
 ListView {
     id: root
 
+    width: parent.width
     height: root.contentItem.height
 
     clip: true
@@ -23,7 +24,7 @@ ListView {
     }
 
     delegate: Item {
-        implicitWidth: parent.width
+        implicitWidth: root.width
         implicitHeight: containerRadioButton.implicitHeight
 
         RadioButton {
diff --git a/client/ui/qml/Controls2/DrawerType.qml b/client/ui/qml/Controls2/DrawerType.qml
new file mode 100644
index 00000000..bede3700
--- /dev/null
+++ b/client/ui/qml/Controls2/DrawerType.qml
@@ -0,0 +1,20 @@
+import QtQuick
+import QtQuick.Controls
+
+Drawer {
+    edge: Qt.BottomEdge
+
+    clip: true
+    modal: true
+
+    enter: Transition {
+        SmoothedAnimation {
+            velocity: 4
+        }
+    }
+    exit: Transition {
+        SmoothedAnimation {
+            velocity: 4
+        }
+    }
+}
diff --git a/client/ui/qml/Controls2/DropDownType.qml b/client/ui/qml/Controls2/DropDownType.qml
index 2b8986b5..5ac50fa7 100644
--- a/client/ui/qml/Controls2/DropDownType.qml
+++ b/client/ui/qml/Controls2/DropDownType.qml
@@ -111,16 +111,12 @@ Item {
         }
     }
 
-    Drawer {
+    DrawerType {
         id: menu
 
-        edge: Qt.BottomEdge
         width: parent.width
         height: parent.height * 0.9
 
-        clip: true
-        modal: true
-
         background: Rectangle {
             anchors.fill: parent
             anchors.bottomMargin: -radius
diff --git a/client/ui/qml/Controls2/PageType.qml b/client/ui/qml/Controls2/PageType.qml
index 4eb51753..046201b7 100644
--- a/client/ui/qml/Controls2/PageType.qml
+++ b/client/ui/qml/Controls2/PageType.qml
@@ -8,10 +8,11 @@ Item {
     property StackView stackView: StackView.view
 
     function goToPage(page, slide = true) {
+        var pagePath = PageController.getPagePath(page)
         if (slide) {
-            root.stackView.push(PageController.getPagePath(page), {}, StackView.PushTransition)
+            root.stackView.push(pagePath, { "objectName" : pagePath }, StackView.PushTransition)
         } else {
-            root.stackView.push(PageController.getPagePath(page), {}, StackView.Immediate)
+            root.stackView.push(pagePath, { "objectName" : pagePath }, StackView.Immediate)
         }
     }
 
diff --git a/client/ui/qml/Controls2/StackViewType.qml b/client/ui/qml/Controls2/StackViewType.qml
new file mode 100644
index 00000000..e2646e45
--- /dev/null
+++ b/client/ui/qml/Controls2/StackViewType.qml
@@ -0,0 +1,61 @@
+import QtQuick
+import QtQuick.Controls
+
+StackView {
+    id: root
+
+    pushEnter: Transition {
+        PropertyAnimation {
+            property: "opacity"
+            from: 0
+            to:1
+            duration: 200
+        }
+    }
+
+    pushExit: Transition {
+        PropertyAnimation {
+            property: "opacity"
+            from: 1
+            to:0
+            duration: 200
+        }
+    }
+
+    popEnter: Transition {
+        PropertyAnimation {
+            property: "opacity"
+            from: 0
+            to:1
+            duration: 200
+        }
+    }
+
+    popExit: Transition {
+        PropertyAnimation {
+            property: "opacity"
+            from: 1
+            to:0
+            duration: 200
+        }
+    }
+
+    replaceEnter: Transition {
+        PropertyAnimation {
+            property: "opacity"
+            from: 0
+            to:1
+            duration: 200
+        }
+    }
+
+    replaceExit: Transition {
+        PropertyAnimation {
+            property: "opacity"
+            from: 1
+            to:0
+            duration: 200
+        }
+    }
+}
+
diff --git a/client/ui/qml/Controls2/SwitcherType.qml b/client/ui/qml/Controls2/SwitcherType.qml
index b593ece8..e4df04fa 100644
--- a/client/ui/qml/Controls2/SwitcherType.qml
+++ b/client/ui/qml/Controls2/SwitcherType.qml
@@ -59,6 +59,7 @@ Switch {
         }
     }
 
+    contentItem: ColumnLayout {
     contentItem: ColumnLayout {
         id: content
 
diff --git a/client/ui/qml/Controls2/VerticalRadioButton.qml b/client/ui/qml/Controls2/VerticalRadioButton.qml
index 420051cd..50af3c79 100644
--- a/client/ui/qml/Controls2/VerticalRadioButton.qml
+++ b/client/ui/qml/Controls2/VerticalRadioButton.qml
@@ -3,6 +3,8 @@ import QtQuick.Controls
 import QtQuick.Layouts
 import Qt5Compat.GraphicalEffects
 
+import "TextTypes"
+
 RadioButton {
     id: root
 
@@ -13,7 +15,8 @@ RadioButton {
     property string disabledColor: Qt.rgba(1, 1, 1, 0)
     property string selectedColor: Qt.rgba(1, 1, 1, 0)
 
-    property string textColor: "#0E0E11"
+    property string textColor: "#D7D8DB"
+    property string selectedTextColor: "#FBB26A"
 
     property string pressedBorderColor: Qt.rgba(251/255, 178/255, 106/255, 0.3)
     property string selectedBorderColor: "#FBB26A"
@@ -26,11 +29,16 @@ RadioButton {
 
     property string defaultInnerCircleColor: "#FBB26A"
 
+    property string imageSource
+    property bool showImage
+
     hoverEnabled: true
 
     indicator: Rectangle {
         id: background
 
+        anchors.verticalCenter: parent.verticalCenter
+
         implicitWidth: 56
         implicitHeight: 56
         radius: 16
@@ -52,6 +60,16 @@ RadioButton {
             PropertyAnimation { duration: 200 }
         }
 
+        Image {
+            source: imageSource
+            visible: showImage
+
+            anchors.centerIn: parent
+
+            width: 24
+            height: 24
+        }
+
         Rectangle {
             id: outerCircle
 
@@ -59,6 +77,8 @@ RadioButton {
             height: 24
             radius: 16
 
+            visible: !showImage
+
             anchors.centerIn: parent
 
             color: "transparent"
@@ -120,34 +140,41 @@ RadioButton {
 
     contentItem: ColumnLayout {
         id: content
-        anchors.fill: parent
+        anchors.left: parent.left
+        anchors.right: parent.right
         anchors.leftMargin: 8 + background.width
 
-        Text {
-            text: root.text
-            wrapMode: Text.WordWrap
-            color: "#D7D8DB"
-            font.pixelSize: 16
-            font.weight: 400
-            font.family: "PT Root UI VF"
+        spacing: 4
+
+        ListItemTitleType {
+            text: root.text
+
+            color: {
+                if (root.checked) {
+                    return selectedTextColor
+                }
+                return textColor
+            }
 
-            height: 24
             Layout.fillWidth: true
+            Layout.topMargin: 16
+            Layout.bottomMargin: description.visible ? 0 : 16
+
+            Behavior on color {
+                PropertyAnimation { duration: 200 }
+            }
         }
 
-        Text {
-            font.family: "PT Root UI VF"
-            font.styleName: "normal"
-            font.pixelSize: 13
-            font.letterSpacing: 0.02
+        CaptionTextType {
+            id: description
+
             color: "#878B91"
             text: root.descriptionText
-            wrapMode: Text.WordWrap
 
             visible: root.descriptionText !== ""
 
             Layout.fillWidth: true
-            height: 16
+            Layout.bottomMargin: 16
         }
     }
 
diff --git a/client/ui/qml/Pages2/PageHome.qml b/client/ui/qml/Pages2/PageHome.qml
index 1fba3bff..0ecbafcc 100644
--- a/client/ui/qml/Pages2/PageHome.qml
+++ b/client/ui/qml/Pages2/PageHome.qml
@@ -37,6 +37,17 @@ PageType {
         }
     }
 
+    Connections {
+        target: PageController
+
+        function onRestorePageHomeState(isContainerInstalled) {
+            menu.visible = true
+            if (isContainerInstalled) {
+                containersDropDown.menuVisible = true
+            }
+        }
+    }
+
     Rectangle {
         id: buttonBackground
         anchors.fill: buttonContent
@@ -96,16 +107,12 @@ PageType {
         }
     }
 
-    Drawer {
+    DrawerType {
         id: menu
 
-        edge: Qt.BottomEdge
         width: parent.width
         height: parent.height * 0.90
 
-        clip: true
-        modal: true
-
         background: Rectangle {
             anchors.fill: parent
             anchors.bottomMargin: -radius
@@ -180,7 +187,7 @@ PageType {
                         containersDropDown.menuVisible = true
                     }
 
-                    listView: ContainersPageHomeListView {
+                    listView: HomeContainersListView {
                         rootWidth: root.width
 
                         model: proxyContainersModel
@@ -251,81 +258,63 @@ PageType {
                         property variant delegateData: model
 
                         implicitWidth: serversMenuContent.width
-                        implicitHeight: serverRadioButton.implicitHeight
+                        implicitHeight: serverRadioButtonContent.implicitHeight
 
-                        RadioButton {
-                            id: serverRadioButton
+                        ColumnLayout {
+                            id: serverRadioButtonContent
+                            anchors.fill: parent
 
-                            implicitWidth: parent.width
-                            implicitHeight: serverRadioButtonContent.implicitHeight
+                            anchors.rightMargin: 16
+                            anchors.leftMargin: 16
 
-                            hoverEnabled: true
-
-                            checked: index === serversMenuContent.currentIndex
-
-                            ButtonGroup.group: serversRadioButtonGroup
-
-                            indicator: Rectangle {
-                                anchors.fill: parent
-                                color: serverRadioButton.hovered ? "#2C2D30" : "#1C1D21"
-
-                                Behavior on color {
-                                    PropertyAnimation { duration: 200 }
-                                }
-                            }
+                            spacing: 0
 
                             RowLayout {
-                                id: serverRadioButtonContent
-                                anchors.fill: parent
-
-                                anchors.rightMargin: 16
-                                anchors.leftMargin: 16
-
-                                z: 1
-
-                                Image {
-                                    source: "qrc:/images/controls/check.svg"
-                                    visible: serverRadioButton.checked
-                                    width: 24
-                                    height: 24
-
-                                    Layout.rightMargin: 8
-                                }
-
-                                Text {
-                                    id: serverRadioButtonText
-
-                                    text: name
-                                    color: "#D7D8DB"
-                                    font.pixelSize: 16
-                                    font.weight: 400
-                                    font.family: "PT Root UI VF"
-
-                                    height: 24
+                                VerticalRadioButton {
+                                    id: serverRadioButton
 
                                     Layout.fillWidth: true
-                                    Layout.topMargin: 20
-                                    Layout.bottomMargin: 20
+
+                                    text: name
+                                    descriptionText: "description"
+
+                                    checked: index === serversMenuContent.currentIndex
+
+                                    ButtonGroup.group: serversRadioButtonGroup
+
+                                    onClicked: {
+                                        serversMenuContent.currentIndex = index
+
+                                        isDefault = true
+                                        ContainersModel.setCurrentlyProcessedServerIndex(index)
+                                    }
+
+                                    MouseArea {
+                                        anchors.fill: serverRadioButton
+                                        cursorShape: Qt.PointingHandCursor
+                                        enabled: false
+                                    }
                                 }
 
                                 ImageButtonType {
                                     image: "qrc:/images/controls/settings.svg"
 
-//                                    onClicked:
+                                    implicitWidth: 56
+                                    implicitHeight: 56
+
+                                    z: 1
+
+                                    onClicked: function() {
+                                        ServersModel.setCurrentlyProcessedServerIndex(index)
+                                        ContainersModel.setCurrentlyProcessedServerIndex(index)
+                                        goToPage(PageEnum.PageSettingsServerInfo)
+                                        menu.visible = false
+                                    }
                                 }
                             }
 
-                            onClicked: {
-                                serversMenuContent.currentIndex = index
-
-                                ServersModel.setDefaultServerIndex(index)
-                                ContainersModel.setCurrentlyProcessedServerIndex(index)
-                            }
-
-                            MouseArea {
-                                anchors.fill: serverRadioButton
-                                cursorShape: Qt.PointingHandCursor
-                                enabled: false
+                            DividerType {
+                                Layout.fillWidth: true
                             }
                         }
                     }
diff --git a/client/ui/qml/Pages2/PageSettings.qml b/client/ui/qml/Pages2/PageSettings.qml
index 57c252b4..d3b87c19 100644
--- a/client/ui/qml/Pages2/PageSettings.qml
+++ b/client/ui/qml/Pages2/PageSettings.qml
@@ -1,142 +1,109 @@
 import QtQuick
 import QtQuick.Controls
 import QtQuick.Layouts
-
-import SortFilterProxyModel 0.2
+import QtQuick.Dialogs
 
 import PageEnum 1.0
-import ProtocolEnum 1.0
-import ContainerProps 1.0
-import ProtocolProps 1.0
 
 import "./"
 import "../Controls2"
 import "../Controls2/TextTypes"
 import "../Config"
-import "../Components"
 
 PageType {
     id: root
 
-    SortFilterProxyModel {
-        id: proxyServersModel
-        sourceModel: ServersModel
-        filters: [
-            ValueFilter {
-                roleName: "isCurrentlyProcessed"
-                value: true
-            }
-        ]
-    }
+    FlickableType {
+        id: fl
+        anchors.top: root.top
+        anchors.bottom: root.bottom
+        contentHeight: content.height
 
         ColumnLayout {
             id: content
 
-            anchors.fill: parent
+            anchors.top: parent.top
+            anchors.left: parent.left
+            anchors.right: parent.right
 
-            spacing: 16
+            HeaderType {
+                Layout.fillWidth: true
+                Layout.topMargin: 20
+                Layout.rightMargin: 16
+                Layout.leftMargin: 16
 
-            Repeater {
-                id: header
-                model: proxyServersModel
+                headerText: qsTr("Settings")
+            }
 
-                delegate: HeaderType {
-                    Layout.fillWidth: true
-                    Layout.topMargin: 20
-                    Layout.leftMargin: 16
-                    Layout.rightMargin: 16
+            LabelWithButtonType {
+                Layout.fillWidth: true
+                Layout.topMargin: 16
 
-                    actionButtonImage: "qrc:/images/controls/edit-3.svg"
-                    backButtonImage: "qrc:/images/controls/arrow-left.svg"
+                text: qsTr("Servers")
+                buttonImage: "qrc:/images/controls/chevron-right.svg"
+                iconImage: "qrc:/images/controls/server.svg"
 
-                    headerText: name
-                    descriptionText: hostName
-
-                    actionButtonFunction: function() {
-                        connectionTypeSelection.visible = true
-                    }
-
-                    backButtonFunction: function() {
-                        closePage()
-                    }
+                clickedFunction: function() {
+                    goToPage(PageEnum.PageSettingsServersList)
                 }
             }
 
-            TabBar {
-                id: tabBar
+            DividerType {}
 
+            LabelWithButtonType {
                 Layout.fillWidth: true
 
-                background: Rectangle {
-                    color: "transparent"
-                }
+                text: qsTr("Connection")
+                buttonImage: "qrc:/images/controls/chevron-right.svg"
+                iconImage: "qrc:/images/controls/radio.svg"
 
-                TabButtonType {
-                    isSelected: tabBar.currentIndex === 0
-                    text: qsTr("Protocols")
-                }
-                TabButtonType {
-                    isSelected: tabBar.currentIndex === 1
-                    text: qsTr("Services")
-                }
-                TabButtonType {
-                    isSelected: tabBar.currentIndex === 2
-                    text: qsTr("Data")
+                clickedFunction: function() {
                 }
             }
 
-            StackLayout {
-                id: stackLayout
-                currentIndex: tabBar.currentIndex
+            DividerType {}
 
+            LabelWithButtonType {
                 Layout.fillWidth: true
-                height: root.height
 
-                StackView {
-                    id: protocolsStackView
-                    initialItem: PageSettingsContainersListView {
-                        model: SortFilterProxyModel {
-                            sourceModel: ContainersModel
-                            filters: [
-                                ValueFilter {
-                                    roleName: "serviceType"
-                                    value: ProtocolEnum.Vpn
-                                },
-                                ValueFilter {
-                                    roleName: "isSupported"
-                                    value: true
-                                }
-                            ]
-                        }
-                    }
-                }
+                text: qsTr("Application")
+                buttonImage: "qrc:/images/controls/chevron-right.svg"
+                iconImage: "qrc:/images/controls/app.svg"
 
-                StackView {
-                    id: servicesStackView
-                    initialItem: PageSettingsContainersListView {
-                        model: SortFilterProxyModel {
-                            sourceModel: ContainersModel
-                            filters: [
-                                ValueFilter {
-                                    roleName: "serviceType"
-                                    value: ProtocolEnum.Other
-                                },
-                                ValueFilter {
-                                    roleName: "isSupported"
-                                    value: true
-                                }
-                            ]
-                        }
-                    }
-                }
-
-                StackView {
-                    id: dataStackView
-                    initialItem: PageSettingsData {
-
-                    }
+                clickedFunction: function() {
+                    goToPage(PageEnum.PageSetupWizardTextKey)
                 }
             }
+
+            DividerType {}
+
+            LabelWithButtonType {
+                Layout.fillWidth: true
+
+                text: qsTr("Backup")
+                buttonImage: "qrc:/images/controls/chevron-right.svg"
+                iconImage: "qrc:/images/controls/save.svg"
+
+                clickedFunction: function() {
+                    goToPage(PageEnum.PageSetupWizardTextKey)
+                }
+            }
+
+            DividerType {}
+
+            LabelWithButtonType {
+                Layout.fillWidth: true
+
+                text: qsTr("About AmneziaVPN")
+                buttonImage: "qrc:/images/controls/chevron-right.svg"
+                iconImage: "qrc:/images/controls/amnezia.svg"
+
+                clickedFunction: function() {
+                    goToPage(PageEnum.PageSetupWizardTextKey)
+                }
+            }
+
+            DividerType {}
         }
-//    }
+    }
 }
diff --git a/client/ui/qml/Pages2/PageSettingsData.qml b/client/ui/qml/Pages2/PageSettingsServerData.qml
similarity index 67%
rename from client/ui/qml/Pages2/PageSettingsData.qml
rename to client/ui/qml/Pages2/PageSettingsServerData.qml
index 74293aa5..3ab76299 100644
--- a/client/ui/qml/Pages2/PageSettingsData.qml
+++ b/client/ui/qml/Pages2/PageSettingsServerData.qml
@@ -33,6 +33,7 @@ PageType {
                 descriptionText: "May be needed when changing other settings"
 
                 clickedFunction: function() {
+                    ContainersModel.clearCachedProfiles()
                 }
             }
 
@@ -45,6 +46,15 @@ PageType {
                 textColor: "#EB5757"
 
                 clickedFunction: function() {
+                    if (ServersModel.isDefaultServerCurrentlyProcessed && ConnectionController.isConnected()) {
+                        ConnectionController.closeVpnConnection()
+                    }
+                    ServersModel.removeServer()
+                    if (!ServersModel.getServersCount()) {
+                        PageController.replaceStartPage()
+                    } else {
+                        goToStartPage()
+                    }
                 }
             }
 
@@ -57,6 +67,9 @@ PageType {
                 textColor: "#EB5757"
 
                 clickedFunction: function() {
+                    if (ServersModel.isDefaultServerCurrentlyProcessed && ConnectionController.isConnected()) {
+                        ConnectionController.closeVpnConnection()
+                    }
                     ContainersModel.removeAllContainers()
                 }
             }
diff --git a/client/ui/qml/Pages2/PageSettingsServerInfo.qml b/client/ui/qml/Pages2/PageSettingsServerInfo.qml
new file mode 100644
index 00000000..29a0c3c1
--- /dev/null
+++ b/client/ui/qml/Pages2/PageSettingsServerInfo.qml
@@ -0,0 +1,134 @@
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+
+import SortFilterProxyModel 0.2
+
+import PageEnum 1.0
+import ProtocolEnum 1.0
+import ContainerProps 1.0
+import ProtocolProps 1.0
+
+import "./"
+import "../Controls2"
+import "../Controls2/TextTypes"
+import "../Config"
+import "../Components"
+
+PageType {
+    id: root
+
+    SortFilterProxyModel {
+        id: proxyServersModel
+        sourceModel: ServersModel
+        filters: [
+            ValueFilter {
+                roleName: "isCurrentlyProcessed"
+                value: true
+            }
+        ]
+    }
+
+    ColumnLayout {
+        id: content
+
+        anchors.fill: parent
+
+        spacing: 16
+
+        Repeater {
+            id: header
+            model: proxyServersModel
+
+            delegate: HeaderType {
+                Layout.fillWidth: true
+                Layout.topMargin: 20
+                Layout.leftMargin: 16
+                Layout.rightMargin: 16
+
+                actionButtonImage: "qrc:/images/controls/edit-3.svg"
+                backButtonImage: "qrc:/images/controls/arrow-left.svg"
+
+                headerText: name
+                descriptionText: hostName
+
+                actionButtonFunction: function() {
+                    connectionTypeSelection.visible = true
+                }
+
+                backButtonFunction: function() {
+                    closePage()
+                }
+            }
+        }
+
+        TabBar {
+            id: tabBar
+
+            Layout.fillWidth: true
+
+            background: Rectangle {
+                color: "transparent"
+            }
+
+            TabButtonType {
+                isSelected: tabBar.currentIndex === 0
+                text: qsTr("Protocols")
+//                onClicked: {
+//                    tabBarStackView.goToTabBarPage(PageEnum.PageSettingsServerProtocols)
+//                }
+            }
+            TabButtonType {
+                isSelected: tabBar.currentIndex === 1
+                text: qsTr("Services")
+//                onClicked: {
+//                    tabBarStackView.goToTabBarPage(PageEnum.PageSettingsServerServices)
+//                }
+            }
+            TabButtonType {
+                isSelected: tabBar.currentIndex === 2
+                text: qsTr("Data")
+//                onClicked: {
+//                    tabBarStackView.goToTabBarPage(PageEnum.PageSettingsServerData)
+//                }
+            }
+        }
+
+        StackLayout {
+            Layout.preferredWidth: root.width
+            Layout.preferredHeight: root.height - tabBar.implicitHeight - header.implicitHeight
+
+            currentIndex: tabBar.currentIndex
+
+            PageSettingsServerProtocols {
+                stackView: root.stackView
+            }
+            PageSettingsServerServices {
+                stackView: root.stackView
+            }
+            PageSettingsServerData {
+                stackView: root.stackView
+            }
+        }
+
+//        StackViewType {
+//            id: tabBarStackView
+
+//            Layout.preferredWidth: root.width
+//            Layout.preferredHeight: root.height - tabBar.implicitHeight - header.implicitHeight
+
+//            function goToTabBarPage(page) {
+//                var pagePath = PageController.getPagePath(page)
+//                while (tabBarStackView.depth > 1) {
+//                    tabBarStackView.pop()
+//                }
+//                tabBarStackView.replace(pagePath, { "objectName" : pagePath })
+//            }
+
+//            Component.onCompleted: {
+//                var pagePath = PageController.getPagePath(PageEnum.PageSettingsServerProtocols)
+//                tabBarStackView.push(pagePath, { "objectName" : pagePath })
+//            }
+//        }
+    }
+}
diff --git a/client/ui/qml/Pages2/PageSettingsServerProtocols.qml b/client/ui/qml/Pages2/PageSettingsServerProtocols.qml
new file mode 100644
index 00000000..e93aa528
--- /dev/null
+++ b/client/ui/qml/Pages2/PageSettingsServerProtocols.qml
@@ -0,0 +1,38 @@
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+
+import SortFilterProxyModel 0.2
+
+import PageEnum 1.0
+import ProtocolEnum 1.0
+import ContainerProps 1.0
+
+import "./"
+import "../Controls2"
+import "../Controls2/TextTypes"
+import "../Config"
+import "../Components"
+
+PageType {
+    id: root
+
+    SortFilterProxyModel {
+        id: containersProxyModel
+        sourceModel: ContainersModel
+        filters: [
+            ValueFilter {
+                roleName: "serviceType"
+                value: ProtocolEnum.Vpn
+            },
+            ValueFilter {
+                roleName: "isSupported"
+                value: true
+            }
+        ]
+    }
+
+    SettingsContainersListView {
+        model: containersProxyModel
+    }
+}
diff --git a/client/ui/qml/Pages2/PageSettingsServerServices.qml b/client/ui/qml/Pages2/PageSettingsServerServices.qml
new file mode 100644
index 00000000..7351f585
--- /dev/null
+++ b/client/ui/qml/Pages2/PageSettingsServerServices.qml
@@ -0,0 +1,38 @@
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+
+import SortFilterProxyModel 0.2
+
+import PageEnum 1.0
+import ProtocolEnum 1.0
+import ContainerProps 1.0
+
+import "./"
+import "../Controls2"
+import "../Controls2/TextTypes"
+import "../Config"
+import "../Components"
+
+PageType {
+    id: root
+
+    SortFilterProxyModel {
+        id: containersProxyModel
+        sourceModel: ContainersModel
+        filters: [
+            ValueFilter {
+                roleName: "serviceType"
+                value: ProtocolEnum.Other
+            },
+            ValueFilter {
+                roleName: "isSupported"
+                value: true
+            }
+        ]
+    }
+
+    SettingsContainersListView {
+        model: containersProxyModel
+    }
+}
diff --git a/client/ui/qml/Pages2/PageSettingsServersList.qml b/client/ui/qml/Pages2/PageSettingsServersList.qml
index 2344b7e8..63a40cc0 100644
--- a/client/ui/qml/Pages2/PageSettingsServersList.qml
+++ b/client/ui/qml/Pages2/PageSettingsServersList.qml
@@ -36,10 +36,6 @@ PageType {
         actionButtonFunction: function() {
             connectionTypeSelection.visible = true
         }
-
-        backButtonFunction: function() {
-            PageController.goToPageHome()
-        }
     }
 
     ConnectionTypeSelectionDrawer {
@@ -87,7 +83,8 @@ PageType {
 
                             clickedFunction: function() {
                                 ServersModel.setCurrentlyProcessedServerIndex(index)
-                                goToPage(PageEnum.PageSettings)
+                                ContainersModel.setCurrentlyProcessedServerIndex(index)
+                                goToPage(PageEnum.PageSettingsServerInfo)
                             }
                         }
 
diff --git a/client/ui/qml/Pages2/PageSetupWizardInstalling.qml b/client/ui/qml/Pages2/PageSetupWizardInstalling.qml
index 006743d9..cf7b1d28 100644
--- a/client/ui/qml/Pages2/PageSetupWizardInstalling.qml
+++ b/client/ui/qml/Pages2/PageSetupWizardInstalling.qml
@@ -26,10 +26,26 @@ PageType {
 
         function onInstallContainerFinished() {
             goToStartPage()
+            if (stackView.currentItem.objectName === PageController.getPagePath(PageEnum.PageHome)) {
+                PageController.restorePageHomeState(true)
+            } else if (stackView.currentItem.objectName === PageController.getPagePath(PageEnum.PageSettings)) {
+                goToPage(PageEnum.PageSettingsServersList, false)
+                goToPage(PageEnum.PageSettingsServerInfo, false)
+            } else {
+                goToPage(PageEnum.PageHome)
+            }
         }
 
         function onInstallServerFinished() {
             goToStartPage()
+            if (stackView.currentItem.objectName === PageController.getPagePath(PageEnum.PageHome)) {
+                PageController.restorePageHomeState()
+            } else if (stackView.currentItem.objectName === PageController.getPagePath(PageEnum.PageSettings)) {
+                goToPage(PageEnum.PageSettingsServersList, false)
+            } else {
+                var pagePath = PageController.getPagePath(PageEnum.PageStart)
+                stackView.replace(pagePath, { "objectName" : pagePath })
+            }
         }
     }
 
diff --git a/client/ui/qml/Pages2/PageSetupWizardStart.qml b/client/ui/qml/Pages2/PageSetupWizardStart.qml
index 804e145c..6358f00d 100644
--- a/client/ui/qml/Pages2/PageSetupWizardStart.qml
+++ b/client/ui/qml/Pages2/PageSetupWizardStart.qml
@@ -22,16 +22,6 @@ PageType {
         }
     }
 
-    Connections {
-        target: InstallController
-
-        function onInstallServerFinished() {
-            //todo add smt like changeStartPage
-            goToStartPage()
-            goToPage(PageEnum.PageStart)
-        }
-    }
-
     FlickableType {
         id: fl
         anchors.top: root.top
diff --git a/client/ui/qml/Pages2/PageStart.qml b/client/ui/qml/Pages2/PageStart.qml
index c50d4591..44577037 100644
--- a/client/ui/qml/Pages2/PageStart.qml
+++ b/client/ui/qml/Pages2/PageStart.qml
@@ -17,6 +17,7 @@ PageType {
 
         function onGoToPageHome() {
             tabBar.currentIndex = 0
+            tabBarStackView.goToTabBarPage(PageController.getPagePath(PageEnum.PageHome))
         }
 
         function onShowErrorMessage(errorMessage) {
@@ -25,9 +26,8 @@ PageType {
         }
     }
 
-    StackLayout {
-        id: stackLayout
-        currentIndex: tabBar.currentIndex
+    StackViewType {
+        id: tabBarStackView
 
         anchors.top: parent.top
         anchors.right: parent.right
@@ -37,20 +37,15 @@ PageType {
         width: parent.width
         height: root.height - tabBar.implicitHeight
 
-        StackView {
-            initialItem: PageHome {
-                id: pageHome
-            }
+        function goToTabBarPage(page) {
+            var pagePath = PageController.getPagePath(page)
+            tabBarStackView.clear(StackView.PopTransition)
+            tabBarStackView.replace(pagePath, { "objectName" : pagePath })
         }
 
-        Item {
-
-        }
-
-        StackView {
-            initialItem: PageSettingsServersList {
-                id: pageSettingsServersList
-            }
+        Component.onCompleted: {
+            var pagePath = PageController.getPagePath(PageEnum.PageHome)
+            tabBarStackView.push(pagePath, { "objectName" : pagePath })
         }
     }
 
@@ -70,12 +65,12 @@ PageType {
             color: "#1C1D21"
         }
 
-
         TabImageButtonType {
             isSelected: tabBar.currentIndex === 0
             image: "qrc:/images/controls/home.svg"
             onClicked: {
-                pageSettingsServersList.goToStartPage()
+                tabBarStackView.goToTabBarPage(PageEnum.PageHome)
+                ContainersModel.setCurrentlyProcessedServerIndex(ServersModel.getDefaultServerIndex())
             }
         }
         TabImageButtonType {
@@ -86,7 +81,7 @@ PageType {
             isSelected: tabBar.currentIndex === 2
             image: "qrc:/images/controls/settings-2.svg"
             onClicked: {
-                pageHome.goToStartPage()
+                tabBarStackView.goToTabBarPage(PageEnum.PageSettings)
             }
         }
     }
diff --git a/client/ui/qml/main2.qml b/client/ui/qml/main2.qml
index 5ca1b345..bda1c709 100644
--- a/client/ui/qml/main2.qml
+++ b/client/ui/qml/main2.qml
@@ -4,8 +4,10 @@ import QtQuick.Controls
 import QtQuick.Layouts
 
 import PageType 1.0
+import PageEnum 1.0
 
 import "Config"
+import "Controls2"
 
 Window  {
     id: root
@@ -27,9 +29,27 @@ Window  {
         color: "#0E0E11"
     }
 
-    StackView {
+    StackViewType {
+        id: rootStackView
+
         anchors.fill: parent
         focus: true
-        initialItem: PageController.getInitialPage()
+
+        Component.onCompleted: {
+            var pagePath = PageController.getPagePath(PageEnum.PageStart)
+            rootStackView.push(pagePath, { "objectName" : pagePath })
+        }
+    }
+
+    Connections {
+        target: PageController
+
+        function onReplaceStartPage() {
+            var pagePath = PageController.getInitialPage()
+            while (rootStackView.depth > 1) {
+                rootStackView.pop()
+            }
+            rootStackView.replace(pagePath, { "objectName" : pagePath })
+        }
     }
 }
diff --git a/client/ui/uilogic.cpp b/client/ui/uilogic.cpp
index 1cb43ee8..a0cac1cd 100644
--- a/client/ui/uilogic.cpp
+++ b/client/ui/uilogic.cpp
@@ -149,13 +149,13 @@ void UiLogic::initializeUiLogic()
     connect(m_notificationHandler, &NotificationHandler::connectRequested, pageLogic<VpnLogic>(), &VpnLogic::onConnect);
     connect(m_notificationHandler, &NotificationHandler::disconnectRequested, pageLogic<VpnLogic>(), &VpnLogic::onDisconnect);
 
-    if (m_settings->serversCount() > 0) {
-        if (m_settings->defaultServerIndex() < 0) m_settings->setDefaultServer(0);
-        emit goToPage(Page::PageStart, true, false);
-    }
-    else {
-        emit goToPage(Page::PageSetupWizardStart, true, false);
-    }
+//    if (m_settings->serversCount() > 0) {
+//        if (m_settings->defaultServerIndex() < 0) m_settings->setDefaultServer(0);
+//        emit goToPage(Page::PageStart, true, false);
+//    }
+//    else {
+//        emit goToPage(Page::PageSetupWizardStart, true, false);
+//    }
 
     m_selectedServerIndex = m_settings->defaultServerIndex();
 

From 420c33d3baa322b57e3b19f43083d730d4cc639c Mon Sep 17 00:00:00 2001
From: "vladimir.kuznetsov" <nethiuswork@gmail.com>
Date: Mon, 5 Jun 2023 15:49:10 +0800
Subject: [PATCH 025/278] added PageSetupWizardViewConfig - added a popup with
 a question when deleting containers/servers - added import from code and
 import error handling

---
 client/core/defs.h                            |   5 +-
 client/core/errorstrings.cpp                  |   2 +
 client/images/controls/file-cog-2.svg         |  11 ++
 client/resources.qrc                          |   5 +
 .../ui/controllers/connectionController.cpp   |  53 ++----
 client/ui/controllers/connectionController.h  |  14 +-
 client/ui/controllers/importController.cpp    |  75 +++++----
 client/ui/controllers/importController.h      |  17 +-
 client/ui/controllers/pageController.h        |   4 +-
 client/ui/qml/Components/ConnectButton.qml    |   8 +-
 .../ConnectionTypeSelectionDrawer.qml         |  14 --
 .../qml/Components/HomeContainersListView.qml |  60 ++++---
 client/ui/qml/Components/QuestionDrawer.qml   |  77 +++++++++
 client/ui/qml/Controls2/BackButtonType.qml    |  55 +++++++
 client/ui/qml/Controls2/DrawerType.qml        |  14 ++
 client/ui/qml/Controls2/DropDownType.qml      |  39 ++---
 client/ui/qml/Controls2/Header2Type.qml       |  22 ---
 client/ui/qml/Controls2/HeaderType.qml        |  22 ---
 client/ui/qml/Controls2/ProgressBarType.qml   |  10 +-
 client/ui/qml/Controls2/SwitcherType.qml      |   1 -
 .../qml/Controls2/TextFieldWithHeaderType.qml |   3 +-
 client/ui/qml/Pages2/PageDeinstalling.qml     |  91 +++++++++++
 client/ui/qml/Pages2/PageHome.qml             |  14 --
 client/ui/qml/Pages2/PageSettings.qml         |   3 -
 .../ui/qml/Pages2/PageSettingsServerData.qml  |  65 ++++++--
 .../ui/qml/Pages2/PageSettingsServerInfo.qml  |  58 ++-----
 .../ui/qml/Pages2/PageSettingsServersList.qml |  18 ++-
 .../Pages2/PageSetupWizardConfigSource.qml    |  18 +--
 .../qml/Pages2/PageSetupWizardCredentials.qml |  16 +-
 client/ui/qml/Pages2/PageSetupWizardEasy.qml  |  25 +--
 .../qml/Pages2/PageSetupWizardInstalling.qml  |   4 +-
 .../PageSetupWizardProtocolSettings.qml       |   7 +-
 .../qml/Pages2/PageSetupWizardProtocols.qml   |   5 +-
 .../ui/qml/Pages2/PageSetupWizardTextKey.qml  |  22 +--
 .../qml/Pages2/PageSetupWizardViewConfig.qml  | 152 ++++++++++++++++++
 client/ui/qml/Pages2/PageStart.qml            |   2 +
 client/ui/qml/main2.qml                       |   2 +-
 37 files changed, 701 insertions(+), 312 deletions(-)
 create mode 100644 client/images/controls/file-cog-2.svg
 create mode 100644 client/ui/qml/Components/QuestionDrawer.qml
 create mode 100644 client/ui/qml/Controls2/BackButtonType.qml
 create mode 100644 client/ui/qml/Pages2/PageDeinstalling.qml
 create mode 100644 client/ui/qml/Pages2/PageSetupWizardViewConfig.qml

diff --git a/client/core/defs.h b/client/core/defs.h
index 3a3ff565..61c45e4e 100644
--- a/client/core/defs.h
+++ b/client/core/defs.h
@@ -68,7 +68,10 @@ enum ErrorCode
     OpenSslFailed,
     OpenVpnExecutableCrashed,
     ShadowSocksExecutableCrashed,
-    CloakExecutableCrashed
+    CloakExecutableCrashed,
+
+    // import and install errors
+    ImportInvalidConfigError
 };
 
 } // namespace amnezia
diff --git a/client/core/errorstrings.cpp b/client/core/errorstrings.cpp
index 17b40b09..dd298c76 100644
--- a/client/core/errorstrings.cpp
+++ b/client/core/errorstrings.cpp
@@ -57,6 +57,8 @@ QString errorString(ErrorCode code){
     case (OpenVpnTapAdapterError): return QObject::tr("Can't setup OpenVPN TAP network adapter");
     case (AddressPoolError): return QObject::tr("VPN pool error: no available addresses");
 
+    case (ImportInvalidConfigError): return QObject::tr("The config does not contain any containers and credentiaks for connecting to the server");
+
     case(InternalError):
     default:
         return QObject::tr("Internal error");
diff --git a/client/images/controls/file-cog-2.svg b/client/images/controls/file-cog-2.svg
new file mode 100644
index 00000000..20815319
--- /dev/null
+++ b/client/images/controls/file-cog-2.svg
@@ -0,0 +1,11 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M14.5 2H6C5.46957 2 4.96086 2.21071 4.58579 2.58579C4.21071 2.96086 4 3.46957 4 4V20C4 20.5304 4.21071 21.0391 4.58579 21.4142C4.96086 21.7893 5.46957 22 6 22H18C18.5304 22 19.0391 21.7893 19.4142 21.4142C19.7893 21.0391 20 20.5304 20 20V7.5L14.5 2Z" stroke="#CBCBCB" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M14 2V8H20" stroke="#CBCBCB" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M12 17C13.1046 17 14 16.1046 14 15C14 13.8954 13.1046 13 12 13C10.8954 13 10 13.8954 10 15C10 16.1046 10.8954 17 12 17Z" stroke="#CBCBCB" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M12 12V13" stroke="#CBCBCB" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M12 17V18" stroke="#CBCBCB" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M14.6 13.5L13.73 14" stroke="#CBCBCB" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M10.27 16L9.40002 16.5" stroke="#CBCBCB" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M14.6 16.5L13.73 16" stroke="#CBCBCB" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M10.27 14L9.40002 13.5" stroke="#CBCBCB" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/client/resources.qrc b/client/resources.qrc
index db53165c..185c4469 100644
--- a/client/resources.qrc
+++ b/client/resources.qrc
@@ -249,5 +249,10 @@
         <file>images/controls/server.svg</file>
         <file>ui/qml/Pages2/PageSettingsServerProtocols.qml</file>
         <file>ui/qml/Pages2/PageSettingsServerServices.qml</file>
+        <file>ui/qml/Pages2/PageSetupWizardViewConfig.qml</file>
+        <file>images/controls/file-cog-2.svg</file>
+        <file>ui/qml/Components/QuestionDrawer.qml</file>
+        <file>ui/qml/Pages2/PageDeinstalling.qml</file>
+        <file>ui/qml/Controls2/BackButtonType.qml</file>
     </qresource>
 </RCC>
diff --git a/client/ui/controllers/connectionController.cpp b/client/ui/controllers/connectionController.cpp
index 617fd5ee..c4717012 100644
--- a/client/ui/controllers/connectionController.cpp
+++ b/client/ui/controllers/connectionController.cpp
@@ -9,21 +9,7 @@ ConnectionController::ConnectionController(const QSharedPointer<ServersModel> &s
 
 }
 
-bool ConnectionController::onConnectionButtonClicked()
-{
-    if (!isConnected()) {
-        openVpnConnection();
-    } else {
-        closeVpnConnection();
-    }
-}
-
-bool ConnectionController::isConnected()
-{
-    return m_isConnected;
-}
-
-bool ConnectionController::openVpnConnection()
+void ConnectionController::openConnection()
 {
     int serverIndex = m_serversModel->getDefaultServerIndex();
     QModelIndex serverModelIndex = m_serversModel->index(serverIndex);
@@ -35,16 +21,6 @@ bool ConnectionController::openVpnConnection()
     const QJsonObject &containerConfig = qvariant_cast<QJsonObject>(m_containersModel->data(containerModelIndex,
                                                                                             ContainersModel::Roles::ConfigRole));
 
-    //todo error handling
-    qApp->processEvents();
-    emit connectToVpn(serverIndex, credentials, container, containerConfig);
-    m_isConnected = true;
-
-
-//    int serverIndex = m_settings->defaultServerIndex();
-//    ServerCredentials credentials = m_settings->serverCredentials(serverIndex);
-//    DockerContainer container = m_settings->defaultContainer(serverIndex);
-
 //    if (m_settings->containers(serverIndex).isEmpty()) {
 //        set_labelErrorText(tr("VPN Protocols is not installed.\n Please install VPN container at first"));
 //        set_pushButtonConnectChecked(false);
@@ -57,20 +33,23 @@ bool ConnectionController::openVpnConnection()
 //        return;
 //    }
 
-
-//    const QJsonObject &containerConfig = m_settings->containerConfig(serverIndex, container);
-
-//    set_labelErrorText("");
-//    set_pushButtonConnectChecked(true);
-//    set_pushButtonConnectEnabled(false);
-
-//    qApp->processEvents();
-
-//    emit connectToVpn(serverIndex, credentials, container, containerConfig);
+    //todo error handling
+    qApp->processEvents();
+    emit connectToVpn(serverIndex, credentials, container, containerConfig);
 }
 
-bool ConnectionController::closeVpnConnection()
+void ConnectionController::closeConnection()
 {
     emit disconnectFromVpn();
-    m_isConnected = false;
+}
+
+bool ConnectionController::isConnected()
+{
+    return m_isConnected;
+}
+
+void ConnectionController::setIsConnected(bool isConnected)
+{
+    m_isConnected = isConnected;
+    emit isConnectedChanged();
 }
diff --git a/client/ui/controllers/connectionController.h b/client/ui/controllers/connectionController.h
index 8282a582..b1b0ff98 100644
--- a/client/ui/controllers/connectionController.h
+++ b/client/ui/controllers/connectionController.h
@@ -10,24 +10,26 @@ class ConnectionController : public QObject
     Q_OBJECT
 
 public:
+    Q_PROPERTY(bool isConnected READ isConnected WRITE setIsConnected NOTIFY isConnectedChanged)
+
     explicit ConnectionController(const QSharedPointer<ServersModel> &serversModel,
                                   const QSharedPointer<ContainersModel> &containersModel,
                                   QObject *parent = nullptr);
 
-public slots:
-    bool onConnectionButtonClicked();
-
     bool isConnected();
+    void setIsConnected(bool isConnected);
+
+public slots:
+    void openConnection();
+    void closeConnection();
 
 signals:
     void connectToVpn(int serverIndex, const ServerCredentials &credentials, DockerContainer container, const QJsonObject &containerConfig);
     void disconnectFromVpn();
     void connectionStateChanged(Vpn::ConnectionState state);
+    void isConnectedChanged();
 
 private:
-    bool openVpnConnection();
-    bool closeVpnConnection();
-
     QSharedPointer<ServersModel> m_serversModel;
     QSharedPointer<ContainersModel> m_containersModel;
 
diff --git a/client/ui/controllers/importController.cpp b/client/ui/controllers/importController.cpp
index ea1e7ad6..48e811e0 100644
--- a/client/ui/controllers/importController.cpp
+++ b/client/ui/controllers/importController.cpp
@@ -1,6 +1,9 @@
 #include "importController.h"
 
 #include <QFile>
+#include <QFileInfo>
+
+#include "core/errorstrings.h"
 
 namespace {
     enum class ConfigTypes {
@@ -39,50 +42,68 @@ ImportController::ImportController(const QSharedPointer<ServersModel> &serversMo
 
 }
 
-bool ImportController::importFromFile(const QUrl &fileUrl)
+void ImportController::extractConfigFromFile(const QUrl &fileUrl)
 {
     QFile file(fileUrl.toLocalFile());
     if (file.open(QIODevice::ReadOnly)) {
-        QByteArray data = file.readAll();
+        QString data = file.readAll();
 
         auto configFormat = checkConfigFormat(data);
         if (configFormat == ConfigTypes::OpenVpn) {
-            return importOpenVpnConfig(data);
+            m_config = extractOpenVpnConfig(data);
         } else if (configFormat == ConfigTypes::WireGuard) {
-            return importWireGuardConfig(data);
+            m_config = extractWireGuardConfig(data);
         } else {
-            return importAmneziaConfig(data);
+            m_config = extractAmneziaConfig(data);
         }
+
+        m_configFileName = QFileInfo(file.fileName()).fileName();
     }
-    return false;
 }
 
-bool ImportController::import(const QJsonObject &config)
+void ImportController::extractConfigFromCode(QString code)
+{
+    m_config = extractAmneziaConfig(code);
+}
+
+QString ImportController::getConfig()
+{
+    return QJsonDocument(m_config).toJson(QJsonDocument::Indented);
+}
+
+QString ImportController::getConfigFileName()
+{
+    return m_configFileName;
+}
+
+void ImportController::importConfig()
 {
     ServerCredentials credentials;
-    credentials.hostName = config.value(config_key::hostName).toString();
-    credentials.port = config.value(config_key::port).toInt();
-    credentials.userName = config.value(config_key::userName).toString();
-    credentials.secretData = config.value(config_key::password).toString();
+    credentials.hostName = m_config.value(config_key::hostName).toString();
+    credentials.port = m_config.value(config_key::port).toInt();
+    credentials.userName = m_config.value(config_key::userName).toString();
+    credentials.secretData = m_config.value(config_key::password).toString();
 
-    if (credentials.isValid() || config.contains(config_key::containers)) {
-        m_settings->addServer(config);
+    if (credentials.isValid() || m_config.contains(config_key::containers)) {
+        m_serversModel->addServer(m_config);
 
-        if (config.value(config_key::containers).toArray().isEmpty()) {
-            m_settings->setDefaultServer(m_settings->serversCount() - 1);
+        if (!m_config.value(config_key::containers).toArray().isEmpty()) {
+            auto newServerIndex = m_serversModel->index(m_serversModel->getServersCount() - 1);
+            m_serversModel->setData(newServerIndex, true, ServersModel::ServersModelRoles::IsDefaultRole);
         }
 
         emit importFinished();
     } else {
         qDebug() << "Failed to import profile";
-        qDebug().noquote() << QJsonDocument(config).toJson();
-        return false;
+        qDebug().noquote() << QJsonDocument(m_config).toJson();
+        emit importErrorOccurred(errorString(ErrorCode::ImportInvalidConfigError));
     }
 
-    return true;
+    m_config = {};
+    m_configFileName.clear();
 }
 
-bool ImportController::importAmneziaConfig(QString data)
+QJsonObject ImportController::extractAmneziaConfig(QString &data)
 {
     data.replace("vpn://", "");
     QByteArray ba = QByteArray::fromBase64(data.toUtf8(), QByteArray::Base64UrlEncoding | QByteArray::OmitTrailingEquals);
@@ -92,13 +113,7 @@ bool ImportController::importAmneziaConfig(QString data)
         ba = ba_uncompressed;
     }
 
-    QJsonObject config;
-    config = QJsonDocument::fromJson(ba).object();
-    if (!config.isEmpty()) {
-        return import(config);
-    }
-
-    return false;
+    return QJsonDocument::fromJson(ba).object();
 }
 
 //bool ImportController::importConnectionFromQr(const QByteArray &data)
@@ -116,7 +131,7 @@ bool ImportController::importAmneziaConfig(QString data)
 //    return false;
 //}
 
-bool ImportController::importOpenVpnConfig(const QString &data)
+QJsonObject ImportController::extractOpenVpnConfig(const QString &data)
 {
     QJsonObject openVpnConfig;
     openVpnConfig[config_key::config] = data;
@@ -156,10 +171,10 @@ bool ImportController::importOpenVpnConfig(const QString &data)
 
     config[config_key::hostName] = hostName;
 
-    return import(config);
+    return config;
 }
 
-bool ImportController::importWireGuardConfig(const QString &data)
+QJsonObject ImportController::extractWireGuardConfig(const QString &data)
 {
     QJsonObject lastConfig;
     lastConfig[config_key::config] = data;
@@ -200,5 +215,5 @@ bool ImportController::importWireGuardConfig(const QString &data)
 
     config[config_key::hostName] = hostName;
 
-    return import(config);
+    return config;
 }
diff --git a/client/ui/controllers/importController.h b/client/ui/controllers/importController.h
index 7dd548d8..114bb531 100644
--- a/client/ui/controllers/importController.h
+++ b/client/ui/controllers/importController.h
@@ -18,20 +18,27 @@ public:
                               QObject *parent = nullptr);
 
 public slots:
-    bool importFromFile(const QUrl &fileUrl);
+    void importConfig();
+    void extractConfigFromFile(const QUrl &fileUrl);
+    void extractConfigFromCode(QString code);
+    QString getConfig();
+    QString getConfigFileName();
 
 signals:
     void importFinished();
+    void importErrorOccurred(QString errorMessage);
 private:
-    bool import(const QJsonObject &config);
-    bool importAmneziaConfig(QString data);
-    bool importOpenVpnConfig(const QString &data);
-    bool importWireGuardConfig(const QString &data);
+    QJsonObject extractAmneziaConfig(QString &data);
+    QJsonObject extractOpenVpnConfig(const QString &data);
+    QJsonObject extractWireGuardConfig(const QString &data);
 
     QSharedPointer<ServersModel> m_serversModel;
     QSharedPointer<ContainersModel> m_containersModel;
     std::shared_ptr<Settings> m_settings;
 
+    QJsonObject m_config;
+    QString m_configFileName;
+
 };
 
 #endif // IMPORTCONTROLLER_H
diff --git a/client/ui/controllers/pageController.h b/client/ui/controllers/pageController.h
index 1d041deb..22ee0bb3 100644
--- a/client/ui/controllers/pageController.h
+++ b/client/ui/controllers/pageController.h
@@ -9,14 +9,14 @@
 namespace PageLoader
 {
     Q_NAMESPACE
-    enum class PageEnum { PageStart = 0, PageHome, PageShare,
+    enum class PageEnum { PageStart = 0, PageHome, PageShare, PageDeinstalling,
 
                           PageSettingsServersList, PageSettings, PageSettingsServerData, PageSettingsServerInfo,
                           PageSettingsServerProtocols, PageSettingsServerServices,
 
                           PageSetupWizardStart, PageTest, PageSetupWizardCredentials, PageSetupWizardProtocols, PageSetupWizardEasy,
                           PageSetupWizardProtocolSettings, PageSetupWizardInstalling, PageSetupWizardConfigSource,
-                          PageSetupWizardTextKey
+                          PageSetupWizardTextKey, PageSetupWizardViewConfig
     };
     Q_ENUM_NS(PageEnum)
 
diff --git a/client/ui/qml/Components/ConnectButton.qml b/client/ui/qml/Components/ConnectButton.qml
index 73accef4..06c148f1 100644
--- a/client/ui/qml/Components/ConnectButton.qml
+++ b/client/ui/qml/Components/ConnectButton.qml
@@ -13,7 +13,7 @@ Button {
         id: border
 
         source: connectionProccess.running ? "/images/connectionProgress.svg" :
-                                             ConnectionController.isConnected() ? "/images/connectionOff.svg" : "/images/connectionOn.svg"
+                                             ConnectionController.isConnected ? "/images/connectionOff.svg" : "/images/connectionOn.svg"
 
         RotationAnimator {
             id: connectionProccess
@@ -46,7 +46,7 @@ Button {
     }
 
     onClicked: {
-        ConnectionController.onConnectionButtonClicked()
+        ConnectionController.isConnected ? ConnectionController.closeConnection() : ConnectionController.openConnection()
     }
 
     Connections {
@@ -61,6 +61,7 @@ Button {
                     console.log("Disconnected")
                     connectionProccess.running = false
                     root.text = qsTr("Connect")
+                    ConnectionController.isConnected = false
                     break
                 }
                 case ConnectionState.Preparing: {
@@ -78,7 +79,8 @@ Button {
                 case ConnectionState.Connected: {
                     console.log("Connected")
                     connectionProccess.running = false
-                    root.text = qsTr("Connected")
+                    root.text = qsTr("Disconnect")
+                    ConnectionController.isConnected = true
                     break
                 }
                 case ConnectionState.Disconnecting: {
diff --git a/client/ui/qml/Components/ConnectionTypeSelectionDrawer.qml b/client/ui/qml/Components/ConnectionTypeSelectionDrawer.qml
index d80d5e5a..3c1ecd5b 100644
--- a/client/ui/qml/Components/ConnectionTypeSelectionDrawer.qml
+++ b/client/ui/qml/Components/ConnectionTypeSelectionDrawer.qml
@@ -14,20 +14,6 @@ DrawerType {
     width: parent.width
     height: parent.height * 0.4375
 
-    background: Rectangle {
-        anchors.fill: parent
-        anchors.bottomMargin: -radius
-        radius: 16
-        color: "#1C1D21"
-
-        border.color: "#2C2D30"
-        border.width: 1
-    }
-
-    Overlay.modal: Rectangle {
-        color: Qt.rgba(14/255, 14/255, 17/255, 0.8)
-    }
-
     ColumnLayout {
         anchors.top: parent.top
         anchors.left: parent.left
diff --git a/client/ui/qml/Components/HomeContainersListView.qml b/client/ui/qml/Components/HomeContainersListView.qml
index c3e98fbb..0d42b8e9 100644
--- a/client/ui/qml/Components/HomeContainersListView.qml
+++ b/client/ui/qml/Components/HomeContainersListView.qml
@@ -27,44 +27,54 @@ ListView {
 
     delegate: Item {
         implicitWidth: rootWidth
-        implicitHeight: containerRadioButton.implicitHeight
+        implicitHeight: content.implicitHeight
 
-        VerticalRadioButton {
-            id: containerRadioButton
+        ColumnLayout {
+            id: content
 
             anchors.fill: parent
             anchors.rightMargin: 16
             anchors.leftMargin: 16
 
-            text: name
-            descriptionText: description
+            VerticalRadioButton {
+                id: containerRadioButton
 
-            ButtonGroup.group: containersRadioButtonGroup
+                Layout.fillWidth: true
 
-            imageSource: "qrc:/images/controls/download.svg"
-            showImage: !isInstalled
+                text: name
+                descriptionText: description
 
-            checkable: isInstalled
-            checked: isDefault
+                ButtonGroup.group: containersRadioButtonGroup
 
-            onClicked: {
-                if (checked) {
-                    isDefault = true
-                    menuContent.currentIndex = index
-                    containersDropDown.menuVisible = false
-                } else {
-                    ContainersModel.setCurrentlyInstalledContainerIndex(proxyContainersModel.mapToSource(index))
-                    InstallController.setShouldCreateServer(false)
-                    goToPage(PageEnum.PageSetupWizardProtocolSettings)
-                    containersDropDown.menuVisible = false
-                    menu.visible = false
+                imageSource: "qrc:/images/controls/download.svg"
+                showImage: !isInstalled
+
+                checkable: isInstalled
+                checked: isDefault
+
+                onClicked: {
+                    if (checked) {
+                        isDefault = true
+                        menuContent.currentIndex = index
+                        containersDropDown.menuVisible = false
+                    } else {
+                        ContainersModel.setCurrentlyInstalledContainerIndex(proxyContainersModel.mapToSource(index))
+                        InstallController.setShouldCreateServer(false)
+                        goToPage(PageEnum.PageSetupWizardProtocolSettings)
+                        containersDropDown.menuVisible = false
+                        menu.visible = false
+                    }
+                }
+
+                MouseArea {
+                    anchors.fill: containerRadioButton
+                    cursorShape: Qt.PointingHandCursor
+                    enabled: false
                 }
             }
 
-            MouseArea {
-                anchors.fill: containerRadioButton
-                cursorShape: Qt.PointingHandCursor
-                enabled: false
+            DividerType {
+                Layout.fillWidth: true
             }
         }
 
diff --git a/client/ui/qml/Components/QuestionDrawer.qml b/client/ui/qml/Components/QuestionDrawer.qml
new file mode 100644
index 00000000..a79f9140
--- /dev/null
+++ b/client/ui/qml/Components/QuestionDrawer.qml
@@ -0,0 +1,77 @@
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+
+import "../Controls2"
+import "../Controls2/TextTypes"
+
+DrawerType {
+    id: root
+
+    property string headerText
+    property string descriptionText
+    property string yesButtonText
+    property string noButtonText
+
+    property var yesButtonFunction
+    property var noButtonFunction
+
+    width: parent.width
+    height: parent.height * 0.5
+
+    ColumnLayout {
+        anchors.top: parent.top
+        anchors.left: parent.left
+        anchors.right: parent.right
+        anchors.topMargin: 16
+        anchors.rightMargin: 16
+        anchors.leftMargin: 16
+
+        spacing: 8
+
+        Header2TextType {
+            Layout.fillWidth: true
+
+            text: headerText
+        }
+
+        ParagraphTextType {
+            Layout.fillWidth: true
+            Layout.topMargin: 8
+
+            text: descriptionText
+        }
+
+        BasicButtonType {
+            Layout.fillWidth: true
+            Layout.topMargin: 16
+
+            text: yesButtonText
+
+            onClicked: {
+                if (yesButtonFunction && typeof yesButtonFunction === "function") {
+                    yesButtonFunction()
+                }
+            }
+        }
+
+        BasicButtonType {
+            Layout.fillWidth: true
+
+            defaultColor: "transparent"
+            hoveredColor: Qt.rgba(1, 1, 1, 0.08)
+            pressedColor: Qt.rgba(1, 1, 1, 0.12)
+            disabledColor: "#878B91"
+            textColor: "#D7D8DB"
+            borderWidth: 1
+
+            text: noButtonText
+
+            onClicked: {
+                if (noButtonFunction && typeof noButtonFunction === "function") {
+                    noButtonFunction()
+                }
+            }
+        }
+    }
+}
diff --git a/client/ui/qml/Controls2/BackButtonType.qml b/client/ui/qml/Controls2/BackButtonType.qml
new file mode 100644
index 00000000..bec31823
--- /dev/null
+++ b/client/ui/qml/Controls2/BackButtonType.qml
@@ -0,0 +1,55 @@
+import QtQuick
+import QtQuick.Layouts
+import Qt5Compat.GraphicalEffects
+
+Item {
+    id: root
+
+    property string backButtonImage: "qrc:/images/controls/arrow-left.svg"
+    property var backButtonFunction
+
+    implicitWidth: content.implicitWidth
+    implicitHeight: content.implicitHeight
+
+    RowLayout {
+        id: content
+
+        anchors.fill: parent
+
+        ImageButtonType {
+            image: backButtonImage
+            imageColor: "#D7D8DB"
+
+            onClicked: {
+                if (backButtonFunction && typeof backButtonFunction === "function") {
+                    backButtonFunction()
+                } else {
+                    closePage()
+                }
+            }
+        }
+
+        Rectangle {
+            id: background
+            Layout.fillWidth: true
+
+            color: "transparent"
+
+            ShaderEffectSource {
+                id: effectSource
+
+                sourceItem: background
+                anchors.fill: background
+                sourceRect: Qt.rect(x,y, width, height)
+            }
+
+            FastBlur {
+                id: blur
+                anchors.fill: effectSource
+
+                source: effectSource
+                radius: 100
+            }
+        }
+    }
+}
diff --git a/client/ui/qml/Controls2/DrawerType.qml b/client/ui/qml/Controls2/DrawerType.qml
index bede3700..e3c9d588 100644
--- a/client/ui/qml/Controls2/DrawerType.qml
+++ b/client/ui/qml/Controls2/DrawerType.qml
@@ -17,4 +17,18 @@ Drawer {
             velocity: 4
         }
     }
+
+    background: Rectangle {
+        anchors.fill: parent
+        anchors.bottomMargin: -radius
+        radius: 16
+        color: "#1C1D21"
+
+        border.color: "#2C2D30"
+        border.width: 1
+    }
+
+    Overlay.modal: Rectangle {
+        color: Qt.rgba(14/255, 14/255, 17/255, 0.8)
+    }
 }
diff --git a/client/ui/qml/Controls2/DropDownType.qml b/client/ui/qml/Controls2/DropDownType.qml
index 5ac50fa7..700d9981 100644
--- a/client/ui/qml/Controls2/DropDownType.qml
+++ b/client/ui/qml/Controls2/DropDownType.qml
@@ -117,28 +117,9 @@ Item {
         width: parent.width
         height: parent.height * 0.9
 
-        background: Rectangle {
-            anchors.fill: parent
-            anchors.bottomMargin: -radius
-            radius: 16
-            color: "#1C1D21"
-
-            border.color: "#494B50"
-            border.width: 1
-        }
-
-        Overlay.modal: Rectangle {
-            color: Qt.rgba(14/255, 14/255, 17/255, 0.8)
-        }
-
-        Header2Type {
+        ColumnLayout {
             id: header
 
-            headerText: root.headerText
-            backButtonImage: root.headerBackButtonImage
-
-            width: parent.width
-
             anchors.top: parent.top
             anchors.left: parent.left
             anchors.right: parent.right
@@ -146,8 +127,11 @@ Item {
             anchors.leftMargin: 16
             anchors.rightMargin: 16
 
-            backButtonFunction: function() {
-                root.menuVisible = false
+            BackButtonType {
+                backButtonImage: root.headerBackButtonImage
+                backButtonFunction: function() {
+                    root.menuVisible = false
+                }
             }
         }
 
@@ -164,6 +148,17 @@ Item {
 
                 spacing: 16
 
+                Header2Type {
+                    anchors.left: parent.left
+                    anchors.right: parent.right
+                    anchors.leftMargin: 16
+                    anchors.rightMargin: 16
+
+                    headerText: root.headerText
+
+                    width: parent.width
+                }
+
                 Loader {
                     id: listViewLoader
                     sourceComponent: root.listView
diff --git a/client/ui/qml/Controls2/Header2Type.qml b/client/ui/qml/Controls2/Header2Type.qml
index ce9d804a..9433f52a 100644
--- a/client/ui/qml/Controls2/Header2Type.qml
+++ b/client/ui/qml/Controls2/Header2Type.qml
@@ -6,10 +6,7 @@ import "TextTypes"
 Item {
     id: root
 
-    property string backButtonImage
     property string actionButtonImage
-
-    property var backButtonFunction
     property var actionButtonFunction
 
     property string headerText
@@ -22,25 +19,6 @@ Item {
         id: content
         anchors.fill: parent
 
-        ImageButtonType {
-            id: backButton
-
-            Layout.leftMargin: -6
-
-            image: root.backButtonImage
-            imageColor: "#D7D8DB"
-
-            visible: image ? true : false
-
-            onClicked: {
-                if (backButtonFunction && typeof backButtonFunction === "function") {
-                    backButtonFunction()
-                } else {
-                    closePage()
-                }
-            }
-        }
-
         RowLayout {
             Header2TextType {
                 id: header
diff --git a/client/ui/qml/Controls2/HeaderType.qml b/client/ui/qml/Controls2/HeaderType.qml
index 2c0fbd85..19958205 100644
--- a/client/ui/qml/Controls2/HeaderType.qml
+++ b/client/ui/qml/Controls2/HeaderType.qml
@@ -6,10 +6,7 @@ import "TextTypes"
 Item {
     id: root
 
-    property string backButtonImage
     property string actionButtonImage
-
-    property var backButtonFunction
     property var actionButtonFunction
 
     property string headerText
@@ -22,25 +19,6 @@ Item {
         id: content
         anchors.fill: parent
 
-        ImageButtonType {
-            id: backButton
-
-            Layout.leftMargin: -6
-
-            image: root.backButtonImage
-            imageColor: "#D7D8DB"
-
-            visible: image ? true : false
-
-            onClicked: {
-                if (backButtonFunction && typeof backButtonFunction === "function") {
-                    backButtonFunction()
-                } else {
-                    closePage()
-                }
-            }
-        }
-
         RowLayout {
             Header1TextType {
                 id: header
diff --git a/client/ui/qml/Controls2/ProgressBarType.qml b/client/ui/qml/Controls2/ProgressBarType.qml
index f2f2370a..183c3736 100644
--- a/client/ui/qml/Controls2/ProgressBarType.qml
+++ b/client/ui/qml/Controls2/ProgressBarType.qml
@@ -11,9 +11,11 @@ ProgressBar {
         color: "#412102"
     }
 
-    contentItem: Rectangle {
-        width: root.visualPosition * root.width
-        height: root.height
-        color: "#FBB26A"
+    contentItem: Item {
+        Rectangle {
+            width: root.visualPosition * parent.width
+            height: parent.height
+            color: "#FBB26A"
+        }
     }
 }
diff --git a/client/ui/qml/Controls2/SwitcherType.qml b/client/ui/qml/Controls2/SwitcherType.qml
index e4df04fa..b593ece8 100644
--- a/client/ui/qml/Controls2/SwitcherType.qml
+++ b/client/ui/qml/Controls2/SwitcherType.qml
@@ -59,7 +59,6 @@ Switch {
         }
     }
 
-    contentItem: ColumnLayout {
     contentItem: ColumnLayout {
         id: content
 
diff --git a/client/ui/qml/Controls2/TextFieldWithHeaderType.qml b/client/ui/qml/Controls2/TextFieldWithHeaderType.qml
index 3458f741..b41f0b40 100644
--- a/client/ui/qml/Controls2/TextFieldWithHeaderType.qml
+++ b/client/ui/qml/Controls2/TextFieldWithHeaderType.qml
@@ -6,7 +6,6 @@ Item {
     id: root
 
     property string headerText
-    property string textFieldText
     property string textFieldPlaceholderText
     property bool textFieldEditable: true
 
@@ -14,6 +13,7 @@ Item {
     property var clickedFunc
 
     property alias textField: textField
+    property alias textFieldText: textField.text
 
     implicitHeight: 74
 
@@ -53,7 +53,6 @@ Item {
                 id: textField
 
                 enabled: root.textFieldEditable
-                text: root.textFieldText
                 color: "#d7d8db"
 
                 placeholderText: textFieldPlaceholderText
diff --git a/client/ui/qml/Pages2/PageDeinstalling.qml b/client/ui/qml/Pages2/PageDeinstalling.qml
new file mode 100644
index 00000000..1dc542e0
--- /dev/null
+++ b/client/ui/qml/Pages2/PageDeinstalling.qml
@@ -0,0 +1,91 @@
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+
+import SortFilterProxyModel 0.2
+
+import PageEnum 1.0
+
+import "./"
+import "../Controls2"
+import "../Controls2/TextTypes"
+import "../Config"
+
+PageType {
+    id: root
+
+    SortFilterProxyModel {
+        id: proxyServersModel
+        sourceModel: ServersModel
+        filters: [
+            ValueFilter {
+                roleName: "isCurrentlyProcessed"
+                value: true
+            }
+        ]
+    }
+
+    FlickableType {
+        id: fl
+        anchors.fill: parent
+        contentHeight: content.height
+
+        Column {
+            id: content
+
+            anchors.top: parent.top
+            anchors.left: parent.left
+            anchors.right: parent.right
+
+            spacing: 16
+
+            Repeater {
+                model: proxyServersModel
+                delegate: Item {
+                    implicitWidth: parent.width
+                    implicitHeight: delegateContent.implicitHeight
+
+                    ColumnLayout {
+                        id: delegateContent
+
+                        anchors.fill: parent
+                        anchors.rightMargin: 16
+                        anchors.leftMargin: 16
+
+                        HeaderType {
+                            Layout.fillWidth: true
+                            Layout.topMargin: 20
+
+                            headerText: qsTr("Removing services from ") + name
+                        }
+
+                        ProgressBarType {
+                            id: progressBar
+
+                            Layout.fillWidth: true
+                            Layout.topMargin: 32
+
+                            Timer {
+                                id: timer
+
+                                interval: 300
+                                repeat: true
+                                running: true
+                                onTriggered: {
+                                    progressBar.value += 0.001
+                                }
+                            }
+                        }
+
+                        ParagraphTextType {
+                            Layout.fillWidth: true
+                            Layout.topMargin: 8
+
+                            text: "Обычно это занимает не больше 5 минут"
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/client/ui/qml/Pages2/PageHome.qml b/client/ui/qml/Pages2/PageHome.qml
index 0ecbafcc..4f3c4b6a 100644
--- a/client/ui/qml/Pages2/PageHome.qml
+++ b/client/ui/qml/Pages2/PageHome.qml
@@ -113,20 +113,6 @@ PageType {
         width: parent.width
         height: parent.height * 0.90
 
-        background: Rectangle {
-            anchors.fill: parent
-            anchors.bottomMargin: -radius
-            radius: 16
-
-            color: "#1C1D21"
-            border.color: root.borderColor
-            border.width: 1
-        }
-
-        Overlay.modal: Rectangle {
-            color: Qt.rgba(14/255, 14/255, 17/255, 0.8)
-        }
-
         ColumnLayout {
             id: serversMenuHeader
             anchors.top: parent.top
diff --git a/client/ui/qml/Pages2/PageSettings.qml b/client/ui/qml/Pages2/PageSettings.qml
index d3b87c19..300421b7 100644
--- a/client/ui/qml/Pages2/PageSettings.qml
+++ b/client/ui/qml/Pages2/PageSettings.qml
@@ -71,7 +71,6 @@ PageType {
                 iconImage: "qrc:/images/controls/app.svg"
 
                 clickedFunction: function() {
-                    goToPage(PageEnum.PageSetupWizardTextKey)
                 }
             }
 
@@ -85,7 +84,6 @@ PageType {
                 iconImage: "qrc:/images/controls/save.svg"
 
                 clickedFunction: function() {
-                    goToPage(PageEnum.PageSetupWizardTextKey)
                 }
             }
 
@@ -99,7 +97,6 @@ PageType {
                 iconImage: "qrc:/images/controls/amnezia.svg"
 
                 clickedFunction: function() {
-                    goToPage(PageEnum.PageSetupWizardTextKey)
                 }
             }
 
diff --git a/client/ui/qml/Pages2/PageSettingsServerData.qml b/client/ui/qml/Pages2/PageSettingsServerData.qml
index 3ab76299..c1f84cb0 100644
--- a/client/ui/qml/Pages2/PageSettingsServerData.qml
+++ b/client/ui/qml/Pages2/PageSettingsServerData.qml
@@ -9,6 +9,7 @@ import ProtocolEnum 1.0
 
 import "../Controls2"
 import "../Controls2/TextTypes"
+import "../Components"
 
 PageType {
     id: root
@@ -33,7 +34,19 @@ PageType {
                 descriptionText: "May be needed when changing other settings"
 
                 clickedFunction: function() {
-                    ContainersModel.clearCachedProfiles()
+                    questionDrawer.headerText = qsTr("Clear cached profiles?")
+                    questionDrawer.descriptionText = qsTr("some description")
+                    questionDrawer.yesButtonText = qsTr("Continue")
+                    questionDrawer.noButtonText = qsTr("Cancel")
+
+                    questionDrawer.yesButtonFunction = function() {
+                        questionDrawer.visible = false
+                        ContainersModel.clearCachedProfiles()
+                    }
+                    questionDrawer.noButtonFunction = function() {
+                        questionDrawer.visible = false
+                    }
+                    questionDrawer.visible = true
                 }
             }
 
@@ -46,15 +59,27 @@ PageType {
                 textColor: "#EB5757"
 
                 clickedFunction: function() {
-                    if (ServersModel.isDefaultServerCurrentlyProcessed && ConnectionController.isConnected()) {
-                        ConnectionController.closeVpnConnection()
+                    questionDrawer.headerText = qsTr("Remove server?")
+                    questionDrawer.descriptionText = qsTr("All installed AmneziaVPN services will still remain on the server.")
+                    questionDrawer.yesButtonText = qsTr("Continue")
+                    questionDrawer.noButtonText = qsTr("Cancel")
+
+                    questionDrawer.yesButtonFunction = function() {
+                        questionDrawer.visible = false
+                        if (ServersModel.isDefaultServerCurrentlyProcessed && ConnectionController.isConnected) {
+                            ConnectionController.closeConnection()
+                        }
+                        ServersModel.removeServer()
+                        if (!ServersModel.getServersCount()) {
+                            PageController.replaceStartPage()
+                        } else {
+                            goToStartPage()
+                        }
                     }
-                    ServersModel.removeServer()
-                    if (!ServersModel.getServersCount()) {
-                        PageController.replaceStartPage()
-                    } else {
-                        goToStartPage()
+                    questionDrawer.noButtonFunction = function() {
+                        questionDrawer.visible = false
                     }
+                    questionDrawer.visible = true
                 }
             }
 
@@ -67,14 +92,32 @@ PageType {
                 textColor: "#EB5757"
 
                 clickedFunction: function() {
-                    if (ServersModel.isDefaultServerCurrentlyProcessed && ConnectionController.isConnected()) {
-                        ConnectionController.closeVpnConnection()
+                    questionDrawer.headerText = qsTr("Clear server from Amnezia software?")
+                    questionDrawer.descriptionText = qsTr(" All containers will be deleted on the server. This means that configuration files, keys and certificates will be deleted.")
+                    questionDrawer.yesButtonText = qsTr("Continue")
+                    questionDrawer.noButtonText = qsTr("Cancel")
+
+                    questionDrawer.yesButtonFunction = function() {
+                        questionDrawer.visible = false
+                        goToPage(PageEnum.PageDeinstalling)
+                        if (ServersModel.isDefaultServerCurrentlyProcessed && ConnectionController.isConnected) {
+                            ConnectionController.closeVpnConnection()
+                        }
+                        ContainersModel.removeAllContainers()
+                        closePage()
                     }
-                    ContainersModel.removeAllContainers()
+                    questionDrawer.noButtonFunction = function() {
+                        questionDrawer.visible = false
+                    }
+                    questionDrawer.visible = true
                 }
             }
 
             DividerType {}
+
+            QuestionDrawer {
+                id: questionDrawer
+            }
         }
     }
 }
diff --git a/client/ui/qml/Pages2/PageSettingsServerInfo.qml b/client/ui/qml/Pages2/PageSettingsServerInfo.qml
index 29a0c3c1..5e422230 100644
--- a/client/ui/qml/Pages2/PageSettingsServerInfo.qml
+++ b/client/ui/qml/Pages2/PageSettingsServerInfo.qml
@@ -30,8 +30,6 @@ PageType {
     }
 
     ColumnLayout {
-        id: content
-
         anchors.fill: parent
 
         spacing: 16
@@ -40,24 +38,27 @@ PageType {
             id: header
             model: proxyServersModel
 
-            delegate: HeaderType {
-                Layout.fillWidth: true
+            delegate: ColumnLayout {
+                id: content
+
                 Layout.topMargin: 20
                 Layout.leftMargin: 16
                 Layout.rightMargin: 16
 
-                actionButtonImage: "qrc:/images/controls/edit-3.svg"
-                backButtonImage: "qrc:/images/controls/arrow-left.svg"
-
-                headerText: name
-                descriptionText: hostName
-
-                actionButtonFunction: function() {
-                    connectionTypeSelection.visible = true
+                BackButtonType {
                 }
 
-                backButtonFunction: function() {
-                    closePage()
+                HeaderType {
+                    Layout.fillWidth: true
+
+                    actionButtonImage: "qrc:/images/controls/edit-3.svg"
+
+                    headerText: name
+                    descriptionText: hostName
+
+                    actionButtonFunction: function() {
+                        connectionTypeSelection.visible = true
+                    }
                 }
             }
         }
@@ -74,23 +75,14 @@ PageType {
             TabButtonType {
                 isSelected: tabBar.currentIndex === 0
                 text: qsTr("Protocols")
-//                onClicked: {
-//                    tabBarStackView.goToTabBarPage(PageEnum.PageSettingsServerProtocols)
-//                }
             }
             TabButtonType {
                 isSelected: tabBar.currentIndex === 1
                 text: qsTr("Services")
-//                onClicked: {
-//                    tabBarStackView.goToTabBarPage(PageEnum.PageSettingsServerServices)
-//                }
             }
             TabButtonType {
                 isSelected: tabBar.currentIndex === 2
                 text: qsTr("Data")
-//                onClicked: {
-//                    tabBarStackView.goToTabBarPage(PageEnum.PageSettingsServerData)
-//                }
             }
         }
 
@@ -110,25 +102,5 @@ PageType {
                 stackView: root.stackView
             }
         }
-
-//        StackViewType {
-//            id: tabBarStackView
-
-//            Layout.preferredWidth: root.width
-//            Layout.preferredHeight: root.height - tabBar.implicitHeight - header.implicitHeight
-
-//            function goToTabBarPage(page) {
-//                var pagePath = PageController.getPagePath(page)
-//                while (tabBarStackView.depth > 1) {
-//                    tabBarStackView.pop()
-//                }
-//                tabBarStackView.replace(pagePath, { "objectName" : pagePath })
-//            }
-
-//            Component.onCompleted: {
-//                var pagePath = PageController.getPagePath(PageEnum.PageSettingsServerProtocols)
-//                tabBarStackView.push(pagePath, { "objectName" : pagePath })
-//            }
-//        }
     }
 }
diff --git a/client/ui/qml/Pages2/PageSettingsServersList.qml b/client/ui/qml/Pages2/PageSettingsServersList.qml
index 63a40cc0..9c5ddc74 100644
--- a/client/ui/qml/Pages2/PageSettingsServersList.qml
+++ b/client/ui/qml/Pages2/PageSettingsServersList.qml
@@ -17,7 +17,7 @@ import "../Components"
 PageType {
     id: root
 
-    HeaderType {
+    ColumnLayout {
         id: header
 
         anchors.top: parent.top
@@ -28,13 +28,19 @@ PageType {
         anchors.leftMargin: 16
         anchors.rightMargin: 16
 
-        actionButtonImage: "qrc:/images/controls/plus.svg"
-        backButtonImage: "qrc:/images/controls/arrow-left.svg"
+        BackButtonType {
+        }
 
-        headerText: "Серверы"
+        HeaderType {
+            Layout.fillWidth: true
 
-        actionButtonFunction: function() {
-            connectionTypeSelection.visible = true
+            actionButtonImage: "qrc:/images/controls/plus.svg"
+
+            headerText: "Серверы"
+
+            actionButtonFunction: function() {
+                connectionTypeSelection.visible = true
+            }
         }
     }
 
diff --git a/client/ui/qml/Pages2/PageSetupWizardConfigSource.qml b/client/ui/qml/Pages2/PageSetupWizardConfigSource.qml
index 25b88f76..79e596af 100644
--- a/client/ui/qml/Pages2/PageSetupWizardConfigSource.qml
+++ b/client/ui/qml/Pages2/PageSetupWizardConfigSource.qml
@@ -13,14 +13,6 @@ import "../Config"
 PageType {
     id: root
 
-    Connections {
-        target: ImportController
-
-        function onImportFinished() {
-
-        }
-    }
-
     FlickableType {
         id: fl
         anchors.top: root.top
@@ -34,13 +26,18 @@ PageType {
             anchors.left: parent.left
             anchors.right: parent.right
 
+            BackButtonType {
+                Layout.topMargin: 20
+                Layout.rightMargin: 16
+                Layout.leftMargin: 16
+            }
+
             HeaderType {
                 Layout.fillWidth: true
                 Layout.topMargin: 20
                 Layout.rightMargin: 16
                 Layout.leftMargin: 16
 
-                backButtonImage: "qrc:/images/controls/arrow-left.svg"
 
                 headerText: "Подключение к серверу"
                 descriptionText: "Не используйте код подключения из публичных источников. Его могли создать, чтобы перехватывать ваши данные.\n
@@ -71,7 +68,8 @@ PageType {
                 FileDialog {
                     id: fileDialog
                     onAccepted: {
-                        ImportController.importFromFile(selectedFile)
+                        ImportController.extractConfigFromFile(selectedFile)
+                        goToPage(PageEnum.PageSetupWizardViewConfig)
                     }
                 }
             }
diff --git a/client/ui/qml/Pages2/PageSetupWizardCredentials.qml b/client/ui/qml/Pages2/PageSetupWizardCredentials.qml
index 95463c3e..49197962 100644
--- a/client/ui/qml/Pages2/PageSetupWizardCredentials.qml
+++ b/client/ui/qml/Pages2/PageSetupWizardCredentials.qml
@@ -11,9 +11,20 @@ import "../Config"
 PageType {
     id: root
 
+    BackButtonType {
+        id: backButton
+
+        anchors.top: parent.top
+        anchors.left: parent.left
+        anchors.right: parent.right
+        anchors.rightMargin: 16
+        anchors.leftMargin: 16
+        anchors.topMargin: 20
+    }
+
     FlickableType {
         id: fl
-        anchors.top: root.top
+        anchors.top: backButton.bottom
         anchors.bottom: root.bottom
         contentHeight: content.height
 
@@ -30,9 +41,6 @@ PageType {
 
             HeaderType {
                 Layout.fillWidth: true
-                Layout.topMargin: 20
-
-                backButtonImage: "qrc:/images/controls/arrow-left.svg"
 
                 headerText: "Подключение к серверу"
             }
diff --git a/client/ui/qml/Pages2/PageSetupWizardEasy.qml b/client/ui/qml/Pages2/PageSetupWizardEasy.qml
index 8707c19b..99f6ccfb 100644
--- a/client/ui/qml/Pages2/PageSetupWizardEasy.qml
+++ b/client/ui/qml/Pages2/PageSetupWizardEasy.qml
@@ -30,11 +30,22 @@ PageType {
         }
     }
 
+    BackButtonType {
+        id: backButton
+
+        anchors.top: parent.top
+        anchors.left: parent.left
+        anchors.right: parent.right
+        anchors.rightMargin: 16
+        anchors.leftMargin: 16
+        anchors.topMargin: 20
+    }
+
     FlickableType {
         id: fl
-        anchors.top: root.top
+        anchors.top: backButton.bottom
         anchors.bottom: root.bottom
-        contentHeight: content.implicitHeight + buttonContinue.anchors.bottomMargin
+        contentHeight: content.implicitHeight + continueButton.anchors.bottomMargin
 
         Column {
             id: content
@@ -44,7 +55,6 @@ PageType {
             anchors.right: parent.right
             anchors.rightMargin: 16
             anchors.leftMargin: 16
-            anchors.topMargin: 20
 
             spacing: 16
 
@@ -53,9 +63,7 @@ PageType {
 
                 implicitWidth: parent.width
 
-                backButtonImage: "qrc:/images/controls/arrow-left.svg"
-
-                headerText: qsTr("What is the level of Internet control in your region?")
+                headerText: qsTr("What is the level of internet control in your region?")
             }
 
             ListView {
@@ -118,11 +126,10 @@ PageType {
             }
 
             BasicButtonType {
-                id: buttonContinue
+                id: continueButton
 
                 implicitWidth: parent.width
-                anchors.topMargin: 24
-                anchors.bottomMargin: 32
+                anchors.bottomMargin: 24
 
                 text: qsTr("Continue")
 
diff --git a/client/ui/qml/Pages2/PageSetupWizardInstalling.qml b/client/ui/qml/Pages2/PageSetupWizardInstalling.qml
index cf7b1d28..c18c4d27 100644
--- a/client/ui/qml/Pages2/PageSetupWizardInstalling.qml
+++ b/client/ui/qml/Pages2/PageSetupWizardInstalling.qml
@@ -109,7 +109,7 @@ PageType {
                             Layout.fillWidth: true
                             Layout.topMargin: 32
 
-                            value: progressBarValue
+//                            value: progressBarValue
 
                             Timer {
                                 id: timer
@@ -118,7 +118,7 @@ PageType {
                                 repeat: true
                                 running: true
                                 onTriggered: {
-                                    progressBarValue += 0.001
+                                    progressBar.value += 0.001
                                 }
                             }
                         }
diff --git a/client/ui/qml/Pages2/PageSetupWizardProtocolSettings.qml b/client/ui/qml/Pages2/PageSetupWizardProtocolSettings.qml
index fa3ac838..39761cee 100644
--- a/client/ui/qml/Pages2/PageSetupWizardProtocolSettings.qml
+++ b/client/ui/qml/Pages2/PageSetupWizardProtocolSettings.qml
@@ -62,13 +62,14 @@ PageType {
                         anchors.rightMargin: 16
                         anchors.leftMargin: 16
 
+                        BackButtonType {
+                            Layout.topMargin: 20
+                        }
+
                         HeaderType {
                             id: header
 
                             Layout.fillWidth: true
-                            Layout.topMargin: 20
-
-                            backButtonImage: "qrc:/images/controls/arrow-left.svg"
 
                             headerText: "Установка " + name
                             descriptionText: "Эти настройки можно будет изменить позже"
diff --git a/client/ui/qml/Pages2/PageSetupWizardProtocols.qml b/client/ui/qml/Pages2/PageSetupWizardProtocols.qml
index cdacaf04..75b16afd 100644
--- a/client/ui/qml/Pages2/PageSetupWizardProtocols.qml
+++ b/client/ui/qml/Pages2/PageSetupWizardProtocols.qml
@@ -48,9 +48,12 @@ PageType {
 
             spacing: 16
 
+            BackButtonType {
+                width: parent.width
+            }
+
             HeaderType {
                 width: parent.width
-                backButtonImage: "qrc:/images/controls/arrow-left.svg"
 
                 headerText: "Протокол подключения"
                 descriptionText: "Выберите более приоритетный для вас. Позже можно будет установить остальные протоколы и доп сервисы, вроде DNS-прокси и SFTP."
diff --git a/client/ui/qml/Pages2/PageSetupWizardTextKey.qml b/client/ui/qml/Pages2/PageSetupWizardTextKey.qml
index 43dbda0e..f74c3733 100644
--- a/client/ui/qml/Pages2/PageSetupWizardTextKey.qml
+++ b/client/ui/qml/Pages2/PageSetupWizardTextKey.qml
@@ -29,23 +29,26 @@ PageType {
 
             spacing: 16
 
+            BackButtonType {
+                Layout.topMargin: 20
+            }
+
             HeaderType {
                 Layout.fillWidth: true
-                Layout.topMargin: 20
 
-                backButtonImage: "qrc:/images/controls/arrow-left.svg"
-
-                headerText: "Ключ для подключения"
-                descriptionText: "Строка, которая начинается с vpn://..."
+                headerText: qsTr("Connection key")
+                descriptionText: qsTr("A line that starts with vpn://...")
             }
 
             TextFieldWithHeaderType {
+                id: textKey
+
                 Layout.fillWidth: true
                 Layout.topMargin: 32
 
-                headerText: "Ключ"
+                headerText: qsTr("Key")
                 textFieldPlaceholderText: "vpn://"
-                buttonText: "Вставить"
+                buttonText: qsTr("Insert")
 
                 clickedFunc: function() {
                     textField.text = ""
@@ -63,10 +66,11 @@ PageType {
         anchors.leftMargin: 16
         anchors.bottomMargin: 32
 
-        text: qsTr("Подключиться")
+        text: qsTr("Continue")
 
         onClicked: function() {
-//            goToPage(PageEnum.PageSetupWizardInstalling)
+            ImportController.extractConfigFromCode(textKey.textFieldText)
+            goToPage(PageEnum.PageSetupWizardViewConfig)
         }
     }
 }
diff --git a/client/ui/qml/Pages2/PageSetupWizardViewConfig.qml b/client/ui/qml/Pages2/PageSetupWizardViewConfig.qml
new file mode 100644
index 00000000..ca679e79
--- /dev/null
+++ b/client/ui/qml/Pages2/PageSetupWizardViewConfig.qml
@@ -0,0 +1,152 @@
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+import QtQuick.Dialogs
+
+import PageEnum 1.0
+
+import "./"
+import "../Controls2"
+import "../Controls2/TextTypes"
+import "../Config"
+
+PageType {
+    id: root
+
+    property bool showContent: false
+
+    Connections {
+        target: ImportController
+
+        function onImportErrorOccurred(errorMessage) {
+            closePage()
+            PageController.showErrorMessage(errorMessage)
+        }
+
+        function onImportFinished() {
+            goToStartPage()
+            if (stackView.currentItem.objectName === PageController.getPagePath(PageEnum.PageHome)) {
+                PageController.restorePageHomeState()
+            } else if (stackView.currentItem.objectName === PageController.getPagePath(PageEnum.PageSettings)) {
+                goToPage(PageEnum.PageSettingsServersList, false)
+            } else {
+                var pagePath = PageController.getPagePath(PageEnum.PageStart)
+                stackView.replace(pagePath, { "objectName" : pagePath })
+            }
+        }
+    }
+
+    BackButtonType {
+        id: backButton
+
+        anchors.top: parent.top
+        anchors.left: parent.left
+        anchors.right: parent.right
+        anchors.rightMargin: 16
+        anchors.leftMargin: 16
+        anchors.topMargin: 20
+    }
+
+    FlickableType {
+        id: fl
+        anchors.top: backButton.bottom
+        anchors.bottom: root.bottom
+        contentHeight: content.implicitHeight + connectButton.implicitHeight
+
+        ColumnLayout {
+            id: content
+
+            anchors.top: parent.top
+            anchors.left: parent.left
+            anchors.right: parent.right
+            anchors.rightMargin: 16
+            anchors.leftMargin: 16
+
+            HeaderType {
+                headerText: qsTr("New connection")
+            }
+
+            RowLayout {
+                Layout.topMargin: 32
+                spacing: 8
+
+                visible: fileName.text !== ""
+
+                Image {
+                    source: "qrc:/images/controls/file-cog-2.svg"
+                }
+
+                Header2TextType {
+                    id: fileName
+
+                    Layout.fillWidth: true
+
+                    text: ImportController.getConfigFileName()
+                }
+            }
+
+            CaptionTextType {
+                Layout.fillWidth: true
+                Layout.topMargin: 16
+
+                text: qsTr("Do not use connection code from public sources. It could be created to intercept your data.")
+                color: "#878B91"
+            }
+
+            BasicButtonType {
+                defaultColor: "transparent"
+                hoveredColor: Qt.rgba(1, 1, 1, 0.08)
+                pressedColor: Qt.rgba(1, 1, 1, 0.12)
+                disabledColor: "#878B91"
+                textColor: "#D7D8DB"
+
+                text: showContent ? qsTr("Collapse content") : qsTr("Show content")
+
+                onClicked: {
+                    showContent = !showContent
+                }
+            }
+
+            Rectangle {
+                Layout.fillWidth: true
+                Layout.bottomMargin: 16
+
+                implicitHeight: configContent.implicitHeight
+
+                radius: 10
+                color: "#1C1D21"
+
+                visible: showContent
+
+                ParagraphTextType {
+                    id: configContent
+
+                    anchors.fill: parent
+                    anchors.margins: 16
+
+                    text: ImportController.getConfig()
+                }
+            }
+        }
+    }
+
+    ColumnLayout {
+        id: connectButton
+
+        anchors.bottom: parent.bottom
+        anchors.left: parent.left
+        anchors.right: parent.right
+        anchors.rightMargin: 16
+        anchors.leftMargin: 16
+
+        BasicButtonType {
+            Layout.fillWidth: true
+            Layout.bottomMargin: 32
+
+            text: qsTr("Connect")
+            onClicked: {
+                ImportController.importConfig()
+            }
+        }
+    }
+}
diff --git a/client/ui/qml/Pages2/PageStart.qml b/client/ui/qml/Pages2/PageStart.qml
index 44577037..436194b2 100644
--- a/client/ui/qml/Pages2/PageStart.qml
+++ b/client/ui/qml/Pages2/PageStart.qml
@@ -46,6 +46,8 @@ PageType {
         Component.onCompleted: {
             var pagePath = PageController.getPagePath(PageEnum.PageHome)
             tabBarStackView.push(pagePath, { "objectName" : pagePath })
+            ServersModel.setCurrentlyProcessedServerIndex(ServersModel.getDefaultServerIndex())
+            ContainersModel.setCurrentlyProcessedServerIndex(ServersModel.getDefaultServerIndex())
         }
     }
 
diff --git a/client/ui/qml/main2.qml b/client/ui/qml/main2.qml
index bda1c709..9bb6aa28 100644
--- a/client/ui/qml/main2.qml
+++ b/client/ui/qml/main2.qml
@@ -36,7 +36,7 @@ Window  {
         focus: true
 
         Component.onCompleted: {
-            var pagePath = PageController.getPagePath(PageEnum.PageStart)
+            var pagePath = PageController.getInitialPage()
             rootStackView.push(pagePath, { "objectName" : pagePath })
         }
     }

From 80fca589af50d626ea8ea864a73b2b57c493a455 Mon Sep 17 00:00:00 2001
From: "vladimir.kuznetsov" <nethiuswork@gmail.com>
Date: Mon, 5 Jun 2023 22:40:35 +0800
Subject: [PATCH 026/278] added ConnectionController error handling

---
 client/amnezia_application.cpp                | 95 ++++---------------
 client/amnezia_application.h                  |  4 +-
 .../ui/controllers/connectionController.cpp   | 45 ++++++---
 client/ui/controllers/connectionController.h  |  8 ++
 client/ui/controllers/importController.cpp    | 44 ++++-----
 client/ui/controllers/installController.cpp   |  1 -
 client/ui/models/containers_model.cpp         | 14 +--
 client/ui/qml/Components/ConnectButton.qml    | 53 ++++++++---
 client/ui/qml/Pages2/PageHome.qml             |  2 +-
 .../PageSetupWizardProtocolSettings.qml       |  7 +-
 client/ui/qml/main2.qml                       |  1 -
 11 files changed, 134 insertions(+), 140 deletions(-)

diff --git a/client/amnezia_application.cpp b/client/amnezia_application.cpp
index c8bdcf3b..dbeaac38 100644
--- a/client/amnezia_application.cpp
+++ b/client/amnezia_application.cpp
@@ -4,36 +4,15 @@
 #include <QStandardPaths>
 #include <QTimer>
 #include <QTranslator>
+#include <QQuickStyle>
 
-#include "core/servercontroller.h"
 #include "logger.h"
 #include "defines.h"
-#include <QQuickStyle>
 
 #include "platforms/ios/QRCodeReaderBase.h"
 
 #include "ui/pages.h"
 
-#include "ui/pages_logic/AppSettingsLogic.h"
-#include "ui/pages_logic/GeneralSettingsLogic.h"
-#include "ui/pages_logic/NetworkSettingsLogic.h"
-#include "ui/pages_logic/NewServerProtocolsLogic.h"
-#include "ui/pages_logic/QrDecoderLogic.h"
-#include "ui/pages_logic/ServerConfiguringProgressLogic.h"
-#include "ui/pages_logic/ServerContainersLogic.h"
-#include "ui/pages_logic/ServerListLogic.h"
-#include "ui/pages_logic/ServerSettingsLogic.h"
-#include "ui/pages_logic/ServerContainersLogic.h"
-#include "ui/pages_logic/ShareConnectionLogic.h"
-#include "ui/pages_logic/SitesLogic.h"
-#include "ui/pages_logic/StartPageLogic.h"
-#include "ui/pages_logic/VpnLogic.h"
-#include "ui/pages_logic/WizardLogic.h"
-
-#include "ui/pages_logic/protocols/CloakLogic.h"
-#include "ui/pages_logic/protocols/OpenVpnLogic.h"
-#include "ui/pages_logic/protocols/ShadowSocksLogic.h"
-
 #if defined(Q_OS_IOS)
 #include "platforms/ios/QtAppDelegate-C-Interface.h"
 #endif
@@ -76,10 +55,6 @@ AmneziaApplication::~AmneziaApplication()
         QObject::disconnect(m_engine, 0,0,0);
         delete m_engine;
     }
-    if (m_uiLogic) {
-        QObject::disconnect(m_uiLogic, 0,0,0);
-        delete m_uiLogic;
-    }
 
     if (m_protocolProps) delete m_protocolProps;
     if (m_containerProps) delete m_containerProps;
@@ -88,7 +63,6 @@ AmneziaApplication::~AmneziaApplication()
 void AmneziaApplication::init()
 {
     m_engine = new QQmlApplicationEngine;
-    m_uiLogic = new UiLogic(m_settings, m_configurator);
 
     const QUrl url(QStringLiteral("qrc:/ui/qml/main2.qml"));
     QObject::connect(m_engine, &QQmlApplicationEngine::objectCreated,
@@ -108,14 +82,8 @@ void AmneziaApplication::init()
 
     m_vpnConnection.reset(new VpnConnection(m_settings, m_configurator));
 
-    m_connectionController.reset(new ConnectionController(m_serversModel, m_containersModel));
+    m_connectionController.reset(new ConnectionController(m_serversModel, m_containersModel, m_vpnConnection));
 
-    connect(m_vpnConnection.get(), &VpnConnection::connectionStateChanged,
-            m_connectionController.get(), &ConnectionController::connectionStateChanged);
-    connect(m_connectionController.get(), &ConnectionController::connectToVpn,
-            m_vpnConnection.get(), &VpnConnection::connectToVpn, Qt::QueuedConnection);
-    connect(m_connectionController.get(), &ConnectionController::disconnectFromVpn,
-            m_vpnConnection.get(), &VpnConnection::disconnectFromVpn, Qt::QueuedConnection);
     m_engine->rootContext()->setContextProperty("ConnectionController", m_connectionController.get());
 
     m_pageController.reset(new PageController(m_serversModel));
@@ -128,17 +96,12 @@ void AmneziaApplication::init()
     m_engine->rootContext()->setContextProperty("ImportController", m_importController.get());
 
     //
-    m_uiLogic->registerPagesLogic();
-
-#if defined(Q_OS_IOS)
-    setStartPageLogic(m_uiLogic->pageLogic<StartPageLogic>());
-#endif
 
     m_engine->load(url);
 
-    if (m_engine->rootObjects().size() > 0) {
-        m_uiLogic->setQmlRoot(m_engine->rootObjects().at(0));
-    }
+//    if (m_engine->rootObjects().size() > 0) {
+//        m_uiLogic->setQmlRoot(m_engine->rootObjects().at(0));
+//    }
 
     if (m_settings->isSaveLogs()) {
         if (!Logger::init()) {
@@ -146,23 +109,23 @@ void AmneziaApplication::init()
         }
     }
 
-#ifdef Q_OS_WIN
-    if (m_parser.isSet("a")) m_uiLogic->showOnStartup();
-    else emit m_uiLogic->show();
-#else
-    m_uiLogic->showOnStartup();
-#endif
+//#ifdef Q_OS_WIN
+//    if (m_parser.isSet("a")) m_uiLogic->showOnStartup();
+//    else emit m_uiLogic->show();
+//#else
+//    m_uiLogic->showOnStartup();
+//#endif
 
-    // TODO - fix
-#if !defined(Q_OS_ANDROID) && !defined(Q_OS_IOS)
-    if (isPrimary()) {
-        QObject::connect(this, &SingleApplication::instanceStarted, m_uiLogic, [this](){
-            qDebug() << "Secondary instance started, showing this window instead";
-            emit m_uiLogic->show();
-            emit m_uiLogic->raise();
-        });
-    }
-#endif
+//    // TODO - fix
+//#if !defined(Q_OS_ANDROID) && !defined(Q_OS_IOS)
+//    if (isPrimary()) {
+//        QObject::connect(this, &SingleApplication::instanceStarted, m_uiLogic, [this](){
+//            qDebug() << "Secondary instance started, showing this window instead";
+//            emit m_uiLogic->show();
+//            emit m_uiLogic->raise();
+//        });
+//    }
+//#endif
 
 }
 
@@ -174,16 +137,10 @@ void AmneziaApplication::registerTypes()
     qRegisterMetaType<TransportProto>("TransportProto");
     qRegisterMetaType<Proto>("Proto");
     qRegisterMetaType<ServiceType>("ServiceType");
-    qRegisterMetaType<Page>("Page");
 
-    qRegisterMetaType<PageProtocolLogicBase *>("PageProtocolLogicBase *");
-
-
-//    declareQmlPageEnum();
     declareQmlProtocolEnum();
     declareQmlContainerEnum();
 
-    qmlRegisterType<PageType>("PageType", 1, 0, "PageType");
     qmlRegisterType<QRCodeReader>("QRCodeReader", 1, 0, "QRCodeReader");
 
     m_containerProps = new ContainerProps;
@@ -201,16 +158,6 @@ void AmneziaApplication::loadFonts()
 {
     QQuickStyle::setStyle("Basic");
 
-    QFontDatabase::addApplicationFont(":/fonts/Lato-Black.ttf");
-    QFontDatabase::addApplicationFont(":/fonts/Lato-BlackItalic.ttf");
-    QFontDatabase::addApplicationFont(":/fonts/Lato-Bold.ttf");
-    QFontDatabase::addApplicationFont(":/fonts/Lato-BoldItalic.ttf");
-    QFontDatabase::addApplicationFont(":/fonts/Lato-Italic.ttf");
-    QFontDatabase::addApplicationFont(":/fonts/Lato-Light.ttf");
-    QFontDatabase::addApplicationFont(":/fonts/Lato-LightItalic.ttf");
-    QFontDatabase::addApplicationFont(":/fonts/Lato-Regular.ttf");
-    QFontDatabase::addApplicationFont(":/fonts/Lato-Thin.ttf");
-    QFontDatabase::addApplicationFont(":/fonts/Lato-ThinItalic.ttf");
     QFontDatabase::addApplicationFont(":/fonts/pt-root-ui_vf.ttf");
 }
 
diff --git a/client/amnezia_application.h b/client/amnezia_application.h
index f4156d15..0fd6842c 100644
--- a/client/amnezia_application.h
+++ b/client/amnezia_application.h
@@ -11,7 +11,6 @@
 #include "settings.h"
 #include "vpnconnection.h"
 
-#include "ui/uilogic.h"
 #include "configurators/vpn_configurator.h"
 
 #include "ui/models/servers_model.h"
@@ -54,7 +53,6 @@ public:
 
 private:
     QQmlApplicationEngine *m_engine {};
-    UiLogic *m_uiLogic {};
     std::shared_ptr<Settings> m_settings;
     std::shared_ptr<VpnConfigurator> m_configurator;
 
@@ -67,7 +65,7 @@ private:
     QSharedPointer<ContainersModel> m_containersModel;
     QSharedPointer<ServersModel> m_serversModel;
 
-    QScopedPointer<VpnConnection> m_vpnConnection;
+    QSharedPointer<VpnConnection> m_vpnConnection;
 
     QScopedPointer<ConnectionController> m_connectionController;
     QScopedPointer<PageController> m_pageController;
diff --git a/client/ui/controllers/connectionController.cpp b/client/ui/controllers/connectionController.cpp
index c4717012..fbbb67d9 100644
--- a/client/ui/controllers/connectionController.cpp
+++ b/client/ui/controllers/connectionController.cpp
@@ -2,11 +2,31 @@
 
 #include <QApplication>
 
+#include "core/errorstrings.h"
+
 ConnectionController::ConnectionController(const QSharedPointer<ServersModel> &serversModel,
                                            const QSharedPointer<ContainersModel> &containersModel,
-                                           QObject *parent) : QObject(parent), m_serversModel(serversModel), m_containersModel(containersModel)
+                                           const QSharedPointer<VpnConnection> &vpnConnection,
+                                           QObject *parent)
+    : QObject(parent)
+    , m_serversModel(serversModel)
+    , m_containersModel(containersModel)
+    , m_vpnConnection(vpnConnection)
 {
-
+    connect(m_vpnConnection.get(),
+            &VpnConnection::connectionStateChanged,
+            this,
+            &ConnectionController::connectionStateChanged);
+    connect(this,
+            &ConnectionController::connectToVpn,
+            m_vpnConnection.get(),
+            &VpnConnection::connectToVpn,
+            Qt::QueuedConnection);
+    connect(this,
+            &ConnectionController::disconnectFromVpn,
+            m_vpnConnection.get(),
+            &VpnConnection::disconnectFromVpn,
+            Qt::QueuedConnection);
 }
 
 void ConnectionController::openConnection()
@@ -21,19 +41,11 @@ void ConnectionController::openConnection()
     const QJsonObject &containerConfig = qvariant_cast<QJsonObject>(m_containersModel->data(containerModelIndex,
                                                                                             ContainersModel::Roles::ConfigRole));
 
-//    if (m_settings->containers(serverIndex).isEmpty()) {
-//        set_labelErrorText(tr("VPN Protocols is not installed.\n Please install VPN container at first"));
-//        set_pushButtonConnectChecked(false);
-//        return;
-//    }
+    if (container == DockerContainer::None) {
+        emit connectionErrorOccurred(tr("VPN Protocols is not installed.\n Please install VPN container at first"));
+        return;
+    }
 
-//    if (container == DockerContainer::None) {
-//        set_labelErrorText(tr("VPN Protocol not chosen"));
-//        set_pushButtonConnectChecked(false);
-//        return;
-//    }
-
-    //todo error handling
     qApp->processEvents();
     emit connectToVpn(serverIndex, credentials, container, containerConfig);
 }
@@ -43,6 +55,11 @@ void ConnectionController::closeConnection()
     emit disconnectFromVpn();
 }
 
+QString ConnectionController::getLastConnectionError()
+{
+    return errorString(m_vpnConnection->lastError());
+}
+
 bool ConnectionController::isConnected()
 {
     return m_isConnected;
diff --git a/client/ui/controllers/connectionController.h b/client/ui/controllers/connectionController.h
index b1b0ff98..93ee28a7 100644
--- a/client/ui/controllers/connectionController.h
+++ b/client/ui/controllers/connectionController.h
@@ -4,6 +4,7 @@
 #include "ui/models/servers_model.h"
 #include "ui/models/containers_model.h"
 #include "protocols/vpnprotocol.h"
+#include "vpnconnection.h"
 
 class ConnectionController : public QObject
 {
@@ -14,6 +15,7 @@ public:
 
     explicit ConnectionController(const QSharedPointer<ServersModel> &serversModel,
                                   const QSharedPointer<ContainersModel> &containersModel,
+                                  const QSharedPointer<VpnConnection> &vpnConnection,
                                   QObject *parent = nullptr);
 
     bool isConnected();
@@ -23,16 +25,22 @@ public slots:
     void openConnection();
     void closeConnection();
 
+    QString getLastConnectionError();
+
 signals:
     void connectToVpn(int serverIndex, const ServerCredentials &credentials, DockerContainer container, const QJsonObject &containerConfig);
     void disconnectFromVpn();
     void connectionStateChanged(Vpn::ConnectionState state);
     void isConnectedChanged();
 
+    void connectionErrorOccurred(QString errorMessage);
+
 private:
     QSharedPointer<ServersModel> m_serversModel;
     QSharedPointer<ContainersModel> m_containersModel;
 
+    QSharedPointer<VpnConnection> m_vpnConnection;
+
     bool m_isConnected = false;
 };
 
diff --git a/client/ui/controllers/importController.cpp b/client/ui/controllers/importController.cpp
index 48e811e0..2724f9cd 100644
--- a/client/ui/controllers/importController.cpp
+++ b/client/ui/controllers/importController.cpp
@@ -6,33 +6,32 @@
 #include "core/errorstrings.h"
 
 namespace {
-    enum class ConfigTypes {
-        Amnezia,
-        OpenVpn,
-        WireGuard
-    };
+enum class ConfigTypes { Amnezia, OpenVpn, WireGuard };
 
-    ConfigTypes checkConfigFormat(const QString &config)
-    {
-        const QString openVpnConfigPatternCli = "client";
-        const QString openVpnConfigPatternProto1 = "proto tcp";
-        const QString openVpnConfigPatternProto2 = "proto udp";
-        const QString openVpnConfigPatternDriver1 = "dev tun";
-        const QString openVpnConfigPatternDriver2 = "dev tap";
+ConfigTypes checkConfigFormat(const QString &config)
+{
+    const QString openVpnConfigPatternCli = "client";
+    const QString openVpnConfigPatternProto1 = "proto tcp";
+    const QString openVpnConfigPatternProto2 = "proto udp";
+    const QString openVpnConfigPatternDriver1 = "dev tun";
+    const QString openVpnConfigPatternDriver2 = "dev tap";
 
-        const QString wireguardConfigPatternSectionInterface = "[Interface]";
-        const QString wireguardConfigPatternSectionPeer = "[Peer]";
+    const QString wireguardConfigPatternSectionInterface = "[Interface]";
+    const QString wireguardConfigPatternSectionPeer = "[Peer]";
 
-        if (config.contains(openVpnConfigPatternCli) &&
-            (config.contains(openVpnConfigPatternProto1) || config.contains(openVpnConfigPatternProto2)) &&
-            (config.contains(openVpnConfigPatternDriver1) || config.contains(openVpnConfigPatternDriver2))) {
-            return ConfigTypes::OpenVpn;
-        } else if (config.contains(wireguardConfigPatternSectionInterface) && config.contains(wireguardConfigPatternSectionPeer)) {
-            return ConfigTypes::WireGuard;
-        }
-        return ConfigTypes::Amnezia;
+    if (config.contains(openVpnConfigPatternCli)
+        && (config.contains(openVpnConfigPatternProto1)
+            || config.contains(openVpnConfigPatternProto2))
+        && (config.contains(openVpnConfigPatternDriver1)
+            || config.contains(openVpnConfigPatternDriver2))) {
+        return ConfigTypes::OpenVpn;
+    } else if (config.contains(wireguardConfigPatternSectionInterface)
+               && config.contains(wireguardConfigPatternSectionPeer)) {
+        return ConfigTypes::WireGuard;
     }
+    return ConfigTypes::Amnezia;
 }
+} // namespace
 
 ImportController::ImportController(const QSharedPointer<ServersModel> &serversModel,
                                    const QSharedPointer<ContainersModel> &containersModel,
@@ -64,6 +63,7 @@ void ImportController::extractConfigFromFile(const QUrl &fileUrl)
 void ImportController::extractConfigFromCode(QString code)
 {
     m_config = extractAmneziaConfig(code);
+    m_configFileName = "";
 }
 
 QString ImportController::getConfig()
diff --git a/client/ui/controllers/installController.cpp b/client/ui/controllers/installController.cpp
index 15a24c31..2fe96962 100644
--- a/client/ui/controllers/installController.cpp
+++ b/client/ui/controllers/installController.cpp
@@ -10,7 +10,6 @@ InstallController::InstallController(const QSharedPointer<ServersModel> &servers
                                     const std::shared_ptr<Settings> &settings,
                                     QObject *parent) : QObject(parent), m_serversModel(serversModel), m_containersModel(containersModel),  m_settings(settings)
 {
-
 }
 
 void InstallController::install(DockerContainer container, int port, TransportProto transportProto)
diff --git a/client/ui/models/containers_model.cpp b/client/ui/models/containers_model.cpp
index b240878d..e65e79d7 100644
--- a/client/ui/models/containers_model.cpp
+++ b/client/ui/models/containers_model.cpp
@@ -22,17 +22,19 @@ bool ContainersModel::setData(const QModelIndex &index, const QVariant &value, i
 
     switch (role) {
     case NameRole:
-//        return ContainerProps::containerHumanNames().value(container);
+        //        return ContainerProps::containerHumanNames().value(container);
     case DescRole:
-//        return ContainerProps::containerDescriptions().value(container);
+        //        return ContainerProps::containerDescriptions().value(container);
     case ConfigRole:
-        m_settings->setContainerConfig(m_currentlyProcessedServerIndex, container, value.toJsonObject());
+        m_settings->setContainerConfig(m_currentlyProcessedServerIndex,
+                                       container,
+                                       value.toJsonObject());
     case ServiceTypeRole:
-//        return ContainerProps::containerService(container);
+        //        return ContainerProps::containerService(container);
     case DockerContainerRole:
-//        return container;
+        //        return container;
     case IsInstalledRole:
-//        return m_settings->containers(m_currentlyProcessedServerIndex).contains(container);
+        //        return m_settings->containers(m_currentlyProcessedServerIndex).contains(container);
     case IsDefaultRole:
         m_settings->setDefaultContainer(m_currentlyProcessedServerIndex, container);
         emit defaultContainerChanged();
diff --git a/client/ui/qml/Components/ConnectButton.qml b/client/ui/qml/Components/ConnectButton.qml
index 06c148f1..3c34a6b0 100644
--- a/client/ui/qml/Components/ConnectButton.qml
+++ b/client/ui/qml/Components/ConnectButton.qml
@@ -7,27 +7,48 @@ import ConnectionState 1.0
 Button {
     id: root
 
+    Connections {
+        target: ConnectionController
+
+        function onConnectionErrorOccurred(errorMessage) {
+            PageController.showErrorMessage(errorMessage)
+        }
+    }
+
     text: qsTr("Connect")
 
-    background: Image {
-        id: border
+    background: Item {
+        clip: true
 
-        source: connectionProccess.running ? "/images/connectionProgress.svg" :
-                                             ConnectionController.isConnected ? "/images/connectionOff.svg" : "/images/connectionOn.svg"
+        implicitHeight: border.implicitHeight
+        implicitWidth: border.implicitWidth
 
-        RotationAnimator {
-            id: connectionProccess
+        Image {
+            id: border
 
-            target: border
-            running: false
-            from: 0
-            to: 360
-            loops: Animation.Infinite
-            duration: 1250
+            source: connectionProccess.running ? "/images/connectionProgress.svg" :
+                                                 ConnectionController.isConnected ? "/images/connectionOff.svg" : "/images/connectionOn.svg"
+            RotationAnimator {
+                id: connectionProccess
+
+                target: border
+                running: false
+                from: 0
+                to: 360
+                loops: Animation.Infinite
+                duration: 1250
+            }
+
+            Behavior on source {
+                PropertyAnimation { duration: 200 }
+            }
         }
 
-        Behavior on source {
-            PropertyAnimation { duration: 200 }
+        MouseArea {
+            anchors.fill: parent
+
+            cursorShape: Qt.PointingHandCursor
+            enabled: false
         }
     }
 
@@ -46,7 +67,7 @@ Button {
     }
 
     onClicked: {
-        ConnectionController.isConnected ? ConnectionController.closeConnection() : ConnectionController.openConnection()
+        connectionProccess.running ? ConnectionController.closeConnection() : ConnectionController.openConnection()
     }
 
     Connections {
@@ -98,6 +119,8 @@ Button {
                 case ConnectionState.Error: {
                     console.log("Error")
                     connectionProccess.running = false
+                    root.text = qsTr("Connect")
+                    PageController.showErrorMessage(ConnectionController.getLastConnectionError())
                     break
                 }
             }
diff --git a/client/ui/qml/Pages2/PageHome.qml b/client/ui/qml/Pages2/PageHome.qml
index 4f3c4b6a..e5521787 100644
--- a/client/ui/qml/Pages2/PageHome.qml
+++ b/client/ui/qml/Pages2/PageHome.qml
@@ -262,7 +262,7 @@ PageType {
                                     Layout.fillWidth: true
 
                                     text: name
-                                    descriptionText: "description"
+                                    descriptionText: hostName
 
                                     checked: index === serversMenuContent.currentIndex
 
diff --git a/client/ui/qml/Pages2/PageSetupWizardProtocolSettings.qml b/client/ui/qml/Pages2/PageSetupWizardProtocolSettings.qml
index 39761cee..19f81d09 100644
--- a/client/ui/qml/Pages2/PageSetupWizardProtocolSettings.qml
+++ b/client/ui/qml/Pages2/PageSetupWizardProtocolSettings.qml
@@ -39,8 +39,6 @@ PageType {
             anchors.left: parent.left
             anchors.right: parent.right
 
-            spacing: 16
-
             ListView {
                 // todo change id naming
                 id: containers
@@ -63,6 +61,8 @@ PageType {
                         anchors.leftMargin: 16
 
                         BackButtonType {
+                            id: backButton
+
                             Layout.topMargin: 20
                         }
 
@@ -136,6 +136,7 @@ PageType {
                             id: port
 
                             Layout.fillWidth: true
+                            Layout.topMargin: 16
                             headerText: "Port"
                         }
 
@@ -143,7 +144,7 @@ PageType {
                             // todo make it dynamic
                             implicitHeight: root.height - port.implicitHeight -
                                             transportProtoBackground.implicitHeight - transportProtoHeader.implicitHeight -
-                                            header.implicitHeight - installButton.implicitHeight - 100
+                                            header.implicitHeight - backButton.implicitHeight - installButton.implicitHeight - 116
 
                             color: "transparent"
                         }
diff --git a/client/ui/qml/main2.qml b/client/ui/qml/main2.qml
index 9bb6aa28..44a85925 100644
--- a/client/ui/qml/main2.qml
+++ b/client/ui/qml/main2.qml
@@ -3,7 +3,6 @@ import QtQuick.Window
 import QtQuick.Controls
 import QtQuick.Layouts
 
-import PageType 1.0
 import PageEnum 1.0
 
 import "Config"

From 68d9394d9fb3d0bbb3d46953714303bbfc565569 Mon Sep 17 00:00:00 2001
From: "vladimir.kuznetsov" <nethiuswork@gmail.com>
Date: Mon, 5 Jun 2023 17:49:20 +0300
Subject: [PATCH 027/278] fixed windows build errors after refactoring

---
 client/configurators/ssh_configurator.cpp     |  6 ++--
 .../protocols/ikev2_vpn_protocol_windows.cpp  | 30 +++++++++----------
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/client/configurators/ssh_configurator.cpp b/client/configurators/ssh_configurator.cpp
index e1435bc3..d94e4468 100644
--- a/client/configurators/ssh_configurator.cpp
+++ b/client/configurators/ssh_configurator.cpp
@@ -69,14 +69,14 @@ void SshConfigurator::openSshTerminal(const ServerCredentials &credentials)
     p->setProcessEnvironment(prepareEnv());
     p->setProgram(qApp->applicationDirPath() + "\\cygwin\\putty.exe");
 
-    if (credentials.password.contains("PRIVATE KEY")) {
+    if (credentials.secretData.contains("PRIVATE KEY")) {
         // todo: connect by key
 //        p->setNativeArguments(QString("%1@%2")
-//            .arg(credentials.userName).arg(credentials.hostName).arg(credentials.password));
+//            .arg(credentials.userName).arg(credentials.hostName).arg(credentials.secretData));
     }
     else {
         p->setNativeArguments(QString("%1@%2 -pw %3")
-            .arg(credentials.userName).arg(credentials.hostName).arg(credentials.password));
+            .arg(credentials.userName).arg(credentials.hostName).arg(credentials.secretData));
     }
 #else
     p->setProgram("/bin/bash");
diff --git a/client/protocols/ikev2_vpn_protocol_windows.cpp b/client/protocols/ikev2_vpn_protocol_windows.cpp
index 7564f969..5c471e22 100644
--- a/client/protocols/ikev2_vpn_protocol_windows.cpp
+++ b/client/protocols/ikev2_vpn_protocol_windows.cpp
@@ -35,14 +35,14 @@ Ikev2Protocol::~Ikev2Protocol()
 
 void Ikev2Protocol::stop()
 {
-    setConnectionState(VpnProtocol::Disconnecting);
+    setConnectionState(Vpn::ConnectionState::Disconnecting);
     {
         if (! disconnect_vpn() ){
             qDebug()<<"We don't disconnect";
-            setConnectionState(VpnProtocol::Error);
+            setConnectionState(Vpn::ConnectionState::Error);
         }
         else {
-            setConnectionState(VpnProtocol::Disconnected);
+            setConnectionState(Vpn::ConnectionState::Disconnected);
         }
     }
 }
@@ -55,40 +55,40 @@ void Ikev2Protocol::newConnectionStateEventReceived(UINT unMsg, tagRASCONNSTATE
     {
     case RASCS_OpenPort:
         //qDebug()<<__FUNCTION__ << __LINE__;
-        setConnectionState(Preparing);
+        setConnectionState(Vpn::ConnectionState::Preparing);
         break;
     case RASCS_PortOpened:
         //qDebug()<<__FUNCTION__ << __LINE__;
-        setConnectionState(Preparing);
+        setConnectionState(Vpn::ConnectionState::Preparing);
         break;
     case RASCS_ConnectDevice:
         //qDebug()<<__FUNCTION__ << __LINE__;
-        setConnectionState(Preparing);
+        setConnectionState(Vpn::ConnectionState::Preparing);
         break;
     case RASCS_DeviceConnected:
         //qDebug()<<__FUNCTION__ << __LINE__;
-        setConnectionState(Preparing);
+        setConnectionState(Vpn::ConnectionState::Preparing);
         break;
     case RASCS_AllDevicesConnected:
         //qDebug()<<__FUNCTION__ << __LINE__;
-        setConnectionState(Preparing);
+        setConnectionState(Vpn::ConnectionState::Preparing);
         break;
     case RASCS_Authenticate:
         //qDebug()<<__FUNCTION__ << __LINE__;
-        setConnectionState(Preparing);
+        setConnectionState(Vpn::ConnectionState::Preparing);
         break;
     case RASCS_AuthNotify:
         //qDebug()<<__FUNCTION__ << __LINE__;
         if (dwError != 0) {
             //qDebug() << "have error" << dwError;
-            setConnectionState(Disconnected);
+            setConnectionState(Vpn::ConnectionState::Disconnected);
         } else {
             //qDebug() << "RASCS_AuthNotify but no error" << dwError;
         }
         break;
     case RASCS_AuthRetry:
         //qDebug()<<__FUNCTION__ << __LINE__;
-        setConnectionState(Preparing);
+        setConnectionState(Vpn::ConnectionState::Preparing);
         break;
     case RASCS_AuthCallback:
         qDebug()<<__FUNCTION__ << __LINE__;
@@ -151,16 +151,16 @@ void Ikev2Protocol::newConnectionStateEventReceived(UINT unMsg, tagRASCONNSTATE
         qDebug()<<__FUNCTION__ << __LINE__;
         break;
     case RASCS_PasswordExpired:
-        setConnectionState(Error);
+        setConnectionState(Vpn::ConnectionState::Error);
         qDebug()<<__FUNCTION__ << __LINE__;
         break;
 
     case RASCS_Connected: // = RASCS_DONE:
-        setConnectionState(Connected);
+        setConnectionState(Vpn::ConnectionState::Connected);
         //qDebug()<<__FUNCTION__ << __LINE__;
         break;
     case RASCS_Disconnected:
-        setConnectionState(Disconnected);
+        setConnectionState(Vpn::ConnectionState::Disconnected);
         //qDebug()<<__FUNCTION__ << __LINE__;
         break;
     default:
@@ -177,7 +177,7 @@ void Ikev2Protocol::readIkev2Configuration(const QJsonObject &configuration)
 ErrorCode Ikev2Protocol::start()
 {
     QByteArray cert = QByteArray::fromBase64(m_config[config_key::cert].toString().toUtf8());
-    setConnectionState(Connecting);
+    setConnectionState(Vpn::ConnectionState::Connecting);
 
     QTemporaryFile certFile;
     certFile.setAutoRemove(false);

From c3f39ad24d7f617c846fb5a818fa0b8b1a34f10d Mon Sep 17 00:00:00 2001
From: "vladimir.kuznetsov" <nethiuswork@gmail.com>
Date: Wed, 7 Jun 2023 13:17:48 +0300
Subject: [PATCH 028/278] added caching of servers and containers in models

---
 client/ui/models/containers_model.cpp         | 52 +++++++++++--------
 client/ui/models/containers_model.h           |  5 ++
 client/ui/models/servers_model.cpp            | 27 ++++++----
 client/ui/models/servers_model.h              |  3 ++
 .../Components/SettingsContainersListView.qml |  2 -
 client/ui/qml/Controls2/BackButtonType.qml    | 16 ------
 client/ui/qml/Pages2/PageHome.qml             | 30 +++++------
 client/ui/qml/Pages2/PageStart.qml            |  4 +-
 8 files changed, 69 insertions(+), 70 deletions(-)

diff --git a/client/ui/models/containers_model.cpp b/client/ui/models/containers_model.cpp
index e65e79d7..b6574439 100644
--- a/client/ui/models/containers_model.cpp
+++ b/client/ui/models/containers_model.cpp
@@ -21,23 +21,25 @@ bool ContainersModel::setData(const QModelIndex &index, const QVariant &value, i
     DockerContainer container = ContainerProps::allContainers().at(index.row());
 
     switch (role) {
-    case NameRole:
-        //        return ContainerProps::containerHumanNames().value(container);
-    case DescRole:
-        //        return ContainerProps::containerDescriptions().value(container);
-    case ConfigRole:
-        m_settings->setContainerConfig(m_currentlyProcessedServerIndex,
-                                       container,
-                                       value.toJsonObject());
-    case ServiceTypeRole:
-        //        return ContainerProps::containerService(container);
-    case DockerContainerRole:
-        //        return container;
-    case IsInstalledRole:
-        //        return m_settings->containers(m_currentlyProcessedServerIndex).contains(container);
-    case IsDefaultRole:
-        m_settings->setDefaultContainer(m_currentlyProcessedServerIndex, container);
-        emit defaultContainerChanged();
+        case NameRole:
+            //        return ContainerProps::containerHumanNames().value(container);
+        case DescRole:
+            //        return ContainerProps::containerDescriptions().value(container);
+        case ConfigRole:
+            m_settings->setContainerConfig(m_currentlyProcessedServerIndex,
+                                           container,
+                                           value.toJsonObject());
+        case ServiceTypeRole:
+            //        return ContainerProps::containerService(container);
+        case DockerContainerRole:
+            //        return container;
+        case IsInstalledRole:
+            //        return m_settings->containers(m_currentlyProcessedServerIndex).contains(container);
+        case IsDefaultRole: {
+            m_settings->setDefaultContainer(m_currentlyProcessedServerIndex, container);
+            m_defaultContainerIndex = container;
+            emit defaultContainerChanged();
+        }
     }
 
     emit dataChanged(index, index);
@@ -58,8 +60,10 @@ QVariant ContainersModel::data(const QModelIndex &index, int role) const
             return ContainerProps::containerHumanNames().value(container);
         case DescRole:
             return ContainerProps::containerDescriptions().value(container);
-        case ConfigRole:
-            return m_settings->containerConfig(m_currentlyProcessedServerIndex, container);
+        case ConfigRole: {
+            if (container == DockerContainer::None) return QJsonObject();
+            return m_containers.value(container);
+        }
         case ServiceTypeRole:
             return ContainerProps::containerService(container);
         case DockerContainerRole:
@@ -71,11 +75,11 @@ QVariant ContainersModel::data(const QModelIndex &index, int role) const
         case EasySetupDescriptionRole:
             return ContainerProps::easySetupDescription(container);
         case IsInstalledRole:
-            return m_settings->containers(m_currentlyProcessedServerIndex).contains(container);
+            return m_containers.contains(container);
         case IsCurrentlyInstalledRole:
             return container == static_cast<DockerContainer>(m_currentlyInstalledContainerIndex);
         case IsDefaultRole:
-            return container == m_settings->defaultContainer(m_currentlyProcessedServerIndex);
+            return container == m_defaultContainerIndex;
         case IsSupportedRole:
             return ContainerProps::isSupportedByCurrentPlatform(container);
     }
@@ -87,6 +91,8 @@ void ContainersModel::setCurrentlyProcessedServerIndex(int index)
 {
     beginResetModel();
     m_currentlyProcessedServerIndex = index;
+    m_containers = m_settings->containers(m_currentlyProcessedServerIndex);
+    m_defaultContainerIndex = m_settings->defaultContainer(m_currentlyProcessedServerIndex);
     endResetModel();
     emit defaultContainerChanged();
 }
@@ -98,12 +104,12 @@ void ContainersModel::setCurrentlyInstalledContainerIndex(int index)
 
 DockerContainer ContainersModel::getDefaultContainer()
 {
-    return m_settings->defaultContainer(m_currentlyProcessedServerIndex);
+    return m_defaultContainerIndex;
 }
 
 QString ContainersModel::getDefaultContainerName()
 {
-    return ContainerProps::containerHumanNames().value(getDefaultContainer());
+    return ContainerProps::containerHumanNames().value(m_defaultContainerIndex);
 }
 
 int ContainersModel::getCurrentlyInstalledContainerIndex()
diff --git a/client/ui/models/containers_model.h b/client/ui/models/containers_model.h
index 3ce7bd6b..5753a1dd 100644
--- a/client/ui/models/containers_model.h
+++ b/client/ui/models/containers_model.h
@@ -55,8 +55,13 @@ protected:
     QHash<int, QByteArray> roleNames() const override;
 
 private:
+    QMap<DockerContainer, QJsonObject> m_containers;
+
+
     int m_currentlyProcessedServerIndex;
     int m_currentlyInstalledContainerIndex;
+    DockerContainer m_defaultContainerIndex;
+
     std::shared_ptr<Settings> m_settings;
 };
 
diff --git a/client/ui/models/servers_model.cpp b/client/ui/models/servers_model.cpp
index d05bb695..bb08e88c 100644
--- a/client/ui/models/servers_model.cpp
+++ b/client/ui/models/servers_model.cpp
@@ -2,24 +2,28 @@
 
 ServersModel::ServersModel(std::shared_ptr<Settings> settings, QObject *parent) : m_settings(settings), QAbstractListModel(parent)
 {
-
+    m_servers = m_settings->serversArray();
+    m_defaultServerIndex = m_settings->defaultServerIndex();
 }
 
 int ServersModel::rowCount(const QModelIndex &parent) const
 {
     Q_UNUSED(parent);
-    return static_cast<int>(m_settings->serversCount());
+    return static_cast<int>(m_servers.size());
 }
 
 bool ServersModel::setData(const QModelIndex &index, const QVariant &value, int role)
 {
     if (!index.isValid() || index.row() < 0
-        || index.row() >= static_cast<int>(m_settings->serversCount())) {
+        || index.row() >= static_cast<int>(m_servers.size())) {
         return false;
     }
 
     switch (role) {
-        case IsDefaultRole: m_settings->setDefaultServer(index.row());
+        case IsDefaultRole: {
+            m_settings->setDefaultServer(index.row());
+            m_defaultServerIndex = m_settings->defaultServerIndex();
+        }
         default: return true;
     }
 
@@ -29,12 +33,11 @@ bool ServersModel::setData(const QModelIndex &index, const QVariant &value, int
 
 QVariant ServersModel::data(const QModelIndex &index, int role) const
 {
-    if (!index.isValid() || index.row() < 0 || index.row() >= static_cast<int>(m_settings->serversCount())) {
+    if (!index.isValid() || index.row() < 0 || index.row() >= static_cast<int>(m_servers.size())) {
         return QVariant();
     }
 
-    const QJsonArray &servers = m_settings->serversArray();
-    const QJsonObject server = servers.at(index.row()).toObject();
+    const QJsonObject server = m_servers.at(index.row()).toObject();
 
     switch (role) {
     case NameRole: {
@@ -49,7 +52,7 @@ QVariant ServersModel::data(const QModelIndex &index, int role) const
     case CredentialsRole:
         return QVariant::fromValue(m_settings->serverCredentials(index.row()));
     case IsDefaultRole:
-        return index.row() == m_settings->defaultServerIndex();
+        return index.row() == m_defaultServerIndex;
     case IsCurrentlyProcessedRole:
         return index.row() == m_currenlyProcessedServerIndex;
     }
@@ -59,12 +62,12 @@ QVariant ServersModel::data(const QModelIndex &index, int role) const
 
 const int ServersModel::getDefaultServerIndex()
 {
-    return m_settings->defaultServerIndex();
+    return m_defaultServerIndex;
 }
 
 const int ServersModel::getServersCount()
 {
-    return m_settings->serversCount();
+    return m_servers.count();
 }
 
 void ServersModel::setCurrentlyProcessedServerIndex(int index)
@@ -74,7 +77,7 @@ void ServersModel::setCurrentlyProcessedServerIndex(int index)
 
 bool ServersModel::isDefaultServerCurrentlyProcessed()
 {
-    return m_settings->defaultServerIndex() == m_currenlyProcessedServerIndex;
+    return m_defaultServerIndex == m_currenlyProcessedServerIndex;
 }
 
 ServerCredentials ServersModel::getCurrentlyProcessedServerCredentials()
@@ -86,6 +89,7 @@ void ServersModel::addServer(const QJsonObject &server)
 {
     beginResetModel();
     m_settings->addServer(server);
+    m_servers = m_settings->serversArray();
     endResetModel();
 }
 
@@ -93,6 +97,7 @@ void ServersModel::removeServer()
 {
     beginResetModel();
     m_settings->removeServer(m_currenlyProcessedServerIndex);
+    m_servers = m_settings->serversArray();
 
     if (m_settings->defaultServerIndex() == m_currenlyProcessedServerIndex) {
         m_settings->setDefaultServer(0);
diff --git a/client/ui/models/servers_model.h b/client/ui/models/servers_model.h
index 54ac5ef4..593babc3 100644
--- a/client/ui/models/servers_model.h
+++ b/client/ui/models/servers_model.h
@@ -46,8 +46,11 @@ protected:
     QHash<int, QByteArray> roleNames() const override;
 
 private:
+    QJsonArray m_servers;
+
     std::shared_ptr<Settings> m_settings;
 
+    int m_defaultServerIndex;
     int m_currenlyProcessedServerIndex;
 };
 
diff --git a/client/ui/qml/Components/SettingsContainersListView.qml b/client/ui/qml/Components/SettingsContainersListView.qml
index 5175fd49..abc50837 100644
--- a/client/ui/qml/Components/SettingsContainersListView.qml
+++ b/client/ui/qml/Components/SettingsContainersListView.qml
@@ -37,8 +37,6 @@ ListView {
 
             ButtonGroup.group: containersRadioButtonGroup
 
-            checked: isDefault
-
             indicator: Rectangle {
                 anchors.fill: parent
                 color: containerRadioButton.hovered ? Qt.rgba(1, 1, 1, 0.08) : "transparent"
diff --git a/client/ui/qml/Controls2/BackButtonType.qml b/client/ui/qml/Controls2/BackButtonType.qml
index bec31823..389191e8 100644
--- a/client/ui/qml/Controls2/BackButtonType.qml
+++ b/client/ui/qml/Controls2/BackButtonType.qml
@@ -34,22 +34,6 @@ Item {
             Layout.fillWidth: true
 
             color: "transparent"
-
-            ShaderEffectSource {
-                id: effectSource
-
-                sourceItem: background
-                anchors.fill: background
-                sourceRect: Qt.rect(x,y, width, height)
-            }
-
-            FastBlur {
-                id: blur
-                anchors.fill: effectSource
-
-                source: effectSource
-                radius: 100
-            }
         }
     }
 }
diff --git a/client/ui/qml/Pages2/PageHome.qml b/client/ui/qml/Pages2/PageHome.qml
index e5521787..227870c5 100644
--- a/client/ui/qml/Pages2/PageHome.qml
+++ b/client/ui/qml/Pages2/PageHome.qml
@@ -137,21 +137,6 @@ PageType {
                 Layout.alignment: Qt.AlignHCenter | Qt.AlignVCenter
                 spacing: 8
 
-                SortFilterProxyModel {
-                    id: proxyContainersModel
-                    sourceModel: ContainersModel
-                    filters: [
-                        ValueFilter {
-                            roleName: "serviceType"
-                            value: ProtocolEnum.Vpn
-                        },
-                        ValueFilter {
-                            roleName: "isSupported"
-                            value: true
-                        }
-                    ]
-                }
-
                 DropDownType {
                     id: containersDropDown
 
@@ -176,7 +161,20 @@ PageType {
                     listView: HomeContainersListView {
                         rootWidth: root.width
 
-                        model: proxyContainersModel
+                        model: SortFilterProxyModel {
+                            id: proxyContainersModel
+                            sourceModel: ContainersModel
+                            filters: [
+                                ValueFilter {
+                                    roleName: "serviceType"
+                                    value: ProtocolEnum.Vpn
+                                },
+                                ValueFilter {
+                                    roleName: "isSupported"
+                                    value: true
+                                }
+                            ]
+                        }
                         currentIndex: ContainersModel.getDefaultContainer()
                     }
                 }
diff --git a/client/ui/qml/Pages2/PageStart.qml b/client/ui/qml/Pages2/PageStart.qml
index 436194b2..83b641a1 100644
--- a/client/ui/qml/Pages2/PageStart.qml
+++ b/client/ui/qml/Pages2/PageStart.qml
@@ -45,9 +45,9 @@ PageType {
 
         Component.onCompleted: {
             var pagePath = PageController.getPagePath(PageEnum.PageHome)
-            tabBarStackView.push(pagePath, { "objectName" : pagePath })
             ServersModel.setCurrentlyProcessedServerIndex(ServersModel.getDefaultServerIndex())
             ContainersModel.setCurrentlyProcessedServerIndex(ServersModel.getDefaultServerIndex())
+            tabBarStackView.push(pagePath, { "objectName" : pagePath })
         }
     }
 
@@ -71,8 +71,8 @@ PageType {
             isSelected: tabBar.currentIndex === 0
             image: "qrc:/images/controls/home.svg"
             onClicked: {
-                tabBarStackView.goToTabBarPage(PageEnum.PageHome)
                 ContainersModel.setCurrentlyProcessedServerIndex(ServersModel.getDefaultServerIndex())
+                tabBarStackView.goToTabBarPage(PageEnum.PageHome)
             }
         }
         TabImageButtonType {

From 1fd48a1cf827236ec2fcc7b98db6b44469b33042 Mon Sep 17 00:00:00 2001
From: "vladimir.kuznetsov" <nethiuswork@gmail.com>
Date: Wed, 7 Jun 2023 18:28:32 +0800
Subject: [PATCH 029/278] added protocol settings page and openvpn settings
 page

---
 client/resources.qrc                          |  3 +
 client/ui/controllers/pageController.h        | 28 +++++--
 .../qml/Components/HomeContainersListView.qml |  1 +
 .../Components/Protocols/OpenVpnSettings.qml  | 81 +++++++++++++++++++
 .../Components/SettingsContainersListView.qml |  4 +-
 .../qml/Components/TransportProtoSelector.qml | 59 ++++++++++++++
 .../qml/Controls2/HorizontalRadioButton.qml   | 10 +--
 client/ui/qml/Pages2/PageHome.qml             |  5 +-
 .../qml/Pages2/PageSettingsServerProtocol.qml | 24 ++++++
 .../ui/qml/Pages2/PageSettingsServersList.qml |  1 +
 .../PageSetupWizardProtocolSettings.qml       | 59 +++-----------
 client/ui/qml/Pages2/PageStart.qml            |  1 +
 12 files changed, 209 insertions(+), 67 deletions(-)
 create mode 100644 client/ui/qml/Components/Protocols/OpenVpnSettings.qml
 create mode 100644 client/ui/qml/Components/TransportProtoSelector.qml
 create mode 100644 client/ui/qml/Pages2/PageSettingsServerProtocol.qml

diff --git a/client/resources.qrc b/client/resources.qrc
index 185c4469..e2f16853 100644
--- a/client/resources.qrc
+++ b/client/resources.qrc
@@ -254,5 +254,8 @@
         <file>ui/qml/Components/QuestionDrawer.qml</file>
         <file>ui/qml/Pages2/PageDeinstalling.qml</file>
         <file>ui/qml/Controls2/BackButtonType.qml</file>
+        <file>ui/qml/Pages2/PageSettingsServerProtocol.qml</file>
+        <file>ui/qml/Components/Protocols/OpenVpnSettings.qml</file>
+        <file>ui/qml/Components/TransportProtoSelector.qml</file>
     </qresource>
 </RCC>
diff --git a/client/ui/controllers/pageController.h b/client/ui/controllers/pageController.h
index 22ee0bb3..946c1ce5 100644
--- a/client/ui/controllers/pageController.h
+++ b/client/ui/controllers/pageController.h
@@ -9,14 +9,30 @@
 namespace PageLoader
 {
     Q_NAMESPACE
-    enum class PageEnum { PageStart = 0, PageHome, PageShare, PageDeinstalling,
+    enum class PageEnum {
+        PageStart = 0,
+        PageHome,
+        PageShare,
+        PageDeinstalling,
 
-                          PageSettingsServersList, PageSettings, PageSettingsServerData, PageSettingsServerInfo,
-                          PageSettingsServerProtocols, PageSettingsServerServices,
+        PageSettingsServersList,
+        PageSettings,
+        PageSettingsServerData,
+        PageSettingsServerInfo,
+        PageSettingsServerProtocols,
+        PageSettingsServerServices,
+        PageSettingsServerProtocol,
 
-                          PageSetupWizardStart, PageTest, PageSetupWizardCredentials, PageSetupWizardProtocols, PageSetupWizardEasy,
-                          PageSetupWizardProtocolSettings, PageSetupWizardInstalling, PageSetupWizardConfigSource,
-                          PageSetupWizardTextKey, PageSetupWizardViewConfig
+        PageSetupWizardStart,
+        PageTest,
+        PageSetupWizardCredentials,
+        PageSetupWizardProtocols,
+        PageSetupWizardEasy,
+        PageSetupWizardProtocolSettings,
+        PageSetupWizardInstalling,
+        PageSetupWizardConfigSource,
+        PageSetupWizardTextKey,
+        PageSetupWizardViewConfig
     };
     Q_ENUM_NS(PageEnum)
 
diff --git a/client/ui/qml/Components/HomeContainersListView.qml b/client/ui/qml/Components/HomeContainersListView.qml
index 0d42b8e9..926302c4 100644
--- a/client/ui/qml/Components/HomeContainersListView.qml
+++ b/client/ui/qml/Components/HomeContainersListView.qml
@@ -20,6 +20,7 @@ ListView {
     height: menuContent.contentItem.height
 
     clip: true
+    interactive: false
 
     ButtonGroup {
         id: containersRadioButtonGroup
diff --git a/client/ui/qml/Components/Protocols/OpenVpnSettings.qml b/client/ui/qml/Components/Protocols/OpenVpnSettings.qml
new file mode 100644
index 00000000..8c036fc0
--- /dev/null
+++ b/client/ui/qml/Components/Protocols/OpenVpnSettings.qml
@@ -0,0 +1,81 @@
+import QtQuick 2.15
+import QtQuick.Controls
+import QtQuick.Layouts
+
+import "../../Controls2"
+import "../../Controls2/TextTypes"
+import "../../Components"
+
+Item {
+    id: root
+
+    ColumnLayout {
+        anchors.fill: parent
+
+        anchors.leftMargin: 16
+        anchors.rightMargin: 16
+
+        spacing: 16
+
+        Header2TextType {
+            Layout.fillWidth: true
+
+            text: "OpenVpn"
+        }
+
+        TextFieldWithHeaderType {
+            Layout.fillWidth: true
+
+            headerText: qsTr("VPN Addresses Subnet")
+        }
+
+        ParagraphTextType {
+            Layout.fillWidth: true
+
+            text: qsTr("Network protocol")
+        }
+
+        TransportProtoSelector {
+            Layout.fillWidth: true
+        }
+
+        TextFieldWithHeaderType {
+            Layout.fillWidth: true
+
+            headerText: qsTr("Port")
+        }
+
+        SwitcherType {
+            Layout.fillWidth: true
+            text: qsTr("Auto-negotiate encryption")
+        }
+
+        DropDownType {
+            Layout.fillWidth: true
+
+        }
+
+        DropDownType {
+            Layout.fillWidth: true
+
+        }
+
+        CheckBoxType {
+            Layout.fillWidth: true
+
+            text: qsTr("TLS auth")
+        }
+
+        CheckBoxType {
+            Layout.fillWidth: true
+
+            text: qsTr("Block DNS requests outside of VPN")
+        }
+
+        SwitcherType {
+            Layout.fillWidth: true
+
+            text: qsTr("Additional configuration commands")
+        }
+    }
+}
diff --git a/client/ui/qml/Components/SettingsContainersListView.qml b/client/ui/qml/Components/SettingsContainersListView.qml
index 5175fd49..334696b0 100644
--- a/client/ui/qml/Components/SettingsContainersListView.qml
+++ b/client/ui/qml/Components/SettingsContainersListView.qml
@@ -18,6 +18,7 @@ ListView {
     height: root.contentItem.height
 
     clip: true
+    interactive: false
 
     ButtonGroup {
         id: containersRadioButtonGroup
@@ -89,8 +90,7 @@ ListView {
 
             onClicked: {
                 if (isInstalled) {
-//                    isDefault = true
-//                    root.currentIndex = index
+                    goToPage(PageEnum.PageSettingsServerProtocol)
                 } else {
                     ContainersModel.setCurrentlyInstalledContainerIndex(root.model.mapToSource(index))
                     InstallController.setShouldCreateServer(false)
diff --git a/client/ui/qml/Components/TransportProtoSelector.qml b/client/ui/qml/Components/TransportProtoSelector.qml
new file mode 100644
index 00000000..6f5aa44b
--- /dev/null
+++ b/client/ui/qml/Components/TransportProtoSelector.qml
@@ -0,0 +1,59 @@
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+
+import "../Controls2"
+import "../Controls2/TextTypes"
+
+Rectangle {
+    id: root
+
+    property var rootWidth: root.width
+    property int currentIndex
+
+    property alias mouseArea: transportProtoButtonMouseArea
+
+    implicitWidth: transportProtoButtonGroup.implicitWidth
+    implicitHeight: transportProtoButtonGroup.implicitHeight
+
+    color: "#1C1D21"
+    radius: 16
+
+    RowLayout {
+        id: transportProtoButtonGroup
+
+        spacing: 0
+
+        HorizontalRadioButton {
+            checked: root.currentIndex === 0
+
+            implicitWidth: (rootWidth - 32) / 2
+            text: "UDP"
+
+            hoverEnabled: !transportProtoButtonMouseArea.enabled
+
+            onClicked: {
+                root.currentIndex = 0
+            }
+        }
+
+        HorizontalRadioButton {
+            checked: root.currentIndex === 1
+
+            implicitWidth: (rootWidth - 32) / 2
+            text: "TCP"
+
+            hoverEnabled: !transportProtoButtonMouseArea.enabled
+
+            onClicked: {
+                root.currentIndex = 1
+            }
+        }
+    }
+
+    MouseArea {
+        id: transportProtoButtonMouseArea
+
+        anchors.fill: parent
+    }
+}
diff --git a/client/ui/qml/Controls2/HorizontalRadioButton.qml b/client/ui/qml/Controls2/HorizontalRadioButton.qml
index 6f00d210..86218b3f 100644
--- a/client/ui/qml/Controls2/HorizontalRadioButton.qml
+++ b/client/ui/qml/Controls2/HorizontalRadioButton.qml
@@ -2,6 +2,8 @@ import QtQuick
 import QtQuick.Controls
 import QtQuick.Layouts
 
+import "TextTypes"
+
 RadioButton {
     id: root
 
@@ -74,15 +76,9 @@ RadioButton {
         anchors.fill: parent
         spacing: 16
 
-        Text {
+        ButtonTextType {
             text: root.text
-            wrapMode: Text.WordWrap
-            color: "#D7D8DB"
-            font.pixelSize: 16
-            font.weight: 400
-            font.family: "PT Root UI VF"
 
-            height: 24
             Layout.fillWidth: true
             Layout.rightMargin: 16
             Layout.leftMargin: 16
diff --git a/client/ui/qml/Pages2/PageHome.qml b/client/ui/qml/Pages2/PageHome.qml
index e5521787..276764a3 100644
--- a/client/ui/qml/Pages2/PageHome.qml
+++ b/client/ui/qml/Pages2/PageHome.qml
@@ -164,7 +164,7 @@ PageType {
 
                     text: root.currentContainerName
                     textColor: "#0E0E11"
-                    headerText: "Протокол подключения"
+                    headerText: qsTr("Протокол подключения")
                     headerBackButtonImage: "qrc:/images/controls/arrow-left.svg"
 
                     onRootButtonClicked: function() {
@@ -198,7 +198,7 @@ PageType {
 
                 actionButtonImage: "qrc:/images/controls/plus.svg"
 
-                headerText: "Серверы"
+                headerText: qsTr("Servers")
 
                 actionButtonFunction: function() {
                     menu.visible = false
@@ -237,6 +237,7 @@ PageType {
                     currentIndex: ServersModel.getDefaultServerIndex()
 
                     clip: true
+                    interactive: false
 
                     delegate: Item {
                         id: menuContentDelegate
diff --git a/client/ui/qml/Pages2/PageSettingsServerProtocol.qml b/client/ui/qml/Pages2/PageSettingsServerProtocol.qml
new file mode 100644
index 00000000..800041f0
--- /dev/null
+++ b/client/ui/qml/Pages2/PageSettingsServerProtocol.qml
@@ -0,0 +1,24 @@
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+
+import SortFilterProxyModel 0.2
+
+import PageEnum 1.0
+import ProtocolEnum 1.0
+import ContainerProps 1.0
+
+import "./"
+import "../Controls2"
+import "../Controls2/TextTypes"
+import "../Config"
+import "../Components"
+import "../Components/Protocols"
+
+PageType {
+    id: root
+
+    OpenVpnSettings {
+        anchors.fill: parent
+    }
+}
diff --git a/client/ui/qml/Pages2/PageSettingsServersList.qml b/client/ui/qml/Pages2/PageSettingsServersList.qml
index 9c5ddc74..fa4ce86c 100644
--- a/client/ui/qml/Pages2/PageSettingsServersList.qml
+++ b/client/ui/qml/Pages2/PageSettingsServersList.qml
@@ -67,6 +67,7 @@ PageType {
                 model: ServersModel
 
                 clip: true
+                interactive: false
 
                 delegate: Item {
                     implicitWidth: servers.width
diff --git a/client/ui/qml/Pages2/PageSetupWizardProtocolSettings.qml b/client/ui/qml/Pages2/PageSetupWizardProtocolSettings.qml
index 19f81d09..57fa497d 100644
--- a/client/ui/qml/Pages2/PageSetupWizardProtocolSettings.qml
+++ b/client/ui/qml/Pages2/PageSetupWizardProtocolSettings.qml
@@ -12,6 +12,7 @@ import "./"
 import "../Controls2"
 import "../Controls2/TextTypes"
 import "../Config"
+import "../Components"
 
 PageType {
     id: root
@@ -83,53 +84,11 @@ PageType {
                             text: "Network protocol"
                         }
 
-                        Rectangle {
-                            id: transportProtoBackground
+                        TransportProtoSelector {
+                            id: transportProtoSelector
 
-                            implicitWidth: transportProtoButtonGroup.implicitWidth
-                            implicitHeight: transportProtoButtonGroup.implicitHeight
-
-                            color: "#1C1D21"
-                            radius: 16
-
-                            RowLayout {
-                                id: transportProtoButtonGroup
-
-                                property int currentIndex
-                                spacing: 0
-
-                                HorizontalRadioButton {
-                                    checked: transportProtoButtonGroup.currentIndex === 0
-
-                                    implicitWidth: (root.width - 32) / 2
-                                    text: "UDP"
-
-                                    hoverEnabled: !transportProtoButtonMouseArea.enabled
-
-                                    onClicked: {
-                                        transportProtoButtonGroup.currentIndex = 0
-                                    }
-                                }
-
-                                HorizontalRadioButton {
-                                    checked: transportProtoButtonGroup.currentIndex === 1
-
-                                    implicitWidth: (root.width - 32) / 2
-                                    text: "TCP"
-
-                                    hoverEnabled: !transportProtoButtonMouseArea.enabled
-
-                                    onClicked: {
-                                        transportProtoButtonGroup.currentIndex = 1
-                                    }
-                                }    
-                            }
-
-                            MouseArea {
-                                id: transportProtoButtonMouseArea
-
-                                anchors.fill: parent
-                            }
+                            Layout.fillWidth: true
+                            rootWidth: root.width
                         }
 
                         TextFieldWithHeaderType {
@@ -143,7 +102,7 @@ PageType {
                         Rectangle {
                             // todo make it dynamic
                             implicitHeight: root.height - port.implicitHeight -
-                                            transportProtoBackground.implicitHeight - transportProtoHeader.implicitHeight -
+                                            transportProtoSelector.implicitHeight - transportProtoHeader.implicitHeight -
                                             header.implicitHeight - backButton.implicitHeight - installButton.implicitHeight - 116
 
                             color: "transparent"
@@ -159,7 +118,7 @@ PageType {
 
                             onClicked: function() {
                                 goToPage(PageEnum.PageSetupWizardInstalling);
-                                InstallController.install(dockerContainer, port.textFieldText, transportProtoButtonGroup.currentIndex)
+                                InstallController.install(dockerContainer, port.textFieldText, transportProtoSelector.currentIndex)
                             }
                         }
 
@@ -172,10 +131,10 @@ PageType {
                             } else {
                                 port.textFieldText = ProtocolProps.defaultPort(defaultContainerProto)
                             }
-                            transportProtoButtonGroup.currentIndex = ProtocolProps.defaultTransportProto(defaultContainerProto)
+                            transportProtoSelector.currentIndex = ProtocolProps.defaultTransportProto(defaultContainerProto)
 
                             port.enabled = ProtocolProps.defaultPortChangeable(defaultContainerProto)
-                            transportProtoButtonMouseArea.enabled = !ProtocolProps.defaultTransportProtoChangeable(defaultContainerProto)
+                            transportProtoSelector.mouseArea.enabled = !ProtocolProps.defaultTransportProtoChangeable(defaultContainerProto)
                         }
                     }
                 }
diff --git a/client/ui/qml/Pages2/PageStart.qml b/client/ui/qml/Pages2/PageStart.qml
index 436194b2..a801bb66 100644
--- a/client/ui/qml/Pages2/PageStart.qml
+++ b/client/ui/qml/Pages2/PageStart.qml
@@ -78,6 +78,7 @@ PageType {
         TabImageButtonType {
             isSelected: tabBar.currentIndex === 1
             image: "qrc:/images/controls/share-2.svg"
+            onClicked: {}
         }
         TabImageButtonType {
             isSelected: tabBar.currentIndex === 2

From cd3263db5059e164119bb5c97556a675305758a4 Mon Sep 17 00:00:00 2001
From: "vladimir.kuznetsov" <nethiuswork@gmail.com>
Date: Sat, 10 Jun 2023 05:25:41 +0300
Subject: [PATCH 030/278] made libssh::ssh_connect a non-blocking feature

- extended error handling when connecting via ssh
---
 client/core/defs.h                            |  2 +-
 client/core/errorstrings.cpp                  |  1 +
 client/core/sshclient.cpp                     | 49 +++++++++++++------
 client/core/sshclient.h                       |  2 +-
 client/ui/controllers/connectionController.h  |  3 +-
 client/ui/qml/Controls2/BasicButtonType.qml   |  4 +-
 client/ui/qml/Controls2/PopupType.qml         | 12 +++--
 .../ui/qml/Pages2/PageSettingsServerData.qml  |  1 +
 client/ui/qml/main2.qml                       |  8 ++-
 client/vpnconnection.cpp                      |  6 +--
 10 files changed, 54 insertions(+), 34 deletions(-)

diff --git a/client/core/defs.h b/client/core/defs.h
index 61c45e4e..1c268246 100644
--- a/client/core/defs.h
+++ b/client/core/defs.h
@@ -36,7 +36,7 @@ enum ErrorCode
 
     // Ssh connection errors
     SshRequsetDeniedError, SshInterruptedError, SshInternalError,
-    SshPrivateKeyError, SshPrivateKeyFormatError,
+    SshPrivateKeyError, SshPrivateKeyFormatError, SshTimeoutError,
 
     // Ssh sftp errors
     SshSftpEofError, SshSftpNoSuchFileError, SshSftpPermissionDeniedError,
diff --git a/client/core/errorstrings.cpp b/client/core/errorstrings.cpp
index dd298c76..cd66186d 100644
--- a/client/core/errorstrings.cpp
+++ b/client/core/errorstrings.cpp
@@ -24,6 +24,7 @@ QString errorString(ErrorCode code){
     case(SshInternalError): return QObject::tr("Ssh internal error");
     case(SshPrivateKeyError): return QObject::tr("Invalid private key or invalid passphrase entered");
     case(SshPrivateKeyFormatError): return QObject::tr("The selected private key format is not supported, use openssh ED25519 key types or PEM key types");
+    case(SshTimeoutError): return QObject::tr("Timeout connecting to server");
 
     // Libssh sftp errors
     case(SshSftpEofError): return QObject::tr("Sftp error: End-of-file encountered");
diff --git a/client/core/sshclient.cpp b/client/core/sshclient.cpp
index 0367dc1f..e8d021ad 100644
--- a/client/core/sshclient.cpp
+++ b/client/core/sshclient.cpp
@@ -10,6 +10,8 @@ const uint32_t S_IRWXU = 0644;
 #endif
 
 namespace libssh {
+    const QString libsshTimeoutError = "Timeout connecting to";
+
     std::function<QString()> Client::m_passphraseCallback;
 
     Client::Client(QObject *parent) : QObject(parent)
@@ -45,11 +47,20 @@ namespace libssh {
             ssh_options_set(m_session, SSH_OPTIONS_USER, hostUsername.c_str());
             ssh_options_set(m_session, SSH_OPTIONS_LOG_VERBOSITY, &logVerbosity);
 
-            int connectionResult = ssh_connect(m_session);
+            QFutureWatcher<int> watcher;
+            QFuture<int> future = QtConcurrent::run([this]() {
+                return ssh_connect(m_session);
+            });
+
+            QEventLoop wait;
+            connect(&watcher, &QFutureWatcher<ErrorCode>::finished, &wait, &QEventLoop::quit);
+            watcher.setFuture(future);
+            wait.exec();
+
+            int connectionResult = watcher.result();
 
             if (connectionResult != SSH_OK) {
-                qDebug() << ssh_get_error(m_session);
-                return fromLibsshErrorCode(ssh_get_error_code(m_session));
+                return fromLibsshErrorCode();
             }
 
             std::string authUsername = credentials.userName.toStdString();
@@ -78,8 +89,8 @@ namespace libssh {
                     ssh_key_free(privateKey);
                 }
                 if (authResult != SSH_OK) {
-                    qDebug() << ssh_get_error(m_session);
-                    ErrorCode errorCode = fromLibsshErrorCode(ssh_get_error_code(m_session));
+                    qCritical() << ssh_get_error(m_session);
+                    ErrorCode errorCode = fromLibsshErrorCode();
                     if (errorCode == ErrorCode::NoError) {
                         errorCode = ErrorCode::SshPrivateKeyFormatError;
                     }
@@ -88,8 +99,7 @@ namespace libssh {
             } else {
                 authResult = ssh_userauth_password(m_session, authUsername.c_str(), credentials.secretData.toStdString().c_str());
                 if (authResult != SSH_OK) {
-                    qDebug() << ssh_get_error(m_session);
-                    return fromLibsshErrorCode(ssh_get_error_code(m_session));
+                    return fromLibsshErrorCode();
                 }
             }
         }
@@ -188,16 +198,15 @@ namespace libssh {
     ErrorCode Client::writeResponse(const QString &data)
     {
         if (m_channel == nullptr) {
-            qDebug() << "ssh channel not initialized";
-            return fromLibsshErrorCode(ssh_get_error_code(m_session));
+            qCritical() << "ssh channel not initialized";
+            return fromLibsshErrorCode();
         }
 
         int bytesWritten = ssh_channel_write(m_channel, data.toUtf8(), (uint32_t)data.size());
         if (bytesWritten == data.size() && ssh_channel_write(m_channel, "\n", 1)) {
-            return fromLibsshErrorCode(ssh_get_error_code(m_session));
+            return fromLibsshErrorCode();
         }
-        qDebug() << ssh_get_error(m_session);
-        return fromLibsshErrorCode(ssh_get_error_code(m_session));
+        return fromLibsshErrorCode();
     }
 
     ErrorCode Client::closeChannel()
@@ -212,8 +221,7 @@ namespace libssh {
             ssh_channel_free(m_channel);
             m_channel = nullptr;
         }
-        qDebug() << ssh_get_error(m_session);
-        return fromLibsshErrorCode(ssh_get_error_code(m_session));
+        return fromLibsshErrorCode();
     }
 
     ErrorCode Client::sftpFileCopy(const SftpOverwriteMode overwriteMode, const std::string& localPath, const std::string& remotePath, const std::string& fileDesc)
@@ -312,12 +320,21 @@ namespace libssh {
             sftp_free(m_sftpSession);
             m_sftpSession = nullptr;
         }
-        qDebug() << ssh_get_error(m_session);
+        qCritical() << ssh_get_error(m_session);
         return errorCode;
     }
 
-    ErrorCode Client::fromLibsshErrorCode(int errorCode)
+    ErrorCode Client::fromLibsshErrorCode()
     {
+        int errorCode = ssh_get_error_code(m_session);
+        if (errorCode != SSH_NO_ERROR) {
+            QString errorMessage = ssh_get_error(m_session);
+            qCritical() << errorMessage;
+            if (errorMessage.contains(libsshTimeoutError)) {
+                return ErrorCode::SshTimeoutError;
+            }
+        }
+
         switch (errorCode) {
         case(SSH_NO_ERROR): return ErrorCode::NoError;
         case(SSH_REQUEST_DENIED): return ErrorCode::SshRequsetDeniedError;
diff --git a/client/core/sshclient.h b/client/core/sshclient.h
index db22d0dd..4e08faaa 100644
--- a/client/core/sshclient.h
+++ b/client/core/sshclient.h
@@ -40,7 +40,7 @@ namespace libssh {
     private:
         ErrorCode closeChannel();
         ErrorCode closeSftpSession();
-        ErrorCode fromLibsshErrorCode(int errorCode);
+        ErrorCode fromLibsshErrorCode();
         ErrorCode fromLibsshSftpErrorCode(int errorCode);
         static int callback(const char *prompt, char *buf, size_t len, int echo, int verify, void *userdata);
 
diff --git a/client/ui/controllers/connectionController.h b/client/ui/controllers/connectionController.h
index 93ee28a7..c1e81ea3 100644
--- a/client/ui/controllers/connectionController.h
+++ b/client/ui/controllers/connectionController.h
@@ -19,13 +19,14 @@ public:
                                   QObject *parent = nullptr);
 
     bool isConnected();
-    void setIsConnected(bool isConnected);
+    void setIsConnected(bool isConnected); //todo take state from vpnconnection?
 
 public slots:
     void openConnection();
     void closeConnection();
 
     QString getLastConnectionError();
+    Vpn::ConnectionState connectionState(){return {};}; //todo update ConnectButton text on page change
 
 signals:
     void connectToVpn(int serverIndex, const ServerCredentials &credentials, DockerContainer container, const QJsonObject &containerConfig);
diff --git a/client/ui/qml/Controls2/BasicButtonType.qml b/client/ui/qml/Controls2/BasicButtonType.qml
index 266beefe..05074fa9 100644
--- a/client/ui/qml/Controls2/BasicButtonType.qml
+++ b/client/ui/qml/Controls2/BasicButtonType.qml
@@ -24,10 +24,10 @@ Button {
         radius: 16
         color: {
             if (root.enabled) {
-                if(root.pressed) {
+                if (root.pressed) {
                     return pressedColor
                 }
-                return hovered ? hoveredColor : defaultColor
+                return root.hovered ? hoveredColor : defaultColor
             } else {
                 return disabledColor
             }
diff --git a/client/ui/qml/Controls2/PopupType.qml b/client/ui/qml/Controls2/PopupType.qml
index dd92d5fe..61bdfd18 100644
--- a/client/ui/qml/Controls2/PopupType.qml
+++ b/client/ui/qml/Controls2/PopupType.qml
@@ -27,15 +27,17 @@ Popup {
     background: Rectangle {
         anchors.fill: parent
 
-        color: Qt.rgba(215/255, 216/255, 219/255, 0.95)
+        color: "white"//Qt.rgba(215/255, 216/255, 219/255, 0.95)
         radius: 4
     }
 
     contentItem: RowLayout {
-        width: parent.width
+        anchors.fill: parent
+        anchors.leftMargin: 16
+        anchors.rightMargin: 16
 
         CaptionTextType {
-            horizontalAlignment: Text.AlignHCenter
+            horizontalAlignment: Text.AlignLeft
             Layout.fillWidth: true
 
             text: root.popupErrorMessageText
@@ -44,7 +46,7 @@ Popup {
         BasicButtonType {
             visible: closeButtonVisible
 
-            defaultColor: Qt.rgba(215/255, 216/255, 219/255, 0.95)
+            defaultColor: "white"//"transparent"//Qt.rgba(215/255, 216/255, 219/255, 0.95)
             hoveredColor: "#C1C2C5"
             pressedColor: "#AEB0B7"
             disabledColor: "#494B50"
@@ -52,7 +54,7 @@ Popup {
             textColor: "#0E0E11"
             borderWidth: 0
 
-            text: "Close"
+            text: qsTr("Close")
             onClicked: {
                 root.close()
             }
diff --git a/client/ui/qml/Pages2/PageSettingsServerData.qml b/client/ui/qml/Pages2/PageSettingsServerData.qml
index c1f84cb0..fe09ed01 100644
--- a/client/ui/qml/Pages2/PageSettingsServerData.qml
+++ b/client/ui/qml/Pages2/PageSettingsServerData.qml
@@ -74,6 +74,7 @@ PageType {
                             PageController.replaceStartPage()
                         } else {
                             goToStartPage()
+                            goToPage(PageEnum.PageSettingsServersList)
                         }
                     }
                     questionDrawer.noButtonFunction = function() {
diff --git a/client/ui/qml/main2.qml b/client/ui/qml/main2.qml
index 44a85925..0be8e368 100644
--- a/client/ui/qml/main2.qml
+++ b/client/ui/qml/main2.qml
@@ -16,6 +16,9 @@ Window  {
     minimumWidth: GC.isDesktop() ? 360 : 0
     minimumHeight: GC.isDesktop() ? 640 : 0
 
+    color: "#0E0E11"
+
+    // todo
     onClosing: function() {
         console.debug("QML onClosing signal")
         UiLogic.onCloseWindow()
@@ -23,11 +26,6 @@ Window  {
 
     title: "AmneziaVPN"
 
-    Rectangle {
-        anchors.fill: parent
-        color: "#0E0E11"
-    }
-
     StackViewType {
         id: rootStackView
 
diff --git a/client/vpnconnection.cpp b/client/vpnconnection.cpp
index 468a6d96..1f0902fb 100644
--- a/client/vpnconnection.cpp
+++ b/client/vpnconnection.cpp
@@ -336,7 +336,7 @@ void VpnConnection::connectToVpn(int serverIndex,
 
     ErrorCode e = ErrorCode::NoError;
 
-    m_vpnConfiguration = createVpnConfiguration(serverIndex, credentials, container, containerConfig);
+    m_vpnConfiguration = createVpnConfiguration(serverIndex, credentials, container, containerConfig, &e);
     if (e) {
         emit connectionStateChanged(Vpn::ConnectionState::Error);
         return;
@@ -345,7 +345,7 @@ void VpnConnection::connectToVpn(int serverIndex,
 #if !defined (Q_OS_ANDROID) && !defined (Q_OS_IOS)
     m_vpnProtocol.reset(VpnProtocol::factory(container, m_vpnConfiguration));
     if (!m_vpnProtocol) {
-        emit Vpn::ConnectionState::Error;
+        emit connectionStateChanged(Vpn::ConnectionState::Error);
         return;
     }
     m_vpnProtocol->prepare();
@@ -371,7 +371,7 @@ void VpnConnection::connectToVpn(int serverIndex,
     createProtocolConnections();
 
     e = m_vpnProtocol.data()->start();
-    if (e) emit Vpn::ConnectionState::Error;
+    if (e) emit connectionStateChanged(Vpn::ConnectionState::Error);
 }
 
 void VpnConnection::createProtocolConnections() {

From be7386f0d76645b97e44b775c6b90b3cc740ab5f Mon Sep 17 00:00:00 2001
From: "vladimir.kuznetsov" <nethiuswork@gmail.com>
Date: Tue, 13 Jun 2023 20:03:20 +0900
Subject: [PATCH 031/278] added exportController and PageShare - added a blank
 PageSettingsProtocol

---
 client/amnezia_application.cpp                |   7 +-
 client/amnezia_application.h                  |  11 +-
 client/images/controls/check_off.png          | Bin 17930 -> 0 bytes
 client/images/controls/check_on.png           | Bin 18032 -> 0 bytes
 .../radio-button-inner-circle-pressed.png     | Bin 0 -> 5125 bytes
 .../controls/radio-button-inner-circle.png    | Bin 0 -> 7720 bytes
 .../images/controls/radio-button-pressed.svg  |   3 +
 client/images/controls/radio-button.svg       |   3 +
 client/images/controls/radio_off.png          | Bin 491 -> 0 bytes
 client/images/controls/radio_on.png           | Bin 624 -> 0 bytes
 client/resources.qrc                          |  10 +-
 client/ui/controllers/exportController.cpp    | 156 +++++++++
 client/ui/controllers/exportController.h      |  44 +++
 client/ui/controllers/importController.h      |   1 +
 client/ui/controllers/installController.cpp   |   3 +-
 client/ui/controllers/pageController.h        |   1 -
 .../protocolSettingsController.cpp            |  19 +
 .../controllers/protocolSettingsController.h  |  31 ++
 client/ui/models/containers_model.cpp         |  22 +-
 client/ui/models/containers_model.h           |   8 +-
 client/ui/models/servers_model.cpp            |   5 +
 client/ui/models/servers_model.h              |   1 +
 .../qml/Components/HomeContainersListView.qml |   2 +-
 .../Components/Protocols/OpenVpnSettings.qml  |  70 ++++
 .../Components/SettingsContainersListView.qml |   3 +-
 .../qml/Components/ShareConnectionDrawer.qml  | 177 ++++++++++
 client/ui/qml/Controls2/BackButtonType.qml    |   2 +
 client/ui/qml/Controls2/DropDownType.qml      |  13 +-
 client/ui/qml/Controls2/ListViewType.qml      | 107 ++++++
 .../ui/qml/Controls2/VerticalRadioButton.qml  |  94 ++---
 client/ui/qml/Pages2/PageHome.qml             |   4 +-
 .../qml/Pages2/PageSettingsServerProtocol.qml |  59 +++-
 client/ui/qml/Pages2/PageSetupWizardEasy.qml  |   2 +-
 .../qml/Pages2/PageSetupWizardInstalling.qml  |   2 +-
 .../PageSetupWizardProtocolSettings.qml       |   2 +-
 .../qml/Pages2/PageSetupWizardProtocols.qml   |   2 +-
 client/ui/qml/Pages2/PageShare.qml            | 327 +++++++++++++++++-
 client/ui/qml/Pages2/PageStart.qml            |   4 +-
 38 files changed, 1080 insertions(+), 115 deletions(-)
 delete mode 100644 client/images/controls/check_off.png
 delete mode 100644 client/images/controls/check_on.png
 create mode 100644 client/images/controls/radio-button-inner-circle-pressed.png
 create mode 100644 client/images/controls/radio-button-inner-circle.png
 create mode 100644 client/images/controls/radio-button-pressed.svg
 create mode 100644 client/images/controls/radio-button.svg
 delete mode 100644 client/images/controls/radio_off.png
 delete mode 100644 client/images/controls/radio_on.png
 create mode 100644 client/ui/controllers/exportController.cpp
 create mode 100644 client/ui/controllers/exportController.h
 create mode 100644 client/ui/controllers/protocolSettingsController.cpp
 create mode 100644 client/ui/controllers/protocolSettingsController.h
 create mode 100644 client/ui/qml/Components/ShareConnectionDrawer.qml
 create mode 100644 client/ui/qml/Controls2/ListViewType.qml

diff --git a/client/amnezia_application.cpp b/client/amnezia_application.cpp
index dbeaac38..598645d8 100644
--- a/client/amnezia_application.cpp
+++ b/client/amnezia_application.cpp
@@ -46,7 +46,6 @@
 #endif
 
     m_settings = std::shared_ptr<Settings>(new Settings);
-    m_configurator = std::shared_ptr<VpnConfigurator>(new VpnConfigurator(m_settings, this));
 }
 
 AmneziaApplication::~AmneziaApplication()
@@ -80,10 +79,10 @@ void AmneziaApplication::init()
     m_serversModel.reset(new ServersModel(m_settings, this));
     m_engine->rootContext()->setContextProperty("ServersModel", m_serversModel.get());
 
+    m_configurator = std::shared_ptr<VpnConfigurator>(new VpnConfigurator(m_settings, this));
     m_vpnConnection.reset(new VpnConnection(m_settings, m_configurator));
 
     m_connectionController.reset(new ConnectionController(m_serversModel, m_containersModel, m_vpnConnection));
-
     m_engine->rootContext()->setContextProperty("ConnectionController", m_connectionController.get());
 
     m_pageController.reset(new PageController(m_serversModel));
@@ -95,6 +94,10 @@ void AmneziaApplication::init()
     m_importController.reset(new ImportController(m_serversModel, m_containersModel, m_settings));
     m_engine->rootContext()->setContextProperty("ImportController", m_importController.get());
 
+    m_exportController.reset(
+        new ExportController(m_serversModel, m_containersModel, m_settings, m_configurator));
+    m_engine->rootContext()->setContextProperty("ExportController", m_exportController.get());
+
     //
 
     m_engine->load(url);
diff --git a/client/amnezia_application.h b/client/amnezia_application.h
index 0fd6842c..510f580f 100644
--- a/client/amnezia_application.h
+++ b/client/amnezia_application.h
@@ -13,12 +13,13 @@
 
 #include "configurators/vpn_configurator.h"
 
-#include "ui/models/servers_model.h"
-#include "ui/models/containers_model.h"
 #include "ui/controllers/connectionController.h"
-#include "ui/controllers/pageController.h"
-#include "ui/controllers/installController.h"
+#include "ui/controllers/exportController.h"
 #include "ui/controllers/importController.h"
+#include "ui/controllers/installController.h"
+#include "ui/controllers/pageController.h"
+#include "ui/models/containers_model.h"
+#include "ui/models/servers_model.h"
 
 #define amnApp (static_cast<AmneziaApplication *>(QCoreApplication::instance()))
 
@@ -71,7 +72,7 @@ private:
     QScopedPointer<PageController> m_pageController;
     QScopedPointer<InstallController> m_installController;
     QScopedPointer<ImportController> m_importController;
-
+    QScopedPointer<ExportController> m_exportController;
 };
 
 #endif // AMNEZIA_APPLICATION_H
diff --git a/client/images/controls/check_off.png b/client/images/controls/check_off.png
deleted file mode 100644
index 0a7fbf709ea09e47560231777967e2308702adad..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 17930
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

diff --git a/client/images/controls/check_on.png b/client/images/controls/check_on.png
deleted file mode 100644
index 8b3b683b11f7d401dcbf33c7464c168180bf4f83..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 18032
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
aD}jaet7)Ar2^CO>0Y_U`n?mb#+x`t5|GQ)W

diff --git a/client/images/controls/radio-button-inner-circle-pressed.png b/client/images/controls/radio-button-inner-circle-pressed.png
new file mode 100644
index 0000000000000000000000000000000000000000..efcd6f1f97111a9b48dc7276a95bead4aadba225
GIT binary patch
literal 5125
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

literal 0
HcmV?d00001

diff --git a/client/images/controls/radio-button-inner-circle.png b/client/images/controls/radio-button-inner-circle.png
new file mode 100644
index 0000000000000000000000000000000000000000..da29d54aa12cae758b9d6a8ed105d32ba7edebf7
GIT binary patch
literal 7720
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

literal 0
HcmV?d00001

diff --git a/client/images/controls/radio-button-pressed.svg b/client/images/controls/radio-button-pressed.svg
new file mode 100644
index 00000000..cf302db0
--- /dev/null
+++ b/client/images/controls/radio-button-pressed.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect x="0.5" y="0.5" width="23" height="23" rx="11.5" stroke="#A85809"/>
+</svg>
diff --git a/client/images/controls/radio-button.svg b/client/images/controls/radio-button.svg
new file mode 100644
index 00000000..75b1b5b4
--- /dev/null
+++ b/client/images/controls/radio-button.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect x="0.5" y="0.5" width="23" height="23" rx="11.5" stroke="#878B91"/>
+</svg>
diff --git a/client/images/controls/radio_off.png b/client/images/controls/radio_off.png
deleted file mode 100644
index 685980bdfd97a2c58261f3d3e1abc6fa1d0dbde7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 491
zcmV<H0Tlj;P)<h;3K|Lk000e1NJLTq000yK000yS1^@s6jfou%00009a7bBm000XU
z000XU0RWnu7ytkO0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH0f0$FK~#7FtyDX5
z!Y~khG8`Z!m?BhmE3gkhT0)VWAj|~L!ElP$U2>9;+9u;NR)d-VWlj)f*T94f;_JM^
zYe~CLtJPZx9DtOvNv7ifZ1D|bWOPQ@7gM!Owx#SFfro}$?*u`Jy6YD6O65==3XXt=
z!T3GPo^dRrR!hDPhmR&r60;Ay*6Vf+`>s!6Cu_IlERLScsbF7@v6Av`=a6laa_mmc
zdbeG3DTafAVUAxyO8ZdFj)7x0Syt)%(skWt5QexE9NVb79Y9<=71EgJc_@n@3?PiT
zaSUCs=ldv&wN{%B{uxZD7xM+mLgjhUnht#?(`kybP`P5GiveGG8QCN&+02-$sG%`<
ziQ^cTVmul#$N0}AXBkD2ITswW-FlVHPpwvaqgvjPIIqGJMb4*+<499>_siw-YsX>p
zd~shV2WrY|+`qQxOW1ZMr@jyvHK-*$&xhx)I*H{qO;da><`b@aW_e((gj>WCEA_Kw
hooO-?BGUU}egJE$3_uvVdIJCe002ovPDHLkV1feU&3pg=

diff --git a/client/images/controls/radio_on.png b/client/images/controls/radio_on.png
deleted file mode 100644
index 48560e537843f963e8e0360c77b49dc8220fadb2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 624
zcmV-$0+0QPP)<h;3K|Lk000e1NJLTq000yK000yS1^@s6jfou%00009a7bBm000XU
z000XU0RWnu7ytkO0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH0tHD#K~#7Fl~l`a
z(?AqGb`%lXjgg>IfyJ~7R$Umx2RJI9(0$THKLJ#+v9l}i1;C=o8vdX`&JUD$QIJ3?
z85V^;7O|>6Qspt7>pE%19oy|$*fV$TJ$LThhk-1tw;51$0KuZYAp#6cjt@&gnu(z&
z+NsKKg;_<%S)2uXP>jUEzaE199(Z@arIQ*qmg>m8(fW?>eC!B+_e7+D&e*$Of^@H<
zNG1Exakmb|ZQ*Vm2(r<WN^f@|Q%U7blW#^L=t6Tob%f>pB%^3u-|pVfBYFJpFyq{~
zn=4NhAGL3XD1YW?{W(S08$~i&SHJAZvm-^<U4BHrO2mZMZJRxuX?NZ{n<&(`L#%$?
zLl*qC1vrZ{lRbO?8-I_7%!E;3_WXTCx$!+j9w>rolow`!;izoFG;DkRo^nW`<$-E)
z8dtR{n5k2?N(JO0><zVYNoa5$_7$Q1xP&}76yg+u{};fh5J<v)D;Z*(wM<lAS_#5)
z8S#jl*m%x)mq^d9z03a1B6XMNP<?StNEebE(a;#bVI!F}@6{YOSDs8lvr1;P_Scv^
zQ=P>nR#V-|_VJo`Z#}Q6w%$~h`>T?WC%YgE6qVOJ;$*AWh{qT8wZD6sdaH4d>&92s
zfOTcDMqM;6d@8Rv0WG<0=mxBwaE!NY8-oI)Zi>}8l^In=n#m>X+15fe=Ae)O0000<
KMNUMnLSTXd5EgR)

diff --git a/client/resources.qrc b/client/resources.qrc
index e2f16853..d60acfdd 100644
--- a/client/resources.qrc
+++ b/client/resources.qrc
@@ -6,10 +6,6 @@
         <file>images/favorites_disabled.png</file>
         <file>images/favorites_enabled.png</file>
         <file>images/favorites_hover.png</file>
-        <file>images/controls/check_off.png</file>
-        <file>images/controls/check_on.png</file>
-        <file>images/controls/radio_off.png</file>
-        <file>images/controls/radio_on.png</file>
         <file>images/download.png</file>
         <file>images/upload.png</file>
         <file>images/tray/active.png</file>
@@ -257,5 +253,11 @@
         <file>ui/qml/Pages2/PageSettingsServerProtocol.qml</file>
         <file>ui/qml/Components/Protocols/OpenVpnSettings.qml</file>
         <file>ui/qml/Components/TransportProtoSelector.qml</file>
+        <file>ui/qml/Controls2/ListViewType.qml</file>
+        <file>images/controls/radio-button.svg</file>
+        <file>images/controls/radio-button-inner-circle.png</file>
+        <file>images/controls/radio-button-pressed.svg</file>
+        <file>images/controls/radio-button-inner-circle-pressed.png</file>
+        <file>ui/qml/Components/ShareConnectionDrawer.qml</file>
     </qresource>
 </RCC>
diff --git a/client/ui/controllers/exportController.cpp b/client/ui/controllers/exportController.cpp
new file mode 100644
index 00000000..9ff73f33
--- /dev/null
+++ b/client/ui/controllers/exportController.cpp
@@ -0,0 +1,156 @@
+#include "exportController.h"
+
+#include <QBuffer>
+#include <QDataStream>
+#include <QDesktopServices>
+#include <QFile>
+#include <QFileDialog>
+#include <QFileInfo>
+#include <QImage>
+#include <QStandardPaths>
+
+#include "qrcodegen.hpp"
+
+ExportController::ExportController(const QSharedPointer<ServersModel> &serversModel,
+                                   const QSharedPointer<ContainersModel> &containersModel,
+                                   const std::shared_ptr<Settings> &settings,
+                                   const std::shared_ptr<VpnConfigurator> &configurator,
+                                   QObject *parent)
+    : QObject(parent)
+    , m_serversModel(serversModel)
+    , m_containersModel(containersModel)
+    , m_settings(settings)
+    , m_configurator(configurator)
+{}
+
+void ExportController::generateFullAccessConfig()
+{
+    int serverIndex = m_serversModel->getCurrentlyProcessedServerIndex();
+    QJsonObject config = m_settings->server(serverIndex);
+
+    QByteArray compressedConfig = QJsonDocument(config).toJson();
+    compressedConfig = qCompress(compressedConfig, 8);
+    m_amneziaCode = QString("vpn://%1")
+                        .arg(QString(compressedConfig.toBase64(QByteArray::Base64UrlEncoding
+                                                               | QByteArray::OmitTrailingEquals)));
+
+    m_qrCodes = generateQrCodeImageSeries(compressedConfig);
+}
+
+void ExportController::generateConnectionConfig()
+{
+    int serverIndex = m_serversModel->getCurrentlyProcessedServerIndex();
+    ServerCredentials credentials = m_serversModel->getCurrentlyProcessedServerCredentials();
+
+    DockerContainer container = static_cast<DockerContainer>(
+        m_containersModel->getCurrentlyProcessedContainerIndex());
+    QModelIndex containerModelIndex = m_containersModel->index(container);
+    QJsonObject containerConfig = qvariant_cast<QJsonObject>(
+        m_containersModel->data(containerModelIndex, ContainersModel::Roles::ConfigRole));
+    containerConfig.insert(config_key::container, ContainerProps::containerToString(container));
+
+    ErrorCode e = ErrorCode::NoError;
+    for (Proto p : ContainerProps::protocolsForContainer(container)) {
+        QJsonObject protoConfig = m_settings->protocolConfig(serverIndex, container, p);
+
+        QString cfg = m_configurator->genVpnProtocolConfig(credentials,
+                                                           container,
+                                                           containerConfig,
+                                                           p,
+                                                           &e);
+        if (e) {
+            cfg = "Error generating config";
+            break;
+        }
+        protoConfig.insert(config_key::last_config, cfg);
+        containerConfig.insert(ProtocolProps::protoToString(p), protoConfig);
+    }
+
+    QJsonObject config = m_settings->server(serverIndex);
+    if (!e) {
+        config.remove(config_key::userName);
+        config.remove(config_key::password);
+        config.remove(config_key::port);
+        config.insert(config_key::containers, QJsonArray{containerConfig});
+        config.insert(config_key::defaultContainer, ContainerProps::containerToString(container));
+
+        auto dns = m_configurator->getDnsForConfig(serverIndex);
+        config.insert(config_key::dns1, dns.first);
+        config.insert(config_key::dns2, dns.second);
+
+    } /*else {
+        set_textEditShareAmneziaCodeText(tr("Error while generating connection profile"));
+        return;
+    }*/
+    QByteArray compressedConfig = QJsonDocument(config).toJson();
+    compressedConfig = qCompress(compressedConfig, 8);
+    m_amneziaCode = QString("vpn://%1")
+                        .arg(QString(compressedConfig.toBase64(QByteArray::Base64UrlEncoding
+                                                               | QByteArray::OmitTrailingEquals)));
+
+    m_qrCodes = generateQrCodeImageSeries(compressedConfig);
+}
+
+QString ExportController::getAmneziaCode()
+{
+    return m_amneziaCode;
+}
+
+QList<QString> ExportController::getQrCodes()
+{
+    return m_qrCodes;
+}
+
+void ExportController::saveFile()
+{
+    QString fileExtension = ".vpn";
+    QString docDir = QStandardPaths::writableLocation(QStandardPaths::DocumentsLocation);
+    QUrl fileName;
+    fileName = QFileDialog::getSaveFileUrl(nullptr,
+                                           tr("Save AmneziaVPN config"),
+                                           QUrl::fromLocalFile(docDir + "/" + "amnezia_config"),
+                                           "*" + fileExtension);
+    if (fileName.isEmpty())
+        return;
+    if (!fileName.toString().endsWith(fileExtension)) {
+        fileName = QUrl(fileName.toString() + fileExtension);
+    }
+    if (fileName.isEmpty())
+        return;
+
+    QFile save(fileName.toLocalFile());
+
+    save.open(QIODevice::WriteOnly);
+    save.write(m_amneziaCode.toUtf8());
+    save.close();
+
+    QFileInfo fi(fileName.toLocalFile());
+    QDesktopServices::openUrl(fi.absoluteDir().absolutePath());
+}
+
+QList<QString> ExportController::generateQrCodeImageSeries(const QByteArray &data)
+{
+    double k = 850;
+
+    quint8 chunksCount = std::ceil(data.size() / k);
+    QList<QString> chunks;
+    for (int i = 0; i < data.size(); i = i + k) {
+        QByteArray chunk;
+        QDataStream s(&chunk, QIODevice::WriteOnly);
+        s << amnezia::qrMagicCode << chunksCount << (quint8) std::round(i / k) << data.mid(i, k);
+
+        QByteArray ba = chunk.toBase64(QByteArray::Base64UrlEncoding
+                                       | QByteArray::OmitTrailingEquals);
+
+        qrcodegen::QrCode qr = qrcodegen::QrCode::encodeText(ba, qrcodegen::QrCode::Ecc::LOW);
+        QString svg = QString::fromStdString(toSvgString(qr, 0));
+        chunks.append(svgToBase64(svg));
+    }
+
+    return chunks;
+}
+
+QString ExportController::svgToBase64(const QString &image)
+{
+    return "data:image/svg;base64," + QString::fromLatin1(image.toUtf8().toBase64().data());
+}
diff --git a/client/ui/controllers/exportController.h b/client/ui/controllers/exportController.h
new file mode 100644
index 00000000..c5054143
--- /dev/null
+++ b/client/ui/controllers/exportController.h
@@ -0,0 +1,44 @@
+#ifndef EXPORTCONTROLLER_H
+#define EXPORTCONTROLLER_H
+
+#include <QObject>
+
+#include "configurators/vpn_configurator.h"
+#include "ui/models/containers_model.h"
+#include "ui/models/servers_model.h"
+
+class ExportController : public QObject
+{
+    Q_OBJECT
+public:
+    explicit ExportController(const QSharedPointer<ServersModel> &serversModel,
+                              const QSharedPointer<ContainersModel> &containersModel,
+                              const std::shared_ptr<Settings> &settings,
+                              const std::shared_ptr<VpnConfigurator> &configurator,
+                              QObject *parent = nullptr);
+
+public slots:
+    void generateFullAccessConfig();
+    void generateConnectionConfig();
+    QString getAmneziaCode();
+    QList<QString> getQrCodes();
+
+    void saveFile();
+
+signals:
+    void generateConfig(bool isFullAccess);
+
+private:
+    QList<QString> generateQrCodeImageSeries(const QByteArray &data);
+    QString svgToBase64(const QString &image);
+
+    QSharedPointer<ServersModel> m_serversModel;
+    QSharedPointer<ContainersModel> m_containersModel;
+    std::shared_ptr<Settings> m_settings;
+    std::shared_ptr<VpnConfigurator> m_configurator;
+
+    QString m_amneziaCode;
+    QList<QString> m_qrCodes;
+};
+
+#endif // EXPORTCONTROLLER_H
diff --git a/client/ui/controllers/importController.h b/client/ui/controllers/importController.h
index 114bb531..561ea19c 100644
--- a/client/ui/controllers/importController.h
+++ b/client/ui/controllers/importController.h
@@ -27,6 +27,7 @@ public slots:
 signals:
     void importFinished();
     void importErrorOccurred(QString errorMessage);
+
 private:
     QJsonObject extractAmneziaConfig(QString &data);
     QJsonObject extractOpenVpnConfig(const QString &data);
diff --git a/client/ui/controllers/installController.cpp b/client/ui/controllers/installController.cpp
index 2fe96962..8f9e1f88 100644
--- a/client/ui/controllers/installController.cpp
+++ b/client/ui/controllers/installController.cpp
@@ -9,8 +9,7 @@ InstallController::InstallController(const QSharedPointer<ServersModel> &servers
                                     const QSharedPointer<ContainersModel> &containersModel,
                                     const std::shared_ptr<Settings> &settings,
                                     QObject *parent) : QObject(parent), m_serversModel(serversModel), m_containersModel(containersModel),  m_settings(settings)
-{
-}
+{}
 
 void InstallController::install(DockerContainer container, int port, TransportProto transportProto)
 {
diff --git a/client/ui/controllers/pageController.h b/client/ui/controllers/pageController.h
index 946c1ce5..dcf2fc66 100644
--- a/client/ui/controllers/pageController.h
+++ b/client/ui/controllers/pageController.h
@@ -24,7 +24,6 @@ namespace PageLoader
         PageSettingsServerProtocol,
 
         PageSetupWizardStart,
-        PageTest,
         PageSetupWizardCredentials,
         PageSetupWizardProtocols,
         PageSetupWizardEasy,
diff --git a/client/ui/controllers/protocolSettingsController.cpp b/client/ui/controllers/protocolSettingsController.cpp
new file mode 100644
index 00000000..48414021
--- /dev/null
+++ b/client/ui/controllers/protocolSettingsController.cpp
@@ -0,0 +1,19 @@
+#include "protocolSettingsController.h"
+
+ProtocolSettingsController::ProtocolSettingsController(
+    const QSharedPointer<ServersModel> &serversModel,
+    const QSharedPointer<ContainersModel> &containersModel,
+    const std::shared_ptr<Settings> &settings,
+    QObject *parent)
+    : QObject(parent)
+    , m_serversModel(serversModel)
+    , m_containersModel(containersModel)
+    , m_settings(settings)
+{}
+
+QByteArray ProtocolSettingsController::getOpenVpnConfig()
+{
+    auto containerIndex = m_containersModel->index(
+        m_containersModel->getCurrentlyProcessedContainerIndex());
+    auto config = m_containersModel->data(containerIndex, ContainersModel::Roles::ConfigRole);
+}
diff --git a/client/ui/controllers/protocolSettingsController.h b/client/ui/controllers/protocolSettingsController.h
new file mode 100644
index 00000000..730cbda7
--- /dev/null
+++ b/client/ui/controllers/protocolSettingsController.h
@@ -0,0 +1,31 @@
+#ifndef PROTOCOLSETTINGSCONTROLLER_H
+#define PROTOCOLSETTINGSCONTROLLER_H
+
+#include <QObject>
+
+#include "containers/containers_defs.h"
+#include "core/defs.h"
+#include "ui/models/containers_model.h"
+#include "ui/models/servers_model.h"
+
+class ProtocolSettingsController : public QObject
+{
+    Q_OBJECT
+public:
+    explicit ProtocolSettingsController(const QSharedPointer<ServersModel> &serversModel,
+                                        const QSharedPointer<ContainersModel> &containersModel,
+                                        const std::shared_ptr<Settings> &settings,
+                                        QObject *parent = nullptr);
+
+public slots:
+    QByteArray getOpenVpnConfig();
+
+signals:
+
+private:
+    QSharedPointer<ServersModel> m_serversModel;
+    QSharedPointer<ContainersModel> m_containersModel;
+    std::shared_ptr<Settings> m_settings;
+};
+
+#endif // PROTOCOLSETTINGSCONTROLLER_H
diff --git a/client/ui/models/containers_model.cpp b/client/ui/models/containers_model.cpp
index b6574439..1caf6944 100644
--- a/client/ui/models/containers_model.cpp
+++ b/client/ui/models/containers_model.cpp
@@ -25,10 +25,10 @@ bool ContainersModel::setData(const QModelIndex &index, const QVariant &value, i
             //        return ContainerProps::containerHumanNames().value(container);
         case DescRole:
             //        return ContainerProps::containerDescriptions().value(container);
-        case ConfigRole:
-            m_settings->setContainerConfig(m_currentlyProcessedServerIndex,
-                                           container,
-                                           value.toJsonObject());
+        case ConfigRole: //todo save to model also
+        m_settings->setContainerConfig(m_currentlyProcessedServerIndex,
+                                       container,
+                                       value.toJsonObject());
         case ServiceTypeRole:
             //        return ContainerProps::containerService(container);
         case DockerContainerRole:
@@ -76,8 +76,8 @@ QVariant ContainersModel::data(const QModelIndex &index, int role) const
             return ContainerProps::easySetupDescription(container);
         case IsInstalledRole:
             return m_containers.contains(container);
-        case IsCurrentlyInstalledRole:
-            return container == static_cast<DockerContainer>(m_currentlyInstalledContainerIndex);
+        case IsCurrentlyProcessedRole:
+            return container == static_cast<DockerContainer>(m_currentlyProcessedContainerIndex);
         case IsDefaultRole:
             return container == m_defaultContainerIndex;
         case IsSupportedRole:
@@ -97,9 +97,9 @@ void ContainersModel::setCurrentlyProcessedServerIndex(int index)
     emit defaultContainerChanged();
 }
 
-void ContainersModel::setCurrentlyInstalledContainerIndex(int index)
+void ContainersModel::setCurrentlyProcessedContainerIndex(int index)
 {
-    m_currentlyInstalledContainerIndex = index;
+    m_currentlyProcessedContainerIndex = index;
 }
 
 DockerContainer ContainersModel::getDefaultContainer()
@@ -112,9 +112,9 @@ QString ContainersModel::getDefaultContainerName()
     return ContainerProps::containerHumanNames().value(m_defaultContainerIndex);
 }
 
-int ContainersModel::getCurrentlyInstalledContainerIndex()
+int ContainersModel::getCurrentlyProcessedContainerIndex()
 {
-    return m_currentlyInstalledContainerIndex;
+    return m_currentlyProcessedContainerIndex;
 }
 
 void ContainersModel::removeAllContainers()
@@ -153,7 +153,7 @@ QHash<int, QByteArray> ContainersModel::roleNames() const {
     roles[EasySetupDescriptionRole] = "easySetupDescription";
 
     roles[IsInstalledRole] = "isInstalled";
-    roles[IsCurrentlyInstalledRole] = "isCurrentlyInstalled";
+    roles[IsCurrentlyProcessedRole] = "isCurrentlyProcessed";
     roles[IsDefaultRole] = "isDefault";
     roles[IsSupportedRole] = "isSupported";
     return roles;
diff --git a/client/ui/models/containers_model.h b/client/ui/models/containers_model.h
index 5753a1dd..7bb58755 100644
--- a/client/ui/models/containers_model.h
+++ b/client/ui/models/containers_model.h
@@ -27,7 +27,7 @@ public:
         EasySetupDescriptionRole,
 
         IsInstalledRole,
-        IsCurrentlyInstalledRole,
+        IsCurrentlyProcessedRole,
         IsDefaultRole,
         IsSupportedRole
     };
@@ -45,8 +45,8 @@ public slots:
     QString getDefaultContainerName();
 
     void setCurrentlyProcessedServerIndex(int index);
-    void setCurrentlyInstalledContainerIndex(int index);
-    int getCurrentlyInstalledContainerIndex();
+    void setCurrentlyProcessedContainerIndex(int index);
+    int getCurrentlyProcessedContainerIndex();
 
     void removeAllContainers();
     void clearCachedProfiles();
@@ -59,7 +59,7 @@ private:
 
 
     int m_currentlyProcessedServerIndex;
-    int m_currentlyInstalledContainerIndex;
+    int m_currentlyProcessedContainerIndex;
     DockerContainer m_defaultContainerIndex;
 
     std::shared_ptr<Settings> m_settings;
diff --git a/client/ui/models/servers_model.cpp b/client/ui/models/servers_model.cpp
index bb08e88c..9ef87d37 100644
--- a/client/ui/models/servers_model.cpp
+++ b/client/ui/models/servers_model.cpp
@@ -75,6 +75,11 @@ void ServersModel::setCurrentlyProcessedServerIndex(int index)
     m_currenlyProcessedServerIndex = index;
 }
 
+int ServersModel::getCurrentlyProcessedServerIndex()
+{
+    return m_currenlyProcessedServerIndex;
+}
+
 bool ServersModel::isDefaultServerCurrentlyProcessed()
 {
     return m_defaultServerIndex == m_currenlyProcessedServerIndex;
diff --git a/client/ui/models/servers_model.h b/client/ui/models/servers_model.h
index 593babc3..6f55176e 100644
--- a/client/ui/models/servers_model.h
+++ b/client/ui/models/servers_model.h
@@ -37,6 +37,7 @@ public slots:
     const int getServersCount();
 
     void setCurrentlyProcessedServerIndex(int index);
+    int getCurrentlyProcessedServerIndex();
     ServerCredentials getCurrentlyProcessedServerCredentials();
 
     void addServer(const QJsonObject &server);
diff --git a/client/ui/qml/Components/HomeContainersListView.qml b/client/ui/qml/Components/HomeContainersListView.qml
index 926302c4..28f81b2e 100644
--- a/client/ui/qml/Components/HomeContainersListView.qml
+++ b/client/ui/qml/Components/HomeContainersListView.qml
@@ -59,7 +59,7 @@ ListView {
                         menuContent.currentIndex = index
                         containersDropDown.menuVisible = false
                     } else {
-                        ContainersModel.setCurrentlyInstalledContainerIndex(proxyContainersModel.mapToSource(index))
+                        ContainersModel.setCurrentlyProcessedContainerIndex(proxyContainersModel.mapToSource(index))
                         InstallController.setShouldCreateServer(false)
                         goToPage(PageEnum.PageSetupWizardProtocolSettings)
                         containersDropDown.menuVisible = false
diff --git a/client/ui/qml/Components/Protocols/OpenVpnSettings.qml b/client/ui/qml/Components/Protocols/OpenVpnSettings.qml
index 8c036fc0..5c574832 100644
--- a/client/ui/qml/Components/Protocols/OpenVpnSettings.qml
+++ b/client/ui/qml/Components/Protocols/OpenVpnSettings.qml
@@ -8,8 +8,12 @@ import "../../Components"
 
 Item {
     id: root
+    implicitHeight: col.implicitHeight
+    implicitWidth: col.implicitWidth
 
     ColumnLayout {
+        id: col
+
         anchors.fill: parent
 
         anchors.leftMargin: 16
@@ -51,13 +55,79 @@ Item {
         }
 
         DropDownType {
+            id: hash
             Layout.fillWidth: true
+            implicitHeight: 74
 
+            rootButtonBorderWidth: 0
+
+            descriptionText: qsTr("Hash")
+            headerText: qsTr("Hash")
+
+            listView: ListViewType {
+                rootWidth: root.width
+
+                model: ListModel {
+                    ListElement { name : qsTr("SHA512") }
+                    ListElement { name : qsTr("SHA384") }
+                    ListElement { name : qsTr("SHA256") }
+                    ListElement { name : qsTr("SHA3-512") }
+                    ListElement { name : qsTr("SHA3-384") }
+                    ListElement { name : qsTr("SHA3-256") }
+                    ListElement { name : qsTr("whirlpool") }
+                    ListElement { name : qsTr("BLAKE2b512") }
+                    ListElement { name : qsTr("BLAKE2s256") }
+                    ListElement { name : qsTr("SHA1") }
+                }
+                currentIndex: 0
+
+                clickedFunction: {
+                    hash.text = selectedText
+                    hash.menuVisible = false
+                }
+
+                Component.onCompleted: {
+                    hash.text = selectedText
+                }
+            }
         }
 
         DropDownType {
+            id: cipher
             Layout.fillWidth: true
+            implicitHeight: 74
 
+            rootButtonBorderWidth: 0
+
+            descriptionText: qsTr("Cipher")
+            headerText: qsTr("Cipher")
+
+            listView: ListViewType {
+                rootWidth: root.width
+
+                model: ListModel {
+                    ListElement { name : qsTr("AES-256-GCM") }
+                    ListElement { name : qsTr("AES-192-GCM") }
+                    ListElement { name : qsTr("AES-128-GCM") }
+                    ListElement { name : qsTr("AES-256-CBC") }
+                    ListElement { name : qsTr("AES-192-CBC") }
+                    ListElement { name : qsTr("AES-128-CBC") }
+                    ListElement { name : qsTr("ChaCha20-Poly1305") }
+                    ListElement { name : qsTr("ARIA-256-CBC") }
+                    ListElement { name : qsTr("CAMELLIA-256-CBC") }
+                    ListElement { name : qsTr("none") }
+                }
+                currentIndex: 0
+
+                clickedFunction: {
+                    cipher.text = selectedText
+                    cipher.menuVisible = false
+                }
+
+                Component.onCompleted: {
+                    cipher.text = selectedText
+                }
+            }
         }
 
         CheckBoxType {
diff --git a/client/ui/qml/Components/SettingsContainersListView.qml b/client/ui/qml/Components/SettingsContainersListView.qml
index d5664541..1b8ea40c 100644
--- a/client/ui/qml/Components/SettingsContainersListView.qml
+++ b/client/ui/qml/Components/SettingsContainersListView.qml
@@ -88,9 +88,10 @@ ListView {
 
             onClicked: {
                 if (isInstalled) {
+                    ContainersModel.setCurrentlyProcessedContainerIndex(root.model.mapToSource(index))
                     goToPage(PageEnum.PageSettingsServerProtocol)
                 } else {
-                    ContainersModel.setCurrentlyInstalledContainerIndex(root.model.mapToSource(index))
+                    ContainersModel.setCurrentlyProcessedContainerIndex(root.model.mapToSource(index))
                     InstallController.setShouldCreateServer(false)
                     goToPage(PageEnum.PageSetupWizardProtocolSettings)
                 }
diff --git a/client/ui/qml/Components/ShareConnectionDrawer.qml b/client/ui/qml/Components/ShareConnectionDrawer.qml
new file mode 100644
index 00000000..5c9ceee8
--- /dev/null
+++ b/client/ui/qml/Components/ShareConnectionDrawer.qml
@@ -0,0 +1,177 @@
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+import QtQuick.Dialogs
+
+import SortFilterProxyModel 0.2
+
+import PageEnum 1.0
+import ContainerProps 1.0
+
+import "./"
+import "../Controls2"
+import "../Controls2/TextTypes"
+
+DrawerType {
+    id: root
+
+    property var qrCodes: []
+    property alias configText: configContent.text
+    property alias headerText: header.headerText
+
+    width: parent.width
+    height: parent.height * 0.9
+
+    Item{
+        anchors.fill: parent
+
+        FlickableType {
+            anchors.top: parent.top
+            anchors.bottom: parent.bottom
+            contentHeight: content.height + 32
+
+            ColumnLayout {
+                id: content
+
+                anchors.top: parent.top
+                anchors.left: parent.left
+                anchors.right: parent.right
+
+                anchors.topMargin: 20
+                anchors.leftMargin: 16
+                anchors.rightMargin: 16
+
+                Header2Type {
+                    id: header
+                    Layout.fillWidth: true
+                }
+
+                BasicButtonType {
+                    Layout.fillWidth: true
+                    Layout.topMargin: 16
+
+                    text: qsTr("Save connection code")
+
+                    onClicked: {
+                        ExportController.saveFile()
+                    }
+                }
+
+                BasicButtonType {
+                    Layout.fillWidth: true
+                    Layout.topMargin: 8
+
+                    defaultColor: "transparent"
+                    hoveredColor: Qt.rgba(1, 1, 1, 0.08)
+                    pressedColor: Qt.rgba(1, 1, 1, 0.12)
+                    disabledColor: "#878B91"
+                    textColor: "#D7D8DB"
+                    borderWidth: 1
+
+                    text: qsTr("Copy")
+
+                    onClicked: {
+                        configContent.selectAll()
+                        configContent.copy()
+                        configContent.select(0, 0)
+                    }
+                }
+
+
+                BasicButtonType {
+                    Layout.fillWidth: true
+                    Layout.topMargin: 8
+
+                    defaultColor: "transparent"
+                    hoveredColor: Qt.rgba(1, 1, 1, 0.08)
+                    pressedColor: Qt.rgba(1, 1, 1, 0.12)
+                    disabledColor: "#878B91"
+                    textColor: "#D7D8DB"
+
+                    text: showContent ? qsTr("Collapse content") : qsTr("Show content")
+
+                    onClicked: {
+                        showContent = !showContent
+                    }
+                }
+
+                Rectangle {
+                    Layout.fillWidth: true
+                    Layout.preferredHeight: configContent.implicitHeight + configContent.anchors.topMargin + configContent.anchors.bottomMargin
+
+                    radius: 10
+                    color: "#2C2D30"
+
+                    visible: showContent
+
+                    height: 24
+
+                    TextField {
+                        id: configContent
+
+                        anchors.fill: parent
+                        anchors.margins: 16
+
+                        height: 24
+
+                        color: "#D7D8DB"
+
+                        font.pixelSize: 16
+                        font.weight: Font.Medium
+                        font.family: "PT Root UI VF"
+
+                        wrapMode: Text.Wrap
+
+                        enabled: false
+                        background: Rectangle {
+                            anchors.fill: parent
+                            color: "transparent"
+                        }
+                    }
+                }
+
+                Rectangle {
+                    Layout.fillWidth: true
+                    Layout.preferredHeight: width
+                    Layout.topMargin: 20
+
+                    color: "white"
+
+                    Image {
+                        anchors.fill: parent
+                        smooth: false
+
+                        Timer {
+                            property int idx: 0
+                            interval: 1000
+                            running: qrCodes.length > 0
+                            repeat: true
+                            onTriggered: {
+                                idx++
+                                if (idx >= qrCodes.length) {
+                                    idx = 0
+                                }
+                                parent.source = qrCodes[idx]
+                            }
+                        }
+
+                        Behavior on source {
+                            PropertyAnimation { duration: 200 }
+                        }
+
+                        visible: qrCodes.length > 0
+                    }
+                }
+
+                ParagraphTextType {
+                    Layout.fillWidth: true
+                    Layout.topMargin: 24
+                    Layout.bottomMargin: 32
+
+                    horizontalAlignment: Text.AlignHCenter
+                    text: qsTr("To read the QR code in the Amnezia app, select \"Add Server\" → \"I have connection details\"")
+                }
+            }
+        }
+    }
+}
diff --git a/client/ui/qml/Controls2/BackButtonType.qml b/client/ui/qml/Controls2/BackButtonType.qml
index 389191e8..0ccb7345 100644
--- a/client/ui/qml/Controls2/BackButtonType.qml
+++ b/client/ui/qml/Controls2/BackButtonType.qml
@@ -11,6 +11,8 @@ Item {
     implicitWidth: content.implicitWidth
     implicitHeight: content.implicitHeight
 
+    visible: backButtonImage !== ""
+
     RowLayout {
         id: content
 
diff --git a/client/ui/qml/Controls2/DropDownType.qml b/client/ui/qml/Controls2/DropDownType.qml
index 700d9981..6456bbad 100644
--- a/client/ui/qml/Controls2/DropDownType.qml
+++ b/client/ui/qml/Controls2/DropDownType.qml
@@ -19,11 +19,12 @@ Item {
     property string rootButtonImage: "qrc:/images/controls/chevron-down.svg"
     property string rootButtonImageColor: "#494B50"
     property string rootButtonDefaultColor: "#1C1D21"
-    property int rootButtonMaximumWidth
+    property int rootButtonMaximumWidth: 0
 
     property string rootButtonBorderColor: "#494B50"
     property int rootButtonBorderWidth: 1
 
+    property real drawerHeight: 0.9
     property Component listView
 
     property alias menuVisible: menu.visible
@@ -55,7 +56,9 @@ Item {
             Layout.leftMargin: 16
 
             LabelTextType {
-                horizontalAlignment: Text.AlignHCenter
+                Layout.fillWidth: true
+
+                horizontalAlignment: Text.AlignLeft
                 verticalAlignment: Text.AlignVCenter
 
                 visible: root.descriptionText !== ""
@@ -65,7 +68,9 @@ Item {
             }
 
             ButtonTextType {
-                horizontalAlignment: Text.AlignHCenter
+                Layout.fillWidth: true
+
+                horizontalAlignment: Text.AlignLeft
                 verticalAlignment: Text.AlignVCenter
 
                 Layout.maximumWidth: rootButtonMaximumWidth ? rootButtonMaximumWidth : implicitWidth
@@ -115,7 +120,7 @@ Item {
         id: menu
 
         width: parent.width
-        height: parent.height * 0.9
+        height: parent.height * drawerHeight
 
         ColumnLayout {
             id: header
diff --git a/client/ui/qml/Controls2/ListViewType.qml b/client/ui/qml/Controls2/ListViewType.qml
new file mode 100644
index 00000000..421b82a3
--- /dev/null
+++ b/client/ui/qml/Controls2/ListViewType.qml
@@ -0,0 +1,107 @@
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+
+import "TextTypes"
+
+ListView {
+    id: menuContent
+
+    property var rootWidth
+    property var selectedText
+    property string imageSource
+    property var clickedFunction
+    property bool dividerVisible: false
+
+    width: rootWidth
+    height: menuContent.contentItem.height
+
+    clip: true
+    interactive: false
+
+    ButtonGroup {
+        id: buttonGroup
+    }
+
+    delegate: Item {
+        implicitWidth: rootWidth
+        implicitHeight: content.implicitHeight
+
+        ColumnLayout {
+            id: content
+
+            anchors.fill: parent
+            spacing: 16
+
+            RadioButton {
+                id: radioButton
+
+                implicitWidth: parent.width
+                implicitHeight: radioButtonContent.implicitHeight
+
+                hoverEnabled: true
+
+                indicator: Rectangle {
+                    anchors.fill: parent
+                    color: radioButton.hovered ? "#2C2D30" : "#1C1D21"
+
+                    Behavior on color {
+                        PropertyAnimation { duration: 200 }
+                    }
+                }
+
+                RowLayout {
+                    id: radioButtonContent
+                    anchors.fill: parent
+
+                    anchors.rightMargin: 16
+                    anchors.leftMargin: 16
+
+                    z: 1
+
+                    ParagraphTextType {
+                        Layout.fillWidth: true
+                        Layout.topMargin: 20
+                        Layout.bottomMargin: 20
+
+                        text: name
+                    }
+
+                    Image {
+                        source: imageSource ? imageSource : "qrc:/images/controls/check.svg"
+                        visible: imageSource ? true : radioButton.checked
+
+                        width: 24
+                        height: 24
+
+                        Layout.rightMargin: 8
+                    }
+                }
+
+                ButtonGroup.group: buttonGroup
+                checked: menuContent.currentIndex === index
+
+                onClicked: {
+                    menuContent.currentIndex = index
+                    menuContent.selectedText = name
+                    if (clickedFunction && typeof clickedFunction === "function") {
+                        clickedFunction()
+                    }
+                }
+            }
+
+            DividerType {
+                Layout.fillWidth: true
+                Layout.bottomMargin: 16
+
+                visible: dividerVisible
+            }
+        }
+
+        Component.onCompleted: {
+            if (menuContent.currentIndex === index) {
+                menuContent.selectedText = name
+            }
+        }
+    }
+}
diff --git a/client/ui/qml/Controls2/VerticalRadioButton.qml b/client/ui/qml/Controls2/VerticalRadioButton.qml
index 50af3c79..7f2411fb 100644
--- a/client/ui/qml/Controls2/VerticalRadioButton.qml
+++ b/client/ui/qml/Controls2/VerticalRadioButton.qml
@@ -23,12 +23,6 @@ RadioButton {
     property string defaultBodredColor: "transparent"
     property int borderWidth: 0
 
-    property string defaultCircleBorderColor: "#878B91"
-    property string selectedCircleBorderColor: "#A85809"
-    property string pressedCircleBorderColor: Qt.rgba(251/255, 178/255, 106/255, 0.3)
-
-    property string defaultInnerCircleColor: "#FBB26A"
-
     property string imageSource
     property bool showImage
 
@@ -61,80 +55,38 @@ RadioButton {
         }
 
         Image {
-            source: imageSource
-            visible: showImage
+            source: {
+                if (showImage) {
+                    return imageSource
+                } else if (root.pressed) {
+                    return "qrc:/images/controls/radio-button-inner-circle-pressed.png"
+                } else if (root.checked) {
+                    return "qrc:/images/controls/radio-button-inner-circle.png"
+                }
+
+                return ""
+            }
 
             anchors.centerIn: parent
 
             width: 24
             height: 24
         }
-
-        Rectangle {
-            id: outerCircle
-
-            width: 24
-            height: 24
-            radius: 16
-
-            visible: !showImage
+        Image {
+            source: {
+                if (showImage) {
+                    return ""
+                } else if (root.pressed || root.checked) {
+                    return "qrc:/images/controls/radio-button-pressed.svg"
+                } else {
+                    return "qrc:/images/controls/radio-button.svg"
+                }
+            }
 
             anchors.centerIn: parent
 
-            color: "transparent"
-            border.color: {
-                if (root.enabled) {
-                    if (root.pressed) {
-                        return pressedCircleBorderColor
-                    } else if (root.checked) {
-                        return selectedCircleBorderColor
-                    }
-                }
-                return defaultCircleBorderColor
-            }
-
-            border.width: 1
-
-            Behavior on border.color {
-                PropertyAnimation { duration: 200 }
-            }
-
-            Rectangle {
-                id: innerCircle
-
-                width: 12
-                height: 12
-                radius: 16
-
-                anchors.centerIn: parent
-
-                color: "transparent"
-                border.color: defaultInnerCircleColor
-                border.width: {
-                    if (root.enabled) {
-                        if(root.checked) {
-                            return 6
-                        }
-                        return root.pressed ? 6 : 0
-                    } else {
-                        return 0
-                    }
-                }
-
-                Behavior on border.width {
-                    PropertyAnimation { duration: 200 }
-                }
-            }
-
-            DropShadow {
-                anchors.fill: innerCircle
-                horizontalOffset: 0
-                verticalOffset: 0
-                radius: 12
-                samples: 13
-                color: "#FBB26A"
-                source: innerCircle
-            }
+            width: 24
+            height: 24
         }
     }
 
diff --git a/client/ui/qml/Pages2/PageHome.qml b/client/ui/qml/Pages2/PageHome.qml
index 23ca9e01..780f3aef 100644
--- a/client/ui/qml/Pages2/PageHome.qml
+++ b/client/ui/qml/Pages2/PageHome.qml
@@ -111,7 +111,7 @@ PageType {
         id: menu
 
         width: parent.width
-        height: parent.height * 0.90
+        height: parent.height * 0.9
 
         ColumnLayout {
             id: serversMenuHeader
@@ -247,8 +247,8 @@ PageType {
 
                         ColumnLayout {
                             id: serverRadioButtonContent
-                            anchors.fill: parent
 
+                            anchors.fill: parent
                             anchors.rightMargin: 16
                             anchors.leftMargin: 16
 
diff --git a/client/ui/qml/Pages2/PageSettingsServerProtocol.qml b/client/ui/qml/Pages2/PageSettingsServerProtocol.qml
index 800041f0..498006df 100644
--- a/client/ui/qml/Pages2/PageSettingsServerProtocol.qml
+++ b/client/ui/qml/Pages2/PageSettingsServerProtocol.qml
@@ -18,7 +18,64 @@ import "../Components/Protocols"
 PageType {
     id: root
 
-    OpenVpnSettings {
+    FlickableType {
+        id: fl
         anchors.fill: parent
+        contentHeight: content.height + openVpnSettings.implicitHeight
+
+        Column {
+            id: content
+
+            anchors.top: parent.top
+            anchors.left: parent.left
+            anchors.right: parent.right
+
+            spacing: 16
+
+            ListView {
+                // todo change id naming
+                id: container
+                width: parent.width
+                height: container.contentItem.height
+                clip: true
+                interactive: false
+                model: SortFilterProxyModel {
+                    id: proxyContainersModel
+                    sourceModel: ContainersModel
+                    filters: [
+                        ValueFilter {
+                            roleName: "isCurrentlyProcessed"
+                            value: true
+                        }
+                    ]
+                }
+
+                delegate: Item {
+                    implicitWidth: container.width
+                    implicitHeight: delegateContent.implicitHeight
+
+                    ColumnLayout {
+                        id: delegateContent
+
+                        anchors.fill: parent
+                        anchors.rightMargin: 16
+                        anchors.leftMargin: 16
+
+                        HeaderType {
+                            Layout.fillWidth: true
+                            Layout.topMargin: 20
+
+                            headerText: name
+                        }
+                    }
+                }
+            }
+
+            OpenVpnSettings {
+                id: openVpnSettings
+
+                width: parent.width
+            }
+        }
     }
 }
diff --git a/client/ui/qml/Pages2/PageSetupWizardEasy.qml b/client/ui/qml/Pages2/PageSetupWizardEasy.qml
index 99f6ccfb..1836f892 100644
--- a/client/ui/qml/Pages2/PageSetupWizardEasy.qml
+++ b/client/ui/qml/Pages2/PageSetupWizardEasy.qml
@@ -134,7 +134,7 @@ PageType {
                 text: qsTr("Continue")
 
                 onClicked: function() {
-                    ContainersModel.setCurrentlyInstalledContainerIndex(containers.dockerContainer)
+                    ContainersModel.setCurrentlyProcessedContainerIndex(containers.dockerContainer)
                     goToPage(PageEnum.PageSetupWizardInstalling);
                     InstallController.install(containers.dockerContainer,
                                               containers.containerDefaultPort,
diff --git a/client/ui/qml/Pages2/PageSetupWizardInstalling.qml b/client/ui/qml/Pages2/PageSetupWizardInstalling.qml
index c18c4d27..9631e258 100644
--- a/client/ui/qml/Pages2/PageSetupWizardInstalling.qml
+++ b/client/ui/qml/Pages2/PageSetupWizardInstalling.qml
@@ -54,7 +54,7 @@ PageType {
         sourceModel: ContainersModel
         filters: [
             ValueFilter {
-                roleName: "isCurrentlyInstalled"
+                roleName: "isCurrentlyProcessed"
                 value: true
             }
         ]
diff --git a/client/ui/qml/Pages2/PageSetupWizardProtocolSettings.qml b/client/ui/qml/Pages2/PageSetupWizardProtocolSettings.qml
index 57fa497d..c0483df4 100644
--- a/client/ui/qml/Pages2/PageSetupWizardProtocolSettings.qml
+++ b/client/ui/qml/Pages2/PageSetupWizardProtocolSettings.qml
@@ -22,7 +22,7 @@ PageType {
         sourceModel: ContainersModel
         filters: [
             ValueFilter {
-                roleName: "isCurrentlyInstalled"
+                roleName: "isCurrentlyProcessed"
                 value: true
             }
         ]
diff --git a/client/ui/qml/Pages2/PageSetupWizardProtocols.qml b/client/ui/qml/Pages2/PageSetupWizardProtocols.qml
index 75b16afd..e2ae4a16 100644
--- a/client/ui/qml/Pages2/PageSetupWizardProtocols.qml
+++ b/client/ui/qml/Pages2/PageSetupWizardProtocols.qml
@@ -90,7 +90,7 @@ PageType {
                             buttonImage: "qrc:/images/controls/chevron-right.svg"
 
                             clickedFunction: function() {
-                                ContainersModel.setCurrentlyInstalledContainerIndex(proxyContainersModel.mapToSource(index))
+                                ContainersModel.setCurrentlyProcessedContainerIndex(proxyContainersModel.mapToSource(index))
                                 goToPage(PageEnum.PageSetupWizardProtocolSettings)
                             }
                         }
diff --git a/client/ui/qml/Pages2/PageShare.qml b/client/ui/qml/Pages2/PageShare.qml
index 5560aee7..a731e425 100644
--- a/client/ui/qml/Pages2/PageShare.qml
+++ b/client/ui/qml/Pages2/PageShare.qml
@@ -1,5 +1,330 @@
 import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+import QtQuick.Dialogs
 
-Item {
+import SortFilterProxyModel 0.2
 
+import PageEnum 1.0
+import ContainerProps 1.0
+
+import "./"
+import "../Controls2"
+import "../Controls2/TextTypes"
+import "../Components"
+
+PageType {
+    id: root
+
+    Connections {
+        target: ExportController
+
+        function onGenerateConfig(isFullAccess) {
+            if (isFullAccess) {
+                ExportController.generateFullAccessConfig()
+            } else {
+                ExportController.generateConnectionConfig()
+            }
+
+            shareConnectionDrawer.configText = ExportController.getAmneziaCode()
+            shareConnectionDrawer.qrCodes = ExportController.getQrCodes()
+        }
+    }
+
+    property bool showContent: false
+    property list<QtObject> connectionTypesModel: [
+        amneziaConnectionFormat
+    ]
+
+    QtObject {
+        id: amneziaConnectionFormat
+        property string name: qsTr("For the AmnesiaVPN app")
+        property var func: function() {
+            ExportController.generateConfig(false)
+        }
+    }
+    QtObject {
+        id: openVpnConnectionFormat
+        property string name: qsTr("OpenVpn native format")
+        property var func: function() {
+            console.log("Item 3 clicked")
+        }
+    }
+    QtObject {
+        id: wireGuardConnectionFormat
+        property string name: qsTr("WireGuard native format")
+        property var func: function() {
+            console.log("Item 3 clicked")
+        }
+    }
+
+    FlickableType {
+        anchors.top: root.top
+        anchors.bottom: root.bottom
+        contentHeight: content.height
+
+        ColumnLayout {
+            id: content
+
+            anchors.top: parent.top
+            anchors.left: parent.left
+            anchors.right: parent.right
+
+            anchors.rightMargin: 16
+            anchors.leftMargin: 16
+
+            HeaderType {
+                Layout.fillWidth: true
+                Layout.topMargin: 20
+
+                headerText: qsTr("VPN Access")
+            }
+
+            Rectangle {
+                id: accessTypeSelector
+
+                property int currentIndex
+
+                Layout.topMargin: 32
+
+                implicitWidth: accessTypeSelectorContent.implicitWidth
+                implicitHeight: accessTypeSelectorContent.implicitHeight
+
+                color: "#1C1D21"
+                radius: 16
+
+                RowLayout {
+                    id: accessTypeSelectorContent
+
+                    spacing: 0
+
+                    HorizontalRadioButton {
+                        checked: accessTypeSelector.currentIndex === 0
+
+                        implicitWidth: (root.width - 32) / 2
+                        text: qsTr("Connection")
+
+                        onClicked: {
+                            accessTypeSelector.currentIndex = 0
+                        }
+                    }
+
+                    HorizontalRadioButton {
+                        checked: root.currentIndex === 1
+
+                        implicitWidth: (root.width - 32) / 2
+                        text: qsTr("Full")
+
+                        onClicked: {
+                            accessTypeSelector.currentIndex = 1
+                        }
+                    }
+                }
+            }
+
+            ParagraphTextType {
+                Layout.fillWidth: true
+
+                text: qsTr("VPN access without the ability to manage the server")
+                color: "#878B91"
+            }
+
+            DropDownType {
+                id: serverSelector
+
+                Layout.fillWidth: true
+                Layout.topMargin: 24
+
+                implicitHeight: 74
+
+                rootButtonBorderWidth: 0
+                drawerHeight: 0.4375
+
+                descriptionText: qsTr("Server and service")
+                headerText: qsTr("Server")
+
+                listView: ListViewType {
+                    rootWidth: root.width
+                    dividerVisible: true
+
+                    imageSource: "qrc:/images/controls/chevron-right.svg"
+
+                    model: ServersModel
+                    currentIndex: ServersModel.getDefaultServerIndex()
+
+                    clickedFunction: function() {
+                        serverSelector.text = selectedText
+                        ContainersModel.setCurrentlyProcessedServerIndex(currentIndex)
+                        protocolSelector.visible = true
+                    }
+
+                    Component.onCompleted: {
+                        serverSelector.text = selectedText
+                        ContainersModel.setCurrentlyProcessedServerIndex(currentIndex)
+                    }
+                }
+
+                DrawerType {
+                    id: protocolSelector
+
+                    width: parent.width
+                    height: parent.height * 0.5
+
+                    ColumnLayout {
+                        id: header
+
+                        anchors.top: parent.top
+                        anchors.left: parent.left
+                        anchors.right: parent.right
+                        anchors.topMargin: 16
+                        anchors.leftMargin: 16
+                        anchors.rightMargin: 16
+
+                        BackButtonType {
+                            backButtonImage: "qrc:/images/controls/arrow-left.svg"
+                            backButtonFunction: function() {
+                                protocolSelector.visible = false
+                            }
+                        }
+                    }
+
+                    FlickableType {
+                        anchors.top: header.bottom
+                        anchors.topMargin: 16
+                        contentHeight: col.implicitHeight
+
+                        Column {
+                            id: col
+                            anchors.top: parent.top
+                            anchors.left: parent.left
+                            anchors.right: parent.right
+
+                            spacing: 16
+
+                            Header2TextType {
+                                anchors.left: parent.left
+                                anchors.right: parent.right
+                                anchors.leftMargin: 16
+                                anchors.rightMargin: 16
+
+                                text: qsTr("Protocols and services")
+                                wrapMode: Text.WordWrap
+                            }
+
+                            ListViewType {
+                                rootWidth: root.width
+                                dividerVisible: true
+
+                                imageSource: "qrc:/images/controls/chevron-right.svg"
+
+                                model: SortFilterProxyModel {
+                                    id: proxyContainersModel
+                                    sourceModel: ContainersModel
+                                    filters: [
+                                        ValueFilter {
+                                            roleName: "isInstalled"
+                                            value: true
+                                        }
+
+                                    ]
+                                }
+
+                                currentIndex: 0
+
+                                clickedFunction: function () {
+                                    serverSelector.text += ", " + selectedText
+                                    shareConnectionDrawer.headerText = qsTr("Connection to ") + serverSelector.text
+
+                                    protocolSelector.visible = false
+                                    serverSelector.menuVisible = false
+
+                                    fillConnectionTypeModel()
+                                }
+
+                                Component.onCompleted: {
+                                    serverSelector.text += ", " + selectedText
+                                    shareConnectionDrawer.headerText = qsTr("Connection to ") + serverSelector.text
+
+                                    fillConnectionTypeModel()
+                                }
+
+                                function fillConnectionTypeModel() {
+                                    connectionTypesModel = [amneziaConnectionFormat]
+
+                                    if (currentIndex === ContainerProps.containerFromString("OpenVpn")) {
+                                        connectionTypesModel.push(openVpnConnectionFormat)
+                                    } else if (currentIndex === ContainerProps.containerFromString("wireGuardConnectionType")) {
+                                        connectionTypesModel.push(amneziaConnectionFormat)
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+
+            DropDownType {
+                id: connectionTypeSelector
+
+                property int currentIndex
+
+                Layout.fillWidth: true
+                Layout.topMargin: 16
+
+                implicitHeight: 74
+
+                rootButtonBorderWidth: 0
+                drawerHeight: 0.4375
+
+                visible: accessTypeSelector.currentIndex === 0
+                enabled: connectionTypesModel.length > 1
+
+                descriptionText: qsTr("Connection format")
+                headerText: qsTr("Connection format")
+
+                listView: ListViewType {
+                    id: connectionTypeSelectorListView
+
+                    rootWidth: root.width
+                    dividerVisible: true
+
+                    imageSource: "qrc:/images/controls/chevron-right.svg"
+
+                    model: connectionTypesModel
+                    currentIndex: 0
+
+                    clickedFunction: function() {
+                        connectionTypeSelector.text = selectedText
+                        connectionTypeSelector.currentIndex = currentIndex
+                        connectionTypeSelector.menuVisible = false
+                    }
+
+                    Component.onCompleted: {
+                        connectionTypeSelector.text = selectedText
+                        connectionTypeSelector.currentIndex = currentIndex
+                    }
+                }
+            }
+
+            ShareConnectionDrawer {
+                id: shareConnectionDrawer
+            }
+
+            BasicButtonType {
+                Layout.fillWidth: true
+                Layout.topMargin: 32
+
+                text: qsTr("Share")
+
+                onClicked: {
+                    if (accessTypeSelector.currentIndex === 0) {
+                        connectionTypesModel[connectionTypeSelector.currentIndex].func()
+                    } else {
+                        ExportController.generateConfig(true)
+                    }
+                    shareConnectionDrawer.visible = true
+                }
+            }
+        }
+    }
 }
diff --git a/client/ui/qml/Pages2/PageStart.qml b/client/ui/qml/Pages2/PageStart.qml
index 16dd00d3..8b9cefa4 100644
--- a/client/ui/qml/Pages2/PageStart.qml
+++ b/client/ui/qml/Pages2/PageStart.qml
@@ -78,7 +78,9 @@ PageType {
         TabImageButtonType {
             isSelected: tabBar.currentIndex === 1
             image: "qrc:/images/controls/share-2.svg"
-            onClicked: {}
+            onClicked: {
+                tabBarStackView.goToTabBarPage(PageEnum.PageShare)
+            }
         }
         TabImageButtonType {
             isSelected: tabBar.currentIndex === 2

From 7b14ad9616f4437b4569c10659c07d634c500300 Mon Sep 17 00:00:00 2001
From: "vladimir.kuznetsov" <nethiuswork@gmail.com>
Date: Fri, 16 Jun 2023 13:43:55 +0900
Subject: [PATCH 032/278] added PageSettingsAbout, PageSettingsApplication,
 PageSettingsBackup, PageSettingsConnection, PageSettingsDns - added
 SettingsController

---
 client/amnezia_application.cpp                |   4 +
 client/amnezia_application.h                  |   2 +
 client/images/controls/delete.svg             |   5 +
 client/images/controls/github.svg             |   4 +
 client/images/controls/mail.svg               |   4 +
 client/images/controls/telegram.svg           |   3 +
 client/resources.qrc                          |   9 +
 client/ui/controllers/exportController.cpp    |  42 ++--
 client/ui/controllers/exportController.h      |  10 +
 client/ui/controllers/pageController.h        |   5 +
 client/ui/controllers/settingsController.cpp  | 113 ++++++++++
 client/ui/controllers/settingsController.h    |  56 +++++
 .../Components/Protocols/OpenVpnSettings.qml  |   4 -
 .../qml/Components/ShareConnectionDrawer.qml  |  14 +-
 client/ui/qml/Controls2/DropDownType.qml      |  44 +++-
 client/ui/qml/Controls2/ImageButtonType.qml   |   9 +-
 client/ui/qml/Controls2/SwitcherType.qml      |  37 +++-
 client/ui/qml/Pages2/PageHome.qml             |   4 +-
 client/ui/qml/Pages2/PageSettings.qml         |   4 +
 client/ui/qml/Pages2/PageSettingsAbout.qml    | 207 ++++++++++++++++++
 .../ui/qml/Pages2/PageSettingsApplication.qml |  74 +++++++
 client/ui/qml/Pages2/PageSettingsBackup.qml   | 184 ++++++++++++++++
 .../ui/qml/Pages2/PageSettingsConnection.qml  | 107 +++++++++
 client/ui/qml/Pages2/PageSettingsDns.qml      |  87 ++++++++
 client/ui/qml/Pages2/PageShare.qml            |  10 +-
 client/utilities.cpp                          |  54 +++++
 client/utilities.h                            |  15 +-
 service/server/CMakeLists.txt                 |   6 +-
 28 files changed, 1054 insertions(+), 63 deletions(-)
 create mode 100644 client/images/controls/delete.svg
 create mode 100644 client/images/controls/github.svg
 create mode 100644 client/images/controls/mail.svg
 create mode 100644 client/images/controls/telegram.svg
 create mode 100644 client/ui/controllers/settingsController.cpp
 create mode 100644 client/ui/controllers/settingsController.h
 create mode 100644 client/ui/qml/Pages2/PageSettingsAbout.qml
 create mode 100644 client/ui/qml/Pages2/PageSettingsApplication.qml
 create mode 100644 client/ui/qml/Pages2/PageSettingsBackup.qml
 create mode 100644 client/ui/qml/Pages2/PageSettingsConnection.qml
 create mode 100644 client/ui/qml/Pages2/PageSettingsDns.qml

diff --git a/client/amnezia_application.cpp b/client/amnezia_application.cpp
index 598645d8..b9aa0f74 100644
--- a/client/amnezia_application.cpp
+++ b/client/amnezia_application.cpp
@@ -98,6 +98,10 @@ void AmneziaApplication::init()
         new ExportController(m_serversModel, m_containersModel, m_settings, m_configurator));
     m_engine->rootContext()->setContextProperty("ExportController", m_exportController.get());
 
+    m_settingsController.reset(
+        new SettingsController(m_serversModel, m_containersModel, m_settings));
+    m_engine->rootContext()->setContextProperty("SettingsController", m_settingsController.get());
+
     //
 
     m_engine->load(url);
diff --git a/client/amnezia_application.h b/client/amnezia_application.h
index 510f580f..893511b6 100644
--- a/client/amnezia_application.h
+++ b/client/amnezia_application.h
@@ -18,6 +18,7 @@
 #include "ui/controllers/importController.h"
 #include "ui/controllers/installController.h"
 #include "ui/controllers/pageController.h"
+#include "ui/controllers/settingsController.h"
 #include "ui/models/containers_model.h"
 #include "ui/models/servers_model.h"
 
@@ -73,6 +74,7 @@ private:
     QScopedPointer<InstallController> m_installController;
     QScopedPointer<ImportController> m_importController;
     QScopedPointer<ExportController> m_exportController;
+    QScopedPointer<SettingsController> m_settingsController;
 };
 
 #endif // AMNEZIA_APPLICATION_H
diff --git a/client/images/controls/delete.svg b/client/images/controls/delete.svg
new file mode 100644
index 00000000..78ef3eea
--- /dev/null
+++ b/client/images/controls/delete.svg
@@ -0,0 +1,5 @@
+<svg width="25" height="24" viewBox="0 0 25 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M20.332 5H9.33203L2.33203 12L9.33203 19H20.332C20.8625 19 21.3712 18.7893 21.7462 18.4142C22.1213 18.0391 22.332 17.5304 22.332 17V7C22.332 6.46957 22.1213 5.96086 21.7462 5.58579C21.3712 5.21071 20.8625 5 20.332 5V5Z" stroke="#D7D8DB" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M18.332 9L12.332 15" stroke="#D7D8DB" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M12.332 9L18.332 15" stroke="#D7D8DB" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/client/images/controls/github.svg b/client/images/controls/github.svg
new file mode 100644
index 00000000..7b1f250a
--- /dev/null
+++ b/client/images/controls/github.svg
@@ -0,0 +1,4 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M15 22V18C15.1392 16.7473 14.78 15.4901 14 14.5C17 14.5 20 12.5 20 9C20.08 7.75 19.73 6.52 19 5.5C19.28 4.35 19.28 3.15 19 2C19 2 18 2 16 3.5C13.36 3 10.64 3 8.00004 3.5C6.00004 2 5.00004 2 5.00004 2C4.70004 3.15 4.70004 4.35 5.00004 5.5C4.27191 6.51588 3.91851 7.75279 4.00004 9C4.00004 12.5 7.00004 14.5 10 14.5C9.61004 14.99 9.32004 15.55 9.15004 16.15C8.98004 16.75 8.93004 17.38 9.00004 18V22" stroke="#CBCBCB" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M9 18C4.49 20 4 16 2 16" stroke="#CBCBCB" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/client/images/controls/mail.svg b/client/images/controls/mail.svg
new file mode 100644
index 00000000..1debe4f1
--- /dev/null
+++ b/client/images/controls/mail.svg
@@ -0,0 +1,4 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M20 4H4C2.89543 4 2 4.89543 2 6V18C2 19.1046 2.89543 20 4 20H20C21.1046 20 22 19.1046 22 18V6C22 4.89543 21.1046 4 20 4Z" stroke="#CBCBCB" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M22 7L13.03 12.7C12.7213 12.8934 12.3643 12.996 12 12.996C11.6357 12.996 11.2787 12.8934 10.97 12.7L2 7" stroke="#CBCBCB" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/client/images/controls/telegram.svg b/client/images/controls/telegram.svg
new file mode 100644
index 00000000..7b76e506
--- /dev/null
+++ b/client/images/controls/telegram.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M11.944 3.26667e-05C8.77112 0.0148396 5.73324 1.28566 3.4949 3.53449C1.25656 5.78332 -3.4549e-05 8.82711 7.12435e-10 12C7.12441e-10 15.1826 1.26428 18.2349 3.51472 20.4853C5.76515 22.7358 8.8174 24 12 24C15.1826 24 18.2348 22.7358 20.4853 20.4853C22.7357 18.2349 24 15.1826 24 12C24 8.81743 22.7357 5.76519 20.4853 3.51475C18.2348 1.26431 15.1826 3.26667e-05 12 3.26667e-05C11.9813 -1.08889e-05 11.9627 -1.08889e-05 11.944 3.26667e-05ZM16.906 7.22403C17.006 7.22203 17.227 7.24703 17.371 7.36403C17.4667 7.44713 17.5277 7.56311 17.542 7.68903C17.558 7.78203 17.578 7.99503 17.562 8.16103C17.382 10.059 16.6 14.663 16.202 16.788C16.034 17.688 15.703 17.989 15.382 18.018C14.686 18.083 14.157 17.558 13.482 17.116C12.426 16.423 11.829 15.992 10.804 15.316C9.619 14.536 10.387 14.106 11.062 13.406C11.239 13.222 14.309 10.429 14.369 10.176C14.376 10.144 14.383 10.026 14.313 9.96403C14.243 9.90203 14.139 9.92303 14.064 9.94003C13.958 9.96403 12.271 11.08 9.003 13.285C8.523 13.615 8.09 13.775 7.701 13.765C7.273 13.757 6.449 13.524 5.836 13.325C5.084 13.08 4.487 12.951 4.539 12.536C4.566 12.32 4.864 12.099 5.432 11.873C8.93 10.349 11.262 9.34403 12.43 8.85903C15.762 7.47303 16.455 7.23203 16.906 7.22403Z" fill="#D7D8DB"/>
+</svg>
diff --git a/client/resources.qrc b/client/resources.qrc
index d60acfdd..a8f8718e 100644
--- a/client/resources.qrc
+++ b/client/resources.qrc
@@ -259,5 +259,14 @@
         <file>images/controls/radio-button-pressed.svg</file>
         <file>images/controls/radio-button-inner-circle-pressed.png</file>
         <file>ui/qml/Components/ShareConnectionDrawer.qml</file>
+        <file>ui/qml/Pages2/PageSettingsConnection.qml</file>
+        <file>ui/qml/Pages2/PageSettingsDns.qml</file>
+        <file>ui/qml/Pages2/PageSettingsApplication.qml</file>
+        <file>ui/qml/Pages2/PageSettingsBackup.qml</file>
+        <file>images/controls/delete.svg</file>
+        <file>ui/qml/Pages2/PageSettingsAbout.qml</file>
+        <file>images/controls/github.svg</file>
+        <file>images/controls/mail.svg</file>
+        <file>images/controls/telegram.svg</file>
     </qresource>
 </RCC>
diff --git a/client/ui/controllers/exportController.cpp b/client/ui/controllers/exportController.cpp
index 9ff73f33..98cbebd1 100644
--- a/client/ui/controllers/exportController.cpp
+++ b/client/ui/controllers/exportController.cpp
@@ -11,6 +11,8 @@
 
 #include "qrcodegen.hpp"
 
+#include "core/errorstrings.h"
+
 ExportController::ExportController(const QSharedPointer<ServersModel> &serversModel,
                                    const QSharedPointer<ContainersModel> &containersModel,
                                    const std::shared_ptr<Settings> &settings,
@@ -35,6 +37,7 @@ void ExportController::generateFullAccessConfig()
                                                                | QByteArray::OmitTrailingEquals)));
 
     m_qrCodes = generateQrCodeImageSeries(compressedConfig);
+    emit exportConfigChanged();
 }
 
 void ExportController::generateConnectionConfig()
@@ -49,25 +52,25 @@ void ExportController::generateConnectionConfig()
         m_containersModel->data(containerModelIndex, ContainersModel::Roles::ConfigRole));
     containerConfig.insert(config_key::container, ContainerProps::containerToString(container));
 
-    ErrorCode e = ErrorCode::NoError;
-    for (Proto p : ContainerProps::protocolsForContainer(container)) {
-        QJsonObject protoConfig = m_settings->protocolConfig(serverIndex, container, p);
+    ErrorCode errorCode = ErrorCode::NoError;
+    for (Proto protocol : ContainerProps::protocolsForContainer(container)) {
+        QJsonObject protocolConfig = m_settings->protocolConfig(serverIndex, container, protocol);
 
-        QString cfg = m_configurator->genVpnProtocolConfig(credentials,
-                                                           container,
-                                                           containerConfig,
-                                                           p,
-                                                           &e);
-        if (e) {
-            cfg = "Error generating config";
-            break;
+        QString vpnConfig = m_configurator->genVpnProtocolConfig(credentials,
+                                                                 container,
+                                                                 containerConfig,
+                                                                 protocol,
+                                                                 &errorCode);
+        if (errorCode) {
+            emit exportErrorOccurred(errorString(errorCode));
+            return;
         }
-        protoConfig.insert(config_key::last_config, cfg);
-        containerConfig.insert(ProtocolProps::protoToString(p), protoConfig);
+        protocolConfig.insert(config_key::last_config, vpnConfig);
+        containerConfig.insert(ProtocolProps::protoToString(protocol), protocolConfig);
     }
 
     QJsonObject config = m_settings->server(serverIndex);
-    if (!e) {
+    if (!errorCode) {
         config.remove(config_key::userName);
         config.remove(config_key::password);
         config.remove(config_key::port);
@@ -77,11 +80,8 @@ void ExportController::generateConnectionConfig()
         auto dns = m_configurator->getDnsForConfig(serverIndex);
         config.insert(config_key::dns1, dns.first);
         config.insert(config_key::dns2, dns.second);
+    }
 
-    } /*else {
-        set_textEditShareAmneziaCodeText(tr("Error while generating connection profile"));
-        return;
-    }*/
     QByteArray compressedConfig = QJsonDocument(config).toJson();
     compressedConfig = qCompress(compressedConfig, 8);
     m_amneziaCode = QString("vpn://%1")
@@ -89,6 +89,7 @@ void ExportController::generateConnectionConfig()
                                                                | QByteArray::OmitTrailingEquals)));
 
     m_qrCodes = generateQrCodeImageSeries(compressedConfig);
+    emit exportConfigChanged();
 }
 
 QString ExportController::getAmneziaCode()
@@ -154,3 +155,8 @@ QString ExportController::svgToBase64(const QString &image)
 {
     return "data:image/svg;base64," + QString::fromLatin1(image.toUtf8().toBase64().data());
 }
+
+int ExportController::getQrCodesCount()
+{
+    return m_qrCodes.size();
+}
diff --git a/client/ui/controllers/exportController.h b/client/ui/controllers/exportController.h
index c5054143..63997efd 100644
--- a/client/ui/controllers/exportController.h
+++ b/client/ui/controllers/exportController.h
@@ -17,9 +17,14 @@ public:
                               const std::shared_ptr<VpnConfigurator> &configurator,
                               QObject *parent = nullptr);
 
+    Q_PROPERTY(QList<QString> qrCodes READ getQrCodes NOTIFY exportConfigChanged)
+    Q_PROPERTY(int qrCodesCount READ getQrCodesCount NOTIFY exportConfigChanged)
+    Q_PROPERTY(QString amneziaCode READ getAmneziaCode NOTIFY exportConfigChanged)
+
 public slots:
     void generateFullAccessConfig();
     void generateConnectionConfig();
+
     QString getAmneziaCode();
     QList<QString> getQrCodes();
 
@@ -27,11 +32,16 @@ public slots:
 
 signals:
     void generateConfig(bool isFullAccess);
+    void exportErrorOccurred(QString errorMessage);
+
+    void exportConfigChanged();
 
 private:
     QList<QString> generateQrCodeImageSeries(const QByteArray &data);
     QString svgToBase64(const QString &image);
 
+    int getQrCodesCount();
+
     QSharedPointer<ServersModel> m_serversModel;
     QSharedPointer<ContainersModel> m_containersModel;
     std::shared_ptr<Settings> m_settings;
diff --git a/client/ui/controllers/pageController.h b/client/ui/controllers/pageController.h
index dcf2fc66..587e0e38 100644
--- a/client/ui/controllers/pageController.h
+++ b/client/ui/controllers/pageController.h
@@ -22,6 +22,11 @@ namespace PageLoader
         PageSettingsServerProtocols,
         PageSettingsServerServices,
         PageSettingsServerProtocol,
+        PageSettingsConnection,
+        PageSettingsDns,
+        PageSettingsApplication,
+        PageSettingsBackup,
+        PageSettingsAbout,
 
         PageSetupWizardStart,
         PageSetupWizardCredentials,
diff --git a/client/ui/controllers/settingsController.cpp b/client/ui/controllers/settingsController.cpp
new file mode 100644
index 00000000..b86b1cff
--- /dev/null
+++ b/client/ui/controllers/settingsController.cpp
@@ -0,0 +1,113 @@
+#include "settingsController.h"
+
+#include <QStandardPaths>
+
+#include "defines.h"
+#include "logger.h"
+#include "utilities.h"
+
+SettingsController::SettingsController(const QSharedPointer<ServersModel> &serversModel,
+                                       const QSharedPointer<ContainersModel> &containersModel,
+                                       const std::shared_ptr<Settings> &settings,
+                                       QObject *parent)
+    : QObject(parent)
+    , m_serversModel(serversModel)
+    , m_containersModel(containersModel)
+    , m_settings(settings)
+{
+    m_appVersion = QString("%1: %2 (%3)")
+                       .arg(tr("Software version"), QString(APP_MAJOR_VERSION), __DATE__);
+}
+
+void SettingsController::setAmneziaDns(bool enable)
+{
+    m_settings->setUseAmneziaDns(enable);
+}
+
+bool SettingsController::isAmneziaDnsEnabled()
+{
+    return m_settings->useAmneziaDns();
+}
+
+QString SettingsController::getPrimaryDns()
+{
+    return m_settings->primaryDns();
+}
+
+void SettingsController::setPrimaryDns(const QString &dns)
+{
+    m_settings->setPrimaryDns(dns);
+    emit primaryDnsChanged();
+}
+
+QString SettingsController::getSecondaryDns()
+{
+    return m_settings->secondaryDns();
+}
+
+void SettingsController::setSecondaryDns(const QString &dns)
+{
+    return m_settings->setSecondaryDns(dns);
+    emit secondaryDnsChanged();
+}
+
+bool SettingsController::isSaveLogsEnabled()
+{
+    return m_settings->isSaveLogs();
+}
+
+void SettingsController::setSaveLogs(bool enable)
+{
+    m_settings->setSaveLogs(enable);
+}
+
+void SettingsController::openLogsFolder()
+{
+    Logger::openLogsFolder();
+}
+
+void SettingsController::exportLogsFile()
+{
+    Utils::saveFile(".log", tr("Save log"), "AmneziaVPN", Logger::getLogFile());
+}
+
+void SettingsController::clearLogs()
+{
+    Logger::clearLogs();
+    Logger::clearServiceLogs();
+}
+
+void SettingsController::backupAppConfig()
+{
+    Utils::saveFile(".backup",
+                    tr("Backup application config"),
+                    "AmneziaVPN",
+                    m_settings->backupAppConfig());
+}
+
+void SettingsController::restoreAppConfig()
+{
+    QString fileName = Utils::getFileName(Q_NULLPTR,
+                                          tr("Open backup"),
+                                          QStandardPaths::writableLocation(
+                                              QStandardPaths::DocumentsLocation),
+                                          "*.backup");
+
+    //todo error processing
+    if (fileName.isEmpty())
+        return;
+
+    QFile file(fileName);
+    file.open(QIODevice::ReadOnly);
+    QByteArray data = file.readAll();
+
+    bool ok = m_settings->restoreAppConfig(data);
+    if (ok) {
+        //        emit uiLogic()->showWarningMessage(tr("Can't import config, file is corrupted."));
+    }
+}
+
+QString SettingsController::getAppVersion()
+{
+    return m_appVersion;
+}
diff --git a/client/ui/controllers/settingsController.h b/client/ui/controllers/settingsController.h
new file mode 100644
index 00000000..77de424c
--- /dev/null
+++ b/client/ui/controllers/settingsController.h
@@ -0,0 +1,56 @@
+#ifndef SETTINGSCONTROLLER_H
+#define SETTINGSCONTROLLER_H
+
+#include <QObject>
+
+#include "ui/models/containers_model.h"
+#include "ui/models/servers_model.h"
+
+class SettingsController : public QObject
+{
+    Q_OBJECT
+public:
+    explicit SettingsController(const QSharedPointer<ServersModel> &serversModel,
+                                const QSharedPointer<ContainersModel> &containersModel,
+                                const std::shared_ptr<Settings> &settings,
+                                QObject *parent = nullptr);
+
+    Q_PROPERTY(QString primaryDns READ getPrimaryDns WRITE setPrimaryDns NOTIFY primaryDnsChanged)
+    Q_PROPERTY(
+        QString secondaryDns READ getSecondaryDns WRITE setSecondaryDns NOTIFY secondaryDnsChanged)
+
+public slots:
+    void setAmneziaDns(bool enable);
+    bool isAmneziaDnsEnabled();
+
+    QString getPrimaryDns();
+    void setPrimaryDns(const QString &dns);
+
+    QString getSecondaryDns();
+    void setSecondaryDns(const QString &dns);
+
+    bool isSaveLogsEnabled();
+    void setSaveLogs(bool enable);
+
+    void openLogsFolder();
+    void exportLogsFile();
+    void clearLogs();
+
+    void backupAppConfig();
+    void restoreAppConfig();
+
+    QString getAppVersion();
+
+signals:
+    void primaryDnsChanged();
+    void secondaryDnsChanged();
+
+private:
+    QSharedPointer<ServersModel> m_serversModel;
+    QSharedPointer<ContainersModel> m_containersModel;
+    std::shared_ptr<Settings> m_settings;
+
+    QString m_appVersion;
+};
+
+#endif // SETTINGSCONTROLLER_H
diff --git a/client/ui/qml/Components/Protocols/OpenVpnSettings.qml b/client/ui/qml/Components/Protocols/OpenVpnSettings.qml
index 5c574832..f937dcfc 100644
--- a/client/ui/qml/Components/Protocols/OpenVpnSettings.qml
+++ b/client/ui/qml/Components/Protocols/OpenVpnSettings.qml
@@ -59,8 +59,6 @@ Item {
             Layout.fillWidth: true
             implicitHeight: 74
 
-            rootButtonBorderWidth: 0
-
             descriptionText: qsTr("Hash")
             headerText: qsTr("Hash")
 
@@ -97,8 +95,6 @@ Item {
             Layout.fillWidth: true
             implicitHeight: 74
 
-            rootButtonBorderWidth: 0
-
             descriptionText: qsTr("Cipher")
             headerText: qsTr("Cipher")
 
diff --git a/client/ui/qml/Components/ShareConnectionDrawer.qml b/client/ui/qml/Components/ShareConnectionDrawer.qml
index 5c9ceee8..1b92c752 100644
--- a/client/ui/qml/Components/ShareConnectionDrawer.qml
+++ b/client/ui/qml/Components/ShareConnectionDrawer.qml
@@ -15,8 +15,6 @@ import "../Controls2/TextTypes"
 DrawerType {
     id: root
 
-    property var qrCodes: []
-    property alias configText: configContent.text
     property alias headerText: header.headerText
 
     width: parent.width
@@ -120,6 +118,8 @@ DrawerType {
                         font.weight: Font.Medium
                         font.family: "PT Root UI VF"
 
+                        text: ExportController.amneziaCode
+
                         wrapMode: Text.Wrap
 
                         enabled: false
@@ -135,6 +135,8 @@ DrawerType {
                     Layout.preferredHeight: width
                     Layout.topMargin: 20
 
+                    visible: ExportController.qrCodesCount > 0
+
                     color: "white"
 
                     Image {
@@ -144,22 +146,20 @@ DrawerType {
                         Timer {
                             property int idx: 0
                             interval: 1000
-                            running: qrCodes.length > 0
+                            running: ExportController.qrCodesCount > 0
                             repeat: true
                             onTriggered: {
                                 idx++
-                                if (idx >= qrCodes.length) {
+                                if (idx >= ExportController.qrCodesCount) {
                                     idx = 0
                                 }
-                                parent.source = qrCodes[idx]
+                                parent.source = ExportController.qrCodes[idx]
                             }
                         }
 
                         Behavior on source {
                             PropertyAnimation { duration: 200 }
                         }
-
-                        visible: qrCodes.length > 0
                     }
                 }
 
diff --git a/client/ui/qml/Controls2/DropDownType.qml b/client/ui/qml/Controls2/DropDownType.qml
index 6456bbad..38cd0afa 100644
--- a/client/ui/qml/Controls2/DropDownType.qml
+++ b/client/ui/qml/Controls2/DropDownType.qml
@@ -15,13 +15,15 @@ Item {
     property string headerText
     property string headerBackButtonImage
 
-    property var onRootButtonClicked
+    property var rootButtonClickedFunction
     property string rootButtonImage: "qrc:/images/controls/chevron-down.svg"
-    property string rootButtonImageColor: "#494B50"
-    property string rootButtonDefaultColor: "#1C1D21"
+    property string rootButtonImageColor: "#D7D8DB"
+    property string rootButtonBackgroundColor: "#1C1D21"
     property int rootButtonMaximumWidth: 0
 
-    property string rootButtonBorderColor: "#494B50"
+    property string rootButtonHoveredBorderColor: "#494B50"
+    property string rootButtonDefaultBorderColor: "transparent"
+    property string rootButtonPressedBorderColor: "#D7D8DB"
     property int rootButtonBorderWidth: 1
 
     property real drawerHeight: 0.9
@@ -32,18 +34,31 @@ Item {
     implicitWidth: rootButtonContent.implicitWidth
     implicitHeight: rootButtonContent.implicitHeight
 
+    onMenuVisibleChanged: {
+        if (menuVisible) {
+            rootButtonBackground.border.color = rootButtonPressedBorderColor
+            rootButtonBackground.border.width = rootButtonBorderWidth
+        } else {
+            rootButtonBackground.border.color = rootButtonDefaultBorderColor
+            rootButtonBackground.border.width = 0
+        }
+    }
+
     Rectangle {
         id: rootButtonBackground
         anchors.fill: rootButtonContent
 
         radius: 16
-        color: rootButtonDefaultColor
-        border.color: rootButtonBorderColor
-        border.width: rootButtonBorderWidth
+        color: rootButtonBackgroundColor
+        border.color: rootButtonDefaultBorderColor
+        border.width: 0
 
         Behavior on border.width {
             PropertyAnimation { duration: 200 }
         }
+        Behavior on border.color {
+            PropertyAnimation { duration: 200 }
+        }
     }
 
     RowLayout {
@@ -83,7 +98,6 @@ Item {
             }
         }
 
-        //todo change to image type
         ImageButtonType {
             Layout.leftMargin: 4
             Layout.rightMargin: 16
@@ -100,16 +114,22 @@ Item {
         hoverEnabled: true
 
         onEntered: {
-            rootButtonBackground.border.width = rootButtonBorderWidth
+            if (menu.visible === false) {
+                rootButtonBackground.border.width = rootButtonBorderWidth
+                rootButtonBackground.border.color = rootButtonHoveredBorderColor
+            }
         }
 
         onExited: {
-            rootButtonBackground.border.width = 0
+            if (menu.visible === false) {
+                rootButtonBackground.border.width = 0
+                rootButtonBackground.border.color = rootButtonDefaultBorderColor
+            }
         }
 
         onClicked: {
-            if (onRootButtonClicked && typeof onRootButtonClicked === "function") {
-                onRootButtonClicked()
+            if (rootButtonClickedFunction && typeof rootButtonClickedFunction === "function") {
+                rootButtonClickedFunction()
             } else {
                 menu.visible = true
             }
diff --git a/client/ui/qml/Controls2/ImageButtonType.qml b/client/ui/qml/Controls2/ImageButtonType.qml
index 72c78342..843599a4 100644
--- a/client/ui/qml/Controls2/ImageButtonType.qml
+++ b/client/ui/qml/Controls2/ImageButtonType.qml
@@ -10,8 +10,10 @@ Button {
     property string hoveredColor: Qt.rgba(1, 1, 1, 0.08)
     property string defaultColor: "transparent"
     property string pressedColor: Qt.rgba(1, 1, 1, 0.12)
+    property string disableColor: "#2C2D30"
 
     property string imageColor: "#878B91"
+    property string disableImageColor: "#2C2D30"
 
     implicitWidth: 40
     implicitHeight: 40
@@ -19,7 +21,11 @@ Button {
     hoverEnabled: true
 
     icon.source: image
-    icon.color: imageColor
+    icon.color: root.enabled ? imageColor : disableImageColor
+
+    Behavior on icon.color {
+        PropertyAnimation { duration: 200 }
+    }
 
     background: Rectangle {
         id: background
@@ -33,6 +39,7 @@ Button {
                 }
                 return hovered ? hoveredColor : defaultColor
             }
+            return defaultColor
         }
         Behavior on color {
             PropertyAnimation { duration: 200 }
diff --git a/client/ui/qml/Controls2/SwitcherType.qml b/client/ui/qml/Controls2/SwitcherType.qml
index b593ece8..b63c64fb 100644
--- a/client/ui/qml/Controls2/SwitcherType.qml
+++ b/client/ui/qml/Controls2/SwitcherType.qml
@@ -2,9 +2,13 @@ import QtQuick
 import QtQuick.Controls
 import QtQuick.Layouts
 
+import "TextTypes"
+
 Switch {
     id: root
 
+    property alias descriptionText: description.text
+
     property string checkedIndicatorColor: "#412102"
     property string defaultIndicatorColor: "transparent"
     property string checkedIndicatorBorderColor: "#412102"
@@ -16,10 +20,18 @@ Switch {
     property string hoveredIndicatorBackgroundColor: Qt.rgba(1, 1, 1, 0.08)
     property string defaultIndicatorBackgroundColor: "transparent"
 
+    implicitWidth: content.implicitWidth + switcher.implicitWidth
+    implicitHeight: content.implicitHeight
+
     indicator: Rectangle {
+        id: switcher
+
+        anchors.left: content.right
+        anchors.verticalCenter: parent.verticalCenter
+
         implicitWidth: 52
         implicitHeight: 32
-        x: content.width - width
+
         radius: 16
         color: root.checked ? checkedIndicatorColor : defaultIndicatorColor
         border.color: root.checked ? checkedIndicatorBorderColor : defaultIndicatorBorderColor
@@ -62,16 +74,23 @@ Switch {
     contentItem: ColumnLayout {
         id: content
 
-        Text {
-            text: root.text
-            color: "#D7D8DB"
-            font.pixelSize: 18
-            font.weight: 400
-            font.family: "PT Root UI VF"
+        anchors.fill: parent
+        anchors.rightMargin: switcher.implicitWidth
 
-            height: 22
+        ListItemTitleType {
             Layout.fillWidth: true
-            Layout.bottomMargin: 16
+
+            text: root.text
+        }
+
+        CaptionTextType {
+            id: description
+
+            Layout.fillWidth: true
+
+            color: "#878B91"
+
+            visible: text !== ""
         }
     }
 
diff --git a/client/ui/qml/Pages2/PageHome.qml b/client/ui/qml/Pages2/PageHome.qml
index 780f3aef..9571b1fb 100644
--- a/client/ui/qml/Pages2/PageHome.qml
+++ b/client/ui/qml/Pages2/PageHome.qml
@@ -145,14 +145,14 @@ PageType {
                     rootButtonBorderWidth: 0
                     rootButtonImageColor: "#0E0E11"
                     rootButtonMaximumWidth: 150 //todo make it dynamic
-                    rootButtonDefaultColor: "#D7D8DB"
+                    rootButtonBackgroundColor: "#D7D8DB"
 
                     text: root.currentContainerName
                     textColor: "#0E0E11"
                     headerText: qsTr("Протокол подключения")
                     headerBackButtonImage: "qrc:/images/controls/arrow-left.svg"
 
-                    onRootButtonClicked: function() {
+                    rootButtonClickedFunction: function() {
                         ServersModel.setCurrentlyProcessedServerIndex(serversMenuContent.currentIndex)
                         ContainersModel.setCurrentlyProcessedServerIndex(serversMenuContent.currentIndex)
                         containersDropDown.menuVisible = true
diff --git a/client/ui/qml/Pages2/PageSettings.qml b/client/ui/qml/Pages2/PageSettings.qml
index 300421b7..a7472580 100644
--- a/client/ui/qml/Pages2/PageSettings.qml
+++ b/client/ui/qml/Pages2/PageSettings.qml
@@ -58,6 +58,7 @@ PageType {
                 iconImage: "qrc:/images/controls/radio.svg"
 
                 clickedFunction: function() {
+                    goToPage(PageEnum.PageSettingsConnection)
                 }
             }
 
@@ -71,6 +72,7 @@ PageType {
                 iconImage: "qrc:/images/controls/app.svg"
 
                 clickedFunction: function() {
+                    goToPage(PageEnum.PageSettingsApplication)
                 }
             }
 
@@ -84,6 +86,7 @@ PageType {
                 iconImage: "qrc:/images/controls/save.svg"
 
                 clickedFunction: function() {
+                    goToPage(PageEnum.PageSettingsBackup)
                 }
             }
 
@@ -97,6 +100,7 @@ PageType {
                 iconImage: "qrc:/images/controls/amnezia.svg"
 
                 clickedFunction: function() {
+                    goToPage(PageEnum.PageSettingsAbout)
                 }
             }
 
diff --git a/client/ui/qml/Pages2/PageSettingsAbout.qml b/client/ui/qml/Pages2/PageSettingsAbout.qml
new file mode 100644
index 00000000..88c927b9
--- /dev/null
+++ b/client/ui/qml/Pages2/PageSettingsAbout.qml
@@ -0,0 +1,207 @@
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+
+import PageEnum 1.0
+
+import "./"
+import "../Controls2"
+import "../Config"
+import "../Controls2/TextTypes"
+import "../Components"
+
+PageType {
+    id: root
+
+    BackButtonType {
+        id: backButton
+
+        anchors.top: parent.top
+        anchors.left: parent.left
+        anchors.right: parent.right
+        anchors.rightMargin: 16
+        anchors.leftMargin: 16
+        anchors.topMargin: 20
+    }
+
+    FlickableType {
+        id: fl
+        anchors.top: backButton.bottom
+        anchors.bottom: root.bottom
+        contentHeight: content.height
+
+        ColumnLayout {
+            id: content
+
+            anchors.top: parent.top
+            anchors.left: parent.left
+            anchors.right: parent.right
+
+            Image {
+                id: image
+                source: "qrc:/images/amneziaBigLogo.png"
+
+                Layout.alignment: Qt.AlignCenter
+                Layout.topMargin: 16
+                Layout.leftMargin: 16
+                Layout.rightMargin: 16
+                Layout.preferredWidth: 344
+                Layout.preferredHeight: 279
+            }
+
+            Header2TextType {
+                Layout.fillWidth: true
+                Layout.topMargin: 16
+                Layout.leftMargin: 16
+                Layout.rightMargin: 16
+
+                text: qsTr("Support the project with a donation")
+                horizontalAlignment: Text.AlignHCenter
+            }
+
+            ParagraphTextType {
+                Layout.fillWidth: true
+                Layout.topMargin: 16
+                Layout.leftMargin: 16
+                Layout.rightMargin: 16
+
+                horizontalAlignment: Text.AlignHCenter
+
+                height: 20
+                font.pixelSize: 14
+
+                text: qsTr("This is a free and open source application. If you like it, support the developers with a donation.
+And if you don't like the app, all the more support it - the donation will be used to improve the app.")
+                color: "#CCCAC8"
+            }
+
+            BasicButtonType {
+                Layout.fillWidth: true
+                Layout.topMargin: 24
+                Layout.leftMargin: 16
+                Layout.rightMargin: 16
+
+                text: qsTr("Card on Patreon")
+
+                onClicked: {
+                }
+            }
+
+            BasicButtonType {
+                Layout.fillWidth: true
+                Layout.topMargin: 8
+                Layout.leftMargin: 16
+                Layout.rightMargin: 16
+
+                defaultColor: "transparent"
+                hoveredColor: Qt.rgba(1, 1, 1, 0.08)
+                pressedColor: Qt.rgba(1, 1, 1, 0.12)
+                disabledColor: "#878B91"
+                textColor: "#D7D8DB"
+                borderWidth: 1
+
+                text: qsTr("Show other methods on Github")
+
+                onClicked: {
+                }
+            }
+
+            ParagraphTextType {
+                Layout.fillWidth: true
+                Layout.topMargin: 32
+                Layout.leftMargin: 16
+                Layout.rightMargin: 16
+
+                text: qsTr("Contacts")
+            }
+
+            LabelWithButtonType {
+                Layout.fillWidth: true
+                Layout.topMargin: 16
+
+                text: qsTr("Telegram group")
+                descriptionText: qsTr("To discuss features")
+                buttonImage: "qrc:/images/controls/chevron-right.svg"
+                iconImage: "qrc:/images/controls/telegram.svg"
+
+                clickedFunction: function() {
+                    goToPage(PageEnum.PageSettingsAbout)
+                }
+            }
+
+            DividerType {}
+
+            LabelWithButtonType {
+                Layout.fillWidth: true
+
+                text: qsTr("Mail")
+                descriptionText: qsTr("For reviews and bug reports")
+                buttonImage: "qrc:/images/controls/chevron-right.svg"
+                iconImage: "qrc:/images/controls/mail.svg"
+
+                clickedFunction: function() {
+                    goToPage(PageEnum.PageSettingsAbout)
+                }
+            }
+
+            DividerType {}
+
+            LabelWithButtonType {
+                Layout.fillWidth: true
+
+                text: qsTr("Github")
+                buttonImage: "qrc:/images/controls/chevron-right.svg"
+                iconImage: "qrc:/images/controls/github.svg"
+
+                clickedFunction: function() {
+                    goToPage(PageEnum.PageSettingsAbout)
+                }
+            }
+
+            DividerType {}
+
+            LabelWithButtonType {
+                Layout.fillWidth: true
+
+                text: qsTr("Website")
+                buttonImage: "qrc:/images/controls/chevron-right.svg"
+                iconImage: "qrc:/images/controls/amnezia.svg"
+
+                clickedFunction: function() {
+                    goToPage(PageEnum.PageSettingsAbout)
+                }
+            }
+
+            DividerType {}
+
+            CaptionTextType {
+                Layout.fillWidth: true
+                Layout.topMargin: 40
+
+                horizontalAlignment: Text.AlignHCenter
+
+                text: SettingsController.getAppVersion()
+                color: "#878B91"
+            }
+
+            BasicButtonType {
+                Layout.alignment: Qt.AlignHCenter
+                Layout.topMargin: 8
+                Layout.bottomMargin: 16
+                implicitHeight: 32
+
+                defaultColor: "transparent"
+                hoveredColor: Qt.rgba(1, 1, 1, 0.08)
+                pressedColor: Qt.rgba(1, 1, 1, 0.12)
+                disabledColor: "#878B91"
+                textColor: "#FBB26A"
+
+                text: qsTr("Check for updates")
+
+                onClicked: {
+                    Qt.openUrlExternally("https://github.com/amnezia-vpn/desktop-client/releases/latest")
+                }
+            }
+        }
+    }
+}
diff --git a/client/ui/qml/Pages2/PageSettingsApplication.qml b/client/ui/qml/Pages2/PageSettingsApplication.qml
new file mode 100644
index 00000000..9a6eab3c
--- /dev/null
+++ b/client/ui/qml/Pages2/PageSettingsApplication.qml
@@ -0,0 +1,74 @@
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+
+import PageEnum 1.0
+
+import "./"
+import "../Controls2"
+import "../Config"
+import "../Controls2/TextTypes"
+
+PageType {
+    id: root
+
+    BackButtonType {
+        id: backButton
+
+        anchors.top: parent.top
+        anchors.left: parent.left
+        anchors.right: parent.right
+        anchors.rightMargin: 16
+        anchors.leftMargin: 16
+        anchors.topMargin: 20
+    }
+
+    FlickableType {
+        id: fl
+        anchors.top: backButton.bottom
+        anchors.bottom: root.bottom
+        contentHeight: content.height
+
+        ColumnLayout {
+            id: content
+
+            anchors.top: parent.top
+            anchors.left: parent.left
+            anchors.right: parent.right
+            anchors.leftMargin: 16
+            anchors.rightMargin: 16
+
+            spacing: 16
+
+            HeaderType {
+                Layout.fillWidth: true
+
+                headerText: qsTr("Application")
+            }
+
+            LabelWithButtonType {
+                Layout.fillWidth: true
+
+                text: qsTr("Language")
+                buttonImage: "qrc:/images/controls/chevron-right.svg"
+
+                clickedFunction: function() {
+                }
+            }
+
+            DividerType {}
+
+            LabelWithButtonType {
+                Layout.fillWidth: true
+
+                text: qsTr("Reset settings and remove all data from the application")
+                buttonImage: "qrc:/images/controls/chevron-right.svg"
+
+                clickedFunction: function() {
+                }
+            }
+
+            DividerType {}
+        }
+    }
+}
diff --git a/client/ui/qml/Pages2/PageSettingsBackup.qml b/client/ui/qml/Pages2/PageSettingsBackup.qml
new file mode 100644
index 00000000..0cc62979
--- /dev/null
+++ b/client/ui/qml/Pages2/PageSettingsBackup.qml
@@ -0,0 +1,184 @@
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+
+import PageEnum 1.0
+
+import "./"
+import "../Controls2"
+import "../Config"
+import "../Controls2/TextTypes"
+
+PageType {
+    id: root
+
+    BackButtonType {
+        id: backButton
+
+        anchors.top: parent.top
+        anchors.left: parent.left
+        anchors.right: parent.right
+        anchors.rightMargin: 16
+        anchors.leftMargin: 16
+        anchors.topMargin: 20
+    }
+
+    FlickableType {
+        id: fl
+        anchors.top: backButton.bottom
+        anchors.bottom: root.bottom
+        contentHeight: content.height
+
+        ColumnLayout {
+            id: content
+
+            anchors.top: parent.top
+            anchors.left: parent.left
+            anchors.right: parent.right
+            anchors.leftMargin: 16
+            anchors.rightMargin: 16
+
+            spacing: 16
+
+            HeaderType {
+                Layout.fillWidth: true
+
+                headerText: qsTr("Backup")
+            }
+
+            SwitcherType {
+                Layout.fillWidth: true
+                Layout.topMargin: 16
+
+                text: qsTr("Save logs")
+
+                checked: SettingsController.isSaveLogsEnabled()
+                onCheckedChanged: {
+                    if (checked !== SettingsController.isSaveLogsEnabled()) {
+                        SettingsController.setSaveLogs(checked)
+                    }
+                }
+            }
+
+            RowLayout {
+                Layout.fillWidth: true
+
+                ColumnLayout {
+                    Layout.alignment: Qt.AlignBaseline
+                    Layout.preferredWidth: root.width / 3
+
+                    ImageButtonType {
+                        Layout.alignment: Qt.AlignHCenter
+
+                        implicitWidth: 56
+                        implicitHeight: 56
+
+                        image: "qrc:/images/controls/folder-open.svg"
+
+                        onClicked: SettingsController.openLogsFolder()
+                    }
+
+                    CaptionTextType {
+                        horizontalAlignment: Text.AlignHCenter
+                        Layout.fillWidth: true
+
+                        text: qsTr("Open folder with logs")
+                        color: "#D7D8DB"
+                    }
+                }
+
+                ColumnLayout {
+                    Layout.alignment: Qt.AlignBaseline
+                    Layout.preferredWidth: root.width / 3
+
+                    ImageButtonType {
+                        Layout.alignment: Qt.AlignHCenter
+
+                        implicitWidth: 56
+                        implicitHeight: 56
+
+                        image: "qrc:/images/controls/save.svg"
+
+                        onClicked: SettingsController.exportLogsFile()
+                    }
+
+                    CaptionTextType {
+                        horizontalAlignment: Text.AlignHCenter
+                        Layout.fillWidth: true
+
+                        text: qsTr("Save logs to file")
+                        color: "#D7D8DB"
+                    }
+                }
+
+                ColumnLayout {
+                    Layout.alignment: Qt.AlignBaseline
+                    Layout.preferredWidth: root.width / 3
+
+                    ImageButtonType {
+                        Layout.alignment: Qt.AlignHCenter
+
+                        implicitWidth: 56
+                        implicitHeight: 56
+
+                        image: "qrc:/images/controls/delete.svg"
+
+                        onClicked: SettingsController.clearLogs()
+                    }
+
+                    CaptionTextType {
+                        horizontalAlignment: Text.AlignHCenter
+                        Layout.fillWidth: true
+
+                        text: qsTr("Clear logs")
+                        color: "#D7D8DB"
+                    }
+                }
+            }
+
+            ListItemTitleType {
+                Layout.fillWidth: true
+                Layout.topMargin: 10
+
+                text: qsTr("Configuration backup")
+            }
+
+            CaptionTextType {
+                Layout.fillWidth: true
+                Layout.topMargin: -12
+
+                text: qsTr("It will help you instantly restore connection settings at the next installation")
+                color: "#878B91"
+            }
+
+            BasicButtonType {
+                Layout.fillWidth: true
+                Layout.topMargin: 14
+
+                text: qsTr("Make a backup")
+
+                onClicked: {
+                    SettingsController.backupAppConfig()
+                }
+            }
+
+            BasicButtonType {
+                Layout.fillWidth: true
+                Layout.topMargin: -8
+
+                defaultColor: "transparent"
+                hoveredColor: Qt.rgba(1, 1, 1, 0.08)
+                pressedColor: Qt.rgba(1, 1, 1, 0.12)
+                disabledColor: "#878B91"
+                textColor: "#D7D8DB"
+                borderWidth: 1
+
+                text: qsTr("Restore from backup")
+
+                onClicked: {
+                    SettingsController.restoreAppConfig()
+                }
+            }
+        }
+    }
+}
diff --git a/client/ui/qml/Pages2/PageSettingsConnection.qml b/client/ui/qml/Pages2/PageSettingsConnection.qml
new file mode 100644
index 00000000..fb0bb000
--- /dev/null
+++ b/client/ui/qml/Pages2/PageSettingsConnection.qml
@@ -0,0 +1,107 @@
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+
+import PageEnum 1.0
+
+import "./"
+import "../Controls2"
+import "../Config"
+
+PageType {
+    id: root
+
+    BackButtonType {
+        id: backButton
+
+        anchors.top: parent.top
+        anchors.left: parent.left
+        anchors.right: parent.right
+        anchors.rightMargin: 16
+        anchors.leftMargin: 16
+        anchors.topMargin: 20
+    }
+
+    FlickableType {
+        id: fl
+        anchors.top: backButton.bottom
+        anchors.bottom: root.bottom
+        contentHeight: content.height
+
+        ColumnLayout {
+            id: content
+
+            anchors.top: parent.top
+            anchors.left: parent.left
+            anchors.right: parent.right
+
+            spacing: 16
+
+            HeaderType {
+                Layout.fillWidth: true
+                Layout.leftMargin: 16
+                Layout.rightMargin: 16
+
+                headerText: qsTr("Connection")
+            }
+
+            SwitcherType {
+                Layout.fillWidth: true
+                Layout.leftMargin: 16
+                Layout.rightMargin: 16
+
+                text: qsTr("Use AmnesiaDNS if installed on the server")
+                descriptionText: qsTr("Internal IP address 172.29.172.254")
+
+                checked: SettingsController.isAmneziaDnsEnabled()
+                onCheckedChanged: {
+                    if (checked !== SettingsController.isAmneziaDnsEnabled()) {
+                        SettingsController.setAmneziaDns(checked)
+                    }
+                }
+            }
+
+            DividerType {}
+
+            LabelWithButtonType {
+                Layout.fillWidth: true
+
+                text: qsTr("DNS servers")
+                descriptionText: qsTr("If AmneziaDNS is not used or installed")
+                buttonImage: "qrc:/images/controls/chevron-right.svg"
+
+                clickedFunction: function() {
+                    goToPage(PageEnum.PageSettingsDns)
+                }
+            }
+
+            DividerType {}
+
+            LabelWithButtonType {
+                Layout.fillWidth: true
+
+                text: qsTr("Split site tunneling")
+                descriptionText: qsTr("Allows you to connect to some sites through a secure connection, and to others bypassing it")
+                buttonImage: "qrc:/images/controls/chevron-right.svg"
+
+                clickedFunction: function() {
+                }
+            }
+
+            DividerType {}
+
+            LabelWithButtonType {
+                Layout.fillWidth: true
+
+                text: qsTr("Separate application tunneling")
+                descriptionText: qsTr("Allows you to use the VPN only for certain applications")
+                buttonImage: "qrc:/images/controls/chevron-right.svg"
+
+                clickedFunction: function() {
+                }
+            }
+
+            DividerType {}
+        }
+    }
+}
diff --git a/client/ui/qml/Pages2/PageSettingsDns.qml b/client/ui/qml/Pages2/PageSettingsDns.qml
new file mode 100644
index 00000000..2a06438b
--- /dev/null
+++ b/client/ui/qml/Pages2/PageSettingsDns.qml
@@ -0,0 +1,87 @@
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+
+import PageEnum 1.0
+
+import "./"
+import "../Controls2"
+import "../Config"
+import "../Controls2/TextTypes"
+
+PageType {
+    id: root
+
+    BackButtonType {
+        id: backButton
+
+        anchors.top: parent.top
+        anchors.left: parent.left
+        anchors.right: parent.right
+        anchors.rightMargin: 16
+        anchors.leftMargin: 16
+        anchors.topMargin: 20
+    }
+
+    FlickableType {
+        id: fl
+        anchors.top: backButton.bottom
+        anchors.bottom: root.bottom
+        contentHeight: content.height
+
+        ColumnLayout {
+            id: content
+
+            anchors.top: parent.top
+            anchors.left: parent.left
+            anchors.right: parent.right
+            anchors.leftMargin: 16
+            anchors.rightMargin: 16
+
+            spacing: 16
+
+            HeaderType {
+                Layout.fillWidth: true
+
+                headerText: qsTr("DNS servers")
+            }
+
+            ParagraphTextType {
+                text: qsTr("If AmneziaDNS is not used or installed")
+            }
+
+            TextFieldWithHeaderType {
+                id: primaryDns
+
+                Layout.fillWidth: true
+                headerText: "Primary DNS"
+
+                textFieldText: SettingsController.primaryDns
+            }
+
+            TextFieldWithHeaderType {
+                id: secondaryDns
+
+                Layout.fillWidth: true
+                headerText: "Secondary DNS"
+
+                textFieldText: SettingsController.secondaryDns
+            }
+
+            BasicButtonType {
+                Layout.fillWidth: true
+
+                text: qsTr("Save")
+
+                onClicked: function() {
+                    if (primaryDns.textFieldText !== SettingsController.primaryDns) {
+                        SettingsController.primaryDns = primaryDns.textFieldText
+                    }
+                    if (secondaryDns.textFieldText !== SettingsController.secondaryDns) {
+                        SettingsController.secondaryDns = secondaryDns.textFieldText
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/client/ui/qml/Pages2/PageShare.qml b/client/ui/qml/Pages2/PageShare.qml
index a731e425..64641094 100644
--- a/client/ui/qml/Pages2/PageShare.qml
+++ b/client/ui/qml/Pages2/PageShare.qml
@@ -25,9 +25,6 @@ PageType {
             } else {
                 ExportController.generateConnectionConfig()
             }
-
-            shareConnectionDrawer.configText = ExportController.getAmneziaCode()
-            shareConnectionDrawer.qrCodes = ExportController.getQrCodes()
         }
     }
 
@@ -125,7 +122,8 @@ PageType {
             ParagraphTextType {
                 Layout.fillWidth: true
 
-                text: qsTr("VPN access without the ability to manage the server")
+                text: accessTypeSelector.currentIndex === 0 ? qsTr("VPN access without the ability to manage the server") :
+                                                              qsTr("Full access to server")
                 color: "#878B91"
             }
 
@@ -137,7 +135,6 @@ PageType {
 
                 implicitHeight: 74
 
-                rootButtonBorderWidth: 0
                 drawerHeight: 0.4375
 
                 descriptionText: qsTr("Server and service")
@@ -234,6 +231,7 @@ PageType {
                                 clickedFunction: function () {
                                     serverSelector.text += ", " + selectedText
                                     shareConnectionDrawer.headerText = qsTr("Connection to ") + serverSelector.text
+                                    ContainersModel.setCurrentlyProcessedContainerIndex(proxyContainersModel.mapToSource(currentIndex))
 
                                     protocolSelector.visible = false
                                     serverSelector.menuVisible = false
@@ -244,6 +242,7 @@ PageType {
                                 Component.onCompleted: {
                                     serverSelector.text += ", " + selectedText
                                     shareConnectionDrawer.headerText = qsTr("Connection to ") + serverSelector.text
+                                    ContainersModel.setCurrentlyProcessedContainerIndex(proxyContainersModel.mapToSource(currentIndex))
 
                                     fillConnectionTypeModel()
                                 }
@@ -273,7 +272,6 @@ PageType {
 
                 implicitHeight: 74
 
-                rootButtonBorderWidth: 0
                 drawerHeight: 0.4375
 
                 visible: accessTypeSelector.currentIndex === 0
diff --git a/client/utilities.cpp b/client/utilities.cpp
index 13e36c2f..bf06ddac 100644
--- a/client/utilities.cpp
+++ b/client/utilities.cpp
@@ -1,5 +1,6 @@
 #include <QCoreApplication>
 #include <QDebug>
+#include <QDesktopServices>
 #include <QDir>
 #include <QHostAddress>
 #include <QHostInfo>
@@ -7,6 +8,7 @@
 #include <QRandomGenerator>
 #include <QRegularExpression>
 #include <QStandardPaths>
+#include <QUrl>
 
 #include "defines.h"
 #include "utilities.h"
@@ -247,6 +249,58 @@ QString Utils::certUtilPath()
 #endif
 }
 
+void Utils::saveFile(const QString &fileExtension,
+                     const QString &caption,
+                     const QString &fileName,
+                     const QString &data)
+{
+    QString docDir = QStandardPaths::writableLocation(QStandardPaths::DocumentsLocation);
+    QUrl fileUrl = QFileDialog::getSaveFileUrl(nullptr,
+                                               caption,
+                                               QUrl::fromLocalFile(docDir + "/" + fileName),
+                                               "*" + fileExtension);
+    if (fileUrl.isEmpty())
+        return;
+    if (!fileUrl.toString().endsWith(fileExtension)) {
+        fileUrl = QUrl(fileUrl.toString() + fileExtension);
+    }
+    if (fileUrl.isEmpty())
+        return;
+
+    QFile save(fileUrl.toLocalFile());
+
+    //todo check if save successful
+    save.open(QIODevice::WriteOnly);
+    save.write(data.toUtf8());
+    save.close();
+
+    QFileInfo fi(fileUrl.toLocalFile());
+    QDesktopServices::openUrl(fi.absoluteDir().absolutePath());
+}
+
+QString Utils::getFileName(QWidget *parent,
+                           const QString &caption,
+                           const QString &dir,
+                           const QString &filter,
+                           QString *selectedFilter,
+                           QFileDialog::Options options)
+{
+    QString fileName
+        = QFileDialog::getOpenFileName(parent, caption, dir, filter, selectedFilter, options);
+
+#ifdef Q_OS_ANDROID
+    // patch for files containing spaces etc
+    const QString sep{"raw%3A%2F"};
+    if (fileName.startsWith("content://") && fileName.contains(sep)) {
+        QString contentUrl = fileName.split(sep).at(0);
+        QString rawUrl = fileName.split(sep).at(1);
+        rawUrl.replace(" ", "%20");
+        fileName = contentUrl + sep + rawUrl;
+    }
+#endif
+    return fileName;
+}
+
 #ifdef Q_OS_WIN
 // Inspired from http://stackoverflow.com/a/15281070/1529139
 // and http://stackoverflow.com/q/40059902/1529139
diff --git a/client/utilities.h b/client/utilities.h
index aeb06865..191fa5c1 100644
--- a/client/utilities.h
+++ b/client/utilities.h
@@ -1,9 +1,10 @@
 #ifndef UTILITIES_H
 #define UTILITIES_H
 
+#include <QFileDialog>
 #include <QRegExp>
-#include <QString>
 #include <QRegularExpression>
+#include <QString>
 
 #ifdef Q_OS_WIN
 #include "Windows.h"
@@ -50,6 +51,18 @@ public:
     static QString wireguardExecPath();
     static QString certUtilPath();
 
+    static void saveFile(const QString &fileExtension,
+                         const QString &caption,
+                         const QString &fileName,
+                         const QString &data);
+
+    static QString getFileName(QWidget *parent = nullptr,
+                               const QString &caption = QString(),
+                               const QString &dir = QString(),
+                               const QString &filter = QString(),
+                               QString *selectedFilter = nullptr,
+                               QFileDialog::Options options = QFileDialog::Options());
+
 #ifdef Q_OS_WIN
     static bool signalCtrl(DWORD dwProcessId, DWORD dwCtrlEvent);
 #endif
diff --git a/service/server/CMakeLists.txt b/service/server/CMakeLists.txt
index 687b382a..2b3ff800 100644
--- a/service/server/CMakeLists.txt
+++ b/service/server/CMakeLists.txt
@@ -6,7 +6,7 @@ project(${PROJECT})
 set(CMAKE_CXX_STANDARD 20)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
-find_package(Qt6 REQUIRED COMPONENTS Core Network RemoteObjects Core5Compat)
+find_package(Qt6 REQUIRED COMPONENTS Core Network RemoteObjects Core5Compat Widgets)
 qt_standard_project_setup()
 
 set(HEADERS
@@ -89,14 +89,14 @@ include_directories(
 )
 
 add_executable(${PROJECT} ${SOURCES} ${HEADERS})
-target_link_libraries(${PROJECT} PRIVATE Qt6::Core Qt6::Network Qt6::RemoteObjects Qt6::Core5Compat ${LIBS})
+target_link_libraries(${PROJECT} PRIVATE Qt6::Core Qt6::Network Qt6::RemoteObjects Qt6::Core5Compat Qt6::Widgets ${LIBS})
 
 qt_add_repc_sources(${PROJECT} ${CMAKE_CURRENT_LIST_DIR}/../../ipc/ipc_interface.rep)
 if(NOT IOS)
     qt_add_repc_sources(${PROJECT} ${CMAKE_CURRENT_LIST_DIR}/../../ipc/ipc_process_interface.rep)
 endif()
 
-# deploy artifacts required to run the application to the debug build folder
+# copy deploy artifacts required to run the application to the debug build folder
 if(WIN32)
     if("${CMAKE_SIZEOF_VOID_P}" STREQUAL "8")
         set(DEPLOY_ARTIFACT_PATH "windows/x64")

From 3a264e6bafbd279605291f2b75b99ee126373a58 Mon Sep 17 00:00:00 2001
From: "vladimir.kuznetsov" <nethiuswork@gmail.com>
Date: Tue, 20 Jun 2023 10:25:24 +0900
Subject: [PATCH 033/278] added a drawer to change the server name and moved
 the display of the exported config to a separate drawer

---
 client/images/controls/telegram.svg           |   2 +-
 .../ui/controllers/connectionController.cpp   |   5 +-
 client/ui/controllers/exportController.cpp    |   3 +-
 client/ui/controllers/installController.cpp   |   4 +-
 client/ui/models/servers_model.cpp            |  35 ++++--
 client/ui/models/servers_model.h              |   3 +-
 .../ConnectionTypeSelectionDrawer.qml         |   4 +-
 .../qml/Components/ShareConnectionDrawer.qml  | 100 ++++++++++++------
 .../ui/qml/Controls2/LabelWithButtonType.qml  |  76 ++++++++-----
 client/ui/qml/Controls2/ListViewType.qml      |   3 +-
 client/ui/qml/Pages2/PageHome.qml             |  12 +--
 client/ui/qml/Pages2/PageSettings.qml         |  24 ++---
 client/ui/qml/Pages2/PageSettingsAbout.qml    |  23 ++--
 .../ui/qml/Pages2/PageSettingsApplication.qml |  13 ++-
 client/ui/qml/Pages2/PageSettingsBackup.qml   |   2 +-
 .../ui/qml/Pages2/PageSettingsConnection.qml  |  12 +--
 client/ui/qml/Pages2/PageSettingsDns.qml      |   2 +-
 .../ui/qml/Pages2/PageSettingsServerData.qml  |   4 +-
 .../ui/qml/Pages2/PageSettingsServerInfo.qml  |  54 +++++++++-
 .../ui/qml/Pages2/PageSettingsServersList.qml |   2 +-
 .../Pages2/PageSetupWizardConfigSource.qml    |  16 +--
 .../qml/Pages2/PageSetupWizardCredentials.qml |   2 +-
 client/ui/qml/Pages2/PageSetupWizardEasy.qml  |   2 +-
 .../qml/Pages2/PageSetupWizardProtocols.qml   |   6 +-
 client/ui/qml/Pages2/PageSetupWizardStart.qml |   4 +-
 .../ui/qml/Pages2/PageSetupWizardTextKey.qml  |   4 +-
 .../qml/Pages2/PageSetupWizardViewConfig.qml  |   2 +-
 client/ui/qml/Pages2/PageShare.qml            |   8 +-
 client/ui/qml/Pages2/PageStart.qml            |   4 +-
 client/ui/qml/Pages2/PageTest.qml             |   4 +-
 30 files changed, 276 insertions(+), 159 deletions(-)

diff --git a/client/images/controls/telegram.svg b/client/images/controls/telegram.svg
index 7b76e506..92bb6a79 100644
--- a/client/images/controls/telegram.svg
+++ b/client/images/controls/telegram.svg
@@ -1,3 +1,3 @@
 <svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M11.944 3.26667e-05C8.77112 0.0148396 5.73324 1.28566 3.4949 3.53449C1.25656 5.78332 -3.4549e-05 8.82711 7.12435e-10 12C7.12441e-10 15.1826 1.26428 18.2349 3.51472 20.4853C5.76515 22.7358 8.8174 24 12 24C15.1826 24 18.2348 22.7358 20.4853 20.4853C22.7357 18.2349 24 15.1826 24 12C24 8.81743 22.7357 5.76519 20.4853 3.51475C18.2348 1.26431 15.1826 3.26667e-05 12 3.26667e-05C11.9813 -1.08889e-05 11.9627 -1.08889e-05 11.944 3.26667e-05ZM16.906 7.22403C17.006 7.22203 17.227 7.24703 17.371 7.36403C17.4667 7.44713 17.5277 7.56311 17.542 7.68903C17.558 7.78203 17.578 7.99503 17.562 8.16103C17.382 10.059 16.6 14.663 16.202 16.788C16.034 17.688 15.703 17.989 15.382 18.018C14.686 18.083 14.157 17.558 13.482 17.116C12.426 16.423 11.829 15.992 10.804 15.316C9.619 14.536 10.387 14.106 11.062 13.406C11.239 13.222 14.309 10.429 14.369 10.176C14.376 10.144 14.383 10.026 14.313 9.96403C14.243 9.90203 14.139 9.92303 14.064 9.94003C13.958 9.96403 12.271 11.08 9.003 13.285C8.523 13.615 8.09 13.775 7.701 13.765C7.273 13.757 6.449 13.524 5.836 13.325C5.084 13.08 4.487 12.951 4.539 12.536C4.566 12.32 4.864 12.099 5.432 11.873C8.93 10.349 11.262 9.34403 12.43 8.85903C15.762 7.47303 16.455 7.23203 16.906 7.22403Z" fill="#D7D8DB"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M3.44009 10.8882C8.78796 8.6139 12.3627 7.1439 14.1358 6.42277C19.2263 4.37033 20.2844 4.00977 20.9708 4.00977C21.1138 4.00977 21.457 4.0375 21.6857 4.20392C21.8573 4.34259 21.9145 4.53674 21.9431 4.67542C21.9717 4.8141 22.0003 5.11919 21.9717 5.36882C21.6857 8.17012 20.5132 15.0208 19.8841 18.155C19.6267 19.4863 19.1119 19.9301 18.6257 19.9855C17.5676 20.0687 16.7383 19.2921 15.7087 18.6542C14.1072 17.628 13.408 17.1299 11.8351 16.1314C10.0334 14.9665 11.2059 14.3286 12.2355 13.3024C12.4929 13.025 16.9956 8.75257 17.0814 8.36427C17.0814 8.3088 17.11 8.14239 16.9956 8.05918C16.8812 7.97597 16.7383 8.00371 16.6239 8.03145C16.4523 8.05918 13.8784 9.72332 8.87375 12.9961C8.1302 13.4954 7.47244 13.7173 6.87188 13.7173C6.21412 13.7173 4.9558 13.3567 4.01206 13.0516C2.86813 12.691 1.95299 12.4969 2.03878 11.8867C2.12458 11.5539 2.58215 11.2211 3.44009 10.8882Z" stroke="#D7D8DB" stroke-width="2"/>
 </svg>
diff --git a/client/ui/controllers/connectionController.cpp b/client/ui/controllers/connectionController.cpp
index fbbb67d9..dcc15958 100644
--- a/client/ui/controllers/connectionController.cpp
+++ b/client/ui/controllers/connectionController.cpp
@@ -32,9 +32,8 @@ ConnectionController::ConnectionController(const QSharedPointer<ServersModel> &s
 void ConnectionController::openConnection()
 {
     int serverIndex = m_serversModel->getDefaultServerIndex();
-    QModelIndex serverModelIndex = m_serversModel->index(serverIndex);
-    ServerCredentials credentials = qvariant_cast<ServerCredentials>(m_serversModel->data(serverModelIndex,
-                                                                                          ServersModel::ServersModelRoles::CredentialsRole));
+    ServerCredentials credentials = qvariant_cast<ServerCredentials>(
+        m_serversModel->data(serverIndex, ServersModel::ServersModelRoles::CredentialsRole));
 
     DockerContainer container = m_containersModel->getDefaultContainer();
     QModelIndex containerModelIndex = m_containersModel->index(container);
diff --git a/client/ui/controllers/exportController.cpp b/client/ui/controllers/exportController.cpp
index 98cbebd1..cbb5a1bb 100644
--- a/client/ui/controllers/exportController.cpp
+++ b/client/ui/controllers/exportController.cpp
@@ -43,7 +43,8 @@ void ExportController::generateFullAccessConfig()
 void ExportController::generateConnectionConfig()
 {
     int serverIndex = m_serversModel->getCurrentlyProcessedServerIndex();
-    ServerCredentials credentials = m_serversModel->getCurrentlyProcessedServerCredentials();
+    ServerCredentials credentials = qvariant_cast<ServerCredentials>(
+        m_serversModel->data(serverIndex, ServersModel::ServersModelRoles::CredentialsRole));
 
     DockerContainer container = static_cast<DockerContainer>(
         m_containersModel->getCurrentlyProcessedContainerIndex());
diff --git a/client/ui/controllers/installController.cpp b/client/ui/controllers/installController.cpp
index 8f9e1f88..08ef69d4 100644
--- a/client/ui/controllers/installController.cpp
+++ b/client/ui/controllers/installController.cpp
@@ -61,7 +61,9 @@ void InstallController::installServer(DockerContainer container, QJsonObject& co
 void InstallController::installContainer(DockerContainer container, QJsonObject& config)
 {
     //todo check if container already installed
-    ServerCredentials serverCredentials = m_serversModel->getCurrentlyProcessedServerCredentials();
+    int serverIndex = m_serversModel->getCurrentlyProcessedServerIndex();
+    ServerCredentials serverCredentials = qvariant_cast<ServerCredentials>(
+        m_serversModel->data(serverIndex, ServersModel::ServersModelRoles::CredentialsRole));
 
     ServerController serverController(m_settings);
     ErrorCode errorCode = serverController.setupContainer(serverCredentials, container, config);
diff --git a/client/ui/models/servers_model.cpp b/client/ui/models/servers_model.cpp
index 9ef87d37..f027a90d 100644
--- a/client/ui/models/servers_model.cpp
+++ b/client/ui/models/servers_model.cpp
@@ -19,12 +19,23 @@ bool ServersModel::setData(const QModelIndex &index, const QVariant &value, int
         return false;
     }
 
+    QJsonObject server = m_servers.at(index.row()).toObject();
+
     switch (role) {
-        case IsDefaultRole: {
-            m_settings->setDefaultServer(index.row());
-            m_defaultServerIndex = m_settings->defaultServerIndex();
-        }
-        default: return true;
+    case NameRole: {
+        server.insert(config_key::description, value.toString());
+        m_settings->editServer(index.row(), server);
+        m_servers.replace(index.row(), server);
+        break;
+    }
+    case IsDefaultRole: {
+        m_settings->setDefaultServer(index.row());
+        m_defaultServerIndex = m_settings->defaultServerIndex();
+        break;
+    }
+    default: {
+        return true;
+    }
     }
 
     emit dataChanged(index, index);
@@ -51,6 +62,8 @@ QVariant ServersModel::data(const QModelIndex &index, int role) const
         return server.value(config_key::hostName).toString();
     case CredentialsRole:
         return QVariant::fromValue(m_settings->serverCredentials(index.row()));
+    case CredentialsLoginRole:
+        return m_settings->serverCredentials(index.row()).userName;
     case IsDefaultRole:
         return index.row() == m_defaultServerIndex;
     case IsCurrentlyProcessedRole:
@@ -60,6 +73,12 @@ QVariant ServersModel::data(const QModelIndex &index, int role) const
     return QVariant();
 }
 
+QVariant ServersModel::data(const int index, int role) const
+{
+    QModelIndex modelIndex = this->index(index);
+    return data(modelIndex, role);
+}
+
 const int ServersModel::getDefaultServerIndex()
 {
     return m_defaultServerIndex;
@@ -85,11 +104,6 @@ bool ServersModel::isDefaultServerCurrentlyProcessed()
     return m_defaultServerIndex == m_currenlyProcessedServerIndex;
 }
 
-ServerCredentials ServersModel::getCurrentlyProcessedServerCredentials()
-{
-    return qvariant_cast<ServerCredentials>(data(index(m_currenlyProcessedServerIndex), CredentialsRole));
-}
-
 void ServersModel::addServer(const QJsonObject &server)
 {
     beginResetModel();
@@ -121,6 +135,7 @@ QHash<int, QByteArray> ServersModel::roleNames() const {
     roles[NameRole] = "name";
     roles[HostNameRole] = "hostName";
     roles[CredentialsRole] = "credentials";
+    roles[CredentialsLoginRole] = "credentialsLogin";
     roles[IsDefaultRole] = "isDefault";
     roles[IsCurrentlyProcessedRole] = "isCurrentlyProcessed";
     return roles;
diff --git a/client/ui/models/servers_model.h b/client/ui/models/servers_model.h
index 6f55176e..be13d61b 100644
--- a/client/ui/models/servers_model.h
+++ b/client/ui/models/servers_model.h
@@ -19,6 +19,7 @@ public:
         NameRole = Qt::UserRole + 1,
         HostNameRole,
         CredentialsRole,
+        CredentialsLoginRole,
         IsDefaultRole,
         IsCurrentlyProcessedRole
     };
@@ -29,6 +30,7 @@ public:
 
     bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole) override;
     QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
+    QVariant data(const int index, int role = Qt::DisplayRole) const;
 
 public slots:
     const int getDefaultServerIndex();
@@ -38,7 +40,6 @@ public slots:
 
     void setCurrentlyProcessedServerIndex(int index);
     int getCurrentlyProcessedServerIndex();
-    ServerCredentials getCurrentlyProcessedServerCredentials();
 
     void addServer(const QJsonObject &server);
     void removeServer();
diff --git a/client/ui/qml/Components/ConnectionTypeSelectionDrawer.qml b/client/ui/qml/Components/ConnectionTypeSelectionDrawer.qml
index 3c1ecd5b..51bffc03 100644
--- a/client/ui/qml/Components/ConnectionTypeSelectionDrawer.qml
+++ b/client/ui/qml/Components/ConnectionTypeSelectionDrawer.qml
@@ -36,7 +36,7 @@ DrawerType {
             Layout.topMargin: 16
 
             text: "IP, логин и пароль от сервера"
-            buttonImage: "qrc:/images/controls/chevron-right.svg"
+            rightImageSource: "qrc:/images/controls/chevron-right.svg"
 
             clickedFunction: function() {
                 goToPage(PageEnum.PageSetupWizardCredentials)
@@ -50,7 +50,7 @@ DrawerType {
             Layout.fillWidth: true
 
             text: "QR-код, ключ или файл настроек"
-            buttonImage: "qrc:/images/controls/chevron-right.svg"
+            rightImageSource: "qrc:/images/controls/chevron-right.svg"
 
             clickedFunction: function() {
                 goToPage(PageEnum.PageSetupWizardConfigSource)
diff --git a/client/ui/qml/Components/ShareConnectionDrawer.qml b/client/ui/qml/Components/ShareConnectionDrawer.qml
index 1b92c752..627eba81 100644
--- a/client/ui/qml/Components/ShareConnectionDrawer.qml
+++ b/client/ui/qml/Components/ShareConnectionDrawer.qml
@@ -16,11 +16,12 @@ DrawerType {
     id: root
 
     property alias headerText: header.headerText
+    property alias configContentHeaderText: configContentHeader.headerText
 
     width: parent.width
     height: parent.height * 0.9
 
-    Item{
+    Item {
         anchors.fill: parent
 
         FlickableType {
@@ -86,46 +87,77 @@ DrawerType {
                     disabledColor: "#878B91"
                     textColor: "#D7D8DB"
 
-                    text: showContent ? qsTr("Collapse content") : qsTr("Show content")
+                    text: qsTr("Show content")
 
                     onClicked: {
-                        showContent = !showContent
+                        configContentDrawer.visible = true
                     }
                 }
 
-                Rectangle {
-                    Layout.fillWidth: true
-                    Layout.preferredHeight: configContent.implicitHeight + configContent.anchors.topMargin + configContent.anchors.bottomMargin
+                DrawerType {
+                    id: configContentDrawer
 
-                    radius: 10
-                    color: "#2C2D30"
+                    width: parent.width
+                    height: parent.height * 0.9
 
-                    visible: showContent
+                    BackButtonType {
+                        id: backButton
 
-                    height: 24
+                        anchors.top: parent.top
+                        anchors.left: parent.left
+                        anchors.right: parent.right
+                        anchors.rightMargin: 16
+                        anchors.leftMargin: 16
+                        anchors.topMargin: 16
 
-                    TextField {
-                        id: configContent
+                        backButtonFunction: function() {
+                            configContentDrawer.visible = false
+                        }
+                    }
 
-                        anchors.fill: parent
-                        anchors.margins: 16
+                    FlickableType {
+                        anchors.top: backButton.bottom
+                        anchors.left: parent.left
+                        anchors.right: parent.right
+                        anchors.bottom: parent.bottom
+                        contentHeight: configContent.implicitHeight + configContent.anchors.topMargin + configContent.anchors.bottomMargin
 
-                        height: 24
+                        ColumnLayout {
+                            id: configContent
 
-                        color: "#D7D8DB"
-
-                        font.pixelSize: 16
-                        font.weight: Font.Medium
-                        font.family: "PT Root UI VF"
-
-                        text: ExportController.amneziaCode
-
-                        wrapMode: Text.Wrap
-
-                        enabled: false
-                        background: Rectangle {
                             anchors.fill: parent
-                            color: "transparent"
+                            anchors.rightMargin: 16
+                            anchors.leftMargin: 16
+
+                            Header2Type {
+                                id: configContentHeader
+                                Layout.fillWidth: true
+                                Layout.topMargin: 16
+                            }
+
+                            TextField {
+                                Layout.fillWidth: true
+                                Layout.topMargin: 16
+                                Layout.bottomMargin: 16
+
+                                padding: 0
+                                height: 24
+
+                                color: "#D7D8DB"
+
+                                font.pixelSize: 16
+                                font.weight: Font.Medium
+                                font.family: "PT Root UI VF"
+
+                                text: ExportController.amneziaCode
+
+                                wrapMode: Text.Wrap
+
+                                readOnly: true
+                                background: Rectangle {
+                                    color: "transparent"
+                                }
+                            }
                         }
                     }
                 }
@@ -143,17 +175,19 @@ DrawerType {
                         anchors.fill: parent
                         smooth: false
 
+                        source: ExportController.qrCodesCount ? ExportController.qrCodes[0] : ""
+
                         Timer {
-                            property int idx: 0
+                            property int index: 0
                             interval: 1000
                             running: ExportController.qrCodesCount > 0
                             repeat: true
                             onTriggered: {
-                                idx++
-                                if (idx >= ExportController.qrCodesCount) {
-                                    idx = 0
+                                index++
+                                if (index >= ExportController.qrCodesCount) {
+                                    index = 0
                                 }
-                                parent.source = ExportController.qrCodes[idx]
+                                parent.source = ExportController.qrCodes[index]
                             }
                         }
 
diff --git a/client/ui/qml/Controls2/LabelWithButtonType.qml b/client/ui/qml/Controls2/LabelWithButtonType.qml
index e4e711a6..27ead16c 100644
--- a/client/ui/qml/Controls2/LabelWithButtonType.qml
+++ b/client/ui/qml/Controls2/LabelWithButtonType.qml
@@ -12,8 +12,8 @@ Item {
 
     property var clickedFunction
 
-    property alias buttonImage: button.image
-    property string iconImage
+    property string rightImageSource
+    property string leftImageSource
 
     property string textColor: "#d7d8db"
 
@@ -26,17 +26,34 @@ Item {
         anchors.leftMargin: 16
         anchors.rightMargin: 16
 
-        Image {
-            id: icon
-            source: iconImage
-            visible: iconImage ? true : false
-            Layout.rightMargin: visible ? 16 : 0
+        Rectangle {
+            id: leftImageBackground
+
+            visible: leftImageSource ? true : false
+
+            Layout.preferredHeight: rightImageSource ? leftImage.implicitHeight : 56
+            Layout.preferredWidth: rightImageSource ? leftImage.implicitWidth : 56
+            Layout.rightMargin: rightImageSource ? 16 : 0
+
+            radius: 12
+            color: "transparent"
+
+            Behavior on color {
+                PropertyAnimation { duration: 200 }
+            }
+
+            Image {
+                id: leftImage
+
+                anchors.centerIn: parent
+                source: leftImageSource
+            }
         }
 
         ColumnLayout {
             ListItemTitleType {
                 text: root.text
-                color: textColor
+                color: root.textColor
 
                 Layout.fillWidth: true
                 Layout.topMargin: 16
@@ -63,25 +80,20 @@ Item {
         }
 
         ImageButtonType {
-            id: button
+            id: rightImage
 
             hoverEnabled: false
-            image: buttonImage
-            onClicked: {
-                if (clickedFunction && typeof clickedFunction === "function") {
-                    clickedFunction()
-                }
-            }
+            image: rightImageSource
+            visible: rightImageSource ? true : false
 
             Layout.alignment: Qt.AlignRight
 
             Rectangle {
-                id: imageBackground
-                anchors.fill: button
+                id: rightImageBackground
+                anchors.fill: parent
                 radius: 12
                 color: "transparent"
 
-
                 Behavior on color {
                     PropertyAnimation { duration: 200 }
                 }
@@ -106,31 +118,39 @@ Item {
         hoverEnabled: true
 
         onEntered: {
-            if (buttonImage) {
-                imageBackground.color = button.hoveredColor
+            if (rightImageSource) {
+                rightImageBackground.color = rightImage.hoveredColor
+            } else if (leftImageSource) {
+                leftImageBackground.color = rightImage.hoveredColor
             } else {
-                background.color = button.hoveredColor
+                background.color = rightImage.hoveredColor
             }
         }
 
         onExited: {
-            if (buttonImage) {
-                imageBackground.color = button.defaultColor
+            if (rightImageSource) {
+                rightImageBackground.color = rightImage.defaultColor
+            } else if (leftImageSource) {
+                leftImageBackground.color = rightImage.defaultColor
             } else {
-                background.color = button.defaultColor
+                background.color = rightImage.defaultColor
             }
         }
 
         onPressedChanged: {
-            if (buttonImage) {
-                imageBackground.color = pressed ? button.pressedColor : entered ? button.hoveredColor : button.defaultColor
+            if (rightImageSource) {
+                rightImageBackground.color = pressed ? rightImage.pressedColor : entered ? rightImage.hoveredColor : rightImage.defaultColor
+            } else if (leftImageSource) {
+                leftImageBackground.color = pressed ? rightImage.pressedColor : entered ? rightImage.hoveredColor : rightImage.defaultColor
             } else {
-                background.color = pressed ? button.pressedColor : entered ? button.hoveredColor : button.defaultColor
+                background.color = pressed ? rightImage.pressedColor : entered ? rightImage.hoveredColor : rightImage.defaultColor
             }
         }
 
         onClicked: {
-            button.clicked()
+            if (clickedFunction && typeof clickedFunction === "function") {
+                clickedFunction()
+            }
         }
     }
 }
diff --git a/client/ui/qml/Controls2/ListViewType.qml b/client/ui/qml/Controls2/ListViewType.qml
index 421b82a3..4251f0fd 100644
--- a/client/ui/qml/Controls2/ListViewType.qml
+++ b/client/ui/qml/Controls2/ListViewType.qml
@@ -31,7 +31,6 @@ ListView {
             id: content
 
             anchors.fill: parent
-            spacing: 16
 
             RadioButton {
                 id: radioButton
@@ -92,7 +91,7 @@ ListView {
 
             DividerType {
                 Layout.fillWidth: true
-                Layout.bottomMargin: 16
+                Layout.bottomMargin: 4
 
                 visible: dividerVisible
             }
diff --git a/client/ui/qml/Pages2/PageHome.qml b/client/ui/qml/Pages2/PageHome.qml
index 9571b1fb..282c1408 100644
--- a/client/ui/qml/Pages2/PageHome.qml
+++ b/client/ui/qml/Pages2/PageHome.qml
@@ -51,7 +51,6 @@ PageType {
     Rectangle {
         id: buttonBackground
         anchors.fill: buttonContent
-        anchors.bottomMargin: -radius
 
         radius: 16
         color: root.defaultColor
@@ -59,11 +58,12 @@ PageType {
         border.width: 1
 
         Rectangle {
-            width: parent.width
-            height: 1
-            y: parent.height - height - parent.radius
-
-            color: root.borderColor
+            width: parent.radius
+            height: parent.radius
+            anchors.bottom: parent.bottom
+            anchors.right: parent.right
+            anchors.left: parent.left
+            color: parent.color
         }
     }
 
diff --git a/client/ui/qml/Pages2/PageSettings.qml b/client/ui/qml/Pages2/PageSettings.qml
index a7472580..f430a004 100644
--- a/client/ui/qml/Pages2/PageSettings.qml
+++ b/client/ui/qml/Pages2/PageSettings.qml
@@ -15,8 +15,8 @@ PageType {
 
     FlickableType {
         id: fl
-        anchors.top: root.top
-        anchors.bottom: root.bottom
+        anchors.top: parent.top
+        anchors.bottom: parent.bottom
         contentHeight: content.height
 
         ColumnLayout {
@@ -40,8 +40,8 @@ PageType {
                 Layout.topMargin: 16
 
                 text: qsTr("Servers")
-                buttonImage: "qrc:/images/controls/chevron-right.svg"
-                iconImage: "qrc:/images/controls/server.svg"
+                rightImageSource: "qrc:/images/controls/chevron-right.svg"
+                leftImageSource: "qrc:/images/controls/server.svg"
 
                 clickedFunction: function() {
                     goToPage(PageEnum.PageSettingsServersList)
@@ -54,8 +54,8 @@ PageType {
                 Layout.fillWidth: true
 
                 text: qsTr("Connection")
-                buttonImage: "qrc:/images/controls/chevron-right.svg"
-                iconImage: "qrc:/images/controls/radio.svg"
+                rightImageSource: "qrc:/images/controls/chevron-right.svg"
+                leftImageSource: "qrc:/images/controls/radio.svg"
 
                 clickedFunction: function() {
                     goToPage(PageEnum.PageSettingsConnection)
@@ -68,8 +68,8 @@ PageType {
                 Layout.fillWidth: true
 
                 text: qsTr("Application")
-                buttonImage: "qrc:/images/controls/chevron-right.svg"
-                iconImage: "qrc:/images/controls/app.svg"
+                rightImageSource: "qrc:/images/controls/chevron-right.svg"
+                leftImageSource: "qrc:/images/controls/app.svg"
 
                 clickedFunction: function() {
                     goToPage(PageEnum.PageSettingsApplication)
@@ -82,8 +82,8 @@ PageType {
                 Layout.fillWidth: true
 
                 text: qsTr("Backup")
-                buttonImage: "qrc:/images/controls/chevron-right.svg"
-                iconImage: "qrc:/images/controls/save.svg"
+                rightImageSource: "qrc:/images/controls/chevron-right.svg"
+                leftImageSource: "qrc:/images/controls/save.svg"
 
                 clickedFunction: function() {
                     goToPage(PageEnum.PageSettingsBackup)
@@ -96,8 +96,8 @@ PageType {
                 Layout.fillWidth: true
 
                 text: qsTr("About AmneziaVPN")
-                buttonImage: "qrc:/images/controls/chevron-right.svg"
-                iconImage: "qrc:/images/controls/amnezia.svg"
+                rightImageSource: "qrc:/images/controls/chevron-right.svg"
+                leftImageSource: "qrc:/images/controls/amnezia.svg"
 
                 clickedFunction: function() {
                     goToPage(PageEnum.PageSettingsAbout)
diff --git a/client/ui/qml/Pages2/PageSettingsAbout.qml b/client/ui/qml/Pages2/PageSettingsAbout.qml
index 88c927b9..a1bdeb26 100644
--- a/client/ui/qml/Pages2/PageSettingsAbout.qml
+++ b/client/ui/qml/Pages2/PageSettingsAbout.qml
@@ -27,7 +27,7 @@ PageType {
     FlickableType {
         id: fl
         anchors.top: backButton.bottom
-        anchors.bottom: root.bottom
+        anchors.bottom: parent.bottom
         contentHeight: content.height
 
         ColumnLayout {
@@ -102,8 +102,7 @@ And if you don't like the app, all the more support it - the donation will be us
 
                 text: qsTr("Show other methods on Github")
 
-                onClicked: {
-                }
+                onClicked: Qt.openUrlExternally("https://github.com/amnezia-vpn/amnezia-client")
             }
 
             ParagraphTextType {
@@ -121,11 +120,10 @@ And if you don't like the app, all the more support it - the donation will be us
 
                 text: qsTr("Telegram group")
                 descriptionText: qsTr("To discuss features")
-                buttonImage: "qrc:/images/controls/chevron-right.svg"
-                iconImage: "qrc:/images/controls/telegram.svg"
+                leftImageSource: "qrc:/images/controls/telegram.svg"
 
                 clickedFunction: function() {
-                    goToPage(PageEnum.PageSettingsAbout)
+                    Qt.openUrlExternally("https://t.me/amnezia_vpn_dev")
                 }
             }
 
@@ -136,11 +134,9 @@ And if you don't like the app, all the more support it - the donation will be us
 
                 text: qsTr("Mail")
                 descriptionText: qsTr("For reviews and bug reports")
-                buttonImage: "qrc:/images/controls/chevron-right.svg"
-                iconImage: "qrc:/images/controls/mail.svg"
+                leftImageSource: "qrc:/images/controls/mail.svg"
 
                 clickedFunction: function() {
-                    goToPage(PageEnum.PageSettingsAbout)
                 }
             }
 
@@ -150,11 +146,10 @@ And if you don't like the app, all the more support it - the donation will be us
                 Layout.fillWidth: true
 
                 text: qsTr("Github")
-                buttonImage: "qrc:/images/controls/chevron-right.svg"
-                iconImage: "qrc:/images/controls/github.svg"
+                leftImageSource: "qrc:/images/controls/github.svg"
 
                 clickedFunction: function() {
-                    goToPage(PageEnum.PageSettingsAbout)
+                    Qt.openUrlExternally("https://github.com/amnezia-vpn/amnezia-client")
                 }
             }
 
@@ -164,11 +159,9 @@ And if you don't like the app, all the more support it - the donation will be us
                 Layout.fillWidth: true
 
                 text: qsTr("Website")
-                buttonImage: "qrc:/images/controls/chevron-right.svg"
-                iconImage: "qrc:/images/controls/amnezia.svg"
+                leftImageSource: "qrc:/images/controls/amnezia.svg"
 
                 clickedFunction: function() {
-                    goToPage(PageEnum.PageSettingsAbout)
                 }
             }
 
diff --git a/client/ui/qml/Pages2/PageSettingsApplication.qml b/client/ui/qml/Pages2/PageSettingsApplication.qml
index 9a6eab3c..08a5ec0d 100644
--- a/client/ui/qml/Pages2/PageSettingsApplication.qml
+++ b/client/ui/qml/Pages2/PageSettingsApplication.qml
@@ -26,7 +26,7 @@ PageType {
     FlickableType {
         id: fl
         anchors.top: backButton.bottom
-        anchors.bottom: root.bottom
+        anchors.bottom: parent.bottom
         contentHeight: content.height
 
         ColumnLayout {
@@ -35,22 +35,21 @@ PageType {
             anchors.top: parent.top
             anchors.left: parent.left
             anchors.right: parent.right
-            anchors.leftMargin: 16
-            anchors.rightMargin: 16
-
-            spacing: 16
 
             HeaderType {
                 Layout.fillWidth: true
+                Layout.leftMargin: 16
+                Layout.rightMargin: 16
 
                 headerText: qsTr("Application")
             }
 
             LabelWithButtonType {
                 Layout.fillWidth: true
+                Layout.topMargin: 16
 
                 text: qsTr("Language")
-                buttonImage: "qrc:/images/controls/chevron-right.svg"
+                rightImageSource: "qrc:/images/controls/chevron-right.svg"
 
                 clickedFunction: function() {
                 }
@@ -62,7 +61,7 @@ PageType {
                 Layout.fillWidth: true
 
                 text: qsTr("Reset settings and remove all data from the application")
-                buttonImage: "qrc:/images/controls/chevron-right.svg"
+                rightImageSource: "qrc:/images/controls/chevron-right.svg"
 
                 clickedFunction: function() {
                 }
diff --git a/client/ui/qml/Pages2/PageSettingsBackup.qml b/client/ui/qml/Pages2/PageSettingsBackup.qml
index 0cc62979..a5445754 100644
--- a/client/ui/qml/Pages2/PageSettingsBackup.qml
+++ b/client/ui/qml/Pages2/PageSettingsBackup.qml
@@ -26,7 +26,7 @@ PageType {
     FlickableType {
         id: fl
         anchors.top: backButton.bottom
-        anchors.bottom: root.bottom
+        anchors.bottom: parent.bottom
         contentHeight: content.height
 
         ColumnLayout {
diff --git a/client/ui/qml/Pages2/PageSettingsConnection.qml b/client/ui/qml/Pages2/PageSettingsConnection.qml
index fb0bb000..ad8524f5 100644
--- a/client/ui/qml/Pages2/PageSettingsConnection.qml
+++ b/client/ui/qml/Pages2/PageSettingsConnection.qml
@@ -25,7 +25,7 @@ PageType {
     FlickableType {
         id: fl
         anchors.top: backButton.bottom
-        anchors.bottom: root.bottom
+        anchors.bottom: parent.bottom
         contentHeight: content.height
 
         ColumnLayout {
@@ -35,8 +35,6 @@ PageType {
             anchors.left: parent.left
             anchors.right: parent.right
 
-            spacing: 16
-
             HeaderType {
                 Layout.fillWidth: true
                 Layout.leftMargin: 16
@@ -47,6 +45,8 @@ PageType {
 
             SwitcherType {
                 Layout.fillWidth: true
+                Layout.topMargin: 16
+                Layout.bottomMargin: 16
                 Layout.leftMargin: 16
                 Layout.rightMargin: 16
 
@@ -68,7 +68,7 @@ PageType {
 
                 text: qsTr("DNS servers")
                 descriptionText: qsTr("If AmneziaDNS is not used or installed")
-                buttonImage: "qrc:/images/controls/chevron-right.svg"
+                rightImageSource: "qrc:/images/controls/chevron-right.svg"
 
                 clickedFunction: function() {
                     goToPage(PageEnum.PageSettingsDns)
@@ -82,7 +82,7 @@ PageType {
 
                 text: qsTr("Split site tunneling")
                 descriptionText: qsTr("Allows you to connect to some sites through a secure connection, and to others bypassing it")
-                buttonImage: "qrc:/images/controls/chevron-right.svg"
+                rightImageSource: "qrc:/images/controls/chevron-right.svg"
 
                 clickedFunction: function() {
                 }
@@ -95,7 +95,7 @@ PageType {
 
                 text: qsTr("Separate application tunneling")
                 descriptionText: qsTr("Allows you to use the VPN only for certain applications")
-                buttonImage: "qrc:/images/controls/chevron-right.svg"
+                rightImageSource: "qrc:/images/controls/chevron-right.svg"
 
                 clickedFunction: function() {
                 }
diff --git a/client/ui/qml/Pages2/PageSettingsDns.qml b/client/ui/qml/Pages2/PageSettingsDns.qml
index 2a06438b..1c989c0c 100644
--- a/client/ui/qml/Pages2/PageSettingsDns.qml
+++ b/client/ui/qml/Pages2/PageSettingsDns.qml
@@ -26,7 +26,7 @@ PageType {
     FlickableType {
         id: fl
         anchors.top: backButton.bottom
-        anchors.bottom: root.bottom
+        anchors.bottom: parent.bottom
         contentHeight: content.height
 
         ColumnLayout {
diff --git a/client/ui/qml/Pages2/PageSettingsServerData.qml b/client/ui/qml/Pages2/PageSettingsServerData.qml
index fe09ed01..6179983b 100644
--- a/client/ui/qml/Pages2/PageSettingsServerData.qml
+++ b/client/ui/qml/Pages2/PageSettingsServerData.qml
@@ -16,8 +16,8 @@ PageType {
 
     FlickableType {
         id: fl
-        anchors.top: root.top
-        anchors.bottom: root.bottom
+        anchors.top: parent.top
+        anchors.bottom: parent.bottom
         contentHeight: content.height
 
         ColumnLayout {
diff --git a/client/ui/qml/Pages2/PageSettingsServerInfo.qml b/client/ui/qml/Pages2/PageSettingsServerInfo.qml
index 5e422230..3f2562da 100644
--- a/client/ui/qml/Pages2/PageSettingsServerInfo.qml
+++ b/client/ui/qml/Pages2/PageSettingsServerInfo.qml
@@ -54,10 +54,60 @@ PageType {
                     actionButtonImage: "qrc:/images/controls/edit-3.svg"
 
                     headerText: name
-                    descriptionText: hostName
+                    descriptionText: credentialsLogin + " · " + hostName
 
                     actionButtonFunction: function() {
-                        connectionTypeSelection.visible = true
+                        serverNameEditDrawer.visible = true
+                    }
+                }
+
+                DrawerType {
+                    id: serverNameEditDrawer
+
+                    width: root.width
+                    height: root.height * 0.35
+
+                    onVisibleChanged: {
+                        if (serverNameEditDrawer.visible) {
+                            serverName.textField.forceActiveFocus()
+                        }
+                    }
+
+                    ColumnLayout {
+                        anchors.top: parent.top
+                        anchors.left: parent.left
+                        anchors.right: parent.right
+                        anchors.topMargin: 16
+                        anchors.leftMargin: 16
+                        anchors.rightMargin: 16
+
+                        TextFieldWithHeaderType {
+                            id: serverName
+
+                            Layout.fillWidth: true
+                            headerText: qsTr("Server name")
+                            textFieldText: name
+                        }
+
+                        BasicButtonType {
+                            Layout.fillWidth: true
+
+                            defaultColor: "transparent"
+                            hoveredColor: Qt.rgba(1, 1, 1, 0.08)
+                            pressedColor: Qt.rgba(1, 1, 1, 0.12)
+                            disabledColor: "#878B91"
+                            textColor: "#D7D8DB"
+                            borderWidth: 1
+
+                            text: qsTr("Save")
+
+                            onClicked: {
+                                if (serverName.textFieldText !== name) {
+                                    name = serverName.textFieldText
+                                    serverNameEditDrawer.visible = false
+                                }
+                            }
+                        }
                     }
                 }
             }
diff --git a/client/ui/qml/Pages2/PageSettingsServersList.qml b/client/ui/qml/Pages2/PageSettingsServersList.qml
index fa4ce86c..a601199a 100644
--- a/client/ui/qml/Pages2/PageSettingsServersList.qml
+++ b/client/ui/qml/Pages2/PageSettingsServersList.qml
@@ -86,7 +86,7 @@ PageType {
 
                             text: name
                             descriptionText: hostName
-                            buttonImage: "qrc:/images/controls/chevron-right.svg"
+                            rightImageSource: "qrc:/images/controls/chevron-right.svg"
 
                             clickedFunction: function() {
                                 ServersModel.setCurrentlyProcessedServerIndex(index)
diff --git a/client/ui/qml/Pages2/PageSetupWizardConfigSource.qml b/client/ui/qml/Pages2/PageSetupWizardConfigSource.qml
index 79e596af..2ef38067 100644
--- a/client/ui/qml/Pages2/PageSetupWizardConfigSource.qml
+++ b/client/ui/qml/Pages2/PageSetupWizardConfigSource.qml
@@ -15,8 +15,8 @@ PageType {
 
     FlickableType {
         id: fl
-        anchors.top: root.top
-        anchors.bottom: root.bottom
+        anchors.top: parent.top
+        anchors.bottom: parent.bottom
         contentHeight: content.height
 
         ColumnLayout {
@@ -58,8 +58,8 @@ PageType {
                 Layout.topMargin: 16
 
                 text: "Файл с настройками подключения"
-                buttonImage: "qrc:/images/controls/chevron-right.svg"
-                iconImage: "qrc:/images/controls/folder-open.svg"
+                rightImageSource: "qrc:/images/controls/chevron-right.svg"
+                leftImageSource: "qrc:/images/controls/folder-open.svg"
 
                 clickedFunction: function() {
                     onClicked: fileDialog.open()
@@ -81,8 +81,8 @@ PageType {
                 Layout.fillWidth: true
 
                 text: "QR-код"
-                buttonImage: "qrc:/images/controls/chevron-right.svg"
-                iconImage: "qrc:/images/controls/qr-code.svg"
+                rightImageSource: "qrc:/images/controls/chevron-right.svg"
+                leftImageSource: "qrc:/images/controls/qr-code.svg"
 
                 clickedFunction: function() {
                 }
@@ -94,8 +94,8 @@ PageType {
                 Layout.fillWidth: true
 
                 text: "Ключ в виде текста"
-                buttonImage: "qrc:/images/controls/chevron-right.svg"
-                iconImage: "qrc:/images/controls/text-cursor.svg"
+                rightImageSource: "qrc:/images/controls/chevron-right.svg"
+                leftImageSource: "qrc:/images/controls/text-cursor.svg"
 
                 clickedFunction: function() {
                     goToPage(PageEnum.PageSetupWizardTextKey)
diff --git a/client/ui/qml/Pages2/PageSetupWizardCredentials.qml b/client/ui/qml/Pages2/PageSetupWizardCredentials.qml
index 49197962..3f037035 100644
--- a/client/ui/qml/Pages2/PageSetupWizardCredentials.qml
+++ b/client/ui/qml/Pages2/PageSetupWizardCredentials.qml
@@ -25,7 +25,7 @@ PageType {
     FlickableType {
         id: fl
         anchors.top: backButton.bottom
-        anchors.bottom: root.bottom
+        anchors.bottom: parent.bottom
         contentHeight: content.height
 
         ColumnLayout {
diff --git a/client/ui/qml/Pages2/PageSetupWizardEasy.qml b/client/ui/qml/Pages2/PageSetupWizardEasy.qml
index 1836f892..19f06d5f 100644
--- a/client/ui/qml/Pages2/PageSetupWizardEasy.qml
+++ b/client/ui/qml/Pages2/PageSetupWizardEasy.qml
@@ -44,7 +44,7 @@ PageType {
     FlickableType {
         id: fl
         anchors.top: backButton.bottom
-        anchors.bottom: root.bottom
+        anchors.bottom: parent.bottom
         contentHeight: content.implicitHeight + continueButton.anchors.bottomMargin
 
         Column {
diff --git a/client/ui/qml/Pages2/PageSetupWizardProtocols.qml b/client/ui/qml/Pages2/PageSetupWizardProtocols.qml
index e2ae4a16..527df830 100644
--- a/client/ui/qml/Pages2/PageSetupWizardProtocols.qml
+++ b/client/ui/qml/Pages2/PageSetupWizardProtocols.qml
@@ -32,8 +32,8 @@ PageType {
 
     FlickableType {
         id: fl
-        anchors.top: root.top
-        anchors.bottom: root.bottom
+        anchors.top: parent.top
+        anchors.bottom: parent.bottom
         contentHeight: content.height
 
         Column {
@@ -87,7 +87,7 @@ PageType {
 
                             text: name
                             descriptionText: description
-                            buttonImage: "qrc:/images/controls/chevron-right.svg"
+                            rightImageSource: "qrc:/images/controls/chevron-right.svg"
 
                             clickedFunction: function() {
                                 ContainersModel.setCurrentlyProcessedContainerIndex(proxyContainersModel.mapToSource(index))
diff --git a/client/ui/qml/Pages2/PageSetupWizardStart.qml b/client/ui/qml/Pages2/PageSetupWizardStart.qml
index 6358f00d..ad91303e 100644
--- a/client/ui/qml/Pages2/PageSetupWizardStart.qml
+++ b/client/ui/qml/Pages2/PageSetupWizardStart.qml
@@ -24,8 +24,8 @@ PageType {
 
     FlickableType {
         id: fl
-        anchors.top: root.top
-        anchors.bottom: root.bottom
+        anchors.top: parent.top
+        anchors.bottom: parent.bottom
         contentHeight: content.height
 
         ColumnLayout {
diff --git a/client/ui/qml/Pages2/PageSetupWizardTextKey.qml b/client/ui/qml/Pages2/PageSetupWizardTextKey.qml
index f74c3733..d7dbf43d 100644
--- a/client/ui/qml/Pages2/PageSetupWizardTextKey.qml
+++ b/client/ui/qml/Pages2/PageSetupWizardTextKey.qml
@@ -14,8 +14,8 @@ PageType {
 
     FlickableType {
         id: fl
-        anchors.top: root.top
-        anchors.bottom: root.bottom
+        anchors.top: parent.top
+        anchors.bottom: parent.bottom
         contentHeight: content.height
 
         ColumnLayout {
diff --git a/client/ui/qml/Pages2/PageSetupWizardViewConfig.qml b/client/ui/qml/Pages2/PageSetupWizardViewConfig.qml
index ca679e79..c7b774b4 100644
--- a/client/ui/qml/Pages2/PageSetupWizardViewConfig.qml
+++ b/client/ui/qml/Pages2/PageSetupWizardViewConfig.qml
@@ -50,7 +50,7 @@ PageType {
     FlickableType {
         id: fl
         anchors.top: backButton.bottom
-        anchors.bottom: root.bottom
+        anchors.bottom: parent.bottom
         contentHeight: content.implicitHeight + connectButton.implicitHeight
 
         ColumnLayout {
diff --git a/client/ui/qml/Pages2/PageShare.qml b/client/ui/qml/Pages2/PageShare.qml
index 64641094..504b0cb1 100644
--- a/client/ui/qml/Pages2/PageShare.qml
+++ b/client/ui/qml/Pages2/PageShare.qml
@@ -56,8 +56,8 @@ PageType {
     }
 
     FlickableType {
-        anchors.top: root.top
-        anchors.bottom: root.bottom
+        anchors.top: parent.top
+        anchors.bottom: parent.bottom
         contentHeight: content.height
 
         ColumnLayout {
@@ -121,6 +121,7 @@ PageType {
 
             ParagraphTextType {
                 Layout.fillWidth: true
+                Layout.topMargin: 24
 
                 text: accessTypeSelector.currentIndex === 0 ? qsTr("VPN access without the ability to manage the server") :
                                                               qsTr("Full access to server")
@@ -222,7 +223,6 @@ PageType {
                                             roleName: "isInstalled"
                                             value: true
                                         }
-
                                     ]
                                 }
 
@@ -231,6 +231,7 @@ PageType {
                                 clickedFunction: function () {
                                     serverSelector.text += ", " + selectedText
                                     shareConnectionDrawer.headerText = qsTr("Connection to ") + serverSelector.text
+                                    shareConnectionDrawer.configContentHeaderText = qsTr("File with connection settings to ") + serverSelector.text
                                     ContainersModel.setCurrentlyProcessedContainerIndex(proxyContainersModel.mapToSource(currentIndex))
 
                                     protocolSelector.visible = false
@@ -242,6 +243,7 @@ PageType {
                                 Component.onCompleted: {
                                     serverSelector.text += ", " + selectedText
                                     shareConnectionDrawer.headerText = qsTr("Connection to ") + serverSelector.text
+                                    shareConnectionDrawer.configContentHeaderText = qsTr("File with connection settings to ") + serverSelector.text
                                     ContainersModel.setCurrentlyProcessedContainerIndex(proxyContainersModel.mapToSource(currentIndex))
 
                                     fillConnectionTypeModel()
diff --git a/client/ui/qml/Pages2/PageStart.qml b/client/ui/qml/Pages2/PageStart.qml
index 8b9cefa4..a91cab6a 100644
--- a/client/ui/qml/Pages2/PageStart.qml
+++ b/client/ui/qml/Pages2/PageStart.qml
@@ -59,11 +59,13 @@ PageType {
         anchors.bottom: parent.bottom
 
         topPadding: 8
-        bottomPadding: 34
+        bottomPadding: 8//34
         leftPadding: 96
         rightPadding: 96
 
         background: Rectangle {
+            border.width: 1
+            border.color: "#2C2D30"
             color: "#1C1D21"
         }
 
diff --git a/client/ui/qml/Pages2/PageTest.qml b/client/ui/qml/Pages2/PageTest.qml
index 53ec99fc..d33608f8 100644
--- a/client/ui/qml/Pages2/PageTest.qml
+++ b/client/ui/qml/Pages2/PageTest.qml
@@ -122,7 +122,7 @@ Item {
                                 Layout.rightMargin: 16
 
                                 text: "IP, логин и пароль от сервера"
-                                buttonImage: "qrc:/images/controls/chevron-right.svg"
+                                rightImageSource: "qrc:/images/controls/chevron-right.svg"
                             }
 
                             Rectangle {
@@ -139,7 +139,7 @@ Item {
                                 Layout.rightMargin: 16
 
                                 text: "QR-код, ключ или файл настроек"
-                                buttonImage: "qrc:/images/controls/chevron-right.svg"
+                                rightImageSource: "qrc:/images/controls/chevron-right.svg"
                             }
 
                             Rectangle {

From 249be451f75bfb69778992b742feb23b0f326120 Mon Sep 17 00:00:00 2001
From: "vladimir.kuznetsov" <nethiuswork@gmail.com>
Date: Wed, 21 Jun 2023 20:56:00 +0900
Subject: [PATCH 034/278] moved handling of connection states from qml in
 connectionController - added a check for already installed containers before
 installing the server/container - added a button to scan the server for
 installed containers - added separation for read/write and readonly servers
 for pageHome

---
 client/resources.qrc                          |   1 +
 .../ui/controllers/connectionController.cpp   |  98 ++++++++----
 client/ui/controllers/connectionController.h  |  16 +-
 client/ui/controllers/exportController.cpp    |   2 +-
 client/ui/controllers/importController.cpp    |   2 +-
 client/ui/controllers/installController.cpp   | 150 ++++++++++++++----
 client/ui/controllers/installController.h     |  28 ++--
 client/ui/controllers/pageController.cpp      |   2 +-
 client/ui/controllers/pageController.h        |  16 +-
 client/ui/models/containers_model.cpp         |  90 +++++------
 client/ui/models/servers_model.cpp            |  46 +++---
 client/ui/models/servers_model.h              |  11 +-
 client/ui/qml/Components/ConnectButton.qml    |  79 +++------
 .../qml/Components/ShareConnectionDrawer.qml  |   1 +
 .../qml/Controls2/TextFieldWithHeaderType.qml |   9 +-
 .../qml/Controls2/TextTypes/SmallTextType.qml |  12 ++
 client/ui/qml/Pages2/PageHome.qml             |  71 +++++++--
 .../ui/qml/Pages2/PageSettingsServerData.qml  |  32 +++-
 .../qml/Pages2/PageSetupWizardCredentials.qml |  17 +-
 .../qml/Pages2/PageSetupWizardInstalling.qml  |  23 ++-
 client/ui/qml/Pages2/PageStart.qml            |   5 +
 21 files changed, 466 insertions(+), 245 deletions(-)
 create mode 100644 client/ui/qml/Controls2/TextTypes/SmallTextType.qml

diff --git a/client/resources.qrc b/client/resources.qrc
index a8f8718e..5b5fd593 100644
--- a/client/resources.qrc
+++ b/client/resources.qrc
@@ -268,5 +268,6 @@
         <file>images/controls/github.svg</file>
         <file>images/controls/mail.svg</file>
         <file>images/controls/telegram.svg</file>
+        <file>ui/qml/Controls2/TextTypes/SmallTextType.qml</file>
     </qresource>
 </RCC>
diff --git a/client/ui/controllers/connectionController.cpp b/client/ui/controllers/connectionController.cpp
index dcc15958..aace2857 100644
--- a/client/ui/controllers/connectionController.cpp
+++ b/client/ui/controllers/connectionController.cpp
@@ -6,39 +6,27 @@
 
 ConnectionController::ConnectionController(const QSharedPointer<ServersModel> &serversModel,
                                            const QSharedPointer<ContainersModel> &containersModel,
-                                           const QSharedPointer<VpnConnection> &vpnConnection,
-                                           QObject *parent)
-    : QObject(parent)
-    , m_serversModel(serversModel)
-    , m_containersModel(containersModel)
-    , m_vpnConnection(vpnConnection)
+                                           const QSharedPointer<VpnConnection> &vpnConnection, QObject *parent)
+    : QObject(parent), m_serversModel(serversModel), m_containersModel(containersModel), m_vpnConnection(vpnConnection)
 {
-    connect(m_vpnConnection.get(),
-            &VpnConnection::connectionStateChanged,
-            this,
-            &ConnectionController::connectionStateChanged);
-    connect(this,
-            &ConnectionController::connectToVpn,
-            m_vpnConnection.get(),
-            &VpnConnection::connectToVpn,
+    connect(m_vpnConnection.get(), &VpnConnection::connectionStateChanged, this,
+            &ConnectionController::onConnectionStateChanged);
+    connect(this, &ConnectionController::connectToVpn, m_vpnConnection.get(), &VpnConnection::connectToVpn,
             Qt::QueuedConnection);
-    connect(this,
-            &ConnectionController::disconnectFromVpn,
-            m_vpnConnection.get(),
-            &VpnConnection::disconnectFromVpn,
+    connect(this, &ConnectionController::disconnectFromVpn, m_vpnConnection.get(), &VpnConnection::disconnectFromVpn,
             Qt::QueuedConnection);
 }
 
 void ConnectionController::openConnection()
 {
     int serverIndex = m_serversModel->getDefaultServerIndex();
-    ServerCredentials credentials = qvariant_cast<ServerCredentials>(
-        m_serversModel->data(serverIndex, ServersModel::ServersModelRoles::CredentialsRole));
+    ServerCredentials credentials =
+            qvariant_cast<ServerCredentials>(m_serversModel->data(serverIndex, ServersModel::Roles::CredentialsRole));
 
     DockerContainer container = m_containersModel->getDefaultContainer();
     QModelIndex containerModelIndex = m_containersModel->index(container);
-    const QJsonObject &containerConfig = qvariant_cast<QJsonObject>(m_containersModel->data(containerModelIndex,
-                                                                                            ContainersModel::Roles::ConfigRole));
+    const QJsonObject &containerConfig =
+            qvariant_cast<QJsonObject>(m_containersModel->data(containerModelIndex, ContainersModel::Roles::ConfigRole));
 
     if (container == DockerContainer::None) {
         emit connectionErrorOccurred(tr("VPN Protocols is not installed.\n Please install VPN container at first"));
@@ -59,13 +47,65 @@ QString ConnectionController::getLastConnectionError()
     return errorString(m_vpnConnection->lastError());
 }
 
-bool ConnectionController::isConnected()
+void ConnectionController::onConnectionStateChanged(Vpn::ConnectionState state)
+{
+    m_isConnected = false;
+    m_connectionStateText = tr("Connection...");
+    switch (state) {
+    case Vpn::ConnectionState::Connected: {
+        m_isConnectionInProgress = false;
+        m_isConnected = true;
+        m_connectionStateText = tr("Disconnect");
+        break;
+    }
+    case Vpn::ConnectionState::Connecting: {
+        m_isConnectionInProgress = true;
+        break;
+    }
+    case Vpn::ConnectionState::Reconnecting: {
+        m_isConnectionInProgress = true;
+        m_connectionStateText = tr("Reconnection...");
+        break;
+    }
+    case Vpn::ConnectionState::Disconnected: {
+        m_isConnectionInProgress = false;
+        m_connectionStateText = tr("Connect");
+        break;
+    }
+    case Vpn::ConnectionState::Disconnecting: {
+        m_isConnectionInProgress = true;
+        m_connectionStateText = tr("Disconnection...");
+        break;
+    }
+    case Vpn::ConnectionState::Preparing: {
+        m_isConnectionInProgress = true;
+        break;
+    }
+    case Vpn::ConnectionState::Error: {
+        m_isConnectionInProgress = false;
+        emit connectionErrorOccurred(getLastConnectionError());
+        break;
+    }
+    case Vpn::ConnectionState::Unknown: {
+        m_isConnectionInProgress = false;
+        emit connectionErrorOccurred(getLastConnectionError());
+        break;
+    }
+    }
+    emit connectionStateChanged();
+}
+
+QString ConnectionController::connectionStateText() const
+{
+    return m_connectionStateText;
+}
+
+bool ConnectionController::isConnectionInProgress() const
+{
+    return m_isConnectionInProgress;
+}
+
+bool ConnectionController::isConnected() const
 {
     return m_isConnected;
 }
-
-void ConnectionController::setIsConnected(bool isConnected)
-{
-    m_isConnected = isConnected;
-    emit isConnectedChanged();
-}
diff --git a/client/ui/controllers/connectionController.h b/client/ui/controllers/connectionController.h
index c1e81ea3..421ae84f 100644
--- a/client/ui/controllers/connectionController.h
+++ b/client/ui/controllers/connectionController.h
@@ -11,28 +11,30 @@ class ConnectionController : public QObject
     Q_OBJECT
 
 public:
-    Q_PROPERTY(bool isConnected READ isConnected WRITE setIsConnected NOTIFY isConnectedChanged)
+    Q_PROPERTY(bool isConnected READ isConnected NOTIFY connectionStateChanged)
+    Q_PROPERTY(bool isConnectionInProgress READ isConnectionInProgress NOTIFY connectionStateChanged)
+    Q_PROPERTY(QString connectionStateText READ connectionStateText NOTIFY connectionStateChanged)
 
     explicit ConnectionController(const QSharedPointer<ServersModel> &serversModel,
                                   const QSharedPointer<ContainersModel> &containersModel,
                                   const QSharedPointer<VpnConnection> &vpnConnection,
                                   QObject *parent = nullptr);
 
-    bool isConnected();
-    void setIsConnected(bool isConnected); //todo take state from vpnconnection?
+    bool isConnected() const;
+    bool isConnectionInProgress() const;
+    QString connectionStateText() const;
 
 public slots:
     void openConnection();
     void closeConnection();
 
     QString getLastConnectionError();
-    Vpn::ConnectionState connectionState(){return {};}; //todo update ConnectButton text on page change
+    void onConnectionStateChanged(Vpn::ConnectionState state);
 
 signals:
     void connectToVpn(int serverIndex, const ServerCredentials &credentials, DockerContainer container, const QJsonObject &containerConfig);
     void disconnectFromVpn();
-    void connectionStateChanged(Vpn::ConnectionState state);
-    void isConnectedChanged();
+    void connectionStateChanged();
 
     void connectionErrorOccurred(QString errorMessage);
 
@@ -43,6 +45,8 @@ private:
     QSharedPointer<VpnConnection> m_vpnConnection;
 
     bool m_isConnected = false;
+    bool m_isConnectionInProgress = false;
+    QString m_connectionStateText = tr("Connect");
 };
 
 #endif // CONNECTIONCONTROLLER_H
diff --git a/client/ui/controllers/exportController.cpp b/client/ui/controllers/exportController.cpp
index cbb5a1bb..b6cd7abb 100644
--- a/client/ui/controllers/exportController.cpp
+++ b/client/ui/controllers/exportController.cpp
@@ -44,7 +44,7 @@ void ExportController::generateConnectionConfig()
 {
     int serverIndex = m_serversModel->getCurrentlyProcessedServerIndex();
     ServerCredentials credentials = qvariant_cast<ServerCredentials>(
-        m_serversModel->data(serverIndex, ServersModel::ServersModelRoles::CredentialsRole));
+        m_serversModel->data(serverIndex, ServersModel::Roles::CredentialsRole));
 
     DockerContainer container = static_cast<DockerContainer>(
         m_containersModel->getCurrentlyProcessedContainerIndex());
diff --git a/client/ui/controllers/importController.cpp b/client/ui/controllers/importController.cpp
index 2724f9cd..99de3131 100644
--- a/client/ui/controllers/importController.cpp
+++ b/client/ui/controllers/importController.cpp
@@ -89,7 +89,7 @@ void ImportController::importConfig()
 
         if (!m_config.value(config_key::containers).toArray().isEmpty()) {
             auto newServerIndex = m_serversModel->index(m_serversModel->getServersCount() - 1);
-            m_serversModel->setData(newServerIndex, true, ServersModel::ServersModelRoles::IsDefaultRole);
+            m_serversModel->setData(newServerIndex, true, ServersModel::Roles::IsDefaultRole);
         }
 
         emit importFinished();
diff --git a/client/ui/controllers/installController.cpp b/client/ui/controllers/installController.cpp
index 08ef69d4..5d3bfc2f 100644
--- a/client/ui/controllers/installController.cpp
+++ b/client/ui/controllers/installController.cpp
@@ -2,40 +2,54 @@
 
 #include <QJsonObject>
 
-#include "core/servercontroller.h"
 #include "core/errorstrings.h"
+#include "core/servercontroller.h"
+#include "utilities.h"
 
 InstallController::InstallController(const QSharedPointer<ServersModel> &serversModel,
-                                    const QSharedPointer<ContainersModel> &containersModel,
-                                    const std::shared_ptr<Settings> &settings,
-                                    QObject *parent) : QObject(parent), m_serversModel(serversModel), m_containersModel(containersModel),  m_settings(settings)
-{}
+                                     const QSharedPointer<ContainersModel> &containersModel,
+                                     const std::shared_ptr<Settings> &settings, QObject *parent)
+    : QObject(parent), m_serversModel(serversModel), m_containersModel(containersModel), m_settings(settings)
+{
+}
 
 void InstallController::install(DockerContainer container, int port, TransportProto transportProto)
 {
     Proto mainProto = ContainerProps::defaultProtocol(container);
 
-    QJsonObject containerConfig {
-        { config_key::port, QString::number(port) },
-        { config_key::transport_proto, ProtocolProps::transportProtoToString(transportProto, mainProto) }
-    };
-    QJsonObject config {
-        { config_key::container, ContainerProps::containerToString(container) },
-        { ProtocolProps::protoToString(mainProto), containerConfig }
-    };
+    QJsonObject containerConfig { { config_key::port, QString::number(port) },
+                                  { config_key::transport_proto,
+                                    ProtocolProps::transportProtoToString(transportProto, mainProto) } };
+    QJsonObject config { { config_key::container, ContainerProps::containerToString(container) },
+                         { ProtocolProps::protoToString(mainProto), containerConfig } };
 
     if (m_shouldCreateServer) {
+        if (isServerAlreadyExists()) {
+            return;
+        }
         installServer(container, config);
     } else {
         installContainer(container, config);
     }
 }
 
-void InstallController::installServer(DockerContainer container, QJsonObject& config)
+void InstallController::installServer(DockerContainer container, QJsonObject &config)
 {
-    //todo check if container already installed
     ServerController serverController(m_settings);
-    ErrorCode errorCode = serverController.setupContainer(m_currentlyInstalledServerCredentials, container, config);
+
+    QMap<DockerContainer, QJsonObject> installedContainers;
+    ErrorCode errorCode =
+            serverController.getAlreadyInstalledContainers(m_currentlyInstalledServerCredentials, installedContainers);
+    if (!installedContainers.contains(container)) {
+        errorCode = serverController.setupContainer(m_currentlyInstalledServerCredentials, container, config);
+        installedContainers.insert(container, config);
+    }
+
+    bool isInstalledContainerFound = false;
+    if (!installedContainers.isEmpty()) {
+        isInstalledContainerFound = true;
+    }
+
     if (errorCode == ErrorCode::NoError) {
         QJsonObject server;
         server.insert(config_key::hostName, m_currentlyInstalledServerCredentials.hostName);
@@ -44,43 +58,123 @@ void InstallController::installServer(DockerContainer container, QJsonObject& co
         server.insert(config_key::port, m_currentlyInstalledServerCredentials.port);
         server.insert(config_key::description, m_settings->nextAvailableServerName());
 
-        server.insert(config_key::containers, QJsonArray{ config });
+        QJsonArray containerConfigs;
+        for (const QJsonObject &containerConfig : qAsConst(installedContainers)) {
+            containerConfigs.append(containerConfig);
+        }
+
+        server.insert(config_key::containers, containerConfigs);
         server.insert(config_key::defaultContainer, ContainerProps::containerToString(container));
 
         m_serversModel->addServer(server);
         auto newServerIndex = m_serversModel->index(m_serversModel->getServersCount() - 1);
-        m_serversModel->setData(newServerIndex, true, ServersModel::ServersModelRoles::IsDefaultRole);
+        m_serversModel->setData(newServerIndex, true, ServersModel::Roles::IsDefaultRole);
 
-        emit installServerFinished();
+        emit installServerFinished(isInstalledContainerFound);
         return;
     }
 
     emit installationErrorOccurred(errorString(errorCode));
 }
 
-void InstallController::installContainer(DockerContainer container, QJsonObject& config)
+void InstallController::installContainer(DockerContainer container, QJsonObject &config)
 {
-    //todo check if container already installed
     int serverIndex = m_serversModel->getCurrentlyProcessedServerIndex();
-    ServerCredentials serverCredentials = qvariant_cast<ServerCredentials>(
-        m_serversModel->data(serverIndex, ServersModel::ServersModelRoles::CredentialsRole));
+    ServerCredentials serverCredentials =
+            qvariant_cast<ServerCredentials>(m_serversModel->data(serverIndex, ServersModel::Roles::CredentialsRole));
 
     ServerController serverController(m_settings);
-    ErrorCode errorCode = serverController.setupContainer(serverCredentials, container, config);
+
+    QMap<DockerContainer, QJsonObject> installedContainers;
+    ErrorCode errorCode = serverController.getAlreadyInstalledContainers(serverCredentials, installedContainers);
+
+    bool isInstalledContainerFound = false;
+    if (!installedContainers.isEmpty()) {
+        isInstalledContainerFound = true;
+    }
+
+    if (!installedContainers.contains(container)) {
+        errorCode = serverController.setupContainer(serverCredentials, container, config);
+        installedContainers.insert(container, config);
+    }
+
     if (errorCode == ErrorCode::NoError) {
-        m_containersModel->setData(m_containersModel->index(container), config, ContainersModel::Roles::ConfigRole);
-        emit installContainerFinished();
+        for (auto iterator = installedContainers.begin(); iterator != installedContainers.end(); iterator++) {
+            auto modelIndex = m_containersModel->index(iterator.key());
+            QJsonObject containerConfig =
+                    qvariant_cast<QJsonObject>(m_containersModel->data(modelIndex, ContainersModel::Roles::ConfigRole));
+            if (containerConfig.isEmpty()) {
+                m_containersModel->setData(m_containersModel->index(iterator.key()), iterator.value(),
+                                           ContainersModel::Roles::ConfigRole);
+            }
+        }
+
+        emit installContainerFinished(isInstalledContainerFound);
         return;
     }
 
     emit installationErrorOccurred(errorString(errorCode));
 }
 
-void InstallController::setCurrentlyInstalledServerCredentials(const QString &hostName, const QString &userName, const QString &secretData)
+bool InstallController::isServerAlreadyExists()
+{
+    for (int i = 0; i < m_serversModel->getServersCount(); i++) {
+        auto modelIndex = m_serversModel->index(i);
+        const ServerCredentials credentials =
+                qvariant_cast<ServerCredentials>(m_serversModel->data(modelIndex, ServersModel::Roles::CredentialsRole));
+        if (m_currentlyInstalledServerCredentials.hostName == credentials.hostName
+            && m_currentlyInstalledServerCredentials.port == credentials.port) {
+            emit serverAlreadyExists(i);
+            return true;
+        }
+    }
+    return false;
+}
+
+void InstallController::scanServerForInstalledContainers()
+{
+    int serverIndex = m_serversModel->getCurrentlyProcessedServerIndex();
+    ServerCredentials serverCredentials =
+            qvariant_cast<ServerCredentials>(m_serversModel->data(serverIndex, ServersModel::Roles::CredentialsRole));
+
+    ServerController serverController(m_settings);
+
+    QMap<DockerContainer, QJsonObject> installedContainers;
+    ErrorCode errorCode = serverController.getAlreadyInstalledContainers(serverCredentials, installedContainers);
+
+    if (errorCode == ErrorCode::NoError) {
+        bool isInstalledContainerAddedToGui = false;
+
+        for (auto iterator = installedContainers.begin(); iterator != installedContainers.end(); iterator++) {
+            auto modelIndex = m_containersModel->index(iterator.key());
+            QJsonObject containerConfig =
+                    qvariant_cast<QJsonObject>(m_containersModel->data(modelIndex, ContainersModel::Roles::ConfigRole));
+            if (containerConfig.isEmpty()) {
+                m_containersModel->setData(m_containersModel->index(iterator.key()), iterator.value(),
+                                           ContainersModel::Roles::ConfigRole);
+                isInstalledContainerAddedToGui = true;
+            }
+        }
+
+        emit scanServerFinished(isInstalledContainerAddedToGui);
+        return;
+    }
+
+    emit installationErrorOccurred(errorString(errorCode));
+}
+
+QRegularExpression InstallController::ipAddressPortRegExp()
+{
+    return Utils::ipAddressPortRegExp();
+}
+
+void InstallController::setCurrentlyInstalledServerCredentials(const QString &hostName, const QString &userName,
+                                                               const QString &secretData)
 {
     m_currentlyInstalledServerCredentials.hostName = hostName;
     if (m_currentlyInstalledServerCredentials.hostName.contains(":")) {
-        m_currentlyInstalledServerCredentials.port = m_currentlyInstalledServerCredentials.hostName.split(":").at(1).toInt();
+        m_currentlyInstalledServerCredentials.port =
+                m_currentlyInstalledServerCredentials.hostName.split(":").at(1).toInt();
         m_currentlyInstalledServerCredentials.hostName = m_currentlyInstalledServerCredentials.hostName.split(":").at(0);
     }
     m_currentlyInstalledServerCredentials.userName = userName;
diff --git a/client/ui/controllers/installController.h b/client/ui/controllers/installController.h
index d9e1ad95..6b01e102 100644
--- a/client/ui/controllers/installController.h
+++ b/client/ui/controllers/installController.h
@@ -3,10 +3,10 @@
 
 #include <QObject>
 
-#include "core/defs.h"
 #include "containers/containers_defs.h"
-#include "ui/models/servers_model.h"
+#include "core/defs.h"
 #include "ui/models/containers_model.h"
+#include "ui/models/servers_model.h"
 
 class InstallController : public QObject
 {
@@ -14,22 +14,32 @@ class InstallController : public QObject
 public:
     explicit InstallController(const QSharedPointer<ServersModel> &serversModel,
                                const QSharedPointer<ContainersModel> &containersModel,
-                               const std::shared_ptr<Settings> &settings,
-                               QObject *parent = nullptr);
+                               const std::shared_ptr<Settings> &settings, QObject *parent = nullptr);
 
 public slots:
     void install(DockerContainer container, int port, TransportProto transportProto);
-    void setCurrentlyInstalledServerCredentials(const QString &hostName, const QString &userName, const QString &secretData);
+    void setCurrentlyInstalledServerCredentials(const QString &hostName, const QString &userName,
+                                                const QString &secretData);
     void setShouldCreateServer(bool shouldCreateServer);
 
+    void scanServerForInstalledContainers();
+
+    QRegularExpression ipAddressPortRegExp();
+
 signals:
-    void installContainerFinished();
-    void installServerFinished();
+    void installContainerFinished(bool isInstalledContainerFound);
+    void installServerFinished(bool isInstalledContainerFound);
+
+    void scanServerFinished(bool isInstalledContainerFound);
 
     void installationErrorOccurred(QString errorMessage);
+
+    void serverAlreadyExists(int serverIndex);
+
 private:
-    void installServer(DockerContainer container, QJsonObject& config);
-    void installContainer(DockerContainer container, QJsonObject& config);
+    void installServer(DockerContainer container, QJsonObject &config);
+    void installContainer(DockerContainer container, QJsonObject &config);
+    bool isServerAlreadyExists();
 
     QSharedPointer<ServersModel> m_serversModel;
     QSharedPointer<ContainersModel> m_containersModel;
diff --git a/client/ui/controllers/pageController.cpp b/client/ui/controllers/pageController.cpp
index e49177a5..4ee9b3bf 100644
--- a/client/ui/controllers/pageController.cpp
+++ b/client/ui/controllers/pageController.cpp
@@ -10,7 +10,7 @@ QString PageController::getInitialPage()
     if (m_serversModel->getServersCount()) {
         if (m_serversModel->getDefaultServerIndex() < 0) {
             auto defaultServerIndex = m_serversModel->index(0);
-            m_serversModel->setData(defaultServerIndex, true, ServersModel::ServersModelRoles::IsDefaultRole);
+            m_serversModel->setData(defaultServerIndex, true, ServersModel::Roles::IsDefaultRole);
         }
         return getPagePath(PageLoader::PageEnum::PageStart);
     } else {
diff --git a/client/ui/controllers/pageController.h b/client/ui/controllers/pageController.h
index 587e0e38..384d3c8d 100644
--- a/client/ui/controllers/pageController.h
+++ b/client/ui/controllers/pageController.h
@@ -40,14 +40,9 @@ namespace PageLoader
     };
     Q_ENUM_NS(PageEnum)
 
-    static void declareQmlPageEnum() {
-        qmlRegisterUncreatableMetaObject(
-            PageLoader::staticMetaObject,
-            "PageEnum",
-            1, 0,
-            "PageEnum",
-            "Error: only enums"
-            );
+    static void declareQmlPageEnum()
+    {
+        qmlRegisterUncreatableMetaObject(PageLoader::staticMetaObject, "PageEnum", 1, 0, "PageEnum", "Error: only enums");
     }
 }
 
@@ -55,8 +50,7 @@ class PageController : public QObject
 {
     Q_OBJECT
 public:
-    explicit PageController(const QSharedPointer<ServersModel> &serversModel,
-                            QObject *parent = nullptr);
+    explicit PageController(const QSharedPointer<ServersModel> &serversModel, QObject *parent = nullptr);
 
 public slots:
     QString getInitialPage();
@@ -64,9 +58,11 @@ public slots:
 
 signals:
     void goToPageHome();
+    void goToPageSettings();
     void restorePageHomeState(bool isContainerInstalled = false);
     void replaceStartPage();
     void showErrorMessage(QString errorMessage);
+    void showInfoMessage(QString message);
 
 private:
     QSharedPointer<ServersModel> m_serversModel;
diff --git a/client/ui/models/containers_model.cpp b/client/ui/models/containers_model.cpp
index 1caf6944..f095dd02 100644
--- a/client/ui/models/containers_model.cpp
+++ b/client/ui/models/containers_model.cpp
@@ -2,7 +2,8 @@
 
 #include "core/servercontroller.h"
 
-ContainersModel::ContainersModel(std::shared_ptr<Settings> settings, QObject *parent) : m_settings(settings), QAbstractListModel(parent)
+ContainersModel::ContainersModel(std::shared_ptr<Settings> settings, QObject *parent)
+    : m_settings(settings), QAbstractListModel(parent)
 {
 }
 
@@ -21,25 +22,25 @@ bool ContainersModel::setData(const QModelIndex &index, const QVariant &value, i
     DockerContainer container = ContainerProps::allContainers().at(index.row());
 
     switch (role) {
-        case NameRole:
-            //        return ContainerProps::containerHumanNames().value(container);
-        case DescRole:
-            //        return ContainerProps::containerDescriptions().value(container);
-        case ConfigRole: //todo save to model also
-        m_settings->setContainerConfig(m_currentlyProcessedServerIndex,
-                                       container,
-                                       value.toJsonObject());
-        case ServiceTypeRole:
-            //        return ContainerProps::containerService(container);
-        case DockerContainerRole:
-            //        return container;
-        case IsInstalledRole:
-            //        return m_settings->containers(m_currentlyProcessedServerIndex).contains(container);
-        case IsDefaultRole: {
-            m_settings->setDefaultContainer(m_currentlyProcessedServerIndex, container);
-            m_defaultContainerIndex = container;
-            emit defaultContainerChanged();
-        }
+    case NameRole:
+        //        return ContainerProps::containerHumanNames().value(container);
+    case DescRole:
+        //        return ContainerProps::containerDescriptions().value(container);
+    case ConfigRole: {
+        m_settings->setContainerConfig(m_currentlyProcessedServerIndex, container, value.toJsonObject());
+        m_containers = m_settings->containers(m_currentlyProcessedServerIndex);
+    }
+    case ServiceTypeRole:
+    //        return ContainerProps::containerService(container);
+    case DockerContainerRole:
+        //        return container;
+    case IsInstalledRole:
+    //        return m_settings->containers(m_currentlyProcessedServerIndex).contains(container);
+    case IsDefaultRole: {
+        m_settings->setDefaultContainer(m_currentlyProcessedServerIndex, container);
+        m_defaultContainerIndex = container;
+        emit defaultContainerChanged();
+    }
     }
 
     emit dataChanged(index, index);
@@ -48,40 +49,30 @@ bool ContainersModel::setData(const QModelIndex &index, const QVariant &value, i
 
 QVariant ContainersModel::data(const QModelIndex &index, int role) const
 {
-    if (!index.isValid() || index.row() < 0
-            || index.row() >= ContainerProps::allContainers().size()) {
+    if (!index.isValid() || index.row() < 0 || index.row() >= ContainerProps::allContainers().size()) {
         return QVariant();
     }
 
     DockerContainer container = ContainerProps::allContainers().at(index.row());
 
     switch (role) {
-        case NameRole:
-            return ContainerProps::containerHumanNames().value(container);
-        case DescRole:
-            return ContainerProps::containerDescriptions().value(container);
-        case ConfigRole: {
-            if (container == DockerContainer::None) return QJsonObject();
-            return m_containers.value(container);
+    case NameRole: return ContainerProps::containerHumanNames().value(container);
+    case DescRole: return ContainerProps::containerDescriptions().value(container);
+    case ConfigRole: {
+        if (container == DockerContainer::None) {
+            return QJsonObject();
         }
-        case ServiceTypeRole:
-            return ContainerProps::containerService(container);
-        case DockerContainerRole:
-            return container;
-        case IsEasySetupContainerRole:
-            return ContainerProps::isEasySetupContainer(container);
-        case EasySetupHeaderRole:
-            return ContainerProps::easySetupHeader(container);
-        case EasySetupDescriptionRole:
-            return ContainerProps::easySetupDescription(container);
-        case IsInstalledRole:
-            return m_containers.contains(container);
-        case IsCurrentlyProcessedRole:
-            return container == static_cast<DockerContainer>(m_currentlyProcessedContainerIndex);
-        case IsDefaultRole:
-            return container == m_defaultContainerIndex;
-        case IsSupportedRole:
-            return ContainerProps::isSupportedByCurrentPlatform(container);
+        return m_containers.value(container);
+    }
+    case ServiceTypeRole: return ContainerProps::containerService(container);
+    case DockerContainerRole: return container;
+    case IsEasySetupContainerRole: return ContainerProps::isEasySetupContainer(container);
+    case EasySetupHeaderRole: return ContainerProps::easySetupHeader(container);
+    case EasySetupDescriptionRole: return ContainerProps::easySetupDescription(container);
+    case IsInstalledRole: return m_containers.contains(container);
+    case IsCurrentlyProcessedRole: return container == static_cast<DockerContainer>(m_currentlyProcessedContainerIndex);
+    case IsDefaultRole: return container == m_defaultContainerIndex;
+    case IsSupportedRole: return ContainerProps::isSupportedByCurrentPlatform(container);
     }
 
     return QVariant();
@@ -130,7 +121,7 @@ void ContainersModel::removeAllContainers()
         endResetModel();
     }
 
-    //todo process errors
+    // todo process errors
 }
 
 void ContainersModel::clearCachedProfiles()
@@ -141,7 +132,8 @@ void ContainersModel::clearCachedProfiles()
     }
 }
 
-QHash<int, QByteArray> ContainersModel::roleNames() const {
+QHash<int, QByteArray> ContainersModel::roleNames() const
+{
     QHash<int, QByteArray> roles;
     roles[NameRole] = "name";
     roles[DescRole] = "description";
diff --git a/client/ui/models/servers_model.cpp b/client/ui/models/servers_model.cpp
index f027a90d..94267ed1 100644
--- a/client/ui/models/servers_model.cpp
+++ b/client/ui/models/servers_model.cpp
@@ -1,6 +1,7 @@
 #include "servers_model.h"
 
-ServersModel::ServersModel(std::shared_ptr<Settings> settings, QObject *parent) : m_settings(settings), QAbstractListModel(parent)
+ServersModel::ServersModel(std::shared_ptr<Settings> settings, QObject *parent)
+    : m_settings(settings), QAbstractListModel(parent)
 {
     m_servers = m_settings->serversArray();
     m_defaultServerIndex = m_settings->defaultServerIndex();
@@ -14,8 +15,7 @@ int ServersModel::rowCount(const QModelIndex &parent) const
 
 bool ServersModel::setData(const QModelIndex &index, const QVariant &value, int role)
 {
-    if (!index.isValid() || index.row() < 0
-        || index.row() >= static_cast<int>(m_servers.size())) {
+    if (!index.isValid() || index.row() < 0 || index.row() >= static_cast<int>(m_servers.size())) {
         return false;
     }
 
@@ -29,8 +29,7 @@ bool ServersModel::setData(const QModelIndex &index, const QVariant &value, int
         break;
     }
     case IsDefaultRole: {
-        m_settings->setDefaultServer(index.row());
-        m_defaultServerIndex = m_settings->defaultServerIndex();
+        setDefaultServerIndex(index.row());
         break;
     }
     default: {
@@ -58,16 +57,11 @@ QVariant ServersModel::data(const QModelIndex &index, int role) const
         }
         return description;
     }
-    case HostNameRole:
-        return server.value(config_key::hostName).toString();
-    case CredentialsRole:
-        return QVariant::fromValue(m_settings->serverCredentials(index.row()));
-    case CredentialsLoginRole:
-        return m_settings->serverCredentials(index.row()).userName;
-    case IsDefaultRole:
-        return index.row() == m_defaultServerIndex;
-    case IsCurrentlyProcessedRole:
-        return index.row() == m_currenlyProcessedServerIndex;
+    case HostNameRole: return server.value(config_key::hostName).toString();
+    case CredentialsRole: return QVariant::fromValue(m_settings->serverCredentials(index.row()));
+    case CredentialsLoginRole: return m_settings->serverCredentials(index.row()).userName;
+    case IsDefaultRole: return index.row() == m_defaultServerIndex;
+    case IsCurrentlyProcessedRole: return index.row() == m_currenlyProcessedServerIndex;
     }
 
     return QVariant();
@@ -92,6 +86,7 @@ const int ServersModel::getServersCount()
 void ServersModel::setCurrentlyProcessedServerIndex(int index)
 {
     m_currenlyProcessedServerIndex = index;
+    emit currentlyProcessedServerIndexChanged();
 }
 
 int ServersModel::getCurrentlyProcessedServerIndex()
@@ -104,6 +99,12 @@ bool ServersModel::isDefaultServerCurrentlyProcessed()
     return m_defaultServerIndex == m_currenlyProcessedServerIndex;
 }
 
+bool ServersModel::isCurrentlyProcessedServerHasWriteAccess()
+{
+    auto credentials = m_settings->serverCredentials(m_currenlyProcessedServerIndex);
+    return (!credentials.userName.isEmpty() && !credentials.secretData.isEmpty());
+}
+
 void ServersModel::addServer(const QJsonObject &server)
 {
     beginResetModel();
@@ -119,18 +120,19 @@ void ServersModel::removeServer()
     m_servers = m_settings->serversArray();
 
     if (m_settings->defaultServerIndex() == m_currenlyProcessedServerIndex) {
-        m_settings->setDefaultServer(0);
+        setDefaultServerIndex(0);
     } else if (m_settings->defaultServerIndex() > m_currenlyProcessedServerIndex) {
-        m_settings->setDefaultServer(m_settings->defaultServerIndex() - 1);
+        setDefaultServerIndex(m_settings->defaultServerIndex() - 1);
     }
 
     if (m_settings->serversCount() == 0) {
-        m_settings->setDefaultServer(-1);
+        setDefaultServerIndex(-1);
     }
     endResetModel();
 }
 
-QHash<int, QByteArray> ServersModel::roleNames() const {
+QHash<int, QByteArray> ServersModel::roleNames() const
+{
     QHash<int, QByteArray> roles;
     roles[NameRole] = "name";
     roles[HostNameRole] = "hostName";
@@ -140,3 +142,9 @@ QHash<int, QByteArray> ServersModel::roleNames() const {
     roles[IsCurrentlyProcessedRole] = "isCurrentlyProcessed";
     return roles;
 }
+
+void ServersModel::setDefaultServerIndex(const int index)
+{
+    m_settings->setDefaultServer(index);
+    m_defaultServerIndex = m_settings->defaultServerIndex();
+}
diff --git a/client/ui/models/servers_model.h b/client/ui/models/servers_model.h
index be13d61b..891d6ad1 100644
--- a/client/ui/models/servers_model.h
+++ b/client/ui/models/servers_model.h
@@ -5,7 +5,8 @@
 
 #include "settings.h"
 
-struct ServerModelContent {
+struct ServerModelContent
+{
     QString desc;
     QString address;
     bool isDefault;
@@ -15,7 +16,7 @@ class ServersModel : public QAbstractListModel
 {
     Q_OBJECT
 public:
-    enum ServersModelRoles {
+    enum Roles {
         NameRole = Qt::UserRole + 1,
         HostNameRole,
         CredentialsRole,
@@ -35,6 +36,7 @@ public:
 public slots:
     const int getDefaultServerIndex();
     bool isDefaultServerCurrentlyProcessed();
+    bool isCurrentlyProcessedServerHasWriteAccess();
 
     const int getServersCount();
 
@@ -47,7 +49,12 @@ public slots:
 protected:
     QHash<int, QByteArray> roleNames() const override;
 
+signals:
+    void currentlyProcessedServerIndexChanged();
+
 private:
+    void setDefaultServerIndex(const int index);
+
     QJsonArray m_servers;
 
     std::shared_ptr<Settings> m_settings;
diff --git a/client/ui/qml/Components/ConnectButton.qml b/client/ui/qml/Components/ConnectButton.qml
index 3c34a6b0..626c4ffb 100644
--- a/client/ui/qml/Components/ConnectButton.qml
+++ b/client/ui/qml/Components/ConnectButton.qml
@@ -15,7 +15,7 @@ Button {
         }
     }
 
-    text: qsTr("Connect")
+    text: ConnectionController.connectionStateText
 
     background: Item {
         clip: true
@@ -26,13 +26,21 @@ Button {
         Image {
             id: border
 
-            source: connectionProccess.running ? "/images/connectionProgress.svg" :
-                                                 ConnectionController.isConnected ? "/images/connectionOff.svg" : "/images/connectionOn.svg"
+            source: {
+                if (ConnectionController.isConnectionInProgress) {
+                    return "/images/connectionProgress.svg"
+                } else if (ConnectionController.isConnected) {
+                    return "/images/connectionOff.svg"
+                } else {
+                   return "/images/connectionOn.svg"
+                }
+            }
+
             RotationAnimator {
                 id: connectionProccess
 
                 target: border
-                running: false
+                running: ConnectionController.isConnectionInProgress
                 from: 0
                 to: 360
                 loops: Animation.Infinite
@@ -67,63 +75,12 @@ Button {
     }
 
     onClicked: {
-        connectionProccess.running ? ConnectionController.closeConnection() : ConnectionController.openConnection()
-    }
-
-    Connections {
-        target: ConnectionController
-        function onConnectionStateChanged(state) {
-            switch(state) {
-                case ConnectionState.Unknown: {
-                    console.log("Unknown")
-                    break
-                }
-                case ConnectionState.Disconnected: {
-                    console.log("Disconnected")
-                    connectionProccess.running = false
-                    root.text = qsTr("Connect")
-                    ConnectionController.isConnected = false
-                    break
-                }
-                case ConnectionState.Preparing: {
-                    console.log("Preparing")
-                    connectionProccess.running = true
-                    root.text = qsTr("Connection...")
-                    break
-                }
-                case ConnectionState.Connecting: {
-                    console.log("Connecting")
-                    connectionProccess.running = true
-                    root.text = qsTr("Connection...")
-                    break
-                }
-                case ConnectionState.Connected: {
-                    console.log("Connected")
-                    connectionProccess.running = false
-                    root.text = qsTr("Disconnect")
-                    ConnectionController.isConnected = true
-                    break
-                }
-                case ConnectionState.Disconnecting: {
-                    console.log("Disconnecting")
-                    connectionProccess.running = true
-                    root.text = qsTr("Disconnection...")
-                    break
-                }
-                case ConnectionState.Reconnecting: {
-                    console.log("Reconnecting")
-                    connectionProccess.running = true
-                    root.text = qsTr("Reconnection...")
-                    break
-                }
-                case ConnectionState.Error: {
-                    console.log("Error")
-                    connectionProccess.running = false
-                    root.text = qsTr("Connect")
-                    PageController.showErrorMessage(ConnectionController.getLastConnectionError())
-                    break
-                }
-            }
+        if (ConnectionController.isConnectionInProgress) {
+            ConnectionController.closeConnection()
+        } else if (ConnectionController.isConnected) {
+            ConnectionController.closeConnection()
+        } else {
+            ConnectionController.openConnection()
         }
     }
 }
diff --git a/client/ui/qml/Components/ShareConnectionDrawer.qml b/client/ui/qml/Components/ShareConnectionDrawer.qml
index 627eba81..e03738c8 100644
--- a/client/ui/qml/Components/ShareConnectionDrawer.qml
+++ b/client/ui/qml/Components/ShareConnectionDrawer.qml
@@ -141,6 +141,7 @@ DrawerType {
                                 Layout.bottomMargin: 16
 
                                 padding: 0
+                                leftPadding: 0
                                 height: 24
 
                                 color: "#D7D8DB"
diff --git a/client/ui/qml/Controls2/TextFieldWithHeaderType.qml b/client/ui/qml/Controls2/TextFieldWithHeaderType.qml
index b41f0b40..8ad92d54 100644
--- a/client/ui/qml/Controls2/TextFieldWithHeaderType.qml
+++ b/client/ui/qml/Controls2/TextFieldWithHeaderType.qml
@@ -2,6 +2,8 @@ import QtQuick
 import QtQuick.Controls
 import QtQuick.Layouts
 
+import "TextTypes"
+
 Item {
     id: root
 
@@ -34,15 +36,10 @@ Item {
         anchors.fill: backgroud
         ColumnLayout {
 
-            Text {
+            LabelTextType {
                 text: root.headerText
                 color: "#878b91"
-                font.pixelSize: 13
-                font.weight: 400
-                font.family: "PT Root UI VF"
-                font.letterSpacing: 0.02
 
-                height: 16
                 Layout.fillWidth: true
                 Layout.rightMargin: 16
                 Layout.leftMargin: 16
diff --git a/client/ui/qml/Controls2/TextTypes/SmallTextType.qml b/client/ui/qml/Controls2/TextTypes/SmallTextType.qml
new file mode 100644
index 00000000..96f3342d
--- /dev/null
+++ b/client/ui/qml/Controls2/TextTypes/SmallTextType.qml
@@ -0,0 +1,12 @@
+import QtQuick
+
+Text {
+    height: 20
+
+    color: "#D7D8DB"
+    font.pixelSize: 14
+    font.weight: Font.Normal
+    font.family: "PT Root UI VF"
+
+    wrapMode: Text.WordWrap
+}
diff --git a/client/ui/qml/Pages2/PageHome.qml b/client/ui/qml/Pages2/PageHome.qml
index 282c1408..a4e90117 100644
--- a/client/ui/qml/Pages2/PageHome.qml
+++ b/client/ui/qml/Pages2/PageHome.qml
@@ -21,8 +21,8 @@ PageType {
 
     property string borderColor: "#2C2D30"
 
-    property string currentServerName: serversMenuContent.currentItem.delegateData.name
-    property string currentServerHostName: serversMenuContent.currentItem.delegateData.hostName
+    property string currentServerName
+    property string currentServerHostName
     property string currentContainerName
 
     ConnectButton {
@@ -93,7 +93,15 @@ PageType {
             Layout.bottomMargin: 44
             Layout.alignment: Qt.AlignHCenter | Qt.AlignVCenter
 
-            text: root.currentContainerName + " | " + root.currentServerHostName
+            text: {
+                var string = ""
+                if (SettingsController.isAmneziaDnsEnabled()) {
+                    string += "Amnezia DNS | "
+                }
+
+                string += root.currentContainerName + " | " + root.currentServerHostName
+                return string
+            }
         }
     }
 
@@ -153,6 +161,8 @@ PageType {
                     headerBackButtonImage: "qrc:/images/controls/arrow-left.svg"
 
                     rootButtonClickedFunction: function() {
+                        // todo check if server index changed before set Currently processed
+                        // todo make signal slot for change server index in containersModel
                         ServersModel.setCurrentlyProcessedServerIndex(serversMenuContent.currentIndex)
                         ContainersModel.setCurrentlyProcessedServerIndex(serversMenuContent.currentIndex)
                         containersDropDown.menuVisible = true
@@ -161,20 +171,45 @@ PageType {
                     listView: HomeContainersListView {
                         rootWidth: root.width
 
+                        Connections {
+                            target: ServersModel
+
+                            function onCurrentlyProcessedServerIndexChanged() {
+                                updateContainersModelFilters()
+                            }
+
+                            function updateContainersModelFilters() {
+                                if (ServersModel.isCurrentlyProcessedServerHasWriteAccess()) {
+                                    proxyContainersModel.filters = [serviceTypeFilter, supportedFilter]
+                                } else {
+                                    proxyContainersModel.filters = installedFilter
+                                }
+                            }
+                        }
+
+                        ValueFilter {
+                            id: serviceTypeFilter
+                            roleName: "serviceType"
+                            value: ProtocolEnum.Vpn
+                        }
+                        ValueFilter {
+                            id: supportedFilter
+                            roleName: "isSupported"
+                            value: true
+                        }
+                        ValueFilter {
+                            id: installedFilter
+                            roleName: "isInstalled"
+                            value: true
+                        }
+
                         model: SortFilterProxyModel {
                             id: proxyContainersModel
                             sourceModel: ContainersModel
-                            filters: [
-                                ValueFilter {
-                                    roleName: "serviceType"
-                                    value: ProtocolEnum.Vpn
-                                },
-                                ValueFilter {
-                                    roleName: "isSupported"
-                                    value: true
-                                }
-                            ]
+
+                            Component.onCompleted: updateContainersModelFilters()
                         }
+
                         currentIndex: ContainersModel.getDefaultContainer()
                     }
                 }
@@ -272,6 +307,9 @@ PageType {
 
                                         isDefault = true
                                         ContainersModel.setCurrentlyProcessedServerIndex(index)
+
+                                        root.currentServerName = name
+                                        root.currentServerHostName = hostName
                                     }
 
                                     MouseArea {
@@ -302,6 +340,13 @@ PageType {
                                 Layout.fillWidth: true
                             }
                         }
+
+                        Component.onCompleted: {
+                            if (serversMenuContent.currentIndex === index) {
+                                root.currentServerName = name
+                                root.currentServerHostName = hostName
+                            }
+                        }
                     }
                 }
             }
diff --git a/client/ui/qml/Pages2/PageSettingsServerData.qml b/client/ui/qml/Pages2/PageSettingsServerData.qml
index 6179983b..b98d2b8c 100644
--- a/client/ui/qml/Pages2/PageSettingsServerData.qml
+++ b/client/ui/qml/Pages2/PageSettingsServerData.qml
@@ -14,6 +14,21 @@ import "../Components"
 PageType {
     id: root
 
+    Connections {
+        target: InstallController
+
+        function onScanServerFinished(isInstalledContainerFound) {
+            var message = ""
+            if (isInstalledContainerFound) {
+                message = qsTr("All installed containers have been added to the application")
+            } else {
+                message = qsTr("Не найдено установленных контейнеров")
+            }
+
+            PageController.showErrorMessage(message)
+        }
+    }
+
     FlickableType {
         id: fl
         anchors.top: parent.top
@@ -30,8 +45,8 @@ PageType {
             LabelWithButtonType {
                 Layout.fillWidth: true
 
-                text: "Clear Amnezia cache"
-                descriptionText: "May be needed when changing other settings"
+                text: qsTr("Clear Amnezia cache")
+                descriptionText: qsTr("May be needed when changing other settings")
 
                 clickedFunction: function() {
                     questionDrawer.headerText = qsTr("Clear cached profiles?")
@@ -52,6 +67,19 @@ PageType {
 
             DividerType {}
 
+            LabelWithButtonType {
+                Layout.fillWidth: true
+
+                text: qsTr("Проверить сервер на наличие ранее установленных сервисов Amnezia")
+                descriptionText: qsTr("Добавим их в приложение, если они не отображались")
+
+                clickedFunction: function() {
+                    InstallController.scanServerForInstalledContainers()
+                }
+            }
+
+            DividerType {}
+
             LabelWithButtonType {
                 Layout.fillWidth: true
 
diff --git a/client/ui/qml/Pages2/PageSetupWizardCredentials.qml b/client/ui/qml/Pages2/PageSetupWizardCredentials.qml
index 3f037035..fa6b1f92 100644
--- a/client/ui/qml/Pages2/PageSetupWizardCredentials.qml
+++ b/client/ui/qml/Pages2/PageSetupWizardCredentials.qml
@@ -7,6 +7,7 @@ import PageEnum 1.0
 import "./"
 import "../Controls2"
 import "../Config"
+import "../Controls2/TextTypes"
 
 PageType {
     id: root
@@ -42,28 +43,32 @@ PageType {
             HeaderType {
                 Layout.fillWidth: true
 
-                headerText: "Подключение к серверу"
+                headerText: qsTr("Server connection")
             }
 
             TextFieldWithHeaderType {
                 id: hostname
 
                 Layout.fillWidth: true
-                headerText: "Server IP address [:port]"
+                headerText: qsTr("Server IP address [:port]")
+                textFieldPlaceholderText: qsTr("Enter the address in the format 255.255.255.255:88")
+                textField.validator: RegularExpressionValidator {
+                    regularExpression: InstallController.ipAddressPortRegExp()
+                }
             }
 
             TextFieldWithHeaderType {
                 id: username
 
                 Layout.fillWidth: true
-                headerText: "Login to connect via SSH"
+                headerText: qsTr("Login to connect via SSH")
             }
 
             TextFieldWithHeaderType {
                 id: secretData
 
                 Layout.fillWidth: true
-                headerText: "Password / Private key"
+                headerText: qsTr("Password / Private key")
                 textField.echoMode: TextInput.Password
             }
 
@@ -71,7 +76,7 @@ PageType {
                 Layout.fillWidth: true
                 Layout.topMargin: 24
 
-                text: qsTr("Настроить сервер простым образом")
+                text: qsTr("Set up a server the easy way")
 
                 onClicked: function() {
                     InstallController.setShouldCreateServer(true)
@@ -92,7 +97,7 @@ PageType {
                 textColor: "#D7D8DB"
                 borderWidth: 1
 
-                text: qsTr("Выбрать протокол для установки")
+                text: qsTr("Select protocol to install")
 
                 onClicked: function() {
                     InstallController.setShouldCreateServer(true)
diff --git a/client/ui/qml/Pages2/PageSetupWizardInstalling.qml b/client/ui/qml/Pages2/PageSetupWizardInstalling.qml
index 9631e258..d0fdeabd 100644
--- a/client/ui/qml/Pages2/PageSetupWizardInstalling.qml
+++ b/client/ui/qml/Pages2/PageSetupWizardInstalling.qml
@@ -24,7 +24,7 @@ PageType {
             PageController.showErrorMessage(errorMessage)
         }
 
-        function onInstallContainerFinished() {
+        function onInstallContainerFinished(isInstalledContainerFound) {
             goToStartPage()
             if (stackView.currentItem.objectName === PageController.getPagePath(PageEnum.PageHome)) {
                 PageController.restorePageHomeState(true)
@@ -34,9 +34,15 @@ PageType {
             } else {
                 goToPage(PageEnum.PageHome)
             }
+
+            if (isInstalledContainerFound) {
+                //todo change to info message
+                PageController.showErrorMessage(qsTr("The container you are trying to install is already installed on the server. " +
+                                                     "All installed containers have been added to the application"))
+            }
         }
 
-        function onInstallServerFinished() {
+        function onInstallServerFinished(isInstalledContainerFound) {
             goToStartPage()
             if (stackView.currentItem.objectName === PageController.getPagePath(PageEnum.PageHome)) {
                 PageController.restorePageHomeState()
@@ -46,6 +52,19 @@ PageType {
                 var pagePath = PageController.getPagePath(PageEnum.PageStart)
                 stackView.replace(pagePath, { "objectName" : pagePath })
             }
+
+            if (isInstalledContainerFound) {
+                PageController.showErrorMessage(qsTr("The container you are trying to install is already installed on the server. " +
+                                                     "All installed containers have been added to the application"))
+            }
+        }
+
+        function onServerAlreadyExists(serverIndex) {
+            goToStartPage()
+            ServersModel.setCurrentlyProcessedServerIndex(serverIndex)
+            goToPage(PageEnum.PageSettingsServerInfo, false)
+
+            PageController.showErrorMessage(qsTr("The server has already been added to the application"))
         }
     }
 
diff --git a/client/ui/qml/Pages2/PageStart.qml b/client/ui/qml/Pages2/PageStart.qml
index a91cab6a..1307ee05 100644
--- a/client/ui/qml/Pages2/PageStart.qml
+++ b/client/ui/qml/Pages2/PageStart.qml
@@ -20,6 +20,11 @@ PageType {
             tabBarStackView.goToTabBarPage(PageController.getPagePath(PageEnum.PageHome))
         }
 
+        function onGoToPageSettings() {
+            tabBar.currentIndex = 2
+            tabBarStackView.goToTabBarPage(PageController.getPagePath(PageEnum.PageSettings))
+        }
+
         function onShowErrorMessage(errorMessage) {
             popupErrorMessage.popupErrorMessageText = errorMessage
             popupErrorMessage.open()

From 2ef53c6df9b7d520058dd075c2fb013292ada48a Mon Sep 17 00:00:00 2001
From: "vladimir.kuznetsov" <nethiuswork@gmail.com>
Date: Fri, 23 Jun 2023 15:24:40 +0900
Subject: [PATCH 035/278] added separation for read/write and readonly servers
 for pageSettingsServerProtocols, PageSettingsServerServices,
 PageSettingsServerData - added fields validations for
 pageSetupWizardCredentials

---
 client/amnezia_application.cpp                |  94 +++++------
 client/resources.qrc                          |   1 +
 client/ui/controllers/exportController.cpp    |  55 +++----
 client/ui/controllers/importController.cpp    |  70 ++++----
 client/ui/controllers/installController.cpp   |   3 +-
 client/ui/models/containers_model.cpp         |   2 +-
 client/ui/models/containers_model.h           |   7 +-
 client/ui/models/servers_model.cpp            |  30 ++--
 client/ui/models/servers_model.h              |  23 ++-
 client/ui/pages_logic/ServerListLogic.cpp     |  38 +++--
 .../qml/Controls2/TextFieldWithHeaderType.qml | 151 ++++++++++--------
 .../ui/qml/Filters/ContainersModelFilters.qml |  47 ++++++
 client/ui/qml/Pages2/PageHome.qml             |  46 ++----
 .../ui/qml/Pages2/PageSettingsServerData.qml  |  29 +++-
 .../ui/qml/Pages2/PageSettingsServerInfo.qml  |  14 +-
 .../Pages2/PageSettingsServerProtocols.qml    |  40 +++--
 .../qml/Pages2/PageSettingsServerServices.qml |  40 +++--
 .../ui/qml/Pages2/PageSettingsServersList.qml |   3 +-
 .../qml/Pages2/PageSetupWizardCredentials.qml |  29 ++++
 .../qml/Pages2/PageSetupWizardInstalling.qml  |   2 +-
 client/ui/qml/Pages2/PageShare.qml            |  40 +++--
 client/ui/qml/Pages2/PageStart.qml            |  27 +++-
 22 files changed, 466 insertions(+), 325 deletions(-)
 create mode 100644 client/ui/qml/Filters/ContainersModelFilters.qml

diff --git a/client/amnezia_application.cpp b/client/amnezia_application.cpp
index b9aa0f74..b89e5ba9 100644
--- a/client/amnezia_application.cpp
+++ b/client/amnezia_application.cpp
@@ -1,29 +1,28 @@
 #include "amnezia_application.h"
 
 #include <QFontDatabase>
+#include <QQuickStyle>
 #include <QStandardPaths>
 #include <QTimer>
 #include <QTranslator>
-#include <QQuickStyle>
 
-#include "logger.h"
 #include "defines.h"
+#include "logger.h"
 
 #include "platforms/ios/QRCodeReaderBase.h"
 
 #include "ui/pages.h"
 
 #if defined(Q_OS_IOS)
-#include "platforms/ios/QtAppDelegate-C-Interface.h"
+    #include "platforms/ios/QtAppDelegate-C-Interface.h"
 #endif
 
 #if defined(Q_OS_ANDROID) || defined(Q_OS_IOS)
-    AmneziaApplication::AmneziaApplication(int &argc, char *argv[]):
-        AMNEZIA_BASE_CLASS(argc, argv)
+AmneziaApplication::AmneziaApplication(int &argc, char *argv[]) : AMNEZIA_BASE_CLASS(argc, argv)
 #else
-    AmneziaApplication::AmneziaApplication(int &argc, char *argv[], bool allowSecondary,
-        SingleApplication::Options options, int timeout, const QString &userData):
-    SingleApplication(argc, argv, allowSecondary, options, timeout, userData)
+AmneziaApplication::AmneziaApplication(int &argc, char *argv[], bool allowSecondary, SingleApplication::Options options,
+                                       int timeout, const QString &userData)
+    : SingleApplication(argc, argv, allowSecondary, options, timeout, userData)
 #endif
 {
     setQuitOnLastWindowClosed(false);
@@ -51,12 +50,14 @@
 AmneziaApplication::~AmneziaApplication()
 {
     if (m_engine) {
-        QObject::disconnect(m_engine, 0,0,0);
+        QObject::disconnect(m_engine, 0, 0, 0);
         delete m_engine;
     }
 
-    if (m_protocolProps) delete m_protocolProps;
-    if (m_containerProps) delete m_containerProps;
+    if (m_protocolProps)
+        delete m_protocolProps;
+    if (m_containerProps)
+        delete m_containerProps;
 }
 
 void AmneziaApplication::init()
@@ -64,11 +65,13 @@ void AmneziaApplication::init()
     m_engine = new QQmlApplicationEngine;
 
     const QUrl url(QStringLiteral("qrc:/ui/qml/main2.qml"));
-    QObject::connect(m_engine, &QQmlApplicationEngine::objectCreated,
-                     this, [url](QObject *obj, const QUrl &objUrl) {
-        if (!obj && url == objUrl)
-            QCoreApplication::exit(-1);
-    }, Qt::QueuedConnection);
+    QObject::connect(
+            m_engine, &QQmlApplicationEngine::objectCreated, this,
+            [url](QObject *obj, const QUrl &objUrl) {
+                if (!obj && url == objUrl)
+                    QCoreApplication::exit(-1);
+            },
+            Qt::QueuedConnection);
 
     m_engine->rootContext()->setContextProperty("Debug", &Logger::Instance());
 
@@ -78,6 +81,8 @@ void AmneziaApplication::init()
 
     m_serversModel.reset(new ServersModel(m_settings, this));
     m_engine->rootContext()->setContextProperty("ServersModel", m_serversModel.get());
+    connect(m_serversModel.get(), &ServersModel::currentlyProcessedServerIndexChanged, m_containersModel.get(),
+            &ContainersModel::setCurrentlyProcessedServerIndex);
 
     m_configurator = std::shared_ptr<VpnConfigurator>(new VpnConfigurator(m_settings, this));
     m_vpnConnection.reset(new VpnConnection(m_settings, m_configurator));
@@ -94,21 +99,19 @@ void AmneziaApplication::init()
     m_importController.reset(new ImportController(m_serversModel, m_containersModel, m_settings));
     m_engine->rootContext()->setContextProperty("ImportController", m_importController.get());
 
-    m_exportController.reset(
-        new ExportController(m_serversModel, m_containersModel, m_settings, m_configurator));
+    m_exportController.reset(new ExportController(m_serversModel, m_containersModel, m_settings, m_configurator));
     m_engine->rootContext()->setContextProperty("ExportController", m_exportController.get());
 
-    m_settingsController.reset(
-        new SettingsController(m_serversModel, m_containersModel, m_settings));
+    m_settingsController.reset(new SettingsController(m_serversModel, m_containersModel, m_settings));
     m_engine->rootContext()->setContextProperty("SettingsController", m_settingsController.get());
 
     //
 
     m_engine->load(url);
 
-//    if (m_engine->rootObjects().size() > 0) {
-//        m_uiLogic->setQmlRoot(m_engine->rootObjects().at(0));
-//    }
+    //    if (m_engine->rootObjects().size() > 0) {
+    //        m_uiLogic->setQmlRoot(m_engine->rootObjects().at(0));
+    //    }
 
     if (m_settings->isSaveLogs()) {
         if (!Logger::init()) {
@@ -116,24 +119,23 @@ void AmneziaApplication::init()
         }
     }
 
-//#ifdef Q_OS_WIN
-//    if (m_parser.isSet("a")) m_uiLogic->showOnStartup();
-//    else emit m_uiLogic->show();
-//#else
-//    m_uiLogic->showOnStartup();
-//#endif
-
-//    // TODO - fix
-//#if !defined(Q_OS_ANDROID) && !defined(Q_OS_IOS)
-//    if (isPrimary()) {
-//        QObject::connect(this, &SingleApplication::instanceStarted, m_uiLogic, [this](){
-//            qDebug() << "Secondary instance started, showing this window instead";
-//            emit m_uiLogic->show();
-//            emit m_uiLogic->raise();
-//        });
-//    }
-//#endif
+    // #ifdef Q_OS_WIN
+    //     if (m_parser.isSet("a")) m_uiLogic->showOnStartup();
+    //     else emit m_uiLogic->show();
+    // #else
+    //     m_uiLogic->showOnStartup();
+    // #endif
 
+    //    // TODO - fix
+    // #if !defined(Q_OS_ANDROID) && !defined(Q_OS_IOS)
+    //    if (isPrimary()) {
+    //        QObject::connect(this, &SingleApplication::instanceStarted, m_uiLogic, [this](){
+    //            qDebug() << "Secondary instance started, showing this window instead";
+    //            emit m_uiLogic->show();
+    //            emit m_uiLogic->raise();
+    //        });
+    //    }
+    // #endif
 }
 
 void AmneziaApplication::registerTypes()
@@ -156,6 +158,9 @@ void AmneziaApplication::registerTypes()
     m_protocolProps = new ProtocolProps;
     qmlRegisterSingletonInstance("ProtocolProps", 1, 0, "ProtocolProps", m_protocolProps);
 
+    qmlRegisterSingletonType(QUrl("qrc:/ui/qml/Filters/ContainersModelFilters.qml"), "ContainersModelFilters", 1, 0,
+                             "ContainersModelFilters");
+
     //
     Vpn::declareQmlVpnConnectionStateEnum();
     PageLoader::declareQmlPageEnum();
@@ -182,19 +187,17 @@ bool AmneziaApplication::parseCommands()
     m_parser.addHelpOption();
     m_parser.addVersionOption();
 
-    QCommandLineOption c_autostart {{"a", "autostart"}, "System autostart"};
+    QCommandLineOption c_autostart { { "a", "autostart" }, "System autostart" };
     m_parser.addOption(c_autostart);
 
-    QCommandLineOption c_cleanup {{"c", "cleanup"}, "Cleanup logs"};
+    QCommandLineOption c_cleanup { { "c", "cleanup" }, "Cleanup logs" };
     m_parser.addOption(c_cleanup);
 
     m_parser.process(*this);
 
     if (m_parser.isSet(c_cleanup)) {
         Logger::cleanUp();
-        QTimer::singleShot(100, this, [this]{
-            quit();
-        });
+        QTimer::singleShot(100, this, [this] { quit(); });
         exec();
         return false;
     }
@@ -205,4 +208,3 @@ QQmlApplicationEngine *AmneziaApplication::qmlEngine() const
 {
     return m_engine;
 }
-
diff --git a/client/resources.qrc b/client/resources.qrc
index 5b5fd593..9aba0a6b 100644
--- a/client/resources.qrc
+++ b/client/resources.qrc
@@ -269,5 +269,6 @@
         <file>images/controls/mail.svg</file>
         <file>images/controls/telegram.svg</file>
         <file>ui/qml/Controls2/TextTypes/SmallTextType.qml</file>
+        <file>ui/qml/Filters/ContainersModelFilters.qml</file>
     </qresource>
 </RCC>
diff --git a/client/ui/controllers/exportController.cpp b/client/ui/controllers/exportController.cpp
index b6cd7abb..04264624 100644
--- a/client/ui/controllers/exportController.cpp
+++ b/client/ui/controllers/exportController.cpp
@@ -16,14 +16,14 @@
 ExportController::ExportController(const QSharedPointer<ServersModel> &serversModel,
                                    const QSharedPointer<ContainersModel> &containersModel,
                                    const std::shared_ptr<Settings> &settings,
-                                   const std::shared_ptr<VpnConfigurator> &configurator,
-                                   QObject *parent)
-    : QObject(parent)
-    , m_serversModel(serversModel)
-    , m_containersModel(containersModel)
-    , m_settings(settings)
-    , m_configurator(configurator)
-{}
+                                   const std::shared_ptr<VpnConfigurator> &configurator, QObject *parent)
+    : QObject(parent),
+      m_serversModel(serversModel),
+      m_containersModel(containersModel),
+      m_settings(settings),
+      m_configurator(configurator)
+{
+}
 
 void ExportController::generateFullAccessConfig()
 {
@@ -33,8 +33,8 @@ void ExportController::generateFullAccessConfig()
     QByteArray compressedConfig = QJsonDocument(config).toJson();
     compressedConfig = qCompress(compressedConfig, 8);
     m_amneziaCode = QString("vpn://%1")
-                        .arg(QString(compressedConfig.toBase64(QByteArray::Base64UrlEncoding
-                                                               | QByteArray::OmitTrailingEquals)));
+                            .arg(QString(compressedConfig.toBase64(QByteArray::Base64UrlEncoding
+                                                                   | QByteArray::OmitTrailingEquals)));
 
     m_qrCodes = generateQrCodeImageSeries(compressedConfig);
     emit exportConfigChanged();
@@ -43,25 +43,21 @@ void ExportController::generateFullAccessConfig()
 void ExportController::generateConnectionConfig()
 {
     int serverIndex = m_serversModel->getCurrentlyProcessedServerIndex();
-    ServerCredentials credentials = qvariant_cast<ServerCredentials>(
-        m_serversModel->data(serverIndex, ServersModel::Roles::CredentialsRole));
+    ServerCredentials credentials =
+            qvariant_cast<ServerCredentials>(m_serversModel->data(serverIndex, ServersModel::Roles::CredentialsRole));
 
-    DockerContainer container = static_cast<DockerContainer>(
-        m_containersModel->getCurrentlyProcessedContainerIndex());
+    DockerContainer container = static_cast<DockerContainer>(m_containersModel->getCurrentlyProcessedContainerIndex());
     QModelIndex containerModelIndex = m_containersModel->index(container);
-    QJsonObject containerConfig = qvariant_cast<QJsonObject>(
-        m_containersModel->data(containerModelIndex, ContainersModel::Roles::ConfigRole));
+    QJsonObject containerConfig =
+            qvariant_cast<QJsonObject>(m_containersModel->data(containerModelIndex, ContainersModel::Roles::ConfigRole));
     containerConfig.insert(config_key::container, ContainerProps::containerToString(container));
 
     ErrorCode errorCode = ErrorCode::NoError;
     for (Proto protocol : ContainerProps::protocolsForContainer(container)) {
         QJsonObject protocolConfig = m_settings->protocolConfig(serverIndex, container, protocol);
 
-        QString vpnConfig = m_configurator->genVpnProtocolConfig(credentials,
-                                                                 container,
-                                                                 containerConfig,
-                                                                 protocol,
-                                                                 &errorCode);
+        QString vpnConfig =
+                m_configurator->genVpnProtocolConfig(credentials, container, containerConfig, protocol, &errorCode);
         if (errorCode) {
             emit exportErrorOccurred(errorString(errorCode));
             return;
@@ -75,7 +71,7 @@ void ExportController::generateConnectionConfig()
         config.remove(config_key::userName);
         config.remove(config_key::password);
         config.remove(config_key::port);
-        config.insert(config_key::containers, QJsonArray{containerConfig});
+        config.insert(config_key::containers, QJsonArray { containerConfig });
         config.insert(config_key::defaultContainer, ContainerProps::containerToString(container));
 
         auto dns = m_configurator->getDnsForConfig(serverIndex);
@@ -86,8 +82,8 @@ void ExportController::generateConnectionConfig()
     QByteArray compressedConfig = QJsonDocument(config).toJson();
     compressedConfig = qCompress(compressedConfig, 8);
     m_amneziaCode = QString("vpn://%1")
-                        .arg(QString(compressedConfig.toBase64(QByteArray::Base64UrlEncoding
-                                                               | QByteArray::OmitTrailingEquals)));
+                            .arg(QString(compressedConfig.toBase64(QByteArray::Base64UrlEncoding
+                                                                   | QByteArray::OmitTrailingEquals)));
 
     m_qrCodes = generateQrCodeImageSeries(compressedConfig);
     emit exportConfigChanged();
@@ -108,10 +104,8 @@ void ExportController::saveFile()
     QString fileExtension = ".vpn";
     QString docDir = QStandardPaths::writableLocation(QStandardPaths::DocumentsLocation);
     QUrl fileName;
-    fileName = QFileDialog::getSaveFileUrl(nullptr,
-                                           tr("Save AmneziaVPN config"),
-                                           QUrl::fromLocalFile(docDir + "/" + "amnezia_config"),
-                                           "*" + fileExtension);
+    fileName = QFileDialog::getSaveFileUrl(nullptr, tr("Save AmneziaVPN config"),
+                                           QUrl::fromLocalFile(docDir + "/" + "amnezia_config"), "*" + fileExtension);
     if (fileName.isEmpty())
         return;
     if (!fileName.toString().endsWith(fileExtension)) {
@@ -139,10 +133,9 @@ QList<QString> ExportController::generateQrCodeImageSeries(const QByteArray &dat
     for (int i = 0; i < data.size(); i = i + k) {
         QByteArray chunk;
         QDataStream s(&chunk, QIODevice::WriteOnly);
-        s << amnezia::qrMagicCode << chunksCount << (quint8) std::round(i / k) << data.mid(i, k);
+        s << amnezia::qrMagicCode << chunksCount << (quint8)std::round(i / k) << data.mid(i, k);
 
-        QByteArray ba = chunk.toBase64(QByteArray::Base64UrlEncoding
-                                       | QByteArray::OmitTrailingEquals);
+        QByteArray ba = chunk.toBase64(QByteArray::Base64UrlEncoding | QByteArray::OmitTrailingEquals);
 
         qrcodegen::QrCode qr = qrcodegen::QrCode::encodeText(ba, qrcodegen::QrCode::Ecc::LOW);
         QString svg = QString::fromStdString(toSvgString(qr, 0));
diff --git a/client/ui/controllers/importController.cpp b/client/ui/controllers/importController.cpp
index 99de3131..5b4b7a83 100644
--- a/client/ui/controllers/importController.cpp
+++ b/client/ui/controllers/importController.cpp
@@ -5,40 +5,42 @@
 
 #include "core/errorstrings.h"
 
-namespace {
-enum class ConfigTypes { Amnezia, OpenVpn, WireGuard };
-
-ConfigTypes checkConfigFormat(const QString &config)
+namespace
 {
-    const QString openVpnConfigPatternCli = "client";
-    const QString openVpnConfigPatternProto1 = "proto tcp";
-    const QString openVpnConfigPatternProto2 = "proto udp";
-    const QString openVpnConfigPatternDriver1 = "dev tun";
-    const QString openVpnConfigPatternDriver2 = "dev tap";
+    enum class ConfigTypes {
+        Amnezia,
+        OpenVpn,
+        WireGuard
+    };
 
-    const QString wireguardConfigPatternSectionInterface = "[Interface]";
-    const QString wireguardConfigPatternSectionPeer = "[Peer]";
+    ConfigTypes checkConfigFormat(const QString &config)
+    {
+        const QString openVpnConfigPatternCli = "client";
+        const QString openVpnConfigPatternProto1 = "proto tcp";
+        const QString openVpnConfigPatternProto2 = "proto udp";
+        const QString openVpnConfigPatternDriver1 = "dev tun";
+        const QString openVpnConfigPatternDriver2 = "dev tap";
 
-    if (config.contains(openVpnConfigPatternCli)
-        && (config.contains(openVpnConfigPatternProto1)
-            || config.contains(openVpnConfigPatternProto2))
-        && (config.contains(openVpnConfigPatternDriver1)
-            || config.contains(openVpnConfigPatternDriver2))) {
-        return ConfigTypes::OpenVpn;
-    } else if (config.contains(wireguardConfigPatternSectionInterface)
-               && config.contains(wireguardConfigPatternSectionPeer)) {
-        return ConfigTypes::WireGuard;
+        const QString wireguardConfigPatternSectionInterface = "[Interface]";
+        const QString wireguardConfigPatternSectionPeer = "[Peer]";
+
+        if (config.contains(openVpnConfigPatternCli)
+            && (config.contains(openVpnConfigPatternProto1) || config.contains(openVpnConfigPatternProto2))
+            && (config.contains(openVpnConfigPatternDriver1) || config.contains(openVpnConfigPatternDriver2))) {
+            return ConfigTypes::OpenVpn;
+        } else if (config.contains(wireguardConfigPatternSectionInterface)
+                   && config.contains(wireguardConfigPatternSectionPeer)) {
+            return ConfigTypes::WireGuard;
+        }
+        return ConfigTypes::Amnezia;
     }
-    return ConfigTypes::Amnezia;
-}
 } // namespace
 
 ImportController::ImportController(const QSharedPointer<ServersModel> &serversModel,
                                    const QSharedPointer<ContainersModel> &containersModel,
-                                   const std::shared_ptr<Settings> &settings,
-                                   QObject *parent) : QObject(parent), m_serversModel(serversModel), m_containersModel(containersModel),  m_settings(settings)
+                                   const std::shared_ptr<Settings> &settings, QObject *parent)
+    : QObject(parent), m_serversModel(serversModel), m_containersModel(containersModel), m_settings(settings)
 {
-
 }
 
 void ImportController::extractConfigFromFile(const QUrl &fileUrl)
@@ -88,8 +90,7 @@ void ImportController::importConfig()
         m_serversModel->addServer(m_config);
 
         if (!m_config.value(config_key::containers).toArray().isEmpty()) {
-            auto newServerIndex = m_serversModel->index(m_serversModel->getServersCount() - 1);
-            m_serversModel->setData(newServerIndex, true, ServersModel::Roles::IsDefaultRole);
+            m_serversModel->setDefaultServerIndex(m_serversModel->getServersCount() - 1);
         }
 
         emit importFinished();
@@ -116,12 +117,12 @@ QJsonObject ImportController::extractAmneziaConfig(QString &data)
     return QJsonDocument::fromJson(ba).object();
 }
 
-//bool ImportController::importConnectionFromQr(const QByteArray &data)
+// bool ImportController::importConnectionFromQr(const QByteArray &data)
 //{
-//    QJsonObject dataObj = QJsonDocument::fromJson(data).object();
-//    if (!dataObj.isEmpty()) {
-//        return importConnection(dataObj);
-//    }
+//     QJsonObject dataObj = QJsonDocument::fromJson(data).object();
+//     if (!dataObj.isEmpty()) {
+//         return importConnection(dataObj);
+//     }
 
 //    QByteArray ba_uncompressed = qUncompress(data);
 //    if (!ba_uncompressed.isEmpty()) {
@@ -159,7 +160,6 @@ QJsonObject ImportController::extractOpenVpnConfig(const QString &data)
     config[config_key::defaultContainer] = "amnezia-openvpn";
     config[config_key::description] = m_settings->nextAvailableServerName();
 
-
     const static QRegularExpression dnsRegExp("dhcp-option DNS (\\b\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}\\b)");
     QRegularExpressionMatchIterator dnsMatch = dnsRegExp.globalMatch(data);
     if (dnsMatch.hasNext()) {
@@ -206,7 +206,9 @@ QJsonObject ImportController::extractWireGuardConfig(const QString &data)
     config[config_key::defaultContainer] = "amnezia-wireguard";
     config[config_key::description] = m_settings->nextAvailableServerName();
 
-    const static QRegularExpression dnsRegExp("DNS = (\\b\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}\\b).*(\\b\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}\\b)");
+    const static QRegularExpression dnsRegExp(
+            "DNS = "
+            "(\\b\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}\\b).*(\\b\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}\\b)");
     QRegularExpressionMatch dnsMatch = dnsRegExp.match(data);
     if (dnsMatch.hasMatch()) {
         config[config_key::dns1] = dnsMatch.captured(1);
diff --git a/client/ui/controllers/installController.cpp b/client/ui/controllers/installController.cpp
index 5d3bfc2f..1809e082 100644
--- a/client/ui/controllers/installController.cpp
+++ b/client/ui/controllers/installController.cpp
@@ -67,8 +67,7 @@ void InstallController::installServer(DockerContainer container, QJsonObject &co
         server.insert(config_key::defaultContainer, ContainerProps::containerToString(container));
 
         m_serversModel->addServer(server);
-        auto newServerIndex = m_serversModel->index(m_serversModel->getServersCount() - 1);
-        m_serversModel->setData(newServerIndex, true, ServersModel::Roles::IsDefaultRole);
+        m_serversModel->setDefaultServerIndex(m_serversModel->getServersCount() - 1);
 
         emit installServerFinished(isInstalledContainerFound);
         return;
diff --git a/client/ui/models/containers_model.cpp b/client/ui/models/containers_model.cpp
index f095dd02..7a6946f5 100644
--- a/client/ui/models/containers_model.cpp
+++ b/client/ui/models/containers_model.cpp
@@ -78,7 +78,7 @@ QVariant ContainersModel::data(const QModelIndex &index, int role) const
     return QVariant();
 }
 
-void ContainersModel::setCurrentlyProcessedServerIndex(int index)
+void ContainersModel::setCurrentlyProcessedServerIndex(const int index)
 {
     beginResetModel();
     m_currentlyProcessedServerIndex = index;
diff --git a/client/ui/models/containers_model.h b/client/ui/models/containers_model.h
index 7bb58755..ebf47497 100644
--- a/client/ui/models/containers_model.h
+++ b/client/ui/models/containers_model.h
@@ -3,11 +3,11 @@
 
 #include <QAbstractListModel>
 #include <QJsonObject>
-#include <vector>
 #include <utility>
+#include <vector>
 
-#include "settings.h"
 #include "containers/containers_defs.h"
+#include "settings.h"
 
 class ContainersModel : public QAbstractListModel
 {
@@ -44,7 +44,7 @@ public slots:
     DockerContainer getDefaultContainer();
     QString getDefaultContainerName();
 
-    void setCurrentlyProcessedServerIndex(int index);
+    void setCurrentlyProcessedServerIndex(const int index);
     void setCurrentlyProcessedContainerIndex(int index);
     int getCurrentlyProcessedContainerIndex();
 
@@ -57,7 +57,6 @@ protected:
 private:
     QMap<DockerContainer, QJsonObject> m_containers;
 
-
     int m_currentlyProcessedServerIndex;
     int m_currentlyProcessedContainerIndex;
     DockerContainer m_defaultContainerIndex;
diff --git a/client/ui/models/servers_model.cpp b/client/ui/models/servers_model.cpp
index 94267ed1..9df243fe 100644
--- a/client/ui/models/servers_model.cpp
+++ b/client/ui/models/servers_model.cpp
@@ -5,6 +5,7 @@ ServersModel::ServersModel(std::shared_ptr<Settings> settings, QObject *parent)
 {
     m_servers = m_settings->serversArray();
     m_defaultServerIndex = m_settings->defaultServerIndex();
+    m_currenlyProcessedServerIndex = m_defaultServerIndex;
 }
 
 int ServersModel::rowCount(const QModelIndex &parent) const
@@ -28,10 +29,6 @@ bool ServersModel::setData(const QModelIndex &index, const QVariant &value, int
         m_servers.replace(index.row(), server);
         break;
     }
-    case IsDefaultRole: {
-        setDefaultServerIndex(index.row());
-        break;
-    }
     default: {
         return true;
     }
@@ -62,6 +59,10 @@ QVariant ServersModel::data(const QModelIndex &index, int role) const
     case CredentialsLoginRole: return m_settings->serverCredentials(index.row()).userName;
     case IsDefaultRole: return index.row() == m_defaultServerIndex;
     case IsCurrentlyProcessedRole: return index.row() == m_currenlyProcessedServerIndex;
+    case HasWriteAccess: {
+        auto credentials = m_settings->serverCredentials(index.row());
+        return (!credentials.userName.isEmpty() && !credentials.secretData.isEmpty());
+    }
     }
 
     return QVariant();
@@ -73,6 +74,13 @@ QVariant ServersModel::data(const int index, int role) const
     return data(modelIndex, role);
 }
 
+void ServersModel::setDefaultServerIndex(const int index)
+{
+    m_settings->setDefaultServer(index);
+    m_defaultServerIndex = m_settings->defaultServerIndex();
+    emit defaultServerIndexChanged();
+}
+
 const int ServersModel::getDefaultServerIndex()
 {
     return m_defaultServerIndex;
@@ -83,10 +91,10 @@ const int ServersModel::getServersCount()
     return m_servers.count();
 }
 
-void ServersModel::setCurrentlyProcessedServerIndex(int index)
+void ServersModel::setCurrentlyProcessedServerIndex(const int index)
 {
     m_currenlyProcessedServerIndex = index;
-    emit currentlyProcessedServerIndexChanged();
+    emit currentlyProcessedServerIndexChanged(m_currenlyProcessedServerIndex);
 }
 
 int ServersModel::getCurrentlyProcessedServerIndex()
@@ -101,8 +109,7 @@ bool ServersModel::isDefaultServerCurrentlyProcessed()
 
 bool ServersModel::isCurrentlyProcessedServerHasWriteAccess()
 {
-    auto credentials = m_settings->serverCredentials(m_currenlyProcessedServerIndex);
-    return (!credentials.userName.isEmpty() && !credentials.secretData.isEmpty());
+    return qvariant_cast<bool>(data(m_currenlyProcessedServerIndex, HasWriteAccess));
 }
 
 void ServersModel::addServer(const QJsonObject &server)
@@ -140,11 +147,6 @@ QHash<int, QByteArray> ServersModel::roleNames() const
     roles[CredentialsLoginRole] = "credentialsLogin";
     roles[IsDefaultRole] = "isDefault";
     roles[IsCurrentlyProcessedRole] = "isCurrentlyProcessed";
+    roles[HasWriteAccess] = "hasWriteAccess";
     return roles;
 }
-
-void ServersModel::setDefaultServerIndex(const int index)
-{
-    m_settings->setDefaultServer(index);
-    m_defaultServerIndex = m_settings->defaultServerIndex();
-}
diff --git a/client/ui/models/servers_model.h b/client/ui/models/servers_model.h
index 891d6ad1..6cb9859e 100644
--- a/client/ui/models/servers_model.h
+++ b/client/ui/models/servers_model.h
@@ -5,13 +5,6 @@
 
 #include "settings.h"
 
-struct ServerModelContent
-{
-    QString desc;
-    QString address;
-    bool isDefault;
-};
-
 class ServersModel : public QAbstractListModel
 {
     Q_OBJECT
@@ -22,7 +15,8 @@ public:
         CredentialsRole,
         CredentialsLoginRole,
         IsDefaultRole,
-        IsCurrentlyProcessedRole
+        IsCurrentlyProcessedRole,
+        HasWriteAccess
     };
 
     ServersModel(std::shared_ptr<Settings> settings, QObject *parent = nullptr);
@@ -33,14 +27,20 @@ public:
     QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
     QVariant data(const int index, int role = Qt::DisplayRole) const;
 
+    Q_PROPERTY(int defaultIndex READ getDefaultServerIndex WRITE setDefaultServerIndex NOTIFY defaultServerIndexChanged)
+    Q_PROPERTY(int currentlyProcessedIndex READ getCurrentlyProcessedServerIndex WRITE setCurrentlyProcessedServerIndex
+                       NOTIFY currentlyProcessedServerIndexChanged)
+
 public slots:
+    void setDefaultServerIndex(const int index);
     const int getDefaultServerIndex();
     bool isDefaultServerCurrentlyProcessed();
+
     bool isCurrentlyProcessedServerHasWriteAccess();
 
     const int getServersCount();
 
-    void setCurrentlyProcessedServerIndex(int index);
+    void setCurrentlyProcessedServerIndex(const int index);
     int getCurrentlyProcessedServerIndex();
 
     void addServer(const QJsonObject &server);
@@ -50,11 +50,10 @@ protected:
     QHash<int, QByteArray> roleNames() const override;
 
 signals:
-    void currentlyProcessedServerIndexChanged();
+    void currentlyProcessedServerIndexChanged(const int index);
+    void defaultServerIndexChanged();
 
 private:
-    void setDefaultServerIndex(const int index);
-
     QJsonArray m_servers;
 
     std::shared_ptr<Settings> m_settings;
diff --git a/client/ui/pages_logic/ServerListLogic.cpp b/client/ui/pages_logic/ServerListLogic.cpp
index 56a682b8..16775bc0 100644
--- a/client/ui/pages_logic/ServerListLogic.cpp
+++ b/client/ui/pages_logic/ServerListLogic.cpp
@@ -1,14 +1,12 @@
 #include "ServerListLogic.h"
 
-#include "vpnconnection.h"
 #include "../models/servers_model.h"
 #include "../uilogic.h"
+#include "vpnconnection.h"
 
-ServerListLogic::ServerListLogic(UiLogic *logic, QObject *parent):
-    PageLogicBase(logic, parent),
-    m_serverListModel{new ServersModel(m_settings, this)}
+ServerListLogic::ServerListLogic(UiLogic *logic, QObject *parent)
+    : PageLogicBase(logic, parent), m_serverListModel { new ServersModel(m_settings, this) }
 {
-
 }
 
 void ServerListLogic::onServerListPushbuttonDefaultClicked(int index)
@@ -31,19 +29,19 @@ int ServerListLogic::currServerIdx() const
 
 void ServerListLogic::onUpdatePage()
 {
-    const QJsonArray &servers = m_settings->serversArray();
-    int defaultServer = m_settings->defaultServerIndex();
-    QVector<ServerModelContent> serverListContent;
-    for(int i = 0; i < servers.size(); i++) {
-        ServerModelContent c;
-        auto server = servers.at(i).toObject();
-        c.desc = server.value(config_key::description).toString();
-        c.address = server.value(config_key::hostName).toString();
-        if (c.desc.isEmpty()) {
-            c.desc = c.address;
-        }
-        c.isDefault = (i == defaultServer);
-        serverListContent.push_back(c);
-    }
-//    qobject_cast<ServersModel*>(m_serverListModel)->setContent(serverListContent);
+    //    const QJsonArray &servers = m_settings->serversArray();
+    //    int defaultServer = m_settings->defaultServerIndex();
+    //    QVector<ServerModelContent> serverListContent;
+    //    for(int i = 0; i < servers.size(); i++) {
+    //        ServerModelContent c;
+    //        auto server = servers.at(i).toObject();
+    //        c.desc = server.value(config_key::description).toString();
+    //        c.address = server.value(config_key::hostName).toString();
+    //        if (c.desc.isEmpty()) {
+    //            c.desc = c.address;
+    //        }
+    //        c.isDefault = (i == defaultServer);
+    //        serverListContent.push_back(c);
+    //    }
+    //    qobject_cast<ServersModel*>(m_serverListModel)->setContent(serverListContent);
 }
diff --git a/client/ui/qml/Controls2/TextFieldWithHeaderType.qml b/client/ui/qml/Controls2/TextFieldWithHeaderType.qml
index 8ad92d54..85d651ef 100644
--- a/client/ui/qml/Controls2/TextFieldWithHeaderType.qml
+++ b/client/ui/qml/Controls2/TextFieldWithHeaderType.qml
@@ -8,96 +8,115 @@ Item {
     id: root
 
     property string headerText
-    property string textFieldPlaceholderText
-    property bool textFieldEditable: true
+    property alias errorText: errorField.text
 
     property string buttonText
     property var clickedFunc
 
     property alias textField: textField
     property alias textFieldText: textField.text
+    property string textFieldPlaceholderText
+    property bool textFieldEditable: true
 
-    implicitHeight: 74
+    implicitWidth: content.implicitWidth
+    implicitHeight: content.implicitHeight
 
-    Rectangle {
-        id: backgroud
+    ColumnLayout {
+        id: content
         anchors.fill: parent
-        color: "#1c1d21"
-        radius: 16
-        border.color: textField.focus ? "#d7d8db" : "#2C2D30"
-        border.width: 1
 
-        Behavior on border.color {
-            PropertyAnimation { duration: 200 }
-        }
-    }
+        Rectangle {
+            id: backgroud
+            Layout.fillWidth: true
+            Layout.preferredHeight: 74
+            color: "#1c1d21"
+            radius: 16
+            border.color: textField.focus ? "#d7d8db" : "#2C2D30"
+            border.width: 1
 
-    RowLayout {
-        anchors.fill: backgroud
-        ColumnLayout {
-
-            LabelTextType {
-                text: root.headerText
-                color: "#878b91"
-
-                Layout.fillWidth: true
-                Layout.rightMargin: 16
-                Layout.leftMargin: 16
-                Layout.topMargin: 16
+            Behavior on border.color {
+                PropertyAnimation { duration: 200 }
             }
 
-            TextField {
-                id: textField
+            RowLayout {
+                anchors.fill: backgroud
+                ColumnLayout {
+                    LabelTextType {
+                        text: root.headerText
+                        color: "#878b91"
 
-                enabled: root.textFieldEditable
-                color: "#d7d8db"
+                        Layout.fillWidth: true
+                        Layout.rightMargin: 16
+                        Layout.leftMargin: 16
+                        Layout.topMargin: 16
+                    }
 
-                placeholderText: textFieldPlaceholderText
-                placeholderTextColor: "#494B50"
+                    TextField {
+                        id: textField
 
-                selectionColor:  "#412102"
-                selectedTextColor: "#D7D8DB"
+                        enabled: root.textFieldEditable
+                        color: "#d7d8db"
 
-                font.pixelSize: 16
-                font.weight: 400
-                font.family: "PT Root UI VF"
+                        placeholderText: textFieldPlaceholderText
+                        placeholderTextColor: "#494B50"
 
-                height: 24
-                Layout.fillWidth: true
-                Layout.rightMargin: 16
-                Layout.leftMargin: 16
-                Layout.bottomMargin: 16
-                topPadding: 0
-                rightPadding: 0
-                leftPadding: 0
-                bottomPadding: 0
+                        selectionColor:  "#412102"
+                        selectedTextColor: "#D7D8DB"
 
-                background: Rectangle {
-                    anchors.fill: parent
-                    color: "#1c1d21"
+                        font.pixelSize: 16
+                        font.weight: 400
+                        font.family: "PT Root UI VF"
+
+                        height: 24
+                        Layout.fillWidth: true
+                        Layout.rightMargin: 16
+                        Layout.leftMargin: 16
+                        Layout.bottomMargin: 16
+                        topPadding: 0
+                        rightPadding: 0
+                        leftPadding: 0
+                        bottomPadding: 0
+
+                        background: Rectangle {
+                            anchors.fill: parent
+                            color: "#1c1d21"
+                        }
+
+                        onTextChanged: {
+                            root.errorText = ""
+                        }
+                    }
+                }
+
+                BasicButtonType {
+                    visible: root.buttonText !== ""
+
+                    defaultColor: "transparent"
+                    hoveredColor: Qt.rgba(1, 1, 1, 0.08)
+                    pressedColor: Qt.rgba(1, 1, 1, 0.12)
+                    disabledColor: "#878B91"
+                    textColor: "#D7D8DB"
+                    borderWidth: 0
+
+                    text: buttonText
+
+                    Layout.rightMargin: 24
+
+                    onClicked: {
+                        if (clickedFunc && typeof clickedFunc === "function") {
+                            clickedFunc()
+                        }
+                    }
                 }
             }
         }
 
-        BasicButtonType {
-            visible: root.buttonText !== ""
+        SmallTextType {
+            id: errorField
 
-            defaultColor: "transparent"
-            hoveredColor: Qt.rgba(1, 1, 1, 0.08)
-            pressedColor: Qt.rgba(1, 1, 1, 0.12)
-            disabledColor: "#878B91"
-            textColor: "#D7D8DB"
-            borderWidth: 0
-
-            text: buttonText
-
-            Layout.rightMargin: 24
-
-            onClicked: {
-                if (clickedFunc && typeof clickedFunc === "function") {
-                    clickedFunc()
-                }
-            }
+            text: root.errorText
+            visible: root.errorText !== ""
+            color: "#EB5757"
         }
     }
 }
diff --git a/client/ui/qml/Filters/ContainersModelFilters.qml b/client/ui/qml/Filters/ContainersModelFilters.qml
new file mode 100644
index 00000000..fa8bd83b
--- /dev/null
+++ b/client/ui/qml/Filters/ContainersModelFilters.qml
@@ -0,0 +1,47 @@
+pragma Singleton
+
+import QtQuick 2.15
+
+import SortFilterProxyModel 0.2
+
+import ProtocolEnum 1.0
+
+Item {
+    ValueFilter {
+        id: vpnTypeFilter
+        roleName: "serviceType"
+        value: ProtocolEnum.Vpn
+    }
+
+    ValueFilter {
+        id: serviceTypeFilter
+        roleName: "serviceType"
+        value: ProtocolEnum.Other
+    }
+
+    ValueFilter {
+        id: supportedFilter
+        roleName: "isSupported"
+        value: true
+    }
+
+    ValueFilter {
+        id: installedFilter
+        roleName: "isInstalled"
+        value: true
+    }
+
+    function getWriteAccessProtocolsListFilters() {
+        return [vpnTypeFilter, supportedFilter]
+    }
+    function getReadAccessProtocolsListFilters() {
+        return [vpnTypeFilter, supportedFilter, installedFilter]
+    }
+
+    function getWriteAccessServicesListFilters() {
+        return [serviceTypeFilter, supportedFilter]
+    }
+    function getReadAccessServicesListFilters() {
+        return [serviceTypeFilter, supportedFilter, installedFilter]
+    }
+}
diff --git a/client/ui/qml/Pages2/PageHome.qml b/client/ui/qml/Pages2/PageHome.qml
index a4e90117..9f121273 100644
--- a/client/ui/qml/Pages2/PageHome.qml
+++ b/client/ui/qml/Pages2/PageHome.qml
@@ -7,6 +7,7 @@ import SortFilterProxyModel 0.2
 import PageEnum 1.0
 import ProtocolEnum 1.0
 import ContainerProps 1.0
+import ContainersModelFilters 1.0
 
 import "./"
 import "../Controls2"
@@ -161,10 +162,7 @@ PageType {
                     headerBackButtonImage: "qrc:/images/controls/arrow-left.svg"
 
                     rootButtonClickedFunction: function() {
-                        // todo check if server index changed before set Currently processed
-                        // todo make signal slot for change server index in containersModel
-                        ServersModel.setCurrentlyProcessedServerIndex(serversMenuContent.currentIndex)
-                        ContainersModel.setCurrentlyProcessedServerIndex(serversMenuContent.currentIndex)
+                        ServersModel.currentlyProcessedIndex = serversMenuContent.currentIndex
                         containersDropDown.menuVisible = true
                     }
 
@@ -177,39 +175,22 @@ PageType {
                             function onCurrentlyProcessedServerIndexChanged() {
                                 updateContainersModelFilters()
                             }
+                        }
 
-                            function updateContainersModelFilters() {
-                                if (ServersModel.isCurrentlyProcessedServerHasWriteAccess()) {
-                                    proxyContainersModel.filters = [serviceTypeFilter, supportedFilter]
-                                } else {
-                                    proxyContainersModel.filters = installedFilter
-                                }
+                        function updateContainersModelFilters() {
+                            if (ServersModel.isCurrentlyProcessedServerHasWriteAccess()) {
+                                proxyContainersModel.filters = ContainersModelFilters.getWriteAccessProtocolsListFilters()
+                            } else {
+                                proxyContainersModel.filters = ContainersModelFilters.getReadAccessProtocolsListFilters()
                             }
                         }
 
-                        ValueFilter {
-                            id: serviceTypeFilter
-                            roleName: "serviceType"
-                            value: ProtocolEnum.Vpn
-                        }
-                        ValueFilter {
-                            id: supportedFilter
-                            roleName: "isSupported"
-                            value: true
-                        }
-                        ValueFilter {
-                            id: installedFilter
-                            roleName: "isInstalled"
-                            value: true
-                        }
-
                         model: SortFilterProxyModel {
                             id: proxyContainersModel
                             sourceModel: ContainersModel
-
-                            Component.onCompleted: updateContainersModelFilters()
                         }
 
+                        Component.onCompleted: updateContainersModelFilters()
                         currentIndex: ContainersModel.getDefaultContainer()
                     }
                 }
@@ -267,7 +248,7 @@ PageType {
                     height: serversMenuContent.contentItem.height
 
                     model: ServersModel
-                    currentIndex: ServersModel.getDefaultServerIndex()
+                    currentIndex: ServersModel.defaultIndex
 
                     clip: true
                     interactive: false
@@ -305,8 +286,8 @@ PageType {
                                     onClicked: {
                                         serversMenuContent.currentIndex = index
 
-                                        isDefault = true
-                                        ContainersModel.setCurrentlyProcessedServerIndex(index)
+                                        ServersModel.currentlyProcessedIndex = index
+                                        ServersModel.defaultIndex = index
 
                                         root.currentServerName = name
                                         root.currentServerHostName = hostName
@@ -328,8 +309,7 @@ PageType {
                                     z: 1
 
                                     onClicked: function() {
-                                        ServersModel.setCurrentlyProcessedServerIndex(index)
-                                        ContainersModel.setCurrentlyProcessedServerIndex(index)
+                                        ServersModel.currentlyProcessedIndex = index
                                         goToPage(PageEnum.PageSettingsServerInfo)
                                         menu.visible = false
                                     }
diff --git a/client/ui/qml/Pages2/PageSettingsServerData.qml b/client/ui/qml/Pages2/PageSettingsServerData.qml
index b98d2b8c..319399dc 100644
--- a/client/ui/qml/Pages2/PageSettingsServerData.qml
+++ b/client/ui/qml/Pages2/PageSettingsServerData.qml
@@ -29,6 +29,14 @@ PageType {
         }
     }
 
+    Connections {
+        target: ServersModel
+
+        function onCurrentlyProcessedServerIndexChanged() {
+            content.isServerWithWriteAccess = ServersModel.isCurrentlyProcessedServerHasWriteAccess()
+        }
+    }
+
     FlickableType {
         id: fl
         anchors.top: parent.top
@@ -42,7 +50,10 @@ PageType {
             anchors.left: parent.left
             anchors.right: parent.right
 
+            property bool isServerWithWriteAccess: ServersModel.isCurrentlyProcessedServerHasWriteAccess() //todo make it property?
+
             LabelWithButtonType {
+                visible: content.isServerWithWriteAccess
                 Layout.fillWidth: true
 
                 text: qsTr("Clear Amnezia cache")
@@ -65,9 +76,12 @@ PageType {
                 }
             }
 
-            DividerType {}
+            DividerType {
+                visible: content.isServerWithWriteAccess
+            }
 
             LabelWithButtonType {
+                visible: content.isServerWithWriteAccess
                 Layout.fillWidth: true
 
                 text: qsTr("Проверить сервер на наличие ранее установленных сервисов Amnezia")
@@ -78,12 +92,14 @@ PageType {
                 }
             }
 
-            DividerType {}
+            DividerType {
+                visible: content.isServerWithWriteAccess
+            }
 
             LabelWithButtonType {
                 Layout.fillWidth: true
 
-                text: "Remove server from application"
+                text: qsTr("Remove server from application")
                 textColor: "#EB5757"
 
                 clickedFunction: function() {
@@ -115,9 +131,10 @@ PageType {
             DividerType {}
 
             LabelWithButtonType {
+                visible: content.isServerWithWriteAccess
                 Layout.fillWidth: true
 
-                text: "Clear server from Amnezia software"
+                text: qsTr("Clear server from Amnezia software")
                 textColor: "#EB5757"
 
                 clickedFunction: function() {
@@ -142,7 +159,9 @@ PageType {
                 }
             }
 
-            DividerType {}
+            DividerType {
+                visible: content.isServerWithWriteAccess
+            }
 
             QuestionDrawer {
                 id: questionDrawer
diff --git a/client/ui/qml/Pages2/PageSettingsServerInfo.qml b/client/ui/qml/Pages2/PageSettingsServerInfo.qml
index 3f2562da..aa882aa5 100644
--- a/client/ui/qml/Pages2/PageSettingsServerInfo.qml
+++ b/client/ui/qml/Pages2/PageSettingsServerInfo.qml
@@ -54,7 +54,13 @@ PageType {
                     actionButtonImage: "qrc:/images/controls/edit-3.svg"
 
                     headerText: name
-                    descriptionText: credentialsLogin + " · " + hostName
+                    descriptionText: {
+                        if (ServersModel.isCurrentlyProcessedServerHasWriteAccess()) {
+                            return credentialsLogin + " · " + hostName
+                        } else {
+                            return hostName
+                        }
+                    }
 
                     actionButtonFunction: function() {
                         serverNameEditDrawer.visible = true
@@ -123,10 +129,14 @@ PageType {
             }
 
             TabButtonType {
+                visible: protocolsPage.installedProtocolsCount
+                width: protocolsPage.installedProtocolsCount ? undefined : 0
                 isSelected: tabBar.currentIndex === 0
                 text: qsTr("Protocols")
             }
             TabButtonType {
+                visible: servicesPage.installedServicesCount
+                width: servicesPage.installedServicesCount ? undefined : 0
                 isSelected: tabBar.currentIndex === 1
                 text: qsTr("Services")
             }
@@ -143,9 +153,11 @@ PageType {
             currentIndex: tabBar.currentIndex
 
             PageSettingsServerProtocols {
+                id: protocolsPage
                 stackView: root.stackView
             }
             PageSettingsServerServices {
+                id: servicesPage
                 stackView: root.stackView
             }
             PageSettingsServerData {
diff --git a/client/ui/qml/Pages2/PageSettingsServerProtocols.qml b/client/ui/qml/Pages2/PageSettingsServerProtocols.qml
index e93aa528..1d806d07 100644
--- a/client/ui/qml/Pages2/PageSettingsServerProtocols.qml
+++ b/client/ui/qml/Pages2/PageSettingsServerProtocols.qml
@@ -7,6 +7,7 @@ import SortFilterProxyModel 0.2
 import PageEnum 1.0
 import ProtocolEnum 1.0
 import ContainerProps 1.0
+import ContainersModelFilters 1.0
 
 import "./"
 import "../Controls2"
@@ -17,22 +18,31 @@ import "../Components"
 PageType {
     id: root
 
-    SortFilterProxyModel {
-        id: containersProxyModel
-        sourceModel: ContainersModel
-        filters: [
-            ValueFilter {
-                roleName: "serviceType"
-                value: ProtocolEnum.Vpn
-            },
-            ValueFilter {
-                roleName: "isSupported"
-                value: true
-            }
-        ]
-    }
+    property var installedProtocolsCount
 
     SettingsContainersListView {
-        model: containersProxyModel
+        Connections {
+            target: ServersModel
+
+            function onCurrentlyProcessedServerIndexChanged() {
+                updateContainersModelFilters()
+            }
+        }
+
+        function updateContainersModelFilters() {
+            if (ServersModel.isCurrentlyProcessedServerHasWriteAccess()) {
+                proxyContainersModel.filters = ContainersModelFilters.getWriteAccessProtocolsListFilters()
+            } else {
+                proxyContainersModel.filters = ContainersModelFilters.getReadAccessProtocolsListFilters()
+            }
+            root.installedProtocolsCount = proxyContainersModel.count
+        }
+
+        model: SortFilterProxyModel {
+            id: proxyContainersModel
+            sourceModel: ContainersModel
+        }
+
+        Component.onCompleted: updateContainersModelFilters()
     }
 }
diff --git a/client/ui/qml/Pages2/PageSettingsServerServices.qml b/client/ui/qml/Pages2/PageSettingsServerServices.qml
index 7351f585..1e3d8722 100644
--- a/client/ui/qml/Pages2/PageSettingsServerServices.qml
+++ b/client/ui/qml/Pages2/PageSettingsServerServices.qml
@@ -7,6 +7,7 @@ import SortFilterProxyModel 0.2
 import PageEnum 1.0
 import ProtocolEnum 1.0
 import ContainerProps 1.0
+import ContainersModelFilters 1.0
 
 import "./"
 import "../Controls2"
@@ -17,22 +18,31 @@ import "../Components"
 PageType {
     id: root
 
-    SortFilterProxyModel {
-        id: containersProxyModel
-        sourceModel: ContainersModel
-        filters: [
-            ValueFilter {
-                roleName: "serviceType"
-                value: ProtocolEnum.Other
-            },
-            ValueFilter {
-                roleName: "isSupported"
-                value: true
-            }
-        ]
-    }
+    property var installedServicesCount
 
     SettingsContainersListView {
-        model: containersProxyModel
+        Connections {
+            target: ServersModel
+
+            function onCurrentlyProcessedServerIndexChanged() {
+                updateContainersModelFilters()
+            }
+        }
+
+        function updateContainersModelFilters() {
+            if (ServersModel.isCurrentlyProcessedServerHasWriteAccess()) {
+                proxyContainersModel.filters = ContainersModelFilters.getWriteAccessServicesListFilters()
+            } else {
+                proxyContainersModel.filters = ContainersModelFilters.getReadAccessServicesListFilters()
+            }
+            root.installedServicesCount = proxyContainersModel.count
+        }
+
+        model: SortFilterProxyModel {
+            id: proxyContainersModel
+            sourceModel: ContainersModel
+        }
+
+        Component.onCompleted: updateContainersModelFilters()
     }
 }
diff --git a/client/ui/qml/Pages2/PageSettingsServersList.qml b/client/ui/qml/Pages2/PageSettingsServersList.qml
index a601199a..7f2b1688 100644
--- a/client/ui/qml/Pages2/PageSettingsServersList.qml
+++ b/client/ui/qml/Pages2/PageSettingsServersList.qml
@@ -89,8 +89,7 @@ PageType {
                             rightImageSource: "qrc:/images/controls/chevron-right.svg"
 
                             clickedFunction: function() {
-                                ServersModel.setCurrentlyProcessedServerIndex(index)
-                                ContainersModel.setCurrentlyProcessedServerIndex(index)
+                                ServersModel.currentlyProcessedIndex = index
                                 goToPage(PageEnum.PageSettingsServerInfo)
                             }
                         }
diff --git a/client/ui/qml/Pages2/PageSetupWizardCredentials.qml b/client/ui/qml/Pages2/PageSetupWizardCredentials.qml
index fa6b1f92..fc8bf9ae 100644
--- a/client/ui/qml/Pages2/PageSetupWizardCredentials.qml
+++ b/client/ui/qml/Pages2/PageSetupWizardCredentials.qml
@@ -79,6 +79,10 @@ PageType {
                 text: qsTr("Set up a server the easy way")
 
                 onClicked: function() {
+                    if (!isCredentialsFilled()) {
+                        return
+                    }
+
                     InstallController.setShouldCreateServer(true)
                     InstallController.setCurrentlyInstalledServerCredentials(hostname.textField.text, username.textField.text, secretData.textField.text)
 
@@ -100,6 +104,10 @@ PageType {
                 text: qsTr("Select protocol to install")
 
                 onClicked: function() {
+                    if (!isCredentialsFilled()) {
+                        return
+                    }
+
                     InstallController.setShouldCreateServer(true)
                     InstallController.setCurrentlyInstalledServerCredentials(hostname.textField.text, username.textField.text, secretData.textField.text)
 
@@ -108,4 +116,25 @@ PageType {
             }
         }
     }
+
+    function isCredentialsFilled() {
+        var hasEmptyField = false
+
+        if (hostname.textFieldText === "") {
+            hostname.errorText = qsTr("ip address cannot be empty")
+            hasEmptyField = true
+        } else if (!hostname.textField.acceptableInput) {
+            hostname.errorText = qsTr("Enter the address in the format 255.255.255.255:88")
+        }
+
+        if (username.textFieldText === "") {
+            username.errorText = qsTr("login cannot be empty")
+            hasEmptyField = true
+        }
+        if (secretData.textFieldText === "") {
+            secretData.errorText = qsTr("password/private key cannot be empty")
+            hasEmptyField = true
+        }
+        return !hasEmptyField
+    }
 }
diff --git a/client/ui/qml/Pages2/PageSetupWizardInstalling.qml b/client/ui/qml/Pages2/PageSetupWizardInstalling.qml
index d0fdeabd..f1f5324e 100644
--- a/client/ui/qml/Pages2/PageSetupWizardInstalling.qml
+++ b/client/ui/qml/Pages2/PageSetupWizardInstalling.qml
@@ -61,7 +61,7 @@ PageType {
 
         function onServerAlreadyExists(serverIndex) {
             goToStartPage()
-            ServersModel.setCurrentlyProcessedServerIndex(serverIndex)
+            ServersModel.currentlyProcessedIndex = serverIndex
             goToPage(PageEnum.PageSettingsServerInfo, false)
 
             PageController.showErrorMessage(qsTr("The server has already been added to the application"))
diff --git a/client/ui/qml/Pages2/PageShare.qml b/client/ui/qml/Pages2/PageShare.qml
index 504b0cb1..30430073 100644
--- a/client/ui/qml/Pages2/PageShare.qml
+++ b/client/ui/qml/Pages2/PageShare.qml
@@ -147,18 +147,28 @@ PageType {
 
                     imageSource: "qrc:/images/controls/chevron-right.svg"
 
-                    model: ServersModel
-                    currentIndex: ServersModel.getDefaultServerIndex()
+                    model: SortFilterProxyModel {
+                        id: proxyServersModel
+                        sourceModel: ServersModel
+                        filters: [
+                            ValueFilter {
+                                roleName: "hasWriteAccess"
+                                value: true
+                            }
+                        ]
+                    }
+
+                    currentIndex: 0
 
                     clickedFunction: function() {
                         serverSelector.text = selectedText
-                        ContainersModel.setCurrentlyProcessedServerIndex(currentIndex)
+                        ServersModel.currentlyProcessedIndex = currentIndex
                         protocolSelector.visible = true
                     }
 
                     Component.onCompleted: {
                         serverSelector.text = selectedText
-                        ContainersModel.setCurrentlyProcessedServerIndex(currentIndex)
+                        ServersModel.currentlyProcessedIndex = currentIndex
                     }
                 }
 
@@ -169,7 +179,7 @@ PageType {
                     height: parent.height * 0.5
 
                     ColumnLayout {
-                        id: header
+                        id: protocolSelectorHeader
 
                         anchors.top: parent.top
                         anchors.left: parent.left
@@ -187,12 +197,12 @@ PageType {
                     }
 
                     FlickableType {
-                        anchors.top: header.bottom
+                        anchors.top: protocolSelectorHeader.bottom
                         anchors.topMargin: 16
-                        contentHeight: col.implicitHeight
+                        contentHeight: protocolSelectorContent.implicitHeight
 
                         Column {
-                            id: col
+                            id: protocolSelectorContent
                             anchors.top: parent.top
                             anchors.left: parent.left
                             anchors.right: parent.right
@@ -265,7 +275,7 @@ PageType {
             }
 
             DropDownType {
-                id: connectionTypeSelector
+                id: exportTypeSelector
 
                 property int currentIndex
 
@@ -283,8 +293,6 @@ PageType {
                 headerText: qsTr("Connection format")
 
                 listView: ListViewType {
-                    id: connectionTypeSelectorListView
-
                     rootWidth: root.width
                     dividerVisible: true
 
@@ -294,14 +302,14 @@ PageType {
                     currentIndex: 0
 
                     clickedFunction: function() {
-                        connectionTypeSelector.text = selectedText
-                        connectionTypeSelector.currentIndex = currentIndex
-                        connectionTypeSelector.menuVisible = false
+                        exportTypeSelector.text = selectedText
+                        exportTypeSelector.currentIndex = currentIndex
+                        exportTypeSelector.menuVisible = false
                     }
 
                     Component.onCompleted: {
-                        connectionTypeSelector.text = selectedText
-                        connectionTypeSelector.currentIndex = currentIndex
+                        exportTypeSelector.text = selectedText
+                        exportTypeSelector.currentIndex = currentIndex
                     }
                 }
             }
diff --git a/client/ui/qml/Pages2/PageStart.qml b/client/ui/qml/Pages2/PageStart.qml
index 1307ee05..e2b83056 100644
--- a/client/ui/qml/Pages2/PageStart.qml
+++ b/client/ui/qml/Pages2/PageStart.qml
@@ -50,8 +50,7 @@ PageType {
 
         Component.onCompleted: {
             var pagePath = PageController.getPagePath(PageEnum.PageHome)
-            ServersModel.setCurrentlyProcessedServerIndex(ServersModel.getDefaultServerIndex())
-            ContainersModel.setCurrentlyProcessedServerIndex(ServersModel.getDefaultServerIndex())
+            ServersModel.currentlyProcessedIndex = ServersModel.defaultIndex
             tabBarStackView.push(pagePath, { "objectName" : pagePath })
         }
     }
@@ -65,8 +64,8 @@ PageType {
 
         topPadding: 8
         bottomPadding: 8//34
-        leftPadding: 96
-        rightPadding: 96
+        leftPadding: shareTabButton.visible ? 96 : 128
+        rightPadding: shareTabButton.visible ? 96 : 128
 
         background: Rectangle {
             border.width: 1
@@ -78,11 +77,25 @@ PageType {
             isSelected: tabBar.currentIndex === 0
             image: "qrc:/images/controls/home.svg"
             onClicked: {
-                ContainersModel.setCurrentlyProcessedServerIndex(ServersModel.getDefaultServerIndex())
+                ServersModel.currentlyProcessedIndex = ServersModel.defaultIndex
                 tabBarStackView.goToTabBarPage(PageEnum.PageHome)
             }
         }
         TabImageButtonType {
+            id: shareTabButton
+
+            Connections {
+                target: ServersModel
+
+                function onDefaultServerIndexChanged() {
+                    shareTabButton.visible = ServersModel.isCurrentlyProcessedServerHasWriteAccess()
+                    shareTabButton.width = ServersModel.isCurrentlyProcessedServerHasWriteAccess() ? undefined : 0
+                }
+            }
+
+            visible: ServersModel.isCurrentlyProcessedServerHasWriteAccess()
+            width: visible ? undefined : 0
+
             isSelected: tabBar.currentIndex === 1
             image: "qrc:/images/controls/share-2.svg"
             onClicked: {
@@ -100,8 +113,8 @@ PageType {
 
     MouseArea {
         anchors.fill: tabBar
-        anchors.leftMargin: 96
-        anchors.rightMargin: 96
+        anchors.leftMargin: shareTabButton.visible ? 96 : 128
+        anchors.rightMargin: shareTabButton.visible ? 96 : 128
         cursorShape: Qt.PointingHandCursor
         enabled: false
     }

From 795405c47d3c4fceffbe82aa6ce0be1e8970d12e Mon Sep 17 00:00:00 2001
From: "vladimir.kuznetsov" <nethiuswork@gmail.com>
Date: Tue, 27 Jun 2023 19:07:42 +0900
Subject: [PATCH 036/278] added display of amnesia dns container activity on
 the main page

---
 client/resources.qrc                          |   1 +
 .../ui/controllers/connectionController.cpp   |   2 +
 client/ui/controllers/settingsController.cpp  |  26 +---
 client/ui/controllers/settingsController.h    |   6 +-
 client/ui/models/containers_model.cpp         |  11 ++
 client/ui/models/containers_model.h           |   3 +
 client/ui/models/servers_model.cpp            |  23 ++-
 client/ui/models/servers_model.h              |   6 +-
 client/ui/qml/Components/ConnectButton.qml    |   2 +
 .../qml/Components/ShareConnectionDrawer.qml  |   1 -
 .../ui/qml/Components/ShowDetailsDrawer.qml   |  10 ++
 .../qml/Components/TransportProtoSelector.qml |  14 +-
 client/ui/qml/Controls2/DropDownType.qml      |   3 -
 .../qml/Controls2/HorizontalRadioButton.qml   |   6 +
 client/ui/qml/Pages2/PageHome.qml             |  42 ++++--
 .../Pages2/PageSettingsServerProtocols.qml    |   3 +-
 .../qml/Pages2/PageSettingsServerServices.qml |   3 +-
 .../qml/Pages2/PageSetupWizardCredentials.qml |   6 +-
 .../PageSetupWizardProtocolSettings.qml       | 139 ++++++++++++++++--
 client/ui/qml/Pages2/PageShare.qml            |  12 +-
 client/ui/qml/Pages2/PageStart.qml            |   4 +-
 21 files changed, 238 insertions(+), 85 deletions(-)
 create mode 100644 client/ui/qml/Components/ShowDetailsDrawer.qml

diff --git a/client/resources.qrc b/client/resources.qrc
index 9aba0a6b..b306c154 100644
--- a/client/resources.qrc
+++ b/client/resources.qrc
@@ -270,5 +270,6 @@
         <file>images/controls/telegram.svg</file>
         <file>ui/qml/Controls2/TextTypes/SmallTextType.qml</file>
         <file>ui/qml/Filters/ContainersModelFilters.qml</file>
+        <file>ui/qml/Components/ShowDetailsDrawer.qml</file>
     </qresource>
 </RCC>
diff --git a/client/ui/controllers/connectionController.cpp b/client/ui/controllers/connectionController.cpp
index aace2857..7d1b6bed 100644
--- a/client/ui/controllers/connectionController.cpp
+++ b/client/ui/controllers/connectionController.cpp
@@ -83,11 +83,13 @@ void ConnectionController::onConnectionStateChanged(Vpn::ConnectionState state)
     }
     case Vpn::ConnectionState::Error: {
         m_isConnectionInProgress = false;
+        m_connectionStateText = tr("Connect");
         emit connectionErrorOccurred(getLastConnectionError());
         break;
     }
     case Vpn::ConnectionState::Unknown: {
         m_isConnectionInProgress = false;
+        m_connectionStateText = tr("Connect");
         emit connectionErrorOccurred(getLastConnectionError());
         break;
     }
diff --git a/client/ui/controllers/settingsController.cpp b/client/ui/controllers/settingsController.cpp
index b86b1cff..fcfcc7af 100644
--- a/client/ui/controllers/settingsController.cpp
+++ b/client/ui/controllers/settingsController.cpp
@@ -8,15 +8,10 @@
 
 SettingsController::SettingsController(const QSharedPointer<ServersModel> &serversModel,
                                        const QSharedPointer<ContainersModel> &containersModel,
-                                       const std::shared_ptr<Settings> &settings,
-                                       QObject *parent)
-    : QObject(parent)
-    , m_serversModel(serversModel)
-    , m_containersModel(containersModel)
-    , m_settings(settings)
+                                       const std::shared_ptr<Settings> &settings, QObject *parent)
+    : QObject(parent), m_serversModel(serversModel), m_containersModel(containersModel), m_settings(settings)
 {
-    m_appVersion = QString("%1: %2 (%3)")
-                       .arg(tr("Software version"), QString(APP_MAJOR_VERSION), __DATE__);
+    m_appVersion = QString("%1: %2 (%3)").arg(tr("Software version"), QString(APP_MAJOR_VERSION), __DATE__);
 }
 
 void SettingsController::setAmneziaDns(bool enable)
@@ -79,21 +74,16 @@ void SettingsController::clearLogs()
 
 void SettingsController::backupAppConfig()
 {
-    Utils::saveFile(".backup",
-                    tr("Backup application config"),
-                    "AmneziaVPN",
-                    m_settings->backupAppConfig());
+    Utils::saveFile(".backup", tr("Backup application config"), "AmneziaVPN", m_settings->backupAppConfig());
 }
 
 void SettingsController::restoreAppConfig()
 {
-    QString fileName = Utils::getFileName(Q_NULLPTR,
-                                          tr("Open backup"),
-                                          QStandardPaths::writableLocation(
-                                              QStandardPaths::DocumentsLocation),
-                                          "*.backup");
+    QString fileName =
+            Utils::getFileName(Q_NULLPTR, tr("Open backup"),
+                               QStandardPaths::writableLocation(QStandardPaths::DocumentsLocation), "*.backup");
 
-    //todo error processing
+    // todo error processing
     if (fileName.isEmpty())
         return;
 
diff --git a/client/ui/controllers/settingsController.h b/client/ui/controllers/settingsController.h
index 77de424c..f961a37d 100644
--- a/client/ui/controllers/settingsController.h
+++ b/client/ui/controllers/settingsController.h
@@ -12,12 +12,10 @@ class SettingsController : public QObject
 public:
     explicit SettingsController(const QSharedPointer<ServersModel> &serversModel,
                                 const QSharedPointer<ContainersModel> &containersModel,
-                                const std::shared_ptr<Settings> &settings,
-                                QObject *parent = nullptr);
+                                const std::shared_ptr<Settings> &settings, QObject *parent = nullptr);
 
     Q_PROPERTY(QString primaryDns READ getPrimaryDns WRITE setPrimaryDns NOTIFY primaryDnsChanged)
-    Q_PROPERTY(
-        QString secondaryDns READ getSecondaryDns WRITE setSecondaryDns NOTIFY secondaryDnsChanged)
+    Q_PROPERTY(QString secondaryDns READ getSecondaryDns WRITE setSecondaryDns NOTIFY secondaryDnsChanged)
 
 public slots:
     void setAmneziaDns(bool enable);
diff --git a/client/ui/models/containers_model.cpp b/client/ui/models/containers_model.cpp
index 7a6946f5..ecacc184 100644
--- a/client/ui/models/containers_model.cpp
+++ b/client/ui/models/containers_model.cpp
@@ -132,6 +132,17 @@ void ContainersModel::clearCachedProfiles()
     }
 }
 
+bool ContainersModel::isAmneziaDnsContainerInstalled()
+{
+    return m_containers.contains(DockerContainer::Dns);
+}
+
+bool ContainersModel::isAmneziaDnsContainerInstalled(const int serverIndex)
+{
+    QMap<DockerContainer, QJsonObject> containers = m_settings->containers(serverIndex);
+    return containers.contains(DockerContainer::Dns);
+}
+
 QHash<int, QByteArray> ContainersModel::roleNames() const
 {
     QHash<int, QByteArray> roles;
diff --git a/client/ui/models/containers_model.h b/client/ui/models/containers_model.h
index ebf47497..7331ef22 100644
--- a/client/ui/models/containers_model.h
+++ b/client/ui/models/containers_model.h
@@ -51,6 +51,9 @@ public slots:
     void removeAllContainers();
     void clearCachedProfiles();
 
+    bool isAmneziaDnsContainerInstalled();
+    bool isAmneziaDnsContainerInstalled(const int serverIndex);
+
 protected:
     QHash<int, QByteArray> roleNames() const override;
 
diff --git a/client/ui/models/servers_model.cpp b/client/ui/models/servers_model.cpp
index 9df243fe..b427f15b 100644
--- a/client/ui/models/servers_model.cpp
+++ b/client/ui/models/servers_model.cpp
@@ -59,10 +59,14 @@ QVariant ServersModel::data(const QModelIndex &index, int role) const
     case CredentialsLoginRole: return m_settings->serverCredentials(index.row()).userName;
     case IsDefaultRole: return index.row() == m_defaultServerIndex;
     case IsCurrentlyProcessedRole: return index.row() == m_currenlyProcessedServerIndex;
-    case HasWriteAccess: {
+    case HasWriteAccessRole: {
         auto credentials = m_settings->serverCredentials(index.row());
         return (!credentials.userName.isEmpty() && !credentials.secretData.isEmpty());
     }
+    case ContainsAmneziaDnsRole: {
+        QString primaryDns = server.value(config_key::dns1).toString();
+        return primaryDns == protocols::dns::amneziaDnsIp;
+    }
     }
 
     return QVariant();
@@ -109,7 +113,12 @@ bool ServersModel::isDefaultServerCurrentlyProcessed()
 
 bool ServersModel::isCurrentlyProcessedServerHasWriteAccess()
 {
-    return qvariant_cast<bool>(data(m_currenlyProcessedServerIndex, HasWriteAccess));
+    return qvariant_cast<bool>(data(m_currenlyProcessedServerIndex, HasWriteAccessRole));
+}
+
+bool ServersModel::isDefaultServerHasWriteAccess()
+{
+    return qvariant_cast<bool>(data(m_currenlyProcessedServerIndex, HasWriteAccessRole));
 }
 
 void ServersModel::addServer(const QJsonObject &server)
@@ -138,6 +147,13 @@ void ServersModel::removeServer()
     endResetModel();
 }
 
+bool ServersModel::isDefaultServerConfigContainsAmneziaDns()
+{
+    const QJsonObject server = m_servers.at(m_defaultServerIndex).toObject();
+    QString primaryDns = server.value(config_key::dns1).toString();
+    return primaryDns == protocols::dns::amneziaDnsIp;
+}
+
 QHash<int, QByteArray> ServersModel::roleNames() const
 {
     QHash<int, QByteArray> roles;
@@ -147,6 +163,7 @@ QHash<int, QByteArray> ServersModel::roleNames() const
     roles[CredentialsLoginRole] = "credentialsLogin";
     roles[IsDefaultRole] = "isDefault";
     roles[IsCurrentlyProcessedRole] = "isCurrentlyProcessed";
-    roles[HasWriteAccess] = "hasWriteAccess";
+    roles[HasWriteAccessRole] = "hasWriteAccess";
+    roles[ContainsAmneziaDnsRole] = "containsAmneziaDns";
     return roles;
 }
diff --git a/client/ui/models/servers_model.h b/client/ui/models/servers_model.h
index 6cb9859e..0ec78e7e 100644
--- a/client/ui/models/servers_model.h
+++ b/client/ui/models/servers_model.h
@@ -16,7 +16,8 @@ public:
         CredentialsLoginRole,
         IsDefaultRole,
         IsCurrentlyProcessedRole,
-        HasWriteAccess
+        HasWriteAccessRole,
+        ContainsAmneziaDnsRole
     };
 
     ServersModel(std::shared_ptr<Settings> settings, QObject *parent = nullptr);
@@ -37,6 +38,7 @@ public slots:
     bool isDefaultServerCurrentlyProcessed();
 
     bool isCurrentlyProcessedServerHasWriteAccess();
+    bool isDefaultServerHasWriteAccess();
 
     const int getServersCount();
 
@@ -46,6 +48,8 @@ public slots:
     void addServer(const QJsonObject &server);
     void removeServer();
 
+    bool isDefaultServerConfigContainsAmneziaDns();
+
 protected:
     QHash<int, QByteArray> roleNames() const override;
 
diff --git a/client/ui/qml/Components/ConnectButton.qml b/client/ui/qml/Components/ConnectButton.qml
index 626c4ffb..1f27973a 100644
--- a/client/ui/qml/Components/ConnectButton.qml
+++ b/client/ui/qml/Components/ConnectButton.qml
@@ -17,6 +17,8 @@ Button {
 
     text: ConnectionController.connectionStateText
 
+    enabled: !ConnectionController.isConnectionInProgress
+
     background: Item {
         clip: true
 
diff --git a/client/ui/qml/Components/ShareConnectionDrawer.qml b/client/ui/qml/Components/ShareConnectionDrawer.qml
index e03738c8..720e3206 100644
--- a/client/ui/qml/Components/ShareConnectionDrawer.qml
+++ b/client/ui/qml/Components/ShareConnectionDrawer.qml
@@ -76,7 +76,6 @@ DrawerType {
                     }
                 }
 
-
                 BasicButtonType {
                     Layout.fillWidth: true
                     Layout.topMargin: 8
diff --git a/client/ui/qml/Components/ShowDetailsDrawer.qml b/client/ui/qml/Components/ShowDetailsDrawer.qml
new file mode 100644
index 00000000..2f6d2656
--- /dev/null
+++ b/client/ui/qml/Components/ShowDetailsDrawer.qml
@@ -0,0 +1,10 @@
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+
+import "../Controls2"
+import "../Controls2/TextTypes"
+
+Item {
+
+}
diff --git a/client/ui/qml/Components/TransportProtoSelector.qml b/client/ui/qml/Components/TransportProtoSelector.qml
index 6f5aa44b..dd315deb 100644
--- a/client/ui/qml/Components/TransportProtoSelector.qml
+++ b/client/ui/qml/Components/TransportProtoSelector.qml
@@ -8,11 +8,9 @@ import "../Controls2/TextTypes"
 Rectangle {
     id: root
 
-    property var rootWidth: root.width
+    property real rootWidth: root.width
     property int currentIndex
 
-    property alias mouseArea: transportProtoButtonMouseArea
-
     implicitWidth: transportProtoButtonGroup.implicitWidth
     implicitHeight: transportProtoButtonGroup.implicitHeight
 
@@ -30,8 +28,6 @@ Rectangle {
             implicitWidth: (rootWidth - 32) / 2
             text: "UDP"
 
-            hoverEnabled: !transportProtoButtonMouseArea.enabled
-
             onClicked: {
                 root.currentIndex = 0
             }
@@ -43,17 +39,9 @@ Rectangle {
             implicitWidth: (rootWidth - 32) / 2
             text: "TCP"
 
-            hoverEnabled: !transportProtoButtonMouseArea.enabled
-
             onClicked: {
                 root.currentIndex = 1
             }
         }
     }
-
-    MouseArea {
-        id: transportProtoButtonMouseArea
-
-        anchors.fill: parent
-    }
 }
diff --git a/client/ui/qml/Controls2/DropDownType.qml b/client/ui/qml/Controls2/DropDownType.qml
index 38cd0afa..9b9c718a 100644
--- a/client/ui/qml/Controls2/DropDownType.qml
+++ b/client/ui/qml/Controls2/DropDownType.qml
@@ -19,7 +19,6 @@ Item {
     property string rootButtonImage: "qrc:/images/controls/chevron-down.svg"
     property string rootButtonImageColor: "#D7D8DB"
     property string rootButtonBackgroundColor: "#1C1D21"
-    property int rootButtonMaximumWidth: 0
 
     property string rootButtonHoveredBorderColor: "#494B50"
     property string rootButtonDefaultBorderColor: "transparent"
@@ -88,8 +87,6 @@ Item {
                 horizontalAlignment: Text.AlignLeft
                 verticalAlignment: Text.AlignVCenter
 
-                Layout.maximumWidth: rootButtonMaximumWidth ? rootButtonMaximumWidth : implicitWidth
-
                 color: root.textColor
                 text: root.text
 
diff --git a/client/ui/qml/Controls2/HorizontalRadioButton.qml b/client/ui/qml/Controls2/HorizontalRadioButton.qml
index 86218b3f..4a2a13dd 100644
--- a/client/ui/qml/Controls2/HorizontalRadioButton.qml
+++ b/client/ui/qml/Controls2/HorizontalRadioButton.qml
@@ -88,4 +88,10 @@ RadioButton {
             horizontalAlignment: Qt.AlignHCenter
         }
     }
+
+    MouseArea {
+        anchors.fill: parent
+        cursorShape: Qt.PointingHandCursor
+        enabled: false
+    }
 }
diff --git a/client/ui/qml/Pages2/PageHome.qml b/client/ui/qml/Pages2/PageHome.qml
index 9f121273..b97acad1 100644
--- a/client/ui/qml/Pages2/PageHome.qml
+++ b/client/ui/qml/Pages2/PageHome.qml
@@ -95,13 +95,20 @@ PageType {
             Layout.alignment: Qt.AlignHCenter | Qt.AlignVCenter
 
             text: {
-                var string = ""
-                if (SettingsController.isAmneziaDnsEnabled()) {
-                    string += "Amnezia DNS | "
+                var description = ""
+                if (ServersModel.isDefaultServerHasWriteAccess()) {
+                    if (SettingsController.isAmneziaDnsEnabled()
+                            && ContainersModel.isAmneziaDnsContainerInstalled(ServersModel.getDefaultServerIndex())) {
+                        description += "Amnezia DNS | "
+                    }
+                } else {
+                    if (ServersModel.isDefaultServerConfigContainsAmneziaDns) {
+                        description += "Amnezia DNS | "
+                    }
                 }
 
-                string += root.currentContainerName + " | " + root.currentServerHostName
-                return string
+                description += root.currentContainerName + " | " + root.currentServerHostName
+                return description
             }
         }
     }
@@ -153,7 +160,6 @@ PageType {
 
                     rootButtonBorderWidth: 0
                     rootButtonImageColor: "#0E0E11"
-                    rootButtonMaximumWidth: 150 //todo make it dynamic
                     rootButtonBackgroundColor: "#D7D8DB"
 
                     text: root.currentContainerName
@@ -194,14 +200,6 @@ PageType {
                         currentIndex: ContainersModel.getDefaultContainer()
                     }
                 }
-
-                BasicButtonType {
-                    id: dnsButton
-
-                    implicitHeight: 40
-
-                    text: "Amnezia DNS"
-                }
             }
 
             Header2Type {
@@ -277,7 +275,21 @@ PageType {
                                     Layout.fillWidth: true
 
                                     text: name
-                                    descriptionText: hostName
+                                    descriptionText: {
+                                        var description = ""
+                                        if (hasWriteAccess) {
+                                            if (SettingsController.isAmneziaDnsEnabled()
+                                                    && ContainersModel.isAmneziaDnsContainerInstalled(index)) {
+                                                description += "AmneziaDNS | "
+                                            }
+                                        } else {
+                                            if (containsAmneziaDns) {
+                                                description += "AmneziaDNS | "
+                                            }
+                                        }
+
+                                        return description += hostName
+                                    }
 
                                     checked: index === serversMenuContent.currentIndex
 
diff --git a/client/ui/qml/Pages2/PageSettingsServerProtocols.qml b/client/ui/qml/Pages2/PageSettingsServerProtocols.qml
index 1d806d07..2b67afca 100644
--- a/client/ui/qml/Pages2/PageSettingsServerProtocols.qml
+++ b/client/ui/qml/Pages2/PageSettingsServerProtocols.qml
@@ -21,11 +21,12 @@ PageType {
     property var installedProtocolsCount
 
     SettingsContainersListView {
+        id: settingsContainersListView
         Connections {
             target: ServersModel
 
             function onCurrentlyProcessedServerIndexChanged() {
-                updateContainersModelFilters()
+                settingsContainersListView.updateContainersModelFilters()
             }
         }
 
diff --git a/client/ui/qml/Pages2/PageSettingsServerServices.qml b/client/ui/qml/Pages2/PageSettingsServerServices.qml
index 1e3d8722..282e7e9e 100644
--- a/client/ui/qml/Pages2/PageSettingsServerServices.qml
+++ b/client/ui/qml/Pages2/PageSettingsServerServices.qml
@@ -21,11 +21,12 @@ PageType {
     property var installedServicesCount
 
     SettingsContainersListView {
+        id: settingsContainersListView
         Connections {
             target: ServersModel
 
             function onCurrentlyProcessedServerIndexChanged() {
-                updateContainersModelFilters()
+                settingsContainersListView.updateContainersModelFilters()
             }
         }
 
diff --git a/client/ui/qml/Pages2/PageSetupWizardCredentials.qml b/client/ui/qml/Pages2/PageSetupWizardCredentials.qml
index fc8bf9ae..5a2f7d88 100644
--- a/client/ui/qml/Pages2/PageSetupWizardCredentials.qml
+++ b/client/ui/qml/Pages2/PageSetupWizardCredentials.qml
@@ -121,18 +121,18 @@ PageType {
         var hasEmptyField = false
 
         if (hostname.textFieldText === "") {
-            hostname.errorText = qsTr("ip address cannot be empty")
+            hostname.errorText = qsTr("Ip address cannot be empty")
             hasEmptyField = true
         } else if (!hostname.textField.acceptableInput) {
             hostname.errorText = qsTr("Enter the address in the format 255.255.255.255:88")
         }
 
         if (username.textFieldText === "") {
-            username.errorText = qsTr("login cannot be empty")
+            username.errorText = qsTr("Login cannot be empty")
             hasEmptyField = true
         }
         if (secretData.textFieldText === "") {
-            secretData.errorText = qsTr("password/private key cannot be empty")
+            secretData.errorText = qsTr("Password/private key cannot be empty")
             hasEmptyField = true
         }
         return !hasEmptyField
diff --git a/client/ui/qml/Pages2/PageSetupWizardProtocolSettings.qml b/client/ui/qml/Pages2/PageSetupWizardProtocolSettings.qml
index c0483df4..5ca75f6f 100644
--- a/client/ui/qml/Pages2/PageSetupWizardProtocolSettings.qml
+++ b/client/ui/qml/Pages2/PageSetupWizardProtocolSettings.qml
@@ -29,7 +29,6 @@ PageType {
     }
 
     FlickableType {
-        id: fl
         anchors.fill: parent
         contentHeight: content.height
 
@@ -41,18 +40,17 @@ PageType {
             anchors.right: parent.right
 
             ListView {
-                // todo change id naming
-                id: containers
+                id: processedContainerListView
                 width: parent.width
-                height: containers.contentItem.height
+                height: contentItem.height
                 currentIndex: -1
                 clip: true
                 interactive: false
                 model: proxyContainersModel
 
                 delegate: Item {
-                    implicitWidth: containers.width
-                    implicitHeight: delegateContent.implicitHeight
+                    implicitWidth: processedContainerListView.width
+                    implicitHeight: (delegateContent.implicitHeight > root.height) ? delegateContent.implicitHeight : root.height
 
                     ColumnLayout {
                         id: delegateContent
@@ -72,8 +70,122 @@ PageType {
 
                             Layout.fillWidth: true
 
-                            headerText: "Установка " + name
-                            descriptionText: "Эти настройки можно будет изменить позже"
+                            headerText: qsTr("Installing ") + name
+                            descriptionText: qsTr("protocol description")
+                        }
+
+                        BasicButtonType {
+                            id: showDetailsButton
+
+                            Layout.topMargin: 16
+                            Layout.leftMargin: -8
+
+                            implicitHeight: 32
+
+                            defaultColor: "transparent"
+                            hoveredColor: Qt.rgba(1, 1, 1, 0.08)
+                            pressedColor: Qt.rgba(1, 1, 1, 0.12)
+                            disabledColor: "#878B91"
+                            textColor: "#FBB26A"
+
+                            text: qsTr("More detailed")
+
+                            onClicked: {
+                                showDetailsDrawer.open()
+                            }
+                        }
+
+                        DrawerType {
+                            id: showDetailsDrawer
+
+                            width: parent.width
+                            height: parent.height * 0.9
+
+                            BackButtonType {
+                                id: showDetailsBackButton
+
+                                anchors.top: parent.top
+                                anchors.left: parent.left
+                                anchors.right: parent.right
+                                anchors.rightMargin: 16
+                                anchors.leftMargin: 16
+                                anchors.topMargin: 16
+
+                                backButtonFunction: function() {
+                                    showDetailsDrawer.close()
+                                }
+                            }
+
+                            FlickableType {
+                                anchors.top: showDetailsBackButton.bottom
+                                anchors.left: parent.left
+                                anchors.right: parent.right
+                                anchors.bottom: parent.bottom
+                                contentHeight: {
+                                    var emptySpaceHeight = parent.height - showDetailsBackButton.implicitHeight - showDetailsBackButton.anchors.topMargin
+
+                                    return (showDetailsDrawerContent.implicitHeight > emptySpaceHeight) ?
+                                                showDetailsDrawerContent.implicitHeight : emptySpaceHeight
+                                }
+
+                                ColumnLayout {
+                                    id: showDetailsDrawerContent
+
+                                    anchors.fill: parent
+                                    anchors.rightMargin: 16
+                                    anchors.leftMargin: 16
+
+                                    Header2Type {
+                                        id: showDetailsDrawerHeader
+                                        Layout.fillWidth: true
+                                        Layout.topMargin: 16
+
+                                        headerText: name
+                                    }
+
+                                    TextField {
+                                        Layout.fillWidth: true
+                                        Layout.topMargin: 16
+                                        Layout.bottomMargin: 16
+
+                                        padding: 0
+                                        leftPadding: 0
+                                        height: 24
+
+                                        color: "#D7D8DB"
+
+                                        font.pixelSize: 16
+                                        font.weight: Font.Medium
+                                        font.family: "PT Root UI VF"
+
+                                        text: qsTr("detailed protocol description")
+
+                                        wrapMode: Text.WordWrap
+
+                                        readOnly: true
+                                        background: Rectangle {
+                                            anchors.fill: parent
+                                            color: "transparent"
+                                        }
+                                    }
+
+                                    Rectangle {
+                                        Layout.fillHeight: true
+                                        color: "transparent"
+                                    }
+
+                                    BasicButtonType {
+                                        Layout.fillWidth: true
+                                        Layout.bottomMargin: 32
+
+                                        text: qsTr("Close")
+
+                                        onClicked: function() {
+                                            showDetailsDrawer.close()
+                                        }
+                                    }
+                                }
+                            }
                         }
 
                         ParagraphTextType {
@@ -96,15 +208,12 @@ PageType {
 
                             Layout.fillWidth: true
                             Layout.topMargin: 16
+
                             headerText: "Port"
                         }
 
                         Rectangle {
-                            // todo make it dynamic
-                            implicitHeight: root.height - port.implicitHeight -
-                                            transportProtoSelector.implicitHeight - transportProtoHeader.implicitHeight -
-                                            header.implicitHeight - backButton.implicitHeight - installButton.implicitHeight - 116
-
+                            Layout.fillHeight: true
                             color: "transparent"
                         }
 
@@ -134,7 +243,9 @@ PageType {
                             transportProtoSelector.currentIndex = ProtocolProps.defaultTransportProto(defaultContainerProto)
 
                             port.enabled = ProtocolProps.defaultPortChangeable(defaultContainerProto)
-                            transportProtoSelector.mouseArea.enabled = !ProtocolProps.defaultTransportProtoChangeable(defaultContainerProto)
+                            var protocolSelectorVisible = ProtocolProps.defaultTransportProtoChangeable(defaultContainerProto)
+                            transportProtoSelector.visible = protocolSelectorVisible
+                            transportProtoHeader.visible = protocolSelectorVisible
                         }
                     }
                 }
diff --git a/client/ui/qml/Pages2/PageShare.qml b/client/ui/qml/Pages2/PageShare.qml
index 30430073..1e3d02e8 100644
--- a/client/ui/qml/Pages2/PageShare.qml
+++ b/client/ui/qml/Pages2/PageShare.qml
@@ -260,12 +260,12 @@ PageType {
                                 }
 
                                 function fillConnectionTypeModel() {
-                                    connectionTypesModel = [amneziaConnectionFormat]
+                                    root.connectionTypesModel = [amneziaConnectionFormat]
 
                                     if (currentIndex === ContainerProps.containerFromString("OpenVpn")) {
-                                        connectionTypesModel.push(openVpnConnectionFormat)
+                                        root.connectionTypesModel.push(openVpnConnectionFormat)
                                     } else if (currentIndex === ContainerProps.containerFromString("wireGuardConnectionType")) {
-                                        connectionTypesModel.push(amneziaConnectionFormat)
+                                        root.connectionTypesModel.push(amneziaConnectionFormat)
                                     }
                                 }
                             }
@@ -287,7 +287,7 @@ PageType {
                 drawerHeight: 0.4375
 
                 visible: accessTypeSelector.currentIndex === 0
-                enabled: connectionTypesModel.length > 1
+                enabled: root.connectionTypesModel.length > 1
 
                 descriptionText: qsTr("Connection format")
                 headerText: qsTr("Connection format")
@@ -298,7 +298,7 @@ PageType {
 
                     imageSource: "qrc:/images/controls/chevron-right.svg"
 
-                    model: connectionTypesModel
+                    model: root.connectionTypesModel
                     currentIndex: 0
 
                     clickedFunction: function() {
@@ -326,7 +326,7 @@ PageType {
 
                 onClicked: {
                     if (accessTypeSelector.currentIndex === 0) {
-                        connectionTypesModel[connectionTypeSelector.currentIndex].func()
+                        root.connectionTypesModel[accessTypeSelector.currentIndex].func()
                     } else {
                         ExportController.generateConfig(true)
                     }
diff --git a/client/ui/qml/Pages2/PageStart.qml b/client/ui/qml/Pages2/PageStart.qml
index e2b83056..76450b16 100644
--- a/client/ui/qml/Pages2/PageStart.qml
+++ b/client/ui/qml/Pages2/PageStart.qml
@@ -77,8 +77,8 @@ PageType {
             isSelected: tabBar.currentIndex === 0
             image: "qrc:/images/controls/home.svg"
             onClicked: {
-                ServersModel.currentlyProcessedIndex = ServersModel.defaultIndex
                 tabBarStackView.goToTabBarPage(PageEnum.PageHome)
+                ServersModel.currentlyProcessedIndex = ServersModel.defaultIndex
             }
         }
         TabImageButtonType {
@@ -94,7 +94,7 @@ PageType {
             }
 
             visible: ServersModel.isCurrentlyProcessedServerHasWriteAccess()
-            width: visible ? undefined : 0
+            width: ServersModel.isCurrentlyProcessedServerHasWriteAccess() ? undefined : 0
 
             isSelected: tabBar.currentIndex === 1
             image: "qrc:/images/controls/share-2.svg"

From 464d77dfb58ae284cb2ae248b8a3541d2c8cc4a3 Mon Sep 17 00:00:00 2001
From: "vladimir.kuznetsov" <nethiuswork@gmail.com>
Date: Fri, 30 Jun 2023 10:40:43 +0900
Subject: [PATCH 037/278] added functionality to change app language via
 settings

---
 client/CMakeLists.txt                         |   18 +-
 client/amnezia_application.cpp                |   46 +-
 client/amnezia_application.h                  |   21 +-
 client/resources.qrc                          |    3 +-
 client/settings.h                             |  131 +-
 client/translations/amneziavpn_ru.qm          |  Bin 25539 -> 0 bytes
 client/translations/amneziavpn_ru.ts          | 4382 +++++++++++------
 client/ui/controllers/settingsController.cpp  |    2 +-
 client/ui/models/languageModel.cpp            |   62 +
 client/ui/models/languageModel.h              |   62 +
 .../ConnectionTypeSelectionDrawer.qml         |    2 +
 .../qml/Components/SelectLanguageDrawer.qml   |  137 +
 .../qml/Components/ShareConnectionDrawer.qml  |    2 -
 .../ui/qml/Components/ShowDetailsDrawer.qml   |   10 -
 client/ui/qml/Controls2/BackButtonType.qml    |    1 +
 client/ui/qml/Controls2/BasicButtonType.qml   |    8 +-
 client/ui/qml/Controls2/DividerType.qml       |    4 +
 client/ui/qml/Controls2/DropDownType.qml      |    2 -
 .../Controls2/TextTypes/ButtonTextType.qml    |    5 +-
 .../Controls2/TextTypes/CaptionTextType.qml   |    5 +-
 .../Controls2/TextTypes/Header1TextType.qml   |    7 +-
 .../Controls2/TextTypes/Header2TextType.qml   |    5 +-
 .../qml/Controls2/TextTypes/LabelTextType.qml |    5 +-
 .../Controls2/TextTypes/ListItemTitleType.qml |    5 +-
 .../Controls2/TextTypes/ParagraphTextType.qml |    5 +-
 .../qml/Controls2/TextTypes/SmallTextType.qml |    5 +-
 client/ui/qml/Pages2/PageSettingsAbout.qml    |    2 -
 .../ui/qml/Pages2/PageSettingsApplication.qml |    9 +-
 client/ui/qml/Pages2/PageSettingsBackup.qml   |    2 -
 .../ui/qml/Pages2/PageSettingsConnection.qml  |    2 -
 client/ui/qml/Pages2/PageSettingsDns.qml      |    2 -
 .../ui/qml/Pages2/PageSettingsServerInfo.qml  |    4 +-
 .../ui/qml/Pages2/PageSettingsServersList.qml |    4 +-
 .../Pages2/PageSetupWizardConfigSource.qml    |    9 +-
 .../qml/Pages2/PageSetupWizardCredentials.qml |    2 -
 client/ui/qml/Pages2/PageSetupWizardEasy.qml  |    2 -
 .../PageSetupWizardProtocolSettings.qml       |    4 +-
 .../qml/Pages2/PageSetupWizardProtocols.qml   |   22 +-
 client/ui/qml/Pages2/PageSetupWizardStart.qml |    1 +
 .../ui/qml/Pages2/PageSetupWizardTextKey.qml  |    6 +-
 .../qml/Pages2/PageSetupWizardViewConfig.qml  |    2 -
 client/ui/qml/Pages2/PageShare.qml            |    2 -
 42 files changed, 3333 insertions(+), 1677 deletions(-)
 delete mode 100644 client/translations/amneziavpn_ru.qm
 create mode 100644 client/ui/models/languageModel.cpp
 create mode 100644 client/ui/models/languageModel.h
 create mode 100644 client/ui/qml/Components/SelectLanguageDrawer.qml
 delete mode 100644 client/ui/qml/Components/ShowDetailsDrawer.qml

diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt
index f2346ec5..ad9a4cf4 100644
--- a/client/CMakeLists.txt
+++ b/client/CMakeLists.txt
@@ -19,15 +19,12 @@ set_property(GLOBAL PROPERTY AUTOMOC_TARGETS_FOLDER "Autogen")
 set_property(GLOBAL PROPERTY PREDEFINED_TARGETS_FOLDER "Autogen")
 
 set(PACKAGES
-	Widgets Core Gui Network Xml
-	RemoteObjects Quick Svg QuickControls2
-	Core5Compat Concurrent
+    Widgets Core Gui Network Xml
+    RemoteObjects Quick Svg QuickControls2
+    Core5Compat Concurrent LinguistTools
 )
 if(IOS)
-	set(PACKAGES
-		${PACKAGES}
-		Multimedia
-	)
+    set(PACKAGES ${PACKAGES} Multimedia)
 endif()
 
 find_package(Qt6 REQUIRED COMPONENTS ${PACKAGES})
@@ -38,11 +35,9 @@ set(LIBS ${LIBS}
     Qt6::Quick Qt6::Svg Qt6::QuickControls2
     Qt6::Core5Compat Qt6::Concurrent
 )
+
 if(IOS)
-	set(LIBS
-		${LIBS}
-		Qt6::Multimedia
-	)
+    set(LIBS ${LIBS} Qt6::Multimedia)
 endif()
 
 qt_standard_project_setup()
@@ -349,6 +344,7 @@ if(CMAKE_OSX_SYSROOT STREQUAL "iphoneos")
 endif()
 
 qt_add_executable(${PROJECT} ${SOURCES} ${HEADERS} ${RESOURCES} ${QRC})
+
 qt_add_translations(${PROJECT} TS_FILES
     ${CMAKE_CURRENT_LIST_DIR}/translations/amneziavpn_ru.ts)
 
diff --git a/client/amnezia_application.cpp b/client/amnezia_application.cpp
index 7159aa4f..7c3b466b 100644
--- a/client/amnezia_application.cpp
+++ b/client/amnezia_application.cpp
@@ -3,12 +3,11 @@
 #include <QClipboard>
 #include <QFontDatabase>
 #include <QMimeData>
+#include <QQuickStyle>
 #include <QStandardPaths>
 #include <QTextDocument>
 #include <QTimer>
 #include <QTranslator>
-#include <QQuickStyle>
-
 
 #include "core/servercontroller.h"
 #include "logger.h"
@@ -88,6 +87,10 @@ void AmneziaApplication::init()
     connect(m_serversModel.get(), &ServersModel::currentlyProcessedServerIndexChanged, m_containersModel.get(),
             &ContainersModel::setCurrentlyProcessedServerIndex);
 
+    m_languageModel.reset(new LanguageModel(m_settings, this));
+    m_engine->rootContext()->setContextProperty("LanguageModel", m_languageModel.get());
+    connect(m_languageModel.get(), &LanguageModel::updateTranslations, this, &AmneziaApplication::updateTranslator);
+
     m_configurator = std::shared_ptr<VpnConfigurator>(new VpnConfigurator(m_settings, this));
     m_vpnConnection.reset(new VpnConnection(m_settings, m_configurator));
 
@@ -130,18 +133,16 @@ void AmneziaApplication::init()
     //     m_uiLogic->showOnStartup();
     // #endif
 
-#endif
-
-    // TODO - fix
-#if !defined(Q_OS_ANDROID) && !defined(Q_OS_IOS)
-    if (isPrimary()) {
-        QObject::connect(this, &SingleApplication::instanceStarted, m_uiLogic, [this](){
-            qDebug() << "Secondary instance started, showing this window instead";
-            emit m_uiLogic->show();
-            emit m_uiLogic->raise();
-        });
-    }
-#endif
+//    // TODO - fix
+// #if !defined(Q_OS_ANDROID) && !defined(Q_OS_IOS)
+//    if (isPrimary()) {
+//        QObject::connect(this, &SingleApplication::instanceStarted, m_uiLogic, [this](){
+//            qDebug() << "Secondary instance started, showing this window instead";
+//            emit m_uiLogic->show();
+//            emit m_uiLogic->raise();
+//        });
+//    }
+// #endif
 
 // Android TextField clipboard workaround
 // https://bugreports.qt.io/browse/QTBUG-113461
@@ -195,12 +196,27 @@ void AmneziaApplication::loadFonts()
 
 void AmneziaApplication::loadTranslator()
 {
+    auto locale = m_settings->getAppLanguage();
     m_translator = new QTranslator;
-    if (m_translator->load(QLocale(), QString("amneziavpn"), QLatin1String("_"), QLatin1String(":/translations"))) {
+    if (m_translator->load(locale, QString("amneziavpn"), QLatin1String("_"), QLatin1String(":/i18n"))) {
         installTranslator(m_translator);
     }
 }
 
+void AmneziaApplication::updateTranslator(const QLocale &locale)
+{
+    QResource::registerResource(":/translations.qrc");
+    if (!m_translator->isEmpty())
+        QCoreApplication::removeTranslator(m_translator);
+    if (m_translator->load(locale, QString("amneziavpn"), QLatin1String("_"), QLatin1String(":/i18n"))) {
+        if (QCoreApplication::installTranslator(m_translator)) {
+            m_settings->setAppLanguage(locale);
+        }
+
+        m_engine->retranslate();
+    }
+}
+
 bool AmneziaApplication::parseCommands()
 {
     m_parser.setApplicationDescription(APPLICATION_NAME);
diff --git a/client/amnezia_application.h b/client/amnezia_application.h
index 893511b6..4e9cc348 100644
--- a/client/amnezia_application.h
+++ b/client/amnezia_application.h
@@ -20,17 +20,17 @@
 #include "ui/controllers/pageController.h"
 #include "ui/controllers/settingsController.h"
 #include "ui/models/containers_model.h"
+#include "ui/models/languageModel.h"
 #include "ui/models/servers_model.h"
 
 #define amnApp (static_cast<AmneziaApplication *>(QCoreApplication::instance()))
 
-
 #if defined(Q_OS_ANDROID) || defined(Q_OS_IOS)
-  #define AMNEZIA_BASE_CLASS QApplication
+    #define AMNEZIA_BASE_CLASS QApplication
 #else
-  #define AMNEZIA_BASE_CLASS SingleApplication
-  #define QAPPLICATION_CLASS QApplication
-  #include "singleapplication.h"
+    #define AMNEZIA_BASE_CLASS SingleApplication
+    #define QAPPLICATION_CLASS QApplication
+    #include "singleapplication.h"
 #endif
 
 class AmneziaApplication : public AMNEZIA_BASE_CLASS
@@ -41,7 +41,8 @@ public:
     AmneziaApplication(int &argc, char *argv[]);
 #else
     AmneziaApplication(int &argc, char *argv[], bool allowSecondary = false,
-        SingleApplication::Options options = SingleApplication::User, int timeout = 1000, const QString &userData = {} );
+                       SingleApplication::Options options = SingleApplication::User, int timeout = 1000,
+                       const QString &userData = {});
 #endif
     virtual ~AmneziaApplication();
 
@@ -49,6 +50,7 @@ public:
     void registerTypes();
     void loadFonts();
     void loadTranslator();
+    void updateTranslator(const QLocale &locale);
     bool parseCommands();
 
     QQmlApplicationEngine *qmlEngine() const;
@@ -58,14 +60,15 @@ private:
     std::shared_ptr<Settings> m_settings;
     std::shared_ptr<VpnConfigurator> m_configurator;
 
-    ContainerProps* m_containerProps {};
-    ProtocolProps* m_protocolProps {};
+    ContainerProps *m_containerProps {};
+    ProtocolProps *m_protocolProps {};
 
-    QTranslator* m_translator;
+    QTranslator *m_translator;
     QCommandLineParser m_parser;
 
     QSharedPointer<ContainersModel> m_containersModel;
     QSharedPointer<ServersModel> m_serversModel;
+    QScopedPointer<LanguageModel> m_languageModel;
 
     QSharedPointer<VpnConnection> m_vpnConnection;
 
diff --git a/client/resources.qrc b/client/resources.qrc
index b306c154..357cb40c 100644
--- a/client/resources.qrc
+++ b/client/resources.qrc
@@ -1,6 +1,5 @@
 <RCC>
     <qresource prefix="/">
-        <file>translations/amneziavpn_ru.qm</file>
         <file>images/close.png</file>
         <file>images/settings.png</file>
         <file>images/favorites_disabled.png</file>
@@ -270,6 +269,6 @@
         <file>images/controls/telegram.svg</file>
         <file>ui/qml/Controls2/TextTypes/SmallTextType.qml</file>
         <file>ui/qml/Filters/ContainersModelFilters.qml</file>
-        <file>ui/qml/Components/ShowDetailsDrawer.qml</file>
+        <file>ui/qml/Components/SelectLanguageDrawer.qml</file>
     </qresource>
 </RCC>
diff --git a/client/settings.h b/client/settings.h
index 28a49e18..9bf40ac7 100644
--- a/client/settings.h
+++ b/client/settings.h
@@ -2,15 +2,15 @@
 #define SETTINGS_H
 
 #include <QObject>
-#include <QString>
 #include <QSettings>
+#include <QString>
 
-#include <QJsonDocument>
 #include <QJsonArray>
+#include <QJsonDocument>
 #include <QJsonObject>
 
-#include "core/defs.h"
 #include "containers/containers_defs.h"
+#include "core/defs.h"
 #include "secure_qsettings.h"
 
 using namespace amnezia;
@@ -22,13 +22,19 @@ class Settings : public QObject
     Q_OBJECT
 
 public:
-    explicit Settings(QObject* parent = nullptr);
+    explicit Settings(QObject *parent = nullptr);
 
     ServerCredentials defaultServerCredentials() const;
     ServerCredentials serverCredentials(int index) const;
 
-    QJsonArray serversArray() const { return QJsonDocument::fromJson(m_settings.value("Servers/serversList").toByteArray()).array(); }
-    void setServersArray(const QJsonArray &servers) { m_settings.setValue("Servers/serversList", QJsonDocument(servers).toJson()); }
+    QJsonArray serversArray() const
+    {
+        return QJsonDocument::fromJson(m_settings.value("Servers/serversList").toByteArray()).array();
+    }
+    void setServersArray(const QJsonArray &servers)
+    {
+        m_settings.setValue("Servers/serversList", QJsonDocument(servers).toJson());
+    }
 
     // Servers section
     int serversCount() const;
@@ -37,9 +43,18 @@ public:
     void removeServer(int index);
     bool editServer(int index, const QJsonObject &server);
 
-    int defaultServerIndex() const { return m_settings.value("Servers/defaultServerIndex", 0).toInt(); }
-    void setDefaultServer(int index) { m_settings.setValue("Servers/defaultServerIndex", index); }
-    QJsonObject defaultServer() const { return server(defaultServerIndex()); }
+    int defaultServerIndex() const
+    {
+        return m_settings.value("Servers/defaultServerIndex", 0).toInt();
+    }
+    void setDefaultServer(int index)
+    {
+        m_settings.setValue("Servers/defaultServerIndex", index);
+    }
+    QJsonObject defaultServer() const
+    {
+        return server(defaultServerIndex());
+    }
 
     void setDefaultContainer(int serverIndex, DockerContainer container);
     DockerContainer defaultContainer(int serverIndex) const;
@@ -61,13 +76,28 @@ public:
     QString nextAvailableServerName() const;
 
     // App settings section
-    bool isAutoConnect() const { return m_settings.value("Conf/autoConnect", false).toBool(); }
-    void setAutoConnect(bool enabled) { m_settings.setValue("Conf/autoConnect", enabled); }
+    bool isAutoConnect() const
+    {
+        return m_settings.value("Conf/autoConnect", false).toBool();
+    }
+    void setAutoConnect(bool enabled)
+    {
+        m_settings.setValue("Conf/autoConnect", enabled);
+    }
 
-    bool isStartMinimized() const { return m_settings.value("Conf/startMinimized", false).toBool(); }
-    void setStartMinimized(bool enabled) { m_settings.setValue("Conf/startMinimized", enabled); }
+    bool isStartMinimized() const
+    {
+        return m_settings.value("Conf/startMinimized", false).toBool();
+    }
+    void setStartMinimized(bool enabled)
+    {
+        m_settings.setValue("Conf/startMinimized", enabled);
+    }
 
-    bool isSaveLogs() const { return m_settings.value("Conf/saveLogs", false).toBool(); }
+    bool isSaveLogs() const
+    {
+        return m_settings.value("Conf/saveLogs", false).toBool();
+    }
     void setSaveLogs(bool enabled);
 
     enum RouteMode {
@@ -75,16 +105,29 @@ public:
         VpnOnlyForwardSites,
         VpnAllExceptSites
     };
-    Q_ENUM (RouteMode)
+    Q_ENUM(RouteMode)
 
     QString routeModeString(RouteMode mode) const;
 
-    RouteMode routeMode() const  { return static_cast<RouteMode>(m_settings.value("Conf/routeMode", 0).toInt()); }
-    void setRouteMode(RouteMode mode) { m_settings.setValue("Conf/routeMode", mode); }
+    RouteMode routeMode() const
+    {
+        return static_cast<RouteMode>(m_settings.value("Conf/routeMode", 0).toInt());
+    }
+    void setRouteMode(RouteMode mode)
+    {
+        m_settings.setValue("Conf/routeMode", mode);
+    }
 
-    QVariantMap vpnSites(RouteMode mode) const { return m_settings.value("Conf/" + routeModeString(mode)).toMap(); }
-    void setVpnSites(RouteMode mode, const QVariantMap &sites) { m_settings.setValue("Conf/"+ routeModeString(mode), sites); m_settings.sync(); }
-    void addVpnSite(RouteMode mode, const QString &site, const QString &ip= "");
+    QVariantMap vpnSites(RouteMode mode) const
+    {
+        return m_settings.value("Conf/" + routeModeString(mode)).toMap();
+    }
+    void setVpnSites(RouteMode mode, const QVariantMap &sites)
+    {
+        m_settings.setValue("Conf/" + routeModeString(mode), sites);
+        m_settings.sync();
+    }
+    void addVpnSite(RouteMode mode, const QString &site, const QString &ip = "");
     void addVpnSites(RouteMode mode, const QMap<QString, QString> &sites); // map <site, ip>
     QStringList getVpnIps(RouteMode mode) const;
     void removeVpnSite(RouteMode mode, const QString &site);
@@ -92,33 +135,59 @@ public:
     void addVpnIps(RouteMode mode, const QStringList &ip);
     void removeVpnSites(RouteMode mode, const QStringList &sites);
 
-    bool useAmneziaDns() const { return m_settings.value("Conf/useAmneziaDns", true).toBool(); }
-    void setUseAmneziaDns(bool enabled) { m_settings.setValue("Conf/useAmneziaDns", enabled); }
+    bool useAmneziaDns() const
+    {
+        return m_settings.value("Conf/useAmneziaDns", true).toBool();
+    }
+    void setUseAmneziaDns(bool enabled)
+    {
+        m_settings.setValue("Conf/useAmneziaDns", enabled);
+    }
 
     QString primaryDns() const;
     QString secondaryDns() const;
 
-    //QString primaryDns() const { return m_primaryDns; }
-    void setPrimaryDns(const QString &primaryDns) { m_settings.setValue("Conf/primaryDns", primaryDns); }
+    // QString primaryDns() const { return m_primaryDns; }
+    void setPrimaryDns(const QString &primaryDns)
+    {
+        m_settings.setValue("Conf/primaryDns", primaryDns);
+    }
 
-    //QString secondaryDns() const { return m_secondaryDns; }
-    void setSecondaryDns(const QString &secondaryDns) { m_settings.setValue("Conf/secondaryDns", secondaryDns); }
+    // QString secondaryDns() const { return m_secondaryDns; }
+    void setSecondaryDns(const QString &secondaryDns)
+    {
+        m_settings.setValue("Conf/secondaryDns", secondaryDns);
+    }
 
     static const char cloudFlareNs1[];
     static const char cloudFlareNs2[];
 
-//    static constexpr char openNicNs5[] = "94.103.153.176";
-//    static constexpr char openNicNs13[] = "144.76.103.143";
+    //    static constexpr char openNicNs5[] = "94.103.153.176";
+    //    static constexpr char openNicNs13[] = "144.76.103.143";
 
-    QByteArray backupAppConfig() const { return m_settings.backupAppConfig(); }
-    bool restoreAppConfig(const QByteArray &cfg) { return m_settings.restoreAppConfig(cfg); }
+    QByteArray backupAppConfig() const
+    {
+        return m_settings.backupAppConfig();
+    }
+    bool restoreAppConfig(const QByteArray &cfg)
+    {
+        return m_settings.restoreAppConfig(cfg);
+    }
+
+    QLocale getAppLanguage()
+    {
+        return m_settings.value("Conf/appLanguage", QLocale()).toLocale();
+    };
+    void setAppLanguage(QLocale locale)
+    {
+        m_settings.setValue("Conf/appLanguage", locale);
+    };
 
 signals:
     void saveLogsChanged();
 
 private:
     SecureQSettings m_settings;
-
 };
 
 #endif // SETTINGS_H
diff --git a/client/translations/amneziavpn_ru.qm b/client/translations/amneziavpn_ru.qm
deleted file mode 100644
index f0e3aaea97fb44a56c38e26996633d05308393e5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 25539
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
LCgW%Av1|SxmH|-1

diff --git a/client/translations/amneziavpn_ru.ts b/client/translations/amneziavpn_ru.ts
index befce5d5..b1e7817f 100644
--- a/client/translations/amneziavpn_ru.ts
+++ b/client/translations/amneziavpn_ru.ts
@@ -2,1145 +2,2481 @@
 <!DOCTYPE TS>
 <TS version="2.1" language="ru_RU">
 <context>
-    <name>MainWindow</name>
+    <name>AdvancedServerSettingsLogic</name>
     <message>
-        <location filename="../ui/mainwindow.ui" line="456"/>
-        <source>Connect to the already created VPN server</source>
-        <translation>Подключиться к уже созданному серверу VPN</translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ui" line="478"/>
-        <source>Connection code</source>
-        <translation>Код для подключения</translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.cpp" line="483"/>
-        <source>Connecting...</source>
-        <translation>Подключение...</translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ui" line="414"/>
-        <location filename="../ui/mainwindow.ui" line="606"/>
-        <location filename="../ui/mainwindow.cpp" line="508"/>
-        <location filename="../ui/mainwindow.cpp" line="960"/>
-        <location filename="../ui/mainwindow.cpp" line="1794"/>
-        <source>Connect</source>
-        <translation>Подключиться</translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ui" line="330"/>
-        <location filename="../ui/mainwindow.cpp" line="1476"/>
-        <source>Set up your own server</source>
-        <translation>Настроить собственный сервер</translation>
-    </message>
-    <message>
-        <source>Connect your server to use VPN</source>
-        <translation type="vanished">Подключите ваш сервер, чтобы использовать VPN</translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ui" line="694"/>
-        <source>Server IP address</source>
-        <translation>IP адрес сервера</translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ui" line="710"/>
-        <source>Login to connect via SSH</source>
-        <translation>Логин для подключения по SSH</translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ui" line="726"/>
-        <location filename="../ui/mainwindow.ui" line="6062"/>
-        <location filename="../ui/mainwindow.cpp" line="1482"/>
-        <source>Password</source>
-        <translation>Пароль</translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ui" line="527"/>
-        <source>Where to get connection data →</source>
-        <translation>Где взять логин для подключения →</translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ui" line="433"/>
-        <source>vpn://...</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ui" line="742"/>
-        <location filename="../ui/mainwindow.ui" line="1931"/>
-        <location filename="../ui/mainwindow.ui" line="4323"/>
-        <location filename="../ui/mainwindow.cpp" line="695"/>
-        <location filename="../ui/mainwindow.cpp" line="763"/>
-        <source>Please wait, configuring process may take up to 5 minutes</source>
-        <translation>Пожалуйста подождите, настройка может занять до 5 минут</translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ui" line="550"/>
-        <location filename="../ui/mainwindow.ui" line="880"/>
-        <source>Setup your server to use VPN</source>
-        <translation>Настроить ваш сервер для VPN</translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ui" line="622"/>
-        <source>root</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ui" line="649"/>
-        <location filename="../ui/mainwindow.cpp" line="1483"/>
-        <source>Connect using SSH key</source>
-        <translation>Использовать SSH ключ</translation>
-    </message>
-    <message>
-        <source>Select VPN protocols to install</source>
-        <translation type="vanished">Выберите VPN протоколы для установки</translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ui" line="2116"/>
-        <source>OpenVPN and ShadowSocks
- with masking using Cloak plugin</source>
-        <translation>OpenVPN и ShadowSocks
- с маскировкой плагином Cloak</translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ui" line="2170"/>
-        <source>Port (TCP)</source>
-        <translation>Порт (TCP)</translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ui" line="2189"/>
-        <source>443</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ui" line="2208"/>
-        <location filename="../ui/mainwindow.ui" line="7231"/>
-        <source>Fake Web Site</source>
-        <translation>Сайт маскировки</translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ui" line="2227"/>
-        <location filename="../ui/mainwindow.ui" line="7187"/>
-        <source>mail.ru</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ui" line="2276"/>
-        <source>ShadowSocks</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ui" line="2326"/>
-        <source>Port(TCP)</source>
-        <translation>Порт (TCP)</translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ui" line="2345"/>
-        <source>6789</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ui" line="2364"/>
-        <source>Encryption</source>
-        <translation>Шифрование</translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ui" line="2384"/>
-        <source>chacha20-ietf-poly1305</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ui" line="2389"/>
-        <source>xchacha20-ietf-poly1305</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ui" line="2394"/>
-        <location filename="../ui/mainwindow.ui" line="6931"/>
-        <location filename="../ui/mainwindow.ui" line="7250"/>
-        <source>aes-256-gcm</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ui" line="2399"/>
-        <location filename="../ui/mainwindow.ui" line="7255"/>
-        <source>aes-192-gcm</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ui" line="2404"/>
-        <location filename="../ui/mainwindow.ui" line="6936"/>
-        <location filename="../ui/mainwindow.ui" line="7260"/>
-        <source>aes-128-gcm</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ui" line="2460"/>
-        <source>OpenVPN</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ui" line="2510"/>
-        <location filename="../ui/mainwindow.ui" line="6687"/>
-        <location filename="../ui/mainwindow.ui" line="6909"/>
-        <location filename="../ui/mainwindow.ui" line="7140"/>
-        <source>Port</source>
-        <translation>Порт</translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ui" line="2545"/>
-        <source>Protocol</source>
-        <translation>Протокол</translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ui" line="3655"/>
-        <source>DNS settings</source>
-        <translation>Настройки DNS</translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ui" line="6578"/>
-        <source>UDP</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ui" line="6565"/>
-        <source>TCP</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ui" line="1723"/>
-        <source>AmneziaVPN will install OpenVPN protocol with public/private key pairs generated on server and client sides. You can also configure connection on your mobile device by copying exported &quot;.ovpn&quot; file to your device and setting up official OpenVPN client. We recommend do not use messengers for sending connection profile - it contains VPN private keys.</source>
-        <translation>AmneziaVPN установит протокол OpenVPN и сгенерирует публичные/приваные пары ключей для серверной и клиентской стороны. Вы сможете так же настроить подключение для вашего мобильного устройства, экспортировав конфиг &quot;.ovpn&quot; на устройство и установив официальный клиент OpenVPN. Мы рекоммендуем не передавать конфиг через мессенджеры - он содержит приватный ключ для VPN.</translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ui" line="1864"/>
-        <location filename="../ui/mainwindow.ui" line="1887"/>
-        <location filename="../ui/mainwindow.ui" line="2641"/>
-        <location filename="../ui/mainwindow.ui" line="5406"/>
-        <location filename="../ui/mainwindow.ui" line="6750"/>
-        <location filename="../ui/mainwindow.ui" line="7034"/>
-        <location filename="../ui/mainwindow.ui" line="7344"/>
-        <source>Configuring...</source>
-        <translation>Настройка...</translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ui" line="2675"/>
-        <source>Setup server</source>
-        <translation>Установить сервер</translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ui" line="2769"/>
-        <location filename="../ui/mainwindow.ui" line="2798"/>
-        <source>0 Mbps</source>
-        <translation>0 Мбит/сек</translation>
-    </message>
-    <message>
-        <source>Add site</source>
-        <translation type="vanished">Добавить сайт</translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ui" line="2920"/>
-        <source>Connected</source>
-        <translation>Подключено</translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ui" line="2963"/>
-        <source>How to use VPN</source>
-        <translation>Как использовать VPN</translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ui" line="3051"/>
-        <source>For all connections</source>
-        <translation>Для всех соединений</translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ui" line="3032"/>
-        <source>For selected sites</source>
-        <translation>Для выбранных сайтов</translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ui" line="2979"/>
-        <source>Error text</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ui" line="3131"/>
-        <source>List of the most popular prohibited sites</source>
-        <translation>Список самых популярных запрещенных сайтов</translation>
-    </message>
-    <message>
-        <source>For example, rutor.org or 17.21.111.8</source>
-        <translation type="vanished">Например, rutor.org или 17.21.111.8</translation>
-    </message>
-    <message>
-        <source>Anyone who logs in with this code will have the same rights to use the VPN as you. To create a new code, change your login and / or password for connection in your server settings.</source>
-        <translation type="vanished">Тот, кто зайдёт с этим кодом, будет иметь те же права на использование VPN, что и вы. Чтобы создать новый код смените логин и/или пароль для подлючения в настройках вашего сервера.</translation>
-    </message>
-    <message>
-        <source>These sites will open via VPN</source>
-        <translation type="vanished">These sites will open via VPN</translation>
-    </message>
-    <message>
-        <source>Delete selected item</source>
-        <translation type="vanished">Удалить выбранный элемент</translation>
-    </message>
-    <message>
-        <source>Hostname or IP address</source>
-        <translation type="vanished">Имя хоста или IP адрес</translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ui" line="3237"/>
-        <source>+</source>
-        <translation>+</translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ui" line="4414"/>
-        <source>Server settings</source>
-        <translation>Настройки сервера</translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ui" line="3514"/>
-        <source>Share connection</source>
-        <translation>Поделиться подключением</translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ui" line="496"/>
-        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Lato&apos;; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <location filename="../ui/pages_logic/AdvancedServerSettingsLogic.cpp" line="11"/>
+        <location filename="../ui/pages_logic/AdvancedServerSettingsLogic.cpp" line="62"/>
+        <source>Clear server from Amnezia software</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/mainwindow.ui" line="857"/>
-        <source>Configure VPN protocols manually</source>
-        <translation>Выбрать протоколы</translation>
+        <location filename="../ui/pages_logic/AdvancedServerSettingsLogic.cpp" line="35"/>
+        <source>Service: </source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/mainwindow.ui" line="920"/>
-        <source>Run Setup Wizard</source>
-        <translation>Мастер настройки</translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ui" line="936"/>
-        <source>If you want easily configure your server just run Wizard</source>
-        <translation>Для облегченной настройки сервера запустите мастер настройки</translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ui" line="958"/>
-        <source>Press configure manually to choose VPN protocols you want to install</source>
-        <translation>Выбрать протоколы для установки самостоятельно</translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ui" line="989"/>
-        <location filename="../ui/mainwindow.ui" line="1204"/>
-        <location filename="../ui/mainwindow.ui" line="1504"/>
-        <location filename="../ui/mainwindow.ui" line="1535"/>
-        <location filename="../ui/mainwindow.ui" line="1690"/>
-        <source>Setup Wizard</source>
-        <translation>Мастер настройки</translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ui" line="1049"/>
-        <source>High censorship level</source>
-        <translation>Высокий уровень цензуры</translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ui" line="1062"/>
-        <source>Medium censorship level</source>
-        <translation>Средний уровень цензуры</translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ui" line="1078"/>
-        <source>Low censorship level</source>
-        <translation>Низкий уровень цензуры</translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ui" line="1091"/>
-        <source>I&apos;m living in country with high censorship level. Many of foreign web sites and VPNs blocked by my government. I want to setup reliable VPN, which is invisible for government.</source>
-        <translation>Я живу в стране с высоким уровнем цензуры. Многие зарубежные сайты и VPN сервисы заблокированы. Я хочу установить надёжный VPN, невидимый для надзорных органов.</translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ui" line="1113"/>
-        <source>I&apos;m living in country with medium censorship level. Some web sites blocked by my government, but VPNs are not blocked at all. I want to setup flexible solution.</source>
-        <translation>Я живу в стране со средним уровнем цензуры. Некоторые зарубежные сайты заблокированы, но VPN сервисы в целом работают. Я хочу установить гибкое решение.</translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ui" line="1135"/>
-        <source>I just want to improve my privacy in internet. </source>
-        <translation>Я просто хочу повысить уровень моей приватности в интернете.</translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ui" line="1178"/>
-        <location filename="../ui/mainwindow.ui" line="1303"/>
-        <location filename="../ui/mainwindow.ui" line="1632"/>
-        <source>Next</source>
-        <translation>Далее</translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ui" line="1237"/>
-        <source>AmneziaVPN will install VPN protocol which is not visible for your internet provider and government firewall. Your VPN connection will be detected by your provider as regular web traffic to particular web site.
-
-You SHOULD set this web site address to some foreign web site which is not blocked by your internet provider. Other words you need to type below some foreign web site address which is accessible without VPN.
-
-Please note, this protocol still does not support export connection profile to mobile devices. Keep for updates.</source>
-        <translation>AmneziaVPN установит VPN протокол невидимый для вашего провайдера и гос. фаервола. Ваше VPN соединение будет определяться как обычные запросы к определнному web сайту.
-Вы ДОЛЖНЫ установить адрес этого сайта таким, который не заблокирован вашим провайдером, и находится за границей. Другими словами, вы должны ввести адрес какого-либо зарубежного сайта, который доступен и без VPN.
-
-Заметьте, этот протокол пока не имеет функции экспорта настроек подключения для мобильных устаройств. Следите за обновлениями.</translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ui" line="1263"/>
-        <source>OpenVPN over Cloak (VPN obfuscation) profile will be installed</source>
-        <translation>Будет установлен профиль OpenVPN over Cloak (VPN маскировка)</translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ui" line="1326"/>
-        <source>Type web site address for mask</source>
-        <translation>Адрес сайта для маскировки</translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ui" line="1388"/>
-        <source>Optional.
-
-We recommend to enable VPN mode &quot;For selected sites&quot; and add blocked sites you need to visit manually. If you will choose this option, you will need add every blocked site you want to visit to the access list. You may switch between modes later.
-
-Please note, you should add addresses to the list after VPN connection established. You may add any domain, URL or IP address, it will be resolved to IP address.</source>
-        <translation>Опционально.
-
-Мы рекомендуем включить режим VPN &quot;Для выбранных сайтов&quot; и добавить вручную заблокированные сайты, которые вы хотите посещать. Если вы выберите эту опцию, вы должны будете добавить каждый заблокированный сайт, который вы хотите посетить в список. Позже вы сможете переключаться между режимами работы VPN.
-
-Мы рекомендуем добавлять сайты в список только после того, как соединение VPN будет подключено. Вы сможете добавить любые домены, URL или IP адреса.</translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ui" line="1435"/>
-        <location filename="../ui/mainwindow.ui" line="1785"/>
-        <source>Start configuring</source>
-        <translation>Начать настройку</translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ui" line="1448"/>
-        <source>Turn on mode &quot;VPN for selected sites&quot;</source>
-        <translation>Включить режим
-&quot;VPN для выбранных сайтов&quot;</translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ui" line="1568"/>
-        <source>AmneziaVPN will install VPN protocol which is difficult to detect by your internet provider and government firewall (but possible). In most cases, this is the most suitable protocol. This protocol is faster compared to the VPN protocols with &quot;web traffic masking&quot;.
-
-This protocol support export connection profile to mobile devices using QR code (you should launch 3rd party opensource VPN client - ShadowSocks VPN).</source>
-        <translation>AmneziaVPN установит VPN протокол, который трудно детектировать интернет провайдерам (но возможно). В большинстве случаев, это наиболее подходящий выбор. Этот протокол быстрее, по сравнению с VPN протоколами с полной маскировкой трафика.
-
-Этот протокол поддерживает экспорт профиля подключения с помощью QR кода для настройки на мобильных устройствах (вам нужно будет установить сторонний клиент VPN - ShadowSocks VPN).</translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ui" line="1592"/>
-        <source>OpenVPN over ShadowSocks profile will be installed</source>
-        <translation>Будет установлен профиль
-OpenVPN over ShadowSocks</translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ui" line="1745"/>
-        <source>OpenVPN profile will be installed</source>
-        <translation>Будет установлен профиль OpenVPN</translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ui" line="1906"/>
-        <source>Please wait.</source>
-        <translation>Пожалуйста, ждите.</translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ui" line="1958"/>
-        <source>Select VPN protocols</source>
-        <translation>Выберите протоколы</translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ui" line="2565"/>
-        <source>udp</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ui" line="2570"/>
-        <source>tcp</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ui" line="2846"/>
-        <source>+ Add site</source>
-        <translation>+ Добавить сайт</translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ui" line="3162"/>
-        <source>These sites will be opened using VPN</source>
-        <translation>Эти сайты будут открываться через VPN</translation>
-    </message>
-    <message>
-        <source>For example, yousite.com or 17.21.111.8</source>
-        <translation type="vanished">Например, yousite.com или 17.21.111.8</translation>
-    </message>
-    <message>
-        <source>Web site or hostname or IP address</source>
-        <translation type="vanished">Web-сайт, имя хоста или IP-адрес</translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ui" line="3470"/>
-        <location filename="../ui/mainwindow.ui" line="3678"/>
-        <source>Reinstall server, clear server</source>
-        <translation>Переустановить сервер, очистить сервер</translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ui" line="3476"/>
-        <source>Server management</source>
-        <translation>Управление сервером</translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ui" line="3568"/>
-        <location filename="../ui/mainwindow.cpp" line="972"/>
-        <source>Exit</source>
-        <translation>Выход из приложения</translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ui" line="3600"/>
-        <source>Auto start, Auto connect</source>
-        <translation>Авто-запуск, авто-соединение</translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ui" line="3607"/>
-        <source>App settings</source>
-        <translation>Настройки приложения</translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ui" line="3662"/>
-        <source>Network settings</source>
-        <translation>Настройки сети</translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ui" line="3684"/>
-        <source>Servers</source>
-        <translation>Список серверов</translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ui" line="3732"/>
-        <source>Add or import new server</source>
-        <translation>Добавить или импортировать новый сервер</translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ui" line="3739"/>
-        <source>Add server</source>
-        <translation>Добавить сервер</translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ui" line="3870"/>
-        <source>Servers list</source>
-        <translation>Список серверов</translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ui" line="3962"/>
-        <source>Auto start</source>
-        <translation>Авто старт</translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ui" line="3984"/>
-        <source>Application Settings</source>
-        <translation>Настройки приложения</translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ui" line="4000"/>
-        <source>Auto connect</source>
-        <translation>Авто соединение</translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ui" line="4035"/>
-        <source>Check for updates</source>
-        <translation>Проверить обновления</translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ui" line="4061"/>
-        <source>Start minimized</source>
-        <translation>Запускать свёрнутым</translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ui" line="4096"/>
-        <source>Open logs folder</source>
-        <translation>Открыть папки с логами</translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ui" line="4184"/>
-        <source>DNS Servers</source>
-        <translation>DNS сервера</translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ui" line="4222"/>
-        <location filename="../ui/mainwindow.ui" line="4254"/>
-        <source>Reset to default value</source>
-        <translation>Сбросить по умолчанию</translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ui" line="4283"/>
-        <source>Primary DNS server</source>
-        <translation>Первичный DSN сервер</translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ui" line="4302"/>
-        <source>Secondary DNS server</source>
-        <translation>Вторичный DNS сервер</translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ui" line="4360"/>
-        <location filename="../ui/mainwindow.cpp" line="1533"/>
-        <source>Clear client cached profile</source>
-        <translation>Удалить закешировнный профиль</translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ui" line="4470"/>
-        <location filename="../ui/mainwindow.cpp" line="846"/>
-        <source>Clear server from Amnezia software</source>
-        <translation>Очистить сервер от Amnezia</translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ui" line="4504"/>
-        <source>Forget this server</source>
-        <translation>Забыть этот сервер</translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ui" line="4525"/>
-        <source>root@yourserver.org</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ui" line="4591"/>
-        <source>VPN protocols</source>
-        <translation>VPN протоколы</translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ui" line="4612"/>
-        <source>VPN Protocol: </source>
-        <translation>VPN протокол:</translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ui" line="4763"/>
-        <source>Protocols</source>
-        <translation>Протоколы</translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ui" line="4873"/>
-        <source>Cloak container</source>
-        <translation>Cloak контейнер</translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ui" line="5002"/>
-        <location filename="../ui/mainwindow.ui" line="5174"/>
-        <location filename="../ui/mainwindow.ui" line="5339"/>
-        <source>OpenVPN settings</source>
-        <translation>Настройки OpenVPN</translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ui" line="5012"/>
-        <location filename="../ui/mainwindow.ui" line="5184"/>
-        <source>ShadowSocks settings</source>
-        <translation>Настройки ShadowSocks</translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ui" line="5022"/>
-        <source>Cloak settings</source>
-        <translation>Настройки Cloak</translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ui" line="5049"/>
-        <source>ShadowSocks container</source>
-        <translation>ShadowSocks контейнер</translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ui" line="5214"/>
-        <source>OpenVPN container</source>
-        <translation>OpenVPN контейнер</translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ui" line="5560"/>
-        <source>  Full access</source>
-        <translation>  Полный доступ</translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ui" line="5600"/>
-        <location filename="../ui/mainwindow.ui" line="5725"/>
-        <location filename="../ui/mainwindow.ui" line="5921"/>
-        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Consolas&apos;; font-size:20px; font-weight:600; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:20pt;&quot;&gt;vpn:\\xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ui" line="5627"/>
-        <source>Anyone who logs in with this code will have the same permissions to use VPN and your server as you. 
-This code includes your server credentials!
-Provide this code only to TRUSTED users.</source>
-        <translation>Любой, кто получит этот код, получит полный доступ к серверу и использованию VPN. Этот код содержит пароль от сервера.
-Предоставляйте этот код только доверенным пользователям.</translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ui" line="5685"/>
-        <location filename="../ui/mainwindow.cpp" line="2083"/>
-        <location filename="../ui/mainwindow.cpp" line="2107"/>
-        <location filename="../ui/mainwindow.cpp" line="2147"/>
-        <source>  Share for Amnezia client</source>
-        <translation>  Расшарить для Amnezia</translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ui" line="5752"/>
-        <source>Anyone who logs in with this code will be able to connect to this VPN server. 
-This code does not include server credentials.</source>
-        <translation>Любой, кто получит этот код, получит возможность подключаться к этому VPN серверу
-Этот код не содержи пароль от сервера.</translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ui" line="5831"/>
-        <location filename="../ui/mainwindow.ui" line="6033"/>
-        <location filename="../ui/mainwindow.cpp" line="1653"/>
-        <location filename="../ui/mainwindow.cpp" line="1674"/>
-        <source>Generate config</source>
-        <translation>Сгенерировать конфиг</translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ui" line="5881"/>
-        <location filename="../ui/mainwindow.cpp" line="2084"/>
-        <source>  Share for OpenVPN client</source>
-        <translation>  Расшарить для OpenVPN</translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ui" line="5867"/>
-        <location filename="../ui/mainwindow.ui" line="5997"/>
-        <source>Save file</source>
-        <translation>Сохранить файл</translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ui" line="14"/>
-        <source>AmneziaVPN</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ui" line="3013"/>
-        <source>Except selected sites</source>
-        <translation>Кроме выбранных сайтов</translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ui" line="3207"/>
-        <source>yousite.com or IP address</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ui" line="3262"/>
-        <source>Web site/Hostname/IP address/Subnet</source>
-        <translation>Web сайт/хост/IP адрес/подсеть</translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ui" line="3352"/>
-        <source>Delete selected</source>
-        <translation>Удалить выбранные</translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ui" line="4048"/>
-        <source>Software version: X.X.X (01.06.2021)</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ui" line="4652"/>
-        <source>Share Server (FULL ACCESS)</source>
-        <translation>Расшарить сервер (FULL ACCESS)</translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ui" line="6050"/>
-        <location filename="../ui/mainwindow.cpp" line="2108"/>
-        <source>  Share for ShadowSocks client</source>
-        <translation>  Расшарить для ShadowSocks</translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ui" line="6075"/>
-        <location filename="../ui/mainwindow.ui" line="6114"/>
-        <source>Server:</source>
-        <translation>Сервер:</translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ui" line="6088"/>
-        <location filename="../ui/mainwindow.ui" line="6130"/>
-        <source>Encryption:</source>
-        <translation>Шифрование:</translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ui" line="6101"/>
-        <location filename="../ui/mainwindow.ui" line="6146"/>
-        <source>Port:</source>
-        <translation>Порт:</translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ui" line="6162"/>
-        <source>Password:</source>
-        <translation>Пароль:</translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ui" line="6178"/>
-        <source>Connection string</source>
-        <translation>Строка подключения</translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ui" line="6271"/>
-        <source>  Share for Cloak client</source>
-        <translation>  Расшарить для Cloak</translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ui" line="6337"/>
-        <source>OpenVPN Settings</source>
-        <translation>Настройки OpenVPN</translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ui" line="6359"/>
-        <source>Hash</source>
-        <translation>Хеш</translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ui" line="6378"/>
-        <location filename="../ui/mainwindow.ui" line="6953"/>
-        <location filename="../ui/mainwindow.ui" line="7203"/>
-        <source>Cipher</source>
-        <translation>Шифр</translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ui" line="6397"/>
-        <source>Network protocol</source>
-        <translation>Сетевой протокол</translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ui" line="6430"/>
-        <source>AES-256-GCM</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ui" line="6435"/>
-        <source>AES-192-GCM</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ui" line="6440"/>
-        <source>AES-128-GCM</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ui" line="6445"/>
-        <source>AES-256-CBC</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ui" line="6450"/>
-        <source>AES-192-CBC</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ui" line="6455"/>
-        <source>AES-128-CBC</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ui" line="6460"/>
-        <source>ChaCha20-Poly1305</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ui" line="6465"/>
-        <source>ARIA-256-CBC</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ui" line="6470"/>
-        <source>CAMELLIA-256-CBC</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ui" line="6475"/>
-        <source>none</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ui" line="6492"/>
-        <source>VPN Addresses Subnet</source>
-        <translation>Подсеть для VPN</translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ui" line="6529"/>
-        <location filename="../ui/mainwindow.ui" line="6990"/>
-        <location filename="../ui/mainwindow.ui" line="7300"/>
-        <source>Save and restart VPN</source>
-        <translation>Сохранить и перезапустить VPN</translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ui" line="6608"/>
-        <source>Auto-negotiate encryption</source>
-        <translation>Авто-согласование шифрования</translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ui" line="6625"/>
-        <source>SHA512</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ui" line="6630"/>
-        <source>SHA384</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ui" line="6635"/>
-        <source>SHA256</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ui" line="6640"/>
-        <source>SHA3-512</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ui" line="6645"/>
-        <source>SHA3-384</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ui" line="6650"/>
-        <source>SHA3-256</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ui" line="6655"/>
-        <source>whirlpool</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ui" line="6660"/>
-        <source>BLAKE2b512</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ui" line="6665"/>
-        <source>BLAKE2s256</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ui" line="6670"/>
-        <source>SHA1</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ui" line="6703"/>
-        <source>Block DNS requests outside of VPN</source>
-        <translation>Блокировать запросы DNS мимо VPN</translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ui" line="6785"/>
-        <source>Enable TLS auth</source>
-        <translation>Включить TLS auth</translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ui" line="6887"/>
-        <source>ShadowSocks Settings</source>
-        <translation>Настройки ShadowSocks</translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ui" line="6926"/>
-        <location filename="../ui/mainwindow.ui" line="7245"/>
-        <source>chacha20-poly1305</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ui" line="7165"/>
-        <source>Cloak Settings</source>
-        <translation>Настройки Cloak</translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ui" line="7265"/>
-        <source>plain</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.ui" line="5671"/>
-        <location filename="../ui/mainwindow.ui" line="5795"/>
-        <location filename="../ui/mainwindow.ui" line="5961"/>
-        <location filename="../ui/mainwindow.ui" line="6214"/>
-        <location filename="../ui/mainwindow.cpp" line="1557"/>
-        <location filename="../ui/mainwindow.cpp" line="1568"/>
-        <location filename="../ui/mainwindow.cpp" line="1588"/>
-        <location filename="../ui/mainwindow.cpp" line="1597"/>
-        <source>Copy</source>
-        <translation>Копировать</translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.cpp" line="346"/>
-        <source>Cannot open logs folder!</source>
-        <translation>Невозможно открыть папку с логами!</translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.cpp" line="438"/>
-        <location filename="../ui/mainwindow.cpp" line="447"/>
-        <source>Please fill in all fields</source>
-        <translation>Пожалуйста, заполните все поля</translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.cpp" line="467"/>
-        <source>It&apos;s public key. Private key required</source>
-        <translation>Это публичный ключ. Требуется приватный</translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.cpp" line="709"/>
-        <source>of</source>
-        <translation>из</translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.cpp" line="721"/>
-        <location filename="../ui/mainwindow.cpp" line="783"/>
-        <location filename="../ui/mainwindow.cpp" line="832"/>
-        <source>Error occurred while configuring server.</source>
-        <translation>Ошибка во время настройки сервера</translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.cpp" line="751"/>
-        <source>Amnezia server installed</source>
-        <translation>Amnezia сервер установлен</translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.cpp" line="814"/>
-        <source>Operation finished</source>
-        <translation>Операция завершена</translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.cpp" line="822"/>
+        <location filename="../ui/pages_logic/AdvancedServerSettingsLogic.cpp" line="41"/>
         <source>Uninstalling Amnezia software...</source>
-        <translation>Удаление Amnezia...</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/mainwindow.cpp" line="834"/>
+        <location filename="../ui/pages_logic/AdvancedServerSettingsLogic.cpp" line="50"/>
+        <source>Error occurred while cleaning the server.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/pages_logic/AdvancedServerSettingsLogic.cpp" line="51"/>
+        <location filename="../ui/pages_logic/AdvancedServerSettingsLogic.cpp" line="75"/>
+        <source>Error message: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/pages_logic/AdvancedServerSettingsLogic.cpp" line="52"/>
+        <location filename="../ui/pages_logic/AdvancedServerSettingsLogic.cpp" line="76"/>
         <source>See logs for details.</source>
-        <translation>Смотрите логи для подробных деталей</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/mainwindow.cpp" line="839"/>
+        <location filename="../ui/pages_logic/AdvancedServerSettingsLogic.cpp" line="55"/>
         <source>Amnezia server successfully uninstalled</source>
-        <translation>Amnezia сервер удален</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/mainwindow.cpp" line="955"/>
-        <source>Show</source>
-        <translation>Показать окно</translation>
+        <location filename="../ui/pages_logic/AdvancedServerSettingsLogic.cpp" line="74"/>
+        <source>Error occurred while scanning the server.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/mainwindow.cpp" line="961"/>
-        <location filename="../ui/mainwindow.cpp" line="1796"/>
-        <source>Disconnect</source>
-        <translation>Отключиться</translation>
+        <location filename="../ui/pages_logic/AdvancedServerSettingsLogic.cpp" line="80"/>
+        <source>All containers installed on the server are added to the GUI</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/mainwindow.cpp" line="965"/>
-        <source>Visit Website</source>
-        <translation>Посетить сайт</translation>
+        <location filename="../ui/pages_logic/AdvancedServerSettingsLogic.cpp" line="82"/>
+        <source>No installed containers found on the server</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>AppSettingsLogic</name>
+    <message>
+        <location filename="../ui/pages_logic/AppSettingsLogic.cpp" line="34"/>
+        <source>Software version</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/mainwindow.cpp" line="969"/>
-        <source>Quit</source>
-        <translation>Выход</translation>
+        <location filename="../ui/pages_logic/AppSettingsLogic.cpp" line="70"/>
+        <source>Save log</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/mainwindow.cpp" line="972"/>
-        <source>Do you really want to quit?</source>
-        <translation>Вы действительно хотите выйти?</translation>
+        <location filename="../ui/pages_logic/AppSettingsLogic.cpp" line="86"/>
+        <source>Open backup</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/mainwindow.cpp" line="1163"/>
-        <source>Import IP addresses</source>
-        <translation>Импортовать IP адреса</translation>
+        <location filename="../ui/pages_logic/AppSettingsLogic.cpp" line="100"/>
+        <source>Can&apos;t import config, file is corrupted.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ClientInfoLogic</name>
+    <message>
+        <location filename="../ui/pages_logic/ClientInfoLogic.cpp" line="41"/>
+        <source>Service: </source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ClientManagementLogic</name>
+    <message>
+        <location filename="../ui/pages_logic/ClientManagementLogic.cpp" line="25"/>
+        <source>Service: </source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/mainwindow.cpp" line="1472"/>
-        <source>Import connection</source>
-        <translation>Импортировать соединение</translation>
+        <location filename="../ui/pages_logic/ClientManagementLogic.cpp" line="38"/>
+        <source>An error occurred while getting the list of clients.</source>
+        <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>ConnectionController</name>
     <message>
-        <location filename="../ui/mainwindow.cpp" line="1482"/>
-        <source>Private key</source>
-        <translation>Приватный ключ</translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.cpp" line="1483"/>
-        <source>Connect using SSH password</source>
-        <translation>Соединиться с паролем SSH</translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.cpp" line="1525"/>
-        <source>Cache cleared</source>
-        <translation>Кеш очищен</translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.cpp" line="1554"/>
-        <location filename="../ui/mainwindow.cpp" line="1565"/>
-        <location filename="../ui/mainwindow.cpp" line="1585"/>
-        <location filename="../ui/mainwindow.cpp" line="1594"/>
-        <source>Copied</source>
-        <translation>Скопировано</translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.cpp" line="1575"/>
-        <source>Save AmneziaVPN config</source>
-        <translation>Сохранить конфиг AmneziaVPN</translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.cpp" line="1613"/>
-        <location filename="../ui/mainwindow.cpp" line="1660"/>
-        <source>Generating...</source>
-        <translation>Генерация...</translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.cpp" line="1648"/>
-        <source>Error while generating connection profile</source>
-        <translation>Ошибка во время генерации профиля</translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.cpp" line="1678"/>
-        <source>Save OpenVPN config</source>
-        <translation>Сохранить OpenVPN конфиг</translation>
-    </message>
-    <message>
-        <location filename="../ui/mainwindow.cpp" line="1750"/>
+        <location filename="../ui/controllers/connectionController.cpp" line="32"/>
         <source>VPN Protocols is not installed.
  Please install VPN container at first</source>
-        <translation>VPN протоколы ещё не установлены. Установите VPN контейнеры</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/mainwindow.cpp" line="1756"/>
-        <source>VPN Protocol not chosen</source>
-        <translation>VPN протокол не выбран</translation>
+        <location filename="../ui/controllers/connectionController.cpp" line="53"/>
+        <source>Connection...</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/mainwindow.cpp" line="1902"/>
-        <source>Software version</source>
-        <translation>Версия программы</translation>
+        <location filename="../ui/controllers/connectionController.cpp" line="58"/>
+        <source>Disconnect</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/mainwindow.cpp" line="1932"/>
-        <source>Protocol: </source>
-        <translation>Протокол:</translation>
+        <location filename="../ui/controllers/connectionController.cpp" line="67"/>
+        <source>Reconnection...</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/mainwindow.cpp" line="2086"/>
-        <source>Press Generate config</source>
-        <translation>Нажмите Сгенерировать конфиг</translation>
+        <location filename="../ui/controllers/connectionController.cpp" line="72"/>
+        <location filename="../ui/controllers/connectionController.cpp" line="86"/>
+        <location filename="../ui/controllers/connectionController.cpp" line="92"/>
+        <location filename="../ui/controllers/connectionController.h" line="49"/>
+        <source>Connect</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/mainwindow.cpp" line="2152"/>
-        <source>  Share server full access</source>
-        <translation> Расшарить полный доступ</translation>
+        <location filename="../ui/controllers/connectionController.cpp" line="77"/>
+        <source>Disconnection...</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ContextMenu</name>
+    <message>
+        <location filename="../ui/qml/Controls/ContextMenu.qml" line="9"/>
+        <source>C&amp;ut</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Controls/ContextMenu.qml" line="15"/>
+        <source>&amp;Copy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Controls/ContextMenu.qml" line="21"/>
+        <source>&amp;Paste</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Controls/ContextMenu.qml" line="28"/>
+        <source>&amp;SelectAll</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ExportController</name>
+    <message>
+        <location filename="../ui/controllers/exportController.cpp" line="107"/>
+        <source>Save AmneziaVPN config</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>NotificationHandler</name>
+    <message>
+        <location filename="../ui/notificationhandler.cpp" line="68"/>
+        <location filename="../ui/notificationhandler.cpp" line="75"/>
+        <source>AmneziaVPN</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/notificationhandler.cpp" line="69"/>
+        <source>VPN Connected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/notificationhandler.cpp" line="76"/>
+        <source>VPN Disconnected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/notificationhandler.cpp" line="95"/>
+        <source>AmneziaVPN notification</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/notificationhandler.cpp" line="96"/>
+        <source>Unsecured network detected: </source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OpenVpnSettings</name>
+    <message>
+        <location filename="../ui/qml/Components/Protocols/OpenVpnSettings.qml" line="33"/>
+        <source>VPN Addresses Subnet</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Components/Protocols/OpenVpnSettings.qml" line="39"/>
+        <source>Network protocol</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Components/Protocols/OpenVpnSettings.qml" line="49"/>
+        <source>Port</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Components/Protocols/OpenVpnSettings.qml" line="54"/>
+        <source>Auto-negotiate encryption</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Components/Protocols/OpenVpnSettings.qml" line="62"/>
+        <location filename="../ui/qml/Components/Protocols/OpenVpnSettings.qml" line="63"/>
+        <source>Hash</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Components/Protocols/OpenVpnSettings.qml" line="69"/>
+        <source>SHA512</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Components/Protocols/OpenVpnSettings.qml" line="70"/>
+        <source>SHA384</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Components/Protocols/OpenVpnSettings.qml" line="71"/>
+        <source>SHA256</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Components/Protocols/OpenVpnSettings.qml" line="72"/>
+        <source>SHA3-512</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Components/Protocols/OpenVpnSettings.qml" line="73"/>
+        <source>SHA3-384</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Components/Protocols/OpenVpnSettings.qml" line="74"/>
+        <source>SHA3-256</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Components/Protocols/OpenVpnSettings.qml" line="75"/>
+        <source>whirlpool</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Components/Protocols/OpenVpnSettings.qml" line="76"/>
+        <source>BLAKE2b512</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Components/Protocols/OpenVpnSettings.qml" line="77"/>
+        <source>BLAKE2s256</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Components/Protocols/OpenVpnSettings.qml" line="78"/>
+        <source>SHA1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Components/Protocols/OpenVpnSettings.qml" line="98"/>
+        <location filename="../ui/qml/Components/Protocols/OpenVpnSettings.qml" line="99"/>
+        <source>Cipher</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Components/Protocols/OpenVpnSettings.qml" line="105"/>
+        <source>AES-256-GCM</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Components/Protocols/OpenVpnSettings.qml" line="106"/>
+        <source>AES-192-GCM</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Components/Protocols/OpenVpnSettings.qml" line="107"/>
+        <source>AES-128-GCM</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Components/Protocols/OpenVpnSettings.qml" line="108"/>
+        <source>AES-256-CBC</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Components/Protocols/OpenVpnSettings.qml" line="109"/>
+        <source>AES-192-CBC</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Components/Protocols/OpenVpnSettings.qml" line="110"/>
+        <source>AES-128-CBC</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Components/Protocols/OpenVpnSettings.qml" line="111"/>
+        <source>ChaCha20-Poly1305</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Components/Protocols/OpenVpnSettings.qml" line="112"/>
+        <source>ARIA-256-CBC</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Components/Protocols/OpenVpnSettings.qml" line="113"/>
+        <source>CAMELLIA-256-CBC</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Components/Protocols/OpenVpnSettings.qml" line="114"/>
+        <source>none</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Components/Protocols/OpenVpnSettings.qml" line="132"/>
+        <source>TLS auth</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Components/Protocols/OpenVpnSettings.qml" line="138"/>
+        <source>Block DNS requests outside of VPN</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Components/Protocols/OpenVpnSettings.qml" line="144"/>
+        <source>Additional configuration commands</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PageAbout</name>
+    <message>
+        <location filename="../ui/qml/Pages/PageAbout.qml" line="19"/>
+        <source>About Amnezia</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages/PageAbout.qml" line="26"/>
+        <source>AmneziaVPN is opensource software, it&apos;s free forever. Our goal is to make the best VPN client in the world.
+&lt;ul&gt;
+&lt;li&gt;Sources on &lt;a href=&quot;https://github.com/amnezia-vpn/desktop-client&quot;&gt;GitHub&lt;/a&gt;&lt;/li&gt;
+&lt;li&gt;&lt;a href=&quot;https://amnezia.org/&quot;&gt;Web Site&lt;/a&gt;&lt;/li&gt;
+&lt;li&gt;&lt;a href=&quot;https://t.me/amnezia_vpn_en&quot;&gt;Telegram group&lt;/a&gt;&lt;/li&gt;
+&lt;li&gt;&lt;a href=&quot;https://signal.group/#CjQKIB2gUf8QH_IXnOJMGQWMDjYz9cNfmRQipGWLFiIgc4MwEhAKBONrSiWHvoUFbbD0xwdh&quot;&gt;Signal group&lt;/a&gt;&lt;/li&gt;
+&lt;/ul&gt;
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages/PageAbout.qml" line="40"/>
+        <source>Support</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages/PageAbout.qml" line="48"/>
+        <source>Have questions? You can get support by:
+&lt;ul&gt;
+&lt;li&gt;&lt;a href=&quot;https://t.me/amnezia_vpn_en&quot;&gt;Telegram group&lt;/a&gt; (preferred way)&lt;/li&gt;
+&lt;li&gt;Create issue on &lt;a href=&quot;https://github.com/amnezia-vpn/desktop-client/issues&quot;&gt;GitHub&lt;/a&gt;&lt;/li&gt;
+&lt;li&gt;Email to: &lt;a href=&quot;support@amnezia.org&quot;&gt;support@amnezia.org&lt;/a&gt;&lt;/li&gt;
+&lt;/ul&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages/PageAbout.qml" line="60"/>
+        <source>Donate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages/PageAbout.qml" line="78"/>
+        <source>Please support Amnezia project by donation, we really need it now more than ever.
+&lt;ul&gt;
+&lt;li&gt;By credit card on &lt;a href=&quot;https://www.patreon.com/amneziavpn&quot;&gt;Patreon&lt;/a&gt; (starting from $1)&lt;/li&gt;
+&lt;li&gt;Send some coins to addresses listed &lt;a href=&quot;https://github.com/amnezia-vpn/desktop-client/blob/master/README.md&quot;&gt;on GitHub page&lt;/a&gt;&lt;/li&gt;
+&lt;/ul&gt;
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PageAdvancedServerSettings</name>
+    <message>
+        <location filename="../ui/qml/Pages/PageAdvancedServerSettings.qml" line="22"/>
+        <source>Advanced server settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages/PageAdvancedServerSettings.qml" line="94"/>
+        <source>Clients Management</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PageAppSetting</name>
+    <message>
+        <location filename="../ui/qml/Pages/PageAppSetting.qml" line="19"/>
+        <source>Application Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages/PageAppSetting.qml" line="38"/>
+        <source>Auto connect</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages/PageAppSetting.qml" line="48"/>
+        <source>Auto start</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages/PageAppSetting.qml" line="58"/>
+        <source>Start minimized</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages/PageAppSetting.qml" line="73"/>
+        <source>Check for updates</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages/PageAppSetting.qml" line="82"/>
+        <source>Keep logs</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages/PageAppSetting.qml" line="91"/>
+        <source>Open logs folder</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages/PageAppSetting.qml" line="100"/>
+        <source>Export logs</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages/PageAppSetting.qml" line="110"/>
+        <source>Clear logs</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages/PageAppSetting.qml" line="111"/>
+        <source>Cleared</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages/PageAppSetting.qml" line="129"/>
+        <source>Backup and restore configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages/PageAppSetting.qml" line="136"/>
+        <source>Backup app config</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages/PageAppSetting.qml" line="145"/>
+        <source>Restore app config</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PageClientInfoOpenVPN</name>
+    <message>
+        <location filename="../ui/qml/Pages/ClientInfo/PageClientInfoOpenVPN.qml" line="20"/>
+        <source>Client Info</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages/ClientInfo/PageClientInfoOpenVPN.qml" line="55"/>
+        <source>Client name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages/ClientInfo/PageClientInfoOpenVPN.qml" line="75"/>
+        <source>Certificate id</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages/ClientInfo/PageClientInfoOpenVPN.qml" line="89"/>
+        <source>Certificate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages/ClientInfo/PageClientInfoOpenVPN.qml" line="107"/>
+        <source>Revoke Certificate</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PageClientInfoWireGuard</name>
+    <message>
+        <location filename="../ui/qml/Pages/ClientInfo/PageClientInfoWireGuard.qml" line="20"/>
+        <source>Client Info</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages/ClientInfo/PageClientInfoWireGuard.qml" line="54"/>
+        <source>Client name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages/ClientInfo/PageClientInfoWireGuard.qml" line="74"/>
+        <source>Public Key</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages/ClientInfo/PageClientInfoWireGuard.qml" line="92"/>
+        <source>Revoke Key</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PageClientManagement</name>
+    <message>
+        <location filename="../ui/qml/Pages/PageClientManagement.qml" line="23"/>
+        <source>Clients Management</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PageDeinstalling</name>
+    <message>
+        <location filename="../ui/qml/Pages2/PageDeinstalling.qml" line="59"/>
+        <source>Removing services from </source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PageGeneralSettings</name>
+    <message>
+        <location filename="../ui/qml/Pages/PageGeneralSettings.qml" line="48"/>
+        <source>App settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages/PageGeneralSettings.qml" line="64"/>
+        <source>Network settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages/PageGeneralSettings.qml" line="80"/>
+        <source>Server Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages/PageGeneralSettings.qml" line="97"/>
+        <source>Share connection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages/PageGeneralSettings.qml" line="115"/>
+        <source>Servers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages/PageGeneralSettings.qml" line="132"/>
+        <source>Add server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages/PageGeneralSettings.qml" line="159"/>
+        <source>Exit</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PageHome</name>
+    <message>
+        <location filename="../ui/qml/Pages2/PageHome.qml" line="167"/>
+        <source>Протокол подключения</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageHome.qml" line="213"/>
+        <source>Servers</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PageNetworkSetting</name>
+    <message>
+        <location filename="../ui/qml/Pages/PageNetworkSetting.qml" line="19"/>
+        <source>DNS Servers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages/PageNetworkSetting.qml" line="37"/>
+        <source>Use AmneziaDNS service (recommended)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages/PageNetworkSetting.qml" line="48"/>
+        <source>Use AmneziaDNS container on your server, when it installed.
+
+Your AmneziaDNS server available only when it installed and VPN connected, it has internal IP address 172.29.172.254
+
+If AmneziaDNS service is not installed on the same server, or this option is unchecked, the following DNS servers will be used:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages/PageNetworkSetting.qml" line="55"/>
+        <source>Primary DNS server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages/PageNetworkSetting.qml" line="72"/>
+        <location filename="../ui/qml/Pages/PageNetworkSetting.qml" line="101"/>
+        <source>Reset to default</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages/PageNetworkSetting.qml" line="84"/>
+        <source>Secondary DNS server</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PageNewServer</name>
+    <message>
+        <location filename="../ui/qml/Pages/PageNewServer.qml" line="17"/>
+        <source>Setup your server to use VPN</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages/PageNewServer.qml" line="23"/>
+        <source>If you want easily configure your server just run Wizard</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages/PageNewServer.qml" line="30"/>
+        <source>Run Setup Wizard</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages/PageNewServer.qml" line="42"/>
+        <source>Press configure manually to choose VPN protocols you want to install</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages/PageNewServer.qml" line="49"/>
+        <source>Configure</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PageNewServerProtocols</name>
+    <message>
+        <location filename="../ui/qml/Pages/PageNewServerProtocols.qml" line="27"/>
+        <source>Select VPN protocols</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages/PageNewServerProtocols.qml" line="37"/>
+        <source>Setup server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages/PageNewServerProtocols.qml" line="54"/>
+        <source>Select protocol container</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages/PageNewServerProtocols.qml" line="134"/>
+        <source>Port</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages/PageNewServerProtocols.qml" line="142"/>
+        <source>Network Protocol</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages/PageNewServerProtocols.qml" line="148"/>
+        <source>udp</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages/PageNewServerProtocols.qml" line="149"/>
+        <source>tcp</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PageProtoCloak</name>
+    <message>
+        <location filename="../ui/qml/Pages/Protocols/PageProtoCloak.qml" line="21"/>
+        <source>Cloak Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages/Protocols/PageProtoCloak.qml" line="40"/>
+        <source>Cipher</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages/Protocols/PageProtoCloak.qml" line="48"/>
+        <source>chacha20-poly1305</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages/Protocols/PageProtoCloak.qml" line="49"/>
+        <source>aes-256-gcm</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages/Protocols/PageProtoCloak.qml" line="50"/>
+        <source>aes-192-gcm</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages/Protocols/PageProtoCloak.qml" line="51"/>
+        <source>aes-128-gcm</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages/Protocols/PageProtoCloak.qml" line="73"/>
+        <source>Fake Web Site</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages/Protocols/PageProtoCloak.qml" line="93"/>
+        <source>Port</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages/Protocols/PageProtoCloak.qml" line="178"/>
+        <source>Save and restart VPN</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages/Protocols/PageProtoCloak.qml" line="187"/>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PageProtoOpenVPN</name>
+    <message>
+        <location filename="../ui/qml/Pages/Protocols/PageProtoOpenVPN.qml" line="21"/>
+        <source>OpenVPN Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages/Protocols/PageProtoOpenVPN.qml" line="43"/>
+        <source>VPN Addresses Subnet</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages/Protocols/PageProtoOpenVPN.qml" line="62"/>
+        <source>Network protocol</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages/Protocols/PageProtoOpenVPN.qml" line="78"/>
+        <source>TCP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages/Protocols/PageProtoOpenVPN.qml" line="90"/>
+        <source>UDP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages/Protocols/PageProtoOpenVPN.qml" line="106"/>
+        <source>Port</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages/Protocols/PageProtoOpenVPN.qml" line="127"/>
+        <source>Auto-negotiate encryption</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages/Protocols/PageProtoOpenVPN.qml" line="141"/>
+        <source>Cipher</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages/Protocols/PageProtoOpenVPN.qml" line="151"/>
+        <source>AES-256-GCM</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages/Protocols/PageProtoOpenVPN.qml" line="152"/>
+        <source>AES-192-GCM</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages/Protocols/PageProtoOpenVPN.qml" line="153"/>
+        <source>AES-128-GCM</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages/Protocols/PageProtoOpenVPN.qml" line="154"/>
+        <source>AES-256-CBC</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages/Protocols/PageProtoOpenVPN.qml" line="155"/>
+        <source>AES-192-CBC</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages/Protocols/PageProtoOpenVPN.qml" line="156"/>
+        <source>AES-128-CBC</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages/Protocols/PageProtoOpenVPN.qml" line="157"/>
+        <source>ChaCha20-Poly1305</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages/Protocols/PageProtoOpenVPN.qml" line="158"/>
+        <source>ARIA-256-CBC</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages/Protocols/PageProtoOpenVPN.qml" line="159"/>
+        <source>CAMELLIA-256-CBC</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages/Protocols/PageProtoOpenVPN.qml" line="160"/>
+        <source>none</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages/Protocols/PageProtoOpenVPN.qml" line="180"/>
+        <source>Hash</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages/Protocols/PageProtoOpenVPN.qml" line="189"/>
+        <source>SHA512</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages/Protocols/PageProtoOpenVPN.qml" line="190"/>
+        <source>SHA384</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages/Protocols/PageProtoOpenVPN.qml" line="191"/>
+        <source>SHA256</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages/Protocols/PageProtoOpenVPN.qml" line="192"/>
+        <source>SHA3-512</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages/Protocols/PageProtoOpenVPN.qml" line="193"/>
+        <source>SHA3-384</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages/Protocols/PageProtoOpenVPN.qml" line="194"/>
+        <source>SHA3-256</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages/Protocols/PageProtoOpenVPN.qml" line="195"/>
+        <source>whirlpool</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages/Protocols/PageProtoOpenVPN.qml" line="196"/>
+        <source>BLAKE2b512</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages/Protocols/PageProtoOpenVPN.qml" line="197"/>
+        <source>BLAKE2s256</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages/Protocols/PageProtoOpenVPN.qml" line="198"/>
+        <source>SHA1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages/Protocols/PageProtoOpenVPN.qml" line="219"/>
+        <source>Enable TLS auth</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages/Protocols/PageProtoOpenVPN.qml" line="232"/>
+        <source>Block DNS requests outside of VPN</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages/Protocols/PageProtoOpenVPN.qml" line="244"/>
+        <source>Additional client config commands →</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages/Protocols/PageProtoOpenVPN.qml" line="295"/>
+        <source>Additional server config commands →</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages/Protocols/PageProtoOpenVPN.qml" line="373"/>
+        <source>Save and restart VPN</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages/Protocols/PageProtoOpenVPN.qml" line="384"/>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PageProtoSftp</name>
+    <message>
+        <location filename="../ui/qml/Pages/Protocols/PageProtoSftp.qml" line="19"/>
+        <source>SFTP settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages/Protocols/PageProtoSftp.qml" line="47"/>
+        <source>Port</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages/Protocols/PageProtoSftp.qml" line="58"/>
+        <source>User Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages/Protocols/PageProtoSftp.qml" line="69"/>
+        <source>Password</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages/Protocols/PageProtoSftp.qml" line="115"/>
+        <source>Restore drive when client starts</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages/Protocols/PageProtoSftp.qml" line="135"/>
+        <source>Mount drive</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PageProtoShadowSocks</name>
+    <message>
+        <location filename="../ui/qml/Pages/Protocols/PageProtoShadowSocks.qml" line="21"/>
+        <source>ShadowSocks Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages/Protocols/PageProtoShadowSocks.qml" line="42"/>
+        <source>Cipher</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages/Protocols/PageProtoShadowSocks.qml" line="51"/>
+        <source>chacha20-ietf-poly1305</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages/Protocols/PageProtoShadowSocks.qml" line="52"/>
+        <source>xchacha20-ietf-poly1305</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages/Protocols/PageProtoShadowSocks.qml" line="53"/>
+        <source>aes-256-gcm</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages/Protocols/PageProtoShadowSocks.qml" line="54"/>
+        <source>aes-192-gcm</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages/Protocols/PageProtoShadowSocks.qml" line="55"/>
+        <source>aes-128-gcm</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages/Protocols/PageProtoShadowSocks.qml" line="74"/>
+        <source>Port</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages/Protocols/PageProtoShadowSocks.qml" line="159"/>
+        <source>Save and restart VPN</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages/Protocols/PageProtoShadowSocks.qml" line="168"/>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PageProtoTorWebSite</name>
+    <message>
+        <location filename="../ui/qml/Pages/Protocols/PageProtoTorWebSite.qml" line="20"/>
+        <source>Tor Web Site settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages/Protocols/PageProtoTorWebSite.qml" line="41"/>
+        <source>Web site onion address</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages/Protocols/PageProtoTorWebSite.qml" line="60"/>
+        <source>Notes:&lt;ul&gt;
+&lt;li&gt;Use &lt;a href=&quot;https://www.torproject.org/download/&quot;&gt;Tor Browser&lt;/a&gt; to open this url.&lt;/li&gt;
+&lt;li&gt;After installation it takes several minutes while your onion site will become available in the Tor Network.&lt;/li&gt;
+&lt;li&gt;When configuring WordPress set the domain as this onion address.&lt;/li&gt;
+&lt;/ul&gt;
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PageProtoWireGuard</name>
+    <message>
+        <location filename="../ui/qml/Pages/Protocols/PageProtoWireGuard.qml" line="19"/>
+        <source>WireGuard Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PageQrDecoderIos</name>
+    <message>
+        <location filename="../ui/qml/Pages/PageQrDecoderIos.qml" line="24"/>
+        <source>Import configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PageServerConfiguringProgress</name>
+    <message>
+        <location filename="../ui/qml/Pages/PageServerConfiguringProgress.qml" line="15"/>
+        <source>Configuring...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages/PageServerConfiguringProgress.qml" line="25"/>
+        <source>Please wait.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages/PageServerConfiguringProgress.qml" line="67"/>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PageServerContainers</name>
+    <message>
+        <location filename="../ui/qml/Pages/PageServerContainers.qml" line="39"/>
+        <location filename="../ui/qml/Pages/PageServerContainers.qml" line="430"/>
+        <source>Install new service</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages/PageServerContainers.qml" line="39"/>
+        <source>Installed services</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages/PageServerContainers.qml" line="55"/>
+        <source>Default</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages/PageServerContainers.qml" line="120"/>
+        <source>Port</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages/PageServerContainers.qml" line="128"/>
+        <source>Network Protocol</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages/PageServerContainers.qml" line="134"/>
+        <source>udp</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages/PageServerContainers.qml" line="135"/>
+        <source>tcp</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages/PageServerContainers.qml" line="151"/>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages/PageServerContainers.qml" line="167"/>
+        <source>Continue</source>
+        <translation type="unfinished">Продолжить</translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages/PageServerContainers.qml" line="196"/>
+        <source>Installed Protocols and Services</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages/PageServerContainers.qml" line="306"/>
+        <source>Remove container</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages/PageServerContainers.qml" line="306"/>
+        <source>This action will erase all data of this container on the server.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PageServerList</name>
+    <message>
+        <location filename="../ui/qml/Pages/PageServerList.qml" line="19"/>
+        <source>Servers</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PageServerSettings</name>
+    <message>
+        <location filename="../ui/qml/Pages/PageServerSettings.qml" line="22"/>
+        <source>Server settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages/PageServerSettings.qml" line="71"/>
+        <source>Protocols and Services</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages/PageServerSettings.qml" line="82"/>
+        <source>Share Server (FULL ACCESS)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages/PageServerSettings.qml" line="92"/>
+        <source>Advanced server settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages/PageServerSettings.qml" line="111"/>
+        <source>Forget this server</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PageSettings</name>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettings.qml" line="35"/>
+        <source>Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettings.qml" line="42"/>
+        <source>Servers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettings.qml" line="56"/>
+        <source>Connection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettings.qml" line="70"/>
+        <source>Application</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettings.qml" line="84"/>
+        <source>Backup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettings.qml" line="98"/>
+        <source>About AmneziaVPN</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PageSettingsAbout</name>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsAbout.qml" line="56"/>
+        <source>Support the project with a donation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsAbout.qml" line="71"/>
+        <source>This is a free and open source application. If you like it, support the developers with a donation.
+And if you don&apos;t like the app, all the more support it - the donation will be used to improve the app.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsAbout.qml" line="82"/>
+        <source>Card on Patreon</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsAbout.qml" line="101"/>
+        <source>Show other methods on Github</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsAbout.qml" line="112"/>
+        <source>Contacts</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsAbout.qml" line="119"/>
+        <source>Telegram group</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsAbout.qml" line="120"/>
+        <source>To discuss features</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsAbout.qml" line="133"/>
+        <source>Mail</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsAbout.qml" line="134"/>
+        <source>For reviews and bug reports</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsAbout.qml" line="146"/>
+        <source>Github</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsAbout.qml" line="159"/>
+        <source>Website</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsAbout.qml" line="190"/>
+        <source>Check for updates</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PageSettingsApplication</name>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="43"/>
+        <source>Application</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="50"/>
+        <source>Language</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="66"/>
+        <source>Reset settings and remove all data from the application</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PageSettingsBackup</name>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsBackup.qml" line="44"/>
+        <source>Backup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsBackup.qml" line="51"/>
+        <source>Save logs</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsBackup.qml" line="83"/>
+        <source>Open folder with logs</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsBackup.qml" line="107"/>
+        <source>Save logs to file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsBackup.qml" line="131"/>
+        <source>Clear logs</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsBackup.qml" line="141"/>
+        <source>Configuration backup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsBackup.qml" line="148"/>
+        <source>It will help you instantly restore connection settings at the next installation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsBackup.qml" line="156"/>
+        <source>Make a backup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsBackup.qml" line="174"/>
+        <source>Restore from backup</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PageSettingsConnection</name>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsConnection.qml" line="41"/>
+        <source>Connection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsConnection.qml" line="51"/>
+        <source>Use AmnesiaDNS if installed on the server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsConnection.qml" line="52"/>
+        <source>Internal IP address 172.29.172.254</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsConnection.qml" line="67"/>
+        <source>DNS servers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsConnection.qml" line="68"/>
+        <source>If AmneziaDNS is not used or installed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsConnection.qml" line="81"/>
+        <source>Split site tunneling</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsConnection.qml" line="82"/>
+        <source>Allows you to connect to some sites through a secure connection, and to others bypassing it</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsConnection.qml" line="94"/>
+        <source>Separate application tunneling</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsConnection.qml" line="95"/>
+        <source>Allows you to use the VPN only for certain applications</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PageSettingsDns</name>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsDns.qml" line="44"/>
+        <source>DNS servers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsDns.qml" line="48"/>
+        <source>If AmneziaDNS is not used or installed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsDns.qml" line="72"/>
+        <source>Save</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PageSettingsServerData</name>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsServerData.qml" line="23"/>
+        <source>All installed containers have been added to the application</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsServerData.qml" line="25"/>
+        <source>Не найдено установленных контейнеров</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsServerData.qml" line="59"/>
+        <source>Clear Amnezia cache</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsServerData.qml" line="60"/>
+        <source>May be needed when changing other settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsServerData.qml" line="63"/>
+        <source>Clear cached profiles?</source>
+        <translation>Очистить закешированные профили</translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsServerData.qml" line="64"/>
+        <source>some description</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsServerData.qml" line="65"/>
+        <location filename="../ui/qml/Pages2/PageSettingsServerData.qml" line="108"/>
+        <location filename="../ui/qml/Pages2/PageSettingsServerData.qml" line="143"/>
+        <source>Continue</source>
+        <translation>Продолжить</translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsServerData.qml" line="66"/>
+        <location filename="../ui/qml/Pages2/PageSettingsServerData.qml" line="109"/>
+        <location filename="../ui/qml/Pages2/PageSettingsServerData.qml" line="144"/>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsServerData.qml" line="87"/>
+        <source>Проверить сервер на наличие ранее установленных сервисов Amnezia</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsServerData.qml" line="88"/>
+        <source>Добавим их в приложение, если они не отображались</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsServerData.qml" line="102"/>
+        <source>Remove server from application</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsServerData.qml" line="106"/>
+        <source>Remove server?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsServerData.qml" line="107"/>
+        <source>All installed AmneziaVPN services will still remain on the server.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsServerData.qml" line="137"/>
+        <source>Clear server from Amnezia software</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsServerData.qml" line="141"/>
+        <source>Clear server from Amnezia software?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsServerData.qml" line="142"/>
+        <source> All containers will be deleted on the server. This means that configuration files, keys and certificates will be deleted.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PageSettingsServerInfo</name>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsServerInfo.qml" line="94"/>
+        <source>Server name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsServerInfo.qml" line="108"/>
+        <source>Save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsServerInfo.qml" line="135"/>
+        <source>Protocols</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsServerInfo.qml" line="141"/>
+        <source>Services</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsServerInfo.qml" line="145"/>
+        <source>Data</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PageSetupWizard</name>
+    <message>
+        <location filename="../ui/qml/Pages/PageSetupWizard.qml" line="19"/>
+        <source>Setup your server to use VPN</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages/PageSetupWizard.qml" line="39"/>
+        <source>High censorship level</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages/PageSetupWizard.qml" line="49"/>
+        <source>I&apos;m living in a country with a high censorship level. Many of the foreign websites and VPNs are blocked by my government. I want to setup a reliable VPN, which can not be detected by my internet provider and my government.
+OpenVPN and ShadowSocks over Cloak (VPN obfuscation) profiles will be installed.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages/PageSetupWizard.qml" line="57"/>
+        <source>Medium censorship level</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages/PageSetupWizard.qml" line="67"/>
+        <source>I&apos;m living in a country with a medium censorship level. Some websites are blocked by my government, but VPNs are not blocked at all. I want to setup a flexible solution.
+OpenVPN over ShadowSocks profile will be installed.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages/PageSetupWizard.qml" line="75"/>
+        <source>Low censorship level</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages/PageSetupWizard.qml" line="85"/>
+        <source>I want to improve my privacy on the internet.
+OpenVPN profile will be installed.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages/PageSetupWizard.qml" line="97"/>
+        <source>Next</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PageSetupWizardCredentials</name>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSetupWizardCredentials.qml" line="44"/>
+        <source>Server connection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSetupWizardCredentials.qml" line="51"/>
+        <source>Server IP address [:port]</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSetupWizardCredentials.qml" line="52"/>
+        <location filename="../ui/qml/Pages2/PageSetupWizardCredentials.qml" line="125"/>
+        <source>Enter the address in the format 255.255.255.255:88</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSetupWizardCredentials.qml" line="62"/>
+        <source>Login to connect via SSH</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSetupWizardCredentials.qml" line="69"/>
+        <source>Password / Private key</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSetupWizardCredentials.qml" line="77"/>
+        <source>Set up a server the easy way</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSetupWizardCredentials.qml" line="102"/>
+        <source>Select protocol to install</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSetupWizardCredentials.qml" line="122"/>
+        <source>Ip address cannot be empty</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSetupWizardCredentials.qml" line="129"/>
+        <source>Login cannot be empty</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSetupWizardCredentials.qml" line="133"/>
+        <source>Password/private key cannot be empty</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PageSetupWizardEasy</name>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSetupWizardEasy.qml" line="64"/>
+        <source>What is the level of internet control in your region?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSetupWizardEasy.qml" line="132"/>
+        <source>Continue</source>
+        <translation type="unfinished">Продолжить</translation>
+    </message>
+</context>
+<context>
+    <name>PageSetupWizardHighLevel</name>
+    <message>
+        <location filename="../ui/qml/Pages/PageSetupWizardHighLevel.qml" line="19"/>
+        <source>Setup Wizard</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages/PageSetupWizardHighLevel.qml" line="39"/>
+        <source>AmneziaVPN will install a VPN protocol which is not visible to your internet provider and government firewall. Your VPN connection will be seen by your internet provider as regular web traffic to a particular website.
+
+You SHOULD set this website address to some foreign website which is not blocked by your internet provider. In other words, you need to type some foreign website address which is accessible to you without a VPN.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages/PageSetupWizardHighLevel.qml" line="48"/>
+        <source>Type another web site address for masking or keep it by default. Your internet provider will think you working on this web site when you connected to VPN.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages/PageSetupWizardHighLevel.qml" line="74"/>
+        <source>OpenVPN and ShadowSocks over Cloak (VPN obfuscation) profiles will be installed.
+
+This protocol support exporting connection profiles to mobile devices by exporting ShadowSocks and Cloak configs (you should launch the 3rd party open source VPN client - ShadowSocks VPN and install Cloak plugin).</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages/PageSetupWizardHighLevel.qml" line="87"/>
+        <source>Next</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PageSetupWizardInstalling</name>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSetupWizardInstalling.qml" line="40"/>
+        <location filename="../ui/qml/Pages2/PageSetupWizardInstalling.qml" line="57"/>
+        <source>The container you are trying to install is already installed on the server. All installed containers have been added to the application</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSetupWizardInstalling.qml" line="67"/>
+        <source>The server has already been added to the application</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PageSetupWizardLowLevel</name>
+    <message>
+        <location filename="../ui/qml/Pages/PageSetupWizardLowLevel.qml" line="19"/>
+        <source>Setup Wizard</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages/PageSetupWizardLowLevel.qml" line="39"/>
+        <source>AmneziaVPN will install the OpenVPN protocol with public/private key pairs generated on both server and client sides.
+
+You can also configure the connection on your mobile device by copying the exported &quot;.ovpn&quot; file to your device, and setting up the official OpenVPN client.
+
+We recommend not to use messaging applications for sending the connection profile - it contains VPN private keys.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages/PageSetupWizardLowLevel.qml" line="48"/>
+        <source>OpenVPN profile will be installed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages/PageSetupWizardLowLevel.qml" line="60"/>
+        <source>Start configuring</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PageSetupWizardMediumLevel</name>
+    <message>
+        <location filename="../ui/qml/Pages/PageSetupWizardMediumLevel.qml" line="19"/>
+        <source>Setup Wizard</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages/PageSetupWizardMediumLevel.qml" line="39"/>
+        <source>AmneziaVPN will install a VPN protocol which is difficult to detect by your internet provider and government firewall (but possible). In most cases, this is the most suitable protocol. This protocol is faster compared to the VPN protocols with &quot;VPN masking&quot;.
+
+This protocol supports exporting connection profiles to mobile devices by using QR codes (you should launch the 3rd party open source VPN client - ShadowSocks VPN).</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages/PageSetupWizardMediumLevel.qml" line="44"/>
+        <source>OpenVPN over ShadowSocks profile will be installed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages/PageSetupWizardMediumLevel.qml" line="55"/>
+        <source>Next</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PageSetupWizardProtocolSettings</name>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSetupWizardProtocolSettings.qml" line="75"/>
+        <source>Installing </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSetupWizardProtocolSettings.qml" line="76"/>
+        <source>protocol description</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSetupWizardProtocolSettings.qml" line="93"/>
+        <source>More detailed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSetupWizardProtocolSettings.qml" line="161"/>
+        <source>detailed protocol description</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSetupWizardProtocolSettings.qml" line="181"/>
+        <source>Close</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSetupWizardProtocolSettings.qml" line="226"/>
+        <source>Установить</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PageSetupWizardStart</name>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSetupWizardStart.qml" line="66"/>
+        <source>У меня есть данные для подключения</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSetupWizardStart.qml" line="86"/>
+        <source>У меня ничего нет</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PageSetupWizardTextKey</name>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSetupWizardTextKey.qml" line="39"/>
+        <source>Connection key</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSetupWizardTextKey.qml" line="40"/>
+        <source>A line that starts with vpn://...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSetupWizardTextKey.qml" line="51"/>
+        <source>Key</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSetupWizardTextKey.qml" line="53"/>
+        <source>Insert</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSetupWizardTextKey.qml" line="71"/>
+        <source>Continue</source>
+        <translation type="unfinished">Продолжить</translation>
+    </message>
+</context>
+<context>
+    <name>PageSetupWizardVPNMode</name>
+    <message>
+        <location filename="../ui/qml/Pages/PageSetupWizardVPNMode.qml" line="19"/>
+        <source>Setup Wizard</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages/PageSetupWizardVPNMode.qml" line="39"/>
+        <source>Optional.
+
+You can enable VPN mode &quot;For selected sites&quot; and add blocked sites you need to visit manually. If you will choose this option, you will need add every blocked site you want to visit to the access list. You may switch between modes later.
+
+Please note, you should add addresses to the list after VPN connection established. You may add any domain, URL or IP address, it will be resolved to IP address.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages/PageSetupWizardVPNMode.qml" line="45"/>
+        <source>Turn on mode &quot;VPN for selected sites&quot;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages/PageSetupWizardVPNMode.qml" line="60"/>
+        <source>Start configuring</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PageSetupWizardViewConfig</name>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSetupWizardViewConfig.qml" line="64"/>
+        <source>New connection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSetupWizardViewConfig.qml" line="90"/>
+        <source>Do not use connection code from public sources. It could be created to intercept your data.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSetupWizardViewConfig.qml" line="101"/>
+        <source>Collapse content</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSetupWizardViewConfig.qml" line="101"/>
+        <source>Show content</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSetupWizardViewConfig.qml" line="144"/>
+        <source>Connect</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PageShare</name>
+    <message>
+        <location filename="../ui/qml/Pages2/PageShare.qml" line="38"/>
+        <source>For the AmnesiaVPN app</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageShare.qml" line="45"/>
+        <source>OpenVpn native format</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageShare.qml" line="52"/>
+        <source>WireGuard native format</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageShare.qml" line="77"/>
+        <source>VPN Access</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageShare.qml" line="102"/>
+        <source>Connection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageShare.qml" line="113"/>
+        <source>Full</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageShare.qml" line="126"/>
+        <source>VPN access without the ability to manage the server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageShare.qml" line="127"/>
+        <source>Full access to server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageShare.qml" line="141"/>
+        <source>Server and service</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageShare.qml" line="142"/>
+        <source>Server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageShare.qml" line="216"/>
+        <source>Protocols and services</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageShare.qml" line="241"/>
+        <location filename="../ui/qml/Pages2/PageShare.qml" line="253"/>
+        <source>Connection to </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageShare.qml" line="242"/>
+        <location filename="../ui/qml/Pages2/PageShare.qml" line="254"/>
+        <source>File with connection settings to </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageShare.qml" line="290"/>
+        <location filename="../ui/qml/Pages2/PageShare.qml" line="291"/>
+        <source>Connection format</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageShare.qml" line="323"/>
+        <source>Share</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PageShareConnection</name>
+    <message>
+        <location filename="../ui/qml/Pages/PageShareConnection.qml" line="25"/>
+        <source>Share protocol config</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages/PageShareConnection.qml" line="56"/>
+        <source>Share for Amnezia</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages/PageShareConnection.qml" line="78"/>
+        <source>Share for </source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PageShareProtoAmnezia</name>
+    <message>
+        <location filename="../ui/qml/Pages/Share/PageShareProtoAmnezia.qml" line="18"/>
+        <source>Share for Amnezia</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages/Share/PageShareProtoAmnezia.qml" line="52"/>
+        <source>Anyone who logs in with this code will have the same permissions to use VPN and YOUR SERVER as you. 
+
+This code includes your server credentials!
+
+Provide this code only to TRUSTED users.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages/Share/PageShareProtoAmnezia.qml" line="55"/>
+        <source>Anyone who logs in with this code will be able to connect to this VPN server. 
+
+This code does not include server credentials.
+
+New encryption keys pair will be generated.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages/Share/PageShareProtoAmnezia.qml" line="106"/>
+        <source>Share</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages/Share/PageShareProtoAmnezia.qml" line="106"/>
+        <source>Save to file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages/Share/PageShareProtoAmnezia.qml" line="111"/>
+        <source>Save AmneziaVPN config</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages/Share/PageShareProtoAmnezia.qml" line="141"/>
+        <source>Scan QR code using AmneziaVPN mobile</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PageShareProtoCloak</name>
+    <message>
+        <location filename="../ui/qml/Pages/Share/PageShareProtoCloak.qml" line="18"/>
+        <source>Share Cloak Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages/Share/PageShareProtoCloak.qml" line="42"/>
+        <source>Note: Cloak protocol using same password for all connections</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages/Share/PageShareProtoCloak.qml" line="87"/>
+        <source>Share</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages/Share/PageShareProtoCloak.qml" line="87"/>
+        <source>Save to file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages/Share/PageShareProtoCloak.qml" line="92"/>
+        <source>Save AmneziaVPN config</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PageShareProtoIkev2</name>
+    <message>
+        <location filename="../ui/qml/Pages/Share/PageShareProtoIkev2.qml" line="18"/>
+        <source>Share IKEv2 Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages/Share/PageShareProtoIkev2.qml" line="91"/>
+        <location filename="../ui/qml/Pages/Share/PageShareProtoIkev2.qml" line="96"/>
+        <source>Export p12 certificate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages/Share/PageShareProtoIkev2.qml" line="106"/>
+        <location filename="../ui/qml/Pages/Share/PageShareProtoIkev2.qml" line="111"/>
+        <source>Export config for Apple</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages/Share/PageShareProtoIkev2.qml" line="121"/>
+        <location filename="../ui/qml/Pages/Share/PageShareProtoIkev2.qml" line="126"/>
+        <source>Export config for StrongSwan</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PageShareProtoOpenVPN</name>
+    <message>
+        <location filename="../ui/qml/Pages/Share/PageShareProtoOpenVPN.qml" line="18"/>
+        <source>Share OpenVPN Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages/Share/PageShareProtoOpenVPN.qml" line="42"/>
+        <source>New encryption keys pair will be generated.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages/Share/PageShareProtoOpenVPN.qml" line="86"/>
+        <source>Share</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages/Share/PageShareProtoOpenVPN.qml" line="86"/>
+        <source>Save to file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages/Share/PageShareProtoOpenVPN.qml" line="91"/>
+        <source>Save OpenVPN config</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PageShareProtoSftp</name>
+    <message>
+        <location filename="../ui/qml/Pages/Share/PageShareProtoSftp.qml" line="18"/>
+        <source>Share SFTP settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PageShareProtoShadowSocks</name>
+    <message>
+        <location filename="../ui/qml/Pages/Share/PageShareProtoShadowSocks.qml" line="18"/>
+        <source>Share ShadowSocks Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages/Share/PageShareProtoShadowSocks.qml" line="42"/>
+        <source>Note: ShadowSocks protocol using same password for all connections</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages/Share/PageShareProtoShadowSocks.qml" line="79"/>
+        <source>Copy config</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages/Share/PageShareProtoShadowSocks.qml" line="86"/>
+        <source>Connection string</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages/Share/PageShareProtoShadowSocks.qml" line="101"/>
+        <source>Copy string</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PageShareProtoTorWebSite</name>
+    <message>
+        <location filename="../ui/qml/Pages/Share/PageShareProtoTorWebSite.qml" line="18"/>
+        <source>Share Tor Web site</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PageShareProtoWireGuard</name>
+    <message>
+        <location filename="../ui/qml/Pages/Share/PageShareProtoWireGuard.qml" line="18"/>
+        <source>Share WireGuard Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages/Share/PageShareProtoWireGuard.qml" line="42"/>
+        <source>New encryption keys pair will be generated.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages/Share/PageShareProtoWireGuard.qml" line="85"/>
+        <source>Share</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages/Share/PageShareProtoWireGuard.qml" line="85"/>
+        <source>Save to file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages/Share/PageShareProtoWireGuard.qml" line="90"/>
+        <source>Save OpenVPN config</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PageShareProtocolBase</name>
+    <message>
+        <location filename="../ui/qml/Pages/Share/PageShareProtocolBase.qml" line="15"/>
+        <source>Generate config</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages/Share/PageShareProtocolBase.qml" line="16"/>
+        <source>Generating config...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages/Share/PageShareProtocolBase.qml" line="17"/>
+        <source>Show config</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PageSites</name>
+    <message>
+        <location filename="../ui/qml/Pages/PageSites.qml" line="30"/>
+        <source>Web site/Hostname/IP address/Subnet</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages/PageSites.qml" line="46"/>
+        <source>yousite.com or IP address</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages/PageSites.qml" line="102"/>
+        <source>Import IP addresses</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages/PageSites.qml" line="279"/>
+        <source>Delete selected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages/PageSites.qml" line="297"/>
+        <source>Select all</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages/PageSites.qml" line="310"/>
+        <source>Export all</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PageStart</name>
+    <message>
+        <location filename="../ui/qml/Pages/PageStart.qml" line="46"/>
+        <source>Setup your server to use VPN</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages/PageStart.qml" line="47"/>
+        <source>Connect to the already created VPN server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages/PageStart.qml" line="65"/>
+        <location filename="../ui/qml/Pages/PageStart.qml" line="77"/>
+        <source>Set up your own server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages/PageStart.qml" line="72"/>
+        <source>Import connection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages/PageStart.qml" line="115"/>
+        <source>Connection code</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages/PageStart.qml" line="133"/>
+        <source>Connect</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages/PageStart.qml" line="146"/>
+        <source>Open file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages/PageStart.qml" line="160"/>
+        <source>Scan QR code</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages/PageStart.qml" line="179"/>
+        <source>Restore app config</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages/PageStart.qml" line="203"/>
+        <source>How to get own server? →</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages/PageStart.qml" line="229"/>
+        <source>Server IP address [:port]</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages/PageStart.qml" line="248"/>
+        <source>Login to connect via SSH</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages/PageStart.qml" line="263"/>
+        <location filename="../ui/qml/Pages/PageStart.qml" line="331"/>
+        <source>Password</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages/PageStart.qml" line="324"/>
+        <location filename="../ui/qml/Pages/PageStart.qml" line="332"/>
+        <source>Connect using SSH key</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages/PageStart.qml" line="331"/>
+        <source>Private key</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages/PageStart.qml" line="332"/>
+        <source>Connect using SSH password</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PageTest</name>
+    <message>
+        <location filename="../ui/qml/Pages2/PageTest.qml" line="53"/>
+        <source>Протоколы</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageTest.qml" line="57"/>
+        <source>Сервисы</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageTest.qml" line="61"/>
+        <source>Данные</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageTest.qml" line="93"/>
+        <location filename="../ui/qml/Pages2/PageTest.qml" line="108"/>
+        <source>Forget this server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageTest.qml" line="180"/>
+        <source>SHA512</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageTest.qml" line="181"/>
+        <source>SHA384</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageTest.qml" line="182"/>
+        <source>SHA256</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageTest.qml" line="183"/>
+        <source>SHA3-512</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageTest.qml" line="184"/>
+        <source>SHA3-384</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageTest.qml" line="185"/>
+        <source>SHA3-256</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageTest.qml" line="186"/>
+        <source>whirlpool</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageTest.qml" line="187"/>
+        <source>BLAKE2b512</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageTest.qml" line="188"/>
+        <source>BLAKE2s256</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageTest.qml" line="189"/>
+        <source>SHA1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageTest.qml" line="214"/>
+        <location filename="../ui/qml/Pages2/PageTest.qml" line="220"/>
+        <location filename="../ui/qml/Pages2/PageTest.qml" line="221"/>
+        <source>Auto-negotiate encryption</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PageVPN</name>
+    <message>
+        <location filename="../ui/qml/Pages/PageVPN.qml" line="39"/>
+        <source>Donate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages/PageVPN.qml" line="134"/>
+        <source>Server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages/PageVPN.qml" line="134"/>
+        <source>Profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages/PageVPN.qml" line="162"/>
+        <source>Proto</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages/PageVPN.qml" line="190"/>
+        <source>DNS</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages/PageVPN.qml" line="307"/>
+        <source>How to use VPN</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages/PageVPN.qml" line="324"/>
+        <source>For all connections</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages/PageVPN.qml" line="333"/>
+        <source>Except selected sites</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages/PageVPN.qml" line="343"/>
+        <source>For selected sites</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages/PageVPN.qml" line="356"/>
+        <source>+ Add site</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PageViewConfig</name>
+    <message>
+        <location filename="../ui/qml/Pages/PageViewConfig.qml" line="20"/>
+        <source>Check config</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages/PageViewConfig.qml" line="54"/>
+        <source>Attention!
+The config above contains cached OpenVPN connection profile.
+AmneziaVPN detected this profile may contain malicious scripts. Please, carefully review the config and import this config only if you completely trust it.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages/PageViewConfig.qml" line="62"/>
+        <source>Suspicious string:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages/PageViewConfig.qml" line="85"/>
+        <source>Cached connection profile:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages/PageViewConfig.qml" line="120"/>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages/PageViewConfig.qml" line="129"/>
+        <source>Import config</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PopupType</name>
+    <message>
+        <location filename="../ui/qml/Controls2/PopupType.qml" line="57"/>
+        <source>Close</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
-    <message>
-        <source>AmneziaVPN is already running.</source>
-        <translation type="vanished">Приложение AmneziaVPN уже запущено.</translation>
-    </message>
     <message>
         <location filename="../core/errorstrings.cpp" line="9"/>
         <source>No error</source>
@@ -1166,656 +2502,636 @@ This code does not include server credentials.</source>
         <source>Server port already used. Check for another software</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../core/errorstrings.cpp" line="16"/>
+        <source>Server error: Docker container missing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../core/errorstrings.cpp" line="17"/>
+        <source>Server error: Docker failed</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location filename="../core/errorstrings.cpp" line="18"/>
-        <source>Ssh connection error</source>
+        <source>Installation canceled by user</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../core/errorstrings.cpp" line="19"/>
-        <source>Ssh connection timeout</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../core/errorstrings.cpp" line="20"/>
-        <source>Ssh protocol error</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../core/errorstrings.cpp" line="21"/>
-        <source>Ssh server ket check failed</source>
+        <source>The user does not have permission to use sudo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../core/errorstrings.cpp" line="22"/>
-        <source>Ssh key file error</source>
+        <source>Ssh request was denied</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../core/errorstrings.cpp" line="23"/>
-        <source>Ssh authentication error</source>
+        <source>Ssh request was interrupted</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../core/errorstrings.cpp" line="24"/>
-        <source>Ssh session closed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../core/errorstrings.cpp" line="25"/>
         <source>Ssh internal error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../core/errorstrings.cpp" line="28"/>
-        <source>Failed to create remote process on server</source>
+        <location filename="../core/errorstrings.cpp" line="25"/>
+        <source>Invalid private key or invalid passphrase entered</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../core/errorstrings.cpp" line="29"/>
-        <source>Failed to start remote process on server</source>
+        <location filename="../core/errorstrings.cpp" line="26"/>
+        <source>The selected private key format is not supported, use openssh ED25519 key types or PEM key types</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../core/errorstrings.cpp" line="27"/>
+        <source>Timeout connecting to server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../core/errorstrings.cpp" line="30"/>
-        <source>Remote process on server crashed</source>
+        <source>Sftp error: End-of-file encountered</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../core/errorstrings.cpp" line="31"/>
+        <source>Sftp error: File does not exist</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../core/errorstrings.cpp" line="32"/>
+        <source>Sftp error: Permission denied</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../core/errorstrings.cpp" line="33"/>
-        <source>Failed to save config to disk</source>
+        <source>Sftp error: Generic failure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../core/errorstrings.cpp" line="34"/>
-        <source>OpenVPN config missing</source>
+        <source>Sftp error: Garbage received from server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../core/errorstrings.cpp" line="35"/>
-        <source>OpenVPN management server error</source>
+        <source>Sftp error: No connection has been set up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../core/errorstrings.cpp" line="36"/>
-        <source>EasyRSA runtime error</source>
+        <source>Sftp error: There was a connection, but we lost it</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../core/errorstrings.cpp" line="37"/>
+        <source>Sftp error: Operation not supported by libssh yet</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../core/errorstrings.cpp" line="38"/>
+        <source>Sftp error: Invalid file handle</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../core/errorstrings.cpp" line="39"/>
-        <source>OpenVPN executable missing</source>
+        <source>Sftp error: No such file or directory path exists</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../core/errorstrings.cpp" line="40"/>
-        <source>EasyRsa executable missing</source>
+        <source>Sftp error: An attempt to create an already existing file or directory has been made</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../core/errorstrings.cpp" line="41"/>
-        <source>Amnezia helper service error</source>
-        <translation>Ошибка локального сервиса Amnezia</translation>
+        <source>Sftp error: Write-protected filesystem</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../core/errorstrings.cpp" line="44"/>
+        <location filename="../core/errorstrings.cpp" line="42"/>
+        <source>Sftp error: No media was in remote drive</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../core/errorstrings.cpp" line="45"/>
+        <source>Failed to save config to disk</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../core/errorstrings.cpp" line="46"/>
+        <source>OpenVPN config missing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../core/errorstrings.cpp" line="47"/>
+        <source>OpenVPN management server error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../core/errorstrings.cpp" line="50"/>
+        <source>OpenVPN executable missing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../core/errorstrings.cpp" line="51"/>
+        <source>ShadowSocks (ss-local) executable missing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../core/errorstrings.cpp" line="52"/>
+        <source>Cloak (ck-client) executable missing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../core/errorstrings.cpp" line="53"/>
+        <source>Amnezia helper service error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../core/errorstrings.cpp" line="54"/>
+        <source>OpenSSL failed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../core/errorstrings.cpp" line="57"/>
         <source>Can&apos;t connect: another VPN connection is active</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../core/errorstrings.cpp" line="48"/>
+        <location filename="../core/errorstrings.cpp" line="58"/>
+        <source>Can&apos;t setup OpenVPN TAP network adapter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../core/errorstrings.cpp" line="59"/>
+        <source>VPN pool error: no available addresses</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../core/errorstrings.cpp" line="61"/>
+        <source>The config does not contain any containers and credentiaks for connecting to the server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../core/errorstrings.cpp" line="65"/>
         <source>Internal error</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>QSsh::Internal::SftpChannelPrivate</name>
     <message>
-        <location filename="../3rd/QtSsh/src/ssh/sftpchannel.cpp" line="269"/>
-        <source>Server could not start SFTP subsystem.</source>
+        <location filename="../containers/containers_defs.cpp" line="88"/>
+        <source>IPsec</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../3rd/QtSsh/src/ssh/sftpchannel.cpp" line="301"/>
-        <source>The SFTP server finished unexpectedly with exit code %1.</source>
+        <location filename="../containers/containers_defs.cpp" line="90"/>
+        <location filename="../containers/containers_defs.cpp" line="107"/>
+        <source>Web site in Tor network</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../3rd/QtSsh/src/ssh/sftpchannel.cpp" line="311"/>
-        <source>The SFTP server crashed: %1.</source>
+        <location filename="../containers/containers_defs.cpp" line="91"/>
+        <location filename="../containers/containers_defs.cpp" line="108"/>
+        <source>DNS Service</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../3rd/QtSsh/src/ssh/sftpchannel.cpp" line="340"/>
-        <source>Unexpected packet of type %1.</source>
+        <location filename="../containers/containers_defs.cpp" line="93"/>
+        <source>Sftp file sharing service</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../3rd/QtSsh/src/ssh/sftpchannel.cpp" line="355"/>
-        <source>Protocol version mismatch: Expected %1, got %2</source>
+        <location filename="../containers/containers_defs.cpp" line="100"/>
+        <source>OpenVPN container</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../3rd/QtSsh/src/ssh/sftpchannel.cpp" line="471"/>
-        <source>Unknown error.</source>
+        <location filename="../containers/containers_defs.cpp" line="101"/>
+        <source>Container with OpenVpn and ShadowSocks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../3rd/QtSsh/src/ssh/sftpchannel.cpp" line="496"/>
-        <source>Created remote directory &quot;%1&quot;.</source>
+        <location filename="../containers/containers_defs.cpp" line="102"/>
+        <source>Container with OpenVpn and ShadowSocks protocols configured with traffic masking by Cloak plugin</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../3rd/QtSsh/src/ssh/sftpchannel.cpp" line="499"/>
-        <source>Remote directory &quot;%1&quot; already exists.</source>
+        <location filename="../containers/containers_defs.cpp" line="104"/>
+        <source>WireGuard container</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../3rd/QtSsh/src/ssh/sftpchannel.cpp" line="503"/>
-        <source>Error creating directory &quot;%1&quot;: %2</source>
+        <location filename="../containers/containers_defs.cpp" line="105"/>
+        <source>IPsec container</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../3rd/QtSsh/src/ssh/sftpchannel.cpp" line="527"/>
-        <source>Could not open local file &quot;%1&quot;: %2</source>
+        <location filename="../containers/containers_defs.cpp" line="110"/>
+        <source>Sftp file sharing service - is secure FTP service</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../3rd/QtSsh/src/ssh/sftpchannel.cpp" line="554"/>
-        <source>Remote directory could not be opened for reading.</source>
+        <location filename="../protocols/protocols_defs.cpp" line="82"/>
+        <source>Sftp service</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../3rd/QtSsh/src/ssh/sftpchannel.cpp" line="560"/>
-        <source>Failed to list remote directory contents.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../3rd/QtSsh/src/ssh/sftpchannel.cpp" line="568"/>
-        <source>Failed to close remote directory.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../3rd/QtSsh/src/ssh/sftpchannel.cpp" line="587"/>
-        <source>Failed to open remote file for reading.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../3rd/QtSsh/src/ssh/sftpchannel.cpp" line="593"/>
-        <source>Failed to retrieve information on the remote file (&apos;stat&apos; failed).</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../3rd/QtSsh/src/ssh/sftpchannel.cpp" line="599"/>
-        <source>Failed to read remote file.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../3rd/QtSsh/src/ssh/sftpchannel.cpp" line="610"/>
-        <location filename="../3rd/QtSsh/src/ssh/sftpchannel.cpp" line="679"/>
-        <source>Failed to close remote file.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../3rd/QtSsh/src/ssh/sftpchannel.cpp" line="639"/>
-        <source>Failed to open remote file for writing.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../3rd/QtSsh/src/ssh/sftpchannel.cpp" line="657"/>
-        <source>Failed to write remote file.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../3rd/QtSsh/src/ssh/sftpchannel.cpp" line="810"/>
-        <source>Cannot append to remote file: Server does not support the file size attribute.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../3rd/QtSsh/src/ssh/sftpchannel.cpp" line="830"/>
-        <source>SFTP channel closed unexpectedly.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../3rd/QtSsh/src/ssh/sftpchannel.cpp" line="850"/>
-        <source>Server could not start session: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../3rd/QtSsh/src/ssh/sftpchannel.cpp" line="939"/>
-        <source>Error reading local file: %1</source>
+        <location filename="../ui/pages_logic/ClientInfoLogic.cpp" line="15"/>
+        <source>An error occurred while saving the list of clients.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>QSsh::Internal::SshChannelManager</name>
+    <name>SelectContainer</name>
     <message>
-        <location filename="../3rd/QtSsh/src/ssh/sshchannelmanager.cpp" line="182"/>
-        <source>Unexpected request success packet.</source>
+        <location filename="../ui/qml/Pages/InstallSettings/SelectContainer.qml" line="66"/>
+        <source>VPN containers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../3rd/QtSsh/src/ssh/sshchannelmanager.cpp" line="204"/>
-        <source>Unexpected request failure packet.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../3rd/QtSsh/src/ssh/sshchannelmanager.cpp" line="217"/>
-        <source>Invalid channel id %1</source>
+        <location filename="../ui/qml/Pages/InstallSettings/SelectContainer.qml" line="133"/>
+        <source>Other containers</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>QSsh::Internal::SshConnectionPrivate</name>
+    <name>SelectLanguageDrawer</name>
     <message>
-        <location filename="../3rd/QtSsh/src/ssh/sshconnection.cpp" line="343"/>
-        <source>SSH Protocol error: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../3rd/QtSsh/src/ssh/sshconnection.cpp" line="349"/>
-        <source>Botan library exception: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message numerus="yes">
-        <location filename="../3rd/QtSsh/src/ssh/sshconnection.cpp" line="372"/>
-        <source>Server identification string is %n characters long, but the maximum allowed length is 255.</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
-            <numerusform></numerusform>
-        </translation>
-    </message>
-    <message>
-        <location filename="../3rd/QtSsh/src/ssh/sshconnection.cpp" line="385"/>
-        <source>Server identification string contains illegal NUL character.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../3rd/QtSsh/src/ssh/sshconnection.cpp" line="395"/>
-        <source>Server Identification string &quot;%1&quot; is invalid.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../3rd/QtSsh/src/ssh/sshconnection.cpp" line="402"/>
-        <source>Server protocol version is &quot;%1&quot;, but needs to be 2.0 or 1.99.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../3rd/QtSsh/src/ssh/sshconnection.cpp" line="410"/>
-        <source>Server identification string is invalid (missing carriage return).</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../3rd/QtSsh/src/ssh/sshconnection.cpp" line="416"/>
-        <source>Server reports protocol version 1.99, but sends data before the identification string, which is not allowed.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../3rd/QtSsh/src/ssh/sshconnection.cpp" line="464"/>
-        <location filename="../3rd/QtSsh/src/ssh/sshconnection.cpp" line="487"/>
-        <location filename="../3rd/QtSsh/src/ssh/sshconnection.cpp" line="501"/>
-        <location filename="../3rd/QtSsh/src/ssh/sshconnection.cpp" line="578"/>
-        <source>Unexpected packet of type %1.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../3rd/QtSsh/src/ssh/sshconnection.cpp" line="546"/>
-        <source>Password expired.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../3rd/QtSsh/src/ssh/sshconnection.cpp" line="612"/>
-        <source>Server rejected key.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../3rd/QtSsh/src/ssh/sshconnection.cpp" line="612"/>
-        <source>Server rejected password.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../3rd/QtSsh/src/ssh/sshconnection.cpp" line="627"/>
-        <source>The server sent an unexpected SSH packet of type SSH_MSG_UNIMPLEMENTED.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../3rd/QtSsh/src/ssh/sshconnection.cpp" line="694"/>
-        <source>Server closed connection: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../3rd/QtSsh/src/ssh/sshconnection.cpp" line="717"/>
-        <source>Connection closed unexpectedly.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../3rd/QtSsh/src/ssh/sshconnection.cpp" line="731"/>
-        <source>Timeout waiting for reply from server.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../3rd/QtSsh/src/ssh/sshconnection.cpp" line="824"/>
-        <source>No private key file given.</source>
+        <location filename="../ui/qml/Components/SelectLanguageDrawer.qml" line="49"/>
+        <source>Choose language</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>QSsh::Internal::SshRemoteProcessPrivate</name>
+    <name>ServerConfiguringProgressLogic</name>
     <message>
-        <location filename="../3rd/QtSsh/src/ssh/sshremoteprocess.cpp" line="370"/>
-        <source>Process killed by signal</source>
+        <location filename="../ui/pages_logic/ServerConfiguringProgressLogic.cpp" line="13"/>
+        <location filename="../ui/pages_logic/ServerConfiguringProgressLogic.cpp" line="88"/>
+        <source>Please wait, configuring process may take up to 5 minutes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../3rd/QtSsh/src/ssh/sshremoteprocess.cpp" line="376"/>
-        <source>Server sent invalid signal &quot;%1&quot;</source>
+        <location filename="../ui/pages_logic/ServerConfiguringProgressLogic.cpp" line="17"/>
+        <source>Configuring...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/pages_logic/ServerConfiguringProgressLogic.cpp" line="179"/>
+        <source>Operation finished</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>QSsh::SftpFileSystemModel</name>
+    <name>ServerContainersLogic</name>
     <message>
-        <location filename="../3rd/QtSsh/src/ssh/sftpfilesystemmodel.cpp" line="199"/>
-        <source>File Type</source>
+        <location filename="../ui/pages_logic/ServerContainersLogic.cpp" line="117"/>
+        <source>Error occurred while configuring server.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../3rd/QtSsh/src/ssh/sftpfilesystemmodel.cpp" line="201"/>
-        <source>File Name</source>
+        <location filename="../ui/pages_logic/ServerContainersLogic.cpp" line="118"/>
+        <source>Error message: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../3rd/QtSsh/src/ssh/sftpfilesystemmodel.cpp" line="361"/>
-        <source>Error getting &quot;stat&quot; info about &quot;%1&quot;: %2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../3rd/QtSsh/src/ssh/sftpfilesystemmodel.cpp" line="371"/>
-        <source>Error listing contents of directory &quot;%1&quot;: %2</source>
+        <location filename="../ui/pages_logic/ServerContainersLogic.cpp" line="119"/>
+        <source>See logs for details.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>QSsh::Ssh</name>
+    <name>ServerSettingsLogic</name>
     <message>
-        <location filename="../3rd/QtSsh/src/ssh/sshhostkeydatabase.cpp" line="59"/>
-        <source>Failed to open key file &quot;%1&quot; for reading: %2</source>
+        <location filename="../ui/pages_logic/ServerSettingsLogic.cpp" line="21"/>
+        <location filename="../ui/pages_logic/ServerSettingsLogic.cpp" line="90"/>
+        <source>Clear client cached profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../3rd/QtSsh/src/ssh/sshhostkeydatabase.cpp" line="89"/>
-        <source>Failed to open key file &quot;%1&quot; for writing: %2</source>
+        <location filename="../ui/pages_logic/ServerSettingsLogic.cpp" line="47"/>
+        <source>Service: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../3rd/QtSsh/src/ssh/sshkeypasswordretriever.cpp" line="44"/>
-        <source>Password Required</source>
+        <location filename="../ui/pages_logic/ServerSettingsLogic.cpp" line="82"/>
+        <source>Cache cleared</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../3rd/QtSsh/src/ssh/sshkeypasswordretriever.cpp" line="45"/>
-        <source>Please enter the password for your private key.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>QSsh::SshKeyCreationDialog</name>
-    <message>
-        <location filename="../3rd/QtSsh/src/ssh/sshkeycreationdialog.ui" line="23"/>
-        <source>SSH Key Configuration</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../3rd/QtSsh/src/ssh/sshkeycreationdialog.ui" line="29"/>
-        <source>Options</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../3rd/QtSsh/src/ssh/sshkeycreationdialog.ui" line="35"/>
-        <source>Key algorithm:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../3rd/QtSsh/src/ssh/sshkeycreationdialog.ui" line="50"/>
-        <source>&amp;RSA</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../3rd/QtSsh/src/ssh/sshkeycreationdialog.ui" line="66"/>
-        <source>&amp;DSA</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../3rd/QtSsh/src/ssh/sshkeycreationdialog.ui" line="73"/>
-        <source>ECDSA</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../3rd/QtSsh/src/ssh/sshkeycreationdialog.ui" line="101"/>
-        <source>Key &amp;size:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../3rd/QtSsh/src/ssh/sshkeycreationdialog.ui" line="132"/>
-        <source>Private key file:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../3rd/QtSsh/src/ssh/sshkeycreationdialog.ui" line="148"/>
-        <location filename="../3rd/QtSsh/src/ssh/sshkeycreationdialog.cpp" line="49"/>
-        <source>Browse...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../3rd/QtSsh/src/ssh/sshkeycreationdialog.ui" line="170"/>
-        <source>Public key file:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../3rd/QtSsh/src/ssh/sshkeycreationdialog.ui" line="211"/>
-        <source>&amp;Generate And Save Key Pair</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../3rd/QtSsh/src/ssh/sshkeycreationdialog.ui" line="224"/>
-        <source>&amp;Cancel</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../3rd/QtSsh/src/ssh/sshkeycreationdialog.cpp" line="47"/>
-        <source>Choose...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../3rd/QtSsh/src/ssh/sshkeycreationdialog.cpp" line="108"/>
-        <source>Key Generation Failed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../3rd/QtSsh/src/ssh/sshkeycreationdialog.cpp" line="113"/>
-        <source>Choose Private Key File Name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../3rd/QtSsh/src/ssh/sshkeycreationdialog.cpp" line="129"/>
-        <source>Cannot Save Key File</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../3rd/QtSsh/src/ssh/sshkeycreationdialog.cpp" line="130"/>
-        <source>Failed to create directory: &quot;%1&quot;.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../3rd/QtSsh/src/ssh/sshkeycreationdialog.cpp" line="137"/>
-        <source>Cannot Save Private Key File</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../3rd/QtSsh/src/ssh/sshkeycreationdialog.cpp" line="138"/>
-        <source>The private key file could not be saved: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../3rd/QtSsh/src/ssh/sshkeycreationdialog.cpp" line="146"/>
-        <source>Cannot Save Public Key File</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../3rd/QtSsh/src/ssh/sshkeycreationdialog.cpp" line="147"/>
-        <source>The public key file could not be saved: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../3rd/QtSsh/src/ssh/sshkeycreationdialog.cpp" line="158"/>
-        <source>File Exists</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../3rd/QtSsh/src/ssh/sshkeycreationdialog.cpp" line="159"/>
-        <source>There already is a file of that name. Do you want to overwrite it?</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>ServerWidget</name>
-    <message>
-        <location filename="../ui/server_widget.ui" line="14"/>
-        <source>Form</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/server_widget.ui" line="38"/>
-        <source>Description</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/server_widget.ui" line="51"/>
-        <source>Address</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/server_widget.ui" line="67"/>
-        <source>Set as default</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/server_widget.ui" line="97"/>
-        <source>Share connection</source>
-        <translation type="unfinished">Поделиться подключением</translation>
-    </message>
-    <message>
-        <location filename="../ui/server_widget.ui" line="122"/>
-        <source>Connection</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/server_widget.ui" line="152"/>
-        <source>Server settings</source>
-        <translation type="unfinished">Настройки сервера</translation>
-    </message>
 </context>
 <context>
     <name>Settings</name>
     <message>
-        <location filename="../settings.cpp" line="28"/>
+        <location filename="../settings.cpp" line="29"/>
         <source>Server #1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settings.cpp" line="199"/>
-        <location filename="../settings.cpp" line="206"/>
+        <location filename="../settings.cpp" line="200"/>
+        <location filename="../settings.cpp" line="207"/>
         <source>Server</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>SshConnection</name>
+    <name>SettingsController</name>
     <message>
-        <location filename="../3rd/QtSsh/src/ssh/sshcapabilities.cpp" line="119"/>
-        <source>Server and client capabilities don&apos;t match. Client list was: %1.
-Server list was %2.</source>
+        <location filename="../ui/controllers/settingsController.cpp" line="14"/>
+        <source>Software version</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/controllers/settingsController.cpp" line="66"/>
+        <source>Save log</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/controllers/settingsController.cpp" line="77"/>
+        <source>Backup application config</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/controllers/settingsController.cpp" line="83"/>
+        <source>Open backup</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>SshKeyGenerator</name>
+    <name>ShareConnectionButtonCopyType</name>
     <message>
-        <location filename="../3rd/QtSsh/src/ssh/sshkeygenerator.cpp" line="87"/>
-        <source>Error generating key: %1</source>
+        <location filename="../ui/qml/Controls/ShareConnectionButtonCopyType.qml" line="5"/>
+        <source>Copy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../3rd/QtSsh/src/ssh/sshkeygenerator.cpp" line="212"/>
-        <source>Password for Private Key</source>
+        <location filename="../ui/qml/Controls/ShareConnectionButtonCopyType.qml" line="6"/>
+        <source>Copied</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ShareConnectionDrawer</name>
+    <message>
+        <location filename="../ui/qml/Components/ShareConnectionDrawer.qml" line="52"/>
+        <source>Save connection code</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../3rd/QtSsh/src/ssh/sshkeygenerator.cpp" line="213"/>
-        <source>It is recommended that you secure your private key
-with a password, which you can enter below.</source>
+        <location filename="../ui/qml/Components/ShareConnectionDrawer.qml" line="70"/>
+        <source>Copy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../3rd/QtSsh/src/ssh/sshkeygenerator.cpp" line="215"/>
-        <source>Encrypt Key File</source>
+        <location filename="../ui/qml/Components/ShareConnectionDrawer.qml" line="89"/>
+        <source>Show content</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../3rd/QtSsh/src/ssh/sshkeygenerator.cpp" line="216"/>
-        <source>Do Not Encrypt Key File</source>
+        <location filename="../ui/qml/Components/ShareConnectionDrawer.qml" line="204"/>
+        <source>To read the QR code in the Amnezia app, select &quot;Add Server&quot; → &quot;I have connection details&quot;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ShareConnectionLogic</name>
+    <message>
+        <location filename="../ui/pages_logic/ShareConnectionLogic.cpp" line="111"/>
+        <source>Error while generating connection profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/pages_logic/ShareConnectionLogic.cpp" line="220"/>
+        <source>Error occurred while generating the config.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/pages_logic/ShareConnectionLogic.cpp" line="221"/>
+        <source>Error message: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/pages_logic/ShareConnectionLogic.cpp" line="222"/>
+        <source>See logs for details.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>SitesLogic</name>
+    <message>
+        <location filename="../ui/pages_logic/SitesLogic.cpp" line="31"/>
+        <source>These sites will be opened using VPN</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/pages_logic/SitesLogic.cpp" line="34"/>
+        <source>These sites will be excepted from VPN</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>StartPageLogic</name>
+    <message>
+        <location filename="../ui/pages_logic/StartPageLogic.cpp" line="54"/>
+        <location filename="../ui/pages_logic/StartPageLogic.cpp" line="174"/>
+        <source>Connect</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/pages_logic/StartPageLogic.cpp" line="96"/>
+        <location filename="../ui/pages_logic/StartPageLogic.cpp" line="103"/>
+        <source>Please fill in all fields</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/pages_logic/StartPageLogic.cpp" line="132"/>
+        <source>Connecting...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/pages_logic/StartPageLogic.cpp" line="187"/>
+        <source>Open config file</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>SystemTrayNotificationHandler</name>
+    <message>
+        <location filename="../ui/systemtray_notificationhandler.cpp" line="30"/>
+        <source>Show</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/systemtray_notificationhandler.cpp" line="34"/>
+        <source>Connect</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/systemtray_notificationhandler.cpp" line="35"/>
+        <source>Disconnect</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/systemtray_notificationhandler.cpp" line="39"/>
+        <source>Visit Website</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/systemtray_notificationhandler.cpp" line="43"/>
+        <source>Quit</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>UiLogic</name>
+    <message>
+        <location filename="../ui/uilogic.cpp" line="380"/>
+        <source>Error occurred while configuring server.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/uilogic.cpp" line="381"/>
+        <source>Error message: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/uilogic.cpp" line="382"/>
+        <source>See logs for details.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>VpnConnection</name>
     <message>
-        <location filename="../vpnconnection.cpp" line="303"/>
+        <location filename="../vpnconnection.cpp" line="420"/>
         <source>Mbps</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>VpnLogic</name>
+    <message>
+        <location filename="../ui/pages_logic/VpnLogic.cpp" line="22"/>
+        <location filename="../ui/pages_logic/VpnLogic.cpp" line="23"/>
+        <source>0 Mbps</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/pages_logic/VpnLogic.cpp" line="85"/>
+        <source>AmneziaVPN not supporting selected protocol on this device. Select another protocol.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/pages_logic/VpnLogic.cpp" line="214"/>
+        <source>VPN Protocols is not installed.
+ Please install VPN container at first</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/pages_logic/VpnLogic.cpp" line="220"/>
+        <source>VPN Protocol not chosen</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>VpnProtocol</name>
     <message>
-        <location filename="../protocols/vpnprotocol.cpp" line="99"/>
+        <location filename="../protocols/vpnprotocol.cpp" line="130"/>
         <source>Unknown</source>
-        <translation>Неизвестно</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../protocols/vpnprotocol.cpp" line="100"/>
+        <location filename="../protocols/vpnprotocol.cpp" line="131"/>
         <source>Disconnected</source>
-        <translation>Отключено</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../protocols/vpnprotocol.cpp" line="101"/>
+        <location filename="../protocols/vpnprotocol.cpp" line="132"/>
         <source>Preparing</source>
-        <translation>Подготовка</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../protocols/vpnprotocol.cpp" line="102"/>
+        <location filename="../protocols/vpnprotocol.cpp" line="133"/>
         <source>Connecting...</source>
-        <translation>Подключение...</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../protocols/vpnprotocol.cpp" line="103"/>
+        <location filename="../protocols/vpnprotocol.cpp" line="134"/>
         <source>Connected</source>
-        <translation>Подключено</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../protocols/vpnprotocol.cpp" line="104"/>
+        <location filename="../protocols/vpnprotocol.cpp" line="135"/>
         <source>Disconnecting...</source>
-        <translation>Отключение...</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../protocols/vpnprotocol.cpp" line="105"/>
+        <location filename="../protocols/vpnprotocol.cpp" line="136"/>
         <source>Reconnecting...</source>
-        <translation>Переподключение...</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../protocols/vpnprotocol.cpp" line="106"/>
+        <location filename="../protocols/vpnprotocol.cpp" line="137"/>
         <source>Error</source>
-        <translation>Ошибка</translation>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>amnezia::ContainerProps</name>
+    <message>
+        <location filename="../containers/containers_defs.cpp" line="207"/>
+        <source>Low</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../containers/containers_defs.cpp" line="208"/>
+        <source>High</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../containers/containers_defs.cpp" line="209"/>
+        <source>Medium</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../containers/containers_defs.cpp" line="217"/>
+        <source>Many foreign websites and VPN providers are blocked</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../containers/containers_defs.cpp" line="218"/>
+        <source>Some foreign sites are blocked, but VPN providers are not blocked</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../containers/containers_defs.cpp" line="219"/>
+        <source>I just want to increase the level of privacy</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>main</name>
+    <message>
+        <location filename="../ui/qml/main.qml" line="267"/>
+        <source>It&apos;s public key. Private key required</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/main.qml" line="308"/>
+        <source>Ssh log</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/main.qml" line="318"/>
+        <source>App log</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/main.qml" line="322"/>
+        <source>Wrap words</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/client/ui/controllers/settingsController.cpp b/client/ui/controllers/settingsController.cpp
index fcfcc7af..42dd2231 100644
--- a/client/ui/controllers/settingsController.cpp
+++ b/client/ui/controllers/settingsController.cpp
@@ -2,9 +2,9 @@
 
 #include <QStandardPaths>
 
-#include "defines.h"
 #include "logger.h"
 #include "utilities.h"
+#include "version.h"
 
 SettingsController::SettingsController(const QSharedPointer<ServersModel> &serversModel,
                                        const QSharedPointer<ContainersModel> &containersModel,
diff --git a/client/ui/models/languageModel.cpp b/client/ui/models/languageModel.cpp
new file mode 100644
index 00000000..e95b2ccf
--- /dev/null
+++ b/client/ui/models/languageModel.cpp
@@ -0,0 +1,62 @@
+#include "languageModel.h"
+
+LanguageModel::LanguageModel(std::shared_ptr<Settings> settings, QObject *parent)
+    : m_settings(settings), QAbstractListModel(parent)
+{
+    QMetaEnum metaEnum = QMetaEnum::fromType<LanguageSettings::AvailableLanguageEnum>();
+    for (int i = 0; i < metaEnum.keyCount(); i++) {
+        m_availableLanguages.push_back(
+                LanguageModelData { metaEnum.valueToKey(i), static_cast<LanguageSettings::AvailableLanguageEnum>(i) });
+    }
+}
+
+int LanguageModel::rowCount(const QModelIndex &parent) const
+{
+    return static_cast<int>(m_availableLanguages.size());
+}
+
+QVariant LanguageModel::data(const QModelIndex &index, int role) const
+{
+    if (!index.isValid() || index.row() < 0 || index.row() >= static_cast<int>(m_availableLanguages.size())) {
+        return QVariant();
+    }
+
+    switch (role) {
+    case NameRole: {
+        return m_availableLanguages[index.row()].name;
+        break;
+    }
+    case IndexRole: {
+        return static_cast<int>(m_availableLanguages[index.row()].index);
+        break;
+    }
+    }
+    return QVariant();
+}
+
+QHash<int, QByteArray> LanguageModel::roleNames() const
+{
+    QHash<int, QByteArray> roles;
+    roles[NameRole] = "languageName";
+    roles[IndexRole] = "languageIndex";
+    return roles;
+}
+
+void LanguageModel::changeLanguage(const LanguageSettings::AvailableLanguageEnum language)
+{
+    switch (language) {
+    case LanguageSettings::AvailableLanguageEnum::English: emit updateTranslations(QLocale::English); break;
+    case LanguageSettings::AvailableLanguageEnum::Russian: emit updateTranslations(QLocale::Russian); break;
+    default: emit updateTranslations(QLocale::English); break;
+    }
+}
+
+int LanguageModel::getCurrentLanguageIndex()
+{
+    auto locale = m_settings->getAppLanguage();
+    switch (locale.language()) {
+    case QLocale::English: return static_cast<int>(LanguageSettings::AvailableLanguageEnum::English); break;
+    case QLocale::Russian: return static_cast<int>(LanguageSettings::AvailableLanguageEnum::Russian); break;
+    default: return static_cast<int>(LanguageSettings::AvailableLanguageEnum::English); break;
+    }
+}
diff --git a/client/ui/models/languageModel.h b/client/ui/models/languageModel.h
new file mode 100644
index 00000000..b3ff4f6e
--- /dev/null
+++ b/client/ui/models/languageModel.h
@@ -0,0 +1,62 @@
+#ifndef LANGUAGEMODEL_H
+#define LANGUAGEMODEL_H
+
+#include <QAbstractListModel>
+#include <QQmlEngine>
+
+#include "settings.h"
+
+namespace LanguageSettings
+{
+    Q_NAMESPACE
+    enum class AvailableLanguageEnum {
+        English,
+        Russian
+    };
+    Q_ENUM_NS(AvailableLanguageEnum)
+
+    static void declareQmlAvailableLanguageEnum()
+    {
+        qmlRegisterUncreatableMetaObject(LanguageSettings::staticMetaObject, "AvailableLanguageEnum", 1, 0,
+                                         "AvailableLanguageEnum", QString());
+    }
+}
+
+struct LanguageModelData
+{
+    QString name;
+    LanguageSettings::AvailableLanguageEnum index;
+};
+
+class LanguageModel : public QAbstractListModel
+{
+    Q_OBJECT
+
+public:
+    enum Roles {
+        NameRole = Qt::UserRole + 1,
+        IndexRole
+    };
+
+    LanguageModel(std::shared_ptr<Settings> settings, QObject *parent = nullptr);
+
+    int rowCount(const QModelIndex &parent = QModelIndex()) const override;
+    QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
+
+public slots:
+    void changeLanguage(const LanguageSettings::AvailableLanguageEnum language);
+    int getCurrentLanguageIndex();
+
+signals:
+    void updateTranslations(const QLocale &locale);
+
+protected:
+    QHash<int, QByteArray> roleNames() const override;
+
+private:
+    QVector<LanguageModelData> m_availableLanguages;
+
+    std::shared_ptr<Settings> m_settings;
+};
+
+#endif // LANGUAGEMODEL_H
diff --git a/client/ui/qml/Components/ConnectionTypeSelectionDrawer.qml b/client/ui/qml/Components/ConnectionTypeSelectionDrawer.qml
index 51bffc03..71299b1f 100644
--- a/client/ui/qml/Components/ConnectionTypeSelectionDrawer.qml
+++ b/client/ui/qml/Components/ConnectionTypeSelectionDrawer.qml
@@ -18,12 +18,14 @@ DrawerType {
         anchors.top: parent.top
         anchors.left: parent.left
         anchors.right: parent.right
+        spacing: 0
 
         Header2TextType {
             Layout.fillWidth: true
             Layout.topMargin: 24
             Layout.rightMargin: 16
             Layout.leftMargin: 16
+            Layout.bottomMargin: 32
             Layout.alignment: Qt.AlignHCenter
 
             text: "Данные для подключения"
diff --git a/client/ui/qml/Components/SelectLanguageDrawer.qml b/client/ui/qml/Components/SelectLanguageDrawer.qml
new file mode 100644
index 00000000..f1ffa416
--- /dev/null
+++ b/client/ui/qml/Components/SelectLanguageDrawer.qml
@@ -0,0 +1,137 @@
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+
+import "../Controls2"
+import "../Controls2/TextTypes"
+
+DrawerType {
+    id: root
+
+    width: parent.width
+    height: parent.height * 0.9
+
+    ColumnLayout {
+        id: backButton
+
+        anchors.top: parent.top
+        anchors.left: parent.left
+        anchors.right: parent.right
+        anchors.topMargin: 16
+
+        BackButtonType {
+            backButtonImage: "qrc:/images/controls/arrow-left.svg"
+            backButtonFunction: function() {
+                root.close()
+            }
+        }
+    }
+
+    FlickableType {
+        anchors.top: backButton.bottom
+        anchors.left: parent.left
+        anchors.right: parent.right
+        anchors.bottom: parent.bottom
+        contentHeight: content.implicitHeight
+
+        ColumnLayout {
+            id: content
+
+            anchors.fill: parent
+
+            Header2Type {
+                id: header
+                Layout.fillWidth: true
+                Layout.topMargin: 16
+                Layout.rightMargin: 16
+                Layout.leftMargin: 16
+
+                headerText: qsTr("Choose language")
+            }
+
+            ListView {
+                id: listView
+
+                Layout.fillWidth: true
+                height: listView.contentItem.height
+
+                clip: true
+                interactive: false
+
+                model: LanguageModel
+                currentIndex: LanguageModel.getCurrentLanguageIndex()
+
+                ButtonGroup {
+                    id: buttonGroup
+                }
+
+                delegate: Item {
+                    implicitWidth: root.width
+                    implicitHeight: content.implicitHeight
+
+                    ColumnLayout {
+                        id: delegateContent
+
+                        anchors.fill: parent
+
+                        RadioButton {
+                            id: radioButton
+
+                            implicitWidth: parent.width
+                            implicitHeight: radioButtonContent.implicitHeight
+
+                            hoverEnabled: true
+
+                            indicator: Rectangle {
+                                anchors.fill: parent
+                                color: radioButton.hovered ? "#2C2D30" : "#1C1D21"
+
+                                Behavior on color {
+                                    PropertyAnimation { duration: 200 }
+                                }
+                            }
+
+                            RowLayout {
+                                id: radioButtonContent
+                                anchors.fill: parent
+
+                                anchors.rightMargin: 16
+                                anchors.leftMargin: 16
+
+                                spacing: 0
+
+                                z: 1
+
+                                ParagraphTextType {
+                                    Layout.fillWidth: true
+                                    Layout.topMargin: 20
+                                    Layout.bottomMargin: 20
+
+                                    text: languageName
+                                }
+
+                                Image {
+                                    source: "qrc:/images/controls/check.svg"
+                                    visible: radioButton.checked
+
+                                    width: 24
+                                    height: 24
+
+                                    Layout.rightMargin: 8
+                                }
+                            }
+
+                            ButtonGroup.group: buttonGroup
+                            checked: listView.currentIndex === index
+
+                            onClicked: {
+                                listView.currentIndex = index
+                                LanguageModel.changeLanguage(languageIndex)
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/client/ui/qml/Components/ShareConnectionDrawer.qml b/client/ui/qml/Components/ShareConnectionDrawer.qml
index 720e3206..99e172cc 100644
--- a/client/ui/qml/Components/ShareConnectionDrawer.qml
+++ b/client/ui/qml/Components/ShareConnectionDrawer.qml
@@ -105,8 +105,6 @@ DrawerType {
                         anchors.top: parent.top
                         anchors.left: parent.left
                         anchors.right: parent.right
-                        anchors.rightMargin: 16
-                        anchors.leftMargin: 16
                         anchors.topMargin: 16
 
                         backButtonFunction: function() {
diff --git a/client/ui/qml/Components/ShowDetailsDrawer.qml b/client/ui/qml/Components/ShowDetailsDrawer.qml
deleted file mode 100644
index 2f6d2656..00000000
--- a/client/ui/qml/Components/ShowDetailsDrawer.qml
+++ /dev/null
@@ -1,10 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-import QtQuick.Layouts
-
-import "../Controls2"
-import "../Controls2/TextTypes"
-
-Item {
-
-}
diff --git a/client/ui/qml/Controls2/BackButtonType.qml b/client/ui/qml/Controls2/BackButtonType.qml
index 0ccb7345..91f5f28f 100644
--- a/client/ui/qml/Controls2/BackButtonType.qml
+++ b/client/ui/qml/Controls2/BackButtonType.qml
@@ -17,6 +17,7 @@ Item {
         id: content
 
         anchors.fill: parent
+        anchors.leftMargin: 8
 
         ImageButtonType {
             image: backButtonImage
diff --git a/client/ui/qml/Controls2/BasicButtonType.qml b/client/ui/qml/Controls2/BasicButtonType.qml
index 05074fa9..d9168466 100644
--- a/client/ui/qml/Controls2/BasicButtonType.qml
+++ b/client/ui/qml/Controls2/BasicButtonType.qml
@@ -1,6 +1,8 @@
 import QtQuick
 import QtQuick.Controls
 
+import "TextTypes"
+
 Button {
     id: root
 
@@ -46,12 +48,8 @@ Button {
         cursorShape: Qt.PointingHandCursor
     }
 
-    contentItem: Text {
+    contentItem: ButtonTextType {
         anchors.fill: background
-        font.family: "PT Root UI VF"
-        font.styleName: "normal"
-        font.weight: 400
-        font.pixelSize: 16
         color: textColor
         text: root.text
         horizontalAlignment: Text.AlignHCenter
diff --git a/client/ui/qml/Controls2/DividerType.qml b/client/ui/qml/Controls2/DividerType.qml
index 6341807a..bf01e7a1 100644
--- a/client/ui/qml/Controls2/DividerType.qml
+++ b/client/ui/qml/Controls2/DividerType.qml
@@ -3,6 +3,10 @@ import QtQuick.Layouts
 
 Rectangle {
     Layout.fillWidth: true
+
+    Layout.leftMargin: 16
+    Layout.rightMargin: 16
+
     height: 1
     color: "#2C2D30"
 }
diff --git a/client/ui/qml/Controls2/DropDownType.qml b/client/ui/qml/Controls2/DropDownType.qml
index 9b9c718a..85989ae6 100644
--- a/client/ui/qml/Controls2/DropDownType.qml
+++ b/client/ui/qml/Controls2/DropDownType.qml
@@ -146,8 +146,6 @@ Item {
             anchors.left: parent.left
             anchors.right: parent.right
             anchors.topMargin: 16
-            anchors.leftMargin: 16
-            anchors.rightMargin: 16
 
             BackButtonType {
                 backButtonImage: root.headerBackButtonImage
diff --git a/client/ui/qml/Controls2/TextTypes/ButtonTextType.qml b/client/ui/qml/Controls2/TextTypes/ButtonTextType.qml
index d26594d6..e3b14e63 100644
--- a/client/ui/qml/Controls2/TextTypes/ButtonTextType.qml
+++ b/client/ui/qml/Controls2/TextTypes/ButtonTextType.qml
@@ -1,11 +1,12 @@
 import QtQuick
 
 Text {
-    height: 24
+    lineHeight: 24
+    lineHeightMode: Text.FixedHeight
 
     color: "#D7D8DB"
     font.pixelSize: 16
-    font.weight: Font.Medium
+    font.weight: 500
     font.family: "PT Root UI VF"
 
     wrapMode: Text.WordWrap
diff --git a/client/ui/qml/Controls2/TextTypes/CaptionTextType.qml b/client/ui/qml/Controls2/TextTypes/CaptionTextType.qml
index 15cc96c1..b9e41da2 100644
--- a/client/ui/qml/Controls2/TextTypes/CaptionTextType.qml
+++ b/client/ui/qml/Controls2/TextTypes/CaptionTextType.qml
@@ -1,11 +1,12 @@
 import QtQuick
 
 Text {
-    height: 16
+    lineHeight: 16
+    lineHeightMode: Text.FixedHeight
 
     color: "#0E0E11"
     font.pixelSize: 13
-    font.weight: Font.Normal
+    font.weight: 400
     font.family: "PT Root UI VF"
     font.letterSpacing: 0.02
 
diff --git a/client/ui/qml/Controls2/TextTypes/Header1TextType.qml b/client/ui/qml/Controls2/TextTypes/Header1TextType.qml
index 99addc7b..86b61d7a 100644
--- a/client/ui/qml/Controls2/TextTypes/Header1TextType.qml
+++ b/client/ui/qml/Controls2/TextTypes/Header1TextType.qml
@@ -1,13 +1,14 @@
 import QtQuick
 
 Text {
-    height: 38
+    lineHeight: 38
+    lineHeightMode: Text.FixedHeight
 
     color: "#D7D8DB"
     font.pixelSize: 36
-    font.weight: Font.Bold
+    font.weight: 700
     font.family: "PT Root UI VF"
-    font.letterSpacing: -0.03
+    font.letterSpacing: -1.08
 
     wrapMode: Text.WordWrap
 }
diff --git a/client/ui/qml/Controls2/TextTypes/Header2TextType.qml b/client/ui/qml/Controls2/TextTypes/Header2TextType.qml
index ed96f6f1..9e2a8ae9 100644
--- a/client/ui/qml/Controls2/TextTypes/Header2TextType.qml
+++ b/client/ui/qml/Controls2/TextTypes/Header2TextType.qml
@@ -1,11 +1,12 @@
 import QtQuick
 
 Text {
-    height: 30
+    lineHeight: 30
+    lineHeightMode: Text.FixedHeight
 
     color: "#D7D8DB"
     font.pixelSize: 25
-    font.weight: Font.Bold
+    font.weight: 700
     font.family: "PT Root UI VF"
 
     wrapMode: Text.WordWrap
diff --git a/client/ui/qml/Controls2/TextTypes/LabelTextType.qml b/client/ui/qml/Controls2/TextTypes/LabelTextType.qml
index a2ffa18b..d47d460d 100644
--- a/client/ui/qml/Controls2/TextTypes/LabelTextType.qml
+++ b/client/ui/qml/Controls2/TextTypes/LabelTextType.qml
@@ -1,11 +1,12 @@
 import QtQuick
 
 Text {
-    height: 16
+    lineHeight: 16
+    lineHeightMode: Text.FixedHeight
 
     color: "#878B91"
     font.pixelSize: 13
-    font.weight: Font.Normal
+    font.weight: 400
     font.family: "PT Root UI VF"
     font.letterSpacing: 0.02
 
diff --git a/client/ui/qml/Controls2/TextTypes/ListItemTitleType.qml b/client/ui/qml/Controls2/TextTypes/ListItemTitleType.qml
index 23069db2..30bd7900 100644
--- a/client/ui/qml/Controls2/TextTypes/ListItemTitleType.qml
+++ b/client/ui/qml/Controls2/TextTypes/ListItemTitleType.qml
@@ -1,11 +1,12 @@
 import QtQuick
 
 Text {
-    height: 21.6
+    lineHeight: 21.6
+    lineHeightMode: Text.FixedHeight
 
     color: "#D7D8DB"
     font.pixelSize: 18
-    font.weight: Font.Normal
+    font.weight: 400
     font.family: "PT Root UI VF"
 
     wrapMode: Text.WordWrap
diff --git a/client/ui/qml/Controls2/TextTypes/ParagraphTextType.qml b/client/ui/qml/Controls2/TextTypes/ParagraphTextType.qml
index 74b155ab..a53ca67e 100644
--- a/client/ui/qml/Controls2/TextTypes/ParagraphTextType.qml
+++ b/client/ui/qml/Controls2/TextTypes/ParagraphTextType.qml
@@ -1,11 +1,12 @@
 import QtQuick
 
 Text {
-    height: 24
+    lineHeight: 24
+    lineHeightMode: Text.FixedHeight
 
     color: "#D7D8DB"
     font.pixelSize: 16
-    font.weight: Font.Normal
+    font.weight: 400
     font.family: "PT Root UI VF"
 
     wrapMode: Text.WordWrap
diff --git a/client/ui/qml/Controls2/TextTypes/SmallTextType.qml b/client/ui/qml/Controls2/TextTypes/SmallTextType.qml
index 96f3342d..d1b24e6a 100644
--- a/client/ui/qml/Controls2/TextTypes/SmallTextType.qml
+++ b/client/ui/qml/Controls2/TextTypes/SmallTextType.qml
@@ -1,11 +1,12 @@
 import QtQuick
 
 Text {
-    height: 20
+    lineHeight: 20
+    lineHeightMode: Text.FixedHeight
 
     color: "#D7D8DB"
     font.pixelSize: 14
-    font.weight: Font.Normal
+    font.weight: 400
     font.family: "PT Root UI VF"
 
     wrapMode: Text.WordWrap
diff --git a/client/ui/qml/Pages2/PageSettingsAbout.qml b/client/ui/qml/Pages2/PageSettingsAbout.qml
index a1bdeb26..01b11bda 100644
--- a/client/ui/qml/Pages2/PageSettingsAbout.qml
+++ b/client/ui/qml/Pages2/PageSettingsAbout.qml
@@ -19,8 +19,6 @@ PageType {
         anchors.top: parent.top
         anchors.left: parent.left
         anchors.right: parent.right
-        anchors.rightMargin: 16
-        anchors.leftMargin: 16
         anchors.topMargin: 20
     }
 
diff --git a/client/ui/qml/Pages2/PageSettingsApplication.qml b/client/ui/qml/Pages2/PageSettingsApplication.qml
index 08a5ec0d..b378a6c8 100644
--- a/client/ui/qml/Pages2/PageSettingsApplication.qml
+++ b/client/ui/qml/Pages2/PageSettingsApplication.qml
@@ -8,6 +8,7 @@ import "./"
 import "../Controls2"
 import "../Config"
 import "../Controls2/TextTypes"
+import "../Components"
 
 PageType {
     id: root
@@ -18,8 +19,6 @@ PageType {
         anchors.top: parent.top
         anchors.left: parent.left
         anchors.right: parent.right
-        anchors.rightMargin: 16
-        anchors.leftMargin: 16
         anchors.topMargin: 20
     }
 
@@ -52,10 +51,14 @@ PageType {
                 rightImageSource: "qrc:/images/controls/chevron-right.svg"
 
                 clickedFunction: function() {
+                    selectLanguageDrawer.open()
                 }
             }
 
-            DividerType {}
+            SelectLanguageDrawer {
+                id: selectLanguageDrawer
+            }
+
 
             LabelWithButtonType {
                 Layout.fillWidth: true
diff --git a/client/ui/qml/Pages2/PageSettingsBackup.qml b/client/ui/qml/Pages2/PageSettingsBackup.qml
index a5445754..ddf9f2ba 100644
--- a/client/ui/qml/Pages2/PageSettingsBackup.qml
+++ b/client/ui/qml/Pages2/PageSettingsBackup.qml
@@ -18,8 +18,6 @@ PageType {
         anchors.top: parent.top
         anchors.left: parent.left
         anchors.right: parent.right
-        anchors.rightMargin: 16
-        anchors.leftMargin: 16
         anchors.topMargin: 20
     }
 
diff --git a/client/ui/qml/Pages2/PageSettingsConnection.qml b/client/ui/qml/Pages2/PageSettingsConnection.qml
index ad8524f5..1cf8a1a5 100644
--- a/client/ui/qml/Pages2/PageSettingsConnection.qml
+++ b/client/ui/qml/Pages2/PageSettingsConnection.qml
@@ -17,8 +17,6 @@ PageType {
         anchors.top: parent.top
         anchors.left: parent.left
         anchors.right: parent.right
-        anchors.rightMargin: 16
-        anchors.leftMargin: 16
         anchors.topMargin: 20
     }
 
diff --git a/client/ui/qml/Pages2/PageSettingsDns.qml b/client/ui/qml/Pages2/PageSettingsDns.qml
index 1c989c0c..c51f9092 100644
--- a/client/ui/qml/Pages2/PageSettingsDns.qml
+++ b/client/ui/qml/Pages2/PageSettingsDns.qml
@@ -18,8 +18,6 @@ PageType {
         anchors.top: parent.top
         anchors.left: parent.left
         anchors.right: parent.right
-        anchors.rightMargin: 16
-        anchors.leftMargin: 16
         anchors.topMargin: 20
     }
 
diff --git a/client/ui/qml/Pages2/PageSettingsServerInfo.qml b/client/ui/qml/Pages2/PageSettingsServerInfo.qml
index aa882aa5..7b6dce68 100644
--- a/client/ui/qml/Pages2/PageSettingsServerInfo.qml
+++ b/client/ui/qml/Pages2/PageSettingsServerInfo.qml
@@ -42,14 +42,14 @@ PageType {
                 id: content
 
                 Layout.topMargin: 20
-                Layout.leftMargin: 16
-                Layout.rightMargin: 16
 
                 BackButtonType {
                 }
 
                 HeaderType {
                     Layout.fillWidth: true
+                    Layout.leftMargin: 16
+                    Layout.rightMargin: 16
 
                     actionButtonImage: "qrc:/images/controls/edit-3.svg"
 
diff --git a/client/ui/qml/Pages2/PageSettingsServersList.qml b/client/ui/qml/Pages2/PageSettingsServersList.qml
index 7f2b1688..4c6a9839 100644
--- a/client/ui/qml/Pages2/PageSettingsServersList.qml
+++ b/client/ui/qml/Pages2/PageSettingsServersList.qml
@@ -25,14 +25,14 @@ PageType {
         anchors.right: parent.right
 
         anchors.topMargin: 20
-        anchors.leftMargin: 16
-        anchors.rightMargin: 16
 
         BackButtonType {
         }
 
         HeaderType {
             Layout.fillWidth: true
+            Layout.leftMargin: 16
+            Layout.rightMargin: 16
 
             actionButtonImage: "qrc:/images/controls/plus.svg"
 
diff --git a/client/ui/qml/Pages2/PageSetupWizardConfigSource.qml b/client/ui/qml/Pages2/PageSetupWizardConfigSource.qml
index 2ef38067..45e4c29c 100644
--- a/client/ui/qml/Pages2/PageSetupWizardConfigSource.qml
+++ b/client/ui/qml/Pages2/PageSetupWizardConfigSource.qml
@@ -26,19 +26,18 @@ PageType {
             anchors.left: parent.left
             anchors.right: parent.right
 
+            spacing: 0
+
             BackButtonType {
                 Layout.topMargin: 20
-                Layout.rightMargin: 16
-                Layout.leftMargin: 16
             }
 
             HeaderType {
                 Layout.fillWidth: true
-                Layout.topMargin: 20
+                Layout.topMargin: 8
                 Layout.rightMargin: 16
                 Layout.leftMargin: 16
 
-
                 headerText: "Подключение к серверу"
                 descriptionText: "Не используйте код подключения из публичных источников. Его могли создать, чтобы перехватывать ваши данные.\n
 Всё в порядке, если код передал друг."
@@ -46,7 +45,7 @@ PageType {
 
             Header2TextType {
                 Layout.fillWidth: true
-                Layout.topMargin: 32
+                Layout.topMargin: 48
                 Layout.rightMargin: 16
                 Layout.leftMargin: 16
 
diff --git a/client/ui/qml/Pages2/PageSetupWizardCredentials.qml b/client/ui/qml/Pages2/PageSetupWizardCredentials.qml
index 5a2f7d88..487bdbde 100644
--- a/client/ui/qml/Pages2/PageSetupWizardCredentials.qml
+++ b/client/ui/qml/Pages2/PageSetupWizardCredentials.qml
@@ -18,8 +18,6 @@ PageType {
         anchors.top: parent.top
         anchors.left: parent.left
         anchors.right: parent.right
-        anchors.rightMargin: 16
-        anchors.leftMargin: 16
         anchors.topMargin: 20
     }
 
diff --git a/client/ui/qml/Pages2/PageSetupWizardEasy.qml b/client/ui/qml/Pages2/PageSetupWizardEasy.qml
index 19f06d5f..2a6e1909 100644
--- a/client/ui/qml/Pages2/PageSetupWizardEasy.qml
+++ b/client/ui/qml/Pages2/PageSetupWizardEasy.qml
@@ -36,8 +36,6 @@ PageType {
         anchors.top: parent.top
         anchors.left: parent.left
         anchors.right: parent.right
-        anchors.rightMargin: 16
-        anchors.leftMargin: 16
         anchors.topMargin: 20
     }
 
diff --git a/client/ui/qml/Pages2/PageSetupWizardProtocolSettings.qml b/client/ui/qml/Pages2/PageSetupWizardProtocolSettings.qml
index 5ca75f6f..e593393c 100644
--- a/client/ui/qml/Pages2/PageSetupWizardProtocolSettings.qml
+++ b/client/ui/qml/Pages2/PageSetupWizardProtocolSettings.qml
@@ -63,6 +63,8 @@ PageType {
                             id: backButton
 
                             Layout.topMargin: 20
+                            Layout.rightMargin: -16
+                            Layout.leftMargin: -16
                         }
 
                         HeaderType {
@@ -107,8 +109,6 @@ PageType {
                                 anchors.top: parent.top
                                 anchors.left: parent.left
                                 anchors.right: parent.right
-                                anchors.rightMargin: 16
-                                anchors.leftMargin: 16
                                 anchors.topMargin: 16
 
                                 backButtonFunction: function() {
diff --git a/client/ui/qml/Pages2/PageSetupWizardProtocols.qml b/client/ui/qml/Pages2/PageSetupWizardProtocols.qml
index 527df830..edc443d4 100644
--- a/client/ui/qml/Pages2/PageSetupWizardProtocols.qml
+++ b/client/ui/qml/Pages2/PageSetupWizardProtocols.qml
@@ -42,8 +42,6 @@ PageType {
             anchors.top: parent.top
             anchors.left: parent.left
             anchors.right: parent.right
-            anchors.rightMargin: 16
-            anchors.leftMargin: 16
             anchors.topMargin: 20
 
             spacing: 16
@@ -52,11 +50,23 @@ PageType {
                 width: parent.width
             }
 
-            HeaderType {
+            Item {
                 width: parent.width
+                height: header.implicitHeight
 
-                headerText: "Протокол подключения"
-                descriptionText: "Выберите более приоритетный для вас. Позже можно будет установить остальные протоколы и доп сервисы, вроде DNS-прокси и SFTP."
+                HeaderType {
+                    id: header
+
+                    anchors.fill: parent
+
+                    anchors.leftMargin: 16
+                    anchors.rightMargin: 16
+
+                    width: parent.width
+
+                    headerText: "Протокол подключения"
+                    descriptionText: "Выберите более приоритетный для вас. Позже можно будет установить остальные протоколы и доп сервисы, вроде DNS-прокси и SFTP."
+                }
             }
 
             ListView {
@@ -78,8 +88,6 @@ PageType {
                         anchors.top: parent.top
                         anchors.left: parent.left
                         anchors.right: parent.right
-                        anchors.rightMargin: -16
-                        anchors.leftMargin: -16
 
                         LabelWithButtonType {
                             id: container
diff --git a/client/ui/qml/Pages2/PageSetupWizardStart.qml b/client/ui/qml/Pages2/PageSetupWizardStart.qml
index ad91303e..78ccfa95 100644
--- a/client/ui/qml/Pages2/PageSetupWizardStart.qml
+++ b/client/ui/qml/Pages2/PageSetupWizardStart.qml
@@ -34,6 +34,7 @@ PageType {
             anchors.top: parent.top
             anchors.left: parent.left
             anchors.right: parent.right
+            spacing: 0
 
             Image {
                 id: image
diff --git a/client/ui/qml/Pages2/PageSetupWizardTextKey.qml b/client/ui/qml/Pages2/PageSetupWizardTextKey.qml
index d7dbf43d..504645d1 100644
--- a/client/ui/qml/Pages2/PageSetupWizardTextKey.qml
+++ b/client/ui/qml/Pages2/PageSetupWizardTextKey.qml
@@ -24,8 +24,6 @@ PageType {
             anchors.top: parent.top
             anchors.left: parent.left
             anchors.right: parent.right
-            anchors.rightMargin: 16
-            anchors.leftMargin: 16
 
             spacing: 16
 
@@ -35,6 +33,8 @@ PageType {
 
             HeaderType {
                 Layout.fillWidth: true
+                Layout.rightMargin: 16
+                Layout.leftMargin: 16
 
                 headerText: qsTr("Connection key")
                 descriptionText: qsTr("A line that starts with vpn://...")
@@ -45,6 +45,8 @@ PageType {
 
                 Layout.fillWidth: true
                 Layout.topMargin: 32
+                Layout.rightMargin: 16
+                Layout.leftMargin: 16
 
                 headerText: qsTr("Key")
                 textFieldPlaceholderText: "vpn://"
diff --git a/client/ui/qml/Pages2/PageSetupWizardViewConfig.qml b/client/ui/qml/Pages2/PageSetupWizardViewConfig.qml
index c7b774b4..e1b93302 100644
--- a/client/ui/qml/Pages2/PageSetupWizardViewConfig.qml
+++ b/client/ui/qml/Pages2/PageSetupWizardViewConfig.qml
@@ -42,8 +42,6 @@ PageType {
         anchors.top: parent.top
         anchors.left: parent.left
         anchors.right: parent.right
-        anchors.rightMargin: 16
-        anchors.leftMargin: 16
         anchors.topMargin: 20
     }
 
diff --git a/client/ui/qml/Pages2/PageShare.qml b/client/ui/qml/Pages2/PageShare.qml
index 1e3d02e8..7f567b8d 100644
--- a/client/ui/qml/Pages2/PageShare.qml
+++ b/client/ui/qml/Pages2/PageShare.qml
@@ -185,8 +185,6 @@ PageType {
                         anchors.left: parent.left
                         anchors.right: parent.right
                         anchors.topMargin: 16
-                        anchors.leftMargin: 16
-                        anchors.rightMargin: 16
 
                         BackButtonType {
                             backButtonImage: "qrc:/images/controls/arrow-left.svg"

From 9b07909ed8fe2b7efa2173d2f6fb07a1588807a6 Mon Sep 17 00:00:00 2001
From: "vladimir.kuznetsov" <nethiuswork@gmail.com>
Date: Fri, 30 Jun 2023 13:45:11 +0900
Subject: [PATCH 038/278] added FlickableType to PageSettingsServerProtocols
 and PageSettingsServerServices

---
 client/translations/amneziavpn_ru.ts          |  8 +--
 .../protocolSettingsController.cpp            | 20 +++----
 .../ui/qml/Pages2/PageSettingsServerData.qml  |  2 +-
 .../Pages2/PageSettingsServerProtocols.qml    | 59 ++++++++++++-------
 .../qml/Pages2/PageSettingsServerServices.qml | 59 ++++++++++++-------
 .../qml/Pages2/PageSetupWizardProtocols.qml   | 26 ++++----
 6 files changed, 103 insertions(+), 71 deletions(-)

diff --git a/client/translations/amneziavpn_ru.ts b/client/translations/amneziavpn_ru.ts
index b1e7817f..89ca3dcd 100644
--- a/client/translations/amneziavpn_ru.ts
+++ b/client/translations/amneziavpn_ru.ts
@@ -3114,22 +3114,22 @@ AmneziaVPN detected this profile may contain malicious scripts. Please, carefull
 <context>
     <name>main</name>
     <message>
-        <location filename="../ui/qml/main.qml" line="267"/>
+        <location filename="../ui/qml/main.qml" line="271"/>
         <source>It&apos;s public key. Private key required</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/main.qml" line="308"/>
+        <location filename="../ui/qml/main.qml" line="312"/>
         <source>Ssh log</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/main.qml" line="318"/>
+        <location filename="../ui/qml/main.qml" line="322"/>
         <source>App log</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/main.qml" line="322"/>
+        <location filename="../ui/qml/main.qml" line="326"/>
         <source>Wrap words</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/client/ui/controllers/protocolSettingsController.cpp b/client/ui/controllers/protocolSettingsController.cpp
index 48414021..11b6a904 100644
--- a/client/ui/controllers/protocolSettingsController.cpp
+++ b/client/ui/controllers/protocolSettingsController.cpp
@@ -1,19 +1,15 @@
 #include "protocolSettingsController.h"
 
-ProtocolSettingsController::ProtocolSettingsController(
-    const QSharedPointer<ServersModel> &serversModel,
-    const QSharedPointer<ContainersModel> &containersModel,
-    const std::shared_ptr<Settings> &settings,
-    QObject *parent)
-    : QObject(parent)
-    , m_serversModel(serversModel)
-    , m_containersModel(containersModel)
-    , m_settings(settings)
-{}
+ProtocolSettingsController::ProtocolSettingsController(const QSharedPointer<ServersModel> &serversModel,
+                                                       const QSharedPointer<ContainersModel> &containersModel,
+                                                       const std::shared_ptr<Settings> &settings, QObject *parent)
+    : QObject(parent), m_serversModel(serversModel), m_containersModel(containersModel), m_settings(settings)
+{
+}
 
 QByteArray ProtocolSettingsController::getOpenVpnConfig()
 {
-    auto containerIndex = m_containersModel->index(
-        m_containersModel->getCurrentlyProcessedContainerIndex());
+    auto containerIndex = m_containersModel->index(m_containersModel->getCurrentlyProcessedContainerIndex());
     auto config = m_containersModel->data(containerIndex, ContainersModel::Roles::ConfigRole);
+    return QByteArray();
 }
diff --git a/client/ui/qml/Pages2/PageSettingsServerData.qml b/client/ui/qml/Pages2/PageSettingsServerData.qml
index 319399dc..5db3ae96 100644
--- a/client/ui/qml/Pages2/PageSettingsServerData.qml
+++ b/client/ui/qml/Pages2/PageSettingsServerData.qml
@@ -50,7 +50,7 @@ PageType {
             anchors.left: parent.left
             anchors.right: parent.right
 
-            property bool isServerWithWriteAccess: ServersModel.isCurrentlyProcessedServerHasWriteAccess() //todo make it property?
+            property bool isServerWithWriteAccess: ServersModel.isCurrentlyProcessedServerHasWriteAccess()
 
             LabelWithButtonType {
                 visible: content.isServerWithWriteAccess
diff --git a/client/ui/qml/Pages2/PageSettingsServerProtocols.qml b/client/ui/qml/Pages2/PageSettingsServerProtocols.qml
index 2b67afca..21401bf5 100644
--- a/client/ui/qml/Pages2/PageSettingsServerProtocols.qml
+++ b/client/ui/qml/Pages2/PageSettingsServerProtocols.qml
@@ -20,30 +20,45 @@ PageType {
 
     property var installedProtocolsCount
 
-    SettingsContainersListView {
-        id: settingsContainersListView
-        Connections {
-            target: ServersModel
+    FlickableType {
+        id: fl
+        anchors.top: parent.top
+        anchors.bottom: parent.bottom
+        contentHeight: content.implicitHeight
 
-            function onCurrentlyProcessedServerIndexChanged() {
-                settingsContainersListView.updateContainersModelFilters()
+        Column {
+            id: content
+
+            anchors.top: parent.top
+            anchors.left: parent.left
+            anchors.right: parent.right
+
+            SettingsContainersListView {
+                id: settingsContainersListView
+                Connections {
+                    target: ServersModel
+
+                    function onCurrentlyProcessedServerIndexChanged() {
+                        settingsContainersListView.updateContainersModelFilters()
+                    }
+                }
+
+                function updateContainersModelFilters() {
+                    if (ServersModel.isCurrentlyProcessedServerHasWriteAccess()) {
+                        proxyContainersModel.filters = ContainersModelFilters.getWriteAccessProtocolsListFilters()
+                    } else {
+                        proxyContainersModel.filters = ContainersModelFilters.getReadAccessProtocolsListFilters()
+                    }
+                    root.installedProtocolsCount = proxyContainersModel.count
+                }
+
+                model: SortFilterProxyModel {
+                    id: proxyContainersModel
+                    sourceModel: ContainersModel
+                }
+
+                Component.onCompleted: updateContainersModelFilters()
             }
         }
-
-        function updateContainersModelFilters() {
-            if (ServersModel.isCurrentlyProcessedServerHasWriteAccess()) {
-                proxyContainersModel.filters = ContainersModelFilters.getWriteAccessProtocolsListFilters()
-            } else {
-                proxyContainersModel.filters = ContainersModelFilters.getReadAccessProtocolsListFilters()
-            }
-            root.installedProtocolsCount = proxyContainersModel.count
-        }
-
-        model: SortFilterProxyModel {
-            id: proxyContainersModel
-            sourceModel: ContainersModel
-        }
-
-        Component.onCompleted: updateContainersModelFilters()
     }
 }
diff --git a/client/ui/qml/Pages2/PageSettingsServerServices.qml b/client/ui/qml/Pages2/PageSettingsServerServices.qml
index 282e7e9e..4f832651 100644
--- a/client/ui/qml/Pages2/PageSettingsServerServices.qml
+++ b/client/ui/qml/Pages2/PageSettingsServerServices.qml
@@ -20,30 +20,45 @@ PageType {
 
     property var installedServicesCount
 
-    SettingsContainersListView {
-        id: settingsContainersListView
-        Connections {
-            target: ServersModel
+    FlickableType {
+        id: fl
+        anchors.top: parent.top
+        anchors.bottom: parent.bottom
+        contentHeight: content.implicitHeight
 
-            function onCurrentlyProcessedServerIndexChanged() {
-                settingsContainersListView.updateContainersModelFilters()
+        Column {
+            id: content
+
+            anchors.top: parent.top
+            anchors.left: parent.left
+            anchors.right: parent.right
+
+            SettingsContainersListView {
+                id: settingsContainersListView
+                Connections {
+                    target: ServersModel
+
+                    function onCurrentlyProcessedServerIndexChanged() {
+                        settingsContainersListView.updateContainersModelFilters()
+                    }
+                }
+
+                function updateContainersModelFilters() {
+                    if (ServersModel.isCurrentlyProcessedServerHasWriteAccess()) {
+                        proxyContainersModel.filters = ContainersModelFilters.getWriteAccessServicesListFilters()
+                    } else {
+                        proxyContainersModel.filters = ContainersModelFilters.getReadAccessServicesListFilters()
+                    }
+                    root.installedServicesCount = proxyContainersModel.count
+                }
+
+                model: SortFilterProxyModel {
+                    id: proxyContainersModel
+                    sourceModel: ContainersModel
+                }
+
+                Component.onCompleted: updateContainersModelFilters()
             }
         }
-
-        function updateContainersModelFilters() {
-            if (ServersModel.isCurrentlyProcessedServerHasWriteAccess()) {
-                proxyContainersModel.filters = ContainersModelFilters.getWriteAccessServicesListFilters()
-            } else {
-                proxyContainersModel.filters = ContainersModelFilters.getReadAccessServicesListFilters()
-            }
-            root.installedServicesCount = proxyContainersModel.count
-        }
-
-        model: SortFilterProxyModel {
-            id: proxyContainersModel
-            sourceModel: ContainersModel
-        }
-
-        Component.onCompleted: updateContainersModelFilters()
     }
 }
diff --git a/client/ui/qml/Pages2/PageSetupWizardProtocols.qml b/client/ui/qml/Pages2/PageSetupWizardProtocols.qml
index edc443d4..f343fabf 100644
--- a/client/ui/qml/Pages2/PageSetupWizardProtocols.qml
+++ b/client/ui/qml/Pages2/PageSetupWizardProtocols.qml
@@ -26,15 +26,27 @@ PageType {
                 roleName: "isSupported"
                 value: true
             }
-
         ]
     }
 
+    ColumnLayout {
+        id: backButton
+
+        anchors.top: parent.top
+        anchors.left: parent.left
+        anchors.right: parent.right
+
+        anchors.topMargin: 20
+
+        BackButtonType {
+        }
+    }
+
     FlickableType {
         id: fl
-        anchors.top: parent.top
+        anchors.top: backButton.top
         anchors.bottom: parent.bottom
-        contentHeight: content.height
+        contentHeight: content.implicitHeight + content.anchors.topMargin + content.anchors.bottomMargin
 
         Column {
             id: content
@@ -42,13 +54,7 @@ PageType {
             anchors.top: parent.top
             anchors.left: parent.left
             anchors.right: parent.right
-            anchors.topMargin: 20
-
-            spacing: 16
-
-            BackButtonType {
-                width: parent.width
-            }
+            anchors.bottomMargin: 20
 
             Item {
                 width: parent.width

From 35660ff5e75eb7bc6d31e93a09b7a7cf0988d51d Mon Sep 17 00:00:00 2001
From: "vladimir.kuznetsov" <nethiuswork@gmail.com>
Date: Fri, 30 Jun 2023 18:14:47 +0300
Subject: [PATCH 039/278] speed optimization of ui on windows

---
 .../protocolSettingsController.cpp            |  1 +
 client/ui/models/servers_model.cpp            | 43 +++++++++++++------
 client/ui/models/servers_model.h              |  4 +-
 .../ui/qml/Controls2/VerticalRadioButton.qml  |  5 ---
 4 files changed, 33 insertions(+), 20 deletions(-)

diff --git a/client/ui/controllers/protocolSettingsController.cpp b/client/ui/controllers/protocolSettingsController.cpp
index 48414021..97d39d5d 100644
--- a/client/ui/controllers/protocolSettingsController.cpp
+++ b/client/ui/controllers/protocolSettingsController.cpp
@@ -16,4 +16,5 @@ QByteArray ProtocolSettingsController::getOpenVpnConfig()
     auto containerIndex = m_containersModel->index(
         m_containersModel->getCurrentlyProcessedContainerIndex());
     auto config = m_containersModel->data(containerIndex, ContainersModel::Roles::ConfigRole);
+    return QByteArray();
 }
diff --git a/client/ui/models/servers_model.cpp b/client/ui/models/servers_model.cpp
index b427f15b..866edca4 100644
--- a/client/ui/models/servers_model.cpp
+++ b/client/ui/models/servers_model.cpp
@@ -5,7 +5,7 @@ ServersModel::ServersModel(std::shared_ptr<Settings> settings, QObject *parent)
 {
     m_servers = m_settings->serversArray();
     m_defaultServerIndex = m_settings->defaultServerIndex();
-    m_currenlyProcessedServerIndex = m_defaultServerIndex;
+    m_currentlyProcessedServerIndex = m_defaultServerIndex;
 }
 
 int ServersModel::rowCount(const QModelIndex &parent) const
@@ -44,6 +44,8 @@ QVariant ServersModel::data(const QModelIndex &index, int role) const
         return QVariant();
     }
 
+    qDebug() << "d";
+
     const QJsonObject server = m_servers.at(index.row()).toObject();
 
     switch (role) {
@@ -55,12 +57,12 @@ QVariant ServersModel::data(const QModelIndex &index, int role) const
         return description;
     }
     case HostNameRole: return server.value(config_key::hostName).toString();
-    case CredentialsRole: return QVariant::fromValue(m_settings->serverCredentials(index.row()));
-    case CredentialsLoginRole: return m_settings->serverCredentials(index.row()).userName;
+    case CredentialsRole: return QVariant::fromValue(serverCredentials(index.row()));
+    case CredentialsLoginRole: return serverCredentials(index.row()).userName;
     case IsDefaultRole: return index.row() == m_defaultServerIndex;
-    case IsCurrentlyProcessedRole: return index.row() == m_currenlyProcessedServerIndex;
+    case IsCurrentlyProcessedRole: return index.row() == m_currentlyProcessedServerIndex;
     case HasWriteAccessRole: {
-        auto credentials = m_settings->serverCredentials(index.row());
+        auto credentials = serverCredentials(index.row());
         return (!credentials.userName.isEmpty() && !credentials.secretData.isEmpty());
     }
     case ContainsAmneziaDnsRole: {
@@ -97,28 +99,28 @@ const int ServersModel::getServersCount()
 
 void ServersModel::setCurrentlyProcessedServerIndex(const int index)
 {
-    m_currenlyProcessedServerIndex = index;
-    emit currentlyProcessedServerIndexChanged(m_currenlyProcessedServerIndex);
+    m_currentlyProcessedServerIndex = index;
+    emit currentlyProcessedServerIndexChanged(m_currentlyProcessedServerIndex);
 }
 
 int ServersModel::getCurrentlyProcessedServerIndex()
 {
-    return m_currenlyProcessedServerIndex;
+    return m_currentlyProcessedServerIndex;
 }
 
 bool ServersModel::isDefaultServerCurrentlyProcessed()
 {
-    return m_defaultServerIndex == m_currenlyProcessedServerIndex;
+    return m_defaultServerIndex == m_currentlyProcessedServerIndex;
 }
 
 bool ServersModel::isCurrentlyProcessedServerHasWriteAccess()
 {
-    return qvariant_cast<bool>(data(m_currenlyProcessedServerIndex, HasWriteAccessRole));
+    return qvariant_cast<bool>(data(m_currentlyProcessedServerIndex, HasWriteAccessRole));
 }
 
 bool ServersModel::isDefaultServerHasWriteAccess()
 {
-    return qvariant_cast<bool>(data(m_currenlyProcessedServerIndex, HasWriteAccessRole));
+    return qvariant_cast<bool>(data(m_currentlyProcessedServerIndex, HasWriteAccessRole));
 }
 
 void ServersModel::addServer(const QJsonObject &server)
@@ -132,12 +134,12 @@ void ServersModel::addServer(const QJsonObject &server)
 void ServersModel::removeServer()
 {
     beginResetModel();
-    m_settings->removeServer(m_currenlyProcessedServerIndex);
+    m_settings->removeServer(m_currentlyProcessedServerIndex);
     m_servers = m_settings->serversArray();
 
-    if (m_settings->defaultServerIndex() == m_currenlyProcessedServerIndex) {
+    if (m_settings->defaultServerIndex() == m_currentlyProcessedServerIndex) {
         setDefaultServerIndex(0);
-    } else if (m_settings->defaultServerIndex() > m_currenlyProcessedServerIndex) {
+    } else if (m_settings->defaultServerIndex() > m_currentlyProcessedServerIndex) {
         setDefaultServerIndex(m_settings->defaultServerIndex() - 1);
     }
 
@@ -167,3 +169,16 @@ QHash<int, QByteArray> ServersModel::roleNames() const
     roles[ContainsAmneziaDnsRole] = "containsAmneziaDns";
     return roles;
 }
+
+ServerCredentials ServersModel::serverCredentials(int index) const
+{
+    const QJsonObject &s = m_servers.at(index).toObject();
+
+    ServerCredentials credentials;
+    credentials.hostName = s.value(config_key::hostName).toString();
+    credentials.userName = s.value(config_key::userName).toString();
+    credentials.secretData = s.value(config_key::password).toString();
+    credentials.port = s.value(config_key::port).toInt();
+
+    return credentials;
+}
diff --git a/client/ui/models/servers_model.h b/client/ui/models/servers_model.h
index 0ec78e7e..f149d85b 100644
--- a/client/ui/models/servers_model.h
+++ b/client/ui/models/servers_model.h
@@ -58,12 +58,14 @@ signals:
     void defaultServerIndexChanged();
 
 private:
+    ServerCredentials serverCredentials(int index) const;
+
     QJsonArray m_servers;
 
     std::shared_ptr<Settings> m_settings;
 
     int m_defaultServerIndex;
-    int m_currenlyProcessedServerIndex;
+    int m_currentlyProcessedServerIndex;
 };
 
 #endif // SERVERSMODEL_H
diff --git a/client/ui/qml/Controls2/VerticalRadioButton.qml b/client/ui/qml/Controls2/VerticalRadioButton.qml
index 7f2411fb..c833ca27 100644
--- a/client/ui/qml/Controls2/VerticalRadioButton.qml
+++ b/client/ui/qml/Controls2/VerticalRadioButton.qml
@@ -18,11 +18,6 @@ RadioButton {
     property string textColor: "#D7D8DB"
     property string selectedTextColor: "#FBB26A"
 
-    property string pressedBorderColor: Qt.rgba(251/255, 178/255, 106/255, 0.3)
-    property string selectedBorderColor: "#FBB26A"
-    property string defaultBodredColor: "transparent"
-    property int borderWidth: 0
-
     property string imageSource
     property bool showImage
 

From 43261f8469ae9ab7327060de65ad983e41009e59 Mon Sep 17 00:00:00 2001
From: "vladimir.kuznetsov" <nethiuswork@gmail.com>
Date: Tue, 4 Jul 2023 09:58:19 +0900
Subject: [PATCH 040/278] added busy indicator component - replaced the image
 of the connect button with native rendering

---
 client/resources.qrc                          |   1 +
 client/translations/amneziavpn_ru.ts          |   6 +-
 client/ui/controllers/pageController.h        |   1 +
 client/ui/models/servers_model.cpp            |   2 -
 client/ui/qml/Components/ConnectButton.qml    | 117 +++++++++++++-----
 .../qml/Components/ShareConnectionDrawer.qml  |  19 +--
 client/ui/qml/Controls2/BusyIndicatorType.qml |  68 ++++++++++
 .../ui/qml/Pages2/PageSettingsServerData.qml  |   2 +
 client/ui/qml/Pages2/PageShare.qml            |  11 +-
 client/ui/qml/Pages2/PageStart.qml            |  12 ++
 10 files changed, 197 insertions(+), 42 deletions(-)
 create mode 100644 client/ui/qml/Controls2/BusyIndicatorType.qml

diff --git a/client/resources.qrc b/client/resources.qrc
index 357cb40c..b7bdd463 100644
--- a/client/resources.qrc
+++ b/client/resources.qrc
@@ -270,5 +270,6 @@
         <file>ui/qml/Controls2/TextTypes/SmallTextType.qml</file>
         <file>ui/qml/Filters/ContainersModelFilters.qml</file>
         <file>ui/qml/Components/SelectLanguageDrawer.qml</file>
+        <file>ui/qml/Controls2/BusyIndicatorType.qml</file>
     </qresource>
 </RCC>
diff --git a/client/translations/amneziavpn_ru.ts b/client/translations/amneziavpn_ru.ts
index 89ca3dcd..197c9d40 100644
--- a/client/translations/amneziavpn_ru.ts
+++ b/client/translations/amneziavpn_ru.ts
@@ -1275,17 +1275,17 @@ And if you don&apos;t like the app, all the more support it - the donation will
 <context>
     <name>PageSettingsApplication</name>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="43"/>
+        <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="44"/>
         <source>Application</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="50"/>
+        <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="51"/>
         <source>Language</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="66"/>
+        <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="67"/>
         <source>Reset settings and remove all data from the application</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/client/ui/controllers/pageController.h b/client/ui/controllers/pageController.h
index 384d3c8d..f67da275 100644
--- a/client/ui/controllers/pageController.h
+++ b/client/ui/controllers/pageController.h
@@ -63,6 +63,7 @@ signals:
     void replaceStartPage();
     void showErrorMessage(QString errorMessage);
     void showInfoMessage(QString message);
+    void showBusyIndicator(bool visible);
 
 private:
     QSharedPointer<ServersModel> m_serversModel;
diff --git a/client/ui/models/servers_model.cpp b/client/ui/models/servers_model.cpp
index 866edca4..1bacdd45 100644
--- a/client/ui/models/servers_model.cpp
+++ b/client/ui/models/servers_model.cpp
@@ -44,8 +44,6 @@ QVariant ServersModel::data(const QModelIndex &index, int role) const
         return QVariant();
     }
 
-    qDebug() << "d";
-
     const QJsonObject server = m_servers.at(index.row()).toObject();
 
     switch (role) {
diff --git a/client/ui/qml/Components/ConnectButton.qml b/client/ui/qml/Components/ConnectButton.qml
index 1f27973a..f8e29c47 100644
--- a/client/ui/qml/Components/ConnectButton.qml
+++ b/client/ui/qml/Components/ConnectButton.qml
@@ -1,12 +1,21 @@
 import QtQuick
 import QtQuick.Controls
 import QtQuick.Layouts
+import QtQuick.Shapes
+import Qt5Compat.GraphicalEffects
 
 import ConnectionState 1.0
 
 Button {
     id: root
 
+    property string defaultButtonColor: "#D7D8DB"
+    property string progressButtonColor: "#D7D8DB"
+    property string connectedButtonColor: "#FBB26A"
+
+    implicitWidth: 190
+    implicitHeight: 190
+
     Connections {
         target: ConnectionController
 
@@ -17,48 +26,98 @@ Button {
 
     text: ConnectionController.connectionStateText
 
-    enabled: !ConnectionController.isConnectionInProgress
+//    enabled: !ConnectionController.isConnectionInProgress
 
     background: Item {
-        clip: true
+        implicitWidth: parent.width
+        implicitHeight: parent.height
+        transformOrigin: Item.Center
 
-        implicitHeight: border.implicitHeight
-        implicitWidth: border.implicitWidth
+        Shape {
+            id: backgroundCircle
+            width: parent.implicitWidth
+            height: parent.implicitHeight
+            anchors.bottom: parent.bottom
+            anchors.right: parent.right
+            layer.enabled: true
+            layer.samples: 4
+            layer.effect: DropShadow {
+                anchors.fill: backgroundCircle
+                horizontalOffset: 0
+                verticalOffset: 0
+                radius: 10
+                samples: 25
+                color: "#FBB26A"
+                source: backgroundCircle
+            }
 
-        Image {
-            id: border
+            ShapePath {
+                fillColor: "transparent"
+                strokeColor: {
+                    if (ConnectionController.isConnectionInProgress) {
+                        return Qt.rgba(251/255, 178/255, 106/255, 1)
+                    } else if (ConnectionController.isConnected) {
+                        return connectedButtonColor
+                    } else {
+                        return defaultButtonColor
+                    }
+                }
+                strokeWidth: 3
+                capStyle: ShapePath.RoundCap
 
-            source: {
-                if (ConnectionController.isConnectionInProgress) {
-                    return "/images/connectionProgress.svg"
-                } else if (ConnectionController.isConnected) {
-                    return "/images/connectionOff.svg"
-                } else {
-                   return "/images/connectionOn.svg"
+                PathAngleArc {
+                    centerX: backgroundCircle.width / 2
+                    centerY: backgroundCircle.height / 2
+                    radiusX: 93
+                    radiusY: 93
+                    startAngle: 0
+                    sweepAngle: 360
+                }
+            }
+
+            MouseArea {
+                anchors.fill: parent
+
+                cursorShape: Qt.PointingHandCursor
+                enabled: false
+            }
+        }
+
+        Shape {
+            id: shape
+            width: parent.implicitWidth
+            height: parent.implicitHeight
+            anchors.bottom: parent.bottom
+            anchors.right: parent.right
+            layer.enabled: true
+            layer.samples: 4
+
+            visible: ConnectionController.isConnectionInProgress
+
+            ShapePath {
+                fillColor: "transparent"
+                strokeColor: "#D7D8DB"
+                strokeWidth: 3
+                capStyle: ShapePath.RoundCap
+
+                PathAngleArc {
+                    centerX: shape.width / 2
+                    centerY: shape.height / 2
+                    radiusX: 93
+                    radiusY: 93
+                    startAngle: 245
+                    sweepAngle: -180
                 }
             }
 
             RotationAnimator {
-                id: connectionProccess
-
-                target: border
+                target: shape
                 running: ConnectionController.isConnectionInProgress
                 from: 0
                 to: 360
                 loops: Animation.Infinite
-                duration: 1250
+                duration: 1000
             }
-
-            Behavior on source {
-                PropertyAnimation { duration: 200 }
-            }
-        }
-
-        MouseArea {
-            anchors.fill: parent
-
-            cursorShape: Qt.PointingHandCursor
-            enabled: false
         }
     }
 
@@ -69,7 +128,7 @@ Button {
         font.weight: 700
         font.pixelSize: 20
 
-        color: "#D7D8DB"
+        color: ConnectionController.isConnected ? connectedButtonColor : defaultButtonColor
         text: root.text
 
         horizontalAlignment: Text.AlignHCenter
diff --git a/client/ui/qml/Components/ShareConnectionDrawer.qml b/client/ui/qml/Components/ShareConnectionDrawer.qml
index 99e172cc..b677c5b1 100644
--- a/client/ui/qml/Components/ShareConnectionDrawer.qml
+++ b/client/ui/qml/Components/ShareConnectionDrawer.qml
@@ -17,6 +17,7 @@ DrawerType {
 
     property alias headerText: header.headerText
     property alias configContentHeaderText: configContentHeader.headerText
+    property alias contentVisible: content.visible
 
     width: parent.width
     height: parent.height * 0.9
@@ -24,8 +25,18 @@ DrawerType {
     Item {
         anchors.fill: parent
 
-        FlickableType {
+        Header2Type {
+            id: header
             anchors.top: parent.top
+            anchors.left: parent.left
+            anchors.right: parent.right
+            anchors.topMargin: 20
+            anchors.leftMargin: 16
+            anchors.rightMargin: 16
+        }
+
+        FlickableType {
+            anchors.top: header.bottom
             anchors.bottom: parent.bottom
             contentHeight: content.height + 32
 
@@ -36,15 +47,9 @@ DrawerType {
                 anchors.left: parent.left
                 anchors.right: parent.right
 
-                anchors.topMargin: 20
                 anchors.leftMargin: 16
                 anchors.rightMargin: 16
 
-                Header2Type {
-                    id: header
-                    Layout.fillWidth: true
-                }
-
                 BasicButtonType {
                     Layout.fillWidth: true
                     Layout.topMargin: 16
diff --git a/client/ui/qml/Controls2/BusyIndicatorType.qml b/client/ui/qml/Controls2/BusyIndicatorType.qml
new file mode 100644
index 00000000..7e92998c
--- /dev/null
+++ b/client/ui/qml/Controls2/BusyIndicatorType.qml
@@ -0,0 +1,68 @@
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Shapes
+
+Popup {
+    id: root
+    anchors.centerIn: parent
+
+    modal: true
+    closePolicy: Popup.NoAutoClose
+
+    visible: false
+
+    Overlay.modal: Rectangle {
+        color: Qt.rgba(14/255, 14/255, 17/255, 0.8)
+    }
+
+    background: Rectangle {
+        color: "transparent"
+    }
+
+    BusyIndicator {
+        id: busyIndicator
+
+        visible: true
+        running: true
+
+        contentItem: Item {
+            implicitWidth: 46
+            implicitHeight: 46
+            transformOrigin: Item.Center
+
+            Shape {
+                id: shape
+                width: parent.implicitWidth
+                height: parent.implicitHeight
+                anchors.bottom: parent.bottom
+                anchors.right: parent.right
+                layer.enabled: true
+                layer.samples: 4
+
+                ShapePath {
+                    fillColor: "transparent"
+                    strokeColor: "#787878"
+                    strokeWidth: 3
+                    capStyle: ShapePath.RoundCap
+
+                    PathAngleArc {
+                        centerX: shape.width / 2
+                        centerY: shape.height / 2
+                        radiusX: 18
+                        radiusY: 18
+                        startAngle: 225
+                        sweepAngle: -90
+                    }
+                }
+                RotationAnimator {
+                    target: shape
+                    running: busyIndicator.visible && busyIndicator.running
+                    from: 0
+                    to: 360
+                    loops: Animation.Infinite
+                    duration: 1250
+                }
+            }
+        }
+    }
+}
diff --git a/client/ui/qml/Pages2/PageSettingsServerData.qml b/client/ui/qml/Pages2/PageSettingsServerData.qml
index 5db3ae96..c5af47e0 100644
--- a/client/ui/qml/Pages2/PageSettingsServerData.qml
+++ b/client/ui/qml/Pages2/PageSettingsServerData.qml
@@ -88,7 +88,9 @@ PageType {
                 descriptionText: qsTr("Добавим их в приложение, если они не отображались")
 
                 clickedFunction: function() {
+                    PageController.showBusyIndicator(true)
                     InstallController.scanServerForInstalledContainers()
+                    PageController.showBusyIndicator(false)
                 }
             }
 
diff --git a/client/ui/qml/Pages2/PageShare.qml b/client/ui/qml/Pages2/PageShare.qml
index 7f567b8d..decd461a 100644
--- a/client/ui/qml/Pages2/PageShare.qml
+++ b/client/ui/qml/Pages2/PageShare.qml
@@ -20,11 +20,21 @@ PageType {
         target: ExportController
 
         function onGenerateConfig(isFullAccess) {
+            shareConnectionDrawer.open()
+            shareConnectionDrawer.contentVisible = false
+            PageController.showBusyIndicator(true)
             if (isFullAccess) {
                 ExportController.generateFullAccessConfig()
             } else {
                 ExportController.generateConnectionConfig()
             }
+            PageController.showBusyIndicator(false)
+            shareConnectionDrawer.contentVisible = true
+        }
+
+        function onExportErrorOccurred(errorMessage) {
+            shareConnectionDrawer.close()
+            PageController.showErrorMessage(errorMessage)
         }
     }
 
@@ -328,7 +338,6 @@ PageType {
                     } else {
                         ExportController.generateConfig(true)
                     }
-                    shareConnectionDrawer.visible = true
                 }
             }
         }
diff --git a/client/ui/qml/Pages2/PageStart.qml b/client/ui/qml/Pages2/PageStart.qml
index 76450b16..09bebaa1 100644
--- a/client/ui/qml/Pages2/PageStart.qml
+++ b/client/ui/qml/Pages2/PageStart.qml
@@ -29,6 +29,12 @@ PageType {
             popupErrorMessage.popupErrorMessageText = errorMessage
             popupErrorMessage.open()
         }
+
+        function onShowBusyIndicator(visible) {
+            busyIndicator.visible = visible
+            tabBarStackView.enabled = !visible
+            tabBar.enabled = !visible
+        }
     }
 
     StackViewType {
@@ -130,4 +136,10 @@ PageType {
             id: popupErrorMessage
         }
     }
+
+    BusyIndicatorType {
+        id: busyIndicator
+        anchors.centerIn: parent
+        z: 1
+    }
 }

From a97417fd38cfaea7cbcafdc30ccb9b85d6eff6a1 Mon Sep 17 00:00:00 2001
From: "vladimir.kuznetsov" <nethiuswork@gmail.com>
Date: Wed, 5 Jul 2023 10:15:38 +0900
Subject: [PATCH 041/278] added config export in native format openvpn and
 wireguard

---
 client/ui/controllers/exportController.cpp    | 101 ++++++++++++++++--
 client/ui/controllers/exportController.h      |  16 +--
 client/ui/qml/Components/ConnectButton.qml    |   2 +-
 .../qml/Components/ShareConnectionDrawer.qml  |  19 ++--
 client/ui/qml/Pages2/PageShare.qml            |  38 ++++---
 5 files changed, 137 insertions(+), 39 deletions(-)

diff --git a/client/ui/controllers/exportController.cpp b/client/ui/controllers/exportController.cpp
index 04264624..5cd9a83d 100644
--- a/client/ui/controllers/exportController.cpp
+++ b/client/ui/controllers/exportController.cpp
@@ -9,6 +9,8 @@
 #include <QImage>
 #include <QStandardPaths>
 
+#include "configurators/openvpn_configurator.h"
+#include "configurators/wireguard_configurator.h"
 #include "qrcodegen.hpp"
 
 #include "core/errorstrings.h"
@@ -27,14 +29,17 @@ ExportController::ExportController(const QSharedPointer<ServersModel> &serversMo
 
 void ExportController::generateFullAccessConfig()
 {
+    clearPreviousConfig();
+
     int serverIndex = m_serversModel->getCurrentlyProcessedServerIndex();
     QJsonObject config = m_settings->server(serverIndex);
 
     QByteArray compressedConfig = QJsonDocument(config).toJson();
     compressedConfig = qCompress(compressedConfig, 8);
-    m_amneziaCode = QString("vpn://%1")
-                            .arg(QString(compressedConfig.toBase64(QByteArray::Base64UrlEncoding
-                                                                   | QByteArray::OmitTrailingEquals)));
+    m_rawConfig = QString("vpn://%1")
+                          .arg(QString(compressedConfig.toBase64(QByteArray::Base64UrlEncoding
+                                                                 | QByteArray::OmitTrailingEquals)));
+    m_formattedConfig = m_rawConfig;
 
     m_qrCodes = generateQrCodeImageSeries(compressedConfig);
     emit exportConfigChanged();
@@ -42,6 +47,8 @@ void ExportController::generateFullAccessConfig()
 
 void ExportController::generateConnectionConfig()
 {
+    clearPreviousConfig();
+
     int serverIndex = m_serversModel->getCurrentlyProcessedServerIndex();
     ServerCredentials credentials =
             qvariant_cast<ServerCredentials>(m_serversModel->data(serverIndex, ServersModel::Roles::CredentialsRole));
@@ -81,17 +88,86 @@ void ExportController::generateConnectionConfig()
 
     QByteArray compressedConfig = QJsonDocument(config).toJson();
     compressedConfig = qCompress(compressedConfig, 8);
-    m_amneziaCode = QString("vpn://%1")
-                            .arg(QString(compressedConfig.toBase64(QByteArray::Base64UrlEncoding
-                                                                   | QByteArray::OmitTrailingEquals)));
+    m_rawConfig = QString("vpn://%1")
+                          .arg(QString(compressedConfig.toBase64(QByteArray::Base64UrlEncoding
+                                                                 | QByteArray::OmitTrailingEquals)));
+    m_formattedConfig = m_rawConfig;
 
     m_qrCodes = generateQrCodeImageSeries(compressedConfig);
     emit exportConfigChanged();
 }
 
-QString ExportController::getAmneziaCode()
+void ExportController::generateOpenVpnConfig()
 {
-    return m_amneziaCode;
+    clearPreviousConfig();
+
+    int serverIndex = m_serversModel->getCurrentlyProcessedServerIndex();
+    ServerCredentials credentials =
+            qvariant_cast<ServerCredentials>(m_serversModel->data(serverIndex, ServersModel::Roles::CredentialsRole));
+
+    DockerContainer container = static_cast<DockerContainer>(m_containersModel->getCurrentlyProcessedContainerIndex());
+    QModelIndex containerModelIndex = m_containersModel->index(container);
+    QJsonObject containerConfig =
+            qvariant_cast<QJsonObject>(m_containersModel->data(containerModelIndex, ContainersModel::Roles::ConfigRole));
+    containerConfig.insert(config_key::container, ContainerProps::containerToString(container));
+
+    ErrorCode errorCode = ErrorCode::NoError;
+    QString config =
+            m_configurator->openVpnConfigurator->genOpenVpnConfig(credentials, container, containerConfig, &errorCode);
+    if (errorCode) {
+        emit exportErrorOccurred(errorString(errorCode));
+        return;
+    }
+    config = m_configurator->processConfigWithExportSettings(serverIndex, container, Proto::OpenVpn, config);
+
+    m_rawConfig = config;
+
+    auto configJson = QJsonDocument::fromJson(config.toUtf8()).object();
+    QStringList lines = configJson.value(config_key::config).toString().replace("\r", "").split("\n");
+    for (const QString &line : lines) {
+        m_formattedConfig.append(line + "\n");
+    }
+
+    emit exportConfigChanged();
+}
+
+void ExportController::generateWireGuardConfig()
+{
+    clearPreviousConfig();
+
+    int serverIndex = m_serversModel->getCurrentlyProcessedServerIndex();
+    ServerCredentials credentials =
+            qvariant_cast<ServerCredentials>(m_serversModel->data(serverIndex, ServersModel::Roles::CredentialsRole));
+
+    DockerContainer container = static_cast<DockerContainer>(m_containersModel->getCurrentlyProcessedContainerIndex());
+    QModelIndex containerModelIndex = m_containersModel->index(container);
+    QJsonObject containerConfig =
+            qvariant_cast<QJsonObject>(m_containersModel->data(containerModelIndex, ContainersModel::Roles::ConfigRole));
+    containerConfig.insert(config_key::container, ContainerProps::containerToString(container));
+
+    ErrorCode errorCode = ErrorCode::NoError;
+    QString config = m_configurator->wireguardConfigurator->genWireguardConfig(credentials, container, containerConfig,
+                                                                               &errorCode);
+    if (errorCode) {
+        emit exportErrorOccurred(errorString(errorCode));
+        return;
+    }
+    config = m_configurator->processConfigWithExportSettings(serverIndex, container, Proto::WireGuard, config);
+
+    m_rawConfig = config;
+
+    auto configJson = QJsonDocument::fromJson(config.toUtf8()).object();
+    QStringList lines = configJson.value(config_key::config).toString().replace("\r", "").split("\n");
+    for (const QString &line : lines) {
+        m_formattedConfig.append(line + "\n");
+    }
+
+    emit exportConfigChanged();
+}
+
+QString ExportController::getFormattedConfig()
+{
+    return m_formattedConfig;
 }
 
 QList<QString> ExportController::getQrCodes()
@@ -117,7 +193,7 @@ void ExportController::saveFile()
     QFile save(fileName.toLocalFile());
 
     save.open(QIODevice::WriteOnly);
-    save.write(m_amneziaCode.toUtf8());
+    save.write(m_rawConfig.toUtf8());
     save.close();
 
     QFileInfo fi(fileName.toLocalFile());
@@ -154,3 +230,10 @@ int ExportController::getQrCodesCount()
 {
     return m_qrCodes.size();
 }
+
+void ExportController::clearPreviousConfig()
+{
+    m_rawConfig.clear();
+    m_formattedConfig.clear();
+    m_qrCodes.clear();
+}
diff --git a/client/ui/controllers/exportController.h b/client/ui/controllers/exportController.h
index 63997efd..85144978 100644
--- a/client/ui/controllers/exportController.h
+++ b/client/ui/controllers/exportController.h
@@ -14,24 +14,25 @@ public:
     explicit ExportController(const QSharedPointer<ServersModel> &serversModel,
                               const QSharedPointer<ContainersModel> &containersModel,
                               const std::shared_ptr<Settings> &settings,
-                              const std::shared_ptr<VpnConfigurator> &configurator,
-                              QObject *parent = nullptr);
+                              const std::shared_ptr<VpnConfigurator> &configurator, QObject *parent = nullptr);
 
     Q_PROPERTY(QList<QString> qrCodes READ getQrCodes NOTIFY exportConfigChanged)
     Q_PROPERTY(int qrCodesCount READ getQrCodesCount NOTIFY exportConfigChanged)
-    Q_PROPERTY(QString amneziaCode READ getAmneziaCode NOTIFY exportConfigChanged)
+    Q_PROPERTY(QString formattedConfig READ getFormattedConfig NOTIFY exportConfigChanged)
 
 public slots:
     void generateFullAccessConfig();
     void generateConnectionConfig();
+    void generateOpenVpnConfig();
+    void generateWireGuardConfig();
 
-    QString getAmneziaCode();
+    QString getFormattedConfig();
     QList<QString> getQrCodes();
 
     void saveFile();
 
 signals:
-    void generateConfig(bool isFullAccess);
+    void generateConfig(int type);
     void exportErrorOccurred(QString errorMessage);
 
     void exportConfigChanged();
@@ -42,12 +43,15 @@ private:
 
     int getQrCodesCount();
 
+    void clearPreviousConfig();
+
     QSharedPointer<ServersModel> m_serversModel;
     QSharedPointer<ContainersModel> m_containersModel;
     std::shared_ptr<Settings> m_settings;
     std::shared_ptr<VpnConfigurator> m_configurator;
 
-    QString m_amneziaCode;
+    QString m_rawConfig;
+    QString m_formattedConfig;
     QList<QString> m_qrCodes;
 };
 
diff --git a/client/ui/qml/Components/ConnectButton.qml b/client/ui/qml/Components/ConnectButton.qml
index f8e29c47..85cc345a 100644
--- a/client/ui/qml/Components/ConnectButton.qml
+++ b/client/ui/qml/Components/ConnectButton.qml
@@ -55,7 +55,7 @@ Button {
                 fillColor: "transparent"
                 strokeColor: {
                     if (ConnectionController.isConnectionInProgress) {
-                        return Qt.rgba(251/255, 178/255, 106/255, 1)
+                        return "#261E1A"
                     } else if (ConnectionController.isConnected) {
                         return connectedButtonColor
                     } else {
diff --git a/client/ui/qml/Components/ShareConnectionDrawer.qml b/client/ui/qml/Components/ShareConnectionDrawer.qml
index b677c5b1..d5ed1029 100644
--- a/client/ui/qml/Components/ShareConnectionDrawer.qml
+++ b/client/ui/qml/Components/ShareConnectionDrawer.qml
@@ -137,7 +137,7 @@ DrawerType {
                                 Layout.topMargin: 16
                             }
 
-                            TextField {
+                            TextArea {
                                 Layout.fillWidth: true
                                 Layout.topMargin: 16
                                 Layout.bottomMargin: 16
@@ -147,16 +147,17 @@ DrawerType {
                                 height: 24
 
                                 color: "#D7D8DB"
+                                selectionColor:  "#412102"
+                                selectedTextColor: "#D7D8DB"
 
                                 font.pixelSize: 16
                                 font.weight: Font.Medium
                                 font.family: "PT Root UI VF"
 
-                                text: ExportController.amneziaCode
+                                text: ExportController.formattedConfig
 
                                 wrapMode: Text.Wrap
 
-                                readOnly: true
                                 background: Rectangle {
                                     color: "transparent"
                                 }
@@ -186,11 +187,13 @@ DrawerType {
                             running: ExportController.qrCodesCount > 0
                             repeat: true
                             onTriggered: {
-                                index++
-                                if (index >= ExportController.qrCodesCount) {
-                                    index = 0
+                                if (ExportController.qrCodesCount > 0) {
+                                    index++
+                                    if (index >= ExportController.qrCodesCount) {
+                                        index = 0
+                                    }
+                                    parent.source = ExportController.qrCodes[index]
                                 }
-                                parent.source = ExportController.qrCodes[index]
                             }
                         }
 
@@ -205,6 +208,8 @@ DrawerType {
                     Layout.topMargin: 24
                     Layout.bottomMargin: 32
 
+                    visible: ExportController.qrCodesCount > 0
+
                     horizontalAlignment: Text.AlignHCenter
                     text: qsTr("To read the QR code in the Amnezia app, select \"Add Server\" → \"I have connection details\"")
                 }
diff --git a/client/ui/qml/Pages2/PageShare.qml b/client/ui/qml/Pages2/PageShare.qml
index decd461a..c83b59d5 100644
--- a/client/ui/qml/Pages2/PageShare.qml
+++ b/client/ui/qml/Pages2/PageShare.qml
@@ -16,18 +16,30 @@ import "../Components"
 PageType {
     id: root
 
+    enum ConfigType {
+        AmneziaConnection,
+        AmenziaFullAccess,
+        OpenVpn,
+        WireGuard
+    }
+
     Connections {
         target: ExportController
 
-        function onGenerateConfig(isFullAccess) {
+        function onGenerateConfig(type) {
             shareConnectionDrawer.open()
             shareConnectionDrawer.contentVisible = false
             PageController.showBusyIndicator(true)
-            if (isFullAccess) {
-                ExportController.generateFullAccessConfig()
-            } else {
-                ExportController.generateConnectionConfig()
+
+            console.log(type)
+
+            switch (type) {
+            case PageShare.ConfigType.AmneziaConnection: ExportController.generateConnectionConfig(); break;
+            case PageShare.ConfigType.AmenziaFullAccess: ExportController.generateFullAccessConfig(); break;
+            case PageShare.ConfigType.OpenVpn: ExportController.generateOpenVpnConfig(); break;
+            case PageShare.ConfigType.WireGuard: ExportController.generateWireGuardConfig(); break;
             }
+
             PageController.showBusyIndicator(false)
             shareConnectionDrawer.contentVisible = true
         }
@@ -46,23 +58,17 @@ PageType {
     QtObject {
         id: amneziaConnectionFormat
         property string name: qsTr("For the AmnesiaVPN app")
-        property var func: function() {
-            ExportController.generateConfig(false)
-        }
+        property var type: PageShare.ConfigType.AmneziaConnection
     }
     QtObject {
         id: openVpnConnectionFormat
         property string name: qsTr("OpenVpn native format")
-        property var func: function() {
-            console.log("Item 3 clicked")
-        }
+        property var type: PageShare.ConfigType.OpenVpn
     }
     QtObject {
         id: wireGuardConnectionFormat
         property string name: qsTr("WireGuard native format")
-        property var func: function() {
-            console.log("Item 3 clicked")
-        }
+        property var type: PageShare.ConfigType.WireGuard
     }
 
     FlickableType {
@@ -334,9 +340,9 @@ PageType {
 
                 onClicked: {
                     if (accessTypeSelector.currentIndex === 0) {
-                        root.connectionTypesModel[accessTypeSelector.currentIndex].func()
+                        ExportController.generateConfig(root.connectionTypesModel[exportTypeSelector.currentIndex].type)
                     } else {
-                        ExportController.generateConfig(true)
+                        ExportController.generateConfig(PageShare.ConfigType.AmneziaFullAccess)
                     }
                 }
             }

From c13b9754eb2fb90f0e00547004d03bb3f7d2fee7 Mon Sep 17 00:00:00 2001
From: "vladimir.kuznetsov" <nethiuswork@gmail.com>
Date: Thu, 13 Jul 2023 11:29:26 +0900
Subject: [PATCH 042/278] added protocol settings pages and models for openvpn,
 cloak and shadowsocks

---
 client/CMakeLists.txt                         |   4 +-
 client/amnezia_application.cpp                |  86 ++--
 client/amnezia_application.h                  |  20 +
 client/protocols/protocols_defs.h             | 406 ++++++++-------
 client/resources.qrc                          |   4 +-
 client/ui/controllers/installController.cpp   |  27 +-
 client/ui/controllers/installController.h     |   4 +
 client/ui/controllers/pageController.h        |   8 +-
 client/ui/models/containers_model.cpp         |  38 +-
 client/ui/models/containers_model.h           |   4 +
 client/ui/models/languageModel.cpp            |  10 +-
 .../ui/models/protocols/cloakConfigModel.cpp  |  81 +++
 client/ui/models/protocols/cloakConfigModel.h |  40 ++
 .../ui/models/protocols/ikev2ConfigModel.cpp  |  76 +++
 client/ui/models/protocols/ikev2ConfigModel.h |  39 ++
 .../models/protocols/openvpnConfigModel.cpp   | 152 ++++++
 .../ui/models/protocols/openvpnConfigModel.h  |  52 ++
 .../protocols/shadowsocksConfigModel.cpp      |  76 +++
 .../models/protocols/shadowsocksConfigModel.h |  39 ++
 .../models/protocols/wireguardConfigModel.cpp |  70 +++
 .../models/protocols/wireguardConfigModel.h   |  39 ++
 client/ui/models/protocols_model.cpp          |  75 +--
 client/ui/models/protocols_model.h            |  30 +-
 client/ui/models/servers_model.cpp            |   1 +
 .../ui/pages_logic/GeneralSettingsLogic.cpp   |  14 +-
 .../ui/pages_logic/ServerContainersLogic.cpp  |  62 +--
 .../Components/Protocols/OpenVpnSettings.qml  | 147 ------
 .../Components/SettingsContainersListView.qml |  29 +-
 .../qml/Components/ShareConnectionDrawer.qml  |   8 +-
 .../qml/Components/TransportProtoSelector.qml |   4 +
 client/ui/qml/Controls2/CheckBoxType.qml      |  46 +-
 client/ui/qml/Controls2/DropDownType.qml      |  33 +-
 .../qml/Controls2/HorizontalRadioButton.qml   |  25 +-
 .../qml/Controls2/TextFieldWithHeaderType.qml |  30 +-
 client/ui/qml/Pages2/PageHome.qml             |   1 -
 .../qml/Pages2/PageProtocolCloakSettings.qml  | 176 +++++++
 .../Pages2/PageProtocolOpenVpnSettings.qml    | 465 ++++++++++++++++++
 .../PageProtocolShadowSocksSettings.qml       | 162 ++++++
 .../qml/Pages2/PageSettingsServerProtocol.qml |  93 +++-
 .../qml/Pages2/PageSetupWizardInstalling.qml  |   4 -
 .../qml/Pages2/PageSetupWizardProtocols.qml   |   2 +-
 client/ui/qml/Pages2/PageShare.qml            |  24 +-
 42 files changed, 2130 insertions(+), 576 deletions(-)
 create mode 100644 client/ui/models/protocols/cloakConfigModel.cpp
 create mode 100644 client/ui/models/protocols/cloakConfigModel.h
 create mode 100644 client/ui/models/protocols/ikev2ConfigModel.cpp
 create mode 100644 client/ui/models/protocols/ikev2ConfigModel.h
 create mode 100644 client/ui/models/protocols/openvpnConfigModel.cpp
 create mode 100644 client/ui/models/protocols/openvpnConfigModel.h
 create mode 100644 client/ui/models/protocols/shadowsocksConfigModel.cpp
 create mode 100644 client/ui/models/protocols/shadowsocksConfigModel.h
 create mode 100644 client/ui/models/protocols/wireguardConfigModel.cpp
 create mode 100644 client/ui/models/protocols/wireguardConfigModel.h
 delete mode 100644 client/ui/qml/Components/Protocols/OpenVpnSettings.qml
 create mode 100644 client/ui/qml/Pages2/PageProtocolCloakSettings.qml
 create mode 100644 client/ui/qml/Pages2/PageProtocolOpenVpnSettings.qml
 create mode 100644 client/ui/qml/Pages2/PageProtocolShadowSocksSettings.qml

diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt
index ad9a4cf4..be1c3b92 100644
--- a/client/CMakeLists.txt
+++ b/client/CMakeLists.txt
@@ -129,8 +129,8 @@ file(GLOB_RECURSE PAGE_LOGIC_CPP CONFIGURE_DEPENDS ${CMAKE_CURRENT_LIST_DIR}/ui/
 file(GLOB CONFIGURATORS_H CONFIGURE_DEPENDS ${CMAKE_CURRENT_LIST_DIR}/configurators/*.h)
 file(GLOB CONFIGURATORS_CPP CONFIGURE_DEPENDS ${CMAKE_CURRENT_LIST_DIR}/configurators/*.cpp)
 
-file(GLOB UI_MODELS_H CONFIGURE_DEPENDS ${CMAKE_CURRENT_LIST_DIR}/ui/models/*.h)
-file(GLOB UI_MODELS_CPP CONFIGURE_DEPENDS ${CMAKE_CURRENT_LIST_DIR}/ui/models/*.cpp)
+file(GLOB UI_MODELS_H CONFIGURE_DEPENDS ${CMAKE_CURRENT_LIST_DIR}/ui/models/*.h ${CMAKE_CURRENT_LIST_DIR}/ui/models/protocols/*.h)
+file(GLOB UI_MODELS_CPP CONFIGURE_DEPENDS ${CMAKE_CURRENT_LIST_DIR}/ui/models/*.cpp ${CMAKE_CURRENT_LIST_DIR}/ui/models/protocols/*.cpp)
 
 file(GLOB UI_CONTROLLERS_H CONFIGURE_DEPENDS ${CMAKE_CURRENT_LIST_DIR}/ui/controllers/*.h)
 file(GLOB UI_CONTROLLERS_CPP CONFIGURE_DEPENDS ${CMAKE_CURRENT_LIST_DIR}/ui/controllers/*.cpp)
diff --git a/client/amnezia_application.cpp b/client/amnezia_application.cpp
index 7c3b466b..436dfc3f 100644
--- a/client/amnezia_application.cpp
+++ b/client/amnezia_application.cpp
@@ -79,38 +79,12 @@ void AmneziaApplication::init()
     m_engine->rootContext()->setContextProperty("Debug", &Logger::Instance());
 
     //
-    m_containersModel.reset(new ContainersModel(m_settings, this));
-    m_engine->rootContext()->setContextProperty("ContainersModel", m_containersModel.get());
-
-    m_serversModel.reset(new ServersModel(m_settings, this));
-    m_engine->rootContext()->setContextProperty("ServersModel", m_serversModel.get());
-    connect(m_serversModel.get(), &ServersModel::currentlyProcessedServerIndexChanged, m_containersModel.get(),
-            &ContainersModel::setCurrentlyProcessedServerIndex);
-
-    m_languageModel.reset(new LanguageModel(m_settings, this));
-    m_engine->rootContext()->setContextProperty("LanguageModel", m_languageModel.get());
-    connect(m_languageModel.get(), &LanguageModel::updateTranslations, this, &AmneziaApplication::updateTranslator);
 
     m_configurator = std::shared_ptr<VpnConfigurator>(new VpnConfigurator(m_settings, this));
     m_vpnConnection.reset(new VpnConnection(m_settings, m_configurator));
 
-    m_connectionController.reset(new ConnectionController(m_serversModel, m_containersModel, m_vpnConnection));
-    m_engine->rootContext()->setContextProperty("ConnectionController", m_connectionController.get());
-
-    m_pageController.reset(new PageController(m_serversModel));
-    m_engine->rootContext()->setContextProperty("PageController", m_pageController.get());
-
-    m_installController.reset(new InstallController(m_serversModel, m_containersModel, m_settings));
-    m_engine->rootContext()->setContextProperty("InstallController", m_installController.get());
-
-    m_importController.reset(new ImportController(m_serversModel, m_containersModel, m_settings));
-    m_engine->rootContext()->setContextProperty("ImportController", m_importController.get());
-
-    m_exportController.reset(new ExportController(m_serversModel, m_containersModel, m_settings, m_configurator));
-    m_engine->rootContext()->setContextProperty("ExportController", m_exportController.get());
-
-    m_settingsController.reset(new SettingsController(m_serversModel, m_containersModel, m_settings));
-    m_engine->rootContext()->setContextProperty("SettingsController", m_settingsController.get());
+    initModels();
+    initControllers();
 
     //
 
@@ -244,3 +218,59 @@ QQmlApplicationEngine *AmneziaApplication::qmlEngine() const
 {
     return m_engine;
 }
+
+void AmneziaApplication::initModels()
+{
+    m_containersModel.reset(new ContainersModel(m_settings, this));
+    m_engine->rootContext()->setContextProperty("ContainersModel", m_containersModel.get());
+
+    m_serversModel.reset(new ServersModel(m_settings, this));
+    m_engine->rootContext()->setContextProperty("ServersModel", m_serversModel.get());
+    connect(m_serversModel.get(), &ServersModel::currentlyProcessedServerIndexChanged, m_containersModel.get(),
+            &ContainersModel::setCurrentlyProcessedServerIndex);
+
+    m_languageModel.reset(new LanguageModel(m_settings, this));
+    m_engine->rootContext()->setContextProperty("LanguageModel", m_languageModel.get());
+    connect(m_languageModel.get(), &LanguageModel::updateTranslations, this, &AmneziaApplication::updateTranslator);
+
+    m_protocolsModel.reset(new ProtocolsModel(m_settings, this));
+    m_engine->rootContext()->setContextProperty("ProtocolsModel", m_protocolsModel.get());
+
+    m_openVpnConfigModel.reset(new OpenVpnConfigModel(this));
+    m_engine->rootContext()->setContextProperty("OpenVpnConfigModel", m_openVpnConfigModel.get());
+
+    m_shadowSocksConfigModel.reset(new ShadowSocksConfigModel(this));
+    m_engine->rootContext()->setContextProperty("ShadowSocksConfigModel", m_shadowSocksConfigModel.get());
+
+    m_cloakConfigModel.reset(new CloakConfigModel(this));
+    m_engine->rootContext()->setContextProperty("CloakConfigModel", m_cloakConfigModel.get());
+
+    m_wireguardConfigModel.reset(new WireGuardConfigModel(this));
+    m_engine->rootContext()->setContextProperty("WireGuardConfigModel", m_wireguardConfigModel.get());
+
+#ifdef Q_OS_WINDOWS
+    m_ikev2ConfigModel.reset(new Ikev2ConfigModel(this));
+    m_engine->rootContext()->setContextProperty("Ikev2ConfigModel", m_ikev2ConfigModel.get());
+#endif
+}
+
+void AmneziaApplication::initControllers()
+{
+    m_connectionController.reset(new ConnectionController(m_serversModel, m_containersModel, m_vpnConnection));
+    m_engine->rootContext()->setContextProperty("ConnectionController", m_connectionController.get());
+
+    m_pageController.reset(new PageController(m_serversModel));
+    m_engine->rootContext()->setContextProperty("PageController", m_pageController.get());
+
+    m_installController.reset(new InstallController(m_serversModel, m_containersModel, m_settings));
+    m_engine->rootContext()->setContextProperty("InstallController", m_installController.get());
+
+    m_importController.reset(new ImportController(m_serversModel, m_containersModel, m_settings));
+    m_engine->rootContext()->setContextProperty("ImportController", m_importController.get());
+
+    m_exportController.reset(new ExportController(m_serversModel, m_containersModel, m_settings, m_configurator));
+    m_engine->rootContext()->setContextProperty("ExportController", m_exportController.get());
+
+    m_settingsController.reset(new SettingsController(m_serversModel, m_containersModel, m_settings));
+    m_engine->rootContext()->setContextProperty("SettingsController", m_settingsController.get());
+}
diff --git a/client/amnezia_application.h b/client/amnezia_application.h
index 4e9cc348..fabc7818 100644
--- a/client/amnezia_application.h
+++ b/client/amnezia_application.h
@@ -21,6 +21,14 @@
 #include "ui/controllers/settingsController.h"
 #include "ui/models/containers_model.h"
 #include "ui/models/languageModel.h"
+#include "ui/models/protocols/cloakConfigModel.h"
+#ifdef Q_OS_WINDOWS
+    #include "ui/models/protocols/ikev2ConfigModel.h"
+#endif
+#include "ui/models/protocols/openvpnConfigModel.h"
+#include "ui/models/protocols/shadowsocksConfigModel.h"
+#include "ui/models/protocols/wireguardConfigModel.h"
+#include "ui/models/protocols_model.h"
 #include "ui/models/servers_model.h"
 
 #define amnApp (static_cast<AmneziaApplication *>(QCoreApplication::instance()))
@@ -56,6 +64,9 @@ public:
     QQmlApplicationEngine *qmlEngine() const;
 
 private:
+    void initModels();
+    void initControllers();
+
     QQmlApplicationEngine *m_engine {};
     std::shared_ptr<Settings> m_settings;
     std::shared_ptr<VpnConfigurator> m_configurator;
@@ -69,6 +80,15 @@ private:
     QSharedPointer<ContainersModel> m_containersModel;
     QSharedPointer<ServersModel> m_serversModel;
     QScopedPointer<LanguageModel> m_languageModel;
+    QScopedPointer<ProtocolsModel> m_protocolsModel;
+
+    QScopedPointer<OpenVpnConfigModel> m_openVpnConfigModel;
+    QScopedPointer<ShadowSocksConfigModel> m_shadowSocksConfigModel;
+    QScopedPointer<CloakConfigModel> m_cloakConfigModel;
+    QScopedPointer<WireGuardConfigModel> m_wireguardConfigModel;
+#ifdef Q_OS_WINDOWS
+    QScopedPointer<Ikev2ConfigModel> m_ikev2ConfigModel;
+#endif
 
     QSharedPointer<VpnConnection> m_vpnConnection;
 
diff --git a/client/protocols/protocols_defs.h b/client/protocols/protocols_defs.h
index 1f890f4c..73c2abdf 100644
--- a/client/protocols/protocols_defs.h
+++ b/client/protocols/protocols_defs.h
@@ -1,229 +1,223 @@
 #ifndef PROTOCOLS_DEFS_H
 #define PROTOCOLS_DEFS_H
 
-#include <QObject>
 #include <QDebug>
+#include <QObject>
 #include <QQmlEngine>
 
-namespace amnezia {
-namespace config_key {
-
-// Json config strings
-constexpr char hostName[] = "hostName";
-constexpr char userName[] = "userName";
-constexpr char password[] = "password";
-constexpr char port[] = "port";
-constexpr char local_port[] = "local_port";
-
-constexpr char dns1[] = "dns1";
-constexpr char dns2[] = "dns2";
-
-
-constexpr char description[] = "description";
-constexpr char cert[] = "cert";
-constexpr char config[] = "config";
-
-
-constexpr char containers[] = "containers";
-constexpr char container[] = "container";
-constexpr char defaultContainer[] = "defaultContainer";
-
-constexpr char vpnproto[] = "protocol";
-constexpr char protocols[] = "protocols";
-
-constexpr char remote[] = "remote";
-constexpr char transport_proto[] = "transport_proto";
-constexpr char cipher[] = "cipher";
-constexpr char hash[] = "hash";
-constexpr char ncp_disable[] = "ncp_disable";
-constexpr char tls_auth[] = "tls_auth";
-
-constexpr char client_priv_key[] = "client_priv_key";
-constexpr char client_pub_key[] = "client_pub_key";
-constexpr char server_priv_key[] = "server_priv_key";
-constexpr char server_pub_key[] = "server_pub_key";
-constexpr char psk_key[] = "psk_key";
-
-constexpr char client_ip[] = "client_ip"; // internal ip address
-
-constexpr char site[] = "site";
-constexpr char block_outside_dns[] = "block_outside_dns";
-
-constexpr char subnet_address[] = "subnet_address";
-constexpr char subnet_mask[] = "subnet_mask";
-constexpr char subnet_cidr[] = "subnet_cidr";
-
-constexpr char additional_client_config[] = "additional_client_config";
-constexpr char additional_server_config[] = "additional_server_config";
-
-// proto config keys
-constexpr char last_config[] = "last_config";
-
-constexpr char isThirdPartyConfig[] = "isThirdPartyConfig";
-
-constexpr char openvpn[] = "openvpn";
-constexpr char wireguard[] = "wireguard";
-
-}
-
-namespace protocols {
-
-namespace dns {
-constexpr char amneziaDnsIp[] = "172.29.172.254";
-}
-
-namespace openvpn {
-constexpr char defaultSubnetAddress[] = "10.8.0.0";
-constexpr char defaultSubnetMask[] = "255.255.255.0";
-constexpr char defaultSubnetCidr[] = "24";
-
-constexpr char serverConfigPath[] = "/opt/amnezia/openvpn/server.conf";
-constexpr char caCertPath[] = "/opt/amnezia/openvpn/pki/ca.crt";
-constexpr char clientCertPath[] = "/opt/amnezia/openvpn/pki/issued";
-constexpr char taKeyPath[] = "/opt/amnezia/openvpn/ta.key";
-constexpr char clientsDirPath[] = "/opt/amnezia/openvpn/clients";
-constexpr char defaultPort[] = "1194";
-constexpr char defaultTransportProto[] = "udp";
-constexpr char defaultCipher[] = "AES-256-GCM";
-constexpr char defaultHash[] = "SHA512";
-constexpr bool defaultBlockOutsideDns = true;
-constexpr bool defaultNcpDisable = false;
-constexpr bool defaultTlsAuth = true;
-constexpr char ncpDisableString[] = "ncp-disable";
-constexpr char tlsAuthString[] = "tls-auth /opt/amnezia/openvpn/ta.key 0";
-
-constexpr char defaultAdditionalClientConfig[] = "";
-constexpr char defaultAdditionalServerConfig[] = "";
-}
-
-namespace shadowsocks {
-constexpr char ssKeyPath[] = "/opt/amnezia/shadowsocks/shadowsocks.key";
-constexpr char defaultPort[] = "6789";
-constexpr char defaultLocalProxyPort[] = "8585";
-constexpr char defaultCipher[] = "chacha20-ietf-poly1305";
-}
-
-namespace cloak {
-constexpr char ckPublicKeyPath[] = "/opt/amnezia/cloak/cloak_public.key";
-constexpr char ckBypassUidKeyPath[] = "/opt/amnezia/cloak/cloak_bypass_uid.key";
-constexpr char ckAdminKeyPath[] = "/opt/amnezia/cloak/cloak_admin_uid.key";
-constexpr char defaultPort[] = "443";
-constexpr char defaultRedirSite[] = "tile.openstreetmap.org";
-constexpr char defaultCipher[] = "chacha20-poly1305";
-
-}
-
-namespace wireguard {
-constexpr char defaultSubnetAddress[] = "10.8.1.0";
-constexpr char defaultSubnetMask[] = "255.255.255.0";
-constexpr char defaultSubnetCidr[] = "24";
-
-constexpr char defaultPort[] = "51820";
-constexpr char serverConfigPath[] = "/opt/amnezia/wireguard/wg0.conf";
-constexpr char serverPublicKeyPath[] = "/opt/amnezia/wireguard/wireguard_server_public_key.key";
-constexpr char serverPskKeyPath[] = "/opt/amnezia/wireguard/wireguard_psk.key";
-
-}
-
-namespace sftp {
-constexpr char defaultUserName[] = "sftp_user";
-
-} // namespace sftp
-
-} // namespace protocols
-
-namespace ProtocolEnumNS {
-Q_NAMESPACE
-
-enum TransportProto {
-    Udp,
-    Tcp
-};
-Q_ENUM_NS(TransportProto)
-
-enum Proto {
-    Any = 0,
-    OpenVpn,
-    ShadowSocks,
-    Cloak,
-    WireGuard,
-    Ikev2,
-    L2tp,
-
-    // non-vpn
-    TorWebSite,
-    Dns,
-    FileShare,
-    Sftp
-};
-Q_ENUM_NS(Proto)
-
-enum ServiceType {
-    None = 0,
-    Vpn,
-    Other
-};
-Q_ENUM_NS(ServiceType)
-} // namespace ProtocolEnumNS
-
-using namespace ProtocolEnumNS;
-
-class ProtocolProps : public QObject
+namespace amnezia
 {
-    Q_OBJECT
+    namespace config_key
+    {
 
-public:
-    Q_INVOKABLE static QList<Proto> allProtocols();
+        // Json config strings
+        constexpr char hostName[] = "hostName";
+        constexpr char userName[] = "userName";
+        constexpr char password[] = "password";
+        constexpr char port[] = "port";
+        constexpr char local_port[] = "local_port";
 
-    // spelling may differ for various protocols - TCP for OpenVPN, tcp for others
-    Q_INVOKABLE static TransportProto transportProtoFromString(QString p);
-    Q_INVOKABLE static QString transportProtoToString(TransportProto proto, Proto p = Proto::Any);
+        constexpr char dns1[] = "dns1";
+        constexpr char dns2[] = "dns2";
 
-    Q_INVOKABLE static Proto protoFromString(QString p);
-    Q_INVOKABLE static QString protoToString(Proto p);
+        constexpr char description[] = "description";
+        constexpr char cert[] = "cert";
+        constexpr char config[] = "config";
 
-    Q_INVOKABLE static QMap<Proto, QString> protocolHumanNames();
-    Q_INVOKABLE static QMap<Proto, QString> protocolDescriptions();
+        constexpr char containers[] = "containers";
+        constexpr char container[] = "container";
+        constexpr char defaultContainer[] = "defaultContainer";
 
-    Q_INVOKABLE static ServiceType protocolService(Proto p);
+        constexpr char vpnproto[] = "protocol";
+        constexpr char protocols[] = "protocols";
 
-    Q_INVOKABLE static int defaultPort(Proto p);
-    Q_INVOKABLE static bool defaultPortChangeable(Proto p);
+        constexpr char remote[] = "remote";
+        constexpr char transport_proto[] = "transport_proto";
+        constexpr char cipher[] = "cipher";
+        constexpr char hash[] = "hash";
+        constexpr char ncp_disable[] = "ncp_disable";
+        constexpr char tls_auth[] = "tls_auth";
 
-    Q_INVOKABLE static TransportProto defaultTransportProto(Proto p);
-    Q_INVOKABLE static bool defaultTransportProtoChangeable(Proto p);
+        constexpr char client_priv_key[] = "client_priv_key";
+        constexpr char client_pub_key[] = "client_pub_key";
+        constexpr char server_priv_key[] = "server_priv_key";
+        constexpr char server_pub_key[] = "server_pub_key";
+        constexpr char psk_key[] = "psk_key";
 
+        constexpr char client_ip[] = "client_ip"; // internal ip address
 
-    Q_INVOKABLE static QString key_proto_config_data(Proto p);
-    Q_INVOKABLE static QString key_proto_config_path(Proto p);
+        constexpr char site[] = "site";
+        constexpr char block_outside_dns[] = "block_outside_dns";
 
-};
+        constexpr char subnet_address[] = "subnet_address";
+        constexpr char subnet_mask[] = "subnet_mask";
+        constexpr char subnet_cidr[] = "subnet_cidr";
 
-static void declareQmlProtocolEnum() {
-    qmlRegisterUncreatableMetaObject(
-                ProtocolEnumNS::staticMetaObject,
-                "ProtocolEnum",
-                1, 0,
-                "ProtocolEnum",
-                "Error: only enums"
-                );
+        constexpr char additional_client_config[] = "additional_client_config";
+        constexpr char additional_server_config[] = "additional_server_config";
 
-    qmlRegisterUncreatableMetaObject(
-                ProtocolEnumNS::staticMetaObject,
-                "ProtocolEnum",
-                1, 0,
-                "TransportProto",
-                "Error: only enums"
-                );
+        // proto config keys
+        constexpr char last_config[] = "last_config";
 
-    qmlRegisterUncreatableMetaObject(
-                ProtocolEnumNS::staticMetaObject,
-                "ProtocolEnum",
-                1, 0,
-                "ServiceType",
-                "Error: only enums"
-                );
-}
+        constexpr char isThirdPartyConfig[] = "isThirdPartyConfig";
+
+        constexpr char openvpn[] = "openvpn";
+        constexpr char wireguard[] = "wireguard";
+        constexpr char shadowsocks[] = "shadowsocks";
+        constexpr char cloak[] = "cloak";
+
+    }
+
+    namespace protocols
+    {
+
+        namespace dns
+        {
+            constexpr char amneziaDnsIp[] = "172.29.172.254";
+        }
+
+        namespace openvpn
+        {
+            constexpr char defaultSubnetAddress[] = "10.8.0.0";
+            constexpr char defaultSubnetMask[] = "255.255.255.0";
+            constexpr char defaultSubnetCidr[] = "24";
+
+            constexpr char serverConfigPath[] = "/opt/amnezia/openvpn/server.conf";
+            constexpr char caCertPath[] = "/opt/amnezia/openvpn/pki/ca.crt";
+            constexpr char clientCertPath[] = "/opt/amnezia/openvpn/pki/issued";
+            constexpr char taKeyPath[] = "/opt/amnezia/openvpn/ta.key";
+            constexpr char clientsDirPath[] = "/opt/amnezia/openvpn/clients";
+            constexpr char defaultPort[] = "1194";
+            constexpr char defaultTransportProto[] = "udp";
+            constexpr char defaultCipher[] = "AES-256-GCM";
+            constexpr char defaultHash[] = "SHA512";
+            constexpr bool defaultBlockOutsideDns = true;
+            constexpr bool defaultNcpDisable = false;
+            constexpr bool defaultTlsAuth = true;
+            constexpr char ncpDisableString[] = "ncp-disable";
+            constexpr char tlsAuthString[] = "tls-auth /opt/amnezia/openvpn/ta.key 0";
+
+            constexpr char defaultAdditionalClientConfig[] = "";
+            constexpr char defaultAdditionalServerConfig[] = "";
+        }
+
+        namespace shadowsocks
+        {
+            constexpr char ssKeyPath[] = "/opt/amnezia/shadowsocks/shadowsocks.key";
+            constexpr char defaultPort[] = "6789";
+            constexpr char defaultLocalProxyPort[] = "8585";
+            constexpr char defaultCipher[] = "chacha20-ietf-poly1305";
+        }
+
+        namespace cloak
+        {
+            constexpr char ckPublicKeyPath[] = "/opt/amnezia/cloak/cloak_public.key";
+            constexpr char ckBypassUidKeyPath[] = "/opt/amnezia/cloak/cloak_bypass_uid.key";
+            constexpr char ckAdminKeyPath[] = "/opt/amnezia/cloak/cloak_admin_uid.key";
+            constexpr char defaultPort[] = "443";
+            constexpr char defaultRedirSite[] = "tile.openstreetmap.org";
+            constexpr char defaultCipher[] = "chacha20-poly1305";
+
+        }
+
+        namespace wireguard
+        {
+            constexpr char defaultSubnetAddress[] = "10.8.1.0";
+            constexpr char defaultSubnetMask[] = "255.255.255.0";
+            constexpr char defaultSubnetCidr[] = "24";
+
+            constexpr char defaultPort[] = "51820";
+            constexpr char serverConfigPath[] = "/opt/amnezia/wireguard/wg0.conf";
+            constexpr char serverPublicKeyPath[] = "/opt/amnezia/wireguard/wireguard_server_public_key.key";
+            constexpr char serverPskKeyPath[] = "/opt/amnezia/wireguard/wireguard_psk.key";
+
+        }
+
+        namespace sftp
+        {
+            constexpr char defaultUserName[] = "sftp_user";
+
+        } // namespace sftp
+
+    } // namespace protocols
+
+    namespace ProtocolEnumNS
+    {
+        Q_NAMESPACE
+
+        enum TransportProto {
+            Udp,
+            Tcp
+        };
+        Q_ENUM_NS(TransportProto)
+
+        enum Proto {
+            Any = 0,
+            OpenVpn,
+            ShadowSocks,
+            Cloak,
+            WireGuard,
+            Ikev2,
+            L2tp,
+
+            // non-vpn
+            TorWebSite,
+            Dns,
+            FileShare,
+            Sftp
+        };
+        Q_ENUM_NS(Proto)
+
+        enum ServiceType {
+            None = 0,
+            Vpn,
+            Other
+        };
+        Q_ENUM_NS(ServiceType)
+    } // namespace ProtocolEnumNS
+
+    using namespace ProtocolEnumNS;
+
+    class ProtocolProps : public QObject
+    {
+        Q_OBJECT
+
+    public:
+        Q_INVOKABLE static QList<Proto> allProtocols();
+
+        // spelling may differ for various protocols - TCP for OpenVPN, tcp for others
+        Q_INVOKABLE static TransportProto transportProtoFromString(QString p);
+        Q_INVOKABLE static QString transportProtoToString(TransportProto proto, Proto p = Proto::Any);
+
+        Q_INVOKABLE static Proto protoFromString(QString p);
+        Q_INVOKABLE static QString protoToString(Proto p);
+
+        Q_INVOKABLE static QMap<Proto, QString> protocolHumanNames();
+        Q_INVOKABLE static QMap<Proto, QString> protocolDescriptions();
+
+        Q_INVOKABLE static ServiceType protocolService(Proto p);
+
+        Q_INVOKABLE static int defaultPort(Proto p);
+        Q_INVOKABLE static bool defaultPortChangeable(Proto p);
+
+        Q_INVOKABLE static TransportProto defaultTransportProto(Proto p);
+        Q_INVOKABLE static bool defaultTransportProtoChangeable(Proto p);
+
+        Q_INVOKABLE static QString key_proto_config_data(Proto p);
+        Q_INVOKABLE static QString key_proto_config_path(Proto p);
+    };
+
+    static void declareQmlProtocolEnum()
+    {
+        qmlRegisterUncreatableMetaObject(ProtocolEnumNS::staticMetaObject, "ProtocolEnum", 1, 0, "ProtocolEnum",
+                                         "Error: only enums");
+
+        qmlRegisterUncreatableMetaObject(ProtocolEnumNS::staticMetaObject, "ProtocolEnum", 1, 0, "TransportProto",
+                                         "Error: only enums");
+
+        qmlRegisterUncreatableMetaObject(ProtocolEnumNS::staticMetaObject, "ProtocolEnum", 1, 0, "ServiceType",
+                                         "Error: only enums");
+    }
 
 } // namespace amnezia
 
diff --git a/client/resources.qrc b/client/resources.qrc
index b7bdd463..dd75555f 100644
--- a/client/resources.qrc
+++ b/client/resources.qrc
@@ -250,7 +250,6 @@
         <file>ui/qml/Pages2/PageDeinstalling.qml</file>
         <file>ui/qml/Controls2/BackButtonType.qml</file>
         <file>ui/qml/Pages2/PageSettingsServerProtocol.qml</file>
-        <file>ui/qml/Components/Protocols/OpenVpnSettings.qml</file>
         <file>ui/qml/Components/TransportProtoSelector.qml</file>
         <file>ui/qml/Controls2/ListViewType.qml</file>
         <file>images/controls/radio-button.svg</file>
@@ -271,5 +270,8 @@
         <file>ui/qml/Filters/ContainersModelFilters.qml</file>
         <file>ui/qml/Components/SelectLanguageDrawer.qml</file>
         <file>ui/qml/Controls2/BusyIndicatorType.qml</file>
+        <file>ui/qml/Pages2/PageProtocolOpenVpnSettings.qml</file>
+        <file>ui/qml/Pages2/PageProtocolShadowSocksSettings.qml</file>
+        <file>ui/qml/Pages2/PageProtocolCloakSettings.qml</file>
     </qresource>
 </RCC>
diff --git a/client/ui/controllers/installController.cpp b/client/ui/controllers/installController.cpp
index 1809e082..6fc5f4e9 100644
--- a/client/ui/controllers/installController.cpp
+++ b/client/ui/controllers/installController.cpp
@@ -69,7 +69,7 @@ void InstallController::installServer(DockerContainer container, QJsonObject &co
         m_serversModel->addServer(server);
         m_serversModel->setDefaultServerIndex(m_serversModel->getServersCount() - 1);
 
-        emit installServerFinished(isInstalledContainerFound);
+        emit installServerFinished(false); // todo incorrect notification about found containers
         return;
     }
 
@@ -108,7 +108,7 @@ void InstallController::installContainer(DockerContainer container, QJsonObject
             }
         }
 
-        emit installContainerFinished(isInstalledContainerFound);
+        emit installContainerFinished(false); // todo incorrect notification about found containers
         return;
     }
 
@@ -162,6 +162,29 @@ void InstallController::scanServerForInstalledContainers()
     emit installationErrorOccurred(errorString(errorCode));
 }
 
+void InstallController::updateContainer(QJsonObject config)
+{
+    int serverIndex = m_serversModel->getCurrentlyProcessedServerIndex();
+    ServerCredentials serverCredentials =
+            qvariant_cast<ServerCredentials>(m_serversModel->data(serverIndex, ServersModel::Roles::CredentialsRole));
+
+    const DockerContainer container = ContainerProps::containerFromString(config.value(config_key::container).toString());
+    auto modelIndex = m_containersModel->index(container);
+    QJsonObject oldContainerConfig =
+            qvariant_cast<QJsonObject>(m_containersModel->data(modelIndex, ContainersModel::Roles::ConfigRole));
+
+    ServerController serverController(m_settings);
+
+    auto errorCode = serverController.updateContainer(serverCredentials, container, oldContainerConfig, config);
+    if (errorCode == ErrorCode::NoError) {
+        m_containersModel->setData(modelIndex, config, ContainersModel::Roles::ConfigRole);
+        emit updateContainerFinished();
+        return;
+    }
+
+    emit installationErrorOccurred(errorString(errorCode));
+}
+
 QRegularExpression InstallController::ipAddressPortRegExp()
 {
     return Utils::ipAddressPortRegExp();
diff --git a/client/ui/controllers/installController.h b/client/ui/controllers/installController.h
index 6b01e102..75f4fdef 100644
--- a/client/ui/controllers/installController.h
+++ b/client/ui/controllers/installController.h
@@ -24,12 +24,16 @@ public slots:
 
     void scanServerForInstalledContainers();
 
+    void updateContainer(QJsonObject config);
+
     QRegularExpression ipAddressPortRegExp();
 
 signals:
     void installContainerFinished(bool isInstalledContainerFound);
     void installServerFinished(bool isInstalledContainerFound);
 
+    void updateContainerFinished();
+
     void scanServerFinished(bool isInstalledContainerFound);
 
     void installationErrorOccurred(QString errorMessage);
diff --git a/client/ui/controllers/pageController.h b/client/ui/controllers/pageController.h
index f67da275..468068b8 100644
--- a/client/ui/controllers/pageController.h
+++ b/client/ui/controllers/pageController.h
@@ -36,7 +36,13 @@ namespace PageLoader
         PageSetupWizardInstalling,
         PageSetupWizardConfigSource,
         PageSetupWizardTextKey,
-        PageSetupWizardViewConfig
+        PageSetupWizardViewConfig,
+
+        PageProtocolOpenVpnSettings,
+        PageProtocolShadowSocksSettings,
+        PageProtocolCloakSettings,
+        PageProtocolWireGuardSettings,
+        PageProtocolIKev2Settings
     };
     Q_ENUM_NS(PageEnum)
 
diff --git a/client/ui/models/containers_model.cpp b/client/ui/models/containers_model.cpp
index ecacc184..7b6ffaee 100644
--- a/client/ui/models/containers_model.cpp
+++ b/client/ui/models/containers_model.cpp
@@ -29,6 +29,11 @@ bool ContainersModel::setData(const QModelIndex &index, const QVariant &value, i
     case ConfigRole: {
         m_settings->setContainerConfig(m_currentlyProcessedServerIndex, container, value.toJsonObject());
         m_containers = m_settings->containers(m_currentlyProcessedServerIndex);
+        if (m_defaultContainerIndex != DockerContainer::None) {
+            break;
+        } else if (ContainerProps::containerService(container) == ServiceType::Other) {
+            break;
+        }
     }
     case ServiceTypeRole:
     //        return ContainerProps::containerService(container);
@@ -108,6 +113,11 @@ int ContainersModel::getCurrentlyProcessedContainerIndex()
     return m_currentlyProcessedContainerIndex;
 }
 
+QString ContainersModel::getCurrentlyProcessedContainerName()
+{
+    return ContainerProps::containerHumanNames().value(static_cast<DockerContainer>(m_currentlyProcessedContainerIndex));
+}
+
 void ContainersModel::removeAllContainers()
 {
 
@@ -116,14 +126,39 @@ void ContainersModel::removeAllContainers()
 
     if (errorCode == ErrorCode::NoError) {
         beginResetModel();
+
         m_settings->setContainers(m_currentlyProcessedServerIndex, {});
-        m_settings->setDefaultContainer(m_currentlyProcessedServerIndex, DockerContainer::None);
+        m_containers = m_settings->containers(m_currentlyProcessedServerIndex);
+
+        setData(index(DockerContainer::None, 0), true, IsDefaultRole);
         endResetModel();
     }
 
     // todo process errors
 }
 
+void ContainersModel::removeCurrentlyProcessedContainer()
+{
+    ServerController serverController(m_settings);
+    auto credentials = m_settings->serverCredentials(m_currentlyProcessedServerIndex);
+    auto dockerContainer = static_cast<DockerContainer>(m_currentlyProcessedContainerIndex);
+
+    ErrorCode e = serverController.removeContainer(credentials, dockerContainer);
+
+    beginResetModel(); // todo change to begin remove rows?
+    m_settings->removeContainerConfig(m_currentlyProcessedServerIndex, dockerContainer);
+    m_containers = m_settings->containers(m_currentlyProcessedServerIndex);
+
+    if (m_defaultContainerIndex == m_currentlyProcessedContainerIndex) {
+        if (m_containers.isEmpty()) {
+            setData(index(DockerContainer::None, 0), true, IsDefaultRole);
+        } else {
+            setData(index(m_containers.begin().key(), 0), true, IsDefaultRole);
+        }
+    }
+    endResetModel();
+}
+
 void ContainersModel::clearCachedProfiles()
 {
     const auto &containers = m_settings->containers(m_currentlyProcessedServerIndex);
@@ -150,6 +185,7 @@ QHash<int, QByteArray> ContainersModel::roleNames() const
     roles[DescRole] = "description";
     roles[ServiceTypeRole] = "serviceType";
     roles[DockerContainerRole] = "dockerContainer";
+    roles[ConfigRole] = "config";
 
     roles[IsEasySetupContainerRole] = "isEasySetupContainer";
     roles[EasySetupHeaderRole] = "easySetupHeader";
diff --git a/client/ui/models/containers_model.h b/client/ui/models/containers_model.h
index 7331ef22..b79b058a 100644
--- a/client/ui/models/containers_model.h
+++ b/client/ui/models/containers_model.h
@@ -45,10 +45,14 @@ public slots:
     QString getDefaultContainerName();
 
     void setCurrentlyProcessedServerIndex(const int index);
+
     void setCurrentlyProcessedContainerIndex(int index);
     int getCurrentlyProcessedContainerIndex();
 
+    QString getCurrentlyProcessedContainerName();
+
     void removeAllContainers();
+    void removeCurrentlyProcessedContainer();
     void clearCachedProfiles();
 
     bool isAmneziaDnsContainerInstalled();
diff --git a/client/ui/models/languageModel.cpp b/client/ui/models/languageModel.cpp
index e95b2ccf..76eeb37d 100644
--- a/client/ui/models/languageModel.cpp
+++ b/client/ui/models/languageModel.cpp
@@ -22,14 +22,8 @@ QVariant LanguageModel::data(const QModelIndex &index, int role) const
     }
 
     switch (role) {
-    case NameRole: {
-        return m_availableLanguages[index.row()].name;
-        break;
-    }
-    case IndexRole: {
-        return static_cast<int>(m_availableLanguages[index.row()].index);
-        break;
-    }
+    case NameRole: return m_availableLanguages[index.row()].name;
+    case IndexRole: return static_cast<int>(m_availableLanguages[index.row()].index);
     }
     return QVariant();
 }
diff --git a/client/ui/models/protocols/cloakConfigModel.cpp b/client/ui/models/protocols/cloakConfigModel.cpp
new file mode 100644
index 00000000..203f08b5
--- /dev/null
+++ b/client/ui/models/protocols/cloakConfigModel.cpp
@@ -0,0 +1,81 @@
+#include "cloakConfigModel.h"
+
+#include "protocols/protocols_defs.h"
+
+CloakConfigModel::CloakConfigModel(QObject *parent) : QAbstractListModel(parent)
+{
+}
+
+int CloakConfigModel::rowCount(const QModelIndex &parent) const
+{
+    Q_UNUSED(parent);
+    return 1;
+}
+
+bool CloakConfigModel::setData(const QModelIndex &index, const QVariant &value, int role)
+{
+    if (!index.isValid() || index.row() < 0 || index.row() >= ContainerProps::allContainers().size()) {
+        return false;
+    }
+
+    switch (role) {
+    case Roles::PortRole: m_protocolConfig.insert(config_key::port, value.toString()); break;
+    case Roles::CipherRole: m_protocolConfig.insert(config_key::cipher, value.toString()); break;
+    case Roles::SiteRole: m_protocolConfig.insert(config_key::site, value.toString()); break;
+    }
+
+    emit dataChanged(index, index, QList { role });
+    return true;
+}
+
+QVariant CloakConfigModel::data(const QModelIndex &index, int role) const
+{
+    if (!index.isValid() || index.row() < 0 || index.row() >= rowCount()) {
+        return false;
+    }
+
+    switch (role) {
+    case Roles::PortRole: return m_protocolConfig.value(config_key::port).toString(protocols::cloak::defaultPort);
+    case Roles::CipherRole: return m_protocolConfig.value(config_key::cipher).toString(protocols::cloak::defaultCipher);
+    case Roles::SiteRole: return m_protocolConfig.value(config_key::site).toString(protocols::cloak::defaultRedirSite);
+    }
+
+    return QVariant();
+}
+
+void CloakConfigModel::updateModel(const QJsonObject &config)
+{
+    beginResetModel();
+    m_container = ContainerProps::containerFromString(config.value(config_key::container).toString());
+
+    m_fullConfig = config;
+    QJsonObject protocolConfig = config.value(config_key::cloak).toObject();
+
+    m_protocolConfig.insert(config_key::cipher,
+                            protocolConfig.value(config_key::cipher).toString(protocols::cloak::defaultCipher));
+
+    m_protocolConfig.insert(config_key::port,
+                            protocolConfig.value(config_key::port).toString(protocols::cloak::defaultPort));
+
+    m_protocolConfig.insert(config_key::site,
+                            protocolConfig.value(config_key::site).toString(protocols::cloak::defaultRedirSite));
+
+    endResetModel();
+}
+
+QJsonObject CloakConfigModel::getConfig()
+{
+    m_fullConfig.insert(config_key::cloak, m_protocolConfig);
+    return m_fullConfig;
+}
+
+QHash<int, QByteArray> CloakConfigModel::roleNames() const
+{
+    QHash<int, QByteArray> roles;
+
+    roles[PortRole] = "port";
+    roles[CipherRole] = "cipher";
+    roles[SiteRole] = "site";
+
+    return roles;
+}
diff --git a/client/ui/models/protocols/cloakConfigModel.h b/client/ui/models/protocols/cloakConfigModel.h
new file mode 100644
index 00000000..31ff8c53
--- /dev/null
+++ b/client/ui/models/protocols/cloakConfigModel.h
@@ -0,0 +1,40 @@
+#ifndef CLOAKCONFIGMODEL_H
+#define CLOAKCONFIGMODEL_H
+
+#include <QAbstractListModel>
+#include <QJsonObject>
+
+#include "containers/containers_defs.h"
+
+class CloakConfigModel : public QAbstractListModel
+{
+    Q_OBJECT
+
+public:
+    enum Roles {
+        PortRole = Qt::UserRole + 1,
+        CipherRole,
+        SiteRole
+    };
+
+    explicit CloakConfigModel(QObject *parent = nullptr);
+
+    int rowCount(const QModelIndex &parent = QModelIndex()) const override;
+
+    bool setData(const QModelIndex &index, const QVariant &value, int role) override;
+    QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
+
+public slots:
+    void updateModel(const QJsonObject &config);
+    QJsonObject getConfig();
+
+protected:
+    QHash<int, QByteArray> roleNames() const override;
+
+private:
+    DockerContainer m_container;
+    QJsonObject m_protocolConfig;
+    QJsonObject m_fullConfig;
+};
+
+#endif // CLOAKCONFIGMODEL_H
diff --git a/client/ui/models/protocols/ikev2ConfigModel.cpp b/client/ui/models/protocols/ikev2ConfigModel.cpp
new file mode 100644
index 00000000..f22b965c
--- /dev/null
+++ b/client/ui/models/protocols/ikev2ConfigModel.cpp
@@ -0,0 +1,76 @@
+#include "ikev2ConfigModel.h".h "
+
+#include "protocols/protocols_defs.h"
+
+Ikev2ConfigModel::Ikev2ConfigModel(QObject *parent) : QAbstractListModel(parent)
+{
+}
+
+int Ikev2ConfigModel::rowCount(const QModelIndex &parent) const
+{
+    Q_UNUSED(parent);
+    return 1;
+}
+
+bool Ikev2ConfigModel::setData(const QModelIndex &index, const QVariant &value, int role)
+{
+    if (!index.isValid() || index.row() < 0 || index.row() >= ContainerProps::allContainers().size()) {
+        return false;
+    }
+
+    switch (role) {
+    case Roles::PortRole: m_protocolConfig.insert(config_key::port, value.toString()); break;
+    case Roles::CipherRole: m_protocolConfig.insert(config_key::cipher, value.toString()); break;
+    }
+
+    emit dataChanged(index, index, QList { role });
+    return true;
+}
+
+QVariant Ikev2ConfigModel::data(const QModelIndex &index, int role) const
+{
+    if (!index.isValid() || index.row() < 0 || index.row() >= rowCount()) {
+        return false;
+    }
+
+    switch (role) {
+    case Roles::PortRole: return m_protocolConfig.value(config_key::port).toString(protocols::shadowsocks::defaultPort);
+    case Roles::CipherRole:
+        return m_protocolConfig.value(config_key::cipher).toString(protocols::shadowsocks::defaultCipher);
+    }
+
+    return QVariant();
+}
+
+void Ikev2ConfigModel::updateModel(const QJsonObject &config)
+{
+    beginResetModel();
+    m_container = ContainerProps::containerFromString(config.value(config_key::container).toString());
+
+    m_fullConfig = config;
+    QJsonObject protocolConfig = config.value(config_key::shadowsocks).toObject();
+
+    m_protocolConfig.insert(config_key::cipher,
+                            protocolConfig.value(config_key::cipher).toString(protocols::shadowsocks::defaultCipher));
+
+    m_protocolConfig.insert(config_key::port,
+                            protocolConfig.value(config_key::port).toString(protocols::shadowsocks::defaultPort));
+
+    endResetModel();
+}
+
+QJsonObject Ikev2ConfigModel::getConfig()
+{
+    m_fullConfig.insert(config_key::shadowsocks, m_protocolConfig);
+    return m_fullConfig;
+}
+
+QHash<int, QByteArray> Ikev2ConfigModel::roleNames() const
+{
+    QHash<int, QByteArray> roles;
+
+    roles[PortRole] = "port";
+    roles[CipherRole] = "cipher";
+
+    return roles;
+}
diff --git a/client/ui/models/protocols/ikev2ConfigModel.h b/client/ui/models/protocols/ikev2ConfigModel.h
new file mode 100644
index 00000000..e005f6a4
--- /dev/null
+++ b/client/ui/models/protocols/ikev2ConfigModel.h
@@ -0,0 +1,39 @@
+#ifndef IKEV2CONFIGMODEL_H
+#define IKEV2CONFIGMODEL_H
+
+#include <QAbstractListModel>
+#include <QJsonObject>
+
+#include "containers/containers_defs.h"
+
+class Ikev2ConfigModel : public QAbstractListModel
+{
+    Q_OBJECT
+
+public:
+    enum Roles {
+        PortRole = Qt::UserRole + 1,
+        CipherRole
+    };
+
+    explicit Ikev2ConfigModel(QObject *parent = nullptr);
+
+    int rowCount(const QModelIndex &parent = QModelIndex()) const override;
+
+    bool setData(const QModelIndex &index, const QVariant &value, int role) override;
+    QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
+
+public slots:
+    void updateModel(const QJsonObject &config);
+    QJsonObject getConfig();
+
+protected:
+    QHash<int, QByteArray> roleNames() const override;
+
+private:
+    DockerContainer m_container;
+    QJsonObject m_protocolConfig;
+    QJsonObject m_fullConfig;
+};
+
+#endif // IKEV2CONFIGMODEL_H
diff --git a/client/ui/models/protocols/openvpnConfigModel.cpp b/client/ui/models/protocols/openvpnConfigModel.cpp
new file mode 100644
index 00000000..1b73c987
--- /dev/null
+++ b/client/ui/models/protocols/openvpnConfigModel.cpp
@@ -0,0 +1,152 @@
+#include "openvpnConfigModel.h"
+
+#include "protocols/protocols_defs.h"
+
+OpenVpnConfigModel::OpenVpnConfigModel(QObject *parent) : QAbstractListModel(parent)
+{
+}
+
+int OpenVpnConfigModel::rowCount(const QModelIndex &parent) const
+{
+    Q_UNUSED(parent);
+    return 1;
+}
+
+bool OpenVpnConfigModel::setData(const QModelIndex &index, const QVariant &value, int role)
+{
+    if (!index.isValid() || index.row() < 0 || index.row() >= ContainerProps::allContainers().size()) {
+        return false;
+    }
+
+    switch (role) {
+    case Roles::SubnetAddressRole:
+        m_protocolConfig.insert(amnezia::config_key::subnet_address, value.toString());
+        break;
+    case Roles::TransportProtoRole: m_protocolConfig.insert(config_key::transport_proto, value.toString()); break;
+    case Roles::PortRole: m_protocolConfig.insert(config_key::port, value.toString()); break;
+    case Roles::AutoNegotiateEncryprionRole: m_protocolConfig.insert(config_key::ncp_disable, !value.toBool()); break;
+    case Roles::HashRole: m_protocolConfig.insert(config_key::hash, value.toString()); break;
+    case Roles::CipherRole: m_protocolConfig.insert(config_key::cipher, value.toString()); break;
+    case Roles::TlsAuthRole: m_protocolConfig.insert(config_key::tls_auth, value.toBool()); break;
+    case Roles::BlockDnsRole: m_protocolConfig.insert(config_key::block_outside_dns, value.toBool()); break;
+    case Roles::AdditionalClientCommandsRole:
+        m_protocolConfig.insert(config_key::additional_client_config, value.toString());
+        break;
+    case Roles::AdditionalServerCommandsRole:
+        m_protocolConfig.insert(config_key::additional_server_config, value.toString());
+        break;
+    }
+
+    emit dataChanged(index, index, QList { role });
+    return true;
+}
+
+QVariant OpenVpnConfigModel::data(const QModelIndex &index, int role) const
+{
+    if (!index.isValid() || index.row() < 0 || index.row() >= rowCount()) {
+        return false;
+    }
+
+    switch (role) {
+    case Roles::SubnetAddressRole:
+        return m_protocolConfig.value(amnezia::config_key::subnet_address)
+                .toString(amnezia::protocols::openvpn::defaultSubnetAddress);
+    case Roles::TransportProtoRole:
+        return m_protocolConfig.value(config_key::transport_proto).toString(protocols::openvpn::defaultTransportProto);
+    case Roles::PortRole: return m_protocolConfig.value(config_key::port).toString(protocols::openvpn::defaultPort);
+    case Roles::AutoNegotiateEncryprionRole:
+        return !m_protocolConfig.value(config_key::ncp_disable).toBool(protocols::openvpn::defaultNcpDisable);
+    case Roles::HashRole: return m_protocolConfig.value(config_key::hash).toString(protocols::openvpn::defaultHash);
+    case Roles::CipherRole:
+        return m_protocolConfig.value(config_key::cipher).toString(protocols::openvpn::defaultCipher);
+    case Roles::TlsAuthRole:
+        return m_protocolConfig.value(config_key::tls_auth).toBool(protocols::openvpn::defaultTlsAuth);
+    case Roles::BlockDnsRole:
+        return m_protocolConfig.value(config_key::block_outside_dns).toBool(protocols::openvpn::defaultBlockOutsideDns);
+    case Roles::AdditionalClientCommandsRole:
+        return m_protocolConfig.value(config_key::additional_client_config)
+                .toString(protocols::openvpn::defaultAdditionalClientConfig);
+    case Roles::AdditionalServerCommandsRole:
+        return m_protocolConfig.value(config_key::additional_server_config)
+                .toString(protocols::openvpn::defaultAdditionalServerConfig);
+    case Roles::IsPortEditable: return m_container == DockerContainer::OpenVpn ? true : false;
+    case Roles::IsTransportProtoEditable: return m_container == DockerContainer::OpenVpn ? true : false;
+    case Roles::HasRemoveButton: return m_container == DockerContainer::OpenVpn ? true : false;
+    }
+    return QVariant();
+}
+
+void OpenVpnConfigModel::updateModel(const QJsonObject &config)
+{
+    beginResetModel();
+    m_container =
+            ContainerProps::containerFromString(config.value(config_key::container).toString()); // todo maybe unused
+
+    m_fullConfig = config;
+    QJsonObject protocolConfig = config.value(config_key::openvpn).toObject();
+
+    m_protocolConfig.insert(config_key::subnet_address,
+                            protocolConfig.value(amnezia::config_key::subnet_address)
+                                    .toString(amnezia::protocols::openvpn::defaultSubnetAddress));
+
+    QString transportProto;
+    if (m_container == DockerContainer::OpenVpn) {
+        transportProto =
+                protocolConfig.value(config_key::transport_proto).toString(protocols::openvpn::defaultTransportProto);
+    } else {
+        transportProto = "tcp";
+    }
+
+    m_protocolConfig.insert(config_key::transport_proto, transportProto);
+
+    m_protocolConfig.insert(config_key::ncp_disable,
+                            protocolConfig.value(config_key::ncp_disable).toBool(protocols::openvpn::defaultNcpDisable));
+    m_protocolConfig.insert(config_key::cipher,
+                            protocolConfig.value(config_key::cipher).toString(protocols::openvpn::defaultCipher));
+    m_protocolConfig.insert(config_key::hash,
+                            protocolConfig.value(config_key::hash).toString(protocols::openvpn::defaultHash));
+    m_protocolConfig.insert(config_key::block_outside_dns,
+                            protocolConfig.value(config_key::tls_auth).toBool(protocols::openvpn::defaultTlsAuth));
+    m_protocolConfig.insert(config_key::port,
+                            protocolConfig.value(config_key::port).toString(protocols::openvpn::defaultPort));
+    m_protocolConfig.insert(
+            config_key::tls_auth,
+            protocolConfig.value(config_key::block_outside_dns).toBool(protocols::openvpn::defaultBlockOutsideDns));
+    m_protocolConfig.insert(config_key::additional_client_config,
+                            protocolConfig.value(config_key::additional_client_config)
+                                    .toString(protocols::openvpn::defaultAdditionalClientConfig));
+    m_protocolConfig.insert(config_key::additional_server_config,
+                            protocolConfig.value(config_key::additional_server_config)
+                                    .toString(protocols::openvpn::defaultAdditionalServerConfig));
+
+    endResetModel();
+}
+
+QJsonObject OpenVpnConfigModel::getConfig()
+{
+    m_fullConfig.insert(config_key::openvpn, m_protocolConfig);
+    return m_fullConfig;
+}
+
+QHash<int, QByteArray> OpenVpnConfigModel::roleNames() const
+{
+    QHash<int, QByteArray> roles;
+
+    roles[SubnetAddressRole] = "subnetAddress";
+    roles[TransportProtoRole] = "transportProto";
+    roles[PortRole] = "port";
+    roles[AutoNegotiateEncryprionRole] = "autoNegotiateEncryprion";
+    roles[HashRole] = "hash";
+    roles[CipherRole] = "cipher";
+    roles[TlsAuthRole] = "tlsAuth";
+    roles[BlockDnsRole] = "blockDns";
+    roles[AdditionalClientCommandsRole] = "additionalClientCommands";
+    roles[AdditionalServerCommandsRole] = "additionalServerCommands";
+
+    roles[IsPortEditable] = "isPortEditable";
+    roles[IsTransportProtoEditable] = "isTransportProtoEditable";
+
+    roles[HasRemoveButton] = "hasRemoveButton";
+
+    return roles;
+}
diff --git a/client/ui/models/protocols/openvpnConfigModel.h b/client/ui/models/protocols/openvpnConfigModel.h
new file mode 100644
index 00000000..0357700c
--- /dev/null
+++ b/client/ui/models/protocols/openvpnConfigModel.h
@@ -0,0 +1,52 @@
+#ifndef OPENVPNCONFIGMODEL_H
+#define OPENVPNCONFIGMODEL_H
+
+#include <QAbstractListModel>
+#include <QJsonObject>
+
+#include "containers/containers_defs.h"
+
+class OpenVpnConfigModel : public QAbstractListModel
+{
+    Q_OBJECT
+
+public:
+    enum Roles {
+        SubnetAddressRole = Qt::UserRole + 1,
+        TransportProtoRole,
+        PortRole,
+        AutoNegotiateEncryprionRole,
+        HashRole,
+        CipherRole,
+        TlsAuthRole,
+        BlockDnsRole,
+        AdditionalClientCommandsRole,
+        AdditionalServerCommandsRole,
+
+        IsPortEditable,
+        IsTransportProtoEditable,
+
+        HasRemoveButton
+    };
+
+    explicit OpenVpnConfigModel(QObject *parent = nullptr);
+
+    int rowCount(const QModelIndex &parent = QModelIndex()) const override;
+
+    bool setData(const QModelIndex &index, const QVariant &value, int role) override;
+    QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
+
+public slots:
+    void updateModel(const QJsonObject &config);
+    QJsonObject getConfig();
+
+protected:
+    QHash<int, QByteArray> roleNames() const override;
+
+private:
+    DockerContainer m_container;
+    QJsonObject m_protocolConfig;
+    QJsonObject m_fullConfig;
+};
+
+#endif // OPENVPNCONFIGMODEL_H
diff --git a/client/ui/models/protocols/shadowsocksConfigModel.cpp b/client/ui/models/protocols/shadowsocksConfigModel.cpp
new file mode 100644
index 00000000..60c8feee
--- /dev/null
+++ b/client/ui/models/protocols/shadowsocksConfigModel.cpp
@@ -0,0 +1,76 @@
+#include "shadowsocksConfigModel.h"
+
+#include "protocols/protocols_defs.h"
+
+ShadowSocksConfigModel::ShadowSocksConfigModel(QObject *parent) : QAbstractListModel(parent)
+{
+}
+
+int ShadowSocksConfigModel::rowCount(const QModelIndex &parent) const
+{
+    Q_UNUSED(parent);
+    return 1;
+}
+
+bool ShadowSocksConfigModel::setData(const QModelIndex &index, const QVariant &value, int role)
+{
+    if (!index.isValid() || index.row() < 0 || index.row() >= ContainerProps::allContainers().size()) {
+        return false;
+    }
+
+    switch (role) {
+    case Roles::PortRole: m_protocolConfig.insert(config_key::port, value.toString()); break;
+    case Roles::CipherRole: m_protocolConfig.insert(config_key::cipher, value.toString()); break;
+    }
+
+    emit dataChanged(index, index, QList { role });
+    return true;
+}
+
+QVariant ShadowSocksConfigModel::data(const QModelIndex &index, int role) const
+{
+    if (!index.isValid() || index.row() < 0 || index.row() >= rowCount()) {
+        return false;
+    }
+
+    switch (role) {
+    case Roles::PortRole: return m_protocolConfig.value(config_key::port).toString(protocols::shadowsocks::defaultPort);
+    case Roles::CipherRole:
+        return m_protocolConfig.value(config_key::cipher).toString(protocols::shadowsocks::defaultCipher);
+    }
+
+    return QVariant();
+}
+
+void ShadowSocksConfigModel::updateModel(const QJsonObject &config)
+{
+    beginResetModel();
+    m_container = ContainerProps::containerFromString(config.value(config_key::container).toString());
+
+    m_fullConfig = config;
+    QJsonObject protocolConfig = config.value(config_key::shadowsocks).toObject();
+
+    m_protocolConfig.insert(config_key::cipher,
+                            protocolConfig.value(config_key::cipher).toString(protocols::shadowsocks::defaultCipher));
+
+    m_protocolConfig.insert(config_key::port,
+                            protocolConfig.value(config_key::port).toString(protocols::shadowsocks::defaultPort));
+
+    endResetModel();
+}
+
+QJsonObject ShadowSocksConfigModel::getConfig()
+{
+    m_fullConfig.insert(config_key::shadowsocks, m_protocolConfig);
+    return m_fullConfig;
+}
+
+QHash<int, QByteArray> ShadowSocksConfigModel::roleNames() const
+{
+    QHash<int, QByteArray> roles;
+
+    roles[PortRole] = "port";
+    roles[CipherRole] = "cipher";
+
+    return roles;
+}
diff --git a/client/ui/models/protocols/shadowsocksConfigModel.h b/client/ui/models/protocols/shadowsocksConfigModel.h
new file mode 100644
index 00000000..d8fa036b
--- /dev/null
+++ b/client/ui/models/protocols/shadowsocksConfigModel.h
@@ -0,0 +1,39 @@
+#ifndef SHADOWSOCKSCONFIGMODEL_H
+#define SHADOWSOCKSCONFIGMODEL_H
+
+#include <QAbstractListModel>
+#include <QJsonObject>
+
+#include "containers/containers_defs.h"
+
+class ShadowSocksConfigModel : public QAbstractListModel
+{
+    Q_OBJECT
+
+public:
+    enum Roles {
+        PortRole = Qt::UserRole + 1,
+        CipherRole
+    };
+
+    explicit ShadowSocksConfigModel(QObject *parent = nullptr);
+
+    int rowCount(const QModelIndex &parent = QModelIndex()) const override;
+
+    bool setData(const QModelIndex &index, const QVariant &value, int role) override;
+    QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
+
+public slots:
+    void updateModel(const QJsonObject &config);
+    QJsonObject getConfig();
+
+protected:
+    QHash<int, QByteArray> roleNames() const override;
+
+private:
+    DockerContainer m_container;
+    QJsonObject m_protocolConfig;
+    QJsonObject m_fullConfig;
+};
+
+#endif // SHADOWSOCKSCONFIGMODEL_H
diff --git a/client/ui/models/protocols/wireguardConfigModel.cpp b/client/ui/models/protocols/wireguardConfigModel.cpp
new file mode 100644
index 00000000..15e89865
--- /dev/null
+++ b/client/ui/models/protocols/wireguardConfigModel.cpp
@@ -0,0 +1,70 @@
+#include "wireguardConfigModel.h"
+
+#include "protocols/protocols_defs.h"
+
+WireGuardConfigModel::WireGuardConfigModel(QObject *parent) : QAbstractListModel(parent)
+{
+}
+
+int WireGuardConfigModel::rowCount(const QModelIndex &parent) const
+{
+    Q_UNUSED(parent);
+    return 1;
+}
+
+bool WireGuardConfigModel::setData(const QModelIndex &index, const QVariant &value, int role)
+{
+    if (!index.isValid() || index.row() < 0 || index.row() >= ContainerProps::allContainers().size()) {
+        return false;
+    }
+
+    switch (role) {
+    case Roles::PortRole: m_protocolConfig.insert(config_key::port, value.toString()); break;
+    case Roles::CipherRole: m_protocolConfig.insert(config_key::cipher, value.toString()); break;
+    }
+
+    emit dataChanged(index, index, QList { role });
+    return true;
+}
+
+QVariant WireGuardConfigModel::data(const QModelIndex &index, int role) const
+{
+    if (!index.isValid() || index.row() < 0 || index.row() >= rowCount()) {
+        return false;
+    }
+
+    switch (role) {
+    case Roles::PortRole: return m_protocolConfig.value(config_key::port).toString(protocols::shadowsocks::defaultPort);
+    case Roles::CipherRole:
+        return m_protocolConfig.value(config_key::cipher).toString(protocols::shadowsocks::defaultCipher);
+    }
+
+    return QVariant();
+}
+
+void WireGuardConfigModel::updateModel(const QJsonObject &config)
+{
+    beginResetModel();
+    m_container = ContainerProps::containerFromString(config.value(config_key::container).toString());
+
+    m_fullConfig = config;
+    QJsonObject protocolConfig = config.value(config_key::wireguard).toObject();
+
+    endResetModel();
+}
+
+QJsonObject WireGuardConfigModel::getConfig()
+{
+    m_fullConfig.insert(config_key::wireguard, m_protocolConfig);
+    return m_fullConfig;
+}
+
+QHash<int, QByteArray> WireGuardConfigModel::roleNames() const
+{
+    QHash<int, QByteArray> roles;
+
+    roles[PortRole] = "port";
+    roles[CipherRole] = "cipher";
+
+    return roles;
+}
diff --git a/client/ui/models/protocols/wireguardConfigModel.h b/client/ui/models/protocols/wireguardConfigModel.h
new file mode 100644
index 00000000..1deeacaf
--- /dev/null
+++ b/client/ui/models/protocols/wireguardConfigModel.h
@@ -0,0 +1,39 @@
+#ifndef WIREGUARDCONFIGMODEL_H
+#define WIREGUARDCONFIGMODEL_H
+
+#include <QAbstractListModel>
+#include <QJsonObject>
+
+#include "containers/containers_defs.h"
+
+class WireGuardConfigModel : public QAbstractListModel
+{
+    Q_OBJECT
+
+public:
+    enum Roles {
+        PortRole = Qt::UserRole + 1,
+        CipherRole
+    };
+
+    explicit WireGuardConfigModel(QObject *parent = nullptr);
+
+    int rowCount(const QModelIndex &parent = QModelIndex()) const override;
+
+    bool setData(const QModelIndex &index, const QVariant &value, int role) override;
+    QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
+
+public slots:
+    void updateModel(const QJsonObject &config);
+    QJsonObject getConfig();
+
+protected:
+    QHash<int, QByteArray> roleNames() const override;
+
+private:
+    DockerContainer m_container;
+    QJsonObject m_protocolConfig;
+    QJsonObject m_fullConfig;
+};
+
+#endif // WIREGUARDCONFIGMODEL_H
diff --git a/client/ui/models/protocols_model.cpp b/client/ui/models/protocols_model.cpp
index 7359bb36..ac271eb9 100644
--- a/client/ui/models/protocols_model.cpp
+++ b/client/ui/models/protocols_model.cpp
@@ -1,62 +1,73 @@
 #include "protocols_model.h"
 
-ProtocolsModel::ProtocolsModel(std::shared_ptr<Settings> settings, QObject *parent) :
-    m_settings(settings),
-    QAbstractListModel(parent)
+ProtocolsModel::ProtocolsModel(std::shared_ptr<Settings> settings, QObject *parent)
+    : m_settings(settings), QAbstractListModel(parent)
 {
-
 }
 
 int ProtocolsModel::rowCount(const QModelIndex &parent) const
 {
     Q_UNUSED(parent);
-    return ProtocolProps::allProtocols().size();
+    return m_content.size();
 }
 
-QHash<int, QByteArray> ProtocolsModel::roleNames() const {
+QHash<int, QByteArray> ProtocolsModel::roleNames() const
+{
     QHash<int, QByteArray> roles;
-    roles[NameRole] = "name_role";
-    roles[DescRole] = "desc_role";
-    roles[ServiceTypeRole] = "service_type_role";
-    roles[IsInstalledRole] = "is_installed_role";
+
+    roles[ProtocolNameRole] = "protocolName";
+    roles[ProtocolPageRole] = "protocolPage";
+
     return roles;
 }
 
 QVariant ProtocolsModel::data(const QModelIndex &index, int role) const
 {
-    if (!index.isValid() || index.row() < 0
-            || index.row() >= ProtocolProps::allProtocols().size()) {
+    if (!index.isValid() || index.row() < 0 || index.row() >= m_content.size()) {
         return QVariant();
     }
 
-    Proto p = ProtocolProps::allProtocols().at(index.row());
-    if (role == NameRole) {
-        return ProtocolProps::protocolHumanNames().value(p);
+    switch (role) {
+    case ProtocolNameRole: {
+        amnezia::Proto proto = ProtocolProps::protoFromString(m_content.keys().at(index.row()));
+        return ProtocolProps::protocolHumanNames().value(proto);
     }
-    if (role == DescRole) {
-        return ProtocolProps::protocolDescriptions().value(p);
-    }
-    if (role == ServiceTypeRole) {
-        return ProtocolProps::protocolService(p);
-    }
-    if (role == IsInstalledRole) {
-        return ContainerProps::protocolsForContainer(m_selectedDockerContainer).contains(p);
+    case ProtocolPageRole:
+        return static_cast<int>(protocolPage(ProtocolProps::protoFromString(m_content.keys().at(index.row()))));
     }
+
     return QVariant();
 }
 
-void ProtocolsModel::setSelectedServerIndex(int index)
+void ProtocolsModel::updateModel(const QJsonObject &content)
 {
-    beginResetModel();
-    m_selectedServerIndex = index;
-    endResetModel();
+    m_container = ContainerProps::containerFromString(content.value(config_key::container).toString());
+
+    m_content = content;
+    m_content.remove(config_key::container);
 }
 
-void ProtocolsModel::setSelectedDockerContainer(DockerContainer c)
+QJsonObject ProtocolsModel::getConfig()
 {
-    beginResetModel();
-    m_selectedDockerContainer = c;
-    endResetModel();
+    QJsonObject config = m_content;
+    config.insert(config_key::container, ContainerProps::containerToString(m_container));
+    return config;
 }
 
-
+PageLoader::PageEnum ProtocolsModel::protocolPage(Proto protocol) const
+{
+    switch (protocol) {
+    case Proto::OpenVpn: return PageLoader::PageEnum::PageProtocolOpenVpnSettings;
+    case Proto::Cloak: return PageLoader::PageEnum::PageProtocolCloakSettings;
+    case Proto::ShadowSocks: return PageLoader::PageEnum::PageProtocolShadowSocksSettings;
+    case Proto::WireGuard: return PageLoader::PageEnum::PageProtocolWireGuardSettings;
+    case Proto::Ikev2: return PageLoader::PageEnum::PageProtocolIKev2Settings;
+    case Proto::L2tp: return PageLoader::PageEnum::PageProtocolOpenVpnSettings;
+    // non-vpn
+    case Proto::TorWebSite: return PageLoader::PageEnum::PageProtocolOpenVpnSettings;
+    case Proto::Dns: return PageLoader::PageEnum::PageProtocolOpenVpnSettings;
+    case Proto::FileShare: return PageLoader::PageEnum::PageProtocolOpenVpnSettings;
+    case Proto::Sftp: return PageLoader::PageEnum::PageProtocolOpenVpnSettings;
+    default: return PageLoader::PageEnum::PageProtocolOpenVpnSettings;
+    }
+}
diff --git a/client/ui/models/protocols_model.h b/client/ui/models/protocols_model.h
index 48b6eeb6..1e279cfb 100644
--- a/client/ui/models/protocols_model.h
+++ b/client/ui/models/protocols_model.h
@@ -3,38 +3,40 @@
 
 #include <QAbstractListModel>
 #include <QJsonObject>
-#include <vector>
-#include <utility>
 
+#include "../controllers/pageController.h"
 #include "settings.h"
-#include "containers/containers_defs.h"
 
 class ProtocolsModel : public QAbstractListModel
 {
     Q_OBJECT
 public:
-    ProtocolsModel(std::shared_ptr<Settings> settings, QObject *parent = nullptr);
-public:
-    enum SiteRoles {
-        NameRole = Qt::UserRole + 1,
-        DescRole,
-        ServiceTypeRole,
-        IsInstalledRole
+    enum Roles {
+        ProtocolNameRole = Qt::UserRole + 1,
+        ProtocolPageRole
     };
 
+    ProtocolsModel(std::shared_ptr<Settings> settings, QObject *parent = nullptr);
+
     int rowCount(const QModelIndex &parent = QModelIndex()) const override;
 
     QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
-    Q_INVOKABLE void setSelectedServerIndex(int index);
-    Q_INVOKABLE void setSelectedDockerContainer(DockerContainer c);
+
+public slots:
+    void updateModel(const QJsonObject &content);
+
+    QJsonObject getConfig();
 
 protected:
     QHash<int, QByteArray> roleNames() const override;
 
 private:
-    int m_selectedServerIndex;
-    DockerContainer m_selectedDockerContainer;
+    PageLoader::PageEnum protocolPage(Proto protocol) const;
+
     std::shared_ptr<Settings> m_settings;
+
+    DockerContainer m_container;
+    QJsonObject m_content;
 };
 
 #endif // PROTOCOLS_MODEL_H
diff --git a/client/ui/models/servers_model.cpp b/client/ui/models/servers_model.cpp
index 1bacdd45..6fad9af6 100644
--- a/client/ui/models/servers_model.cpp
+++ b/client/ui/models/servers_model.cpp
@@ -123,6 +123,7 @@ bool ServersModel::isDefaultServerHasWriteAccess()
 
 void ServersModel::addServer(const QJsonObject &server)
 {
+    // todo  beginInsertRows()?
     beginResetModel();
     m_settings->addServer(server);
     m_servers = m_settings->serversArray();
diff --git a/client/ui/pages_logic/GeneralSettingsLogic.cpp b/client/ui/pages_logic/GeneralSettingsLogic.cpp
index 0e92f8c9..141308f4 100644
--- a/client/ui/pages_logic/GeneralSettingsLogic.cpp
+++ b/client/ui/pages_logic/GeneralSettingsLogic.cpp
@@ -1,13 +1,11 @@
 #include "GeneralSettingsLogic.h"
 #include "ShareConnectionLogic.h"
 
-#include "../uilogic.h"
 #include "../models/protocols_model.h"
+#include "../uilogic.h"
 
-GeneralSettingsLogic::GeneralSettingsLogic(UiLogic *logic, QObject *parent):
-    PageLogicBase(logic, parent)
+GeneralSettingsLogic::GeneralSettingsLogic(UiLogic *logic, QObject *parent) : PageLogicBase(logic, parent)
 {
-
 }
 
 void GeneralSettingsLogic::onUpdatePage()
@@ -32,9 +30,11 @@ void GeneralSettingsLogic::onPushButtonGeneralSettingsShareConnectionClicked()
     uiLogic()->m_selectedServerIndex = m_settings->defaultServerIndex();
     uiLogic()->m_selectedDockerContainer = m_settings->defaultContainer(uiLogic()->m_selectedServerIndex);
 
-    qobject_cast<ProtocolsModel *>(uiLogic()->protocolsModel())->setSelectedServerIndex(uiLogic()->m_selectedServerIndex);
-    qobject_cast<ProtocolsModel *>(uiLogic()->protocolsModel())->setSelectedDockerContainer(uiLogic()->m_selectedDockerContainer);
+    //    qobject_cast<ProtocolsModel
+    //    *>(uiLogic()->protocolsModel())->setSelectedServerIndex(uiLogic()->m_selectedServerIndex); qobject_cast<ProtocolsModel
+    //    *>(uiLogic()->protocolsModel())->setSelectedDockerContainer(uiLogic()->m_selectedDockerContainer);
 
-    uiLogic()->pageLogic<ShareConnectionLogic>()->updateSharingPage(uiLogic()->m_selectedServerIndex, uiLogic()->m_selectedDockerContainer);
+    uiLogic()->pageLogic<ShareConnectionLogic>()->updateSharingPage(uiLogic()->m_selectedServerIndex,
+                                                                    uiLogic()->m_selectedDockerContainer);
     emit uiLogic()->goToPage(Page::ShareConnection);
 }
diff --git a/client/ui/pages_logic/ServerContainersLogic.cpp b/client/ui/pages_logic/ServerContainersLogic.cpp
index 2b556dcc..a2971cf8 100644
--- a/client/ui/pages_logic/ServerContainersLogic.cpp
+++ b/client/ui/pages_logic/ServerContainersLogic.cpp
@@ -1,6 +1,6 @@
 #include "ServerContainersLogic.h"
-#include "ShareConnectionLogic.h"
 #include "ServerConfiguringProgressLogic.h"
+#include "ShareConnectionLogic.h"
 
 #include <QApplication>
 
@@ -9,24 +9,22 @@
 #include "core/servercontroller.h"
 #include <functional>
 
-#include "../uilogic.h"
 #include "../pages_logic/VpnLogic.h"
-#include "vpnconnection.h"
+#include "../uilogic.h"
 #include "core/errorstrings.h"
+#include "vpnconnection.h"
 
-
-ServerContainersLogic::ServerContainersLogic(UiLogic *logic, QObject *parent):
-    PageLogicBase(logic, parent)
+ServerContainersLogic::ServerContainersLogic(UiLogic *logic, QObject *parent) : PageLogicBase(logic, parent)
 {
 }
 
 void ServerContainersLogic::onUpdatePage()
 {
-//    ContainersModel *c_model = qobject_cast<ContainersModel *>(uiLogic()->containersModel());
-//    c_model->setSelectedServerIndex(uiLogic()->m_selectedServerIndex);
+    //    ContainersModel *c_model = qobject_cast<ContainersModel *>(uiLogic()->containersModel());
+    //    c_model->setSelectedServerIndex(uiLogic()->m_selectedServerIndex);
 
     ProtocolsModel *p_model = qobject_cast<ProtocolsModel *>(uiLogic()->protocolsModel());
-    p_model->setSelectedServerIndex(uiLogic()->m_selectedServerIndex);
+    //    p_model->setSelectedServerIndex(uiLogic()->m_selectedServerIndex);
 
     set_isManagedServer(m_settings->haveAuthData(uiLogic()->m_selectedServerIndex));
     uiLogic()->m_installCredentials = m_settings->serverCredentials(uiLogic()->m_selectedServerIndex);
@@ -35,25 +33,29 @@ void ServerContainersLogic::onUpdatePage()
 
 void ServerContainersLogic::onPushButtonProtoSettingsClicked(DockerContainer c, Proto p)
 {
-    qDebug()<< "ServerContainersLogic::onPushButtonProtoSettingsClicked" << c << p;
+    qDebug() << "ServerContainersLogic::onPushButtonProtoSettingsClicked" << c << p;
     uiLogic()->m_selectedDockerContainer = c;
-    uiLogic()->protocolLogic(p)->updateProtocolPage(m_settings->protocolConfig(uiLogic()->m_selectedServerIndex, uiLogic()->m_selectedDockerContainer, p),
-                      uiLogic()->m_selectedDockerContainer,
-                      m_settings->haveAuthData(uiLogic()->m_selectedServerIndex));
+    uiLogic()->protocolLogic(p)->updateProtocolPage(
+            m_settings->protocolConfig(uiLogic()->m_selectedServerIndex, uiLogic()->m_selectedDockerContainer, p),
+            uiLogic()->m_selectedDockerContainer, m_settings->haveAuthData(uiLogic()->m_selectedServerIndex));
 
     emit uiLogic()->goToProtocolPage(p);
 }
 
 void ServerContainersLogic::onPushButtonDefaultClicked(DockerContainer c)
 {
-    if (m_settings->defaultContainer(uiLogic()->m_selectedServerIndex) == c) return;
+    if (m_settings->defaultContainer(uiLogic()->m_selectedServerIndex) == c)
+        return;
 
     m_settings->setDefaultContainer(uiLogic()->m_selectedServerIndex, c);
     uiLogic()->onUpdateAllPages();
 
-    if (uiLogic()->m_selectedServerIndex != m_settings->defaultServerIndex()) return;
-    if (!uiLogic()->m_vpnConnection) return;
-    if (!uiLogic()->m_vpnConnection->isConnected()) return;
+    if (uiLogic()->m_selectedServerIndex != m_settings->defaultServerIndex())
+        return;
+    if (!uiLogic()->m_vpnConnection)
+        return;
+    if (!uiLogic()->m_vpnConnection->isConnected())
+        return;
 
     uiLogic()->pageLogic<VpnLogic>()->onDisconnect();
     uiLogic()->pageLogic<VpnLogic>()->onConnect();
@@ -67,16 +69,19 @@ void ServerContainersLogic::onPushButtonShareClicked(DockerContainer c)
 
 void ServerContainersLogic::onPushButtonRemoveClicked(DockerContainer container)
 {
-    //buttonSetEnabledFunc(false);
+    // buttonSetEnabledFunc(false);
     ServerController serverController(m_settings);
-    ErrorCode e = serverController.removeContainer(m_settings->serverCredentials(uiLogic()->m_selectedServerIndex), container);
+    ErrorCode e =
+            serverController.removeContainer(m_settings->serverCredentials(uiLogic()->m_selectedServerIndex), container);
     m_settings->removeContainerConfig(uiLogic()->m_selectedServerIndex, container);
-    //buttonSetEnabledFunc(true);
+    // buttonSetEnabledFunc(true);
 
     if (m_settings->defaultContainer(uiLogic()->m_selectedServerIndex) == container) {
         const auto &c = m_settings->containers(uiLogic()->m_selectedServerIndex);
-        if (c.isEmpty()) m_settings->setDefaultContainer(uiLogic()->m_selectedServerIndex, DockerContainer::None);
-        else m_settings->setDefaultContainer(uiLogic()->m_selectedServerIndex, c.keys().first());
+        if (c.isEmpty())
+            m_settings->setDefaultContainer(uiLogic()->m_selectedServerIndex, DockerContainer::None);
+        else
+            m_settings->setDefaultContainer(uiLogic()->m_selectedServerIndex, c.keys().first());
     }
     uiLogic()->onUpdateAllPages();
 }
@@ -96,7 +101,8 @@ void ServerContainersLogic::onPushButtonContinueClicked(DockerContainer c, int p
         if (!uiLogic()->isContainerAlreadyAddedToGui(c)) {
             auto installAction = [this, c, &config]() {
                 ServerController serverController(m_settings);
-                return serverController.setupContainer(m_settings->serverCredentials(uiLogic()->m_selectedServerIndex), c, config);
+                return serverController.setupContainer(m_settings->serverCredentials(uiLogic()->m_selectedServerIndex),
+                                                       c, config);
             };
             errorCode = uiLogic()->pageLogic<ServerConfiguringProgressLogic>()->doInstallAction(installAction);
 
@@ -107,16 +113,16 @@ void ServerContainersLogic::onPushButtonContinueClicked(DockerContainer c, int p
                 }
             }
         } else {
-            emit uiLogic()->showWarningMessage("Attention! The container you are trying to install is already installed on the server. "
-                                               "All installed containers have been added to the application ");
+            emit uiLogic()->showWarningMessage(
+                    "Attention! The container you are trying to install is already installed on the server. "
+                    "All installed containers have been added to the application ");
         }
 
         uiLogic()->onUpdateAllPages();
     }
     if (errorCode != ErrorCode::NoError) {
-        emit uiLogic()->showWarningMessage(tr("Error occurred while configuring server.") + "\n" +
-                                           tr("Error message: ") + errorString(errorCode) + "\n" +
-                                           tr("See logs for details."));
+        emit uiLogic()->showWarningMessage(tr("Error occurred while configuring server.") + "\n" + tr("Error message: ")
+                                           + errorString(errorCode) + "\n" + tr("See logs for details."));
     }
     emit uiLogic()->closePage();
 }
diff --git a/client/ui/qml/Components/Protocols/OpenVpnSettings.qml b/client/ui/qml/Components/Protocols/OpenVpnSettings.qml
deleted file mode 100644
index f937dcfc..00000000
--- a/client/ui/qml/Components/Protocols/OpenVpnSettings.qml
+++ /dev/null
@@ -1,147 +0,0 @@
-import QtQuick 2.15
-import QtQuick.Controls
-import QtQuick.Layouts
-
-import "../../Controls2"
-import "../../Controls2/TextTypes"
-import "../../Components"
-
-Item {
-    id: root
-    implicitHeight: col.implicitHeight
-    implicitWidth: col.implicitWidth
-
-    ColumnLayout {
-        id: col
-
-        anchors.fill: parent
-
-        anchors.leftMargin: 16
-        anchors.rightMargin: 16
-
-        spacing: 16
-
-        Header2TextType {
-            Layout.fillWidth: true
-
-            text: "OpenVpn"
-        }
-
-        TextFieldWithHeaderType {
-            Layout.fillWidth: true
-
-            headerText: qsTr("VPN Addresses Subnet")
-        }
-
-        ParagraphTextType {
-            Layout.fillWidth: true
-
-            text: qsTr("Network protocol")
-        }
-
-        TransportProtoSelector {
-            Layout.fillWidth: true
-        }
-
-        TextFieldWithHeaderType {
-            Layout.fillWidth: true
-
-            headerText: qsTr("Port")
-        }
-
-        SwitcherType {
-            Layout.fillWidth: true
-            text: qsTr("Auto-negotiate encryption")
-        }
-
-        DropDownType {
-            id: hash
-            Layout.fillWidth: true
-            implicitHeight: 74
-
-            descriptionText: qsTr("Hash")
-            headerText: qsTr("Hash")
-
-            listView: ListViewType {
-                rootWidth: root.width
-
-                model: ListModel {
-                    ListElement { name : qsTr("SHA512") }
-                    ListElement { name : qsTr("SHA384") }
-                    ListElement { name : qsTr("SHA256") }
-                    ListElement { name : qsTr("SHA3-512") }
-                    ListElement { name : qsTr("SHA3-384") }
-                    ListElement { name : qsTr("SHA3-256") }
-                    ListElement { name : qsTr("whirlpool") }
-                    ListElement { name : qsTr("BLAKE2b512") }
-                    ListElement { name : qsTr("BLAKE2s256") }
-                    ListElement { name : qsTr("SHA1") }
-                }
-                currentIndex: 0
-
-                clickedFunction: {
-                    hash.text = selectedText
-                    hash.menuVisible = false
-                }
-
-                Component.onCompleted: {
-                    hash.text = selectedText
-                }
-            }
-        }
-
-        DropDownType {
-            id: cipher
-            Layout.fillWidth: true
-            implicitHeight: 74
-
-            descriptionText: qsTr("Cipher")
-            headerText: qsTr("Cipher")
-
-            listView: ListViewType {
-                rootWidth: root.width
-
-                model: ListModel {
-                    ListElement { name : qsTr("AES-256-GCM") }
-                    ListElement { name : qsTr("AES-192-GCM") }
-                    ListElement { name : qsTr("AES-128-GCM") }
-                    ListElement { name : qsTr("AES-256-CBC") }
-                    ListElement { name : qsTr("AES-192-CBC") }
-                    ListElement { name : qsTr("AES-128-CBC") }
-                    ListElement { name : qsTr("ChaCha20-Poly1305") }
-                    ListElement { name : qsTr("ARIA-256-CBC") }
-                    ListElement { name : qsTr("CAMELLIA-256-CBC") }
-                    ListElement { name : qsTr("none") }
-                }
-                currentIndex: 0
-
-                clickedFunction: {
-                    cipher.text = selectedText
-                    cipher.menuVisible = false
-                }
-
-                Component.onCompleted: {
-                    cipher.text = selectedText
-                }
-            }
-        }
-
-        CheckBoxType {
-            Layout.fillWidth: true
-
-            text: qsTr("TLS auth")
-        }
-
-        CheckBoxType {
-            Layout.fillWidth: true
-
-            text: qsTr("Block DNS requests outside of VPN")
-        }
-
-        SwitcherType {
-            Layout.fillWidth: true
-
-            text: qsTr("Additional configuration commands")
-        }
-    }
-}
diff --git a/client/ui/qml/Components/SettingsContainersListView.qml b/client/ui/qml/Components/SettingsContainersListView.qml
index 1b8ea40c..7204ac16 100644
--- a/client/ui/qml/Components/SettingsContainersListView.qml
+++ b/client/ui/qml/Components/SettingsContainersListView.qml
@@ -6,6 +6,7 @@ import SortFilterProxyModel 0.2
 
 import PageEnum 1.0
 import ProtocolEnum 1.0
+import ContainerEnum 1.0
 
 import "../Controls2"
 import "../Controls2/TextTypes"
@@ -88,8 +89,32 @@ ListView {
 
             onClicked: {
                 if (isInstalled) {
-                    ContainersModel.setCurrentlyProcessedContainerIndex(root.model.mapToSource(index))
-                    goToPage(PageEnum.PageSettingsServerProtocol)
+                    var containerIndex = root.model.mapToSource(index)
+                    ContainersModel.setCurrentlyProcessedContainerIndex(containerIndex)
+                    switch (containerIndex) {
+                    case ContainerEnum.OpenVpn: {
+                        OpenVpnConfigModel.updateModel(ProtocolsModel.getConfig())
+                        goToPage(PageEnum.PageProtocolOpenVpnSettings)
+                        break
+                    }
+                    case ContainerEnum.WireGuard: {
+                        WireGuardConfigModel.updateModel(ProtocolsModel.getConfig())
+                        goToPage(PageEnum.PageProtocolWireGuardSettings)
+                        break
+                    }
+                    case ContainerEnum.Ipsec: {
+                        Ikev2ConfigModel.updateModel(ProtocolsModel.getConfig())
+                        goToPage(PageEnum.PageProtocolIKev2Settings)
+                        break
+                    }
+                    default: {
+                        if (serviceType !== ProtocolEnum.Other) { //todo disable settings for dns container
+                            ProtocolsModel.updateModel(config)
+                            goToPage(PageEnum.PageSettingsServerProtocol)
+                        }
+                    }
+                    }
+
                 } else {
                     ContainersModel.setCurrentlyProcessedContainerIndex(root.model.mapToSource(index))
                     InstallController.setShouldCreateServer(false)
diff --git a/client/ui/qml/Components/ShareConnectionDrawer.qml b/client/ui/qml/Components/ShareConnectionDrawer.qml
index d5ed1029..275e41ea 100644
--- a/client/ui/qml/Components/ShareConnectionDrawer.qml
+++ b/client/ui/qml/Components/ShareConnectionDrawer.qml
@@ -75,9 +75,9 @@ DrawerType {
                     text: qsTr("Copy")
 
                     onClicked: {
-                        configContent.selectAll()
-                        configContent.copy()
-                        configContent.select(0, 0)
+                        configText.selectAll()
+                        configText.copy()
+                        configText.select(0, 0)
                     }
                 }
 
@@ -138,6 +138,8 @@ DrawerType {
                             }
 
                             TextArea {
+                                id: configText
+
                                 Layout.fillWidth: true
                                 Layout.topMargin: 16
                                 Layout.bottomMargin: 16
diff --git a/client/ui/qml/Components/TransportProtoSelector.qml b/client/ui/qml/Components/TransportProtoSelector.qml
index dd315deb..bfd82cb1 100644
--- a/client/ui/qml/Components/TransportProtoSelector.qml
+++ b/client/ui/qml/Components/TransportProtoSelector.qml
@@ -25,6 +25,8 @@ Rectangle {
         HorizontalRadioButton {
             checked: root.currentIndex === 0
 
+            hoverEnabled: root.enabled
+
             implicitWidth: (rootWidth - 32) / 2
             text: "UDP"
 
@@ -36,6 +38,8 @@ Rectangle {
         HorizontalRadioButton {
             checked: root.currentIndex === 1
 
+            hoverEnabled: root.enabled
+
             implicitWidth: (rootWidth - 32) / 2
             text: "TCP"
 
diff --git a/client/ui/qml/Controls2/CheckBoxType.qml b/client/ui/qml/Controls2/CheckBoxType.qml
index 1a22f326..6ce5ac4e 100644
--- a/client/ui/qml/Controls2/CheckBoxType.qml
+++ b/client/ui/qml/Controls2/CheckBoxType.qml
@@ -3,6 +3,8 @@ import QtQuick.Controls
 import QtQuick.Layouts
 import Qt5Compat.GraphicalEffects
 
+import "TextTypes"
+
 CheckBox {
     id: root
 
@@ -26,6 +28,8 @@ CheckBox {
     indicator: Rectangle {
         id: checkBoxBackground
 
+        anchors.verticalCenter: parent.verticalCenter
+
         implicitWidth: 56
         implicitHeight: 56
         radius: 16
@@ -57,43 +61,41 @@ CheckBox {
                 anchors.centerIn: parent
 
                 source: root.pressed ? imageSource : root.checked ? imageSource : ""
-
-                ColorOverlay {
-                    id: imageColor
-                    anchors.fill: indicator
-                    source: indicator
-
-                    color: root.pressed ? pressedImageColor : root.checked ? checkedImageColor : defaultImageColor
+                layer {
+                    enabled: true
+                    effect: ColorOverlay {
+                        color: root.pressed ? pressedImageColor : root.checked ? checkedImageColor : defaultImageColor
+                    }
                 }
             }
         }
     }
 
     contentItem: ColumnLayout {
-        anchors.fill: parent
+        anchors.left: parent.left
+        anchors.right: parent.right
         anchors.leftMargin: 8 + checkBoxBackground.width
 
-        Text {
-            text: root.text
-            color: "#D7D8DB"
-            font.pixelSize: 18
-            font.weight: 400
-            font.family: "PT Root UI VF"
+        spacing: 4
 
-            height: 22
+        ListItemTitleType {
             Layout.fillWidth: true
+//            Layout.topMargin: 16
+//            Layout.bottomMargin: description.visible ? 0 : 16
+
+            text: root.text
         }
 
-        Text {
+        CaptionTextType {
+            id: description
+
+            Layout.fillWidth: true
+            Layout.bottomMargin: 16
+
             text: root.descriptionText
             color: "#878b91"
-            font.pixelSize: 13
-            font.weight: 400
-            font.family: "PT Root UI VF"
-            font.letterSpacing: 0.02
 
-            height: 16
-            Layout.fillWidth: true
+            visible: root.descriptionText !== ""
         }
     }
 
diff --git a/client/ui/qml/Controls2/DropDownType.qml b/client/ui/qml/Controls2/DropDownType.qml
index 85989ae6..7a4538ba 100644
--- a/client/ui/qml/Controls2/DropDownType.qml
+++ b/client/ui/qml/Controls2/DropDownType.qml
@@ -9,8 +9,11 @@ Item {
 
     property string text
     property string textColor: "#d7d8db"
+    property string textDisabledColor: "#878B91"
 
     property string descriptionText
+    property string descriptionTextColor: "#878B91"
+    property string descriptionTextDisabledColor: "#494B50"
 
     property string headerText
     property string headerBackButtonImage
@@ -23,7 +26,6 @@ Item {
     property string rootButtonHoveredBorderColor: "#494B50"
     property string rootButtonDefaultBorderColor: "transparent"
     property string rootButtonPressedBorderColor: "#D7D8DB"
-    property int rootButtonBorderWidth: 1
 
     property real drawerHeight: 0.9
     property Component listView
@@ -36,10 +38,18 @@ Item {
     onMenuVisibleChanged: {
         if (menuVisible) {
             rootButtonBackground.border.color = rootButtonPressedBorderColor
-            rootButtonBackground.border.width = rootButtonBorderWidth
         } else {
             rootButtonBackground.border.color = rootButtonDefaultBorderColor
-            rootButtonBackground.border.width = 0
+        }
+    }
+
+    onEnabledChanged: {
+        if (enabled) {
+            rootButtonBackground.color = rootButtonBackgroundColor
+            rootButtonBackground.border.color = rootButtonDefaultBorderColor
+        } else {
+            rootButtonBackground.color = "transparent"
+            rootButtonBackground.border.color = rootButtonHoveredBorderColor
         }
     }
 
@@ -48,13 +58,10 @@ Item {
         anchors.fill: rootButtonContent
 
         radius: 16
-        color: rootButtonBackgroundColor
-        border.color: rootButtonDefaultBorderColor
-        border.width: 0
+        color: root.enabled ? rootButtonBackgroundColor : "transparent"
+        border.color: root.enabled ? rootButtonDefaultBorderColor : rootButtonHoveredBorderColor
+        border.width: 1
 
-        Behavior on border.width {
-            PropertyAnimation { duration: 200 }
-        }
         Behavior on border.color {
             PropertyAnimation { duration: 200 }
         }
@@ -77,7 +84,7 @@ Item {
 
                 visible: root.descriptionText !== ""
 
-                color: "#878B91"
+                color: root.enabled ? root.descriptionTextColor : root.descriptionTextDisabledColor
                 text: root.descriptionText
             }
 
@@ -87,7 +94,7 @@ Item {
                 horizontalAlignment: Text.AlignLeft
                 verticalAlignment: Text.AlignVCenter
 
-                color: root.textColor
+                color: root.enabled ? root.textColor : root.textDisabledColor
                 text: root.text
 
                 wrapMode: Text.NoWrap
@@ -108,18 +115,16 @@ Item {
     MouseArea {
         anchors.fill: rootButtonContent
         cursorShape: Qt.PointingHandCursor
-        hoverEnabled: true
+        hoverEnabled: root.enabled ? true : false
 
         onEntered: {
             if (menu.visible === false) {
-                rootButtonBackground.border.width = rootButtonBorderWidth
                 rootButtonBackground.border.color = rootButtonHoveredBorderColor
             }
         }
 
         onExited: {
             if (menu.visible === false) {
-                rootButtonBackground.border.width = 0
                 rootButtonBackground.border.color = rootButtonDefaultBorderColor
             }
         }
diff --git a/client/ui/qml/Controls2/HorizontalRadioButton.qml b/client/ui/qml/Controls2/HorizontalRadioButton.qml
index 4a2a13dd..88fc2531 100644
--- a/client/ui/qml/Controls2/HorizontalRadioButton.qml
+++ b/client/ui/qml/Controls2/HorizontalRadioButton.qml
@@ -22,45 +22,44 @@ RadioButton {
     implicitWidth: content.implicitWidth
     implicitHeight: content.implicitHeight
 
-    hoverEnabled: true
-
     indicator: Rectangle {
         anchors.fill: parent
         radius: 16
 
         color: {
-            if (root.enabled) {
+//            if (root.enabled) {
                 if (root.hovered) {
                     return hoveredColor
                 } else if (root.checked) {
                     return selectedColor
                 }
                 return defaultColor
-            } else {
-                return disabledColor
-            }
+//            } else {
+//                return disabledColor
+//            }
         }
 
         border.color: {
-            if (root.enabled) {
+//            if (root.enabled) {
                 if (root.pressed) {
                     return pressedBorderColor
                 } else if (root.checked) {
                     return selectedBorderColor
                 }
-            }
-            return defaultBodredColor
+                return defaultBodredColor
+//            }
+//            return defaultBodredColor
         }
 
         border.width: {
-            if (root.enabled) {
+//            if (root.enabled) {
                 if(root.checked) {
                     return 1
                 }
                 return root.pressed ? 1 : 0
-            } else {
-                return 0
-            }
+//            } else {
+//                return 0
+//            }
         }
 
         Behavior on color {
diff --git a/client/ui/qml/Controls2/TextFieldWithHeaderType.qml b/client/ui/qml/Controls2/TextFieldWithHeaderType.qml
index 85d651ef..13a7ea6e 100644
--- a/client/ui/qml/Controls2/TextFieldWithHeaderType.qml
+++ b/client/ui/qml/Controls2/TextFieldWithHeaderType.qml
@@ -8,6 +8,9 @@ Item {
     id: root
 
     property string headerText
+    property string headerTextDisabledColor: "#494B50"
+    property string headerTextColor: "#878b91"
+
     property alias errorText: errorField.text
 
     property string buttonText
@@ -15,9 +18,18 @@ Item {
 
     property alias textField: textField
     property alias textFieldText: textField.text
+    property string textFieldTextColor: "#d7d8db"
+    property string textFieldTextDisabledColor: "#878B91"
+
     property string textFieldPlaceholderText
     property bool textFieldEditable: true
 
+    property string borderColor: "#2C2D30"
+    property string borderFocusedColor: "#d7d8db"
+
+    property string backgroundColor: "#1c1d21"
+    property string backgroundDisabledColor: "transparent"
+
     implicitWidth: content.implicitWidth
     implicitHeight: content.implicitHeight
 
@@ -29,9 +41,9 @@ Item {
             id: backgroud
             Layout.fillWidth: true
             Layout.preferredHeight: 74
-            color: "#1c1d21"
+            color: root.enabled ? root.backgroundColor : root.backgroundDisabledColor
             radius: 16
-            border.color: textField.focus ? "#d7d8db" : "#2C2D30"
+            border.color: textField.focus ? root.borderFocusedColor : root.borderColor
             border.width: 1
 
             Behavior on border.color {
@@ -43,7 +55,7 @@ Item {
                 ColumnLayout {
                     LabelTextType {
                         text: root.headerText
-                        color: "#878b91"
+                        color: root.enabled ? root.headerTextColor : root.headerTextDisabledColor
 
                         Layout.fillWidth: true
                         Layout.rightMargin: 16
@@ -55,9 +67,9 @@ Item {
                         id: textField
 
                         enabled: root.textFieldEditable
-                        color: "#d7d8db"
+                        color: root.enabled ? root.textFieldTextColor : root.textFieldTextDisabledColor
 
-                        placeholderText: textFieldPlaceholderText
+                        placeholderText: root.textFieldPlaceholderText
                         placeholderTextColor: "#494B50"
 
                         selectionColor:  "#412102"
@@ -79,7 +91,7 @@ Item {
 
                         background: Rectangle {
                             anchors.fill: parent
-                            color: "#1c1d21"
+                            color: root.enabled ? root.backgroundColor : root.backgroundDisabledColor
                         }
 
                         onTextChanged: {
@@ -98,13 +110,13 @@ Item {
                     textColor: "#D7D8DB"
                     borderWidth: 0
 
-                    text: buttonText
+                    text: root.buttonText
 
                     Layout.rightMargin: 24
 
                     onClicked: {
-                        if (clickedFunc && typeof clickedFunc === "function") {
-                            clickedFunc()
+                        if (root.clickedFunc && typeof root.clickedFunc === "function") {
+                            root.clickedFunc()
                         }
                     }
                 }
diff --git a/client/ui/qml/Pages2/PageHome.qml b/client/ui/qml/Pages2/PageHome.qml
index b97acad1..ab1eeba1 100644
--- a/client/ui/qml/Pages2/PageHome.qml
+++ b/client/ui/qml/Pages2/PageHome.qml
@@ -158,7 +158,6 @@ PageType {
 
                     implicitHeight: 40
 
-                    rootButtonBorderWidth: 0
                     rootButtonImageColor: "#0E0E11"
                     rootButtonBackgroundColor: "#D7D8DB"
 
diff --git a/client/ui/qml/Pages2/PageProtocolCloakSettings.qml b/client/ui/qml/Pages2/PageProtocolCloakSettings.qml
new file mode 100644
index 00000000..9ee67303
--- /dev/null
+++ b/client/ui/qml/Pages2/PageProtocolCloakSettings.qml
@@ -0,0 +1,176 @@
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+
+import SortFilterProxyModel 0.2
+
+import "./"
+import "../Controls2"
+import "../Controls2/TextTypes"
+import "../Config"
+import "../Components"
+
+PageType {
+    id: root
+
+    //todo move to main?
+    Connections {
+        target: InstallController
+
+        function onInstallationErrorOccurred(errorMessage) {
+            PageController.showErrorMessage(errorMessage)
+        }
+
+        function onUpdateContainerFinished() {
+            //todo change to notification
+            PageController.showErrorMessage(qsTr("Settings updated successfully"))
+        }
+    }
+
+    ColumnLayout {
+        id: backButton
+
+        anchors.top: parent.top
+        anchors.left: parent.left
+        anchors.right: parent.right
+
+        anchors.topMargin: 20
+
+        BackButtonType {
+        }
+    }
+
+    FlickableType {
+        id: fl
+        anchors.top: backButton.bottom
+        anchors.bottom: parent.bottom
+        contentHeight: content.implicitHeight
+
+        Column {
+            id: content
+
+            anchors.top: parent.top
+            anchors.left: parent.left
+            anchors.right: parent.right
+
+            ListView {
+                id: listview
+
+                width: parent.width
+                height: listview.contentItem.height
+
+                clip: true
+                interactive: false
+
+                model: CloakConfigModel
+
+                delegate: Item {
+                    implicitWidth: listview.width
+                    implicitHeight: col.implicitHeight
+
+                    ColumnLayout {
+                        id: col
+
+                        anchors.top: parent.top
+                        anchors.left: parent.left
+                        anchors.right: parent.right
+
+                        anchors.leftMargin: 16
+                        anchors.rightMargin: 16
+
+                        spacing: 0
+
+                        HeaderType {
+                            Layout.fillWidth: true
+
+                            headerText: qsTr("Cloak settings")
+                        }
+
+                        TextFieldWithHeaderType {
+                            Layout.fillWidth: true
+                            Layout.topMargin: 32
+
+                            headerText: qsTr("Masquerading as traffic from")
+                            textFieldText: site
+
+                            textField.onEditingFinished: {
+                                if (textFieldText !== site) {
+                                    site = textFieldText
+                                }
+                            }
+                        }
+
+                        TextFieldWithHeaderType {
+                            Layout.fillWidth: true
+                            Layout.topMargin: 16
+
+                            headerText: qsTr("Port")
+                            textFieldText: port
+
+                            textField.onEditingFinished: {
+                                if (textFieldText !== port) {
+                                    port = textFieldText
+                                }
+                            }
+                        }
+
+                        DropDownType {
+                            id: cipherDropDown
+                            Layout.fillWidth: true
+                            Layout.topMargin: 16
+                            implicitHeight: 74
+
+                            descriptionText: qsTr("Cipher")
+                            headerText: qsTr("Cipher")
+
+                            listView: ListViewType {
+                                id: cipherListView
+
+                                rootWidth: root.width
+
+                                model: ListModel {
+                                    ListElement { name : "chacha20-ietf-poly1305" }
+                                    ListElement { name : "xchacha20-ietf-poly1305" }
+                                    ListElement { name : "aes-256-gcm" }
+                                    ListElement { name : "aes-192-gcm" }
+                                    ListElement { name : "aes-128-gcm" }
+                                }
+
+                                clickedFunction: function() {
+                                    cipherDropDown.text = selectedText
+                                    cipher = cipherDropDown.text
+                                    cipherDropDown.menuVisible = false
+                                }
+
+                                Component.onCompleted: {
+                                    cipherDropDown.text = cipher
+
+                                    for (var i = 0; i < cipherListView.model.count; i++) {
+                                        if (cipherListView.model.get(i).name === cipherDropDown.text) {
+                                            currentIndex = i
+                                        }
+                                    }
+                                }
+                            }
+                        }
+
+                        BasicButtonType {
+                            Layout.fillWidth: true
+                            Layout.topMargin: 24
+                            Layout.bottomMargin: 24
+
+                            text: qsTr("Save and Restart Amnesia")
+
+                            onClicked: {
+                                forceActiveFocus()
+                                PageController.showBusyIndicator(true)
+                                InstallController.updateContainer(CloakConfigModel.getConfig())
+                                PageController.showBusyIndicator(false)
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/client/ui/qml/Pages2/PageProtocolOpenVpnSettings.qml b/client/ui/qml/Pages2/PageProtocolOpenVpnSettings.qml
new file mode 100644
index 00000000..8e5556d0
--- /dev/null
+++ b/client/ui/qml/Pages2/PageProtocolOpenVpnSettings.qml
@@ -0,0 +1,465 @@
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+
+import SortFilterProxyModel 0.2
+
+import PageEnum 1.0
+
+import "./"
+import "../Controls2"
+import "../Controls2/TextTypes"
+import "../Config"
+import "../Components"
+
+PageType {
+    id: root
+
+    Connections {
+        target: InstallController
+
+        function onInstallationErrorOccurred(errorMessage) {
+            PageController.showErrorMessage(errorMessage)
+        }
+
+        function onUpdateContainerFinished() {
+            //todo change to notification
+            PageController.showErrorMessage(qsTr("Settings updated successfully"))
+        }
+    }
+
+    ColumnLayout {
+        id: backButton
+
+        anchors.top: parent.top
+        anchors.left: parent.left
+        anchors.right: parent.right
+
+        anchors.topMargin: 20
+
+        BackButtonType {
+        }
+    }
+
+    FlickableType {
+        id: fl
+        anchors.top: backButton.bottom
+        anchors.bottom: parent.bottom
+        contentHeight: content.implicitHeight
+
+        Column {
+            id: content
+
+            anchors.top: parent.top
+            anchors.left: parent.left
+            anchors.right: parent.right
+
+            ListView {
+                id: listview
+
+                width: parent.width
+                height: listview.contentItem.height
+
+                clip: true
+                interactive: false
+
+                model: OpenVpnConfigModel
+
+                delegate: Item {
+                    implicitWidth: listview.width
+                    implicitHeight: col.implicitHeight
+
+                    ColumnLayout {
+                        id: col
+
+                        anchors.top: parent.top
+                        anchors.left: parent.left
+                        anchors.right: parent.right
+
+                        anchors.leftMargin: 16
+                        anchors.rightMargin: 16
+
+                        spacing: 0
+
+                        HeaderType {
+                            Layout.fillWidth: true
+
+                            headerText: qsTr("OpenVPN settings")
+                        }
+
+                        TextFieldWithHeaderType {
+                            Layout.fillWidth: true
+                            Layout.topMargin: 32
+
+                            headerText: qsTr("VPN Addresses Subnet")
+                            textFieldText: subnetAddress
+
+                            textField.onEditingFinished: {
+                                if (textFieldText !== subnetAddress) {
+                                    subnetAddress = textFieldText
+                                }
+                            }
+                        }
+
+                        ParagraphTextType {
+                            Layout.fillWidth: true
+                            Layout.topMargin: 32
+
+                            text: qsTr("Network protocol")
+                        }
+
+                        TransportProtoSelector {
+                            Layout.fillWidth: true
+                            Layout.topMargin: 16
+                            rootWidth: root.width
+
+                            enabled: isTransportProtoEditable
+
+                            currentIndex: {
+                                return transportProto === "tcp" ? 1 : 0
+                            }
+
+                            onCurrentIndexChanged: {
+                                if (transportProto === "tcp" && currentIndex === 0) {
+                                    transportProto = "udp"
+                                } else if (transportProto === "udp" && currentIndex === 1) {
+                                    transportProto = "tcp"
+                                }
+                            }
+                        }
+
+                        TextFieldWithHeaderType {
+                            Layout.fillWidth: true
+                            Layout.topMargin: 40
+
+                            enabled: isPortEditable
+
+                            headerText: qsTr("Port")
+                            textFieldText: port
+
+                            textField.onEditingFinished: {
+                                if (textFieldText !== port) {
+                                    port = textFieldText
+                                }
+                            }
+                        }
+
+                        SwitcherType {
+                            id: autoNegotiateEncryprionSwitcher
+
+                            Layout.fillWidth: true
+                            Layout.topMargin: 24
+
+                            text: qsTr("Auto-negotiate encryption")
+                            checked: autoNegotiateEncryprion
+
+                            onCheckedChanged: {
+                                if (checked !== autoNegotiateEncryprion) {
+                                    autoNegotiateEncryprion = checked
+                                }
+                            }
+                        }
+
+                        DropDownType {
+                            id: hashDropDown
+                            Layout.fillWidth: true
+                            Layout.topMargin: 20
+                            implicitHeight: 74
+
+                            enabled: !autoNegotiateEncryprionSwitcher.checked
+
+                            descriptionText: qsTr("Hash")
+                            headerText: qsTr("Hash")
+
+                            listView: ListViewType {
+                                id: hashListView
+
+                                rootWidth: root.width
+
+                                model: ListModel {
+                                    ListElement { name : qsTr("SHA512") }
+                                    ListElement { name : qsTr("SHA384") }
+                                    ListElement { name : qsTr("SHA256") }
+                                    ListElement { name : qsTr("SHA3-512") }
+                                    ListElement { name : qsTr("SHA3-384") }
+                                    ListElement { name : qsTr("SHA3-256") }
+                                    ListElement { name : qsTr("whirlpool") }
+                                    ListElement { name : qsTr("BLAKE2b512") }
+                                    ListElement { name : qsTr("BLAKE2s256") }
+                                    ListElement { name : qsTr("SHA1") }
+                                }
+
+                                clickedFunction: function() {
+                                    hashDropDown.text = selectedText
+                                    hash = hashDropDown.text
+                                    hashDropDown.menuVisible = false
+                                }
+
+                                Component.onCompleted: {
+                                    hashDropDown.text = hash
+
+                                    for (var i = 0; i < hashListView.model.count; i++) {
+                                        if (hashListView.model.get(i).name === hashDropDown.text) {
+                                            currentIndex = i
+                                        }
+                                    }
+                                }
+                            }
+                        }
+
+                        DropDownType {
+                            id: cipherDropDown
+                            Layout.fillWidth: true
+                            Layout.topMargin: 16
+                            implicitHeight: 74
+
+                            enabled: !autoNegotiateEncryprionSwitcher.checked
+
+                            descriptionText: qsTr("Cipher")
+                            headerText: qsTr("Cipher")
+
+                            listView: ListViewType {
+                                id: cipherListView
+
+                                rootWidth: root.width
+
+                                model: ListModel {
+                                    ListElement { name : qsTr("AES-256-GCM") }
+                                    ListElement { name : qsTr("AES-192-GCM") }
+                                    ListElement { name : qsTr("AES-128-GCM") }
+                                    ListElement { name : qsTr("AES-256-CBC") }
+                                    ListElement { name : qsTr("AES-192-CBC") }
+                                    ListElement { name : qsTr("AES-128-CBC") }
+                                    ListElement { name : qsTr("ChaCha20-Poly1305") }
+                                    ListElement { name : qsTr("ARIA-256-CBC") }
+                                    ListElement { name : qsTr("CAMELLIA-256-CBC") }
+                                    ListElement { name : qsTr("none") }
+                                }
+
+                                clickedFunction: function() {
+                                    cipherDropDown.text = selectedText
+                                    cipher = cipherDropDown.text
+                                    cipherDropDown.menuVisible = false
+                                }
+
+                                Component.onCompleted: {
+                                    cipherDropDown.text = cipher
+
+                                    for (var i = 0; i < cipherListView.model.count; i++) {
+                                        if (cipherListView.model.get(i).name === cipherDropDown.text) {
+                                            currentIndex = i
+                                        }
+                                    }
+                                }
+                            }
+                        }
+
+                        Rectangle {
+                            Layout.fillWidth: true
+                            Layout.topMargin: 32
+                            Layout.preferredHeight: checkboxLayout.implicitHeight
+                            color: "#1C1D21"
+                            radius: 16
+
+                            ColumnLayout {
+                                id: checkboxLayout
+                                CheckBoxType {
+                                    Layout.fillWidth: true
+
+                                    text: qsTr("TLS auth")
+                                    checked: tlsAuth
+
+                                    onCheckedChanged: {
+                                        if (checked !== tlsAuth) {
+                                            tlsAuth = checked
+                                        }
+                                    }
+                                }
+
+                                DividerType {}
+
+                                CheckBoxType {
+                                    Layout.fillWidth: true
+
+                                    text: qsTr("Block DNS requests outside of VPN")
+                                    checked: blockDns
+
+                                    onCheckedChanged: {
+                                        if (checked !== blockDns) {
+                                            blockDns = checked
+                                        }
+                                    }
+                                }
+                            }
+                        }
+
+                        SwitcherType {
+                            id: additionalClientCommandsSwitcher
+                            Layout.fillWidth: true
+                            Layout.topMargin: 32
+
+                            checked: additionalClientCommands !== ""
+
+                            text: qsTr("Additional client configuration commands")
+                        }
+
+                        Rectangle {
+                            Layout.fillWidth: true
+                            Layout.topMargin: 16
+
+                            height: 148
+                            color: "#1C1D21"
+                            border.width: 1
+                            border.color: "#2C2D30"
+                            radius: 16
+                            visible: additionalClientCommandsSwitcher.checked
+
+                            FlickableType {
+                                anchors.top: parent.top
+                                anchors.bottom: parent.bottom
+                                contentHeight: additionalClientCommandsTextArea.implicitHeight
+                                TextArea {
+                                    id: additionalClientCommandsTextArea
+
+                                    width: parent.width
+                                    anchors.topMargin: 16
+                                    anchors.bottomMargin: 16
+
+                                    topPadding: 16
+                                    leftPadding: 16
+
+                                    color: "#D7D8DB"
+                                    selectionColor:  "#412102"
+                                    selectedTextColor: "#D7D8DB"
+                                    placeholderTextColor: "#878B91"
+
+                                    font.pixelSize: 16
+                                    font.weight: Font.Medium
+                                    font.family: "PT Root UI VF"
+
+                                    placeholderText: qsTr("Commands:")
+                                    text: additionalClientCommands
+
+                                    wrapMode: Text.Wrap
+
+                                    onEditingFinished: {
+                                        if (additionalClientCommands !== text) {
+                                            additionalClientCommands = text
+                                        }
+                                    }
+                                }
+                            }
+                        }
+
+                        SwitcherType {
+                            id: additionalServerCommandsSwitcher
+                            Layout.fillWidth: true
+                            Layout.topMargin: 16
+
+                            checked: additionalServerCommands !== ""
+
+                            text: qsTr("Additional server configuration commands")
+                        }
+
+                        Rectangle {
+                            Layout.fillWidth: true
+                            Layout.topMargin: 16
+
+                            height: 148
+                            color: "#1C1D21"
+                            border.width: 1
+                            border.color: "#2C2D30"
+                            radius: 16
+                            visible: additionalServerCommandsSwitcher.checked
+
+                            FlickableType {
+                                anchors.top: parent.top
+                                anchors.bottom: parent.bottom
+                                contentHeight: additionalServerCommandsTextArea.implicitHeight
+                                TextArea {
+                                    id: additionalServerCommandsTextArea
+
+                                    width: parent.width
+                                    anchors.topMargin: 16
+                                    anchors.bottomMargin: 16
+
+                                    topPadding: 16
+                                    leftPadding: 16
+
+                                    color: "#D7D8DB"
+                                    selectionColor:  "#412102"
+                                    selectedTextColor: "#D7D8DB"
+                                    placeholderTextColor: "#878B91"
+
+                                    font.pixelSize: 16
+                                    font.weight: Font.Medium
+                                    font.family: "PT Root UI VF"
+
+                                    placeholderText: qsTr("Commands:")
+                                    text: additionalServerCommands
+
+                                    wrapMode: Text.Wrap
+
+                                    onEditingFinished: {
+                                        if (additionalServerCommands !== text) {
+                                            additionalServerCommands = text
+                                        }
+                                    }
+                                }
+                            }
+                        }
+
+                        BasicButtonType {
+                            Layout.topMargin: 24
+
+                            defaultColor: "transparent"
+                            hoveredColor: Qt.rgba(1, 1, 1, 0.08)
+                            pressedColor: Qt.rgba(1, 1, 1, 0.12)
+                            textColor: "#EB5757"
+
+                            text: qsTr("Remove OpenVPN")
+
+                            onClicked: {
+                                questionDrawer.headerText = qsTr("Remove OpenVpn from server?")
+//                                questionDrawer.descriptionText = qsTr("")
+                                questionDrawer.yesButtonText = qsTr("Continue")
+                                questionDrawer.noButtonText = qsTr("Cancel")
+
+                                questionDrawer.yesButtonFunction = function() {
+                                    questionDrawer.visible = false
+                                    goToPage(PageEnum.PageDeinstalling)
+                                    ContainersModel.removeCurrentlyProcessedContainer()
+                                    closePage()
+                                    closePage() //todo auto close to deinstall page?
+                                }
+                                questionDrawer.noButtonFunction = function() {
+                                    questionDrawer.visible = false
+                                }
+                                questionDrawer.visible = true
+                            }
+                        }
+
+                        BasicButtonType {
+                            Layout.fillWidth: true
+                            Layout.topMargin: 24
+                            Layout.bottomMargin: 24
+
+                            text: qsTr("Save and Restart Amnesia")
+
+                            onClicked: {
+                                forceActiveFocus()
+                                PageController.showBusyIndicator(true)
+                                InstallController.updateContainer(OpenVpnConfigModel.getConfig())
+                                PageController.showBusyIndicator(false)
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        QuestionDrawer {
+            id: questionDrawer
+        }
+    }
+}
diff --git a/client/ui/qml/Pages2/PageProtocolShadowSocksSettings.qml b/client/ui/qml/Pages2/PageProtocolShadowSocksSettings.qml
new file mode 100644
index 00000000..57006cc4
--- /dev/null
+++ b/client/ui/qml/Pages2/PageProtocolShadowSocksSettings.qml
@@ -0,0 +1,162 @@
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+
+import SortFilterProxyModel 0.2
+
+import "./"
+import "../Controls2"
+import "../Controls2/TextTypes"
+import "../Config"
+import "../Components"
+
+PageType {
+    id: root
+
+    //todo move to main?
+    Connections {
+        target: InstallController
+
+        function onInstallationErrorOccurred(errorMessage) {
+            PageController.showErrorMessage(errorMessage)
+        }
+
+        function onUpdateContainerFinished() {
+            //todo change to notification
+            PageController.showErrorMessage(qsTr("Settings updated successfully"))
+        }
+    }
+
+    ColumnLayout {
+        id: backButton
+
+        anchors.top: parent.top
+        anchors.left: parent.left
+        anchors.right: parent.right
+
+        anchors.topMargin: 20
+
+        BackButtonType {
+        }
+    }
+
+    FlickableType {
+        id: fl
+        anchors.top: backButton.bottom
+        anchors.bottom: parent.bottom
+        contentHeight: content.implicitHeight
+
+        Column {
+            id: content
+
+            anchors.top: parent.top
+            anchors.left: parent.left
+            anchors.right: parent.right
+
+            ListView {
+                id: listview
+
+                width: parent.width
+                height: listview.contentItem.height
+
+                clip: true
+                interactive: false
+
+                model: ShadowSocksConfigModel
+
+                delegate: Item {
+                    implicitWidth: listview.width
+                    implicitHeight: col.implicitHeight
+
+                    ColumnLayout {
+                        id: col
+
+                        anchors.top: parent.top
+                        anchors.left: parent.left
+                        anchors.right: parent.right
+
+                        anchors.leftMargin: 16
+                        anchors.rightMargin: 16
+
+                        spacing: 0
+
+                        HeaderType {
+                            Layout.fillWidth: true
+
+                            headerText: qsTr("ShadowSocks settings")
+                        }
+
+                        TextFieldWithHeaderType {
+                            Layout.fillWidth: true
+                            Layout.topMargin: 40
+
+                            headerText: qsTr("Port")
+                            textFieldText: port
+
+                            textField.onEditingFinished: {
+                                if (textFieldText !== port) {
+                                    port = textFieldText
+                                }
+                            }
+                        }
+
+                        DropDownType {
+                            id: cipherDropDown
+                            Layout.fillWidth: true
+                            Layout.topMargin: 20
+                            implicitHeight: 74
+
+                            descriptionText: qsTr("Cipher")
+                            headerText: qsTr("Cipher")
+
+                            listView: ListViewType {
+                                id: cipherListView
+
+                                rootWidth: root.width
+
+                                model: ListModel {
+                                    ListElement { name : "chacha20-ietf-poly1305" }
+                                    ListElement { name : "xchacha20-ietf-poly1305" }
+                                    ListElement { name : "aes-256-gcm" }
+                                    ListElement { name : "aes-192-gcm" }
+                                    ListElement { name : "aes-128-gcm" }
+                                }
+
+                                clickedFunction: function() {
+                                    cipherDropDown.text = selectedText
+                                    cipher = cipherDropDown.text
+                                    cipherDropDown.menuVisible = false
+                                }
+
+                                Component.onCompleted: {
+                                    cipherDropDown.text = cipher
+
+                                    for (var i = 0; i < cipherListView.model.count; i++) {
+                                        if (cipherListView.model.get(i).name === cipherDropDown.text) {
+                                            currentIndex = i
+                                        }
+                                    }
+                                }
+                            }
+                        }
+
+                        BasicButtonType {
+                            Layout.fillWidth: true
+                            Layout.topMargin: 24
+                            Layout.bottomMargin: 24
+
+                            text: qsTr("Save and Restart Amnesia")
+
+                            onClicked: {
+                                forceActiveFocus()
+                                PageController.showBusyIndicator(true)
+                                InstallController.updateContainer(ShadowSocksConfigModel.getConfig())
+                                PageController.showBusyIndicator(false)
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/client/ui/qml/Pages2/PageSettingsServerProtocol.qml b/client/ui/qml/Pages2/PageSettingsServerProtocol.qml
index 498006df..ec2ca91f 100644
--- a/client/ui/qml/Pages2/PageSettingsServerProtocol.qml
+++ b/client/ui/qml/Pages2/PageSettingsServerProtocol.qml
@@ -6,6 +6,7 @@ import SortFilterProxyModel 0.2
 
 import PageEnum 1.0
 import ProtocolEnum 1.0
+import ContainerEnum 1.0
 import ContainerProps 1.0
 
 import "./"
@@ -13,15 +14,37 @@ import "../Controls2"
 import "../Controls2/TextTypes"
 import "../Config"
 import "../Components"
-import "../Components/Protocols"
 
 PageType {
     id: root
 
+    ColumnLayout {
+        id: header
+
+        anchors.top: parent.top
+        anchors.left: parent.left
+        anchors.right: parent.right
+
+        anchors.topMargin: 20
+
+        BackButtonType {
+        }
+
+        HeaderType {
+            Layout.fillWidth: true
+            Layout.leftMargin: 16
+            Layout.rightMargin: 16
+
+            headerText: ContainersModel.getCurrentlyProcessedContainerName() + qsTr(" settings")
+        }
+    }
+
     FlickableType {
         id: fl
-        anchors.fill: parent
-        contentHeight: content.height + openVpnSettings.implicitHeight
+        anchors.top: header.bottom
+        anchors.left: parent.left
+        anchors.right: parent.right
+        contentHeight: content.height
 
         Column {
             id: content
@@ -29,8 +52,7 @@ PageType {
             anchors.top: parent.top
             anchors.left: parent.left
             anchors.right: parent.right
-
-            spacing: 16
+            anchors.topMargin: 32
 
             ListView {
                 // todo change id naming
@@ -39,16 +61,7 @@ PageType {
                 height: container.contentItem.height
                 clip: true
                 interactive: false
-                model: SortFilterProxyModel {
-                    id: proxyContainersModel
-                    sourceModel: ContainersModel
-                    filters: [
-                        ValueFilter {
-                            roleName: "isCurrentlyProcessed"
-                            value: true
-                        }
-                    ]
-                }
+                model: ProtocolsModel
 
                 delegate: Item {
                     implicitWidth: container.width
@@ -58,24 +71,60 @@ PageType {
                         id: delegateContent
 
                         anchors.fill: parent
-                        anchors.rightMargin: 16
-                        anchors.leftMargin: 16
 
-                        HeaderType {
+                        LabelWithButtonType {
+                            id: button
+
                             Layout.fillWidth: true
-                            Layout.topMargin: 20
 
-                            headerText: name
+                            text: protocolName
+                            rightImageSource: "qrc:/images/controls/chevron-right.svg"
+
+                            clickedFunction: function() {
+                                var containerIndex = ContainersModel.getCurrentlyProcessedContainerIndex()
+                                switch (containerIndex) {
+                                case ContainerEnum.OpenVpn: OpenVpnConfigModel.updateModel(ProtocolsModel.getConfig()); break;
+                                case ContainerEnum.ShadowSocks: ShadowSocksConfigModel.updateModel(ProtocolsModel.getConfig()); break;
+                                case ContainerEnum.Cloak: CloakConfigModel.updateModel(ProtocolsModel.getConfig()); break;
+                                case ContainerEnum.WireGuard: WireGuardConfigModel.updateModel(ProtocolsModel.getConfig()); break;
+                                case ContainerEnum.Ipsec: Ikev2ConfigModel.updateModel(ProtocolsModel.getConfig()); break;
+                                }
+                                goToPage(protocolPage);
+                            }
+
+                            MouseArea {
+                                anchors.fill: button
+                                cursorShape: Qt.PointingHandCursor
+                                enabled: false
+                            }
                         }
+
+                        DividerType {}
                     }
                 }
             }
 
-            OpenVpnSettings {
-                id: openVpnSettings
+            LabelWithButtonType {
+                id: removeButton
 
                 width: parent.width
+
+                text: qsTr("Remove ") + ContainersModel.getCurrentlyProcessedContainerName()
+                textColor: "#EB5757"
+
+                clickedFunction: function() {
+                    ContainersModel.removeCurrentlyProcessedContainer()
+                    closePage()
+                }
+
+                MouseArea {
+                    anchors.fill: removeButton
+                    cursorShape: Qt.PointingHandCursor
+                    enabled: false
+                }
             }
+
+            DividerType {}
         }
     }
 }
diff --git a/client/ui/qml/Pages2/PageSetupWizardInstalling.qml b/client/ui/qml/Pages2/PageSetupWizardInstalling.qml
index f1f5324e..2f07db18 100644
--- a/client/ui/qml/Pages2/PageSetupWizardInstalling.qml
+++ b/client/ui/qml/Pages2/PageSetupWizardInstalling.qml
@@ -14,8 +14,6 @@ import "../Config"
 PageType {
     id: root
 
-    property real progressBarValue: 0
-
     Connections {
         target: InstallController
 
@@ -128,8 +126,6 @@ PageType {
                             Layout.fillWidth: true
                             Layout.topMargin: 32
 
-//                            value: progressBarValue
-
                             Timer {
                                 id: timer
 
diff --git a/client/ui/qml/Pages2/PageSetupWizardProtocols.qml b/client/ui/qml/Pages2/PageSetupWizardProtocols.qml
index f343fabf..6a8e301f 100644
--- a/client/ui/qml/Pages2/PageSetupWizardProtocols.qml
+++ b/client/ui/qml/Pages2/PageSetupWizardProtocols.qml
@@ -44,7 +44,7 @@ PageType {
 
     FlickableType {
         id: fl
-        anchors.top: backButton.top
+        anchors.top: backButton.bottom
         anchors.bottom: parent.bottom
         contentHeight: content.implicitHeight + content.anchors.topMargin + content.anchors.bottomMargin
 
diff --git a/client/ui/qml/Pages2/PageShare.qml b/client/ui/qml/Pages2/PageShare.qml
index c83b59d5..903e5658 100644
--- a/client/ui/qml/Pages2/PageShare.qml
+++ b/client/ui/qml/Pages2/PageShare.qml
@@ -31,8 +31,6 @@ PageType {
             shareConnectionDrawer.contentVisible = false
             PageController.showBusyIndicator(true)
 
-            console.log(type)
-
             switch (type) {
             case PageShare.ConfigType.AmneziaConnection: ExportController.generateConnectionConfig(); break;
             case PageShare.ConfigType.AmenziaFullAccess: ExportController.generateFullAccessConfig(); break;
@@ -51,6 +49,7 @@ PageType {
     }
 
     property bool showContent: false
+    property bool shareButtonEnabled: false
     property list<QtObject> connectionTypesModel: [
         amneziaConnectionFormat
     ]
@@ -180,6 +179,7 @@ PageType {
                         serverSelector.text = selectedText
                         ServersModel.currentlyProcessedIndex = currentIndex
                         protocolSelector.visible = true
+                        root.shareButtonEnabled = false
                     }
 
                     Component.onCompleted: {
@@ -253,18 +253,24 @@ PageType {
                                 currentIndex: 0
 
                                 clickedFunction: function () {
-                                    serverSelector.text += ", " + selectedText
-                                    shareConnectionDrawer.headerText = qsTr("Connection to ") + serverSelector.text
-                                    shareConnectionDrawer.configContentHeaderText = qsTr("File with connection settings to ") + serverSelector.text
-                                    ContainersModel.setCurrentlyProcessedContainerIndex(proxyContainersModel.mapToSource(currentIndex))
+                                    handler()
 
                                     protocolSelector.visible = false
                                     serverSelector.menuVisible = false
-
-                                    fillConnectionTypeModel()
                                 }
 
                                 Component.onCompleted: {
+                                    handler()
+                                }
+
+                                function handler() {
+                                    if (!proxyContainersModel.count) {
+                                        root.shareButtonEnabled = false
+                                        return
+                                    } else {
+                                        root.shareButtonEnabled = true
+                                    }
+
                                     serverSelector.text += ", " + selectedText
                                     shareConnectionDrawer.headerText = qsTr("Connection to ") + serverSelector.text
                                     shareConnectionDrawer.configContentHeaderText = qsTr("File with connection settings to ") + serverSelector.text
@@ -336,6 +342,8 @@ PageType {
                 Layout.fillWidth: true
                 Layout.topMargin: 32
 
+                enabled: shareButtonEnabled
+
                 text: qsTr("Share")
 
                 onClicked: {

From 3aaa7b62eff5f532a11b8fcff632878dabd7017f Mon Sep 17 00:00:00 2001
From: "vladimir.kuznetsov" <nethiuswork@gmail.com>
Date: Fri, 14 Jul 2023 13:14:50 +0900
Subject: [PATCH 043/278] added page to display raw config

---
 client/amnezia_application.cpp                |  15 ++
 client/amnezia_application.h                  |   2 +
 client/resources.qrc                          |   1 +
 client/ui/controllers/exportController.cpp    |  31 ++-
 client/ui/controllers/exportController.h      |   7 +-
 client/ui/controllers/pageController.h        |   4 +-
 client/ui/models/protocols_model.cpp          |  14 ++
 client/ui/models/protocols_model.h            |   3 +-
 .../Components/SettingsContainersListView.qml |  13 +-
 .../qml/Components/ShareConnectionDrawer.qml  |   2 +-
 client/ui/qml/Pages2/PageHome.qml             |   2 +-
 .../qml/Pages2/PageProtocolCloakSettings.qml  |   2 +
 .../Pages2/PageProtocolOpenVpnSettings.qml    |   2 +
 client/ui/qml/Pages2/PageProtocolRaw.qml      | 190 ++++++++++++++++++
 .../PageProtocolShadowSocksSettings.qml       |   2 +
 client/ui/qml/main2.qml                       |   6 +
 16 files changed, 266 insertions(+), 30 deletions(-)
 create mode 100644 client/ui/qml/Pages2/PageProtocolRaw.qml

diff --git a/client/amnezia_application.cpp b/client/amnezia_application.cpp
index 436dfc3f..abd839ed 100644
--- a/client/amnezia_application.cpp
+++ b/client/amnezia_application.cpp
@@ -86,6 +86,21 @@ void AmneziaApplication::init()
     initModels();
     initControllers();
 
+    m_notificationHandler.reset(NotificationHandler::create(nullptr));
+
+    connect(m_vpnConnection.get(), &VpnConnection::connectionStateChanged, m_notificationHandler.get(),
+            &NotificationHandler::setConnectionState);
+
+    void openConnection();
+    void closeConnection();
+
+    connect(m_notificationHandler.get(), &NotificationHandler::raiseRequested, m_pageController.get(),
+            &PageController::raise);
+    connect(m_notificationHandler.get(), &NotificationHandler::connectRequested, m_connectionController.get(),
+            &ConnectionController::openConnection);
+    connect(m_notificationHandler.get(), &NotificationHandler::disconnectRequested, m_connectionController.get(),
+            &ConnectionController::closeConnection);
+
     //
 
     m_engine->load(url);
diff --git a/client/amnezia_application.h b/client/amnezia_application.h
index fabc7818..6e9fcdf0 100644
--- a/client/amnezia_application.h
+++ b/client/amnezia_application.h
@@ -22,6 +22,7 @@
 #include "ui/models/containers_model.h"
 #include "ui/models/languageModel.h"
 #include "ui/models/protocols/cloakConfigModel.h"
+#include "ui/notificationhandler.h"
 #ifdef Q_OS_WINDOWS
     #include "ui/models/protocols/ikev2ConfigModel.h"
 #endif
@@ -91,6 +92,7 @@ private:
 #endif
 
     QSharedPointer<VpnConnection> m_vpnConnection;
+    QScopedPointer<NotificationHandler> m_notificationHandler;
 
     QScopedPointer<ConnectionController> m_connectionController;
     QScopedPointer<PageController> m_pageController;
diff --git a/client/resources.qrc b/client/resources.qrc
index dd75555f..df6fcb3e 100644
--- a/client/resources.qrc
+++ b/client/resources.qrc
@@ -273,5 +273,6 @@
         <file>ui/qml/Pages2/PageProtocolOpenVpnSettings.qml</file>
         <file>ui/qml/Pages2/PageProtocolShadowSocksSettings.qml</file>
         <file>ui/qml/Pages2/PageProtocolCloakSettings.qml</file>
+        <file>ui/qml/Pages2/PageProtocolRaw.qml</file>
     </qresource>
 </RCC>
diff --git a/client/ui/controllers/exportController.cpp b/client/ui/controllers/exportController.cpp
index 5cd9a83d..c989422d 100644
--- a/client/ui/controllers/exportController.cpp
+++ b/client/ui/controllers/exportController.cpp
@@ -36,10 +36,9 @@ void ExportController::generateFullAccessConfig()
 
     QByteArray compressedConfig = QJsonDocument(config).toJson();
     compressedConfig = qCompress(compressedConfig, 8);
-    m_rawConfig = QString("vpn://%1")
-                          .arg(QString(compressedConfig.toBase64(QByteArray::Base64UrlEncoding
-                                                                 | QByteArray::OmitTrailingEquals)));
-    m_formattedConfig = m_rawConfig;
+    m_config = QString("vpn://%1")
+                       .arg(QString(compressedConfig.toBase64(QByteArray::Base64UrlEncoding
+                                                              | QByteArray::OmitTrailingEquals)));
 
     m_qrCodes = generateQrCodeImageSeries(compressedConfig);
     emit exportConfigChanged();
@@ -88,10 +87,9 @@ void ExportController::generateConnectionConfig()
 
     QByteArray compressedConfig = QJsonDocument(config).toJson();
     compressedConfig = qCompress(compressedConfig, 8);
-    m_rawConfig = QString("vpn://%1")
-                          .arg(QString(compressedConfig.toBase64(QByteArray::Base64UrlEncoding
-                                                                 | QByteArray::OmitTrailingEquals)));
-    m_formattedConfig = m_rawConfig;
+    m_config = QString("vpn://%1")
+                       .arg(QString(compressedConfig.toBase64(QByteArray::Base64UrlEncoding
+                                                              | QByteArray::OmitTrailingEquals)));
 
     m_qrCodes = generateQrCodeImageSeries(compressedConfig);
     emit exportConfigChanged();
@@ -120,12 +118,10 @@ void ExportController::generateOpenVpnConfig()
     }
     config = m_configurator->processConfigWithExportSettings(serverIndex, container, Proto::OpenVpn, config);
 
-    m_rawConfig = config;
-
     auto configJson = QJsonDocument::fromJson(config.toUtf8()).object();
     QStringList lines = configJson.value(config_key::config).toString().replace("\r", "").split("\n");
     for (const QString &line : lines) {
-        m_formattedConfig.append(line + "\n");
+        m_config.append(line + "\n");
     }
 
     emit exportConfigChanged();
@@ -154,20 +150,18 @@ void ExportController::generateWireGuardConfig()
     }
     config = m_configurator->processConfigWithExportSettings(serverIndex, container, Proto::WireGuard, config);
 
-    m_rawConfig = config;
-
     auto configJson = QJsonDocument::fromJson(config.toUtf8()).object();
     QStringList lines = configJson.value(config_key::config).toString().replace("\r", "").split("\n");
     for (const QString &line : lines) {
-        m_formattedConfig.append(line + "\n");
+        m_config.append(line + "\n");
     }
 
     emit exportConfigChanged();
 }
 
-QString ExportController::getFormattedConfig()
+QString ExportController::getConfig()
 {
-    return m_formattedConfig;
+    return m_config;
 }
 
 QList<QString> ExportController::getQrCodes()
@@ -193,7 +187,7 @@ void ExportController::saveFile()
     QFile save(fileName.toLocalFile());
 
     save.open(QIODevice::WriteOnly);
-    save.write(m_rawConfig.toUtf8());
+    save.write(m_config.toUtf8());
     save.close();
 
     QFileInfo fi(fileName.toLocalFile());
@@ -233,7 +227,6 @@ int ExportController::getQrCodesCount()
 
 void ExportController::clearPreviousConfig()
 {
-    m_rawConfig.clear();
-    m_formattedConfig.clear();
+    m_config.clear();
     m_qrCodes.clear();
 }
diff --git a/client/ui/controllers/exportController.h b/client/ui/controllers/exportController.h
index 85144978..e4a37a96 100644
--- a/client/ui/controllers/exportController.h
+++ b/client/ui/controllers/exportController.h
@@ -18,7 +18,7 @@ public:
 
     Q_PROPERTY(QList<QString> qrCodes READ getQrCodes NOTIFY exportConfigChanged)
     Q_PROPERTY(int qrCodesCount READ getQrCodesCount NOTIFY exportConfigChanged)
-    Q_PROPERTY(QString formattedConfig READ getFormattedConfig NOTIFY exportConfigChanged)
+    Q_PROPERTY(QString config READ getConfig NOTIFY exportConfigChanged)
 
 public slots:
     void generateFullAccessConfig();
@@ -26,7 +26,7 @@ public slots:
     void generateOpenVpnConfig();
     void generateWireGuardConfig();
 
-    QString getFormattedConfig();
+    QString getConfig();
     QList<QString> getQrCodes();
 
     void saveFile();
@@ -50,8 +50,7 @@ private:
     std::shared_ptr<Settings> m_settings;
     std::shared_ptr<VpnConfigurator> m_configurator;
 
-    QString m_rawConfig;
-    QString m_formattedConfig;
+    QString m_config;
     QList<QString> m_qrCodes;
 };
 
diff --git a/client/ui/controllers/pageController.h b/client/ui/controllers/pageController.h
index 468068b8..05b8fbf9 100644
--- a/client/ui/controllers/pageController.h
+++ b/client/ui/controllers/pageController.h
@@ -42,7 +42,8 @@ namespace PageLoader
         PageProtocolShadowSocksSettings,
         PageProtocolCloakSettings,
         PageProtocolWireGuardSettings,
-        PageProtocolIKev2Settings
+        PageProtocolIKev2Settings,
+        PageProtocolRaw
     };
     Q_ENUM_NS(PageEnum)
 
@@ -70,6 +71,7 @@ signals:
     void showErrorMessage(QString errorMessage);
     void showInfoMessage(QString message);
     void showBusyIndicator(bool visible);
+    void raise();
 
 private:
     QSharedPointer<ServersModel> m_serversModel;
diff --git a/client/ui/models/protocols_model.cpp b/client/ui/models/protocols_model.cpp
index ac271eb9..da730f55 100644
--- a/client/ui/models/protocols_model.cpp
+++ b/client/ui/models/protocols_model.cpp
@@ -17,6 +17,7 @@ QHash<int, QByteArray> ProtocolsModel::roleNames() const
 
     roles[ProtocolNameRole] = "protocolName";
     roles[ProtocolPageRole] = "protocolPage";
+    roles[RawConfigRole] = "rawConfig";
 
     return roles;
 }
@@ -34,6 +35,19 @@ QVariant ProtocolsModel::data(const QModelIndex &index, int role) const
     }
     case ProtocolPageRole:
         return static_cast<int>(protocolPage(ProtocolProps::protoFromString(m_content.keys().at(index.row()))));
+    case RawConfigRole: {
+        auto protocolConfig = m_content.value(ContainerProps::containerTypeToString(m_container)).toObject();
+        auto lastConfigJsonDoc =
+                QJsonDocument::fromJson(protocolConfig.value(config_key::last_config).toString().toUtf8());
+        auto lastConfigJson = lastConfigJsonDoc.object();
+
+        QString rawConfig;
+        QStringList lines = lastConfigJson.value(config_key::config).toString().replace("\r", "").split("\n");
+        for (const QString &l : lines) {
+            rawConfig.append(l + "\n");
+        }
+        return rawConfig;
+    }
     }
 
     return QVariant();
diff --git a/client/ui/models/protocols_model.h b/client/ui/models/protocols_model.h
index 1e279cfb..c4ad5c70 100644
--- a/client/ui/models/protocols_model.h
+++ b/client/ui/models/protocols_model.h
@@ -13,7 +13,8 @@ class ProtocolsModel : public QAbstractListModel
 public:
     enum Roles {
         ProtocolNameRole = Qt::UserRole + 1,
-        ProtocolPageRole
+        ProtocolPageRole,
+        RawConfigRole
     };
 
     ProtocolsModel(std::shared_ptr<Settings> settings, QObject *parent = nullptr);
diff --git a/client/ui/qml/Components/SettingsContainersListView.qml b/client/ui/qml/Components/SettingsContainersListView.qml
index 7204ac16..d2f3ee81 100644
--- a/client/ui/qml/Components/SettingsContainersListView.qml
+++ b/client/ui/qml/Components/SettingsContainersListView.qml
@@ -7,6 +7,7 @@ import SortFilterProxyModel 0.2
 import PageEnum 1.0
 import ProtocolEnum 1.0
 import ContainerEnum 1.0
+import ContainerProps 1.0
 
 import "../Controls2"
 import "../Controls2/TextTypes"
@@ -91,19 +92,25 @@ ListView {
                 if (isInstalled) {
                     var containerIndex = root.model.mapToSource(index)
                     ContainersModel.setCurrentlyProcessedContainerIndex(containerIndex)
+                    if (config[ContainerProps.containerTypeToString(containerIndex)]["isThirdPartyConfig"]) {
+                        ProtocolsModel.updateModel(config)
+                        goToPage(PageEnum.PageProtocolRaw)
+                        return
+                    }
+
                     switch (containerIndex) {
                     case ContainerEnum.OpenVpn: {
-                        OpenVpnConfigModel.updateModel(ProtocolsModel.getConfig())
+                        OpenVpnConfigModel.updateModel(config)
                         goToPage(PageEnum.PageProtocolOpenVpnSettings)
                         break
                     }
                     case ContainerEnum.WireGuard: {
-                        WireGuardConfigModel.updateModel(ProtocolsModel.getConfig())
+                        WireGuardConfigModel.updateModel(config)
                         goToPage(PageEnum.PageProtocolWireGuardSettings)
                         break
                     }
                     case ContainerEnum.Ipsec: {
-                        Ikev2ConfigModel.updateModel(ProtocolsModel.getConfig())
+                        Ikev2ConfigModel.updateModel(config)
                         goToPage(PageEnum.PageProtocolIKev2Settings)
                         break
                     }
diff --git a/client/ui/qml/Components/ShareConnectionDrawer.qml b/client/ui/qml/Components/ShareConnectionDrawer.qml
index 275e41ea..05df413c 100644
--- a/client/ui/qml/Components/ShareConnectionDrawer.qml
+++ b/client/ui/qml/Components/ShareConnectionDrawer.qml
@@ -156,7 +156,7 @@ DrawerType {
                                 font.weight: Font.Medium
                                 font.family: "PT Root UI VF"
 
-                                text: ExportController.formattedConfig
+                                text: ExportController.config
 
                                 wrapMode: Text.Wrap
 
diff --git a/client/ui/qml/Pages2/PageHome.qml b/client/ui/qml/Pages2/PageHome.qml
index ab1eeba1..b7d44c78 100644
--- a/client/ui/qml/Pages2/PageHome.qml
+++ b/client/ui/qml/Pages2/PageHome.qml
@@ -102,7 +102,7 @@ PageType {
                         description += "Amnezia DNS | "
                     }
                 } else {
-                    if (ServersModel.isDefaultServerConfigContainsAmneziaDns) {
+                    if (ServersModel.isDefaultServerConfigContainsAmneziaDns()) {
                         description += "Amnezia DNS | "
                     }
                 }
diff --git a/client/ui/qml/Pages2/PageProtocolCloakSettings.qml b/client/ui/qml/Pages2/PageProtocolCloakSettings.qml
index 9ee67303..33d231b5 100644
--- a/client/ui/qml/Pages2/PageProtocolCloakSettings.qml
+++ b/client/ui/qml/Pages2/PageProtocolCloakSettings.qml
@@ -53,6 +53,8 @@ PageType {
             anchors.left: parent.left
             anchors.right: parent.right
 
+            enabled: ServersModel.isCurrentlyProcessedServerHasWriteAccess()
+
             ListView {
                 id: listview
 
diff --git a/client/ui/qml/Pages2/PageProtocolOpenVpnSettings.qml b/client/ui/qml/Pages2/PageProtocolOpenVpnSettings.qml
index 8e5556d0..0bad68e9 100644
--- a/client/ui/qml/Pages2/PageProtocolOpenVpnSettings.qml
+++ b/client/ui/qml/Pages2/PageProtocolOpenVpnSettings.qml
@@ -54,6 +54,8 @@ PageType {
             anchors.left: parent.left
             anchors.right: parent.right
 
+            enabled: ServersModel.isCurrentlyProcessedServerHasWriteAccess()
+
             ListView {
                 id: listview
 
diff --git a/client/ui/qml/Pages2/PageProtocolRaw.qml b/client/ui/qml/Pages2/PageProtocolRaw.qml
new file mode 100644
index 00000000..377d948e
--- /dev/null
+++ b/client/ui/qml/Pages2/PageProtocolRaw.qml
@@ -0,0 +1,190 @@
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+
+import SortFilterProxyModel 0.2
+
+import PageEnum 1.0
+import ProtocolEnum 1.0
+import ContainerEnum 1.0
+import ContainerProps 1.0
+
+import "./"
+import "../Controls2"
+import "../Controls2/TextTypes"
+import "../Config"
+import "../Components"
+
+PageType {
+    id: root
+
+    ColumnLayout {
+        id: header
+
+        anchors.top: parent.top
+        anchors.left: parent.left
+        anchors.right: parent.right
+
+        anchors.topMargin: 20
+
+        BackButtonType {
+        }
+
+        HeaderType {
+            Layout.fillWidth: true
+            Layout.leftMargin: 16
+            Layout.rightMargin: 16
+
+            headerText: ContainersModel.getCurrentlyProcessedContainerName() + qsTr(" settings")
+        }
+    }
+
+    FlickableType {
+        id: fl
+        anchors.top: header.bottom
+        anchors.left: parent.left
+        anchors.right: parent.right
+        contentHeight: content.height
+
+        Column {
+            id: content
+
+            anchors.top: parent.top
+            anchors.left: parent.left
+            anchors.right: parent.right
+            anchors.topMargin: 32
+
+            ListView {
+                width: parent.width
+                height: contentItem.height
+                clip: true
+                interactive: false
+                model: ProtocolsModel
+
+                delegate: Item {
+                    implicitWidth: parent.width
+                    implicitHeight: delegateContent.implicitHeight
+
+                    ColumnLayout {
+                        id: delegateContent
+
+                        anchors.fill: parent
+
+                        LabelWithButtonType {
+                            id: button
+
+                            Layout.fillWidth: true
+
+                            text: qsTr("Show connection options")
+
+                            clickedFunction: function() {
+                                configContentDrawer.open()
+                            }
+
+                            MouseArea {
+                                anchors.fill: button
+                                cursorShape: Qt.PointingHandCursor
+                                enabled: false
+                            }
+                        }
+
+                        DividerType {}
+
+                        DrawerType {
+                            id: configContentDrawer
+
+                            width: parent.width
+                            height: parent.height * 0.9
+
+                            BackButtonType {
+                                id: backButton
+
+                                anchors.top: parent.top
+                                anchors.left: parent.left
+                                anchors.right: parent.right
+                                anchors.topMargin: 16
+
+                                backButtonFunction: function() {
+                                    configContentDrawer.visible = false
+                                }
+                            }
+
+                            FlickableType {
+                                anchors.top: backButton.bottom
+                                anchors.left: parent.left
+                                anchors.right: parent.right
+                                anchors.bottom: parent.bottom
+                                contentHeight: configContent.implicitHeight + configContent.anchors.topMargin + configContent.anchors.bottomMargin
+
+                                ColumnLayout {
+                                    id: configContent
+
+                                    anchors.fill: parent
+                                    anchors.rightMargin: 16
+                                    anchors.leftMargin: 16
+
+                                    Header2Type {
+                                        Layout.fillWidth: true
+                                        Layout.topMargin: 16
+
+                                        headerText: qsTr("Connection options ") + protocolName
+                                    }
+
+                                    TextArea {
+                                        id: configText
+
+                                        Layout.fillWidth: true
+                                        Layout.topMargin: 16
+                                        Layout.bottomMargin: 16
+
+                                        padding: 0
+                                        leftPadding: 0
+                                        height: 24
+
+                                        color: "#D7D8DB"
+                                        selectionColor:  "#412102"
+                                        selectedTextColor: "#D7D8DB"
+
+                                        font.pixelSize: 16
+                                        font.weight: Font.Medium
+                                        font.family: "PT Root UI VF"
+
+                                        text: rawConfig
+
+                                        wrapMode: Text.Wrap
+
+                                        background: Rectangle {
+                                            color: "transparent"
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+
+            LabelWithButtonType {
+                id: removeButton
+
+                width: parent.width
+
+                text: qsTr("Remove ") + ContainersModel.getCurrentlyProcessedContainerName()
+                textColor: "#EB5757"
+
+                clickedFunction: function() {
+                    ContainersModel.removeCurrentlyProcessedContainer()
+                    closePage()
+                }
+
+                MouseArea {
+                    anchors.fill: removeButton
+                    cursorShape: Qt.PointingHandCursor
+                    enabled: false
+                }
+            }
+
+            DividerType {}
+        }
+    }
+}
diff --git a/client/ui/qml/Pages2/PageProtocolShadowSocksSettings.qml b/client/ui/qml/Pages2/PageProtocolShadowSocksSettings.qml
index 57006cc4..730e3907 100644
--- a/client/ui/qml/Pages2/PageProtocolShadowSocksSettings.qml
+++ b/client/ui/qml/Pages2/PageProtocolShadowSocksSettings.qml
@@ -53,6 +53,8 @@ PageType {
             anchors.left: parent.left
             anchors.right: parent.right
 
+            enabled: ServersModel.isCurrentlyProcessedServerHasWriteAccess()
+
             ListView {
                 id: listview
 
diff --git a/client/ui/qml/main2.qml b/client/ui/qml/main2.qml
index 0be8e368..8ad71d0f 100644
--- a/client/ui/qml/main2.qml
+++ b/client/ui/qml/main2.qml
@@ -48,5 +48,11 @@ Window  {
             }
             rootStackView.replace(pagePath, { "objectName" : pagePath })
         }
+
+        function onRaise() {
+            root.show()
+            root.raise()
+            root.requestActivate()
+        }
     }
 }

From 75489c00c28c4c7022ede605789183eecf093042 Mon Sep 17 00:00:00 2001
From: "vladimir.kuznetsov" <nethiuswork@gmail.com>
Date: Fri, 14 Jul 2023 22:59:49 +0900
Subject: [PATCH 044/278] added button 'Reset settings and remove all data from
 the application'

---
 client/core/servercontroller.cpp              | 486 +++++++++---------
 client/core/servercontroller.h                |  59 ++-
 client/resources.qrc                          |   1 +
 client/secure_qsettings.cpp                   |  55 +-
 client/secure_qsettings.h                     |  19 +-
 client/settings.cpp                           |  80 +--
 client/settings.h                             |   2 +
 client/ui/controllers/installController.cpp   |  17 +-
 client/ui/controllers/pageController.h        |   1 +
 client/ui/controllers/settingsController.cpp  |  10 +-
 client/ui/controllers/settingsController.h    |   8 +-
 client/ui/models/languageModel.cpp            |   5 +
 client/ui/models/languageModel.h              |   1 +
 .../ui/pages_logic/ServerContainersLogic.cpp  |   2 +-
 .../ui/qml/Controls2/LabelWithButtonType.qml  |   9 +-
 .../ui/qml/Pages2/PageSettingsApplication.qml |  34 ++
 client/ui/qml/Pages2/PageSettingsBackup.qml   |  90 ----
 client/ui/qml/Pages2/PageSettingsLogging.qml  | 138 +++++
 18 files changed, 585 insertions(+), 432 deletions(-)
 create mode 100644 client/ui/qml/Pages2/PageSettingsLogging.qml

diff --git a/client/core/servercontroller.cpp b/client/core/servercontroller.cpp
index 7f4690dc..409399dc 100644
--- a/client/core/servercontroller.cpp
+++ b/client/core/servercontroller.cpp
@@ -1,23 +1,23 @@
 #include "servercontroller.h"
 
+#include <QApplication>
 #include <QCryptographicHash>
 #include <QDir>
-#include <QFile>
 #include <QEventLoop>
+#include <QFile>
+#include <QFileInfo>
+#include <QJsonDocument>
+#include <QJsonObject>
 #include <QLoggingCategory>
 #include <QPointer>
-#include <QTimer>
-#include <QJsonObject>
-#include <QJsonDocument>
-#include <QApplication>
 #include <QTemporaryFile>
-#include <QFileInfo>
 #include <QThread>
+#include <QTimer>
 #include <QtConcurrent>
 
 #include <filesystem>
-#include <iostream>
 #include <fstream>
+#include <iostream>
 #include <sys/stat.h>
 
 #include <chrono>
@@ -25,15 +25,14 @@
 
 #include "containers/containers_defs.h"
 #include "logger.h"
+#include "scripts_registry.h"
 #include "server_defs.h"
 #include "settings.h"
-#include "scripts_registry.h"
 #include "utilities.h"
 
 #include <configurators/vpn_configurator.h>
 
-ServerController::ServerController(std::shared_ptr<Settings> settings, QObject *parent) :
-    m_settings(settings)
+ServerController::ServerController(std::shared_ptr<Settings> settings, QObject *parent) : m_settings(settings)
 {
 }
 
@@ -42,10 +41,10 @@ ServerController::~ServerController()
     m_sshClient.disconnectFromHost();
 }
 
-
 ErrorCode ServerController::runScript(const ServerCredentials &credentials, QString script,
-    const std::function<ErrorCode (const QString &, libssh::Client &)> &cbReadStdOut,
-    const std::function<ErrorCode (const QString &, libssh::Client &)> &cbReadStdErr) {
+                                      const std::function<ErrorCode(const QString &, libssh::Client &)> &cbReadStdOut,
+                                      const std::function<ErrorCode(const QString &, libssh::Client &)> &cbReadStdErr)
+{
 
     auto error = m_sshClient.connectToHost(credentials);
     if (error != ErrorCode::NoError) {
@@ -82,7 +81,6 @@ ErrorCode ServerController::runScript(const ServerCredentials &credentials, QStr
         qDebug().noquote() << "EXEC" << lineToExec;
         Logger::appendSshLog("Run command:" + lineToExec);
 
-
         error = m_sshClient.executeCommand(lineToExec, cbReadStdOut, cbReadStdErr);
         if (error != ErrorCode::NoError) {
             return error;
@@ -93,36 +91,36 @@ ErrorCode ServerController::runScript(const ServerCredentials &credentials, QStr
     return ErrorCode::NoError;
 }
 
-ErrorCode ServerController::runContainerScript(const ServerCredentials &credentials,
-    DockerContainer container, QString script,
-    const std::function<ErrorCode (const QString &, libssh::Client &)> &cbReadStdOut,
-    const std::function<ErrorCode (const QString &, libssh::Client &)> &cbReadStdErr)
+ErrorCode
+ServerController::runContainerScript(const ServerCredentials &credentials, DockerContainer container, QString script,
+                                     const std::function<ErrorCode(const QString &, libssh::Client &)> &cbReadStdOut,
+                                     const std::function<ErrorCode(const QString &, libssh::Client &)> &cbReadStdErr)
 {
     QString fileName = "/opt/amnezia/" + Utils::getRandomString(16) + ".sh";
     Logger::appendSshLog("Run container script for " + ContainerProps::containerToString(container) + ":\n" + script);
 
     ErrorCode e = uploadTextFileToContainer(container, credentials, script, fileName);
-    if (e) return e;
+    if (e)
+        return e;
 
     QString runner = QString("sudo docker exec -i $CONTAINER_NAME bash %1 ").arg(fileName);
-    e = runScript(credentials,
-        replaceVars(runner, genVarsForScript(credentials, container)), cbReadStdOut, cbReadStdErr);
+    e = runScript(credentials, replaceVars(runner, genVarsForScript(credentials, container)), cbReadStdOut, cbReadStdErr);
 
     QString remover = QString("sudo docker exec -i $CONTAINER_NAME rm %1 ").arg(fileName);
-    runScript(credentials,
-        replaceVars(remover, genVarsForScript(credentials, container)), cbReadStdOut, cbReadStdErr);
+    runScript(credentials, replaceVars(remover, genVarsForScript(credentials, container)), cbReadStdOut, cbReadStdErr);
 
     return e;
 }
 
-ErrorCode ServerController::uploadTextFileToContainer(DockerContainer container,
-    const ServerCredentials &credentials, const QString &file, const QString &path,
-    libssh::SftpOverwriteMode overwriteMode)
+ErrorCode ServerController::uploadTextFileToContainer(DockerContainer container, const ServerCredentials &credentials,
+                                                      const QString &file, const QString &path,
+                                                      libssh::SftpOverwriteMode overwriteMode)
 {
     ErrorCode e = ErrorCode::NoError;
     QString tmpFileName = QString("/tmp/%1.tmp").arg(Utils::getRandomString(16));
     e = uploadFileToHost(credentials, file.toUtf8(), tmpFileName);
-    if (e) return e;
+    if (e)
+        return e;
 
     QString stdOut;
     auto cbReadStd = [&](const QString &data, libssh::Client &) {
@@ -131,61 +129,63 @@ ErrorCode ServerController::uploadTextFileToContainer(DockerContainer container,
     };
 
     // mkdir
-    QString mkdir = QString("sudo docker exec -i $CONTAINER_NAME mkdir -p  \"$(dirname %1)\"")
-            .arg(path);
-
-    e = runScript(credentials,
-        replaceVars(mkdir, genVarsForScript(credentials, container)));
-    if (e) return e;
+    QString mkdir = QString("sudo docker exec -i $CONTAINER_NAME mkdir -p  \"$(dirname %1)\"").arg(path);
 
+    e = runScript(credentials, replaceVars(mkdir, genVarsForScript(credentials, container)));
+    if (e)
+        return e;
 
     if (overwriteMode == libssh::SftpOverwriteMode::SftpOverwriteExisting) {
         e = runScript(credentials,
-            replaceVars(QString("sudo docker cp %1 $CONTAINER_NAME:/%2").arg(tmpFileName).arg(path),
-                genVarsForScript(credentials, container)), cbReadStd, cbReadStd);
+                      replaceVars(QString("sudo docker cp %1 $CONTAINER_NAME:/%2").arg(tmpFileName).arg(path),
+                                  genVarsForScript(credentials, container)),
+                      cbReadStd, cbReadStd);
 
-        if (e) return e;
-    }
-    else if (overwriteMode == libssh::SftpOverwriteMode::SftpAppendToExisting) {
+        if (e)
+            return e;
+    } else if (overwriteMode == libssh::SftpOverwriteMode::SftpAppendToExisting) {
         e = runScript(credentials,
-            replaceVars(QString("sudo docker cp %1 $CONTAINER_NAME:/%2").arg(tmpFileName).arg(tmpFileName),
-                genVarsForScript(credentials, container)), cbReadStd, cbReadStd);
+                      replaceVars(QString("sudo docker cp %1 $CONTAINER_NAME:/%2").arg(tmpFileName).arg(tmpFileName),
+                                  genVarsForScript(credentials, container)),
+                      cbReadStd, cbReadStd);
 
-        if (e) return e;
+        if (e)
+            return e;
 
-        e = runScript(credentials,
-            replaceVars(QString("sudo docker exec -i $CONTAINER_NAME sh -c \"cat %1 >> %2\"").arg(tmpFileName).arg(path),
-                genVarsForScript(credentials, container)), cbReadStd, cbReadStd);
-
-        if (e) return e;
-    }
-    else return ErrorCode::NotImplementedError;
+        e = runScript(
+                credentials,
+                replaceVars(
+                        QString("sudo docker exec -i $CONTAINER_NAME sh -c \"cat %1 >> %2\"").arg(tmpFileName).arg(path),
+                        genVarsForScript(credentials, container)),
+                cbReadStd, cbReadStd);
 
+        if (e)
+            return e;
+    } else
+        return ErrorCode::NotImplementedError;
 
     if (stdOut.contains("Error: No such container:")) {
         return ErrorCode::ServerContainerMissingError;
     }
 
     runScript(credentials,
-        replaceVars(QString("sudo shred %1").arg(tmpFileName),
-              genVarsForScript(credentials, container)));
+              replaceVars(QString("sudo shred %1").arg(tmpFileName), genVarsForScript(credentials, container)));
 
-    runScript(credentials,
-            replaceVars(QString("sudo rm %1").arg(tmpFileName),
-                genVarsForScript(credentials, container)));
+    runScript(credentials, replaceVars(QString("sudo rm %1").arg(tmpFileName), genVarsForScript(credentials, container)));
 
     return e;
 }
 
-QByteArray ServerController::getTextFileFromContainer(DockerContainer container,
-    const ServerCredentials &credentials, const QString &path, ErrorCode *errorCode)
+QByteArray ServerController::getTextFileFromContainer(DockerContainer container, const ServerCredentials &credentials,
+                                                      const QString &path, ErrorCode *errorCode)
 {
 
-    if (errorCode) *errorCode = ErrorCode::NoError;
-
-    QString script = QString("sudo docker exec -i %1 sh -c \"xxd -p \'%2\'\"").
-            arg(ContainerProps::containerToString(container)).arg(path);
+    if (errorCode)
+        *errorCode = ErrorCode::NoError;
 
+    QString script = QString("sudo docker exec -i %1 sh -c \"xxd -p \'%2\'\"")
+                             .arg(ContainerProps::containerToString(container))
+                             .arg(path);
 
     QString stdOut;
     auto cbReadStdOut = [&](const QString &data, libssh::Client &) {
@@ -197,14 +197,13 @@ QByteArray ServerController::getTextFileFromContainer(DockerContainer container,
 
     qDebug().noquote() << "Copy file from container stdout : \n" << stdOut;
 
-
-    qDebug().noquote() << "Copy file from container END : \n" ;
+    qDebug().noquote() << "Copy file from container END : \n";
 
     return QByteArray::fromHex(stdOut.toUtf8());
 }
 
-ErrorCode ServerController::uploadFileToHost(const ServerCredentials &credentials, const QByteArray &data, const QString &remotePath,
-    libssh::SftpOverwriteMode overwriteMode)
+ErrorCode ServerController::uploadFileToHost(const ServerCredentials &credentials, const QByteArray &data,
+                                             const QString &remotePath, libssh::SftpOverwriteMode overwriteMode)
 {
     auto error = m_sshClient.connectToHost(credentials);
     if (error != ErrorCode::NoError) {
@@ -218,7 +217,8 @@ ErrorCode ServerController::uploadFileToHost(const ServerCredentials &credential
 
     qDebug() << "remotePath" << remotePath;
 
-    error = m_sshClient.sftpFileCopy(overwriteMode, localFile.fileName().toStdString(), remotePath.toStdString(), "non_desc");
+    error = m_sshClient.sftpFileCopy(overwriteMode, localFile.fileName().toStdString(), remotePath.toStdString(),
+                                     "non_desc");
     if (error != ErrorCode::NoError) {
         return error;
     }
@@ -227,41 +227,45 @@ ErrorCode ServerController::uploadFileToHost(const ServerCredentials &credential
 
 ErrorCode ServerController::removeAllContainers(const ServerCredentials &credentials)
 {
-    return runScript(credentials,
-        amnezia::scriptData(SharedScriptType::remove_all_containers));
+    return runScript(credentials, amnezia::scriptData(SharedScriptType::remove_all_containers));
 }
 
 ErrorCode ServerController::removeContainer(const ServerCredentials &credentials, DockerContainer container)
 {
     return runScript(credentials,
-        replaceVars(amnezia::scriptData(SharedScriptType::remove_container),
-            genVarsForScript(credentials, container)));
+                     replaceVars(amnezia::scriptData(SharedScriptType::remove_container),
+                                 genVarsForScript(credentials, container)));
 }
 
 ErrorCode ServerController::setupContainer(const ServerCredentials &credentials, DockerContainer container,
                                            QJsonObject &config, bool isUpdate)
 {
     qDebug().noquote() << "ServerController::setupContainer" << ContainerProps::containerToString(container);
-    //qDebug().noquote() << QJsonDocument(config).toJson();
+    // qDebug().noquote() << QJsonDocument(config).toJson();
     ErrorCode e = ErrorCode::NoError;
 
     e = isUserInSudo(credentials, container);
-    if (e) return e;
+    if (e)
+        return e;
 
     if (!isUpdate) {
         e = isServerPortBusy(credentials, container, config);
-        if (e) return e;
+        if (e)
+            return e;
     }
 
     e = isServerDpkgBusy(credentials, container);
-    if (e) return e;
+    if (e)
+        return e;
 
     e = installDockerWorker(credentials, container);
-    if (e) return e;
+    if (e)
+        return e;
     qDebug().noquote() << "ServerController::setupContainer installDockerWorker finished";
 
     e = prepareHostWorker(credentials, container, config);
-    if (e) return e;
+    if (e)
+        return e;
     qDebug().noquote() << "ServerController::setupContainer prepareHostWorker finished";
 
     removeContainer(credentials, container);
@@ -269,15 +273,18 @@ ErrorCode ServerController::setupContainer(const ServerCredentials &credentials,
 
     qDebug().noquote() << "buildContainerWorker start";
     e = buildContainerWorker(credentials, container, config);
-    if (e) return e;
+    if (e)
+        return e;
     qDebug().noquote() << "ServerController::setupContainer buildContainerWorker finished";
 
     e = runContainerWorker(credentials, container, config);
-    if (e) return e;
+    if (e)
+        return e;
     qDebug().noquote() << "ServerController::setupContainer runContainerWorker finished";
 
     e = configureContainerWorker(credentials, container, config);
-    if (e) return e;
+    if (e)
+        return e;
     qDebug().noquote() << "ServerController::setupContainer configureContainerWorker finished";
 
     setupServerFirewall(credentials);
@@ -287,46 +294,25 @@ ErrorCode ServerController::setupContainer(const ServerCredentials &credentials,
 }
 
 ErrorCode ServerController::updateContainer(const ServerCredentials &credentials, DockerContainer container,
-    const QJsonObject &oldConfig, QJsonObject &newConfig)
+                                            const QJsonObject &oldConfig, QJsonObject &newConfig)
 {
     bool reinstallRequired = isReinstallContainerRequired(container, oldConfig, newConfig);
-    qDebug() << "ServerController::updateContainer for container" << container << "reinstall required is" << reinstallRequired;
+    qDebug() << "ServerController::updateContainer for container" << container << "reinstall required is"
+             << reinstallRequired;
 
     if (reinstallRequired) {
         return setupContainer(credentials, container, newConfig, true);
-    }
-    else {
+    } else {
         ErrorCode e = configureContainerWorker(credentials, container, newConfig);
-        if (e) return e;
+        if (e)
+            return e;
 
         return startupContainerWorker(credentials, container, newConfig);
     }
 }
 
-QJsonObject ServerController::createContainerInitialConfig(DockerContainer container, int port, TransportProto tp)
-{
-    Proto mainProto = ContainerProps::defaultProtocol(container);
-
-    QJsonObject config {
-        { config_key::container, ContainerProps::containerToString(container) }
-    };
-
-    QJsonObject protoConfig;
-    protoConfig.insert(config_key::port, QString::number(port));
-    protoConfig.insert(config_key::transport_proto, ProtocolProps::transportProtoToString(tp, mainProto));
-
-
-    if (container == DockerContainer::Sftp) {
-        protoConfig.insert(config_key::userName, protocols::sftp::defaultUserName);
-        protoConfig.insert(config_key::password, Utils::getRandomString(10));
-    }
-
-    config.insert(ProtocolProps::protoToString(mainProto), protoConfig);
-
-    return config;
-}
-
-bool ServerController::isReinstallContainerRequired(DockerContainer container, const QJsonObject &oldConfig, const QJsonObject &newConfig)
+bool ServerController::isReinstallContainerRequired(DockerContainer container, const QJsonObject &oldConfig,
+                                                    const QJsonObject &newConfig)
 {
     Proto mainProto = ContainerProps::defaultProtocol(container);
 
@@ -334,25 +320,25 @@ bool ServerController::isReinstallContainerRequired(DockerContainer container, c
     const QJsonObject &newProtoConfig = newConfig.value(ProtocolProps::protoToString(mainProto)).toObject();
 
     if (container == DockerContainer::OpenVpn) {
-        if (oldProtoConfig.value(config_key::transport_proto).toString(protocols::openvpn::defaultTransportProto) !=
-            newProtoConfig.value(config_key::transport_proto).toString(protocols::openvpn::defaultTransportProto))
-                return true;
+        if (oldProtoConfig.value(config_key::transport_proto).toString(protocols::openvpn::defaultTransportProto)
+            != newProtoConfig.value(config_key::transport_proto).toString(protocols::openvpn::defaultTransportProto))
+            return true;
 
-        if (oldProtoConfig.value(config_key::port).toString(protocols::openvpn::defaultPort) !=
-            newProtoConfig.value(config_key::port).toString(protocols::openvpn::defaultPort))
-                return true;
+        if (oldProtoConfig.value(config_key::port).toString(protocols::openvpn::defaultPort)
+            != newProtoConfig.value(config_key::port).toString(protocols::openvpn::defaultPort))
+            return true;
     }
 
     if (container == DockerContainer::Cloak) {
-        if (oldProtoConfig.value(config_key::port).toString(protocols::cloak::defaultPort) !=
-            newProtoConfig.value(config_key::port).toString(protocols::cloak::defaultPort))
-                return true;
+        if (oldProtoConfig.value(config_key::port).toString(protocols::cloak::defaultPort)
+            != newProtoConfig.value(config_key::port).toString(protocols::cloak::defaultPort))
+            return true;
     }
 
     if (container == DockerContainer::ShadowSocks) {
-         if (oldProtoConfig.value(config_key::port).toString(protocols::shadowsocks::defaultPort) !=
-            newProtoConfig.value(config_key::port).toString(protocols::shadowsocks::defaultPort))
-                return true;
+        if (oldProtoConfig.value(config_key::port).toString(protocols::shadowsocks::defaultPort)
+            != newProtoConfig.value(config_key::port).toString(protocols::shadowsocks::defaultPort))
+            return true;
     }
 
     return false;
@@ -374,75 +360,88 @@ ErrorCode ServerController::installDockerWorker(const ServerCredentials &credent
         return ErrorCode::NoError;
     };
 
-    ErrorCode error = runScript(credentials,
-                                replaceVars(amnezia::scriptData(SharedScriptType::install_docker),
-                                            genVarsForScript(credentials)), cbReadStdOut, cbReadStdErr);
+    ErrorCode error =
+            runScript(credentials,
+                      replaceVars(amnezia::scriptData(SharedScriptType::install_docker), genVarsForScript(credentials)),
+                      cbReadStdOut, cbReadStdErr);
 
-    if (stdOut.contains("command not found")) return ErrorCode::ServerDockerFailedError;
+    if (stdOut.contains("command not found"))
+        return ErrorCode::ServerDockerFailedError;
 
     return error;
 }
 
-ErrorCode ServerController::prepareHostWorker(const ServerCredentials &credentials, DockerContainer container, const QJsonObject &config)
+ErrorCode ServerController::prepareHostWorker(const ServerCredentials &credentials, DockerContainer container,
+                                              const QJsonObject &config)
 {
     // create folder on host
-    return runScript(credentials,
-        replaceVars(amnezia::scriptData(SharedScriptType::prepare_host),
-            genVarsForScript(credentials, container)));
+    return runScript(
+            credentials,
+            replaceVars(amnezia::scriptData(SharedScriptType::prepare_host), genVarsForScript(credentials, container)));
 }
 
-ErrorCode ServerController::buildContainerWorker(const ServerCredentials &credentials, DockerContainer container, const QJsonObject &config)
+ErrorCode ServerController::buildContainerWorker(const ServerCredentials &credentials, DockerContainer container,
+                                                 const QJsonObject &config)
 {
     ErrorCode e = uploadFileToHost(credentials, amnezia::scriptData(ProtocolScriptType::dockerfile, container).toUtf8(),
-        amnezia::server::getDockerfileFolder(container) + "/Dockerfile");
+                                   amnezia::server::getDockerfileFolder(container) + "/Dockerfile");
 
-    if (e) return e;
+    if (e)
+        return e;
 
     QString stdOut;
     auto cbReadStdOut = [&](const QString &data, libssh::Client &) {
         stdOut += data + "\n";
         return ErrorCode::NoError;
     };
-//    auto cbReadStdErr = [&](const QString &data, QSharedPointer<QSsh::SshRemoteProcess> proc) {
-//        stdOut += data + "\n";
-//    };
+    //    auto cbReadStdErr = [&](const QString &data, QSharedPointer<QSsh::SshRemoteProcess> proc) {
+    //        stdOut += data + "\n";
+    //    };
 
     e = runScript(credentials,
-        replaceVars(amnezia::scriptData(SharedScriptType::build_container),
-                    genVarsForScript(credentials, container, config)), cbReadStdOut);
-    if (e) return e;
+                  replaceVars(amnezia::scriptData(SharedScriptType::build_container),
+                              genVarsForScript(credentials, container, config)),
+                  cbReadStdOut);
+    if (e)
+        return e;
 
     return e;
 }
 
-ErrorCode ServerController::runContainerWorker(const ServerCredentials &credentials, DockerContainer container, QJsonObject &config)
+ErrorCode ServerController::runContainerWorker(const ServerCredentials &credentials, DockerContainer container,
+                                               QJsonObject &config)
 {
     QString stdOut;
     auto cbReadStdOut = [&](const QString &data, libssh::Client &) {
         stdOut += data + "\n";
         return ErrorCode::NoError;
     };
-   // auto cbReadStdErr = [&](const QString &data, QSharedPointer<QSsh::SshRemoteProcess> proc) {
-   //     stdOut += data + "\n";
-   // };
+    // auto cbReadStdErr = [&](const QString &data, QSharedPointer<QSsh::SshRemoteProcess> proc) {
+    //     stdOut += data + "\n";
+    // };
 
     ErrorCode e = runScript(credentials,
-        replaceVars(amnezia::scriptData(ProtocolScriptType::run_container, container),
-            genVarsForScript(credentials, container, config)), cbReadStdOut);
+                            replaceVars(amnezia::scriptData(ProtocolScriptType::run_container, container),
+                                        genVarsForScript(credentials, container, config)),
+                            cbReadStdOut);
 
     qDebug() << "cbReadStdOut: " << stdOut;
 
+    if (stdOut.contains("docker: Error response from daemon"))
+        return ErrorCode::ServerDockerFailedError;
 
-    if (stdOut.contains("docker: Error response from daemon")) return ErrorCode::ServerDockerFailedError;
-
-    if (stdOut.contains("address already in use")) return ErrorCode::ServerPortAlreadyAllocatedError;
-    if (stdOut.contains("is already in use by container")) return ErrorCode::ServerPortAlreadyAllocatedError;
-    if (stdOut.contains("invalid publish")) return ErrorCode::ServerDockerFailedError;
+    if (stdOut.contains("address already in use"))
+        return ErrorCode::ServerPortAlreadyAllocatedError;
+    if (stdOut.contains("is already in use by container"))
+        return ErrorCode::ServerPortAlreadyAllocatedError;
+    if (stdOut.contains("invalid publish"))
+        return ErrorCode::ServerDockerFailedError;
 
     return e;
 }
 
-ErrorCode ServerController::configureContainerWorker(const ServerCredentials &credentials, DockerContainer container, QJsonObject &config)
+ErrorCode ServerController::configureContainerWorker(const ServerCredentials &credentials, DockerContainer container,
+                                                     QJsonObject &config)
 {
     QString stdOut;
     auto cbReadStdOut = [&](const QString &data, libssh::Client &) {
@@ -454,19 +453,18 @@ ErrorCode ServerController::configureContainerWorker(const ServerCredentials &cr
         return ErrorCode::NoError;
     };
 
-
     ErrorCode e = runContainerScript(credentials, container,
-        replaceVars(amnezia::scriptData(ProtocolScriptType::configure_container, container),
-            genVarsForScript(credentials, container, config)),
-                cbReadStdOut, cbReadStdErr);
-
+                                     replaceVars(amnezia::scriptData(ProtocolScriptType::configure_container, container),
+                                                 genVarsForScript(credentials, container, config)),
+                                     cbReadStdOut, cbReadStdErr);
 
     m_configurator->updateContainerConfigAfterInstallation(container, config, stdOut);
 
     return e;
 }
 
-ErrorCode ServerController::startupContainerWorker(const ServerCredentials &credentials, DockerContainer container, const QJsonObject &config)
+ErrorCode ServerController::startupContainerWorker(const ServerCredentials &credentials, DockerContainer container,
+                                                   const QJsonObject &config)
 {
     QString script = amnezia::scriptData(ProtocolScriptType::container_startup, container);
 
@@ -475,16 +473,19 @@ ErrorCode ServerController::startupContainerWorker(const ServerCredentials &cred
     }
 
     ErrorCode e = uploadTextFileToContainer(container, credentials,
-        replaceVars(script, genVarsForScript(credentials, container, config)),
-            "/opt/amnezia/start.sh");
-    if (e) return e;
+                                            replaceVars(script, genVarsForScript(credentials, container, config)),
+                                            "/opt/amnezia/start.sh");
+    if (e)
+        return e;
 
     return runScript(credentials,
-        replaceVars("sudo docker exec -d $CONTAINER_NAME sh -c \"chmod a+x /opt/amnezia/start.sh && /opt/amnezia/start.sh\"",
-            genVarsForScript(credentials, container, config)));
+                     replaceVars("sudo docker exec -d $CONTAINER_NAME sh -c \"chmod a+x /opt/amnezia/start.sh && "
+                                 "/opt/amnezia/start.sh\"",
+                                 genVarsForScript(credentials, container, config)));
 }
 
-ServerController::Vars ServerController::genVarsForScript(const ServerCredentials &credentials, DockerContainer container, const QJsonObject &config)
+ServerController::Vars ServerController::genVarsForScript(const ServerCredentials &credentials,
+                                                          DockerContainer container, const QJsonObject &config)
 {
     const QJsonObject &openvpnConfig = config.value(ProtocolProps::protoToString(Proto::OpenVpn)).toObject();
     const QJsonObject &cloakConfig = config.value(ProtocolProps::protoToString(Proto::Cloak)).toObject();
@@ -495,85 +496,102 @@ ServerController::Vars ServerController::genVarsForScript(const ServerCredential
 
     Vars vars;
 
-    vars.append({{"$REMOTE_HOST", credentials.hostName}});
+    vars.append({ { "$REMOTE_HOST", credentials.hostName } });
 
     // OpenVPN vars
-    vars.append({{"$OPENVPN_SUBNET_IP", openvpnConfig.value(config_key::subnet_address).toString(protocols::openvpn::defaultSubnetAddress) }});
-    vars.append({{"$OPENVPN_SUBNET_CIDR", openvpnConfig.value(config_key::subnet_cidr).toString(protocols::openvpn::defaultSubnetCidr) }});
-    vars.append({{"$OPENVPN_SUBNET_MASK", openvpnConfig.value(config_key::subnet_mask).toString(protocols::openvpn::defaultSubnetMask) }});
+    vars.append(
+            { { "$OPENVPN_SUBNET_IP",
+                openvpnConfig.value(config_key::subnet_address).toString(protocols::openvpn::defaultSubnetAddress) } });
+    vars.append({ { "$OPENVPN_SUBNET_CIDR",
+                    openvpnConfig.value(config_key::subnet_cidr).toString(protocols::openvpn::defaultSubnetCidr) } });
+    vars.append({ { "$OPENVPN_SUBNET_MASK",
+                    openvpnConfig.value(config_key::subnet_mask).toString(protocols::openvpn::defaultSubnetMask) } });
 
-    vars.append({{"$OPENVPN_PORT", openvpnConfig.value(config_key::port).toString(protocols::openvpn::defaultPort) }});
-    vars.append({{"$OPENVPN_TRANSPORT_PROTO", openvpnConfig.value(config_key::transport_proto).toString(protocols::openvpn::defaultTransportProto) }});
+    vars.append({ { "$OPENVPN_PORT", openvpnConfig.value(config_key::port).toString(protocols::openvpn::defaultPort) } });
+    vars.append(
+            { { "$OPENVPN_TRANSPORT_PROTO",
+                openvpnConfig.value(config_key::transport_proto).toString(protocols::openvpn::defaultTransportProto) } });
 
     bool isNcpDisabled = openvpnConfig.value(config_key::ncp_disable).toBool(protocols::openvpn::defaultNcpDisable);
-    vars.append({{"$OPENVPN_NCP_DISABLE",  isNcpDisabled ? protocols::openvpn::ncpDisableString : "" }});
+    vars.append({ { "$OPENVPN_NCP_DISABLE", isNcpDisabled ? protocols::openvpn::ncpDisableString : "" } });
 
-    vars.append({{"$OPENVPN_CIPHER", openvpnConfig.value(config_key::cipher).toString(protocols::openvpn::defaultCipher) }});
-    vars.append({{"$OPENVPN_HASH", openvpnConfig.value(config_key::hash).toString(protocols::openvpn::defaultHash) }});
+    vars.append({ { "$OPENVPN_CIPHER",
+                    openvpnConfig.value(config_key::cipher).toString(protocols::openvpn::defaultCipher) } });
+    vars.append({ { "$OPENVPN_HASH", openvpnConfig.value(config_key::hash).toString(protocols::openvpn::defaultHash) } });
 
     bool isTlsAuth = openvpnConfig.value(config_key::tls_auth).toBool(protocols::openvpn::defaultTlsAuth);
-    vars.append({{"$OPENVPN_TLS_AUTH", isTlsAuth ? protocols::openvpn::tlsAuthString : "" }});
+    vars.append({ { "$OPENVPN_TLS_AUTH", isTlsAuth ? protocols::openvpn::tlsAuthString : "" } });
     if (!isTlsAuth) {
         // erase $OPENVPN_TA_KEY, so it will not set in OpenVpnConfigurator::genOpenVpnConfig
-        vars.append({{"$OPENVPN_TA_KEY", "" }});
+        vars.append({ { "$OPENVPN_TA_KEY", "" } });
     }
 
-    vars.append({{"$OPENVPN_ADDITIONAL_CLIENT_CONFIG", openvpnConfig.value(config_key::additional_client_config).
-                  toString(protocols::openvpn::defaultAdditionalClientConfig) }});
-    vars.append({{"$OPENVPN_ADDITIONAL_SERVER_CONFIG", openvpnConfig.value(config_key::additional_server_config).
-                  toString(protocols::openvpn::defaultAdditionalServerConfig) }});
+    vars.append({ { "$OPENVPN_ADDITIONAL_CLIENT_CONFIG",
+                    openvpnConfig.value(config_key::additional_client_config)
+                            .toString(protocols::openvpn::defaultAdditionalClientConfig) } });
+    vars.append({ { "$OPENVPN_ADDITIONAL_SERVER_CONFIG",
+                    openvpnConfig.value(config_key::additional_server_config)
+                            .toString(protocols::openvpn::defaultAdditionalServerConfig) } });
 
     // ShadowSocks vars
-    vars.append({{"$SHADOWSOCKS_SERVER_PORT", ssConfig.value(config_key::port).toString(protocols::shadowsocks::defaultPort) }});
-    vars.append({{"$SHADOWSOCKS_LOCAL_PORT", ssConfig.value(config_key::local_port).toString(protocols::shadowsocks::defaultLocalProxyPort) }});
-    vars.append({{"$SHADOWSOCKS_CIPHER", ssConfig.value(config_key::cipher).toString(protocols::shadowsocks::defaultCipher) }});
+    vars.append({ { "$SHADOWSOCKS_SERVER_PORT",
+                    ssConfig.value(config_key::port).toString(protocols::shadowsocks::defaultPort) } });
+    vars.append({ { "$SHADOWSOCKS_LOCAL_PORT",
+                    ssConfig.value(config_key::local_port).toString(protocols::shadowsocks::defaultLocalProxyPort) } });
+    vars.append({ { "$SHADOWSOCKS_CIPHER",
+                    ssConfig.value(config_key::cipher).toString(protocols::shadowsocks::defaultCipher) } });
 
-    vars.append({{"$CONTAINER_NAME", ContainerProps::containerToString(container)}});
-    vars.append({{"$DOCKERFILE_FOLDER", "/opt/amnezia/" + ContainerProps::containerToString(container)}});
+    vars.append({ { "$CONTAINER_NAME", ContainerProps::containerToString(container) } });
+    vars.append({ { "$DOCKERFILE_FOLDER", "/opt/amnezia/" + ContainerProps::containerToString(container) } });
 
     // Cloak vars
-    vars.append({{"$CLOAK_SERVER_PORT", cloakConfig.value(config_key::port).toString(protocols::cloak::defaultPort) }});
-    vars.append({{"$FAKE_WEB_SITE_ADDRESS", cloakConfig.value(config_key::site).toString(protocols::cloak::defaultRedirSite) }});
+    vars.append({ { "$CLOAK_SERVER_PORT", cloakConfig.value(config_key::port).toString(protocols::cloak::defaultPort) } });
+    vars.append({ { "$FAKE_WEB_SITE_ADDRESS",
+                    cloakConfig.value(config_key::site).toString(protocols::cloak::defaultRedirSite) } });
 
     // Wireguard vars
-    vars.append({{"$WIREGUARD_SUBNET_IP", wireguarConfig.value(config_key::subnet_address).toString(protocols::wireguard::defaultSubnetAddress) }});
-    vars.append({{"$WIREGUARD_SUBNET_CIDR", wireguarConfig.value(config_key::subnet_cidr).toString(protocols::wireguard::defaultSubnetCidr) }});
-    vars.append({{"$WIREGUARD_SUBNET_MASK", wireguarConfig.value(config_key::subnet_mask).toString(protocols::wireguard::defaultSubnetMask) }});
+    vars.append(
+            { { "$WIREGUARD_SUBNET_IP",
+                wireguarConfig.value(config_key::subnet_address).toString(protocols::wireguard::defaultSubnetAddress) } });
+    vars.append({ { "$WIREGUARD_SUBNET_CIDR",
+                    wireguarConfig.value(config_key::subnet_cidr).toString(protocols::wireguard::defaultSubnetCidr) } });
+    vars.append({ { "$WIREGUARD_SUBNET_MASK",
+                    wireguarConfig.value(config_key::subnet_mask).toString(protocols::wireguard::defaultSubnetMask) } });
 
-    vars.append({{"$WIREGUARD_SERVER_PORT", wireguarConfig.value(config_key::port).toString(protocols::wireguard::defaultPort) }});
+    vars.append({ { "$WIREGUARD_SERVER_PORT",
+                    wireguarConfig.value(config_key::port).toString(protocols::wireguard::defaultPort) } });
 
     // IPsec vars
-    vars.append({{"$IPSEC_VPN_L2TP_NET", "192.168.42.0/24"}});
-    vars.append({{"$IPSEC_VPN_L2TP_POOL", "192.168.42.10-192.168.42.250"}});
-    vars.append({{"$IPSEC_VPN_L2TP_LOCAL", "192.168.42.1"}});
+    vars.append({ { "$IPSEC_VPN_L2TP_NET", "192.168.42.0/24" } });
+    vars.append({ { "$IPSEC_VPN_L2TP_POOL", "192.168.42.10-192.168.42.250" } });
+    vars.append({ { "$IPSEC_VPN_L2TP_LOCAL", "192.168.42.1" } });
 
-    vars.append({{"$IPSEC_VPN_XAUTH_NET", "192.168.43.0/24"}});
-    vars.append({{"$IPSEC_VPN_XAUTH_POOL", "192.168.43.10-192.168.43.250"}});
+    vars.append({ { "$IPSEC_VPN_XAUTH_NET", "192.168.43.0/24" } });
+    vars.append({ { "$IPSEC_VPN_XAUTH_POOL", "192.168.43.10-192.168.43.250" } });
 
-    vars.append({{"$IPSEC_VPN_SHA2_TRUNCBUG", "yes"}});
+    vars.append({ { "$IPSEC_VPN_SHA2_TRUNCBUG", "yes" } });
 
-    vars.append({{"$IPSEC_VPN_VPN_ANDROID_MTU_FIX", "yes"}});
-    vars.append({{"$IPSEC_VPN_DISABLE_IKEV2", "no"}});
-    vars.append({{"$IPSEC_VPN_DISABLE_L2TP", "no"}});
-    vars.append({{"$IPSEC_VPN_DISABLE_XAUTH", "no"}});
+    vars.append({ { "$IPSEC_VPN_VPN_ANDROID_MTU_FIX", "yes" } });
+    vars.append({ { "$IPSEC_VPN_DISABLE_IKEV2", "no" } });
+    vars.append({ { "$IPSEC_VPN_DISABLE_L2TP", "no" } });
+    vars.append({ { "$IPSEC_VPN_DISABLE_XAUTH", "no" } });
 
-    vars.append({{"$IPSEC_VPN_C2C_TRAFFIC", "no"}});
-
-    vars.append({{"$PRIMARY_SERVER_DNS", m_settings->primaryDns()}});
-    vars.append({{"$SECONDARY_SERVER_DNS", m_settings->secondaryDns()}});
+    vars.append({ { "$IPSEC_VPN_C2C_TRAFFIC", "no" } });
 
+    vars.append({ { "$PRIMARY_SERVER_DNS", m_settings->primaryDns() } });
+    vars.append({ { "$SECONDARY_SERVER_DNS", m_settings->secondaryDns() } });
 
     // Sftp vars
-    vars.append({{"$SFTP_PORT", sftpConfig.value(config_key::port).toString(QString::number(ProtocolProps::defaultPort(Proto::Sftp))) }});
-    vars.append({{"$SFTP_USER", sftpConfig.value(config_key::userName).toString() }});
-    vars.append({{"$SFTP_PASSWORD", sftpConfig.value(config_key::password).toString() }});
-
+    vars.append(
+            { { "$SFTP_PORT",
+                sftpConfig.value(config_key::port).toString(QString::number(ProtocolProps::defaultPort(Proto::Sftp))) } });
+    vars.append({ { "$SFTP_USER", sftpConfig.value(config_key::userName).toString() } });
+    vars.append({ { "$SFTP_PASSWORD", sftpConfig.value(config_key::password).toString() } });
 
     QString serverIp = Utils::getIPAddress(credentials.hostName);
     if (!serverIp.isEmpty()) {
-        vars.append({{"$SERVER_IP_ADDRESS", serverIp}});
-    }
-    else {
+        vars.append({ { "$SERVER_IP_ADDRESS", serverIp } });
+    } else {
         qWarning() << "ServerController::genVarsForScript unable to resolve address for credentials.hostName";
     }
 
@@ -592,10 +610,11 @@ QString ServerController::checkSshConnection(const ServerCredentials &credential
         return ErrorCode::NoError;
     };
 
-    ErrorCode e = runScript(credentials,
-        amnezia::scriptData(SharedScriptType::check_connection), cbReadStdOut, cbReadStdErr);
+    ErrorCode e =
+            runScript(credentials, amnezia::scriptData(SharedScriptType::check_connection), cbReadStdOut, cbReadStdErr);
 
-    if (errorCode) *errorCode = e;
+    if (errorCode)
+        *errorCode = e;
 
     return stdOut;
 }
@@ -607,23 +626,24 @@ void ServerController::setCancelInstallation(const bool cancel)
 
 ErrorCode ServerController::setupServerFirewall(const ServerCredentials &credentials)
 {
-    return runScript(credentials,
-        replaceVars(amnezia::scriptData(SharedScriptType::setup_host_firewall),
-            genVarsForScript(credentials)));
+    return runScript(
+            credentials,
+            replaceVars(amnezia::scriptData(SharedScriptType::setup_host_firewall), genVarsForScript(credentials)));
 }
 
 QString ServerController::replaceVars(const QString &script, const Vars &vars)
 {
     QString s = script;
     for (const QPair<QString, QString> &var : vars) {
-        //qDebug() << "Replacing" << var.first << var.second;
+        // qDebug() << "Replacing" << var.first << var.second;
         s.replace(var.first, var.second);
     }
-    //qDebug().noquote() << script;
+    // qDebug().noquote() << script;
     return s;
 }
 
-ErrorCode ServerController::isServerPortBusy(const ServerCredentials &credentials, DockerContainer container, const QJsonObject &config)
+ErrorCode ServerController::isServerPortBusy(const ServerCredentials &credentials, DockerContainer container,
+                                             const QJsonObject &config)
 {
     if (container == DockerContainer::Dns) {
         return ErrorCode::NoError;
@@ -646,8 +666,10 @@ ErrorCode ServerController::isServerPortBusy(const ServerCredentials &credential
     QStringList fixedPorts = ContainerProps::fixedPortsForContainer(container);
 
     QString defaultPort("%1");
-    QString port = containerConfig.value(config_key::port).toString(defaultPort.arg(ProtocolProps::defaultPort(protocol)));
-    QString defaultTransportProto = ProtocolProps::transportProtoToString(ProtocolProps::defaultTransportProto(protocol), protocol);
+    QString port =
+            containerConfig.value(config_key::port).toString(defaultPort.arg(ProtocolProps::defaultPort(protocol)));
+    QString defaultTransportProto =
+            ProtocolProps::transportProtoToString(ProtocolProps::defaultTransportProto(protocol), protocol);
     QString transportProto = containerConfig.value(config_key::transport_proto).toString(defaultTransportProto);
 
     QString script = QString("sudo lsof -i -P -n | grep -E ':%1 ").arg(port);
@@ -660,8 +682,8 @@ ErrorCode ServerController::isServerPortBusy(const ServerCredentials &credential
         script = script.append(" | grep LISTEN");
     }
 
-    ErrorCode errorCode = runScript(credentials,
-              replaceVars(script, genVarsForScript(credentials, container)), cbReadStdOut, cbReadStdErr);
+    ErrorCode errorCode = runScript(credentials, replaceVars(script, genVarsForScript(credentials, container)),
+                                    cbReadStdOut, cbReadStdErr);
     if (errorCode != ErrorCode::NoError) {
         return errorCode;
     }
@@ -689,9 +711,11 @@ ErrorCode ServerController::isUserInSudo(const ServerCredentials &credentials, D
     };
 
     const QString scriptData = amnezia::scriptData(SharedScriptType::check_user_in_sudo);
-    ErrorCode error = runScript(credentials, replaceVars(scriptData, genVarsForScript(credentials)), cbReadStdOut, cbReadStdErr);
+    ErrorCode error =
+            runScript(credentials, replaceVars(scriptData, genVarsForScript(credentials)), cbReadStdOut, cbReadStdErr);
 
-    if (!stdOut.contains("sudo")) return ErrorCode::ServerUserNotInSudo;
+    if (!stdOut.contains("sudo"))
+        return ErrorCode::ServerUserNotInSudo;
 
     return error;
 }
@@ -718,7 +742,8 @@ ErrorCode ServerController::isServerDpkgBusy(const ServerCredentials &credential
             stdOut.clear();
             runScript(credentials,
                       replaceVars(amnezia::scriptData(SharedScriptType::check_server_is_busy),
-                                  genVarsForScript(credentials)), cbReadStdOut, cbReadStdErr);
+                                  genVarsForScript(credentials)),
+                      cbReadStdOut, cbReadStdErr);
             if (!stdOut.isEmpty() || stdOut.contains("Unable to acquire the dpkg frontend lock")) {
                 emit serverIsBusy(true);
                 QThread::msleep(1000);
@@ -738,7 +763,8 @@ ErrorCode ServerController::isServerDpkgBusy(const ServerCredentials &credential
     return future.result();
 }
 
-ErrorCode ServerController::getAlreadyInstalledContainers(const ServerCredentials &credentials, QMap<DockerContainer, QJsonObject> &installedContainers)
+ErrorCode ServerController::getAlreadyInstalledContainers(const ServerCredentials &credentials,
+                                                          QMap<DockerContainer, QJsonObject> &installedContainers)
 {
     QString stdOut;
     auto cbReadStdOut = [&](const QString &data, libssh::Client &) {
@@ -770,13 +796,10 @@ ErrorCode ServerController::getAlreadyInstalledContainers(const ServerCredential
             QString transportProto = containerAndPortMatch.captured(3);
             DockerContainer container = ContainerProps::containerFromString(name);
             Proto mainProto = ContainerProps::defaultProtocol(container);
-            QJsonObject config {
-                { config_key::container, name },
-                { ProtocolProps::protoToString(mainProto), QJsonObject {
-                    { config_key::port, port },
-                    { config_key::transport_proto, transportProto }}
-                }
-            };
+            QJsonObject config { { config_key::container, name },
+                                 { ProtocolProps::protoToString(mainProto),
+                                   QJsonObject { { config_key::port, port },
+                                                 { config_key::transport_proto, transportProto } } } };
             installedContainers.insert(container, config);
         }
     }
@@ -784,7 +807,8 @@ ErrorCode ServerController::getAlreadyInstalledContainers(const ServerCredential
     return ErrorCode::NoError;
 }
 
-ErrorCode ServerController::getDecryptedPrivateKey(const ServerCredentials &credentials, QString &decryptedPrivateKey, const std::function<QString()> &callback)
+ErrorCode ServerController::getDecryptedPrivateKey(const ServerCredentials &credentials, QString &decryptedPrivateKey,
+                                                   const std::function<QString()> &callback)
 {
     auto error = m_sshClient.getDecryptedPrivateKey(credentials, decryptedPrivateKey, callback);
     return error;
diff --git a/client/core/servercontroller.h b/client/core/servercontroller.h
index 70ac9cc2..cb74d571 100644
--- a/client/core/servercontroller.h
+++ b/client/core/servercontroller.h
@@ -4,8 +4,8 @@
 #include <QJsonObject>
 #include <QObject>
 
-#include "defs.h"
 #include "containers/containers_defs.h"
+#include "defs.h"
 #include "sshclient.h"
 
 class Settings;
@@ -24,52 +24,61 @@ public:
 
     ErrorCode removeAllContainers(const ServerCredentials &credentials);
     ErrorCode removeContainer(const ServerCredentials &credentials, DockerContainer container);
-    ErrorCode setupContainer(const ServerCredentials &credentials, DockerContainer container,
-                             QJsonObject &config, bool isUpdate = false);
+    ErrorCode setupContainer(const ServerCredentials &credentials, DockerContainer container, QJsonObject &config,
+                             bool isUpdate = false);
     ErrorCode updateContainer(const ServerCredentials &credentials, DockerContainer container,
                               const QJsonObject &oldConfig, QJsonObject &newConfig);
-    ErrorCode getAlreadyInstalledContainers(const ServerCredentials &credentials, QMap<DockerContainer, QJsonObject> &installedContainers);
+    ErrorCode getAlreadyInstalledContainers(const ServerCredentials &credentials,
+                                            QMap<DockerContainer, QJsonObject> &installedContainers);
 
-    // create initial config - generate passwords, etc
-    QJsonObject createContainerInitialConfig(DockerContainer container, int port, TransportProto tp);
-    ErrorCode startupContainerWorker(const ServerCredentials &credentials, DockerContainer container, const QJsonObject &config = QJsonObject());
+    ErrorCode startupContainerWorker(const ServerCredentials &credentials, DockerContainer container,
+                                     const QJsonObject &config = QJsonObject());
 
-    ErrorCode uploadTextFileToContainer(DockerContainer container, const ServerCredentials &credentials,
-                                        const QString &file, const QString &path,
-                                        libssh::SftpOverwriteMode overwriteMode = libssh::SftpOverwriteMode::SftpOverwriteExisting);
+    ErrorCode uploadTextFileToContainer(
+            DockerContainer container, const ServerCredentials &credentials, const QString &file, const QString &path,
+            libssh::SftpOverwriteMode overwriteMode = libssh::SftpOverwriteMode::SftpOverwriteExisting);
     QByteArray getTextFileFromContainer(DockerContainer container, const ServerCredentials &credentials,
                                         const QString &path, ErrorCode *errorCode = nullptr);
 
     QString replaceVars(const QString &script, const Vars &vars);
-    Vars genVarsForScript(const ServerCredentials &credentials, DockerContainer container = DockerContainer::None, const QJsonObject &config = QJsonObject());
+    Vars genVarsForScript(const ServerCredentials &credentials, DockerContainer container = DockerContainer::None,
+                          const QJsonObject &config = QJsonObject());
 
     ErrorCode runScript(const ServerCredentials &credentials, QString script,
-        const std::function<ErrorCode (const QString &, libssh::Client &)> &cbReadStdOut = nullptr,
-        const std::function<ErrorCode (const QString &, libssh::Client &)> &cbReadStdErr = nullptr);
+                        const std::function<ErrorCode(const QString &, libssh::Client &)> &cbReadStdOut = nullptr,
+                        const std::function<ErrorCode(const QString &, libssh::Client &)> &cbReadStdErr = nullptr);
 
-    ErrorCode runContainerScript(const ServerCredentials &credentials, DockerContainer container, QString script,
-        const std::function<ErrorCode (const QString &, libssh::Client &)> &cbReadStdOut = nullptr,
-        const std::function<ErrorCode (const QString &, libssh::Client &)> &cbReadStdErr = nullptr);
+    ErrorCode
+    runContainerScript(const ServerCredentials &credentials, DockerContainer container, QString script,
+                       const std::function<ErrorCode(const QString &, libssh::Client &)> &cbReadStdOut = nullptr,
+                       const std::function<ErrorCode(const QString &, libssh::Client &)> &cbReadStdErr = nullptr);
 
     QString checkSshConnection(const ServerCredentials &credentials, ErrorCode *errorCode = nullptr);
 
     void setCancelInstallation(const bool cancel);
 
-    ErrorCode getDecryptedPrivateKey(const ServerCredentials &credentials, QString &decryptedPrivateKey, const std::function<QString()> &callback);
+    ErrorCode getDecryptedPrivateKey(const ServerCredentials &credentials, QString &decryptedPrivateKey,
+                                     const std::function<QString()> &callback);
+
 private:
     ErrorCode installDockerWorker(const ServerCredentials &credentials, DockerContainer container);
-    ErrorCode prepareHostWorker(const ServerCredentials &credentials, DockerContainer container, const QJsonObject &config = QJsonObject());
-    ErrorCode buildContainerWorker(const ServerCredentials &credentials, DockerContainer container, const QJsonObject &config = QJsonObject());
+    ErrorCode prepareHostWorker(const ServerCredentials &credentials, DockerContainer container,
+                                const QJsonObject &config = QJsonObject());
+    ErrorCode buildContainerWorker(const ServerCredentials &credentials, DockerContainer container,
+                                   const QJsonObject &config = QJsonObject());
     ErrorCode runContainerWorker(const ServerCredentials &credentials, DockerContainer container, QJsonObject &config);
-    ErrorCode configureContainerWorker(const ServerCredentials &credentials, DockerContainer container, QJsonObject &config);
+    ErrorCode configureContainerWorker(const ServerCredentials &credentials, DockerContainer container,
+                                       QJsonObject &config);
 
-    ErrorCode isServerPortBusy(const ServerCredentials &credentials, DockerContainer container, const QJsonObject &config);
-    bool isReinstallContainerRequired(DockerContainer container, const QJsonObject &oldConfig, const QJsonObject &newConfig);
+    ErrorCode isServerPortBusy(const ServerCredentials &credentials, DockerContainer container,
+                               const QJsonObject &config);
+    bool isReinstallContainerRequired(DockerContainer container, const QJsonObject &oldConfig,
+                                      const QJsonObject &newConfig);
     ErrorCode isUserInSudo(const ServerCredentials &credentials, DockerContainer container);
     ErrorCode isServerDpkgBusy(const ServerCredentials &credentials, DockerContainer container);
-    
-    ErrorCode uploadFileToHost(const ServerCredentials &credentials, const QByteArray &data,
-                               const QString &remotePath, libssh::SftpOverwriteMode overwriteMode = libssh::SftpOverwriteMode::SftpOverwriteExisting);
+
+    ErrorCode uploadFileToHost(const ServerCredentials &credentials, const QByteArray &data, const QString &remotePath,
+                               libssh::SftpOverwriteMode overwriteMode = libssh::SftpOverwriteMode::SftpOverwriteExisting);
 
     ErrorCode setupServerFirewall(const ServerCredentials &credentials);
 
diff --git a/client/resources.qrc b/client/resources.qrc
index df6fcb3e..3435a107 100644
--- a/client/resources.qrc
+++ b/client/resources.qrc
@@ -274,5 +274,6 @@
         <file>ui/qml/Pages2/PageProtocolShadowSocksSettings.qml</file>
         <file>ui/qml/Pages2/PageProtocolCloakSettings.qml</file>
         <file>ui/qml/Pages2/PageProtocolRaw.qml</file>
+        <file>ui/qml/Pages2/PageSettingsLogging.qml</file>
     </qresource>
 </RCC>
diff --git a/client/secure_qsettings.cpp b/client/secure_qsettings.cpp
index e71eff48..1df10168 100644
--- a/client/secure_qsettings.cpp
+++ b/client/secure_qsettings.cpp
@@ -1,30 +1,28 @@
 #include "secure_qsettings.h"
 #include "platforms/ios/MobileUtils.h"
 
+#include "QAead.h"
+#include "QBlockCipher.h"
+#include "utilities.h"
 #include <QDataStream>
 #include <QDebug>
 #include <QEventLoop>
 #include <QIODevice>
 #include <QJsonDocument>
 #include <QJsonObject>
+#include <QRandomGenerator>
 #include <QSharedPointer>
 #include <QTimer>
-#include "utilities.h"
-#include <QRandomGenerator>
-#include "QAead.h"
-#include "QBlockCipher.h"
 
 using namespace QKeychain;
 
 SecureQSettings::SecureQSettings(const QString &organization, const QString &application, QObject *parent)
-    : QObject{parent},
-      m_settings(organization, application, parent),
-      encryptedKeys({"Servers/serversList"})
+    : QObject { parent }, m_settings(organization, application, parent), encryptedKeys({ "Servers/serversList" })
 {
     bool encrypted = m_settings.value("Conf/encrypted").toBool();
 
     // convert settings to encrypted for if updated to >= 2.1.0
-    if (encryptionRequired() && ! encrypted) {
+    if (encryptionRequired() && !encrypted) {
         for (const QString &key : m_settings.allKeys()) {
             if (encryptedKeys.contains(key)) {
                 const QVariant &val = value(key);
@@ -44,15 +42,15 @@ QVariant SecureQSettings::value(const QString &key, const QVariant &defaultValue
         return m_cache.value(key);
     }
 
-    if (!m_settings.contains(key)) return defaultValue;
+    if (!m_settings.contains(key))
+        return defaultValue;
 
     QVariant retVal;
 
     // check if value is not encrypted, v. < 2.0.x
     retVal = m_settings.value(key);
     if (retVal.isValid()) {
-        if (retVal.userType() == QVariant::ByteArray &&
-                retVal.toByteArray().mid(0, magicString.size()) == magicString) {
+        if (retVal.userType() == QVariant::ByteArray && retVal.toByteArray().mid(0, magicString.size()) == magicString) {
 
             if (getEncKey().isEmpty() || getEncIv().isEmpty()) {
                 qCritical() << "SecureQSettings::setValue Decryption requested, but key is empty";
@@ -71,8 +69,7 @@ QVariant SecureQSettings::value(const QString &key, const QVariant &defaultValue
                 retVal = QVariant();
             }
         }
-    }
-    else {
+    } else {
         qWarning() << "SecureQSettings::value invalid QVariant value";
         retVal = QVariant();
     }
@@ -95,14 +92,12 @@ void SecureQSettings::setValue(const QString &key, const QVariant &value)
 
             QByteArray encryptedValue = encryptText(decryptedValue);
             m_settings.setValue(key, magicString + encryptedValue);
-        }
-        else {
+        } else {
             qCritical() << "SecureQSettings::setValue Encryption required, but key is empty";
             return;
         }
 
-    }
-    else {
+    } else {
         m_settings.setValue(key, value);
     }
 
@@ -139,7 +134,8 @@ QByteArray SecureQSettings::backupAppConfig() const
 bool SecureQSettings::restoreAppConfig(const QByteArray &json)
 {
     QJsonObject cfg = QJsonDocument::fromJson(json).object();
-    if (cfg.isEmpty()) return false;
+    if (cfg.isEmpty())
+        return false;
 
     for (const QString &key : cfg.keys()) {
         setValue(key, cfg.value(key).toVariant());
@@ -149,14 +145,13 @@ bool SecureQSettings::restoreAppConfig(const QByteArray &json)
     return true;
 }
 
-
-QByteArray SecureQSettings::encryptText(const QByteArray& value) const
+QByteArray SecureQSettings::encryptText(const QByteArray &value) const
 {
     QSimpleCrypto::QBlockCipher cipher;
     return cipher.encryptAesBlockCipher(value, getEncKey(), getEncIv());
 }
 
-QByteArray SecureQSettings::decryptText(const QByteArray& ba) const
+QByteArray SecureQSettings::decryptText(const QByteArray &ba) const
 {
     QSimpleCrypto::QBlockCipher cipher;
     return cipher.decryptAesBlockCipher(ba, getEncKey(), getEncIv());
@@ -228,13 +223,11 @@ QByteArray SecureQSettings::getSecTag(const QString &tag)
     job->setAutoDelete(false);
     job->setKey(tag);
     QEventLoop loop;
-    job->connect(job.data(), &ReadPasswordJob::finished, job.data(), [&loop](){
-        loop.quit();
-    });
+    job->connect(job.data(), &ReadPasswordJob::finished, job.data(), [&loop]() { loop.quit(); });
     job->start();
     loop.exec();
 
-    if ( job->error() ) {
+    if (job->error()) {
         qCritical() << "SecureQSettings::getSecTag Error:" << job->errorString();
     }
 
@@ -249,9 +242,7 @@ void SecureQSettings::setSecTag(const QString &tag, const QByteArray &data)
     job->setBinaryData(data);
     QEventLoop loop;
     QTimer::singleShot(1000, &loop, SLOT(quit()));
-    job->connect(job.data(), &WritePasswordJob::finished, job.data(), [&loop](){
-        loop.quit();
-    });
+    job->connect(job.data(), &WritePasswordJob::finished, job.data(), [&loop]() { loop.quit(); });
     job->start();
     loop.exec();
 
@@ -260,4 +251,10 @@ void SecureQSettings::setSecTag(const QString &tag, const QByteArray &data)
     }
 }
 
-
+void SecureQSettings::clearSettings()
+{
+    QMutexLocker locker(&mutex);
+    m_settings.clear();
+    m_cache.clear();
+    sync();
+}
diff --git a/client/secure_qsettings.h b/client/secure_qsettings.h
index 9b1f6167..7421ce01 100644
--- a/client/secure_qsettings.h
+++ b/client/secure_qsettings.h
@@ -1,23 +1,22 @@
 #ifndef SECUREQSETTINGS_H
 #define SECUREQSETTINGS_H
 
-#include <QSettings>
-#include <QObject>
 #include <QMutex>
 #include <QMutexLocker>
+#include <QObject>
+#include <QSettings>
 
 #include "keychain.h"
 
-
-constexpr const char* settingsKeyTag = "settingsKeyTag";
-constexpr const char* settingsIvTag = "settingsIvTag";
-constexpr const char* keyChainName = "AmneziaVPN-Keychain";
-
+constexpr const char *settingsKeyTag = "settingsKeyTag";
+constexpr const char *settingsIvTag = "settingsIvTag";
+constexpr const char *keyChainName = "AmneziaVPN-Keychain";
 
 class SecureQSettings : public QObject
 {
 public:
-    explicit SecureQSettings(const QString &organization, const QString &application = QString(), QObject *parent = nullptr);
+    explicit SecureQSettings(const QString &organization, const QString &application = QString(),
+                             QObject *parent = nullptr);
 
     QVariant value(const QString &key, const QVariant &defaultValue = QVariant()) const;
     void setValue(const QString &key, const QVariant &value);
@@ -28,7 +27,7 @@ public:
     bool restoreAppConfig(const QByteArray &json);
 
     QByteArray encryptText(const QByteArray &value) const;
-    QByteArray decryptText(const QByteArray& ba) const;
+    QByteArray decryptText(const QByteArray &ba) const;
 
     bool encryptionRequired() const;
 
@@ -38,6 +37,8 @@ public:
     static QByteArray getSecTag(const QString &tag);
     static void setSecTag(const QString &tag, const QByteArray &data);
 
+    void clearSettings();
+
 private:
     QSettings m_settings;
 
diff --git a/client/settings.cpp b/client/settings.cpp
index 1781cb2e..fbdd63ce 100644
--- a/client/settings.cpp
+++ b/client/settings.cpp
@@ -1,6 +1,6 @@
-#include "version.h"
 #include "settings.h"
 #include "utilities.h"
+#include "version.h"
 
 #include "containers/containers_defs.h"
 #include "logger.h"
@@ -8,10 +8,7 @@
 const char Settings::cloudFlareNs1[] = "1.1.1.1";
 const char Settings::cloudFlareNs2[] = "1.0.0.1";
 
-
-Settings::Settings(QObject* parent) :
-    QObject(parent),
-    m_settings(ORGANIZATION_NAME, APPLICATION_NAME, this)
+Settings::Settings(QObject *parent) : QObject(parent), m_settings(ORGANIZATION_NAME, APPLICATION_NAME, this)
 {
     // Import old settings
     if (serversCount() == 0) {
@@ -20,7 +17,7 @@ Settings::Settings(QObject* parent) :
         QString serverName = m_settings.value("Server/serverName").toString();
         int port = m_settings.value("Server/serverPort").toInt();
 
-        if (!user.isEmpty() && !password.isEmpty() && !serverName.isEmpty()){
+        if (!user.isEmpty() && !password.isEmpty() && !serverName.isEmpty()) {
             QJsonObject server;
             server.insert(config_key::userName, user);
             server.insert(config_key::password, password);
@@ -46,7 +43,8 @@ int Settings::serversCount() const
 QJsonObject Settings::server(int index) const
 {
     const QJsonArray &servers = serversArray();
-    if (index >= servers.size()) return QJsonObject();
+    if (index >= servers.size())
+        return QJsonObject();
 
     return servers.at(index).toObject();
 }
@@ -61,7 +59,8 @@ void Settings::addServer(const QJsonObject &server)
 void Settings::removeServer(int index)
 {
     QJsonArray servers = serversArray();
-    if (index >= servers.size()) return;
+    if (index >= servers.size())
+        return;
 
     servers.removeAt(index);
     setServersArray(servers);
@@ -70,7 +69,8 @@ void Settings::removeServer(int index)
 bool Settings::editServer(int index, const QJsonObject &server)
 {
     QJsonArray servers = serversArray();
-    if (index >= servers.size()) return false;
+    if (index >= servers.size())
+        return false;
 
     servers.replace(index, server);
     setServersArray(servers);
@@ -94,8 +94,8 @@ QString Settings::defaultContainerName(int serverIndex) const
     QString name = server(serverIndex).value(config_key::defaultContainer).toString();
     if (name.isEmpty()) {
         return ContainerProps::containerToString(DockerContainer::None);
-    }
-    else return name;
+    } else
+        return name;
 }
 
 QMap<DockerContainer, QJsonObject> Settings::containers(int serverIndex) const
@@ -104,7 +104,8 @@ QMap<DockerContainer, QJsonObject> Settings::containers(int serverIndex) const
 
     QMap<DockerContainer, QJsonObject> containersMap;
     for (const QJsonValue &val : containers) {
-        containersMap.insert(ContainerProps::containerFromString(val.toObject().value(config_key::container).toString()), val.toObject());
+        containersMap.insert(ContainerProps::containerFromString(val.toObject().value(config_key::container).toString()),
+                             val.toObject());
     }
 
     return containersMap;
@@ -114,17 +115,17 @@ void Settings::setContainers(int serverIndex, const QMap<DockerContainer, QJsonO
 {
     QJsonObject s = server(serverIndex);
     QJsonArray c;
-    for (const QJsonObject &o: containers) {
+    for (const QJsonObject &o : containers) {
         c.append(o);
     }
     s.insert(config_key::containers, c);
     editServer(serverIndex, s);
 }
 
-
 QJsonObject Settings::containerConfig(int serverIndex, DockerContainer container)
 {
-    if (container == DockerContainer::None) return QJsonObject();
+    if (container == DockerContainer::None)
+        return QJsonObject();
     return containers(serverIndex).value(container);
 }
 
@@ -170,7 +171,7 @@ void Settings::clearLastConnectionConfig(int serverIndex, DockerContainer contai
 {
     // recursively remove
     if (proto == Proto::Any) {
-        for (Proto p: ContainerProps::protocolsForContainer(container)) {
+        for (Proto p : ContainerProps::protocolsForContainer(container)) {
             clearLastConnectionConfig(serverIndex, container, p);
         }
         return;
@@ -183,7 +184,8 @@ void Settings::clearLastConnectionConfig(int serverIndex, DockerContainer contai
 
 bool Settings::haveAuthData(int serverIndex) const
 {
-    if (serverIndex < 0) return false;
+    if (serverIndex < 0)
+        return false;
     ServerCredentials cred = serverCredentials(serverIndex);
     return (!cred.hostName.isEmpty() && !cred.userName.isEmpty() && !cred.secretData.isEmpty());
 }
@@ -196,7 +198,7 @@ QString Settings::nextAvailableServerName() const
     do {
         i++;
         nameExist = false;
-        for (const QJsonValue &server: serversArray()) {
+        for (const QJsonValue &server : serversArray()) {
             if (server.toObject().value(config_key::description).toString() == tr("Server") + " " + QString::number(i)) {
                 nameExist = true;
                 break;
@@ -223,19 +225,17 @@ void Settings::setSaveLogs(bool enabled)
 QString Settings::routeModeString(RouteMode mode) const
 {
     switch (mode) {
-    case VpnAllSites:
-        return "AllSites";
-    case VpnOnlyForwardSites:
-        return "ForwardSites";
-    case VpnAllExceptSites:
-        return "ExceptSites";
+    case VpnAllSites: return "AllSites";
+    case VpnOnlyForwardSites: return "ForwardSites";
+    case VpnAllExceptSites: return "ExceptSites";
     }
 }
 
 void Settings::addVpnSite(RouteMode mode, const QString &site, const QString &ip)
 {
     QVariantMap sites = vpnSites(mode);
-    if (sites.contains(site) && ip.isEmpty()) return;
+    if (sites.contains(site) && ip.isEmpty())
+        return;
 
     sites.insert(site, ip);
     setVpnSites(mode, sites);
@@ -248,7 +248,8 @@ void Settings::addVpnSites(RouteMode mode, const QMap<QString, QString> &sites)
         const QString &site = i.key();
         const QString &ip = i.value();
 
-        if (allSites.contains(site) && allSites.value(site) == ip) continue;
+        if (allSites.contains(site) && allSites.value(site) == ip)
+            continue;
 
         allSites.insert(site, ip);
     }
@@ -263,8 +264,7 @@ QStringList Settings::getVpnIps(RouteMode mode) const
     for (auto i = m.constBegin(); i != m.constEnd(); ++i) {
         if (Utils::checkIpSubnetFormat(i.key())) {
             ips.append(i.key());
-        }
-        else if (Utils::checkIpSubnetFormat(i.value().toString())) {
+        } else if (Utils::checkIpSubnetFormat(i.value().toString())) {
             ips.append(i.value().toString());
         }
     }
@@ -275,7 +275,8 @@ QStringList Settings::getVpnIps(RouteMode mode) const
 void Settings::removeVpnSite(RouteMode mode, const QString &site)
 {
     QVariantMap sites = vpnSites(mode);
-    if (!sites.contains(site)) return;
+    if (!sites.contains(site))
+        return;
 
     sites.remove(site);
     setVpnSites(mode, sites);
@@ -285,7 +286,8 @@ void Settings::addVpnIps(RouteMode mode, const QStringList &ips)
 {
     QVariantMap sites = vpnSites(mode);
     for (const QString &ip : ips) {
-        if (ip.isEmpty()) continue;
+        if (ip.isEmpty())
+            continue;
 
         sites.insert(ip, "");
     }
@@ -297,7 +299,8 @@ void Settings::removeVpnSites(RouteMode mode, const QStringList &sites)
 {
     QVariantMap sitesMap = vpnSites(mode);
     for (const QString &site : sites) {
-        if (site.isEmpty()) continue;
+        if (site.isEmpty())
+            continue;
 
         sitesMap.remove(site);
     }
@@ -305,9 +308,20 @@ void Settings::removeVpnSites(RouteMode mode, const QStringList &sites)
     setVpnSites(mode, sitesMap);
 }
 
-QString Settings::primaryDns() const { return m_settings.value("Conf/primaryDns", cloudFlareNs1).toString(); }
+QString Settings::primaryDns() const
+{
+    return m_settings.value("Conf/primaryDns", cloudFlareNs1).toString();
+}
 
-QString Settings::secondaryDns() const { return m_settings.value("Conf/secondaryDns", cloudFlareNs2).toString(); }
+QString Settings::secondaryDns() const
+{
+    return m_settings.value("Conf/secondaryDns", cloudFlareNs2).toString();
+}
+
+void Settings::clearSettings()
+{
+    m_settings.clearSettings();
+}
 
 ServerCredentials Settings::defaultServerCredentials() const
 {
diff --git a/client/settings.h b/client/settings.h
index 9bf40ac7..00b02c15 100644
--- a/client/settings.h
+++ b/client/settings.h
@@ -183,6 +183,8 @@ public:
         m_settings.setValue("Conf/appLanguage", locale);
     };
 
+    void clearSettings();
+
 signals:
     void saveLogsChanged();
 
diff --git a/client/ui/controllers/installController.cpp b/client/ui/controllers/installController.cpp
index 6fc5f4e9..2259721a 100644
--- a/client/ui/controllers/installController.cpp
+++ b/client/ui/controllers/installController.cpp
@@ -16,12 +16,19 @@ InstallController::InstallController(const QSharedPointer<ServersModel> &servers
 void InstallController::install(DockerContainer container, int port, TransportProto transportProto)
 {
     Proto mainProto = ContainerProps::defaultProtocol(container);
+    QJsonObject containerConfig;
 
-    QJsonObject containerConfig { { config_key::port, QString::number(port) },
-                                  { config_key::transport_proto,
-                                    ProtocolProps::transportProtoToString(transportProto, mainProto) } };
-    QJsonObject config { { config_key::container, ContainerProps::containerToString(container) },
-                         { ProtocolProps::protoToString(mainProto), containerConfig } };
+    containerConfig.insert(config_key::port, QString::number(port));
+    containerConfig.insert(config_key::transport_proto, ProtocolProps::transportProtoToString(transportProto, mainProto));
+
+    if (container == DockerContainer::Sftp) {
+        containerConfig.insert(config_key::userName, protocols::sftp::defaultUserName);
+        containerConfig.insert(config_key::password, Utils::getRandomString(10));
+    }
+
+    QJsonObject config;
+    config.insert(config_key::container, ContainerProps::containerToString(container));
+    config.insert(ProtocolProps::protoToString(mainProto), containerConfig);
 
     if (m_shouldCreateServer) {
         if (isServerAlreadyExists()) {
diff --git a/client/ui/controllers/pageController.h b/client/ui/controllers/pageController.h
index 05b8fbf9..a0b9753b 100644
--- a/client/ui/controllers/pageController.h
+++ b/client/ui/controllers/pageController.h
@@ -27,6 +27,7 @@ namespace PageLoader
         PageSettingsApplication,
         PageSettingsBackup,
         PageSettingsAbout,
+        PageSettingsLogging,
 
         PageSetupWizardStart,
         PageSetupWizardCredentials,
diff --git a/client/ui/controllers/settingsController.cpp b/client/ui/controllers/settingsController.cpp
index 42dd2231..b501d085 100644
--- a/client/ui/controllers/settingsController.cpp
+++ b/client/ui/controllers/settingsController.cpp
@@ -46,14 +46,15 @@ void SettingsController::setSecondaryDns(const QString &dns)
     emit secondaryDnsChanged();
 }
 
-bool SettingsController::isSaveLogsEnabled()
+bool SettingsController::isLoggingEnable()
 {
     return m_settings->isSaveLogs();
 }
 
-void SettingsController::setSaveLogs(bool enable)
+void SettingsController::toggleLogging(bool enable)
 {
     m_settings->setSaveLogs(enable);
+    emit loggingStateChanged();
 }
 
 void SettingsController::openLogsFolder()
@@ -101,3 +102,8 @@ QString SettingsController::getAppVersion()
 {
     return m_appVersion;
 }
+
+void SettingsController::clearSettings()
+{
+    m_settings->clearSettings();
+}
diff --git a/client/ui/controllers/settingsController.h b/client/ui/controllers/settingsController.h
index f961a37d..313f934d 100644
--- a/client/ui/controllers/settingsController.h
+++ b/client/ui/controllers/settingsController.h
@@ -16,6 +16,7 @@ public:
 
     Q_PROPERTY(QString primaryDns READ getPrimaryDns WRITE setPrimaryDns NOTIFY primaryDnsChanged)
     Q_PROPERTY(QString secondaryDns READ getSecondaryDns WRITE setSecondaryDns NOTIFY secondaryDnsChanged)
+    Q_PROPERTY(bool isLoggingEnable READ isLoggingEnable WRITE toggleLogging NOTIFY loggingStateChanged)
 
 public slots:
     void setAmneziaDns(bool enable);
@@ -27,8 +28,8 @@ public slots:
     QString getSecondaryDns();
     void setSecondaryDns(const QString &dns);
 
-    bool isSaveLogsEnabled();
-    void setSaveLogs(bool enable);
+    bool isLoggingEnable();
+    void toggleLogging(bool enable);
 
     void openLogsFolder();
     void exportLogsFile();
@@ -39,9 +40,12 @@ public slots:
 
     QString getAppVersion();
 
+    void clearSettings();
+
 signals:
     void primaryDnsChanged();
     void secondaryDnsChanged();
+    void loggingStateChanged();
 
 private:
     QSharedPointer<ServersModel> m_serversModel;
diff --git a/client/ui/models/languageModel.cpp b/client/ui/models/languageModel.cpp
index 76eeb37d..adbbdaaa 100644
--- a/client/ui/models/languageModel.cpp
+++ b/client/ui/models/languageModel.cpp
@@ -54,3 +54,8 @@ int LanguageModel::getCurrentLanguageIndex()
     default: return static_cast<int>(LanguageSettings::AvailableLanguageEnum::English); break;
     }
 }
+
+QString LanguageModel::getCurrentLanuageName()
+{
+    return m_availableLanguages[getCurrentLanguageIndex()].name;
+}
diff --git a/client/ui/models/languageModel.h b/client/ui/models/languageModel.h
index b3ff4f6e..4e8a9092 100644
--- a/client/ui/models/languageModel.h
+++ b/client/ui/models/languageModel.h
@@ -46,6 +46,7 @@ public:
 public slots:
     void changeLanguage(const LanguageSettings::AvailableLanguageEnum language);
     int getCurrentLanguageIndex();
+    QString getCurrentLanuageName();
 
 signals:
     void updateTranslations(const QLocale &locale);
diff --git a/client/ui/pages_logic/ServerContainersLogic.cpp b/client/ui/pages_logic/ServerContainersLogic.cpp
index a2971cf8..89eeb6c8 100644
--- a/client/ui/pages_logic/ServerContainersLogic.cpp
+++ b/client/ui/pages_logic/ServerContainersLogic.cpp
@@ -89,7 +89,7 @@ void ServerContainersLogic::onPushButtonRemoveClicked(DockerContainer container)
 void ServerContainersLogic::onPushButtonContinueClicked(DockerContainer c, int port, TransportProto tp)
 {
     ServerController serverController(m_settings);
-    QJsonObject config = serverController.createContainerInitialConfig(c, port, tp);
+    QJsonObject config; // = serverController.createContainerInitialConfig(c, port, tp);
 
     emit uiLogic()->goToPage(Page::ServerConfiguringProgress);
     qApp->processEvents();
diff --git a/client/ui/qml/Controls2/LabelWithButtonType.qml b/client/ui/qml/Controls2/LabelWithButtonType.qml
index 27ead16c..c925f801 100644
--- a/client/ui/qml/Controls2/LabelWithButtonType.qml
+++ b/client/ui/qml/Controls2/LabelWithButtonType.qml
@@ -17,14 +17,16 @@ Item {
 
     property string textColor: "#d7d8db"
 
-    implicitWidth: content.implicitWidth
-    implicitHeight: content.implicitHeight
+    implicitWidth: content.implicitWidth + content.anchors.topMargin + content.anchors.bottomMargin
+    implicitHeight: content.implicitHeight + content.anchors.leftMargin + content.anchors.rightMargin
 
     RowLayout {
         id: content
         anchors.fill: parent
         anchors.leftMargin: 16
         anchors.rightMargin: 16
+        anchors.topMargin: 16
+        anchors.bottomMargin: 16
 
         Rectangle {
             id: leftImageBackground
@@ -56,8 +58,6 @@ Item {
                 color: root.textColor
 
                 Layout.fillWidth: true
-                Layout.topMargin: 16
-                Layout.bottomMargin: description.visible ? 0 : 16
 
                 horizontalAlignment: Text.AlignLeft
                 verticalAlignment: Text.AlignVCenter
@@ -72,7 +72,6 @@ Item {
                 visible: root.descriptionText !== ""
 
                 Layout.fillWidth: true
-                Layout.bottomMargin: 16
 
                 horizontalAlignment: Text.AlignLeft
                 verticalAlignment: Text.AlignVCenter
diff --git a/client/ui/qml/Pages2/PageSettingsApplication.qml b/client/ui/qml/Pages2/PageSettingsApplication.qml
index b378a6c8..54d315b0 100644
--- a/client/ui/qml/Pages2/PageSettingsApplication.qml
+++ b/client/ui/qml/Pages2/PageSettingsApplication.qml
@@ -48,6 +48,7 @@ PageType {
                 Layout.topMargin: 16
 
                 text: qsTr("Language")
+                descriptionText: LanguageModel.getCurrentLanuageName()
                 rightImageSource: "qrc:/images/controls/chevron-right.svg"
 
                 clickedFunction: function() {
@@ -60,6 +61,22 @@ PageType {
             }
 
 
+            DividerType {}
+
+            LabelWithButtonType {
+                Layout.fillWidth: true
+
+                text: qsTr("Logging")
+                descriptionText: SettingsController.isLoggingEnable ? qsTr("Enabled") : qsTr("Disabled")
+                rightImageSource: "qrc:/images/controls/chevron-right.svg"
+
+                clickedFunction: function() {
+                    goToPage(PageEnum.PageSettingsLogging)
+                }
+            }
+
+            DividerType {}
+
             LabelWithButtonType {
                 Layout.fillWidth: true
 
@@ -67,10 +84,27 @@ PageType {
                 rightImageSource: "qrc:/images/controls/chevron-right.svg"
 
                 clickedFunction: function() {
+                    questionDrawer.headerText = qsTr("Reset settings and remove all data from the application?")
+                    questionDrawer.descriptionText = qsTr("All settings will be reset to default. All installed AmneziaVPN services will still remain on the server.")
+                    questionDrawer.yesButtonText = qsTr("Continue")
+                    questionDrawer.noButtonText = qsTr("Cancel")
+
+                    questionDrawer.yesButtonFunction = function() {
+                        questionDrawer.visible = false
+                        SettingsController.clearSettings()
+                    }
+                    questionDrawer.noButtonFunction = function() {
+                        questionDrawer.visible = false
+                    }
+                    questionDrawer.visible = true
                 }
             }
 
             DividerType {}
+
+            QuestionDrawer {
+                id: questionDrawer
+            }
         }
     }
 }
diff --git a/client/ui/qml/Pages2/PageSettingsBackup.qml b/client/ui/qml/Pages2/PageSettingsBackup.qml
index ddf9f2ba..1c196aa3 100644
--- a/client/ui/qml/Pages2/PageSettingsBackup.qml
+++ b/client/ui/qml/Pages2/PageSettingsBackup.qml
@@ -44,96 +44,6 @@ PageType {
                 headerText: qsTr("Backup")
             }
 
-            SwitcherType {
-                Layout.fillWidth: true
-                Layout.topMargin: 16
-
-                text: qsTr("Save logs")
-
-                checked: SettingsController.isSaveLogsEnabled()
-                onCheckedChanged: {
-                    if (checked !== SettingsController.isSaveLogsEnabled()) {
-                        SettingsController.setSaveLogs(checked)
-                    }
-                }
-            }
-
-            RowLayout {
-                Layout.fillWidth: true
-
-                ColumnLayout {
-                    Layout.alignment: Qt.AlignBaseline
-                    Layout.preferredWidth: root.width / 3
-
-                    ImageButtonType {
-                        Layout.alignment: Qt.AlignHCenter
-
-                        implicitWidth: 56
-                        implicitHeight: 56
-
-                        image: "qrc:/images/controls/folder-open.svg"
-
-                        onClicked: SettingsController.openLogsFolder()
-                    }
-
-                    CaptionTextType {
-                        horizontalAlignment: Text.AlignHCenter
-                        Layout.fillWidth: true
-
-                        text: qsTr("Open folder with logs")
-                        color: "#D7D8DB"
-                    }
-                }
-
-                ColumnLayout {
-                    Layout.alignment: Qt.AlignBaseline
-                    Layout.preferredWidth: root.width / 3
-
-                    ImageButtonType {
-                        Layout.alignment: Qt.AlignHCenter
-
-                        implicitWidth: 56
-                        implicitHeight: 56
-
-                        image: "qrc:/images/controls/save.svg"
-
-                        onClicked: SettingsController.exportLogsFile()
-                    }
-
-                    CaptionTextType {
-                        horizontalAlignment: Text.AlignHCenter
-                        Layout.fillWidth: true
-
-                        text: qsTr("Save logs to file")
-                        color: "#D7D8DB"
-                    }
-                }
-
-                ColumnLayout {
-                    Layout.alignment: Qt.AlignBaseline
-                    Layout.preferredWidth: root.width / 3
-
-                    ImageButtonType {
-                        Layout.alignment: Qt.AlignHCenter
-
-                        implicitWidth: 56
-                        implicitHeight: 56
-
-                        image: "qrc:/images/controls/delete.svg"
-
-                        onClicked: SettingsController.clearLogs()
-                    }
-
-                    CaptionTextType {
-                        horizontalAlignment: Text.AlignHCenter
-                        Layout.fillWidth: true
-
-                        text: qsTr("Clear logs")
-                        color: "#D7D8DB"
-                    }
-                }
-            }
-
             ListItemTitleType {
                 Layout.fillWidth: true
                 Layout.topMargin: 10
diff --git a/client/ui/qml/Pages2/PageSettingsLogging.qml b/client/ui/qml/Pages2/PageSettingsLogging.qml
new file mode 100644
index 00000000..998065e4
--- /dev/null
+++ b/client/ui/qml/Pages2/PageSettingsLogging.qml
@@ -0,0 +1,138 @@
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+
+import PageEnum 1.0
+
+import "./"
+import "../Controls2"
+import "../Config"
+import "../Controls2/TextTypes"
+
+PageType {
+    id: root
+
+    BackButtonType {
+        id: backButton
+
+        anchors.top: parent.top
+        anchors.left: parent.left
+        anchors.right: parent.right
+        anchors.topMargin: 20
+    }
+
+    FlickableType {
+        id: fl
+        anchors.top: backButton.bottom
+        anchors.bottom: parent.bottom
+        contentHeight: content.height
+
+        ColumnLayout {
+            id: content
+
+            anchors.top: parent.top
+            anchors.left: parent.left
+            anchors.right: parent.right
+            anchors.leftMargin: 16
+            anchors.rightMargin: 16
+
+            spacing: 16
+
+            HeaderType {
+                Layout.fillWidth: true
+
+                headerText: qsTr("Logging")
+            }
+
+            SwitcherType {
+                Layout.fillWidth: true
+                Layout.topMargin: 16
+
+                text: qsTr("Save logs")
+
+                checked: SettingsController.isLoggingEnable
+                onCheckedChanged: {
+                    if (checked !== SettingsController.isLoggingEnable) {
+                        SettingsController.isLoggingEnable = checked
+                    }
+                }
+            }
+
+            RowLayout {
+                Layout.fillWidth: true
+
+                ColumnLayout {
+                    Layout.alignment: Qt.AlignBaseline
+                    Layout.preferredWidth: root.width / 3
+
+                    ImageButtonType {
+                        Layout.alignment: Qt.AlignHCenter
+
+                        implicitWidth: 56
+                        implicitHeight: 56
+
+                        image: "qrc:/images/controls/folder-open.svg"
+
+                        onClicked: SettingsController.openLogsFolder()
+                    }
+
+                    CaptionTextType {
+                        horizontalAlignment: Text.AlignHCenter
+                        Layout.fillWidth: true
+
+                        text: qsTr("Open folder with logs")
+                        color: "#D7D8DB"
+                    }
+                }
+
+                ColumnLayout {
+                    Layout.alignment: Qt.AlignBaseline
+                    Layout.preferredWidth: root.width / 3
+
+                    ImageButtonType {
+                        Layout.alignment: Qt.AlignHCenter
+
+                        implicitWidth: 56
+                        implicitHeight: 56
+
+                        image: "qrc:/images/controls/save.svg"
+
+                        onClicked: SettingsController.exportLogsFile()
+                    }
+
+                    CaptionTextType {
+                        horizontalAlignment: Text.AlignHCenter
+                        Layout.fillWidth: true
+
+                        text: qsTr("Save logs to file")
+                        color: "#D7D8DB"
+                    }
+                }
+
+                ColumnLayout {
+                    Layout.alignment: Qt.AlignBaseline
+                    Layout.preferredWidth: root.width / 3
+
+                    ImageButtonType {
+                        Layout.alignment: Qt.AlignHCenter
+
+                        implicitWidth: 56
+                        implicitHeight: 56
+
+                        image: "qrc:/images/controls/delete.svg"
+
+                        onClicked: SettingsController.clearLogs()
+                    }
+
+                    CaptionTextType {
+                        horizontalAlignment: Text.AlignHCenter
+                        Layout.fillWidth: true
+
+                        text: qsTr("Clear logs")
+                        color: "#D7D8DB"
+                    }
+                }
+            }
+        }
+    }
+}

From 5d677a9115724ded952bd61434777866d4993330 Mon Sep 17 00:00:00 2001
From: "vladimir.kuznetsov" <nethiuswork@gmail.com>
Date: Tue, 18 Jul 2023 11:15:04 +0900
Subject: [PATCH 045/278] added pages for sftp and tor website settings

---
 client/CMakeLists.txt                         |  12 +-
 client/amnezia_application.cpp                |   3 +
 client/amnezia_application.h                  |   3 +
 client/images/controls/copy.svg               |   4 +
 client/protocols/protocols_defs.h             |   1 +
 client/resources.qrc                          |   3 +
 client/ui/controllers/installController.cpp   |  79 +++++
 client/ui/controllers/installController.h     |   5 +
 client/ui/controllers/pageController.h        |   3 +
 client/ui/models/containers_model.cpp         |   5 +
 client/ui/models/containers_model.h           |   1 +
 client/ui/models/servers_model.cpp            |   5 +
 client/ui/models/servers_model.h              |   2 +
 client/ui/models/services/sftpConfigModel.cpp |  64 ++++
 client/ui/models/services/sftpConfigModel.h   |  39 +++
 .../Components/SettingsContainersListView.qml |  11 +
 .../ui/qml/Controls2/LabelWithButtonType.qml  |  24 +-
 .../Controls2/TextTypes/CaptionTextType.qml   |   2 +-
 .../Controls2/TextTypes/ListItemTitleType.qml |   2 +-
 .../Pages2/PageProtocolOpenVpnSettings.qml    |   2 +
 .../ui/qml/Pages2/PageServiceSftpSettings.qml | 280 ++++++++++++++++++
 .../Pages2/PageServiceTorWebsiteSettings.qml  | 169 +++++++++++
 22 files changed, 713 insertions(+), 6 deletions(-)
 create mode 100644 client/images/controls/copy.svg
 create mode 100644 client/ui/models/services/sftpConfigModel.cpp
 create mode 100644 client/ui/models/services/sftpConfigModel.h
 create mode 100644 client/ui/qml/Pages2/PageServiceSftpSettings.qml
 create mode 100644 client/ui/qml/Pages2/PageServiceTorWebsiteSettings.qml

diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt
index be1c3b92..8f1c9353 100644
--- a/client/CMakeLists.txt
+++ b/client/CMakeLists.txt
@@ -129,8 +129,16 @@ file(GLOB_RECURSE PAGE_LOGIC_CPP CONFIGURE_DEPENDS ${CMAKE_CURRENT_LIST_DIR}/ui/
 file(GLOB CONFIGURATORS_H CONFIGURE_DEPENDS ${CMAKE_CURRENT_LIST_DIR}/configurators/*.h)
 file(GLOB CONFIGURATORS_CPP CONFIGURE_DEPENDS ${CMAKE_CURRENT_LIST_DIR}/configurators/*.cpp)
 
-file(GLOB UI_MODELS_H CONFIGURE_DEPENDS ${CMAKE_CURRENT_LIST_DIR}/ui/models/*.h ${CMAKE_CURRENT_LIST_DIR}/ui/models/protocols/*.h)
-file(GLOB UI_MODELS_CPP CONFIGURE_DEPENDS ${CMAKE_CURRENT_LIST_DIR}/ui/models/*.cpp ${CMAKE_CURRENT_LIST_DIR}/ui/models/protocols/*.cpp)
+file(GLOB UI_MODELS_H CONFIGURE_DEPENDS
+    ${CMAKE_CURRENT_LIST_DIR}/ui/models/*.h
+    ${CMAKE_CURRENT_LIST_DIR}/ui/models/protocols/*.h
+    ${CMAKE_CURRENT_LIST_DIR}/ui/models/services/*.h
+)
+file(GLOB UI_MODELS_CPP CONFIGURE_DEPENDS
+    ${CMAKE_CURRENT_LIST_DIR}/ui/models/*.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/ui/models/protocols/*.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/ui/models/services/*.cpp
+)
 
 file(GLOB UI_CONTROLLERS_H CONFIGURE_DEPENDS ${CMAKE_CURRENT_LIST_DIR}/ui/controllers/*.h)
 file(GLOB UI_CONTROLLERS_CPP CONFIGURE_DEPENDS ${CMAKE_CURRENT_LIST_DIR}/ui/controllers/*.cpp)
diff --git a/client/amnezia_application.cpp b/client/amnezia_application.cpp
index abd839ed..7bf035fa 100644
--- a/client/amnezia_application.cpp
+++ b/client/amnezia_application.cpp
@@ -267,6 +267,9 @@ void AmneziaApplication::initModels()
     m_ikev2ConfigModel.reset(new Ikev2ConfigModel(this));
     m_engine->rootContext()->setContextProperty("Ikev2ConfigModel", m_ikev2ConfigModel.get());
 #endif
+
+    m_sftpConfigModel.reset(new SftpConfigModel(this));
+    m_engine->rootContext()->setContextProperty("SftpConfigModel", m_sftpConfigModel.get());
 }
 
 void AmneziaApplication::initControllers()
diff --git a/client/amnezia_application.h b/client/amnezia_application.h
index 6e9fcdf0..3ba42e41 100644
--- a/client/amnezia_application.h
+++ b/client/amnezia_application.h
@@ -31,6 +31,7 @@
 #include "ui/models/protocols/wireguardConfigModel.h"
 #include "ui/models/protocols_model.h"
 #include "ui/models/servers_model.h"
+#include "ui/models/services/sftpConfigModel.h"
 
 #define amnApp (static_cast<AmneziaApplication *>(QCoreApplication::instance()))
 
@@ -91,6 +92,8 @@ private:
     QScopedPointer<Ikev2ConfigModel> m_ikev2ConfigModel;
 #endif
 
+    QScopedPointer<SftpConfigModel> m_sftpConfigModel;
+
     QSharedPointer<VpnConnection> m_vpnConnection;
     QScopedPointer<NotificationHandler> m_notificationHandler;
 
diff --git a/client/images/controls/copy.svg b/client/images/controls/copy.svg
new file mode 100644
index 00000000..787e71db
--- /dev/null
+++ b/client/images/controls/copy.svg
@@ -0,0 +1,4 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M20 9H11C9.89543 9 9 9.89543 9 11V20C9 21.1046 9.89543 22 11 22H20C21.1046 22 22 21.1046 22 20V11C22 9.89543 21.1046 9 20 9Z" stroke="#CBCBCB" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M5 15H4C3.46957 15 2.96086 14.7893 2.58579 14.4142C2.21071 14.0391 2 13.5304 2 13V4C2 3.46957 2.21071 2.96086 2.58579 2.58579C2.96086 2.21071 3.46957 2 4 2H13C13.5304 2 14.0391 2.21071 14.4142 2.58579C14.7893 2.96086 15 3.46957 15 4V5" stroke="#CBCBCB" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/client/protocols/protocols_defs.h b/client/protocols/protocols_defs.h
index 73c2abdf..2fba272f 100644
--- a/client/protocols/protocols_defs.h
+++ b/client/protocols/protocols_defs.h
@@ -65,6 +65,7 @@ namespace amnezia
         constexpr char wireguard[] = "wireguard";
         constexpr char shadowsocks[] = "shadowsocks";
         constexpr char cloak[] = "cloak";
+        constexpr char sftp[] = "sftp";
 
     }
 
diff --git a/client/resources.qrc b/client/resources.qrc
index 3435a107..e1afa294 100644
--- a/client/resources.qrc
+++ b/client/resources.qrc
@@ -275,5 +275,8 @@
         <file>ui/qml/Pages2/PageProtocolCloakSettings.qml</file>
         <file>ui/qml/Pages2/PageProtocolRaw.qml</file>
         <file>ui/qml/Pages2/PageSettingsLogging.qml</file>
+        <file>ui/qml/Pages2/PageServiceSftpSettings.qml</file>
+        <file>images/controls/copy.svg</file>
+        <file>ui/qml/Pages2/PageServiceTorWebsiteSettings.qml</file>
     </qresource>
 </RCC>
diff --git a/client/ui/controllers/installController.cpp b/client/ui/controllers/installController.cpp
index 2259721a..84633b54 100644
--- a/client/ui/controllers/installController.cpp
+++ b/client/ui/controllers/installController.cpp
@@ -1,6 +1,8 @@
 #include "installController.h"
 
+#include <QDesktopServices>
 #include <QJsonObject>
+#include <QStandardPaths>
 
 #include "core/errorstrings.h"
 #include "core/servercontroller.h"
@@ -214,3 +216,80 @@ void InstallController::setShouldCreateServer(bool shouldCreateServer)
 {
     m_shouldCreateServer = shouldCreateServer;
 }
+
+void InstallController::mountSftpDrive(const QString &port, const QString &password, const QString &username)
+{
+    QString mountPath;
+    QString cmd;
+
+    int serverIndex = m_serversModel->getCurrentlyProcessedServerIndex();
+    ServerCredentials serverCredentials =
+            qvariant_cast<ServerCredentials>(m_serversModel->data(serverIndex, ServersModel::Roles::CredentialsRole));
+    QString hostname = serverCredentials.hostName;
+
+#ifdef Q_OS_WINDOWS
+    mountPath = getNextDriverLetter() + ":";
+    //    QString cmd = QString("net use \\\\sshfs\\%1@x.x.x.x!%2 /USER:%1 %3")
+    //            .arg(labelTftpUserNameText())
+    //            .arg(labelTftpPortText())
+    //            .arg(labelTftpPasswordText());
+
+    cmd = "C:\\Program Files\\SSHFS-Win\\bin\\sshfs.exe";
+#elif defined AMNEZIA_DESKTOP
+    mountPath =
+            QString("%1/sftp:%2:%3").arg(QStandardPaths::writableLocation(QStandardPaths::HomeLocation), hostname, port);
+    QDir dir(mountPath);
+    if (!dir.exists()) {
+        dir.mkpath(mountPath);
+    }
+
+    cmd = "/usr/local/bin/sshfs";
+#endif
+
+#ifdef AMNEZIA_DESKTOP
+    QSharedPointer<QProcess> process;
+    process.reset(new QProcess());
+    m_sftpMountProcesses.append(process);
+    process->setProcessChannelMode(QProcess::MergedChannels);
+
+    connect(process.get(), &QProcess::readyRead, this, [this, process, mountPath]() {
+        QString s = process->readAll();
+        if (s.contains("The service sshfs has been started")) {
+            QDesktopServices::openUrl(QUrl("file:///" + mountPath));
+        }
+        qDebug() << s;
+    });
+
+    process->setProgram(cmd);
+
+    QString args = QString("%1@%2:/ %3 "
+                           "-o port=%4 "
+                           "-f "
+                           "-o reconnect "
+                           "-o rellinks "
+                           "-o fstypename=SSHFS "
+                           "-o ssh_command=/usr/bin/ssh.exe "
+                           "-o UserKnownHostsFile=/dev/null "
+                           "-o StrictHostKeyChecking=no "
+                           "-o password_stdin")
+                           .arg(username, hostname, mountPath, port);
+
+    //    args.replace("\n", " ");
+    //    args.replace("\r", " ");
+    // #ifndef Q_OS_WIN
+    //    args.replace("reconnect-orellinks", "");
+    // #endif
+    process->setArguments(args.split(" ", Qt::SkipEmptyParts));
+    process->start();
+    process->waitForStarted(50);
+    if (process->state() != QProcess::Running) {
+        qDebug() << "onPushButtonSftpMountDriveClicked process not started";
+        qDebug() << args;
+    } else {
+        process->write((password + "\n").toUtf8());
+    }
+
+    // qDebug().noquote() << "onPushButtonSftpMountDriveClicked" << args;
+
+#endif
+}
diff --git a/client/ui/controllers/installController.h b/client/ui/controllers/installController.h
index 75f4fdef..8458b46d 100644
--- a/client/ui/controllers/installController.h
+++ b/client/ui/controllers/installController.h
@@ -2,6 +2,7 @@
 #define INSTALLCONTROLLER_H
 
 #include <QObject>
+#include <QProcess>
 
 #include "containers/containers_defs.h"
 #include "core/defs.h"
@@ -28,6 +29,8 @@ public slots:
 
     QRegularExpression ipAddressPortRegExp();
 
+    void mountSftpDrive(const QString &port, const QString &password, const QString &username);
+
 signals:
     void installContainerFinished(bool isInstalledContainerFound);
     void installServerFinished(bool isInstalledContainerFound);
@@ -52,6 +55,8 @@ private:
     ServerCredentials m_currentlyInstalledServerCredentials;
 
     bool m_shouldCreateServer;
+
+    QList<QSharedPointer<QProcess>> m_sftpMountProcesses;
 };
 
 #endif // INSTALLCONTROLLER_H
diff --git a/client/ui/controllers/pageController.h b/client/ui/controllers/pageController.h
index a0b9753b..d79b100a 100644
--- a/client/ui/controllers/pageController.h
+++ b/client/ui/controllers/pageController.h
@@ -29,6 +29,9 @@ namespace PageLoader
         PageSettingsAbout,
         PageSettingsLogging,
 
+        PageServiceSftpSettings,
+        PageServiceTorWebsiteSettings,
+
         PageSetupWizardStart,
         PageSetupWizardCredentials,
         PageSetupWizardProtocols,
diff --git a/client/ui/models/containers_model.cpp b/client/ui/models/containers_model.cpp
index 7b6ffaee..922542dd 100644
--- a/client/ui/models/containers_model.cpp
+++ b/client/ui/models/containers_model.cpp
@@ -118,6 +118,11 @@ QString ContainersModel::getCurrentlyProcessedContainerName()
     return ContainerProps::containerHumanNames().value(static_cast<DockerContainer>(m_currentlyProcessedContainerIndex));
 }
 
+QJsonObject ContainersModel::getCurrentlyProcessedContainerConfig()
+{
+    return qvariant_cast<QJsonObject>(data(index(m_currentlyProcessedContainerIndex), ConfigRole));
+}
+
 void ContainersModel::removeAllContainers()
 {
 
diff --git a/client/ui/models/containers_model.h b/client/ui/models/containers_model.h
index b79b058a..75ba9114 100644
--- a/client/ui/models/containers_model.h
+++ b/client/ui/models/containers_model.h
@@ -50,6 +50,7 @@ public slots:
     int getCurrentlyProcessedContainerIndex();
 
     QString getCurrentlyProcessedContainerName();
+    QJsonObject getCurrentlyProcessedContainerConfig();
 
     void removeAllContainers();
     void removeCurrentlyProcessedContainer();
diff --git a/client/ui/models/servers_model.cpp b/client/ui/models/servers_model.cpp
index 6fad9af6..fabbb829 100644
--- a/client/ui/models/servers_model.cpp
+++ b/client/ui/models/servers_model.cpp
@@ -106,6 +106,11 @@ int ServersModel::getCurrentlyProcessedServerIndex()
     return m_currentlyProcessedServerIndex;
 }
 
+QString ServersModel::getCurrentlyProcessedServerHostName()
+{
+    return qvariant_cast<QString>(data(m_currentlyProcessedServerIndex, HostNameRole));
+}
+
 bool ServersModel::isDefaultServerCurrentlyProcessed()
 {
     return m_defaultServerIndex == m_currentlyProcessedServerIndex;
diff --git a/client/ui/models/servers_model.h b/client/ui/models/servers_model.h
index f149d85b..a31e3c04 100644
--- a/client/ui/models/servers_model.h
+++ b/client/ui/models/servers_model.h
@@ -45,6 +45,8 @@ public slots:
     void setCurrentlyProcessedServerIndex(const int index);
     int getCurrentlyProcessedServerIndex();
 
+    QString getCurrentlyProcessedServerHostName();
+
     void addServer(const QJsonObject &server);
     void removeServer();
 
diff --git a/client/ui/models/services/sftpConfigModel.cpp b/client/ui/models/services/sftpConfigModel.cpp
new file mode 100644
index 00000000..3cbb5ebc
--- /dev/null
+++ b/client/ui/models/services/sftpConfigModel.cpp
@@ -0,0 +1,64 @@
+#include "sftpConfigModel.h"
+
+#include "protocols/protocols_defs.h"
+
+SftpConfigModel::SftpConfigModel(QObject *parent) : QAbstractListModel(parent)
+{
+}
+
+int SftpConfigModel::rowCount(const QModelIndex &parent) const
+{
+    Q_UNUSED(parent);
+    return 1;
+}
+
+QVariant SftpConfigModel::data(const QModelIndex &index, int role) const
+{
+    if (!index.isValid() || index.row() < 0 || index.row() >= rowCount()) {
+        return false;
+    }
+
+    switch (role) {
+    case Roles::PortRole: return m_protocolConfig.value(config_key::port).toString();
+    case Roles::UserNameRole:
+        return m_protocolConfig.value(config_key::userName).toString(protocols::sftp::defaultUserName);
+    case Roles::PasswordRole: return m_protocolConfig.value(config_key::password).toString();
+    }
+
+    return QVariant();
+}
+
+void SftpConfigModel::updateModel(const QJsonObject &config)
+{
+    beginResetModel();
+    m_container = ContainerProps::containerFromString(config.value(config_key::container).toString());
+
+    m_fullConfig = config;
+    QJsonObject protocolConfig = config.value(config_key::sftp).toObject();
+
+    m_protocolConfig.insert(config_key::userName,
+                            protocolConfig.value(config_key::userName).toString(protocols::sftp::defaultUserName));
+
+    m_protocolConfig.insert(config_key::password, protocolConfig.value(config_key::password).toString());
+
+    m_protocolConfig.insert(config_key::port, protocolConfig.value(config_key::port).toString());
+
+    endResetModel();
+}
+
+QJsonObject SftpConfigModel::getConfig()
+{
+    m_fullConfig.insert(config_key::sftp, m_protocolConfig);
+    return m_fullConfig;
+}
+
+QHash<int, QByteArray> SftpConfigModel::roleNames() const
+{
+    QHash<int, QByteArray> roles;
+
+    roles[PortRole] = "port";
+    roles[UserNameRole] = "username";
+    roles[PasswordRole] = "password";
+
+    return roles;
+}
diff --git a/client/ui/models/services/sftpConfigModel.h b/client/ui/models/services/sftpConfigModel.h
new file mode 100644
index 00000000..e948591e
--- /dev/null
+++ b/client/ui/models/services/sftpConfigModel.h
@@ -0,0 +1,39 @@
+#ifndef SFTPCONFIGMODEL_H
+#define SFTPCONFIGMODEL_H
+
+#include <QAbstractListModel>
+#include <QJsonObject>
+
+#include "containers/containers_defs.h"
+
+class SftpConfigModel : public QAbstractListModel
+{
+    Q_OBJECT
+
+public:
+    enum Roles {
+        PortRole = Qt::UserRole + 1,
+        UserNameRole,
+        PasswordRole
+    };
+
+    explicit SftpConfigModel(QObject *parent = nullptr);
+
+    int rowCount(const QModelIndex &parent = QModelIndex()) const override;
+
+    QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
+
+public slots:
+    void updateModel(const QJsonObject &config);
+    QJsonObject getConfig();
+
+protected:
+    QHash<int, QByteArray> roleNames() const override;
+
+private:
+    DockerContainer m_container;
+    QJsonObject m_protocolConfig;
+    QJsonObject m_fullConfig;
+};
+
+#endif // SFTPCONFIGMODEL_H
diff --git a/client/ui/qml/Components/SettingsContainersListView.qml b/client/ui/qml/Components/SettingsContainersListView.qml
index d2f3ee81..eac473f4 100644
--- a/client/ui/qml/Components/SettingsContainersListView.qml
+++ b/client/ui/qml/Components/SettingsContainersListView.qml
@@ -92,6 +92,7 @@ ListView {
                 if (isInstalled) {
                     var containerIndex = root.model.mapToSource(index)
                     ContainersModel.setCurrentlyProcessedContainerIndex(containerIndex)
+
                     if (config[ContainerProps.containerTypeToString(containerIndex)]["isThirdPartyConfig"]) {
                         ProtocolsModel.updateModel(config)
                         goToPage(PageEnum.PageProtocolRaw)
@@ -114,6 +115,16 @@ ListView {
                         goToPage(PageEnum.PageProtocolIKev2Settings)
                         break
                     }
+                    case ContainerEnum.Sftp: {
+                        SftpConfigModel.updateModel(config)
+                        goToPage(PageEnum.PageServiceSftpSettings)
+                        break
+                    }
+                    case ContainerEnum.TorWebSite: {
+                        goToPage(PageEnum.PageServiceTorWebsiteSettings)
+                        break
+                    }
+
                     default: {
                         if (serviceType !== ProtocolEnum.Other) { //todo disable settings for dns container
                             ProtocolsModel.updateModel(config)
diff --git a/client/ui/qml/Controls2/LabelWithButtonType.qml b/client/ui/qml/Controls2/LabelWithButtonType.qml
index c925f801..3aca1d57 100644
--- a/client/ui/qml/Controls2/LabelWithButtonType.qml
+++ b/client/ui/qml/Controls2/LabelWithButtonType.qml
@@ -16,6 +16,10 @@ Item {
     property string leftImageSource
 
     property string textColor: "#d7d8db"
+    property string descriptionColor: "#878B91"
+    property string rightImageColor: "#878B91"
+
+    property bool descriptionOnTop: false
 
     implicitWidth: content.implicitWidth + content.anchors.topMargin + content.anchors.bottomMargin
     implicitHeight: content.implicitHeight + content.anchors.leftMargin + content.anchors.rightMargin
@@ -53,26 +57,41 @@ Item {
         }
 
         ColumnLayout {
+            property real textLineHeight: 21.6
+            property real descriptionTextLineHeight: 16
+
+            property int textPixelSize: 18
+            property int descriptionTextSize: 13
+
             ListItemTitleType {
                 text: root.text
-                color: root.textColor
+                color: root.descriptionOnTop ? root.descriptionColor : root.textColor
 
                 Layout.fillWidth: true
 
+                lineHeight: root.descriptionOnTop ? parent.descriptionTextLineHeight : parent.textLineHeight
+                font.pixelSize: root.descriptionOnTop ? parent.descriptionTextSize : parent.textPixelSize
+                font.letterSpacing: root.descriptionOnTop ? 0.02 : 0
+
                 horizontalAlignment: Text.AlignLeft
                 verticalAlignment: Text.AlignVCenter
             }
 
+
             CaptionTextType {
                 id: description
 
-                color: "#878B91"
+                color: root.descriptionOnTop ? root.textColor : root.descriptionColor
                 text: root.descriptionText
 
                 visible: root.descriptionText !== ""
 
                 Layout.fillWidth: true
 
+                lineHeight: root.descriptionOnTop ? parent.textLineHeight : parent.descriptionTextLineHeight
+                font.pixelSize: root.descriptionOnTop ? parent.textPixelSize : parent.descriptionTextSize
+                font.letterSpacing: root.descriptionOnTop ? 0 : 0.02
+
                 horizontalAlignment: Text.AlignLeft
                 verticalAlignment: Text.AlignVCenter
             }
@@ -83,6 +102,7 @@ Item {
 
             hoverEnabled: false
             image: rightImageSource
+            imageColor: rightImageColor
             visible: rightImageSource ? true : false
 
             Layout.alignment: Qt.AlignRight
diff --git a/client/ui/qml/Controls2/TextTypes/CaptionTextType.qml b/client/ui/qml/Controls2/TextTypes/CaptionTextType.qml
index b9e41da2..f7acb6dd 100644
--- a/client/ui/qml/Controls2/TextTypes/CaptionTextType.qml
+++ b/client/ui/qml/Controls2/TextTypes/CaptionTextType.qml
@@ -10,5 +10,5 @@ Text {
     font.family: "PT Root UI VF"
     font.letterSpacing: 0.02
 
-    wrapMode: Text.WordWrap
+    wrapMode: Text.Wrap
 }
diff --git a/client/ui/qml/Controls2/TextTypes/ListItemTitleType.qml b/client/ui/qml/Controls2/TextTypes/ListItemTitleType.qml
index 30bd7900..917e65de 100644
--- a/client/ui/qml/Controls2/TextTypes/ListItemTitleType.qml
+++ b/client/ui/qml/Controls2/TextTypes/ListItemTitleType.qml
@@ -9,5 +9,5 @@ Text {
     font.weight: 400
     font.family: "PT Root UI VF"
 
-    wrapMode: Text.WordWrap
+    wrapMode: Text.Wrap
 }
diff --git a/client/ui/qml/Pages2/PageProtocolOpenVpnSettings.qml b/client/ui/qml/Pages2/PageProtocolOpenVpnSettings.qml
index 0bad68e9..028f9fd3 100644
--- a/client/ui/qml/Pages2/PageProtocolOpenVpnSettings.qml
+++ b/client/ui/qml/Pages2/PageProtocolOpenVpnSettings.qml
@@ -413,6 +413,8 @@ PageType {
 
                         BasicButtonType {
                             Layout.topMargin: 24
+                            Layout.leftMargin: -8
+                            implicitHeight: 32
 
                             defaultColor: "transparent"
                             hoveredColor: Qt.rgba(1, 1, 1, 0.08)
diff --git a/client/ui/qml/Pages2/PageServiceSftpSettings.qml b/client/ui/qml/Pages2/PageServiceSftpSettings.qml
new file mode 100644
index 00000000..ffa42859
--- /dev/null
+++ b/client/ui/qml/Pages2/PageServiceSftpSettings.qml
@@ -0,0 +1,280 @@
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+
+import SortFilterProxyModel 0.2
+
+import PageEnum 1.0
+
+import "./"
+import "../Controls2"
+import "../Controls2/TextTypes"
+import "../Config"
+import "../Components"
+
+PageType {
+    id: root
+
+    //todo move to main?
+    Connections {
+        target: InstallController
+
+        function onInstallationErrorOccurred(errorMessage) {
+            PageController.showErrorMessage(errorMessage)
+        }
+
+        function onUpdateContainerFinished() {
+            //todo change to notification
+            PageController.showErrorMessage(qsTr("Settings updated successfully"))
+        }
+    }
+
+    ColumnLayout {
+        id: backButton
+
+        anchors.top: parent.top
+        anchors.left: parent.left
+        anchors.right: parent.right
+
+        anchors.topMargin: 20
+
+        BackButtonType {
+        }
+    }
+
+    FlickableType {
+        id: fl
+        anchors.top: backButton.bottom
+        anchors.bottom: parent.bottom
+        contentHeight: content.implicitHeight
+
+        Column {
+            id: content
+
+            anchors.top: parent.top
+            anchors.left: parent.left
+            anchors.right: parent.right
+
+            enabled: ServersModel.isCurrentlyProcessedServerHasWriteAccess()
+
+            ListView {
+                id: listview
+
+                width: parent.width
+                height: listview.contentItem.height
+
+                clip: true
+                interactive: false
+
+                model: SftpConfigModel
+
+                delegate: Item {
+                    implicitWidth: listview.width
+                    implicitHeight: col.implicitHeight
+
+                    ColumnLayout {
+                        id: col
+
+                        anchors.top: parent.top
+                        anchors.left: parent.left
+                        anchors.right: parent.right
+
+                        spacing: 0
+
+                        HeaderType {
+                            Layout.fillWidth: true
+                            Layout.leftMargin: 16
+                            Layout.rightMargin: 16
+
+                            headerText: qsTr("SFTP settings")
+                        }
+
+                        LabelWithButtonType {
+                            Layout.fillWidth: true
+                            Layout.topMargin: 32
+
+                            text: qsTr("Host")
+                            descriptionText: ServersModel.getCurrentlyProcessedServerHostName()
+
+                            descriptionOnTop: true
+
+                            rightImageSource: "qrc:/images/controls/copy.svg"
+                            rightImageColor: "#D7D8DB"
+
+                            clickedFunction: function() {
+                                col.copyToClipBoard(descriptionText)
+                            }
+                        }
+
+                        LabelWithButtonType {
+                            Layout.fillWidth: true
+
+                            text: qsTr("Port")
+                            descriptionText: port
+
+                            descriptionOnTop: true
+
+                            rightImageSource: "qrc:/images/controls/copy.svg"
+                            rightImageColor: "#D7D8DB"
+
+                            clickedFunction: function() {
+                                col.copyToClipBoard(descriptionText)
+                            }
+                        }
+
+                        LabelWithButtonType {
+                            Layout.fillWidth: true
+
+                            text: qsTr("Login")
+                            descriptionText: username
+
+                            descriptionOnTop: true
+
+                            rightImageSource: "qrc:/images/controls/copy.svg"
+                            rightImageColor: "#D7D8DB"
+
+                            clickedFunction: function() {
+                                col.copyToClipBoard(descriptionText)
+                            }
+                        }
+
+                        LabelWithButtonType {
+                            Layout.fillWidth: true
+
+                            text: qsTr("Password")
+                            descriptionText: password
+
+                            descriptionOnTop: true
+
+                            rightImageSource: "qrc:/images/controls/copy.svg"
+                            rightImageColor: "#D7D8DB"
+
+                            clickedFunction: function() {
+                                col.copyToClipBoard(descriptionText)
+                            }
+                        }
+
+                        TextEdit{
+                            id: clipboard
+                            visible: false
+                        }
+
+                        function copyToClipBoard(text) {
+                            clipboard.text = text
+                            clipboard.selectAll()
+                            clipboard.copy()
+                            clipboard.select(0, 0)
+                        }
+
+                        BasicButtonType {
+                            Layout.fillWidth: true
+                            Layout.topMargin: 24
+                            Layout.bottomMargin: 24
+                            Layout.leftMargin: 16
+                            Layout.rightMargin: 16
+
+                            defaultColor: "transparent"
+                            hoveredColor: Qt.rgba(1, 1, 1, 0.08)
+                            pressedColor: Qt.rgba(1, 1, 1, 0.12)
+                            disabledColor: "#878B91"
+                            textColor: "#D7D8DB"
+                            borderWidth: 1
+
+                            text: qsTr("Mount folder on device")
+
+                            onClicked: {
+                                PageController.showBusyIndicator(true)
+                                InstallController.mountSftpDrive(port, password, username)
+                                PageController.showBusyIndicator(false)
+                            }
+                        }
+
+                        ParagraphTextType {
+                            Layout.fillWidth: true
+                            Layout.leftMargin: 16
+                            Layout.rightMargin: 16
+
+                            readonly property string windowsFirstLink: "<a href=\"https://github.com/billziss-gh/winfsp/releases/latest\" style=\"color: #FBB26A;\">WinFsp</a>"
+                            readonly property string windowsSecondLink: "<a href=\"https://github.com/billziss-gh/sshfs-win/releases\" style=\"color: #FBB26A;\">SSHFS-Win</a>"
+
+                            readonly property string macosFirstLink: "<a href=\"https://osxfuse.github.io/\" style=\"color: #FBB26A;\">macFUSE</a>"
+                            readonly property string macosSecondLink: "<a href=\"https://osxfuse.github.io/\" style=\"color: #FBB26A;\">SSHFS</a>"
+
+                            onLinkActivated: Qt.openUrlExternally(link)
+                            textFormat: Text.RichText
+                            text: {
+                                var str = qsTr("In order to mount remote SFTP folder as local drive, perform following steps: <br>")
+                                if (Qt.platform.os === "windows") {
+                                    str += qsTr("<br>1. Install the latest version of ") + windowsFirstLink + "\n"
+                                    str += qsTr("<br>2. Install the latest version of ") + windowsSecondLink + "\n"
+                                } else if (Qt.platform.os === "osx") {
+                                    str += qsTr("<br>1. Install the latest version of ") + macosFirstLink + "\n"
+                                    str += qsTr("<br>2. Install the latest version of ") + macosSecondLink + "\n"
+                                } else if (Qt.platform.os === "linux") {
+                                    return ""
+                                } else return ""
+
+                                return str
+                            }
+                        }
+
+                        BasicButtonType {
+                            Layout.topMargin: 16
+                            Layout.bottomMargin: 16
+                            Layout.leftMargin: 8
+                            implicitHeight: 32
+
+                            defaultColor: "transparent"
+                            hoveredColor: Qt.rgba(1, 1, 1, 0.08)
+                            pressedColor: Qt.rgba(1, 1, 1, 0.12)
+                            disabledColor: "#878B91"
+                            textColor: "#FBB26A"
+
+                            text: qsTr("Detailed instructions")
+
+                            onClicked: {
+//                                Qt.openUrlExternally("https://github.com/amnezia-vpn/desktop-client/releases/latest")
+                            }
+                        }
+
+                        BasicButtonType {
+                            Layout.topMargin: 24
+                            Layout.bottomMargin: 16
+                            Layout.leftMargin: 8
+                            implicitHeight: 32
+
+                            defaultColor: "transparent"
+                            hoveredColor: Qt.rgba(1, 1, 1, 0.08)
+                            pressedColor: Qt.rgba(1, 1, 1, 0.12)
+                            textColor: "#EB5757"
+
+                            text: qsTr("Remove SFTP and all data stored there")
+
+                            onClicked: {
+                                questionDrawer.headerText = qsTr("Some description")
+                                questionDrawer.yesButtonText = qsTr("Continue")
+                                questionDrawer.noButtonText = qsTr("Cancel")
+
+                                questionDrawer.yesButtonFunction = function() {
+                                    questionDrawer.visible = false
+                                    goToPage(PageEnum.PageDeinstalling)
+                                    ContainersModel.removeCurrentlyProcessedContainer()
+                                    closePage()
+                                    closePage() //todo auto close to deinstall page?
+                                }
+                                questionDrawer.noButtonFunction = function() {
+                                    questionDrawer.visible = false
+                                }
+                                questionDrawer.visible = true
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        QuestionDrawer {
+            id: questionDrawer
+        }
+    }
+}
diff --git a/client/ui/qml/Pages2/PageServiceTorWebsiteSettings.qml b/client/ui/qml/Pages2/PageServiceTorWebsiteSettings.qml
new file mode 100644
index 00000000..a47a95e3
--- /dev/null
+++ b/client/ui/qml/Pages2/PageServiceTorWebsiteSettings.qml
@@ -0,0 +1,169 @@
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+
+import SortFilterProxyModel 0.2
+
+import PageEnum 1.0
+import ContainerProps 1.0
+
+import "./"
+import "../Controls2"
+import "../Controls2/TextTypes"
+import "../Config"
+import "../Components"
+
+PageType {
+    id: root
+
+    //todo move to main?
+    Connections {
+        target: InstallController
+
+        function onInstallationErrorOccurred(errorMessage) {
+            PageController.showErrorMessage(errorMessage)
+        }
+
+        function onUpdateContainerFinished() {
+            //todo change to notification
+            PageController.showErrorMessage(qsTr("Settings updated successfully"))
+        }
+    }
+
+    ColumnLayout {
+        id: backButton
+
+        anchors.top: parent.top
+        anchors.left: parent.left
+        anchors.right: parent.right
+
+        anchors.topMargin: 20
+
+        BackButtonType {
+        }
+    }
+
+    FlickableType {
+        id: fl
+        anchors.top: backButton.bottom
+        anchors.bottom: parent.bottom
+        contentHeight: content.implicitHeight
+
+        ColumnLayout {
+            id: content
+
+            anchors.top: parent.top
+            anchors.left: parent.left
+            anchors.right: parent.right
+
+            spacing: 0
+
+            HeaderType {
+                Layout.fillWidth: true
+                Layout.leftMargin: 16
+                Layout.rightMargin: 16
+
+                headerText: qsTr("Tor website settings")
+            }
+
+            LabelWithButtonType {
+                Layout.fillWidth: true
+                Layout.topMargin: 32
+
+                text: qsTr("Website address")
+                descriptionText: {
+                    var config = ContainersModel.getCurrentlyProcessedContainerConfig()
+                    var containerIndex = ContainersModel.getCurrentlyProcessedContainerIndex()
+                    return config[ContainerProps.containerTypeToString(containerIndex)]["site"]
+                }
+
+                descriptionOnTop: true
+                textColor: "#FBB26A"
+
+                rightImageSource: "qrc:/images/controls/copy.svg"
+                rightImageColor: "#D7D8DB"
+
+                clickedFunction: function() {
+                    content.copyToClipBoard(descriptionText)
+                }
+            }
+
+            TextEdit{
+                id: clipboard
+                visible: false
+            }
+
+            function copyToClipBoard(text) {
+                clipboard.text = text
+                clipboard.selectAll()
+                clipboard.copy()
+                clipboard.select(0, 0)
+            }
+
+            ParagraphTextType {
+                Layout.fillWidth: true
+                Layout.topMargin: 40
+                Layout.leftMargin: 16
+                Layout.rightMargin: 16
+
+                onLinkActivated: Qt.openUrlExternally(link)
+                textFormat: Text.RichText
+                text: qsTr("Use <a href=\"https://www.torproject.org/download/\" style=\"color: #FBB26A;\">Tor Browser</a> to open this url.")
+            }
+
+            ParagraphTextType {
+                Layout.fillWidth: true
+                Layout.topMargin: 16
+                Layout.leftMargin: 16
+                Layout.rightMargin: 16
+
+                text: qsTr("After installation it takes several minutes while your onion site will become available in the Tor Network.")
+            }
+
+            ParagraphTextType {
+                Layout.fillWidth: true
+                Layout.topMargin: 16
+                Layout.leftMargin: 16
+                Layout.rightMargin: 16
+
+                text: qsTr("When configuring WordPress set the domain as this onion address.")
+            }
+
+            BasicButtonType {
+                Layout.topMargin: 24
+                Layout.bottomMargin: 16
+                Layout.leftMargin: 8
+                implicitHeight: 32
+
+                defaultColor: "transparent"
+                hoveredColor: Qt.rgba(1, 1, 1, 0.08)
+                pressedColor: Qt.rgba(1, 1, 1, 0.12)
+                textColor: "#EB5757"
+
+                text: qsTr("Remove website")
+
+                onClicked: {
+                    questionDrawer.headerText = qsTr("Some description")
+                    questionDrawer.yesButtonText = qsTr("Continue")
+                    questionDrawer.noButtonText = qsTr("Cancel")
+
+                    questionDrawer.yesButtonFunction = function() {
+                        questionDrawer.visible = false
+                        goToPage(PageEnum.PageDeinstalling)
+                        ContainersModel.removeCurrentlyProcessedContainer()
+                        closePage()
+                        closePage() //todo auto close to deinstall page?
+                    }
+                    questionDrawer.noButtonFunction = function() {
+                        questionDrawer.visible = false
+                    }
+                    questionDrawer.visible = true
+                }
+            }
+        }
+
+        QuestionDrawer {
+            id: questionDrawer
+        }
+    }
+}

From 0a1359ed16e16b9452e07528f07eaabfb295bb15 Mon Sep 17 00:00:00 2001
From: "vladimir.kuznetsov" <nethiuswork@gmail.com>
Date: Mon, 24 Jul 2023 16:31:04 +0900
Subject: [PATCH 046/278] moved the platform-specific android code for the new
 ui

---
 client/CMakeLists.txt                         |   2 +
 client/amnezia_application.cpp                |  35 ++-
 .../platforms/android/android_controller.cpp  | 278 ++++++++---------
 client/platforms/android/android_controller.h |  26 +-
 .../platforms/android/authResultReceiver.cpp  |  16 +
 client/platforms/android/authResultReceiver.h |  32 ++
 client/protocols/wireguardprotocol.cpp        |  55 ++--
 client/resources.qrc                          |   2 +-
 client/ui/controllers/exportController.cpp    |  65 +++-
 client/ui/controllers/exportController.h      |  12 +
 client/ui/controllers/importController.cpp    |  54 +++-
 client/ui/controllers/importController.h      |  12 +-
 client/ui/controllers/installController.cpp   |  39 +++
 client/ui/controllers/installController.h     |   1 +
 client/ui/controllers/pageController.cpp      |  27 +-
 client/ui/controllers/pageController.h        |  13 +-
 client/ui/pages_logic/ServerSettingsLogic.cpp |  68 ++---
 client/ui/pages_logic/StartPageLogic.cpp      | 108 +++----
 .../qml/Components/ShareConnectionDrawer.qml  |   4 +-
 client/ui/qml/Controls2/CheckBoxType.qml      |  46 +--
 client/ui/qml/Controls2/PageType.qml          |   1 -
 .../ui/qml/Controls2/VerticalRadioButton.qml  |  62 ++--
 client/ui/qml/Pages2/PageSettingsAbout.qml    |   6 +-
 .../Pages2/PageSetupWizardConfigSource.qml    |  20 +-
 .../ui/qml/Pages2/PageSetupWizardQrReader.qml |  52 ++++
 client/ui/qml/Pages2/PageSetupWizardStart.qml |   4 +
 client/ui/qml/Pages2/PageShare.qml            |  39 ++-
 client/ui/qml/Pages2/PageStart.qml            |  12 +
 client/ui/qml/Pages2/PageTest.qml             | 282 ------------------
 client/ui/qml/main2.qml                       |  14 +-
 client/ui/uilogic.cpp                         | 231 +++++++-------
 31 files changed, 854 insertions(+), 764 deletions(-)
 create mode 100644 client/platforms/android/authResultReceiver.cpp
 create mode 100644 client/platforms/android/authResultReceiver.h
 create mode 100644 client/ui/qml/Pages2/PageSetupWizardQrReader.qml
 delete mode 100644 client/ui/qml/Pages2/PageTest.qml

diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt
index 0ef72ed0..936dcbf2 100644
--- a/client/CMakeLists.txt
+++ b/client/CMakeLists.txt
@@ -293,6 +293,7 @@ if(ANDROID)
         ${CMAKE_CURRENT_LIST_DIR}/platforms/android/android_notificationhandler.h
         ${CMAKE_CURRENT_LIST_DIR}/platforms/android/androidutils.h
         ${CMAKE_CURRENT_LIST_DIR}/platforms/android/androidvpnactivity.h
+        ${CMAKE_CURRENT_LIST_DIR}/platforms/android/authResultReceiver.h
         ${CMAKE_CURRENT_LIST_DIR}/protocols/android_vpnprotocol.h
     )
 
@@ -301,6 +302,7 @@ if(ANDROID)
         ${CMAKE_CURRENT_LIST_DIR}/platforms/android/android_notificationhandler.cpp
         ${CMAKE_CURRENT_LIST_DIR}/platforms/android/androidutils.cpp
         ${CMAKE_CURRENT_LIST_DIR}/platforms/android/androidvpnactivity.cpp
+        ${CMAKE_CURRENT_LIST_DIR}/platforms/android/authResultReceiver.cpp
         ${CMAKE_CURRENT_LIST_DIR}/protocols/android_vpnprotocol.cpp
     )
 endif()
diff --git a/client/amnezia_application.cpp b/client/amnezia_application.cpp
index 53d8fe30..2ee9af16 100644
--- a/client/amnezia_application.cpp
+++ b/client/amnezia_application.cpp
@@ -4,6 +4,7 @@
 #include <QFontDatabase>
 #include <QMimeData>
 #include <QQuickStyle>
+#include <QResource>
 #include <QStandardPaths>
 #include <QTextDocument>
 #include <QTimer>
@@ -14,9 +15,12 @@
 #include "version.h"
 
 #include "platforms/ios/QRCodeReaderBase.h"
+#if defined(Q_OS_ANDROID)
+    #include "platforms/android/android_controller.h"
+#endif
 
-#include "ui/pages.h"
 #include "protocols/qml_register_protocols.h"
+#include "ui/pages.h"
 
 #if defined(Q_OS_IOS)
     #include "platforms/ios/QtAppDelegate-C-Interface.h"
@@ -33,7 +37,7 @@ AmneziaApplication::AmneziaApplication(int &argc, char *argv[], bool allowSecond
     setQuitOnLastWindowClosed(false);
 
     // Fix config file permissions
-#ifdef Q_OS_LINUX && !defined(Q_OS_ANDROID)
+#if defined Q_OS_LINUX && !defined(Q_OS_ANDROID)
     {
         QSettings s(ORGANIZATION_NAME, APPLICATION_NAME);
         s.setValue("permFixed", true);
@@ -87,16 +91,35 @@ void AmneziaApplication::init()
     initModels();
     initControllers();
 
+#ifdef Q_OS_ANDROID
+    connect(AndroidController::instance(), &AndroidController::initialized, this,
+            [this](bool status, bool connected, const QDateTime &connectionDate) {
+                if (connected) {
+                    m_connectionController->onConnectionStateChanged(Vpn::ConnectionState::Connected);
+                    if (m_vpnConnection)
+                        m_vpnConnection->restoreConnection();
+                }
+            });
+    if (!AndroidController::instance()->initialize()) {
+        qCritical() << QString("Init failed");
+        if (m_vpnConnection)
+            emit m_vpnConnection->connectionStateChanged(Vpn::ConnectionState::Error);
+        return;
+    }
+
+    connect(AndroidController::instance(), &AndroidController::importConfigFromOutside, m_importController.get(),
+            &ImportController::extractConfigFromData);
+    connect(AndroidController::instance(), &AndroidController::importConfigFromOutside, m_pageController.get(),
+            &PageController::goToPageViewConfig);
+#endif
+
     m_notificationHandler.reset(NotificationHandler::create(nullptr));
 
     connect(m_vpnConnection.get(), &VpnConnection::connectionStateChanged, m_notificationHandler.get(),
             &NotificationHandler::setConnectionState);
 
-    void openConnection();
-    void closeConnection();
-
     connect(m_notificationHandler.get(), &NotificationHandler::raiseRequested, m_pageController.get(),
-            &PageController::raise);
+            &PageController::raiseMainWindow);
     connect(m_notificationHandler.get(), &NotificationHandler::connectRequested, m_connectionController.get(),
             &ConnectionController::openConnection);
     connect(m_notificationHandler.get(), &NotificationHandler::disconnectRequested, m_connectionController.get(),
diff --git a/client/platforms/android/android_controller.cpp b/client/platforms/android/android_controller.cpp
index 18955532..a56edcbf 100644
--- a/client/platforms/android/android_controller.cpp
+++ b/client/platforms/android/android_controller.cpp
@@ -13,17 +13,16 @@
 
 #include "android_controller.h"
 #include "private/qandroidextras_p.h"
-#include "ui/pages_logic/StartPageLogic.h"
 
-#include "androidvpnactivity.h"
 #include "androidutils.h"
+#include "androidvpnactivity.h"
 
-namespace {
-AndroidController* s_instance = nullptr;
+namespace
+{
+    AndroidController *s_instance = nullptr;
 
-constexpr auto PERMISSIONHELPER_CLASS =
-    "org/amnezia/vpn/qt/VPNPermissionHelper";
-}  // namespace
+    constexpr auto PERMISSIONHELPER_CLASS = "org/amnezia/vpn/qt/VPNPermissionHelper";
+} // namespace
 
 AndroidController::AndroidController() : QObject()
 {
@@ -33,109 +32,127 @@ AndroidController::AndroidController() : QObject()
 
     auto activity = AndroidVPNActivity::instance();
 
-    connect(activity, &AndroidVPNActivity::serviceConnected, this, []() {
-        qDebug() << "Transact: service connected";
-        AndroidVPNActivity::sendToService(ServiceAction::ACTION_REQUEST_STATISTIC, "");
-    }, Qt::QueuedConnection);
+    connect(
+            activity, &AndroidVPNActivity::serviceConnected, this,
+            []() {
+                qDebug() << "Transact: service connected";
+                AndroidVPNActivity::sendToService(ServiceAction::ACTION_REQUEST_STATISTIC, "");
+            },
+            Qt::QueuedConnection);
 
-    connect(activity, &AndroidVPNActivity::eventInitialized, this,
-        [this](const QString& parcelBody) {
-            // We might get multiple Init events as widgets, or fragments
-            // might query this.
-            if (m_init) {
-                return;
-            }
+    connect(
+            activity, &AndroidVPNActivity::eventInitialized, this,
+            [this](const QString &parcelBody) {
+                // We might get multiple Init events as widgets, or fragments
+                // might query this.
+                if (m_init) {
+                    return;
+                }
 
-            qDebug() << "Transact: init";
+                qDebug() << "Transact: init";
 
-            m_init = true;
+                m_init = true;
 
-            auto doc = QJsonDocument::fromJson(parcelBody.toUtf8());
-            qlonglong time = doc.object()["time"].toVariant().toLongLong();
+                auto doc = QJsonDocument::fromJson(parcelBody.toUtf8());
+                qlonglong time = doc.object()["time"].toVariant().toLongLong();
 
-            isConnected = doc.object()["connected"].toBool();
+                isConnected = doc.object()["connected"].toBool();
 
-            if (isConnected) {
-                emit scheduleStatusCheckSignal();
-            }
+                if (isConnected) {
+                    emit scheduleStatusCheckSignal();
+                }
 
-            emit initialized(
-                true, isConnected,
-                time > 0 ? QDateTime::fromMSecsSinceEpoch(time) : QDateTime());
+                emit initialized(true, isConnected, time > 0 ? QDateTime::fromMSecsSinceEpoch(time) : QDateTime());
 
-            setFallbackConnectedNotification();
-        }, Qt::QueuedConnection);
+                setFallbackConnectedNotification();
+            },
+            Qt::QueuedConnection);
 
-    connect(activity, &AndroidVPNActivity::eventConnected, this,
-        [this](const QString& parcelBody) {
-            Q_UNUSED(parcelBody);
-            qDebug() << "Transact: connected";
+    connect(
+            activity, &AndroidVPNActivity::eventConnected, this,
+            [this](const QString &parcelBody) {
+                Q_UNUSED(parcelBody);
+                qDebug() << "Transact: connected";
 
-            if (!isConnected) {
-                emit scheduleStatusCheckSignal();
-            }
+                if (!isConnected) {
+                    emit scheduleStatusCheckSignal();
+                }
 
-            isConnected = true;
+                isConnected = true;
 
-            emit connectionStateChanged(VpnProtocol::Connected);
-        }, Qt::QueuedConnection);
+                emit connectionStateChanged(Vpn::ConnectionState::Connected);
+            },
+            Qt::QueuedConnection);
 
-    connect(activity, &AndroidVPNActivity::eventDisconnected, this,
-        [this]() {
-            qDebug() << "Transact: disconnected";
+    connect(
+            activity, &AndroidVPNActivity::eventDisconnected, this,
+            [this]() {
+                qDebug() << "Transact: disconnected";
 
-            isConnected = false;
+                isConnected = false;
 
-            emit connectionStateChanged(VpnProtocol::Disconnected);
-        }, Qt::QueuedConnection);
+                emit connectionStateChanged(Vpn::ConnectionState::Disconnected);
+            },
+            Qt::QueuedConnection);
 
-    connect(activity, &AndroidVPNActivity::eventStatisticUpdate, this,
-        [this](const QString& parcelBody) {
-            auto doc = QJsonDocument::fromJson(parcelBody.toUtf8());
+    connect(
+            activity, &AndroidVPNActivity::eventStatisticUpdate, this,
+            [this](const QString &parcelBody) {
+                auto doc = QJsonDocument::fromJson(parcelBody.toUtf8());
 
-            QString rx = doc.object()["rx_bytes"].toString();
-            QString tx = doc.object()["tx_bytes"].toString();
-            QString endpoint = doc.object()["endpoint"].toString();
-            QString deviceIPv4 = doc.object()["deviceIpv4"].toString();
+                QString rx = doc.object()["rx_bytes"].toString();
+                QString tx = doc.object()["tx_bytes"].toString();
+                QString endpoint = doc.object()["endpoint"].toString();
+                QString deviceIPv4 = doc.object()["deviceIpv4"].toString();
 
-            emit statusUpdated(rx, tx, endpoint, deviceIPv4);
-        }, Qt::QueuedConnection);
+                emit statusUpdated(rx, tx, endpoint, deviceIPv4);
+            },
+            Qt::QueuedConnection);
 
-    connect(activity, &AndroidVPNActivity::eventBackendLogs, this,
-        [this](const QString& parcelBody) {
-            qDebug() << "Transact: backend logs";
+    connect(
+            activity, &AndroidVPNActivity::eventBackendLogs, this,
+            [this](const QString &parcelBody) {
+                qDebug() << "Transact: backend logs";
 
-            QString buffer = parcelBody.toUtf8();
-            if (m_logCallback) {
-                m_logCallback(buffer);
-            }
-        }, Qt::QueuedConnection);
+                QString buffer = parcelBody.toUtf8();
+                if (m_logCallback) {
+                    m_logCallback(buffer);
+                }
+            },
+            Qt::QueuedConnection);
 
-    connect(activity, &AndroidVPNActivity::eventActivationError, this,
-        [this](const QString& parcelBody) {
-            Q_UNUSED(parcelBody)
-            qDebug() << "Transact: error";
-            emit connectionStateChanged(VpnProtocol::Error);
-        }, Qt::QueuedConnection);
+    connect(
+            activity, &AndroidVPNActivity::eventActivationError, this,
+            [this](const QString &parcelBody) {
+                Q_UNUSED(parcelBody)
+                qDebug() << "Transact: error";
+                emit connectionStateChanged(Vpn::ConnectionState::Error);
+            },
+            Qt::QueuedConnection);
 
-    connect(activity, &AndroidVPNActivity::eventConfigImport, this,
-        [this](const QString& parcelBody) {
-            qDebug() << "Transact: config import";
-            auto doc = QJsonDocument::fromJson(parcelBody.toUtf8());
+    connect(
+            activity, &AndroidVPNActivity::eventConfigImport, this,
+            [this](const QString &parcelBody) {
+                qDebug() << "Transact: config import";
+                auto doc = QJsonDocument::fromJson(parcelBody.toUtf8());
 
-            QString buffer = doc.object()["config"].toString();
-            qDebug() << "Transact: config string" << buffer;
-            importConfig(buffer);
-        }, Qt::QueuedConnection);
+                QString buffer = doc.object()["config"].toString();
+                qDebug() << "Transact: config string" << buffer;
+                importConfigFromOutside(buffer);
+            },
+            Qt::QueuedConnection);
 
-    connect(activity, &AndroidVPNActivity::serviceDisconnected, this,
-        [this]() {
-            qDebug() << "Transact: service disconnected";
-            m_serviceConnected = false;
-        }, Qt::QueuedConnection);
+    connect(
+            activity, &AndroidVPNActivity::serviceDisconnected, this,
+            [this]() {
+                qDebug() << "Transact: service disconnected";
+                m_serviceConnected = false;
+            },
+            Qt::QueuedConnection);
 }
 
-AndroidController* AndroidController::instance() {
+AndroidController *AndroidController::instance()
+{
     if (!s_instance) {
         s_instance = new AndroidController();
     }
@@ -143,16 +160,13 @@ AndroidController* AndroidController::instance() {
     return s_instance;
 }
 
-bool AndroidController::initialize(StartPageLogic *startPageLogic)
+bool AndroidController::initialize()
 {
     qDebug() << "Initializing";
 
-    m_startPageLogic = startPageLogic;
-
     // Hook in the native implementation for startActivityForResult into the JNI
-    JNINativeMethod methods[]{{"startActivityForResult",
-                               "(Landroid/content/Intent;)V",
-                               reinterpret_cast<void*>(startActivityForResult)}};
+    JNINativeMethod methods[] { { "startActivityForResult", "(Landroid/content/Intent;)V",
+                                  reinterpret_cast<void *>(startActivityForResult) } };
     QJniObject javaClass(PERMISSIONHELPER_CLASS);
     QJniEnvironment env;
     jclass objectClass = env->GetObjectClass(javaClass.object<jobject>());
@@ -168,11 +182,9 @@ ErrorCode AndroidController::start()
 {
     qDebug() << "Prompting for VPN permission";
     QJniObject activity = AndroidUtils::getActivity();
-    auto appContext = activity.callObjectMethod(
-                "getApplicationContext", "()Landroid/content/Context;");
-    QJniObject::callStaticMethod<void>(
-                PERMISSIONHELPER_CLASS, "startService", "(Landroid/content/Context;)V",
-                appContext.object());
+    auto appContext = activity.callObjectMethod("getApplicationContext", "()Landroid/content/Context;");
+    QJniObject::callStaticMethod<void>(PERMISSIONHELPER_CLASS, "startService", "(Landroid/content/Context;)V",
+                                       appContext.object());
 
     QJsonDocument doc(m_vpnConfig);
     AndroidVPNActivity::sendToService(ServiceAction::ACTION_ACTIVATE, doc.toJson());
@@ -180,7 +192,8 @@ ErrorCode AndroidController::start()
     return NoError;
 }
 
-void AndroidController::stop() {
+void AndroidController::stop()
+{
     qDebug() << "AndroidController::stop";
 
     AndroidVPNActivity::sendToService(ServiceAction::ACTION_DEACTIVATE, QString());
@@ -188,16 +201,16 @@ void AndroidController::stop() {
 
 // Activates the tunnel that is currently set
 // in the VPN Service
-void AndroidController::resumeStart() {
+void AndroidController::resumeStart()
+{
     AndroidVPNActivity::sendToService(ServiceAction::ACTION_RESUME_ACTIVATE, QString());
 }
 
 /*
  * Sets the current notification text that is shown
  */
-void AndroidController::setNotificationText(const QString& title,
-                                            const QString& message,
-                                            int timerSec) {
+void AndroidController::setNotificationText(const QString &title, const QString &message, int timerSec)
+{
     QJsonObject args;
     args["title"] = title;
     args["message"] = message;
@@ -207,7 +220,8 @@ void AndroidController::setNotificationText(const QString& title,
     AndroidVPNActivity::sendToService(ServiceAction::ACTION_SET_NOTIFICATION_TEXT, doc.toJson());
 }
 
-void AndroidController::shareConfig(const QString& configContent, const QString& suggestedName) {
+void AndroidController::shareConfig(const QString &configContent, const QString &suggestedName)
+{
     AndroidVPNActivity::saveFileAs(configContent, suggestedName);
 }
 
@@ -216,7 +230,8 @@ void AndroidController::shareConfig(const QString& configContent, const QString&
  * switches into the Connected state without the app open
  * e.g via always-on vpn
  */
-void AndroidController::setFallbackConnectedNotification() {
+void AndroidController::setFallbackConnectedNotification()
+{
     QJsonObject args;
     args["title"] = tr("AmneziaVPN");
     //% "Ready for you to connect"
@@ -227,11 +242,13 @@ void AndroidController::setFallbackConnectedNotification() {
     AndroidVPNActivity::sendToService(ServiceAction::ACTION_SET_NOTIFICATION_FALLBACK, doc.toJson());
 }
 
-void AndroidController::checkStatus() {
+void AndroidController::checkStatus()
+{
     AndroidVPNActivity::sendToService(ServiceAction::ACTION_REQUEST_STATISTIC, QString());
 }
 
-void AndroidController::getBackendLogs(std::function<void(const QString&)>&& a_callback) {
+void AndroidController::getBackendLogs(std::function<void(const QString &)> &&a_callback)
+{
     qDebug() << "get logs";
 
     m_logCallback = std::move(a_callback);
@@ -239,16 +256,13 @@ void AndroidController::getBackendLogs(std::function<void(const QString&)>&& a_c
     AndroidVPNActivity::sendToService(ServiceAction::ACTION_REQUEST_GET_LOG, QString());
 }
 
-void AndroidController::cleanupBackendLogs() {
+void AndroidController::cleanupBackendLogs()
+{
     qDebug() << "cleanup logs";
 
     AndroidVPNActivity::sendToService(ServiceAction::ACTION_REQUEST_CLEANUP_LOG, QString());
 }
 
-void AndroidController::importConfig(const QString& data){
-    m_startPageLogic->importAnyFile(data);
-}
-
 const QJsonObject &AndroidController::vpnConfig() const
 {
     return m_vpnConfig;
@@ -285,31 +299,29 @@ void AndroidController::startActivityForResult(JNIEnv *env, jobject, jobject int
     qDebug() << "start vpnPermissionHelper";
     Q_UNUSED(env);
 
-    QtAndroidPrivate::startActivity(intent, 1337,
-         [](int receiverRequestCode, int resultCode,
-            const QJniObject& data) {
-           // Currently this function just used in
-           // VPNService.kt::checkPermissions. So the result
-           // we're getting is if the User gave us the
-           // Vpn.bind permission. In case of NO we should
-           // abort.
-           Q_UNUSED(receiverRequestCode);
-           Q_UNUSED(data);
+    QtAndroidPrivate::startActivity(intent, 1337, [](int receiverRequestCode, int resultCode, const QJniObject &data) {
+        // Currently this function just used in
+        // VPNService.kt::checkPermissions. So the result
+        // we're getting is if the User gave us the
+        // Vpn.bind permission. In case of NO we should
+        // abort.
+        Q_UNUSED(receiverRequestCode);
+        Q_UNUSED(data);
 
-           AndroidController* controller = AndroidController::instance();
-           if (!controller) {
-                return;
-           }
+        AndroidController *controller = AndroidController::instance();
+        if (!controller) {
+            return;
+        }
 
-           if (resultCode == ACTIVITY_RESULT_OK) {
-                qDebug() << "VPN PROMPT RESULT - Accepted";
-                controller->resumeStart();
-                return;
-           }
-           // If the request got rejected abort the current
-           // connection.
-           qWarning() << "VPN PROMPT RESULT - Rejected";
-           emit controller->connectionStateChanged(VpnProtocol::Disconnected);
-         });
+        if (resultCode == ACTIVITY_RESULT_OK) {
+            qDebug() << "VPN PROMPT RESULT - Accepted";
+            controller->resumeStart();
+            return;
+        }
+        // If the request got rejected abort the current
+        // connection.
+        qWarning() << "VPN PROMPT RESULT - Rejected";
+        emit controller->connectionStateChanged(Vpn::ConnectionState::Disconnected);
+    });
     return;
 }
diff --git a/client/platforms/android/android_controller.h b/client/platforms/android/android_controller.h
index 7e5b52c8..baa0bc80 100644
--- a/client/platforms/android/android_controller.h
+++ b/client/platforms/android/android_controller.h
@@ -8,36 +8,32 @@
 #include <QJniEnvironment>
 #include <QJniObject>
 
-#include "ui/pages_logic/StartPageLogic.h"
-
 #include "protocols/vpnprotocol.h"
 
 using namespace amnezia;
 
-
 class AndroidController : public QObject
 {
     Q_OBJECT
 
 public:
     explicit AndroidController();
-    static AndroidController* instance();
+    static AndroidController *instance();
 
     virtual ~AndroidController() override = default;
 
-    bool initialize(StartPageLogic *startPageLogic);
+    bool initialize();
 
     ErrorCode start();
     void stop();
     void resumeStart();
 
     void checkStatus();
-    void setNotificationText(const QString& title, const QString& message, int timerSec);
-    void shareConfig(const QString& data, const QString& suggestedName);
+    void setNotificationText(const QString &title, const QString &message, int timerSec);
+    void shareConfig(const QString &data, const QString &suggestedName);
     void setFallbackConnectedNotification();
-    void getBackendLogs(std::function<void(const QString&)>&& callback);
+    void getBackendLogs(std::function<void(const QString &)> &&callback);
     void cleanupBackendLogs();
-    void importConfig(const QString& data);
 
     const QJsonObject &vpnConfig() const;
     void setVpnConfig(const QJsonObject &newVpnConfig);
@@ -45,18 +41,20 @@ public:
     void startQrReaderActivity();
 
 signals:
-    void connectionStateChanged(VpnProtocol::VpnConnectionState state);
+    void connectionStateChanged(Vpn::ConnectionState state);
 
     // This signal is emitted when the controller is initialized. Note that the
     // VPN tunnel can be already active. In this case, "connected" should be set
     // to true and the "connectionDate" should be set to the activation date if
     // known.
     // If "status" is set to false, the backend service is considered unavailable.
-    void initialized(bool status, bool connected, const QDateTime& connectionDate);
+    void initialized(bool status, bool connected, const QDateTime &connectionDate);
 
     void statusUpdated(QString totalRx, QString totalTx, QString endpoint, QString deviceIPv4);
     void scheduleStatusCheckSignal();
 
+    void importConfigFromOutside(QString &data);
+
 protected slots:
     void scheduleStatusCheckSlot();
 
@@ -65,12 +63,10 @@ private:
 
     QJsonObject m_vpnConfig;
 
-    StartPageLogic *m_startPageLogic;
-
     bool m_serviceConnected = false;
-    std::function<void(const QString&)> m_logCallback;
+    std::function<void(const QString &)> m_logCallback;
 
-    static void startActivityForResult(JNIEnv* env, jobject /*thiz*/, jobject intent);
+    static void startActivityForResult(JNIEnv *env, jobject /*thiz*/, jobject intent);
 
     bool isConnected = false;
 
diff --git a/client/platforms/android/authResultReceiver.cpp b/client/platforms/android/authResultReceiver.cpp
new file mode 100644
index 00000000..21e838a2
--- /dev/null
+++ b/client/platforms/android/authResultReceiver.cpp
@@ -0,0 +1,16 @@
+#include "authResultReceiver.h"
+
+AuthResultReceiver::AuthResultReceiver(QSharedPointer<AuthResultNotifier> &notifier) : m_notifier(notifier)
+{
+}
+
+void AuthResultReceiver::handleActivityResult(int receiverRequestCode, int resultCode, const QJniObject &data)
+{
+    qDebug() << "receiverRequestCode" << receiverRequestCode << "resultCode" << resultCode;
+
+    if (resultCode == -1) { // ResultOK
+        emit m_notifier->authSuccessful();
+    } else {
+        emit m_notifier->authFailed();
+    }
+}
diff --git a/client/platforms/android/authResultReceiver.h b/client/platforms/android/authResultReceiver.h
new file mode 100644
index 00000000..9a88dcf5
--- /dev/null
+++ b/client/platforms/android/authResultReceiver.h
@@ -0,0 +1,32 @@
+#ifndef AUTHRESULTRECEIVER_H
+#define AUTHRESULTRECEIVER_H
+
+#include <QJniObject>
+
+#include <private/qandroidextras_p.h>
+
+class AuthResultNotifier : public QObject
+{
+    Q_OBJECT
+
+public:
+    AuthResultNotifier(QObject *parent = nullptr) : QObject(parent) {};
+
+signals:
+    void authFailed();
+    void authSuccessful();
+};
+
+/* Auth result handler for Android */
+class AuthResultReceiver final : public QAndroidActivityResultReceiver
+{
+public:
+    AuthResultReceiver(QSharedPointer<AuthResultNotifier> &notifier);
+
+    void handleActivityResult(int receiverRequestCode, int resultCode, const QJniObject &data) override;
+
+private:
+    QSharedPointer<AuthResultNotifier> m_notifier;
+};
+
+#endif // AUTHRESULTRECEIVER_H
diff --git a/client/protocols/wireguardprotocol.cpp b/client/protocols/wireguardprotocol.cpp
index f48c7dfd..66fec366 100644
--- a/client/protocols/wireguardprotocol.cpp
+++ b/client/protocols/wireguardprotocol.cpp
@@ -5,27 +5,28 @@
 #include <QThread>
 
 #include "logger.h"
-#include "wireguardprotocol.h"
 #include "utilities.h"
+#include "wireguardprotocol.h"
 
 #include "mozilla/localsocketcontroller.h"
 
-WireguardProtocol::WireguardProtocol(const QJsonObject &configuration, QObject* parent) : VpnProtocol(configuration, parent)
+WireguardProtocol::WireguardProtocol(const QJsonObject &configuration, QObject *parent)
+    : VpnProtocol(configuration, parent)
 {
     m_configFile.setFileName(QDir::tempPath() + QDir::separator() + serviceName() + ".conf");
     writeWireguardConfiguration(configuration);
 
     // MZ
 #if defined(MZ_LINUX)
-    //m_impl.reset(new LinuxController());
+    // m_impl.reset(new LinuxController());
 #elif defined(MZ_MACOS) // || defined(MZ_WINDOWS)
     m_impl.reset(new LocalSocketController());
-    connect(m_impl.get(), &ControllerImpl::connected, this, [this](const QString& pubkey, const QDateTime& connectionTimestamp) {
-        emit connectionStateChanged(VpnProtocol::Connected);
-    });
-    connect(m_impl.get(), &ControllerImpl::disconnected, this, [this](){
-        emit connectionStateChanged(VpnProtocol::Disconnected);
-    });
+    connect(m_impl.get(), &ControllerImpl::connected, this,
+            [this](const QString &pubkey, const QDateTime &connectionTimestamp) {
+                emit connectionStateChanged(Vpn::ConnectionState::Connected);
+            });
+    connect(m_impl.get(), &ControllerImpl::disconnected, this,
+            [this]() { emit connectionStateChanged(Vpn::ConnectionState::Disconnected); });
     m_impl->initialize(nullptr, nullptr);
 #endif
 }
@@ -74,9 +75,10 @@ void WireguardProtocol::stop()
         setConnectionState(Vpn::ConnectionState::Disconnected);
     });
 
-    connect(m_wireguardStopProcess.data(), &PrivilegedProcess::stateChanged, this, [this](QProcess::ProcessState newState) {
-        qDebug() << "WireguardProtocol::WireguardProtocol Stop stateChanged" << newState;
-    });
+    connect(m_wireguardStopProcess.data(), &PrivilegedProcess::stateChanged, this,
+            [this](QProcess::ProcessState newState) {
+                qDebug() << "WireguardProtocol::WireguardProtocol Stop stateChanged" << newState;
+            });
 
 #ifdef Q_OS_LINUX
     if (IpcClient::Interface()) {
@@ -143,8 +145,8 @@ void WireguardProtocol::writeWireguardConfiguration(const QJsonObject &configura
     m_isConfigLoaded = true;
 
     qDebug().noquote() << QString("Set config data") << configPath();
-    qDebug().noquote() << QString("Set config data") << configuration.value(ProtocolProps::key_proto_config_data(Proto::WireGuard)).toString().toUtf8();
-
+    qDebug().noquote() << QString("Set config data")
+                       << configuration.value(ProtocolProps::key_proto_config_data(Proto::WireGuard)).toString().toUtf8();
 }
 
 QString WireguardProtocol::configPath() const
@@ -156,7 +158,8 @@ void WireguardProtocol::updateRouteGateway(QString line)
 {
     // TODO: fix for macos
     line = line.split("ROUTE_GATEWAY", Qt::SkipEmptyParts).at(1);
-    if (!line.contains("/")) return;
+    if (!line.contains("/"))
+        return;
     m_routeGateway = line.split("/", Qt::SkipEmptyParts).first();
     m_routeGateway.replace(" ", "");
     qDebug() << "Set VPN route gateway" << m_routeGateway;
@@ -216,13 +219,13 @@ ErrorCode WireguardProtocol::start()
         setConnectionState(Vpn::ConnectionState::Disconnected);
     });
 
-    connect(m_wireguardStartProcess.data(), &PrivilegedProcess::stateChanged, this, [this](QProcess::ProcessState newState) {
-        qDebug() << "WireguardProtocol::WireguardProtocol stateChanged" << newState;
-    });
+    connect(m_wireguardStartProcess.data(), &PrivilegedProcess::stateChanged, this,
+            [this](QProcess::ProcessState newState) {
+                qDebug() << "WireguardProtocol::WireguardProtocol stateChanged" << newState;
+            });
 
-    connect(m_wireguardStartProcess.data(), &PrivilegedProcess::finished, this, [this]() {
-        setConnectionState(Vpn::ConnectionState::Connected);
-    });
+    connect(m_wireguardStartProcess.data(), &PrivilegedProcess::finished, this,
+            [this]() { setConnectionState(Vpn::ConnectionState::Connected); });
 
     connect(m_wireguardStartProcess.data(), &PrivilegedProcess::readyRead, this, [this]() {
         QRemoteObjectPendingReply<QByteArray> reply = m_wireguardStartProcess->readAll();
@@ -250,7 +253,6 @@ ErrorCode WireguardProtocol::start()
 
 void WireguardProtocol::updateVpnGateway(const QString &line)
 {
-
 }
 
 QString WireguardProtocol::serviceName() const
@@ -261,9 +263,9 @@ QString WireguardProtocol::serviceName() const
 QStringList WireguardProtocol::stopArgs()
 {
 #ifdef Q_OS_WIN
-    return {"--remove", configPath()};
+    return { "--remove", configPath() };
 #elif defined Q_OS_LINUX
-    return {"down", "wg99"};
+    return { "down", "wg99" };
 #else
     return {};
 #endif
@@ -272,11 +274,10 @@ QStringList WireguardProtocol::stopArgs()
 QStringList WireguardProtocol::startArgs()
 {
 #ifdef Q_OS_WIN
-    return {"--add", configPath()};
+    return { "--add", configPath() };
 #elif defined Q_OS_LINUX
-    return {"up", "wg99"};
+    return { "up", "wg99" };
 #else
     return {};
 #endif
 }
-
diff --git a/client/resources.qrc b/client/resources.qrc
index e1afa294..85ee838f 100644
--- a/client/resources.qrc
+++ b/client/resources.qrc
@@ -194,7 +194,6 @@
         <file>ui/qml/Controls2/HorizontalRadioButton.qml</file>
         <file>ui/qml/Controls2/VerticalRadioButton.qml</file>
         <file>ui/qml/Controls2/SwitcherType.qml</file>
-        <file>ui/qml/Pages2/PageTest.qml</file>
         <file>ui/qml/Controls2/TabButtonType.qml</file>
         <file>ui/qml/Pages2/PageSetupWizardProtocolSettings.qml</file>
         <file>ui/qml/Pages2/PageSetupWizardInstalling.qml</file>
@@ -278,5 +277,6 @@
         <file>ui/qml/Pages2/PageServiceSftpSettings.qml</file>
         <file>images/controls/copy.svg</file>
         <file>ui/qml/Pages2/PageServiceTorWebsiteSettings.qml</file>
+        <file>ui/qml/Pages2/PageSetupWizardQrReader.qml</file>
     </qresource>
 </RCC>
diff --git a/client/ui/controllers/exportController.cpp b/client/ui/controllers/exportController.cpp
index c989422d..561222f2 100644
--- a/client/ui/controllers/exportController.cpp
+++ b/client/ui/controllers/exportController.cpp
@@ -11,9 +11,12 @@
 
 #include "configurators/openvpn_configurator.h"
 #include "configurators/wireguard_configurator.h"
-#include "qrcodegen.hpp"
-
 #include "core/errorstrings.h"
+#ifdef Q_OS_ANDROID
+    #include "platforms/android/android_controller.h"
+    #include "platforms/android/androidutils.h"
+#endif
+#include "qrcodegen.hpp"
 
 ExportController::ExportController(const QSharedPointer<ServersModel> &serversModel,
                                    const QSharedPointer<ContainersModel> &containersModel,
@@ -25,6 +28,14 @@ ExportController::ExportController(const QSharedPointer<ServersModel> &serversMo
       m_settings(settings),
       m_configurator(configurator)
 {
+#ifdef Q_OS_ANDROID
+    m_authResultNotifier.reset(new AuthResultNotifier);
+    m_authResultReceiver.reset(new AuthResultReceiver(m_authResultNotifier));
+    connect(m_authResultNotifier.get(), &AuthResultNotifier::authFailed, this,
+            [this]() { emit exportErrorOccurred(tr("Access error!")); });
+    connect(m_authResultNotifier.get(), &AuthResultNotifier::authSuccessful, this,
+            &ExportController::generateFullAccessConfig);
+#endif
 }
 
 void ExportController::generateFullAccessConfig()
@@ -44,6 +55,27 @@ void ExportController::generateFullAccessConfig()
     emit exportConfigChanged();
 }
 
+#if defined(Q_OS_ANDROID)
+void ExportController::generateFullAccessConfigAndroid()
+{
+    /* We use builtin keyguard for ssh key export protection on Android */
+    QJniObject activity = AndroidUtils::getActivity();
+    auto appContext = activity.callObjectMethod("getApplicationContext", "()Landroid/content/Context;");
+    if (appContext.isValid()) {
+        auto intent = QJniObject::callStaticObjectMethod("org/amnezia/vpn/AuthHelper", "getAuthIntent",
+                                                         "(Landroid/content/Context;)Landroid/content/Intent;",
+                                                         appContext.object());
+        if (intent.isValid()) {
+            if (intent.object<jobject>() != nullptr) {
+                QtAndroidPrivate::startActivity(intent.object<jobject>(), 1, m_authResultReceiver.get());
+            }
+        } else {
+            generateFullAccessConfig();
+        }
+    }
+}
+#endif
+
 void ExportController::generateConnectionConfig()
 {
     clearPreviousConfig();
@@ -194,6 +226,35 @@ void ExportController::saveFile()
     QDesktopServices::openUrl(fi.absoluteDir().absolutePath());
 }
 
+void ExportController::shareFile()
+{
+#if defined Q_OS_IOS
+    ext.replace("*", "");
+    QString fileName = QDir::tempPath() + "/" + suggestedName;
+
+    if (fileName.isEmpty())
+        return;
+    if (!fileName.endsWith(ext))
+        fileName.append(ext);
+
+    QFile::remove(fileName);
+
+    QFile save(fileName);
+    save.open(QIODevice::WriteOnly);
+    save.write(data.toUtf8());
+    save.close();
+
+    QStringList filesToSend;
+    filesToSend.append(fileName);
+    MobileUtils::shareText(filesToSend);
+    return;
+#endif
+#if defined Q_OS_ANDROID
+    AndroidController::instance()->shareConfig(m_config, "amnezia_config");
+    return;
+#endif
+}
+
 QList<QString> ExportController::generateQrCodeImageSeries(const QByteArray &data)
 {
     double k = 850;
diff --git a/client/ui/controllers/exportController.h b/client/ui/controllers/exportController.h
index e4a37a96..7af2cd85 100644
--- a/client/ui/controllers/exportController.h
+++ b/client/ui/controllers/exportController.h
@@ -6,6 +6,9 @@
 #include "configurators/vpn_configurator.h"
 #include "ui/models/containers_model.h"
 #include "ui/models/servers_model.h"
+#ifdef Q_OS_ANDROID
+    #include "platforms/android/authResultReceiver.h"
+#endif
 
 class ExportController : public QObject
 {
@@ -22,6 +25,9 @@ public:
 
 public slots:
     void generateFullAccessConfig();
+#if defined(Q_OS_ANDROID)
+    void generateFullAccessConfigAndroid();
+#endif
     void generateConnectionConfig();
     void generateOpenVpnConfig();
     void generateWireGuardConfig();
@@ -30,6 +36,7 @@ public slots:
     QList<QString> getQrCodes();
 
     void saveFile();
+    void shareFile();
 
 signals:
     void generateConfig(int type);
@@ -52,6 +59,11 @@ private:
 
     QString m_config;
     QList<QString> m_qrCodes;
+
+#ifdef Q_OS_ANDROID
+    QSharedPointer<AuthResultNotifier> m_authResultNotifier;
+    QSharedPointer<QAndroidActivityResultReceiver> m_authResultReceiver;
+#endif
 };
 
 #endif // EXPORTCONTROLLER_H
diff --git a/client/ui/controllers/importController.cpp b/client/ui/controllers/importController.cpp
index 5b4b7a83..218f43cb 100644
--- a/client/ui/controllers/importController.cpp
+++ b/client/ui/controllers/importController.cpp
@@ -2,8 +2,15 @@
 
 #include <QFile>
 #include <QFileInfo>
+#include <QStandardPaths>
 
 #include "core/errorstrings.h"
+#ifdef Q_OS_ANDROID
+    #include "../../platforms/android/android_controller.h"
+    #include "../../platforms/android/androidutils.h"
+    #include <QJniObject>
+#endif
+#include "utilities.h"
 
 namespace
 {
@@ -41,33 +48,58 @@ ImportController::ImportController(const QSharedPointer<ServersModel> &serversMo
                                    const std::shared_ptr<Settings> &settings, QObject *parent)
     : QObject(parent), m_serversModel(serversModel), m_containersModel(containersModel), m_settings(settings)
 {
+#ifdef Q_OS_ANDROID
+    // Set security screen for Android app
+    AndroidUtils::runOnAndroidThreadSync([]() {
+        QJniObject activity = AndroidUtils::getActivity();
+        QJniObject window = activity.callObjectMethod("getWindow", "()Landroid/view/Window;");
+        if (window.isValid()) {
+            const int FLAG_SECURE = 8192;
+            window.callMethod<void>("addFlags", "(I)V", FLAG_SECURE);
+        }
+    });
+#endif
 }
 
-void ImportController::extractConfigFromFile(const QUrl &fileUrl)
+void ImportController::extractConfigFromFile()
 {
-    QFile file(fileUrl.toLocalFile());
+    QString fileName = Utils::getFileName(Q_NULLPTR, tr("Open config file"),
+                                          QStandardPaths::writableLocation(QStandardPaths::DocumentsLocation),
+                                          "*.vpn *.ovpn *.conf");
+    QFile file(fileName);
     if (file.open(QIODevice::ReadOnly)) {
         QString data = file.readAll();
 
-        auto configFormat = checkConfigFormat(data);
-        if (configFormat == ConfigTypes::OpenVpn) {
-            m_config = extractOpenVpnConfig(data);
-        } else if (configFormat == ConfigTypes::WireGuard) {
-            m_config = extractWireGuardConfig(data);
-        } else {
-            m_config = extractAmneziaConfig(data);
-        }
-
+        extractConfigFromData(data);
         m_configFileName = QFileInfo(file.fileName()).fileName();
     }
 }
 
+void ImportController::extractConfigFromData(QString &data)
+{
+    auto configFormat = checkConfigFormat(data);
+    if (configFormat == ConfigTypes::OpenVpn) {
+        m_config = extractOpenVpnConfig(data);
+    } else if (configFormat == ConfigTypes::WireGuard) {
+        m_config = extractWireGuardConfig(data);
+    } else {
+        m_config = extractAmneziaConfig(data);
+    }
+}
+
 void ImportController::extractConfigFromCode(QString code)
 {
     m_config = extractAmneziaConfig(code);
     m_configFileName = "";
 }
 
+void ImportController::extractConfigFromQr()
+{
+#ifdef Q_OS_ANDROID
+    AndroidController::instance()->startQrReaderActivity();
+#endif
+}
+
 QString ImportController::getConfig()
 {
     return QJsonDocument(m_config).toJson(QJsonDocument::Indented);
diff --git a/client/ui/controllers/importController.h b/client/ui/controllers/importController.h
index 561ea19c..273b12a5 100644
--- a/client/ui/controllers/importController.h
+++ b/client/ui/controllers/importController.h
@@ -3,10 +3,10 @@
 
 #include <QObject>
 
-#include "core/defs.h"
 #include "containers/containers_defs.h"
-#include "ui/models/servers_model.h"
+#include "core/defs.h"
 #include "ui/models/containers_model.h"
+#include "ui/models/servers_model.h"
 
 class ImportController : public QObject
 {
@@ -14,13 +14,14 @@ class ImportController : public QObject
 public:
     explicit ImportController(const QSharedPointer<ServersModel> &serversModel,
                               const QSharedPointer<ContainersModel> &containersModel,
-                              const std::shared_ptr<Settings> &settings,
-                              QObject *parent = nullptr);
+                              const std::shared_ptr<Settings> &settings, QObject *parent = nullptr);
 
 public slots:
     void importConfig();
-    void extractConfigFromFile(const QUrl &fileUrl);
+    void extractConfigFromFile();
+    void extractConfigFromData(QString &data);
     void extractConfigFromCode(QString code);
+    void extractConfigFromQr();
     QString getConfig();
     QString getConfigFileName();
 
@@ -39,7 +40,6 @@ private:
 
     QJsonObject m_config;
     QString m_configFileName;
-
 };
 
 #endif // IMPORTCONTROLLER_H
diff --git a/client/ui/controllers/installController.cpp b/client/ui/controllers/installController.cpp
index 84633b54..68e47a89 100644
--- a/client/ui/controllers/installController.cpp
+++ b/client/ui/controllers/installController.cpp
@@ -8,6 +8,34 @@
 #include "core/servercontroller.h"
 #include "utilities.h"
 
+namespace
+{
+#ifdef Q_OS_WINDOWS
+    QString getNextDriverLetter()
+    {
+        QProcess drivesProc;
+        drivesProc.start("wmic logicaldisk get caption");
+        drivesProc.waitForFinished();
+        QString drives = drivesProc.readAll();
+        qDebug() << drives;
+
+        QString letters = "CFGHIJKLMNOPQRSTUVWXYZ";
+        QString letter;
+        for (int i = letters.size() - 1; i > 0; i--) {
+            letter = letters.at(i);
+            if (!drives.contains(letter + ":"))
+                break;
+        }
+        if (letter == "C:") {
+            // set err info
+            qDebug() << "Can't find free drive letter";
+            return "";
+        }
+        return letter;
+    }
+#endif
+}
+
 InstallController::InstallController(const QSharedPointer<ServersModel> &serversModel,
                                      const QSharedPointer<ContainersModel> &containersModel,
                                      const std::shared_ptr<Settings> &settings, QObject *parent)
@@ -15,6 +43,17 @@ InstallController::InstallController(const QSharedPointer<ServersModel> &servers
 {
 }
 
+InstallController::~InstallController()
+{
+#ifdef Q_OS_WINDOWS
+    for (QSharedPointer<QProcess> process : m_sftpMountProcesses) {
+        Utils::signalCtrl(process->processId(), CTRL_C_EVENT);
+        process->kill();
+        process->waitForFinished();
+    }
+#endif
+}
+
 void InstallController::install(DockerContainer container, int port, TransportProto transportProto)
 {
     Proto mainProto = ContainerProps::defaultProtocol(container);
diff --git a/client/ui/controllers/installController.h b/client/ui/controllers/installController.h
index 8458b46d..fdd0ebed 100644
--- a/client/ui/controllers/installController.h
+++ b/client/ui/controllers/installController.h
@@ -16,6 +16,7 @@ public:
     explicit InstallController(const QSharedPointer<ServersModel> &serversModel,
                                const QSharedPointer<ContainersModel> &containersModel,
                                const std::shared_ptr<Settings> &settings, QObject *parent = nullptr);
+    ~InstallController();
 
 public slots:
     void install(DockerContainer container, int port, TransportProto transportProto);
diff --git a/client/ui/controllers/pageController.cpp b/client/ui/controllers/pageController.cpp
index 4ee9b3bf..5abeb77f 100644
--- a/client/ui/controllers/pageController.cpp
+++ b/client/ui/controllers/pageController.cpp
@@ -1,7 +1,9 @@
 #include "pageController.h"
 
-PageController::PageController(const QSharedPointer<ServersModel> &serversModel,
-                               QObject *parent) : QObject(parent), m_serversModel(serversModel)
+#include <QApplication>
+
+PageController::PageController(const QSharedPointer<ServersModel> &serversModel, QObject *parent)
+    : QObject(parent), m_serversModel(serversModel)
 {
 }
 
@@ -24,3 +26,24 @@ QString PageController::getPagePath(PageLoader::PageEnum page)
     QString pageName = metaEnum.valueToKey(static_cast<int>(page));
     return "qrc:/ui/qml/Pages2/" + pageName + ".qml";
 }
+
+void PageController::closeWindow()
+{
+#ifdef Q_OS_ANDROID
+    qApp->quit();
+#else
+    if (m_serversModel->getServersCount() == 0) {
+        qApp->quit();
+    } else {
+        emit hideMainWindow();
+    }
+#endif
+}
+
+void PageController::keyPressEvent(Qt::Key key)
+{
+    switch (key) {
+    case Qt::Key_Back: emit closePage();
+    default: return;
+    }
+}
diff --git a/client/ui/controllers/pageController.h b/client/ui/controllers/pageController.h
index d79b100a..e8452b45 100644
--- a/client/ui/controllers/pageController.h
+++ b/client/ui/controllers/pageController.h
@@ -41,6 +41,7 @@ namespace PageLoader
         PageSetupWizardConfigSource,
         PageSetupWizardTextKey,
         PageSetupWizardViewConfig,
+        PageSetupWizardQrReader,
 
         PageProtocolOpenVpnSettings,
         PageProtocolShadowSocksSettings,
@@ -67,15 +68,25 @@ public slots:
     QString getInitialPage();
     QString getPagePath(PageLoader::PageEnum page);
 
+    void closeWindow();
+    void keyPressEvent(Qt::Key key);
+
 signals:
     void goToPageHome();
     void goToPageSettings();
+    void goToPageViewConfig();
+    void closePage();
+
     void restorePageHomeState(bool isContainerInstalled = false);
     void replaceStartPage();
+
     void showErrorMessage(QString errorMessage);
     void showInfoMessage(QString message);
+
     void showBusyIndicator(bool visible);
-    void raise();
+
+    void hideMainWindow();
+    void raiseMainWindow();
 
 private:
     QSharedPointer<ServersModel> m_serversModel;
diff --git a/client/ui/pages_logic/ServerSettingsLogic.cpp b/client/ui/pages_logic/ServerSettingsLogic.cpp
index a17f0159..4c68b549 100644
--- a/client/ui/pages_logic/ServerSettingsLogic.cpp
+++ b/client/ui/pages_logic/ServerSettingsLogic.cpp
@@ -6,20 +6,21 @@
 #include "VpnLogic.h"
 
 #include "core/errorstrings.h"
-#include <core/servercontroller.h>
 #include <QTimer>
+#include <core/servercontroller.h>
 
 #if defined(Q_OS_ANDROID)
-#include "../../platforms/android/androidutils.h"
+    #include "../../platforms/android/androidutils.h"
 #endif
 
-ServerSettingsLogic::ServerSettingsLogic(UiLogic *logic, QObject *parent):
-    PageLogicBase(logic, parent),
-    m_labelWaitInfoVisible{true},
-    m_pushButtonClearClientCacheVisible{true},
-    m_pushButtonShareFullVisible{true},
-    m_pushButtonClearClientCacheText{tr("Clear client cached profile")}
-{ }
+ServerSettingsLogic::ServerSettingsLogic(UiLogic *logic, QObject *parent)
+    : PageLogicBase(logic, parent),
+      m_labelWaitInfoVisible { true },
+      m_pushButtonClearClientCacheVisible { true },
+      m_pushButtonShareFullVisible { true },
+      m_pushButtonClearClientCacheText { tr("Clear client cached profile") }
+{
+}
 
 void ServerSettingsLogic::onUpdatePage()
 {
@@ -33,11 +34,11 @@ void ServerSettingsLogic::onUpdatePage()
     const QString &userName = server.value(config_key::userName).toString();
     const QString &hostName = server.value(config_key::hostName).toString();
     QString name = QString("%1%2%3%4%5")
-        .arg(userName)
-        .arg(userName.isEmpty() ? "" : "@")
-        .arg(hostName)
-        .arg(port.isEmpty() ? "" : ":")
-        .arg(port);
+                           .arg(userName)
+                           .arg(userName.isEmpty() ? "" : "@")
+                           .arg(hostName)
+                           .arg(port.isEmpty() ? "" : ":")
+                           .arg(port);
 
     set_labelServerText(name);
     set_lineEditDescriptionText(server.value(config_key::description).toString());
@@ -49,15 +50,15 @@ void ServerSettingsLogic::onUpdatePage()
 
 void ServerSettingsLogic::onPushButtonForgetServer()
 {
-    if (m_settings->defaultServerIndex() == uiLogic()->m_selectedServerIndex && uiLogic()->m_vpnConnection->isConnected()) {
+    if (m_settings->defaultServerIndex() == uiLogic()->m_selectedServerIndex
+        && uiLogic()->m_vpnConnection->isConnected()) {
         uiLogic()->pageLogic<VpnLogic>()->onDisconnect();
     }
     m_settings->removeServer(uiLogic()->m_selectedServerIndex);
 
     if (m_settings->defaultServerIndex() == uiLogic()->m_selectedServerIndex) {
         m_settings->setDefaultServer(0);
-    }
-    else if (m_settings->defaultServerIndex() > uiLogic()->m_selectedServerIndex) {
+    } else if (m_settings->defaultServerIndex() > uiLogic()->m_selectedServerIndex) {
         m_settings->setDefaultServer(m_settings->defaultServerIndex() - 1);
     }
 
@@ -65,14 +66,12 @@ void ServerSettingsLogic::onPushButtonForgetServer()
         m_settings->setDefaultServer(-1);
     }
 
-
     uiLogic()->m_selectedServerIndex = -1;
     uiLogic()->onUpdateAllPages();
 
     if (m_settings->serversCount() == 0) {
         uiLogic()->setStartPage(Page::Start);
-    }
-    else {
+    } else {
         uiLogic()->closePage();
     }
 }
@@ -86,9 +85,7 @@ void ServerSettingsLogic::onPushButtonClearClientCacheClicked()
         m_settings->clearLastConnectionConfig(uiLogic()->m_selectedServerIndex, container);
     }
 
-    QTimer::singleShot(3000, this, [this]() {
-        set_pushButtonClearClientCacheText(tr("Clear client cached profile"));
-    });
+    QTimer::singleShot(3000, this, [this]() { set_pushButtonClearClientCacheText(tr("Clear client cached profile")); });
 }
 
 void ServerSettingsLogic::onLineEditDescriptionEditingFinished()
@@ -111,7 +108,7 @@ void authResultReceiver::handleActivityResult(int receiverRequestCode, int resul
 {
     qDebug() << "receiverRequestCode" << receiverRequestCode << "resultCode" << resultCode;
 
-    if (resultCode == -1) { //ResultOK
+    if (resultCode == -1) { // ResultOK
         uiLogic()->pageLogic<ShareConnectionLogic>()->updateSharingPage(m_serverIndex, DockerContainer::None);
         emit uiLogic()->goToShareProtocolPage(Proto::Any);
     }
@@ -121,26 +118,27 @@ void authResultReceiver::handleActivityResult(int receiverRequestCode, int resul
 void ServerSettingsLogic::onPushButtonShareFullClicked()
 {
 #if defined(Q_OS_ANDROID)
-/* We use builtin keyguard for ssh key export protection on Android */
+    /* We use builtin keyguard for ssh key export protection on Android */
     QJniObject activity = AndroidUtils::getActivity();
-    auto appContext = activity.callObjectMethod(
-        "getApplicationContext", "()Landroid/content/Context;");
+    auto appContext = activity.callObjectMethod("getApplicationContext", "()Landroid/content/Context;");
     if (appContext.isValid()) {
         QAndroidActivityResultReceiver *receiver = new authResultReceiver(uiLogic(), uiLogic()->m_selectedServerIndex);
-        auto intent = QJniObject::callStaticObjectMethod(
-               "org/amnezia/vpn/AuthHelper", "getAuthIntent",
-               "(Landroid/content/Context;)Landroid/content/Intent;", appContext.object());
+        auto intent = QJniObject::callStaticObjectMethod("org/amnezia/vpn/AuthHelper", "getAuthIntent",
+                                                         "(Landroid/content/Context;)Landroid/content/Intent;",
+                                                         appContext.object());
         if (intent.isValid()) {
             if (intent.object<jobject>() != nullptr) {
-                    QtAndroidPrivate::startActivity(intent.object<jobject>(), 1, receiver);
-                }
-            } else {
-            uiLogic()->pageLogic<ShareConnectionLogic>()->updateSharingPage(uiLogic()->m_selectedServerIndex, DockerContainer::None);
+                QtAndroidPrivate::startActivity(intent.object<jobject>(), 1, receiver);
+            }
+        } else {
+            uiLogic()->pageLogic<ShareConnectionLogic>()->updateSharingPage(uiLogic()->m_selectedServerIndex,
+                                                                            DockerContainer::None);
             emit uiLogic()->goToShareProtocolPage(Proto::Any);
         }
     }
 #else
-    uiLogic()->pageLogic<ShareConnectionLogic>()->updateSharingPage(uiLogic()->m_selectedServerIndex, DockerContainer::None);
+    uiLogic()->pageLogic<ShareConnectionLogic>()->updateSharingPage(uiLogic()->m_selectedServerIndex,
+                                                                    DockerContainer::None);
     emit uiLogic()->goToShareProtocolPage(Proto::Any);
 #endif
 }
diff --git a/client/ui/pages_logic/StartPageLogic.cpp b/client/ui/pages_logic/StartPageLogic.cpp
index 12490810..454b5fa3 100644
--- a/client/ui/pages_logic/StartPageLogic.cpp
+++ b/client/ui/pages_logic/StartPageLogic.cpp
@@ -1,68 +1,69 @@
 #include "StartPageLogic.h"
 #include "ViewConfigLogic.h"
 
-#include "core/errorstrings.h"
+#include "../uilogic.h"
 #include "configurators/ssh_configurator.h"
 #include "configurators/vpn_configurator.h"
-#include "../uilogic.h"
-#include "utilities.h"
+#include "core/errorstrings.h"
 #include "core/servercontroller.h"
+#include "utilities.h"
 
+#include <QEventLoop>
 #include <QFileDialog>
 #include <QStandardPaths>
-#include <QEventLoop>
 
 #ifdef Q_OS_ANDROID
-#include <QJniObject>
-#include "../../platforms/android/androidutils.h"
-#include "../../platforms/android/android_controller.h"
+    #include "../../platforms/android/android_controller.h"
+    #include "../../platforms/android/androidutils.h"
+    #include <QJniObject>
 #endif
 
-namespace {
-enum class ConfigTypes {
-    Amnezia,
-    OpenVpn,
-    WireGuard
-};
-
-ConfigTypes checkConfigFormat(const QString &config)
+namespace
 {
-    const QString openVpnConfigPatternCli = "client";
-    const QString openVpnConfigPatternProto1 = "proto tcp";
-    const QString openVpnConfigPatternProto2 = "proto udp";
-    const QString openVpnConfigPatternDriver1 = "dev tun";
-    const QString openVpnConfigPatternDriver2 = "dev tap";
+    enum class ConfigTypes {
+        Amnezia,
+        OpenVpn,
+        WireGuard
+    };
 
-    const QString wireguardConfigPatternSectionInterface = "[Interface]";
-    const QString wireguardConfigPatternSectionPeer = "[Peer]";
+    ConfigTypes checkConfigFormat(const QString &config)
+    {
+        const QString openVpnConfigPatternCli = "client";
+        const QString openVpnConfigPatternProto1 = "proto tcp";
+        const QString openVpnConfigPatternProto2 = "proto udp";
+        const QString openVpnConfigPatternDriver1 = "dev tun";
+        const QString openVpnConfigPatternDriver2 = "dev tap";
 
-    if (config.contains(openVpnConfigPatternCli) &&
-            (config.contains(openVpnConfigPatternProto1) || config.contains(openVpnConfigPatternProto2)) &&
-            (config.contains(openVpnConfigPatternDriver1) || config.contains(openVpnConfigPatternDriver2))) {
-        return ConfigTypes::OpenVpn;
-    } else if (config.contains(wireguardConfigPatternSectionInterface) &&
-               config.contains(wireguardConfigPatternSectionPeer))
-        return ConfigTypes::WireGuard;
-    return ConfigTypes::Amnezia;
-}
+        const QString wireguardConfigPatternSectionInterface = "[Interface]";
+        const QString wireguardConfigPatternSectionPeer = "[Peer]";
+
+        if (config.contains(openVpnConfigPatternCli)
+            && (config.contains(openVpnConfigPatternProto1) || config.contains(openVpnConfigPatternProto2))
+            && (config.contains(openVpnConfigPatternDriver1) || config.contains(openVpnConfigPatternDriver2))) {
+            return ConfigTypes::OpenVpn;
+        } else if (config.contains(wireguardConfigPatternSectionInterface)
+                   && config.contains(wireguardConfigPatternSectionPeer))
+            return ConfigTypes::WireGuard;
+        return ConfigTypes::Amnezia;
+    }
 
 }
 
-StartPageLogic::StartPageLogic(UiLogic *logic, QObject *parent):
-    PageLogicBase(logic, parent),
-    m_pushButtonConnectEnabled{true},
-    m_pushButtonConnectText{tr("Connect")},
-    m_pushButtonConnectKeyChecked{false},
-    m_labelWaitInfoVisible{true},
-    m_pushButtonBackFromStartVisible{true},
-    m_ipAddressPortRegex{Utils::ipAddressPortRegExp()}
+StartPageLogic::StartPageLogic(UiLogic *logic, QObject *parent)
+    : PageLogicBase(logic, parent),
+      m_pushButtonConnectEnabled { true },
+      m_pushButtonConnectText { tr("Connect") },
+      m_pushButtonConnectKeyChecked { false },
+      m_labelWaitInfoVisible { true },
+      m_pushButtonBackFromStartVisible { true },
+      m_ipAddressPortRegex { Utils::ipAddressPortRegExp() }
 {
 #ifdef Q_OS_ANDROID
     // Set security screen for Android app
     AndroidUtils::runOnAndroidThreadSync([]() {
         QJniObject activity = AndroidUtils::getActivity();
         QJniObject window = activity.callObjectMethod("getWindow", "()Landroid/view/Window;");
-        if (window.isValid()){
+        if (window.isValid()) {
             const int FLAG_SECURE = 8192;
             window.callMethod<void>("addFlags", "(I)V", FLAG_SECURE);
         }
@@ -89,17 +90,13 @@ void StartPageLogic::onUpdatePage()
 
 void StartPageLogic::onPushButtonConnect()
 {
-    if (pushButtonConnectKeyChecked()){
-        if (lineEditIpText().isEmpty() ||
-                lineEditLoginText().isEmpty() ||
-                textEditSshKeyText().isEmpty() ) {
+    if (pushButtonConnectKeyChecked()) {
+        if (lineEditIpText().isEmpty() || lineEditLoginText().isEmpty() || textEditSshKeyText().isEmpty()) {
             set_labelWaitInfoText(tr("Please fill in all fields"));
             return;
         }
     } else {
-        if (lineEditIpText().isEmpty() ||
-                lineEditLoginText().isEmpty() ||
-                lineEditPasswordText().isEmpty() ) {
+        if (lineEditIpText().isEmpty() || lineEditLoginText().isEmpty() || lineEditPasswordText().isEmpty()) {
             set_labelWaitInfoText(tr("Please fill in all fields"));
             return;
         }
@@ -174,7 +171,8 @@ void StartPageLogic::onPushButtonConnect()
     set_pushButtonConnectText(tr("Connect"));
 
     uiLogic()->m_installCredentials = serverCredentials;
-    if (ok) emit uiLogic()->goToPage(Page::NewServer);
+    if (ok)
+        emit uiLogic()->goToPage(Page::NewServer);
 }
 
 void StartPageLogic::onPushButtonImport()
@@ -185,8 +183,10 @@ void StartPageLogic::onPushButtonImport()
 void StartPageLogic::onPushButtonImportOpenFile()
 {
     QString fileName = UiLogic::getOpenFileName(Q_NULLPTR, tr("Open config file"),
-        QStandardPaths::writableLocation(QStandardPaths::DocumentsLocation), "*.vpn *.ovpn *.conf");
-    if (fileName.isEmpty()) return;
+                                                QStandardPaths::writableLocation(QStandardPaths::DocumentsLocation),
+                                                "*.vpn *.ovpn *.conf");
+    if (fileName.isEmpty())
+        return;
 
     QFile file(fileName);
     file.open(QIODevice::ReadOnly);
@@ -226,8 +226,7 @@ bool StartPageLogic::importConnection(const QJsonObject &profile)
         // check config
         uiLogic()->pageLogic<ViewConfigLogic>()->set_configJson(profile);
         emit uiLogic()->goToPage(Page::ViewConfig);
-    }
-    else {
+    } else {
         qDebug() << "Failed to import profile";
         qDebug().noquote() << QJsonDocument(profile).toJson();
         return false;
@@ -298,7 +297,6 @@ bool StartPageLogic::importConnectionFromOpenVpnConfig(const QString &config)
     o[config_key::defaultContainer] = "amnezia-openvpn";
     o[config_key::description] = m_settings->nextAvailableServerName();
 
-
     const static QRegularExpression dnsRegExp("dhcp-option DNS (\\b\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}\\b)");
     QRegularExpressionMatchIterator dnsMatch = dnsRegExp.globalMatch(config);
     if (dnsMatch.hasNext()) {
@@ -345,7 +343,9 @@ bool StartPageLogic::importConnectionFromWireguardConfig(const QString &config)
     o[config_key::defaultContainer] = "amnezia-wireguard";
     o[config_key::description] = m_settings->nextAvailableServerName();
 
-    const static QRegularExpression dnsRegExp("DNS = (\\b\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}\\b).*(\\b\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}\\b)");
+    const static QRegularExpression dnsRegExp(
+            "DNS = "
+            "(\\b\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}\\b).*(\\b\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}\\b)");
     QRegularExpressionMatch dnsMatch = dnsRegExp.match(config);
     if (dnsMatch.hasMatch()) {
         o[config_key::dns1] = dnsMatch.captured(1);
diff --git a/client/ui/qml/Components/ShareConnectionDrawer.qml b/client/ui/qml/Components/ShareConnectionDrawer.qml
index 05df413c..692289a8 100644
--- a/client/ui/qml/Components/ShareConnectionDrawer.qml
+++ b/client/ui/qml/Components/ShareConnectionDrawer.qml
@@ -54,10 +54,10 @@ DrawerType {
                     Layout.fillWidth: true
                     Layout.topMargin: 16
 
-                    text: qsTr("Save connection code")
+                    text: Qt.platform.os === "android" ? qsTr("Share") : qsTr("Save connection code")
 
                     onClicked: {
-                        ExportController.saveFile()
+                        Qt.platform.os === "android" ? ExportController.shareFile() : ExportController.saveFile()
                     }
                 }
 
diff --git a/client/ui/qml/Controls2/CheckBoxType.qml b/client/ui/qml/Controls2/CheckBoxType.qml
index 6ce5ac4e..e4b1703f 100644
--- a/client/ui/qml/Controls2/CheckBoxType.qml
+++ b/client/ui/qml/Controls2/CheckBoxType.qml
@@ -26,7 +26,7 @@ CheckBox {
     hoverEnabled: true
 
     indicator: Rectangle {
-        id: checkBoxBackground
+        id: background
 
         anchors.verticalCenter: parent.verticalCenter
 
@@ -57,7 +57,6 @@ CheckBox {
             radius: 4
 
             Image {
-                id: indicator
                 anchors.centerIn: parent
 
                 source: root.pressed ? imageSource : root.checked ? imageSource : ""
@@ -71,31 +70,38 @@ CheckBox {
         }
     }
 
-    contentItem: ColumnLayout {
-        anchors.left: parent.left
-        anchors.right: parent.right
-        anchors.leftMargin: 8 + checkBoxBackground.width
+    contentItem: Item {
+        implicitWidth: content.implicitWidth
+        implicitHeight: content.implicitHeight
 
-        spacing: 4
+        anchors.fill: parent
+        anchors.leftMargin: 8 + background.width
 
-        ListItemTitleType {
-            Layout.fillWidth: true
-//            Layout.topMargin: 16
-//            Layout.bottomMargin: description.visible ? 0 : 16
+        ColumnLayout {
+            id: content
 
-            text: root.text
-        }
+            anchors.left: parent.left
+            anchors.right: parent.right
+            anchors.verticalCenter: parent.verticalCenter
 
-        CaptionTextType {
-            id: description
+            spacing: 4
 
-            Layout.fillWidth: true
-            Layout.bottomMargin: 16
+            ListItemTitleType {
+                Layout.fillWidth: true
 
-            text: root.descriptionText
-            color: "#878b91"
+                text: root.text
+            }
 
-            visible: root.descriptionText !== ""
+            CaptionTextType {
+                id: description
+
+                Layout.fillWidth: true
+
+                text: root.descriptionText
+                color: "#878b91"
+
+                visible: root.descriptionText !== ""
+            }
         }
     }
 
diff --git a/client/ui/qml/Controls2/PageType.qml b/client/ui/qml/Controls2/PageType.qml
index 046201b7..296fcc8c 100644
--- a/client/ui/qml/Controls2/PageType.qml
+++ b/client/ui/qml/Controls2/PageType.qml
@@ -20,7 +20,6 @@ Item {
         if (root.stackView.depth <= 1) {
             return
         }
-
         root.stackView.pop()
     }
 
diff --git a/client/ui/qml/Controls2/VerticalRadioButton.qml b/client/ui/qml/Controls2/VerticalRadioButton.qml
index c833ca27..f44fa751 100644
--- a/client/ui/qml/Controls2/VerticalRadioButton.qml
+++ b/client/ui/qml/Controls2/VerticalRadioButton.qml
@@ -85,44 +85,50 @@ RadioButton {
         }
     }
 
-    contentItem: ColumnLayout {
-        id: content
-        anchors.left: parent.left
-        anchors.right: parent.right
+    contentItem: Item {
+        implicitWidth: content.implicitWidth
+        implicitHeight: content.implicitHeight
+
+        anchors.fill: parent
         anchors.leftMargin: 8 + background.width
 
-        spacing: 4
+        ColumnLayout {
+            id: content
 
-        ListItemTitleType {
-            text: root.text
+            anchors.left: parent.left
+            anchors.right: parent.right
+            anchors.verticalCenter: parent.verticalCenter
 
-            color: {
-                if (root.checked) {
-                    return selectedTextColor
+            spacing: 4
+
+            ListItemTitleType {
+                text: root.text
+
+                color: {
+                    if (root.checked) {
+                        return selectedTextColor
+                    }
+                    return textColor
+                }
+
+                Layout.fillWidth: true
+
+                Behavior on color {
+                    PropertyAnimation { duration: 200 }
                 }
-                return textColor
             }
 
-            Layout.fillWidth: true
-            Layout.topMargin: 16
-            Layout.bottomMargin: description.visible ? 0 : 16
+            CaptionTextType {
+                id: description
 
-            Behavior on color {
-                PropertyAnimation { duration: 200 }
+                color: "#878B91"
+                text: root.descriptionText
+
+                visible: root.descriptionText !== ""
+
+                Layout.fillWidth: true
             }
         }
-
-        CaptionTextType {
-            id: description
-
-            color: "#878B91"
-            text: root.descriptionText
-
-            visible: root.descriptionText !== ""
-
-            Layout.fillWidth: true
-            Layout.bottomMargin: 16
-        }
     }
 
     MouseArea {
diff --git a/client/ui/qml/Pages2/PageSettingsAbout.qml b/client/ui/qml/Pages2/PageSettingsAbout.qml
index 01b11bda..1875f085 100644
--- a/client/ui/qml/Pages2/PageSettingsAbout.qml
+++ b/client/ui/qml/Pages2/PageSettingsAbout.qml
@@ -43,8 +43,8 @@ PageType {
                 Layout.topMargin: 16
                 Layout.leftMargin: 16
                 Layout.rightMargin: 16
-                Layout.preferredWidth: 344
-                Layout.preferredHeight: 279
+                Layout.preferredWidth: 291
+                Layout.preferredHeight: 224
             }
 
             Header2TextType {
@@ -100,7 +100,7 @@ And if you don't like the app, all the more support it - the donation will be us
 
                 text: qsTr("Show other methods on Github")
 
-                onClicked: Qt.openUrlExternally("https://github.com/amnezia-vpn/amnezia-client")
+                onClicked: Qt.openUrlExternally("https://github.com/amnezia-vpn/amnezia-client#donate")
             }
 
             ParagraphTextType {
diff --git a/client/ui/qml/Pages2/PageSetupWizardConfigSource.qml b/client/ui/qml/Pages2/PageSetupWizardConfigSource.qml
index 45e4c29c..78bd7486 100644
--- a/client/ui/qml/Pages2/PageSetupWizardConfigSource.qml
+++ b/client/ui/qml/Pages2/PageSetupWizardConfigSource.qml
@@ -61,16 +61,18 @@ PageType {
                 leftImageSource: "qrc:/images/controls/folder-open.svg"
 
                 clickedFunction: function() {
-                    onClicked: fileDialog.open()
+//                    onClicked: fileDialog.open()
+                    ImportController.extractConfigFromFile()
+                    goToPage(PageEnum.PageSetupWizardViewConfig)
                 }
 
-                FileDialog {
-                    id: fileDialog
-                    onAccepted: {
-                        ImportController.extractConfigFromFile(selectedFile)
-                        goToPage(PageEnum.PageSetupWizardViewConfig)
-                    }
-                }
+//                FileDialog {
+//                    id: fileDialog
+//                    onAccepted: {
+//                        ImportController.extractConfigFromFile(selectedFile)
+//                        goToPage(PageEnum.PageSetupWizardViewConfig)
+//                    }
+//                }
             }
 
             DividerType {}
@@ -84,6 +86,8 @@ PageType {
                 leftImageSource: "qrc:/images/controls/qr-code.svg"
 
                 clickedFunction: function() {
+                    ImportController.extractConfigFromQr()
+//                    goToPage(PageEnum.PageSetupWizardQrReader)
                 }
             }
 
diff --git a/client/ui/qml/Pages2/PageSetupWizardQrReader.qml b/client/ui/qml/Pages2/PageSetupWizardQrReader.qml
new file mode 100644
index 00000000..65d233ef
--- /dev/null
+++ b/client/ui/qml/Pages2/PageSetupWizardQrReader.qml
@@ -0,0 +1,52 @@
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+import QtQuick.Dialogs
+
+import PageEnum 1.0
+import QRCodeReader 1.0
+
+import "./"
+import "../Controls2"
+import "../Controls2/TextTypes"
+import "../Config"
+
+PageType {
+    id: root
+
+    ColumnLayout {
+        anchors.fill: parent
+
+        spacing: 0
+
+        BackButtonType {
+            Layout.topMargin: 20
+        }
+
+        ParagraphTextType {
+            Layout.fillWidth: true
+
+            text: qsTr("Point the camera at the QR code and hold for a couple of seconds.")
+        }
+
+        ProgressBarType {
+
+        }
+
+        Item {
+            Layout.fillHeight: true
+            Layout.fillWidth: true
+
+            QRCodeReader {
+               id: qrCodeReader
+               Component.onCompleted: {
+                   qrCodeReader.setCameraSize(Qt.rect(parent.x,
+                                                      parent.y,
+                                                      parent.width,
+                                                      parent.height))
+                   qrCodeReader.startReading()
+               }
+            }
+        }
+    }
+}
diff --git a/client/ui/qml/Pages2/PageSetupWizardStart.qml b/client/ui/qml/Pages2/PageSetupWizardStart.qml
index 78ccfa95..750084c7 100644
--- a/client/ui/qml/Pages2/PageSetupWizardStart.qml
+++ b/client/ui/qml/Pages2/PageSetupWizardStart.qml
@@ -20,6 +20,10 @@ PageType {
             popupErrorMessage.popupErrorMessageText = errorMessage
             popupErrorMessage.open()
         }
+
+        function onGoToPageViewConfig() {
+            goToPage(PageEnum.PageSetupWizardViewConfig)
+        }
     }
 
     FlickableType {
diff --git a/client/ui/qml/Pages2/PageShare.qml b/client/ui/qml/Pages2/PageShare.qml
index 903e5658..201c630a 100644
--- a/client/ui/qml/Pages2/PageShare.qml
+++ b/client/ui/qml/Pages2/PageShare.qml
@@ -18,7 +18,7 @@ PageType {
 
     enum ConfigType {
         AmneziaConnection,
-        AmenziaFullAccess,
+        AmneziaFullAccess,
         OpenVpn,
         WireGuard
     }
@@ -33,7 +33,14 @@ PageType {
 
             switch (type) {
             case PageShare.ConfigType.AmneziaConnection: ExportController.generateConnectionConfig(); break;
-            case PageShare.ConfigType.AmenziaFullAccess: ExportController.generateFullAccessConfig(); break;
+            case PageShare.ConfigType.AmneziaFullAccess: {
+                if (Qt.platform.os === "android") {
+                    ExportController.generateFullAccessConfigAndroid();
+                } else {
+                    ExportController.generateFullAccessConfig();
+                }
+                break;
+            }
             case PageShare.ConfigType.OpenVpn: ExportController.generateOpenVpnConfig(); break;
             case PageShare.ConfigType.WireGuard: ExportController.generateWireGuardConfig(); break;
             }
@@ -48,6 +55,8 @@ PageType {
         }
     }
 
+    property string fullConfigServerSelectorText
+    property string connectionServerSelectorText
     property bool showContent: false
     property bool shareButtonEnabled: false
     property list<QtObject> connectionTypesModel: [
@@ -118,6 +127,7 @@ PageType {
 
                         onClicked: {
                             accessTypeSelector.currentIndex = 0
+                            serverSelector.text = root.connectionServerSelectorText
                         }
                     }
 
@@ -129,6 +139,7 @@ PageType {
 
                         onClicked: {
                             accessTypeSelector.currentIndex = 1
+                            serverSelector.text = root.fullConfigServerSelectorText
                         }
                     }
                 }
@@ -176,14 +187,24 @@ PageType {
                     currentIndex: 0
 
                     clickedFunction: function() {
-                        serverSelector.text = selectedText
-                        ServersModel.currentlyProcessedIndex = currentIndex
-                        protocolSelector.visible = true
-                        root.shareButtonEnabled = false
+                        handler()
+
+                        if (accessTypeSelector.currentIndex === 0) {
+                            protocolSelector.visible = true
+                            root.shareButtonEnabled = false
+                        } else {
+                            serverSelector.menuVisible = false
+                        }
                     }
 
                     Component.onCompleted: {
+                        handler()
+                    }
+
+                    function handler() {
                         serverSelector.text = selectedText
+                        root.fullConfigServerSelectorText = selectedText
+                        root.connectionServerSelectorText = selectedText
                         ServersModel.currentlyProcessedIndex = currentIndex
                     }
                 }
@@ -260,7 +281,9 @@ PageType {
                                 }
 
                                 Component.onCompleted: {
-                                    handler()
+                                    if (accessTypeSelector.currentIndex === 0) {
+                                        handler()
+                                    }
                                 }
 
                                 function handler() {
@@ -272,6 +295,8 @@ PageType {
                                     }
 
                                     serverSelector.text += ", " + selectedText
+                                    root.connectionServerSelectorText = serverSelector.text
+
                                     shareConnectionDrawer.headerText = qsTr("Connection to ") + serverSelector.text
                                     shareConnectionDrawer.configContentHeaderText = qsTr("File with connection settings to ") + serverSelector.text
                                     ContainersModel.setCurrentlyProcessedContainerIndex(proxyContainersModel.mapToSource(currentIndex))
diff --git a/client/ui/qml/Pages2/PageStart.qml b/client/ui/qml/Pages2/PageStart.qml
index 09bebaa1..5d49abf7 100644
--- a/client/ui/qml/Pages2/PageStart.qml
+++ b/client/ui/qml/Pages2/PageStart.qml
@@ -25,6 +25,11 @@ PageType {
             tabBarStackView.goToTabBarPage(PageController.getPagePath(PageEnum.PageSettings))
         }
 
+        function onGoToPageViewConfig() {
+            var pagePath = PageController.getPagePath(PageEnum.PageSetupWizardViewConfig)
+            tabBarStackView.push(pagePath, { "objectName" : pagePath }, StackView.PushTransition)
+        }
+
         function onShowErrorMessage(errorMessage) {
             popupErrorMessage.popupErrorMessageText = errorMessage
             popupErrorMessage.open()
@@ -35,6 +40,13 @@ PageType {
             tabBarStackView.enabled = !visible
             tabBar.enabled = !visible
         }
+
+        function onClosePage() {
+            if (tabBarStackView.depth <= 1) {
+                return
+            }
+            tabBarStackView.pop()
+        }
     }
 
     StackViewType {
diff --git a/client/ui/qml/Pages2/PageTest.qml b/client/ui/qml/Pages2/PageTest.qml
deleted file mode 100644
index d33608f8..00000000
--- a/client/ui/qml/Pages2/PageTest.qml
+++ /dev/null
@@ -1,282 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-import QtQuick.Layouts
-import PageEnum 1.0
-
-import "./"
-import "../Controls2"
-import "../Config"
-import "../Controls2/TextTypes"
-
-Item {
-    id: root
-
-    ColumnLayout {
-        id: content
-        anchors.top: parent.top
-        anchors.left: parent.left
-        anchors.right: parent.right
-
-        HeaderType {
-            id: header
-
-            Layout.rightMargin: 16
-            Layout.leftMargin: 16
-            Layout.topMargin: 20
-            Layout.bottomMargin: 32
-            Layout.fillWidth: true
-
-            backButtonImage: "qrc:/images/controls/arrow-left.svg"
-            headerText: "Server 1"
-            descriptionText: "root 192.168.111.111"
-        }
-
-        Item {
-            Layout.fillWidth: true
-
-            TabBar {
-                id: tabBar
-
-                anchors {
-                    top: parent.top
-                    right: parent.right
-                    left: parent.left
-                }
-
-                background: Rectangle {
-                    color: "transparent"
-                }
-
-                TabButtonType {
-                    id: bb
-                    isSelected: tabBar.currentIndex === 0
-                    text: qsTr("Протоколы")
-                }
-                TabButtonType {
-                    isSelected: tabBar.currentIndex === 1
-                    text: qsTr("Сервисы")
-                }
-                TabButtonType {
-                    isSelected: tabBar.currentIndex === 2
-                    text: qsTr("Данные")
-                }
-            }
-
-            StackLayout {
-                id: stackLayout
-                currentIndex: tabBar.currentIndex
-
-                anchors.top: tabBar.bottom
-                anchors.topMargin: 16
-
-                width: parent.width
-                height: root.height - header.implicitHeight - tabBar.implicitHeight - 100
-
-                Item {
-                    id: protocolsTab
-
-                    FlickableType {
-                        anchors.top: parent.top
-                        anchors.bottom: parent.bottom
-                        contentHeight: protocolsTabContent.height
-
-                        ColumnLayout {
-                            id: protocolsTabContent
-                            anchors.top: parent.top
-                            anchors.left: parent.left
-                            anchors.right: parent.right
-
-                            BasicButtonType {
-                                Layout.fillWidth: true
-                                Layout.leftMargin: 16
-                                Layout.rightMargin: 16
-                                text: qsTr("Forget this server")
-                            }
-
-                            BasicButtonType {
-                                Layout.fillWidth: true
-                                Layout.leftMargin: 16
-                                Layout.rightMargin: 16
-
-                                defaultColor: "transparent"
-                                hoveredColor: Qt.rgba(255, 255, 255, 0.08)
-                                pressedColor: Qt.rgba(255, 255, 255, 0.12)
-                                disabledColor: "#878B91"
-                                textColor: "#D7D8DB"
-                                borderWidth: 1
-
-                                text: qsTr("Forget this server")
-                            }
-
-                            TextFieldWithHeaderType {
-                                Layout.fillWidth: true
-                                Layout.leftMargin: 16
-                                Layout.rightMargin: 16
-                                headerText: "Server IP adress [:port]"
-                            }
-
-                            LabelWithButtonType {
-                                id: ip
-                                Layout.fillWidth: true
-                                Layout.leftMargin: 16
-                                Layout.rightMargin: 16
-
-                                text: "IP, логин и пароль от сервера"
-                                rightImageSource: "qrc:/images/controls/chevron-right.svg"
-                            }
-
-                            Rectangle {
-                                Layout.fillWidth: true
-                                Layout.leftMargin: 16
-                                Layout.rightMargin: 16
-                                height: 1
-                                color: "#2C2D30"
-                            }
-
-                            LabelWithButtonType {
-                                Layout.fillWidth: true
-                                Layout.leftMargin: 16
-                                Layout.rightMargin: 16
-
-                                text: "QR-код, ключ или файл настроек"
-                                rightImageSource: "qrc:/images/controls/chevron-right.svg"
-                            }
-
-                            Rectangle {
-                                Layout.fillWidth: true
-                                Layout.leftMargin: 16
-                                Layout.rightMargin: 16
-                                height: 1
-                                color: "#2C2D30"
-                            }
-
-                            CardType {
-                                Layout.fillWidth: true
-                                Layout.leftMargin: 16
-                                Layout.rightMargin: 16
-
-                                headerText: "Высокий"
-                                bodyText: "Многие иностранные сайты и VPN-провайдеры заблокированы"
-                                footerText: "футер"
-                            }
-
-                            CardType {
-                                Layout.fillWidth: true
-                                Layout.leftMargin: 16
-                                Layout.rightMargin: 16
-
-                                headerText: "Высокий"
-                                bodyText: "Многие иностранные сайты и VPN-провайдеры заблокированы"
-                                footerText: "футер"
-                            }
-
-                            DropDownType {
-                                Layout.fillWidth: true
-
-                                text: "IP, логин и пароль от сервера"
-                                descriptionText: "IP, логин и пароль от сервера"
-
-                                menuModel: [
-                                    qsTr("SHA512"),
-                                    qsTr("SHA384"),
-                                    qsTr("SHA256"),
-                                    qsTr("SHA3-512"),
-                                    qsTr("SHA3-384"),
-                                    qsTr("SHA3-256"),
-                                    qsTr("whirlpool"),
-                                    qsTr("BLAKE2b512"),
-                                    qsTr("BLAKE2s256"),
-                                    qsTr("SHA1")
-                                ]
-                            }
-                        }
-                    }
-                }
-
-                Item {
-                    id: servicesTab
-
-                    FlickableType {
-                        anchors.top: parent.top
-                        anchors.bottom: parent.bottom
-                        contentHeight: servicesTabContent.height
-
-                        ColumnLayout {
-                            id: servicesTabContent
-                            anchors.top: parent.top
-                            anchors.left: parent.left
-                            anchors.right: parent.right
-
-                            CheckBoxType {
-                                Layout.leftMargin: 16
-                                Layout.rightMargin: 16
-                                Layout.fillWidth: true
-                                text: qsTr("Auto-negotiate encryption")
-                            }
-                            CheckBoxType {
-                                Layout.leftMargin: 16
-                                Layout.rightMargin: 16
-                                Layout.fillWidth: true
-                                text: qsTr("Auto-negotiate encryption")
-                                descriptionText: qsTr("Auto-negotiate encryption")
-                            }
-
-                            Rectangle {
-                                implicitWidth: buttonGroup.implicitWidth
-                                implicitHeight: buttonGroup.implicitHeight
-
-                                Layout.leftMargin: 16
-                                Layout.rightMargin: 16
-
-                                color: "#1C1D21"
-                                radius: 16
-
-                                RowLayout {
-                                    id: buttonGroup
-
-                                    spacing: 0
-
-                                    HorizontalRadioButton {
-                                        implicitWidth: (root.width - 32) / 2
-                                        text: "UDP"
-                                    }
-
-                                    HorizontalRadioButton {
-                                        implicitWidth: (root.width - 32) / 2
-                                        text: "TCP"
-                                    }
-                                }
-                            }
-
-                            VerticalRadioButton {
-                                text: "Раздельное туннелирование"
-                                descriptionText: "Позволяет подключаться к одним сайтам через защищенное соединение, а к другим в обход него"
-                                checked: true
-
-                                Layout.fillWidth: true
-                                Layout.leftMargin: 16
-                                Layout.rightMargin: 16
-                            }
-
-                            VerticalRadioButton {
-                                text: "Раздельное туннелирование"
-
-                                Layout.fillWidth: true
-                                Layout.leftMargin: 16
-                                Layout.rightMargin: 16
-                            }
-
-                            SwitcherType {
-                                text: "Auto-negotiate encryption"
-
-                                Layout.fillWidth: true
-                                Layout.leftMargin: 16
-                                Layout.rightMargin: 16
-                            }
-                        }
-                    }
-                }
-            }
-        }
-    }
-}
diff --git a/client/ui/qml/main2.qml b/client/ui/qml/main2.qml
index 8ad71d0f..d0f9880d 100644
--- a/client/ui/qml/main2.qml
+++ b/client/ui/qml/main2.qml
@@ -18,10 +18,9 @@ Window  {
 
     color: "#0E0E11"
 
-    // todo
     onClosing: function() {
         console.debug("QML onClosing signal")
-        UiLogic.onCloseWindow()
+        PageController.closeWindow()
     }
 
     title: "AmneziaVPN"
@@ -36,6 +35,11 @@ Window  {
             var pagePath = PageController.getInitialPage()
             rootStackView.push(pagePath, { "objectName" : pagePath })
         }
+
+        Keys.onPressed: function(event) {
+            PageController.keyPressEvent(event.key)
+            event.accepted = true
+        }
     }
 
     Connections {
@@ -49,10 +53,14 @@ Window  {
             rootStackView.replace(pagePath, { "objectName" : pagePath })
         }
 
-        function onRaise() {
+        function onRaiseMainWindow() {
             root.show()
             root.raise()
             root.requestActivate()
         }
+
+        function onHideMainWindow() {
+            root.hide()
+        }
     }
 }
diff --git a/client/ui/uilogic.cpp b/client/ui/uilogic.cpp
index cd02bf41..aefcc49c 100644
--- a/client/ui/uilogic.cpp
+++ b/client/ui/uilogic.cpp
@@ -10,79 +10,76 @@
 #include <QKeyEvent>
 #include <QMenu>
 #include <QMetaEnum>
+#include <QMetaObject>
+#include <QQmlFile>
+#include <QStandardPaths>
 #include <QSysInfo>
 #include <QThread>
 #include <QTimer>
-#include <QQmlFile>
-#include <QMetaObject>
-#include <QStandardPaths>
 
 #include "amnezia_application.h"
 
 #include "configurators/cloak_configurator.h"
-#include "configurators/vpn_configurator.h"
 #include "configurators/openvpn_configurator.h"
 #include "configurators/shadowsocks_configurator.h"
 #include "configurators/ssh_configurator.h"
+#include "configurators/vpn_configurator.h"
 
-#include "core/servercontroller.h"
-#include "core/server_defs.h"
 #include "core/errorstrings.h"
+#include "core/server_defs.h"
+#include "core/servercontroller.h"
 
 #include "containers/containers_defs.h"
 
 #include "ui/qautostart.h"
 
 #include "logger.h"
-#include "version.h"
 #include "uilogic.h"
 #include "utilities.h"
+#include "version.h"
 #include "vpnconnection.h"
 #include <functional>
 
 #if defined Q_OS_MAC || defined Q_OS_LINUX
-#include "ui/macos_util.h"
+    #include "ui/macos_util.h"
 #endif
 
 #ifdef Q_OS_ANDROID
-#include "platforms/android/android_controller.h"
+    #include "platforms/android/android_controller.h"
 #endif
 
 #include "platforms/ios/MobileUtils.h"
 
+#include "pages_logic/AdvancedServerSettingsLogic.h"
 #include "pages_logic/AppSettingsLogic.h"
+#include "pages_logic/ClientInfoLogic.h"
+#include "pages_logic/ClientManagementLogic.h"
 #include "pages_logic/GeneralSettingsLogic.h"
 #include "pages_logic/NetworkSettingsLogic.h"
 #include "pages_logic/NewServerProtocolsLogic.h"
 #include "pages_logic/QrDecoderLogic.h"
 #include "pages_logic/ServerConfiguringProgressLogic.h"
+#include "pages_logic/ServerContainersLogic.h"
 #include "pages_logic/ServerListLogic.h"
 #include "pages_logic/ServerSettingsLogic.h"
-#include "pages_logic/ServerContainersLogic.h"
 #include "pages_logic/ShareConnectionLogic.h"
 #include "pages_logic/SitesLogic.h"
 #include "pages_logic/StartPageLogic.h"
 #include "pages_logic/ViewConfigLogic.h"
 #include "pages_logic/VpnLogic.h"
 #include "pages_logic/WizardLogic.h"
-#include "pages_logic/AdvancedServerSettingsLogic.h"
-#include "pages_logic/ClientManagementLogic.h"
-#include "pages_logic/ClientInfoLogic.h"
 
 #include "pages_logic/protocols/CloakLogic.h"
 #include "pages_logic/protocols/OpenVpnLogic.h"
-#include "pages_logic/protocols/ShadowSocksLogic.h"
 #include "pages_logic/protocols/OtherProtocolsLogic.h"
+#include "pages_logic/protocols/ShadowSocksLogic.h"
 #include "pages_logic/protocols/WireGuardLogic.h"
 
 using namespace amnezia;
 using namespace PageEnumNS;
 
-UiLogic::UiLogic(std::shared_ptr<Settings> settings, std::shared_ptr<VpnConfigurator> configurator,
-    QObject *parent) :
-    QObject(parent),
-    m_settings(settings),
-    m_configurator(configurator)
+UiLogic::UiLogic(std::shared_ptr<Settings> settings, std::shared_ptr<VpnConfigurator> configurator, QObject *parent)
+    : QObject(parent), m_settings(settings), m_configurator(configurator)
 {
     m_protocolsModel = new ProtocolsModel(settings, this);
     m_clientManagementModel = new ClientManagementModel(this);
@@ -90,7 +87,6 @@ UiLogic::UiLogic(std::shared_ptr<Settings> settings, std::shared_ptr<VpnConfigur
     m_vpnConnection->moveToThread(&m_vpnConnectionThread);
     m_vpnConnectionThread.start();
 
-
     m_protocolLogicMap.insert(Proto::OpenVpn, new OpenVpnLogic(this));
     m_protocolLogicMap.insert(Proto::ShadowSocks, new ShadowSocksLogic(this));
     m_protocolLogicMap.insert(Proto::Cloak, new CloakLogic(this));
@@ -99,7 +95,6 @@ UiLogic::UiLogic(std::shared_ptr<Settings> settings, std::shared_ptr<VpnConfigur
     m_protocolLogicMap.insert(Proto::Dns, new OtherProtocolsLogic(this));
     m_protocolLogicMap.insert(Proto::Sftp, new OtherProtocolsLogic(this));
     m_protocolLogicMap.insert(Proto::TorWebSite, new OtherProtocolsLogic(this));
-
 }
 
 UiLogic::~UiLogic()
@@ -129,33 +124,37 @@ UiLogic::~UiLogic()
 void UiLogic::initializeUiLogic()
 {
 #ifdef Q_OS_ANDROID
-    connect(AndroidController::instance(), &AndroidController::initialized, [this](bool status, bool connected, const QDateTime& connectionDate) {
-        if (connected) {
-            pageLogic<VpnLogic>()->onConnectionStateChanged(Vpn::ConnectionState::Connected);
-            if (m_vpnConnection) m_vpnConnection->restoreConnection();
-        }
-    });
-    if (!AndroidController::instance()->initialize(pageLogic<StartPageLogic>())) {
-        qCritical() << QString("Init failed");
-        if (m_vpnConnection) m_vpnConnection->connectionStateChanged(Vpn::ConnectionState::Error);
-        return;
-    }
+    connect(AndroidController::instance(), &AndroidController::initialized,
+            [this](bool status, bool connected, const QDateTime &connectionDate) {
+                if (connected) {
+                    pageLogic<VpnLogic>()->onConnectionStateChanged(Vpn::ConnectionState::Connected);
+                    if (m_vpnConnection)
+                        m_vpnConnection->restoreConnection();
+                }
+            });
+//    if (!AndroidController::instance()->initialize(pageLogic<StartPageLogic>())) {
+//        qCritical() << QString("Init failed");
+//        if (m_vpnConnection) m_vpnConnection->connectionStateChanged(Vpn::ConnectionState::Error);
+//        return;
+//    }
 #endif
 
     m_notificationHandler = NotificationHandler::create(qmlRoot());
 
-    connect(m_vpnConnection, &VpnConnection::connectionStateChanged, m_notificationHandler, &NotificationHandler::setConnectionState);
+    connect(m_vpnConnection, &VpnConnection::connectionStateChanged, m_notificationHandler,
+            &NotificationHandler::setConnectionState);
     connect(m_notificationHandler, &NotificationHandler::raiseRequested, this, &UiLogic::raise);
     connect(m_notificationHandler, &NotificationHandler::connectRequested, pageLogic<VpnLogic>(), &VpnLogic::onConnect);
-    connect(m_notificationHandler, &NotificationHandler::disconnectRequested, pageLogic<VpnLogic>(), &VpnLogic::onDisconnect);
+    connect(m_notificationHandler, &NotificationHandler::disconnectRequested, pageLogic<VpnLogic>(),
+            &VpnLogic::onDisconnect);
 
-//    if (m_settings->serversCount() > 0) {
-//        if (m_settings->defaultServerIndex() < 0) m_settings->setDefaultServer(0);
-//        emit goToPage(Page::PageStart, true, false);
-//    }
-//    else {
-//        emit goToPage(Page::PageSetupWizardStart, true, false);
-//    }
+    //    if (m_settings->serversCount() > 0) {
+    //        if (m_settings->defaultServerIndex() < 0) m_settings->setDefaultServer(0);
+    //        emit goToPage(Page::PageStart, true, false);
+    //    }
+    //    else {
+    //        emit goToPage(Page::PageSetupWizardStart, true, false);
+    //    }
 
     m_selectedServerIndex = m_settings->defaultServerIndex();
 
@@ -165,14 +164,13 @@ void UiLogic::initializeUiLogic()
 
 void UiLogic::showOnStartup()
 {
-    if (! m_settings->isStartMinimized()) {
+    if (!m_settings->isStartMinimized()) {
         emit show();
-    }
-    else {
+    } else {
 #ifdef Q_OS_WIN
         emit hide();
 #elif defined Q_OS_MACX
-    // TODO: fix: setDockIconVisible(false);
+        // TODO: fix: setDockIconVisible(false);
 #endif
     }
 }
@@ -180,7 +178,7 @@ void UiLogic::showOnStartup()
 void UiLogic::onUpdateAllPages()
 {
     for (auto logic : m_logicMap) {
-        if (dynamic_cast<ClientInfoLogic*>(logic) || dynamic_cast<ClientManagementLogic*>(logic)) {
+        if (dynamic_cast<ClientInfoLogic *>(logic) || dynamic_cast<ClientManagementLogic *>(logic)) {
             continue;
         }
         logic->onUpdatePage();
@@ -191,57 +189,50 @@ void UiLogic::keyPressEvent(Qt::Key key)
 {
     switch (key) {
     case Qt::Key_AsciiTilde:
-    case Qt::Key_QuoteLeft: emit toggleLogPanel();
-        break;
-    case Qt::Key_L: Logger::openLogsFolder();
-        break;
-    case Qt::Key_K: Logger::openServiceLogsFolder();
-        break;
+    case Qt::Key_QuoteLeft: emit toggleLogPanel(); break;
+    case Qt::Key_L: Logger::openLogsFolder(); break;
+    case Qt::Key_K: Logger::openServiceLogsFolder(); break;
 #ifdef QT_DEBUG
-    case Qt::Key_Q:
-        qApp->quit();
-        break;
+    case Qt::Key_Q: qApp->quit(); break;
     case Qt::Key_H:
         m_selectedServerIndex = m_settings->defaultServerIndex();
         m_selectedDockerContainer = m_settings->defaultContainer(m_selectedServerIndex);
 
-        //updateSharingPage(selectedServerIndex, m_settings->serverCredentials(selectedServerIndex), selectedDockerContainer);
+        // updateSharingPage(selectedServerIndex, m_settings->serverCredentials(selectedServerIndex), selectedDockerContainer);
         emit goToPage(Page::ShareConnection);
         break;
 #endif
     case Qt::Key_C:
-        qDebug().noquote() << "Def server" << m_settings->defaultServerIndex() << m_settings->defaultContainerName(m_settings->defaultServerIndex());
+        qDebug().noquote() << "Def server" << m_settings->defaultServerIndex()
+                           << m_settings->defaultContainerName(m_settings->defaultServerIndex());
         qDebug().noquote() << QJsonDocument(m_settings->defaultServer()).toJson();
         break;
-    case Qt::Key_A:
-        emit goToPage(Page::Start);
-        break;
+    case Qt::Key_A: emit goToPage(Page::Start); break;
     case Qt::Key_S:
         m_selectedServerIndex = m_settings->defaultServerIndex();
         emit goToPage(Page::ServerSettings);
         break;
-    case Qt::Key_P:
-        onGotoCurrentProtocolsPage();
-        break;
+    case Qt::Key_P: onGotoCurrentProtocolsPage(); break;
     case Qt::Key_T:
         m_configurator->sshConfigurator->openSshTerminal(m_settings->serverCredentials(m_settings->defaultServerIndex()));
         break;
     case Qt::Key_Escape:
-        if (currentPage() == Page::Vpn) break;
-        if (currentPage() == Page::ServerConfiguringProgress) break;
+        if (currentPage() == Page::Vpn)
+            break;
+        if (currentPage() == Page::ServerConfiguringProgress)
+            break;
     case Qt::Key_Back:
 
-//        if (currentPage() == Page::Start && pagesStack.size() < 2) break;
-//        if (currentPage() == Page::Sites &&
-//                ui->tableView_sites->selectionModel()->selection().indexes().size() > 0) {
-//            ui->tableView_sites->clearSelection();
-//            break;
-//        }
+        //        if (currentPage() == Page::Start && pagesStack.size() < 2) break;
+        //        if (currentPage() == Page::Sites &&
+        //                ui->tableView_sites->selectionModel()->selection().indexes().size() > 0) {
+        //            ui->tableView_sites->clearSelection();
+        //            break;
+        //        }
 
-            emit closePage();
+        emit closePage();
         //}
-    default:
-        ;
+    default:;
     }
 }
 
@@ -250,8 +241,7 @@ void UiLogic::onCloseWindow()
 #ifdef Q_OS_ANDROID
     qApp->quit();
 #else
-    if (m_settings->serversCount() == 0)
-    {
+    if (m_settings->serversCount() == 0) {
         qApp->quit();
     } else {
         emit hide();
@@ -267,7 +257,6 @@ QString UiLogic::containerName(int container)
 QString UiLogic::containerDesc(int container)
 {
     return ContainerProps::containerDescriptions().value(static_cast<DockerContainer>(container));
-
 }
 
 void UiLogic::onGotoCurrentProtocolsPage()
@@ -286,50 +275,50 @@ void UiLogic::installServer(QPair<DockerContainer, QJsonObject> &container)
     qApp->processEvents();
 
     ServerConfiguringProgressLogic::PageFunc pageFunc;
-    pageFunc.setEnabledFunc = [this] (bool enabled) -> void {
+    pageFunc.setEnabledFunc = [this](bool enabled) -> void {
         pageLogic<ServerConfiguringProgressLogic>()->set_pageEnabled(enabled);
     };
 
     ServerConfiguringProgressLogic::ButtonFunc noButton;
 
     ServerConfiguringProgressLogic::LabelFunc waitInfoFunc;
-    waitInfoFunc.setTextFunc = [this] (const QString& text) -> void {
+    waitInfoFunc.setTextFunc = [this](const QString &text) -> void {
         pageLogic<ServerConfiguringProgressLogic>()->set_labelWaitInfoText(text);
     };
-    waitInfoFunc.setVisibleFunc = [this] (bool visible) -> void {
+    waitInfoFunc.setVisibleFunc = [this](bool visible) -> void {
         pageLogic<ServerConfiguringProgressLogic>()->set_labelWaitInfoVisible(visible);
     };
 
     ServerConfiguringProgressLogic::ProgressFunc progressBarFunc;
-    progressBarFunc.setVisibleFunc = [this] (bool visible) -> void {
+    progressBarFunc.setVisibleFunc = [this](bool visible) -> void {
         pageLogic<ServerConfiguringProgressLogic>()->set_progressBarVisible(visible);
     };
-    progressBarFunc.setValueFunc = [this] (int value) -> void {
+    progressBarFunc.setValueFunc = [this](int value) -> void {
         pageLogic<ServerConfiguringProgressLogic>()->set_progressBarValue(value);
     };
-    progressBarFunc.getValueFunc = [this] (void) -> int {
+    progressBarFunc.getValueFunc = [this](void) -> int {
         return pageLogic<ServerConfiguringProgressLogic>()->progressBarValue();
     };
-    progressBarFunc.getMaximumFunc = [this] (void) -> int {
+    progressBarFunc.getMaximumFunc = [this](void) -> int {
         return pageLogic<ServerConfiguringProgressLogic>()->progressBarMaximum();
     };
-    progressBarFunc.setTextVisibleFunc = [this] (bool visible) -> void {
+    progressBarFunc.setTextVisibleFunc = [this](bool visible) -> void {
         pageLogic<ServerConfiguringProgressLogic>()->set_progressBarTextVisible(visible);
     };
-    progressBarFunc.setTextFunc = [this] (const QString& text) -> void {
+    progressBarFunc.setTextFunc = [this](const QString &text) -> void {
         pageLogic<ServerConfiguringProgressLogic>()->set_progressBarText(text);
     };
 
     ServerConfiguringProgressLogic::LabelFunc busyInfoFunc;
-    busyInfoFunc.setTextFunc = [this] (const QString& text) -> void {
+    busyInfoFunc.setTextFunc = [this](const QString &text) -> void {
         pageLogic<ServerConfiguringProgressLogic>()->set_labelServerBusyText(text);
     };
-    busyInfoFunc.setVisibleFunc = [this] (bool visible) -> void {
+    busyInfoFunc.setVisibleFunc = [this](bool visible) -> void {
         pageLogic<ServerConfiguringProgressLogic>()->set_labelServerBusyVisible(visible);
     };
 
     ServerConfiguringProgressLogic::ButtonFunc cancelButtonFunc;
-    cancelButtonFunc.setVisibleFunc = [this] (bool visible) -> void {
+    cancelButtonFunc.setVisibleFunc = [this](bool visible) -> void {
         pageLogic<ServerConfiguringProgressLogic>()->set_pushButtonCancelVisible(visible);
     };
 
@@ -338,13 +327,12 @@ void UiLogic::installServer(QPair<DockerContainer, QJsonObject> &container)
     if (errorCode == ErrorCode::NoError) {
         if (!isContainerAlreadyAddedToGui(container.first)) {
             progressBarFunc.setTextFunc(QString("Installing %1").arg(ContainerProps::containerToString(container.first)));
-            auto installAction = [&] () {
+            auto installAction = [&]() {
                 ServerController serverController(m_settings);
                 return serverController.setupContainer(m_installCredentials, container.first, container.second);
             };
-            errorCode = pageLogic<ServerConfiguringProgressLogic>()->doInstallAction(installAction, pageFunc, progressBarFunc,
-                                                                                     noButton, waitInfoFunc,
-                                                                                     busyInfoFunc, cancelButtonFunc);
+            errorCode = pageLogic<ServerConfiguringProgressLogic>()->doInstallAction(
+                    installAction, pageFunc, progressBarFunc, noButton, waitInfoFunc, busyInfoFunc, cancelButtonFunc);
             if (errorCode == ErrorCode::NoError) {
                 if (!isServerCreated) {
                     QJsonObject server;
@@ -354,7 +342,7 @@ void UiLogic::installServer(QPair<DockerContainer, QJsonObject> &container)
                     server.insert(config_key::port, m_installCredentials.port);
                     server.insert(config_key::description, m_settings->nextAvailableServerName());
 
-                    server.insert(config_key::containers, QJsonArray{container.second});
+                    server.insert(config_key::containers, QJsonArray { container.second });
                     server.insert(config_key::defaultContainer, ContainerProps::containerToString(container.first));
 
                     m_settings->addServer(server);
@@ -371,22 +359,23 @@ void UiLogic::installServer(QPair<DockerContainer, QJsonObject> &container)
             }
         } else {
             onUpdateAllPages();
-            emit showWarningMessage("Attention! The container you are trying to install is already installed on the server. "
-                                    "All installed containers have been added to the application ");
+            emit showWarningMessage(
+                    "Attention! The container you are trying to install is already installed on the server. "
+                    "All installed containers have been added to the application ");
             emit setStartPage(Page::Vpn);
             return;
         }
     }
-    emit showWarningMessage(tr("Error occurred while configuring server.") + "\n" +
-                            tr("Error message: ") + errorString(errorCode) + "\n" +
-                            tr("See logs for details."));
+    emit showWarningMessage(tr("Error occurred while configuring server.") + "\n" + tr("Error message: ")
+                            + errorString(errorCode) + "\n" + tr("See logs for details."));
     emit closePage();
 }
 
 PageProtocolLogicBase *UiLogic::protocolLogic(Proto p)
 {
     PageProtocolLogicBase *logic = m_protocolLogicMap.value(p);
-    if (logic) return logic;
+    if (logic)
+        return logic;
     else {
         qCritical() << "UiLogic::protocolLogic Warning: logic missing for" << p;
         return new PageProtocolLogicBase(this);
@@ -418,7 +407,7 @@ PageEnumNS::Page UiLogic::currentPage()
     return static_cast<PageEnumNS::Page>(currentPageValue());
 }
 
-void UiLogic::saveTextFile(const QString& desc, const QString& suggestedName, QString ext, const QString& data)
+void UiLogic::saveTextFile(const QString &desc, const QString &suggestedName, QString ext, const QString &data)
 {
 #ifdef Q_OS_IOS
     shareTempFile(suggestedName, ext, data);
@@ -429,17 +418,19 @@ void UiLogic::saveTextFile(const QString& desc, const QString& suggestedName, QS
     QString docDir = QStandardPaths::writableLocation(QStandardPaths::DocumentsLocation);
     QUrl fileName;
 #ifdef AMNEZIA_DESKTOP
-    fileName = QFileDialog::getSaveFileUrl(nullptr, desc,
-        QUrl::fromLocalFile(docDir + "/" + suggestedName), "*" + ext);
-    if (fileName.isEmpty()) return;
-    if (!fileName.toString().endsWith(ext)) fileName = QUrl(fileName.toString() + ext);
+    fileName = QFileDialog::getSaveFileUrl(nullptr, desc, QUrl::fromLocalFile(docDir + "/" + suggestedName), "*" + ext);
+    if (fileName.isEmpty())
+        return;
+    if (!fileName.toString().endsWith(ext))
+        fileName = QUrl(fileName.toString() + ext);
 #elif defined Q_OS_ANDROID
     qDebug() << "UiLogic::shareConfig" << data;
     AndroidController::instance()->shareConfig(data, suggestedName);
     return;
 #endif
 
-    if (fileName.isEmpty()) return;
+    if (fileName.isEmpty())
+        return;
 
 #ifdef AMNEZIA_DESKTOP
     QFile save(fileName.toLocalFile());
@@ -458,11 +449,13 @@ void UiLogic::saveTextFile(const QString& desc, const QString& suggestedName, QS
 void UiLogic::saveBinaryFile(const QString &desc, QString ext, const QString &data)
 {
     ext.replace("*", "");
-    QString fileName = QFileDialog::getSaveFileName(nullptr, desc,
-        QStandardPaths::writableLocation(QStandardPaths::DocumentsLocation), "*" + ext);
+    QString fileName = QFileDialog::getSaveFileName(
+            nullptr, desc, QStandardPaths::writableLocation(QStandardPaths::DocumentsLocation), "*" + ext);
 
-    if (fileName.isEmpty()) return;
-    if (!fileName.endsWith(ext)) fileName.append(ext);
+    if (fileName.isEmpty())
+        return;
+    if (!fileName.endsWith(ext))
+        fileName.append(ext);
 
     QFile save(fileName);
     save.open(QIODevice::WriteOnly);
@@ -478,12 +471,15 @@ void UiLogic::copyToClipboard(const QString &text)
     qApp->clipboard()->setText(text);
 }
 
-void UiLogic::shareTempFile(const QString &suggestedName, QString ext, const QString& data) {
+void UiLogic::shareTempFile(const QString &suggestedName, QString ext, const QString &data)
+{
     ext.replace("*", "");
     QString fileName = QDir::tempPath() + "/" + suggestedName;
 
-    if (fileName.isEmpty()) return;
-    if (!fileName.endsWith(ext)) fileName.append(ext);
+    if (fileName.isEmpty())
+        return;
+    if (!fileName.endsWith(ext))
+        fileName.append(ext);
 
     QFile::remove(fileName);
 
@@ -497,14 +493,14 @@ void UiLogic::shareTempFile(const QString &suggestedName, QString ext, const QSt
     MobileUtils::shareText(filesToSend);
 }
 
-QString UiLogic::getOpenFileName(QWidget *parent, const QString &caption, const QString &dir,
-    const QString &filter, QString *selectedFilter, QFileDialog::Options options)
+QString UiLogic::getOpenFileName(QWidget *parent, const QString &caption, const QString &dir, const QString &filter,
+                                 QString *selectedFilter, QFileDialog::Options options)
 {
     QString fileName = QFileDialog::getOpenFileName(parent, caption, dir, filter, selectedFilter, options);
 
 #ifdef Q_OS_ANDROID
     // patch for files containing spaces etc
-    const QString sep {"raw%3A%2F"};
+    const QString sep { "raw%3A%2F" };
     if (fileName.startsWith("content://") && fileName.contains(sep)) {
         QString contentUrl = fileName.split(sep).at(0);
         QString rawUrl = fileName.split(sep).at(1);
@@ -590,7 +586,8 @@ ErrorCode UiLogic::addAlreadyInstalledContainersGui(bool &isServerCreated)
         }
 
         if (createNewServer) {
-            server.insert(config_key::defaultContainer, ContainerProps::containerToString(installedContainers.firstKey()));
+            server.insert(config_key::defaultContainer,
+                          ContainerProps::containerToString(installedContainers.firstKey()));
             m_settings->addServer(server);
             m_settings->setDefaultServer(m_settings->serversCount() - 1);
             isServerCreated = true;

From b9a13d3a3243c4d00f69206a3e7958362c9ca3f0 Mon Sep 17 00:00:00 2001
From: "vladimir.kuznetsov" <nethiuswork@gmail.com>
Date: Mon, 24 Jul 2023 16:33:58 +0900
Subject: [PATCH 047/278] changed all text to english

---
 .../ConnectionTypeSelectionDrawer.qml         |  6 ++---
 client/ui/qml/Pages2/PageDeinstalling.qml     |  2 +-
 client/ui/qml/Pages2/PageHome.qml             |  2 +-
 .../ui/qml/Pages2/PageSettingsServerData.qml  |  6 ++---
 .../ui/qml/Pages2/PageSettingsServersList.qml |  2 +-
 .../Pages2/PageSetupWizardConfigSource.qml    | 23 ++++++-------------
 .../qml/Pages2/PageSetupWizardInstalling.qml  |  4 ++--
 .../PageSetupWizardProtocolSettings.qml       |  6 ++---
 .../qml/Pages2/PageSetupWizardProtocols.qml   |  4 ++--
 client/ui/qml/Pages2/PageSetupWizardStart.qml |  7 +++---
 10 files changed, 26 insertions(+), 36 deletions(-)

diff --git a/client/ui/qml/Components/ConnectionTypeSelectionDrawer.qml b/client/ui/qml/Components/ConnectionTypeSelectionDrawer.qml
index 71299b1f..8b377600 100644
--- a/client/ui/qml/Components/ConnectionTypeSelectionDrawer.qml
+++ b/client/ui/qml/Components/ConnectionTypeSelectionDrawer.qml
@@ -28,7 +28,7 @@ DrawerType {
             Layout.bottomMargin: 32
             Layout.alignment: Qt.AlignHCenter
 
-            text: "Данные для подключения"
+            text: qsTr("Connection data")
             wrapMode: Text.WordWrap
         }
 
@@ -37,7 +37,7 @@ DrawerType {
             Layout.fillWidth: true
             Layout.topMargin: 16
 
-            text: "IP, логин и пароль от сервера"
+            text: qsTr("Server IP, login and password")
             rightImageSource: "qrc:/images/controls/chevron-right.svg"
 
             clickedFunction: function() {
@@ -51,7 +51,7 @@ DrawerType {
         LabelWithButtonType {
             Layout.fillWidth: true
 
-            text: "QR-код, ключ или файл настроек"
+            text: qsTr("QR code, key or configuration file")
             rightImageSource: "qrc:/images/controls/chevron-right.svg"
 
             clickedFunction: function() {
diff --git a/client/ui/qml/Pages2/PageDeinstalling.qml b/client/ui/qml/Pages2/PageDeinstalling.qml
index 1dc542e0..49bcdb9a 100644
--- a/client/ui/qml/Pages2/PageDeinstalling.qml
+++ b/client/ui/qml/Pages2/PageDeinstalling.qml
@@ -81,7 +81,7 @@ PageType {
                             Layout.fillWidth: true
                             Layout.topMargin: 8
 
-                            text: "Обычно это занимает не больше 5 минут"
+                            text: qsTr("Usually it takes no more than 5 minutes")
                         }
                     }
                 }
diff --git a/client/ui/qml/Pages2/PageHome.qml b/client/ui/qml/Pages2/PageHome.qml
index b7d44c78..76b9f94b 100644
--- a/client/ui/qml/Pages2/PageHome.qml
+++ b/client/ui/qml/Pages2/PageHome.qml
@@ -163,7 +163,7 @@ PageType {
 
                     text: root.currentContainerName
                     textColor: "#0E0E11"
-                    headerText: qsTr("Протокол подключения")
+                    headerText: qsTr("Connection protocol")
                     headerBackButtonImage: "qrc:/images/controls/arrow-left.svg"
 
                     rootButtonClickedFunction: function() {
diff --git a/client/ui/qml/Pages2/PageSettingsServerData.qml b/client/ui/qml/Pages2/PageSettingsServerData.qml
index c5af47e0..20afecd2 100644
--- a/client/ui/qml/Pages2/PageSettingsServerData.qml
+++ b/client/ui/qml/Pages2/PageSettingsServerData.qml
@@ -22,7 +22,7 @@ PageType {
             if (isInstalledContainerFound) {
                 message = qsTr("All installed containers have been added to the application")
             } else {
-                message = qsTr("Не найдено установленных контейнеров")
+                message = qsTr("No installed containers found")
             }
 
             PageController.showErrorMessage(message)
@@ -84,8 +84,8 @@ PageType {
                 visible: content.isServerWithWriteAccess
                 Layout.fillWidth: true
 
-                text: qsTr("Проверить сервер на наличие ранее установленных сервисов Amnezia")
-                descriptionText: qsTr("Добавим их в приложение, если они не отображались")
+                text: qsTr("Check the server for previously installed Amnesia services")
+                descriptionText: qsTr("Add them to the application if they were not displayed")
 
                 clickedFunction: function() {
                     PageController.showBusyIndicator(true)
diff --git a/client/ui/qml/Pages2/PageSettingsServersList.qml b/client/ui/qml/Pages2/PageSettingsServersList.qml
index 4c6a9839..496ed370 100644
--- a/client/ui/qml/Pages2/PageSettingsServersList.qml
+++ b/client/ui/qml/Pages2/PageSettingsServersList.qml
@@ -36,7 +36,7 @@ PageType {
 
             actionButtonImage: "qrc:/images/controls/plus.svg"
 
-            headerText: "Серверы"
+            headerText: qsTr("Servers")
 
             actionButtonFunction: function() {
                 connectionTypeSelection.visible = true
diff --git a/client/ui/qml/Pages2/PageSetupWizardConfigSource.qml b/client/ui/qml/Pages2/PageSetupWizardConfigSource.qml
index 78bd7486..ae24c942 100644
--- a/client/ui/qml/Pages2/PageSetupWizardConfigSource.qml
+++ b/client/ui/qml/Pages2/PageSetupWizardConfigSource.qml
@@ -38,9 +38,9 @@ PageType {
                 Layout.rightMargin: 16
                 Layout.leftMargin: 16
 
-                headerText: "Подключение к серверу"
-                descriptionText: "Не используйте код подключения из публичных источников. Его могли создать, чтобы перехватывать ваши данные.\n
-Всё в порядке, если код передал друг."
+                headerText: qsTr("Server connection")
+                descriptionText: qsTr("Do not use connection code from public sources. It may have been created to intercept your data.\n
+It's okay if a friend passed the code.")
             }
 
             Header2TextType {
@@ -49,30 +49,21 @@ PageType {
                 Layout.rightMargin: 16
                 Layout.leftMargin: 16
 
-                text: "Что у вас есть?"
+                text: qsTr("What do you have?")
             }
 
             LabelWithButtonType {
                 Layout.fillWidth: true
                 Layout.topMargin: 16
 
-                text: "Файл с настройками подключения"
+                text: qsTr("File with connection settings")
                 rightImageSource: "qrc:/images/controls/chevron-right.svg"
                 leftImageSource: "qrc:/images/controls/folder-open.svg"
 
                 clickedFunction: function() {
-//                    onClicked: fileDialog.open()
                     ImportController.extractConfigFromFile()
                     goToPage(PageEnum.PageSetupWizardViewConfig)
                 }
-
-//                FileDialog {
-//                    id: fileDialog
-//                    onAccepted: {
-//                        ImportController.extractConfigFromFile(selectedFile)
-//                        goToPage(PageEnum.PageSetupWizardViewConfig)
-//                    }
-//                }
             }
 
             DividerType {}
@@ -81,7 +72,7 @@ PageType {
             LabelWithButtonType {
                 Layout.fillWidth: true
 
-                text: "QR-код"
+                text: qsTr("QR-code")
                 rightImageSource: "qrc:/images/controls/chevron-right.svg"
                 leftImageSource: "qrc:/images/controls/qr-code.svg"
 
@@ -96,7 +87,7 @@ PageType {
             LabelWithButtonType {
                 Layout.fillWidth: true
 
-                text: "Ключ в виде текста"
+                text: qsTr("Key as text")
                 rightImageSource: "qrc:/images/controls/chevron-right.svg"
                 leftImageSource: "qrc:/images/controls/text-cursor.svg"
 
diff --git a/client/ui/qml/Pages2/PageSetupWizardInstalling.qml b/client/ui/qml/Pages2/PageSetupWizardInstalling.qml
index 2f07db18..a0fdf7be 100644
--- a/client/ui/qml/Pages2/PageSetupWizardInstalling.qml
+++ b/client/ui/qml/Pages2/PageSetupWizardInstalling.qml
@@ -116,7 +116,7 @@ PageType {
                             Layout.fillWidth: true
                             Layout.topMargin: 20
 
-                            headerText: "Установка"
+                            headerText: qsTr("Installing")
                             descriptionText: name
                         }
 
@@ -142,7 +142,7 @@ PageType {
                             Layout.fillWidth: true
                             Layout.topMargin: 8
 
-                            text: "Обычно это занимает не больше 5 минут"
+                            text: qsTr("Usually it takes no more than 5 minutes")
                         }
                     }
                 }
diff --git a/client/ui/qml/Pages2/PageSetupWizardProtocolSettings.qml b/client/ui/qml/Pages2/PageSetupWizardProtocolSettings.qml
index e593393c..29067cb2 100644
--- a/client/ui/qml/Pages2/PageSetupWizardProtocolSettings.qml
+++ b/client/ui/qml/Pages2/PageSetupWizardProtocolSettings.qml
@@ -193,7 +193,7 @@ PageType {
 
                             Layout.topMargin: 16
 
-                            text: "Network protocol"
+                            text: qsTr("Network protocol")
                         }
 
                         TransportProtoSelector {
@@ -209,7 +209,7 @@ PageType {
                             Layout.fillWidth: true
                             Layout.topMargin: 16
 
-                            headerText: "Port"
+                            headerText: qsTr("Port")
                         }
 
                         Rectangle {
@@ -223,7 +223,7 @@ PageType {
                             Layout.fillWidth: true
                             Layout.bottomMargin: 32
 
-                            text: qsTr("Установить")
+                            text: qsTr("Install")
 
                             onClicked: function() {
                                 goToPage(PageEnum.PageSetupWizardInstalling);
diff --git a/client/ui/qml/Pages2/PageSetupWizardProtocols.qml b/client/ui/qml/Pages2/PageSetupWizardProtocols.qml
index 6a8e301f..f3de85b6 100644
--- a/client/ui/qml/Pages2/PageSetupWizardProtocols.qml
+++ b/client/ui/qml/Pages2/PageSetupWizardProtocols.qml
@@ -70,8 +70,8 @@ PageType {
 
                     width: parent.width
 
-                    headerText: "Протокол подключения"
-                    descriptionText: "Выберите более приоритетный для вас. Позже можно будет установить остальные протоколы и доп сервисы, вроде DNS-прокси и SFTP."
+                    headerText: qsTr("Connection protocol")
+                    descriptionText: qsTr("Choose the one with the highest priority for you. Later, you can install other protocols and additional services, such as DNS proxy and SFTP.")
                 }
             }
 
diff --git a/client/ui/qml/Pages2/PageSetupWizardStart.qml b/client/ui/qml/Pages2/PageSetupWizardStart.qml
index 750084c7..73438e34 100644
--- a/client/ui/qml/Pages2/PageSetupWizardStart.qml
+++ b/client/ui/qml/Pages2/PageSetupWizardStart.qml
@@ -58,7 +58,7 @@ PageType {
                 Layout.leftMargin: 16
                 Layout.rightMargin: 16
 
-                text: "Бесплатный сервис для создания личного VPN на вашем сервере. Помогаем получать доступ к заблокированному контенту, не раскрывая конфиденциальность даже провайдерам VPN."
+                text: qsTr("A free service to create a personal VPN on your server. We help you access blocked content without exposing your privacy even to VPN providers.")
             }
 
             BasicButtonType {
@@ -67,7 +67,7 @@ PageType {
                 Layout.leftMargin: 16
                 Layout.rightMargin: 16
 
-                text: qsTr("У меня есть данные для подключения")
+                text: qsTr("I have the data to connect")
 
                 onClicked: {
                     connectionTypeSelection.visible = true
@@ -87,10 +87,9 @@ PageType {
                 textColor: "#D7D8DB"
                 borderWidth: 1
 
-                text: qsTr("У меня ничего нет")
+                text: qsTr("I have nothing")
 
                 onClicked: {
-                    goToPage(PageEnum.PageTest)
                 }
             }
         }

From 0411792ca5c2e614b151c497f7ab5685aa7467c8 Mon Sep 17 00:00:00 2001
From: "vladimir.kuznetsov" <nethiuswork@gmail.com>
Date: Tue, 25 Jul 2023 16:56:10 +0900
Subject: [PATCH 048/278] added qr-code decoder for android - added color
 change for status and navigation bar for android

---
 client/ui/controllers/exportController.cpp    |  47 +++---
 client/ui/controllers/exportController.h      |   1 -
 client/ui/controllers/importController.cpp    | 138 +++++++++++++++---
 client/ui/controllers/importController.h      |  24 ++-
 client/ui/controllers/pageController.cpp      |  41 ++++++
 client/ui/controllers/pageController.h        |   3 +
 .../qml/Components/ShareConnectionDrawer.qml  |   4 +-
 client/ui/qml/Controls2/DrawerType.qml        |  14 ++
 .../Pages2/PageSetupWizardConfigSource.qml    |  10 +-
 .../qml/Pages2/PageSetupWizardInstalling.qml  |   3 +-
 .../qml/Pages2/PageSetupWizardViewConfig.qml  |   3 +-
 client/ui/qml/Pages2/PageStart.qml            |  24 ++-
 client/ui/qml/main2.qml                       |   1 +
 13 files changed, 255 insertions(+), 58 deletions(-)

diff --git a/client/ui/controllers/exportController.cpp b/client/ui/controllers/exportController.cpp
index 561222f2..6e4abb1f 100644
--- a/client/ui/controllers/exportController.cpp
+++ b/client/ui/controllers/exportController.cpp
@@ -202,31 +202,6 @@ QList<QString> ExportController::getQrCodes()
 }
 
 void ExportController::saveFile()
-{
-    QString fileExtension = ".vpn";
-    QString docDir = QStandardPaths::writableLocation(QStandardPaths::DocumentsLocation);
-    QUrl fileName;
-    fileName = QFileDialog::getSaveFileUrl(nullptr, tr("Save AmneziaVPN config"),
-                                           QUrl::fromLocalFile(docDir + "/" + "amnezia_config"), "*" + fileExtension);
-    if (fileName.isEmpty())
-        return;
-    if (!fileName.toString().endsWith(fileExtension)) {
-        fileName = QUrl(fileName.toString() + fileExtension);
-    }
-    if (fileName.isEmpty())
-        return;
-
-    QFile save(fileName.toLocalFile());
-
-    save.open(QIODevice::WriteOnly);
-    save.write(m_config.toUtf8());
-    save.close();
-
-    QFileInfo fi(fileName.toLocalFile());
-    QDesktopServices::openUrl(fi.absoluteDir().absolutePath());
-}
-
-void ExportController::shareFile()
 {
 #if defined Q_OS_IOS
     ext.replace("*", "");
@@ -253,6 +228,28 @@ void ExportController::shareFile()
     AndroidController::instance()->shareConfig(m_config, "amnezia_config");
     return;
 #endif
+
+    QString fileExtension = ".vpn";
+    QString docDir = QStandardPaths::writableLocation(QStandardPaths::DocumentsLocation);
+    QUrl fileName;
+    fileName = QFileDialog::getSaveFileUrl(nullptr, tr("Save AmneziaVPN config"),
+                                           QUrl::fromLocalFile(docDir + "/" + "amnezia_config"), "*" + fileExtension);
+    if (fileName.isEmpty())
+        return;
+    if (!fileName.toString().endsWith(fileExtension)) {
+        fileName = QUrl(fileName.toString() + fileExtension);
+    }
+    if (fileName.isEmpty())
+        return;
+
+    QFile save(fileName.toLocalFile());
+
+    save.open(QIODevice::WriteOnly);
+    save.write(m_config.toUtf8());
+    save.close();
+
+    QFileInfo fi(fileName.toLocalFile());
+    QDesktopServices::openUrl(fi.absoluteDir().absolutePath());
 }
 
 QList<QString> ExportController::generateQrCodeImageSeries(const QByteArray &data)
diff --git a/client/ui/controllers/exportController.h b/client/ui/controllers/exportController.h
index 7af2cd85..84575079 100644
--- a/client/ui/controllers/exportController.h
+++ b/client/ui/controllers/exportController.h
@@ -36,7 +36,6 @@ public slots:
     QList<QString> getQrCodes();
 
     void saveFile();
-    void shareFile();
 
 signals:
     void generateConfig(int type);
diff --git a/client/ui/controllers/importController.cpp b/client/ui/controllers/importController.cpp
index 218f43cb..5711c3bd 100644
--- a/client/ui/controllers/importController.cpp
+++ b/client/ui/controllers/importController.cpp
@@ -41,6 +41,11 @@ namespace
         }
         return ConfigTypes::Amnezia;
     }
+
+#ifdef Q_OS_ANDROID
+    ImportController *mInstance = nullptr;
+    constexpr auto AndroidCameraActivity = "org.amnezia.vpn.qt.CameraActivity";
+#endif
 } // namespace
 
 ImportController::ImportController(const QSharedPointer<ServersModel> &serversModel,
@@ -49,6 +54,7 @@ ImportController::ImportController(const QSharedPointer<ServersModel> &serversMo
     : QObject(parent), m_serversModel(serversModel), m_containersModel(containersModel), m_settings(settings)
 {
 #ifdef Q_OS_ANDROID
+    mInstance = this;
     // Set security screen for Android app
     AndroidUtils::runOnAndroidThreadSync([]() {
         QJniObject activity = AndroidUtils::getActivity();
@@ -58,6 +64,18 @@ ImportController::ImportController(const QSharedPointer<ServersModel> &serversMo
             window.callMethod<void>("addFlags", "(I)V", FLAG_SECURE);
         }
     });
+
+    AndroidUtils::runOnAndroidThreadAsync([]() {
+        JNINativeMethod methods[] {
+            { "passDataToDecoder", "(Ljava/lang/String;)V", reinterpret_cast<void *>(onNewQrCodeDataChunk) },
+        };
+
+        QJniObject javaClass(AndroidCameraActivity);
+        QJniEnvironment env;
+        jclass objectClass = env->GetObjectClass(javaClass.object<jobject>());
+        env->RegisterNatives(objectClass, methods, sizeof(methods) / sizeof(methods[0]));
+        env->DeleteLocalRef(objectClass);
+    });
 #endif
 }
 
@@ -93,11 +111,21 @@ void ImportController::extractConfigFromCode(QString code)
     m_configFileName = "";
 }
 
-void ImportController::extractConfigFromQr()
+bool ImportController::extractConfigFromQr(const QByteArray &data)
 {
-#ifdef Q_OS_ANDROID
-    AndroidController::instance()->startQrReaderActivity();
-#endif
+    QJsonObject dataObj = QJsonDocument::fromJson(data).object();
+    if (!dataObj.isEmpty()) {
+        m_config = dataObj;
+        return true;
+    }
+
+    QByteArray ba_uncompressed = qUncompress(data);
+    if (!ba_uncompressed.isEmpty()) {
+        m_config = QJsonDocument::fromJson(ba_uncompressed).object();
+        return true;
+    }
+
+    return false;
 }
 
 QString ImportController::getConfig()
@@ -149,21 +177,6 @@ QJsonObject ImportController::extractAmneziaConfig(QString &data)
     return QJsonDocument::fromJson(ba).object();
 }
 
-// bool ImportController::importConnectionFromQr(const QByteArray &data)
-//{
-//     QJsonObject dataObj = QJsonDocument::fromJson(data).object();
-//     if (!dataObj.isEmpty()) {
-//         return importConnection(dataObj);
-//     }
-
-//    QByteArray ba_uncompressed = qUncompress(data);
-//    if (!ba_uncompressed.isEmpty()) {
-//        return importConnection(QJsonDocument::fromJson(ba_uncompressed).object());
-//    }
-
-//    return false;
-//}
-
 QJsonObject ImportController::extractOpenVpnConfig(const QString &data)
 {
     QJsonObject openVpnConfig;
@@ -251,3 +264,90 @@ QJsonObject ImportController::extractWireGuardConfig(const QString &data)
 
     return config;
 }
+
+#ifdef Q_OS_ANDROID
+void ImportController::startDecodingQr()
+{
+    AndroidController::instance()->startQrReaderActivity();
+}
+
+void ImportController::stopDecodingQr()
+{
+    QJniObject::callStaticMethod<void>(AndroidCameraActivity, "stopQrCodeReader", "()V");
+    emit qrDecodingFinished();
+}
+
+void ImportController::onNewQrCodeDataChunk(JNIEnv *env, jobject thiz, jstring data)
+{
+    Q_UNUSED(thiz);
+    const char *buffer = env->GetStringUTFChars(data, nullptr);
+    if (!buffer) {
+        return;
+    }
+
+    QString parcelBody(buffer);
+    env->ReleaseStringUTFChars(data, buffer);
+
+    if (mInstance != nullptr) {
+        if (!mInstance->m_isQrCodeProcessed) {
+            mInstance->m_qrCodeChunks.clear();
+            mInstance->m_isQrCodeProcessed = true;
+            mInstance->m_totalQrCodeChunksCount = 0;
+            mInstance->m_receivedQrCodeChunksCount = 0;
+        }
+        mInstance->parseQrCodeChunk(parcelBody);
+    }
+}
+
+void ImportController::parseQrCodeChunk(const QString &code)
+{
+    // qDebug() << code;
+    if (!m_isQrCodeProcessed)
+        return;
+
+    // check if chunk received
+    QByteArray ba = QByteArray::fromBase64(code.toUtf8(), QByteArray::Base64UrlEncoding | QByteArray::OmitTrailingEquals);
+    QDataStream s(&ba, QIODevice::ReadOnly);
+    qint16 magic;
+    s >> magic;
+
+    if (magic == amnezia::qrMagicCode) {
+        quint8 chunksCount;
+        s >> chunksCount;
+        if (m_totalQrCodeChunksCount != chunksCount) {
+            m_qrCodeChunks.clear();
+        }
+
+        m_totalQrCodeChunksCount = chunksCount;
+
+        quint8 chunkId;
+        s >> chunkId;
+        s >> m_qrCodeChunks[chunkId];
+        m_receivedQrCodeChunksCount = m_qrCodeChunks.size();
+
+        if (m_qrCodeChunks.size() == m_totalQrCodeChunksCount) {
+            QByteArray data;
+
+            for (int i = 0; i < m_totalQrCodeChunksCount; ++i) {
+                data.append(m_qrCodeChunks.value(i));
+            }
+
+            bool ok = extractConfigFromQr(data);
+            if (ok) {
+                m_isQrCodeProcessed = false;
+                stopDecodingQr();
+            } else {
+                m_qrCodeChunks.clear();
+                m_totalQrCodeChunksCount = 0;
+                m_receivedQrCodeChunksCount = 0;
+            }
+        }
+    } else {
+        bool ok = extractConfigFromQr(ba);
+        if (ok) {
+            m_isQrCodeProcessed = false;
+            stopDecodingQr();
+        }
+    }
+}
+#endif
diff --git a/client/ui/controllers/importController.h b/client/ui/controllers/importController.h
index 273b12a5..3bdb2252 100644
--- a/client/ui/controllers/importController.h
+++ b/client/ui/controllers/importController.h
@@ -7,6 +7,9 @@
 #include "core/defs.h"
 #include "ui/models/containers_model.h"
 #include "ui/models/servers_model.h"
+#ifdef Q_OS_ANDROID
+    #include "jni.h"
+#endif
 
 class ImportController : public QObject
 {
@@ -21,25 +24,44 @@ public slots:
     void extractConfigFromFile();
     void extractConfigFromData(QString &data);
     void extractConfigFromCode(QString code);
-    void extractConfigFromQr();
+    bool extractConfigFromQr(const QByteArray &data);
     QString getConfig();
     QString getConfigFileName();
 
+#if defined Q_OS_ANDROID
+    void startDecodingQr();
+#endif
+
 signals:
     void importFinished();
     void importErrorOccurred(QString errorMessage);
 
+    void qrDecodingFinished();
+
 private:
     QJsonObject extractAmneziaConfig(QString &data);
     QJsonObject extractOpenVpnConfig(const QString &data);
     QJsonObject extractWireGuardConfig(const QString &data);
 
+#if defined Q_OS_ANDROID
+    void stopDecodingQr();
+    static void onNewQrCodeDataChunk(JNIEnv *env, jobject thiz, jstring data);
+    void parseQrCodeChunk(const QString &code);
+#endif
+
     QSharedPointer<ServersModel> m_serversModel;
     QSharedPointer<ContainersModel> m_containersModel;
     std::shared_ptr<Settings> m_settings;
 
     QJsonObject m_config;
     QString m_configFileName;
+
+#if defined Q_OS_ANDROID
+    QMap<int, QByteArray> m_qrCodeChunks;
+    bool m_isQrCodeProcessed;
+    int m_totalQrCodeChunksCount;
+    int m_receivedQrCodeChunksCount;
+#endif
 };
 
 #endif // IMPORTCONTROLLER_H
diff --git a/client/ui/controllers/pageController.cpp b/client/ui/controllers/pageController.cpp
index 5abeb77f..36d5ba7c 100644
--- a/client/ui/controllers/pageController.cpp
+++ b/client/ui/controllers/pageController.cpp
@@ -1,10 +1,28 @@
 #include "pageController.h"
 
 #include <QApplication>
+#ifdef Q_OS_ANDROID
+    #include "../../platforms/android/androidutils.h"
+    #include <QJniObject>
+#endif
 
 PageController::PageController(const QSharedPointer<ServersModel> &serversModel, QObject *parent)
     : QObject(parent), m_serversModel(serversModel)
 {
+#ifdef Q_OS_ANDROID
+    // Change color of navigation and status bar's
+    auto initialPageNavigationBarColor = getInitialPageNavigationBarColor();
+    AndroidUtils::runOnAndroidThreadSync([&initialPageNavigationBarColor]() {
+        QJniObject activity = AndroidUtils::getActivity();
+        QJniObject window = activity.callObjectMethod("getWindow", "()Landroid/view/Window;");
+        if (window.isValid()) {
+            window.callMethod<void>("addFlags", "(I)V", 0x80000000);
+            window.callMethod<void>("clearFlags", "(I)V", 0x04000000);
+            window.callMethod<void>("setStatusBarColor", "(I)V", 0xFF0E0E11);
+            window.callMethod<void>("setNavigationBarColor", "(I)V", initialPageNavigationBarColor);
+        }
+    });
+#endif
 }
 
 QString PageController::getInitialPage()
@@ -47,3 +65,26 @@ void PageController::keyPressEvent(Qt::Key key)
     default: return;
     }
 }
+
+unsigned int PageController::getInitialPageNavigationBarColor()
+{
+    if (m_serversModel->getServersCount()) {
+        return 0xFF1C1D21;
+    } else {
+        return 0xFF0E0E11;
+    }
+}
+
+void PageController::updateNavigationBarColor(const int color)
+{
+#ifdef Q_OS_ANDROID
+    // Change color of navigation bar
+    AndroidUtils::runOnAndroidThreadSync([&color]() {
+        QJniObject activity = AndroidUtils::getActivity();
+        QJniObject window = activity.callObjectMethod("getWindow", "()Landroid/view/Window;");
+        if (window.isValid()) {
+            window.callMethod<void>("setNavigationBarColor", "(I)V", color);
+        }
+    });
+#endif
+}
diff --git a/client/ui/controllers/pageController.h b/client/ui/controllers/pageController.h
index e8452b45..8087d0fe 100644
--- a/client/ui/controllers/pageController.h
+++ b/client/ui/controllers/pageController.h
@@ -71,6 +71,9 @@ public slots:
     void closeWindow();
     void keyPressEvent(Qt::Key key);
 
+    unsigned int getInitialPageNavigationBarColor();
+    void updateNavigationBarColor(const int color);
+
 signals:
     void goToPageHome();
     void goToPageSettings();
diff --git a/client/ui/qml/Components/ShareConnectionDrawer.qml b/client/ui/qml/Components/ShareConnectionDrawer.qml
index 692289a8..f133f27a 100644
--- a/client/ui/qml/Components/ShareConnectionDrawer.qml
+++ b/client/ui/qml/Components/ShareConnectionDrawer.qml
@@ -54,10 +54,10 @@ DrawerType {
                     Layout.fillWidth: true
                     Layout.topMargin: 16
 
-                    text: Qt.platform.os === "android" ? qsTr("Share") : qsTr("Save connection code")
+                    text: qsTr("Share")
 
                     onClicked: {
-                        Qt.platform.os === "android" ? ExportController.shareFile() : ExportController.saveFile()
+                        ExportController.saveFile()
                     }
                 }
 
diff --git a/client/ui/qml/Controls2/DrawerType.qml b/client/ui/qml/Controls2/DrawerType.qml
index e3c9d588..97fbf034 100644
--- a/client/ui/qml/Controls2/DrawerType.qml
+++ b/client/ui/qml/Controls2/DrawerType.qml
@@ -12,6 +12,7 @@ Drawer {
             velocity: 4
         }
     }
+
     exit: Transition {
         SmoothedAnimation {
             velocity: 4
@@ -31,4 +32,17 @@ Drawer {
     Overlay.modal: Rectangle {
         color: Qt.rgba(14/255, 14/255, 17/255, 0.8)
     }
+
+    onAboutToShow: {
+        if (PageController.getInitialPageNavigationBarColor() !== 0xFF1C1D21) {
+            PageController.updateNavigationBarColor(0xFF1C1D21)
+        }
+    }
+
+    onClosed: {
+        var initialPageNavigationBarColor = PageController.getInitialPageNavigationBarColor()
+        if (initialPageNavigationBarColor !== 0xFF1C1D21) {
+            PageController.updateNavigationBarColor(initialPageNavigationBarColor)
+        }
+    }
 }
diff --git a/client/ui/qml/Pages2/PageSetupWizardConfigSource.qml b/client/ui/qml/Pages2/PageSetupWizardConfigSource.qml
index ae24c942..2d6b249d 100644
--- a/client/ui/qml/Pages2/PageSetupWizardConfigSource.qml
+++ b/client/ui/qml/Pages2/PageSetupWizardConfigSource.qml
@@ -13,6 +13,14 @@ import "../Config"
 PageType {
     id: root
 
+    Connections {
+        target: ImportController
+
+        function onQrDecodingFinished() {
+            goToPage(PageEnum.PageSetupWizardViewConfig)
+        }
+    }
+
     FlickableType {
         id: fl
         anchors.top: parent.top
@@ -77,7 +85,7 @@ It's okay if a friend passed the code.")
                 leftImageSource: "qrc:/images/controls/qr-code.svg"
 
                 clickedFunction: function() {
-                    ImportController.extractConfigFromQr()
+                    ImportController.startDecodingQr()
 //                    goToPage(PageEnum.PageSetupWizardQrReader)
                 }
             }
diff --git a/client/ui/qml/Pages2/PageSetupWizardInstalling.qml b/client/ui/qml/Pages2/PageSetupWizardInstalling.qml
index a0fdf7be..92c95108 100644
--- a/client/ui/qml/Pages2/PageSetupWizardInstalling.qml
+++ b/client/ui/qml/Pages2/PageSetupWizardInstalling.qml
@@ -47,8 +47,7 @@ PageType {
             } else if (stackView.currentItem.objectName === PageController.getPagePath(PageEnum.PageSettings)) {
                 goToPage(PageEnum.PageSettingsServersList, false)
             } else {
-                var pagePath = PageController.getPagePath(PageEnum.PageStart)
-                stackView.replace(pagePath, { "objectName" : pagePath })
+                PageController.replaceStartPage()
             }
 
             if (isInstalledContainerFound) {
diff --git a/client/ui/qml/Pages2/PageSetupWizardViewConfig.qml b/client/ui/qml/Pages2/PageSetupWizardViewConfig.qml
index e1b93302..372a5cde 100644
--- a/client/ui/qml/Pages2/PageSetupWizardViewConfig.qml
+++ b/client/ui/qml/Pages2/PageSetupWizardViewConfig.qml
@@ -30,8 +30,7 @@ PageType {
             } else if (stackView.currentItem.objectName === PageController.getPagePath(PageEnum.PageSettings)) {
                 goToPage(PageEnum.PageSettingsServersList, false)
             } else {
-                var pagePath = PageController.getPagePath(PageEnum.PageStart)
-                stackView.replace(pagePath, { "objectName" : pagePath })
+                PageController.replaceStartPage()
             }
         }
     }
diff --git a/client/ui/qml/Pages2/PageStart.qml b/client/ui/qml/Pages2/PageStart.qml
index 5d49abf7..f522bace 100644
--- a/client/ui/qml/Pages2/PageStart.qml
+++ b/client/ui/qml/Pages2/PageStart.qml
@@ -1,6 +1,7 @@
 import QtQuick
 import QtQuick.Controls
 import QtQuick.Layouts
+import QtQuick.Shapes
 
 import PageEnum 1.0
 
@@ -81,14 +82,27 @@ PageType {
         anchors.bottom: parent.bottom
 
         topPadding: 8
-        bottomPadding: 8//34
+        bottomPadding: 8
         leftPadding: shareTabButton.visible ? 96 : 128
         rightPadding: shareTabButton.visible ? 96 : 128
 
-        background: Rectangle {
-            border.width: 1
-            border.color: "#2C2D30"
-            color: "#1C1D21"
+        background: Shape {
+            width: parent.width
+            height: parent.height
+
+            ShapePath {
+                startX: 0
+                startY: 0
+
+                PathLine { x: width; y: 0 }
+                PathLine { x: width; y: height - 1 }
+                PathLine { x: 0; y: height - 1 }
+                PathLine { x: 0; y: 0 }
+
+                strokeWidth: 1
+                strokeColor: "#2C2D30"
+                fillColor: "#1C1D21"
+            }
         }
 
         TabImageButtonType {
diff --git a/client/ui/qml/main2.qml b/client/ui/qml/main2.qml
index d0f9880d..0b89d840 100644
--- a/client/ui/qml/main2.qml
+++ b/client/ui/qml/main2.qml
@@ -50,6 +50,7 @@ Window  {
             while (rootStackView.depth > 1) {
                 rootStackView.pop()
             }
+            PageController.updateNavigationBarColor(PageController.getInitialPageNavigationBarColor())
             rootStackView.replace(pagePath, { "objectName" : pagePath })
         }
 

From 1092abe776a89da2d482c5b6c929e196763c180e Mon Sep 17 00:00:00 2001
From: "vladimir.kuznetsov" <nethiuswork@gmail.com>
Date: Mon, 31 Jul 2023 00:13:08 +0900
Subject: [PATCH 049/278] added output of notifications/errors after
 installation/import

---
 client/protocols/ios_vpnprotocol.mm           | 50 ++++++------
 client/ui/controllers/exportController.cpp    | 38 ++++-----
 client/ui/controllers/importController.cpp    |  4 +-
 client/ui/controllers/installController.cpp   | 80 ++++++++++++++++---
 client/ui/controllers/installController.h     | 15 +++-
 client/ui/controllers/pageController.h        |  2 +-
 .../protocolSettingsController.cpp            | 15 ----
 .../controllers/protocolSettingsController.h  | 31 -------
 client/ui/controllers/settingsController.cpp  | 11 ++-
 client/ui/controllers/settingsController.h    |  3 +
 client/ui/models/containers_model.cpp         | 39 +++++----
 client/ui/models/containers_model.h           | 11 ++-
 client/ui/models/protocols_model.cpp          |  2 +
 client/ui/models/protocols_model.h            |  1 +
 client/ui/models/servers_model.cpp            | 31 ++++++-
 client/ui/models/servers_model.h              |  7 ++
 .../qml/Components/HomeContainersListView.qml |  6 --
 .../qml/Components/SelectLanguageDrawer.qml   |  2 +-
 client/ui/qml/Controls2/CheckBoxType.qml      | 28 ++++++-
 .../qml/Controls2/HorizontalRadioButton.qml   | 53 ++++++------
 client/ui/qml/Controls2/PopupType.qml         | 54 ++++++++-----
 client/ui/qml/Controls2/SwitcherType.qml      | 26 ++++--
 client/ui/qml/Pages2/PageHome.qml             | 34 ++------
 .../Pages2/PageProtocolOpenVpnSettings.qml    |  5 +-
 client/ui/qml/Pages2/PageProtocolRaw.qml      | 19 ++++-
 .../ui/qml/Pages2/PageServiceSftpSettings.qml |  4 +-
 .../Pages2/PageServiceTorWebsiteSettings.qml  |  4 +-
 .../ui/qml/Pages2/PageSettingsApplication.qml |  1 +
 client/ui/qml/Pages2/PageSettingsBackup.qml   | 18 +++++
 client/ui/qml/Pages2/PageSettingsDns.qml      |  6 ++
 .../ui/qml/Pages2/PageSettingsServerData.qml  | 39 ++++++---
 .../ui/qml/Pages2/PageSettingsServerInfo.qml  |  1 +
 .../qml/Pages2/PageSettingsServerProtocol.qml | 32 +++++---
 .../qml/Pages2/PageSetupWizardInstalling.qml  | 15 +---
 .../PageSetupWizardProtocolSettings.qml       |  9 ++-
 client/ui/qml/Pages2/PageSetupWizardStart.qml | 17 ----
 client/ui/qml/Pages2/PageShare.qml            |  3 +-
 client/ui/qml/Pages2/PageStart.qml            | 28 ++-----
 client/ui/qml/main2.qml                       | 47 +++++++++++
 39 files changed, 488 insertions(+), 303 deletions(-)
 delete mode 100644 client/ui/controllers/protocolSettingsController.cpp
 delete mode 100644 client/ui/controllers/protocolSettingsController.h

diff --git a/client/protocols/ios_vpnprotocol.mm b/client/protocols/ios_vpnprotocol.mm
index f71db34a..2195dbdd 100644
--- a/client/protocols/ios_vpnprotocol.mm
+++ b/client/protocols/ios_vpnprotocol.mm
@@ -136,7 +136,7 @@ void IOSVpnProtocol::stop()
     
     [m_controller disconnect];
     
-    emit connectionStateChanged(Disconnected);
+    emit connectionStateChanged(Vpn::ConnectionState::Disconnected);
     
     [m_controller dealloc];
     m_controller = nullptr;
@@ -264,7 +264,7 @@ void IOSVpnProtocol::setupWireguardProtocol(const QJsonObject& rawConfig)
                 [m_controller dealloc];
                 m_controller = nullptr;
                 dispatch_async(dispatch_get_main_queue(), ^{
-                    emit connectionStateChanged(VpnConnectionState::Error);
+                    emit connectionStateChanged(Vpn::ConnectionState::Error);
                     m_isChangingState = false;
                 });
                 return;
@@ -272,7 +272,7 @@ void IOSVpnProtocol::setupWireguardProtocol(const QJsonObject& rawConfig)
             case ConnectionStateConnected: {
                 Q_ASSERT(date);
                 dispatch_async(dispatch_get_main_queue(), ^{
-                    emit connectionStateChanged(VpnConnectionState::Connected);
+                    emit connectionStateChanged(Vpn::ConnectionState::Connected);
                     m_isChangingState = false;
                 });
                 return;
@@ -280,7 +280,7 @@ void IOSVpnProtocol::setupWireguardProtocol(const QJsonObject& rawConfig)
             case ConnectionStateDisconnected:
                 [m_controller disconnect];
                 dispatch_async(dispatch_get_main_queue(), ^{
-                    emit connectionStateChanged(VpnConnectionState::Disconnected);
+                    emit connectionStateChanged(Vpn::ConnectionState::Disconnected);
                     m_isChangingState = false;
                 });
                 return;
@@ -294,13 +294,13 @@ void IOSVpnProtocol::setupWireguardProtocol(const QJsonObject& rawConfig)
         qDebug() << "State changed: " << a_connected;
         if (a_connected) {
             dispatch_async(dispatch_get_main_queue(), ^{
-                emit connectionStateChanged(Connected);
+                emit connectionStateChanged(Vpn::ConnectionState::Connected);
                 m_isChangingState = false;
             });
             return;
         }
         dispatch_async(dispatch_get_main_queue(), ^{
-            emit connectionStateChanged(Disconnected);
+            emit connectionStateChanged(Vpn::ConnectionState::Disconnected);
             m_isChangingState = false;
         });
     }];
@@ -325,7 +325,7 @@ void IOSVpnProtocol::setupCloakProtocol(const QJsonObject &rawConfig)
                 [m_controller dealloc];
                 m_controller = nullptr;
                 dispatch_async(dispatch_get_main_queue(), ^{
-                    emit connectionStateChanged(VpnConnectionState::Error);
+                    emit connectionStateChanged(Vpn::ConnectionState::Error);
                     m_isChangingState = false;
                 });
                 return;
@@ -333,7 +333,7 @@ void IOSVpnProtocol::setupCloakProtocol(const QJsonObject &rawConfig)
             case ConnectionStateConnected: {
                 Q_ASSERT(date);
                 dispatch_async(dispatch_get_main_queue(), ^{
-                    emit connectionStateChanged(VpnConnectionState::Connected);
+                    emit connectionStateChanged(Vpn::ConnectionState::Connected);
                     m_isChangingState = false;
                 });
                 return;
@@ -341,7 +341,7 @@ void IOSVpnProtocol::setupCloakProtocol(const QJsonObject &rawConfig)
             case ConnectionStateDisconnected:
                 // Just in case we are connecting, let's call disconnect.
                 dispatch_async(dispatch_get_main_queue(), ^{
-                    emit connectionStateChanged(VpnConnectionState::Disconnected);
+                    emit connectionStateChanged(Vpn::ConnectionState::Disconnected);
                     m_isChangingState = false;
                 });
                 return;
@@ -355,13 +355,13 @@ void IOSVpnProtocol::setupCloakProtocol(const QJsonObject &rawConfig)
         qDebug() << "VPN State changed: " << a_connected;
         if (a_connected) {
             dispatch_async(dispatch_get_main_queue(), ^{
-                emit connectionStateChanged(Connected);
+                emit connectionStateChanged(Vpn::ConnectionState::Connected);
                 m_isChangingState = false;
             });
             return;
         }
         dispatch_async(dispatch_get_main_queue(), ^{
-            emit connectionStateChanged(Disconnected);
+            emit connectionStateChanged(Vpn::ConnectionState::Disconnected);
             m_isChangingState = false;
         });
     }];
@@ -388,7 +388,7 @@ void IOSVpnProtocol::setupOpenVPNProtocol(const QJsonObject &rawConfig)
                 [m_controller dealloc];
                 m_controller = nullptr;
                 dispatch_async(dispatch_get_main_queue(), ^{
-                    emit connectionStateChanged(VpnConnectionState::Error);
+                    emit connectionStateChanged(Vpn::ConnectionState::Error);
                     m_isChangingState = false;
                 });
                 return;
@@ -396,7 +396,7 @@ void IOSVpnProtocol::setupOpenVPNProtocol(const QJsonObject &rawConfig)
             case ConnectionStateConnected: {
                 Q_ASSERT(date);
                 dispatch_async(dispatch_get_main_queue(), ^{
-                    emit connectionStateChanged(VpnConnectionState::Connected);
+                    emit connectionStateChanged(Vpn::ConnectionState::Connected);
                     m_isChangingState = false;
                 });
                 return;
@@ -404,7 +404,7 @@ void IOSVpnProtocol::setupOpenVPNProtocol(const QJsonObject &rawConfig)
             case ConnectionStateDisconnected:
                 // Just in case we are connecting, let's call disconnect.
                 dispatch_async(dispatch_get_main_queue(), ^{
-                    emit connectionStateChanged(VpnConnectionState::Disconnected);
+                    emit connectionStateChanged(Vpn::ConnectionState::Disconnected);
                     m_isChangingState = false;
                 });
                 return;
@@ -418,13 +418,13 @@ void IOSVpnProtocol::setupOpenVPNProtocol(const QJsonObject &rawConfig)
         qDebug() << "VPN State changed: " << a_connected;
         if (a_connected) {
             dispatch_async(dispatch_get_main_queue(), ^{
-                emit connectionStateChanged(Connected);
+                emit connectionStateChanged(Vpn::ConnectionState::Connected);
                 m_isChangingState = false;
             });
             return;
         }
         dispatch_async(dispatch_get_main_queue(), ^{
-            emit connectionStateChanged(Disconnected);
+            emit connectionStateChanged(Vpn::ConnectionState::Disconnected);
             m_isChangingState = false;
         });
     }];
@@ -452,7 +452,7 @@ void IOSVpnProtocol::setupShadowSocksProtocol(const QJsonObject &rawConfig)
                 [m_controller dealloc];
                 m_controller = nullptr;
                 dispatch_async(dispatch_get_main_queue(), ^{
-                    emit connectionStateChanged(VpnConnectionState::Error);
+                    emit connectionStateChanged(Vpn::ConnectionState::Error);
                     m_isChangingState = false;
                 });
                 return;
@@ -460,7 +460,7 @@ void IOSVpnProtocol::setupShadowSocksProtocol(const QJsonObject &rawConfig)
             case ConnectionStateConnected: {
                 Q_ASSERT(date);
                 dispatch_async(dispatch_get_main_queue(), ^{
-                    emit connectionStateChanged(VpnConnectionState::Connected);
+                    emit connectionStateChanged(Vpn::ConnectionState::Connected);
                     m_isChangingState = false;
                 });
                 return;
@@ -468,7 +468,7 @@ void IOSVpnProtocol::setupShadowSocksProtocol(const QJsonObject &rawConfig)
             case ConnectionStateDisconnected:
                 // Just in case we are connecting, let's call disconnect.
                 dispatch_async(dispatch_get_main_queue(), ^{
-                    emit connectionStateChanged(VpnConnectionState::Disconnected);
+                    emit connectionStateChanged(Vpn::ConnectionState::Disconnected);
                     m_isChangingState = false;
                 });
                 return;
@@ -482,13 +482,13 @@ void IOSVpnProtocol::setupShadowSocksProtocol(const QJsonObject &rawConfig)
         qDebug() << "SS State changed: " << a_connected;
         if (a_connected) {
             dispatch_async(dispatch_get_main_queue(), ^{
-                emit connectionStateChanged(Connected);
+                emit connectionStateChanged(Vpn::ConnectionState::Connected);
                 m_isChangingState = false;
             });
             return;
         }
             dispatch_async(dispatch_get_main_queue(), ^{
-                emit connectionStateChanged(Disconnected);
+                emit connectionStateChanged(Vpn::ConnectionState::Disconnected);
                 m_isChangingState = false;
             });
     }];
@@ -539,7 +539,7 @@ void IOSVpnProtocol::launchWireguardTunnel(const QJsonObject &rawConfig)
                        failureCallback:^() {
         qDebug() << "Wireguard Protocol - connection failed";
         dispatch_async(dispatch_get_main_queue(), ^{
-            emit connectionStateChanged(Disconnected);
+            emit connectionStateChanged(Vpn::ConnectionState::Disconnected);
             m_isChangingState = false;
         });
     }];
@@ -590,7 +590,7 @@ void IOSVpnProtocol::launchCloakTunnel(const QJsonObject &rawConfig)
                         failureCallback:^{
         qDebug() << "IOSVPNProtocol (OpenVPN Cloak) - connection failed";
         dispatch_async(dispatch_get_main_queue(), ^{
-            emit connectionStateChanged(Disconnected);
+            emit connectionStateChanged(Vpn::ConnectionState::Disconnected);
             m_isChangingState = false;
         });
     }];
@@ -607,7 +607,7 @@ void IOSVpnProtocol::launchOpenVPNTunnel(const QJsonObject &rawConfig)
                         failureCallback:^{
         qDebug() << "IOSVPNProtocol (OpenVPN) - connection failed";
         dispatch_async(dispatch_get_main_queue(), ^{
-            emit connectionStateChanged(Disconnected);
+            emit connectionStateChanged(Vpn::ConnectionState::Disconnected);
             m_isChangingState = false;
         });
     }];
@@ -624,7 +624,7 @@ void IOSVpnProtocol::launchShadowSocksTunnel(const QJsonObject &rawConfig) {
                       failureCallback:^{
         qDebug() << "IOSVPNProtocol (ShadowSocks) - connection failed";
         dispatch_async(dispatch_get_main_queue(), ^{
-            emit connectionStateChanged(Disconnected);
+            emit connectionStateChanged(Vpn::ConnectionState::Disconnected);
             m_isChangingState = false;
         });
     }];
diff --git a/client/ui/controllers/exportController.cpp b/client/ui/controllers/exportController.cpp
index 6e4abb1f..8fbd69f1 100644
--- a/client/ui/controllers/exportController.cpp
+++ b/client/ui/controllers/exportController.cpp
@@ -204,25 +204,25 @@ QList<QString> ExportController::getQrCodes()
 void ExportController::saveFile()
 {
 #if defined Q_OS_IOS
-    ext.replace("*", "");
-    QString fileName = QDir::tempPath() + "/" + suggestedName;
-
-    if (fileName.isEmpty())
-        return;
-    if (!fileName.endsWith(ext))
-        fileName.append(ext);
-
-    QFile::remove(fileName);
-
-    QFile save(fileName);
-    save.open(QIODevice::WriteOnly);
-    save.write(data.toUtf8());
-    save.close();
-
-    QStringList filesToSend;
-    filesToSend.append(fileName);
-    MobileUtils::shareText(filesToSend);
-    return;
+//    ext.replace("*", "");
+//    QString fileName = QDir::tempPath() + "/" + suggestedName;
+//
+//    if (fileName.isEmpty())
+//        return;
+//    if (!fileName.endsWith(ext))
+//        fileName.append(ext);
+//
+//    QFile::remove(fileName);
+//
+//    QFile save(fileName);
+//    save.open(QIODevice::WriteOnly);
+//    save.write(data.toUtf8());
+//    save.close();
+//
+//    QStringList filesToSend;
+//    filesToSend.append(fileName);
+//    MobileUtils::shareText(filesToSend);
+//    return;
 #endif
 #if defined Q_OS_ANDROID
     AndroidController::instance()->shareConfig(m_config, "amnezia_config");
diff --git a/client/ui/controllers/importController.cpp b/client/ui/controllers/importController.cpp
index 5711c3bd..8e2ad5d1 100644
--- a/client/ui/controllers/importController.cpp
+++ b/client/ui/controllers/importController.cpp
@@ -149,9 +149,7 @@ void ImportController::importConfig()
     if (credentials.isValid() || m_config.contains(config_key::containers)) {
         m_serversModel->addServer(m_config);
 
-        if (!m_config.value(config_key::containers).toArray().isEmpty()) {
-            m_serversModel->setDefaultServerIndex(m_serversModel->getServersCount() - 1);
-        }
+        m_serversModel->setDefaultServerIndex(m_serversModel->getServersCount() - 1);
 
         emit importFinished();
     } else {
diff --git a/client/ui/controllers/installController.cpp b/client/ui/controllers/installController.cpp
index 68e47a89..be235e42 100644
--- a/client/ui/controllers/installController.cpp
+++ b/client/ui/controllers/installController.cpp
@@ -88,14 +88,20 @@ void InstallController::installServer(DockerContainer container, QJsonObject &co
     QMap<DockerContainer, QJsonObject> installedContainers;
     ErrorCode errorCode =
             serverController.getAlreadyInstalledContainers(m_currentlyInstalledServerCredentials, installedContainers);
+
+    QString finishMessage = "";
+
     if (!installedContainers.contains(container)) {
         errorCode = serverController.setupContainer(m_currentlyInstalledServerCredentials, container, config);
         installedContainers.insert(container, config);
+        finishMessage = ContainerProps::containerHumanNames().value(container) + tr(" installed successfully. ");
+    } else {
+        finishMessage =
+                ContainerProps::containerHumanNames().value(container) + tr(" is already installed on the server. ");
     }
-
-    bool isInstalledContainerFound = false;
-    if (!installedContainers.isEmpty()) {
-        isInstalledContainerFound = true;
+    if (installedContainers.size() > 1) {
+        finishMessage += tr("\nAlready installed containers were found on the server. "
+                            "All installed containers have been added to the application");
     }
 
     if (errorCode == ErrorCode::NoError) {
@@ -117,7 +123,7 @@ void InstallController::installServer(DockerContainer container, QJsonObject &co
         m_serversModel->addServer(server);
         m_serversModel->setDefaultServerIndex(m_serversModel->getServersCount() - 1);
 
-        emit installServerFinished(false); // todo incorrect notification about found containers
+        emit installServerFinished(finishMessage);
         return;
     }
 
@@ -135,16 +141,19 @@ void InstallController::installContainer(DockerContainer container, QJsonObject
     QMap<DockerContainer, QJsonObject> installedContainers;
     ErrorCode errorCode = serverController.getAlreadyInstalledContainers(serverCredentials, installedContainers);
 
-    bool isInstalledContainerFound = false;
-    if (!installedContainers.isEmpty()) {
-        isInstalledContainerFound = true;
-    }
+    QString finishMessage = "";
 
     if (!installedContainers.contains(container)) {
         errorCode = serverController.setupContainer(serverCredentials, container, config);
         installedContainers.insert(container, config);
+        finishMessage = ContainerProps::containerHumanNames().value(container) + tr(" installed successfully. ");
+    } else {
+        finishMessage =
+                ContainerProps::containerHumanNames().value(container) + tr(" is already installed on the server. ");
     }
 
+    bool isInstalledContainerAddedToGui = false;
+
     if (errorCode == ErrorCode::NoError) {
         for (auto iterator = installedContainers.begin(); iterator != installedContainers.end(); iterator++) {
             auto modelIndex = m_containersModel->index(iterator.key());
@@ -153,10 +162,17 @@ void InstallController::installContainer(DockerContainer container, QJsonObject
             if (containerConfig.isEmpty()) {
                 m_containersModel->setData(m_containersModel->index(iterator.key()), iterator.value(),
                                            ContainersModel::Roles::ConfigRole);
+                if (container != iterator.key()) { // skip the newly installed container
+                    isInstalledContainerAddedToGui = true;
+                }
             }
         }
+        if (isInstalledContainerAddedToGui) {
+            finishMessage += tr("\nAlready installed containers were found on the server. "
+                                "All installed containers have been added to the application");
+        }
 
-        emit installContainerFinished(false); // todo incorrect notification about found containers
+        emit installContainerFinished(finishMessage);
         return;
     }
 
@@ -233,11 +249,55 @@ void InstallController::updateContainer(QJsonObject config)
     emit installationErrorOccurred(errorString(errorCode));
 }
 
+void InstallController::removeCurrentlyProcessedServer()
+{
+    int serverIndex = m_serversModel->getCurrentlyProcessedServerIndex();
+    QString serverName = m_serversModel->data(serverIndex, ServersModel::Roles::NameRole).toString();
+
+    m_serversModel->removeServer();
+    emit removeCurrentlyProcessedServerFinished(tr("Server '") + serverName + tr("' was removed"));
+}
+
+void InstallController::removeAllContainers()
+{
+    int serverIndex = m_serversModel->getCurrentlyProcessedServerIndex();
+    QString serverName = m_serversModel->data(serverIndex, ServersModel::Roles::NameRole).toString();
+
+    ErrorCode errorCode = m_containersModel->removeAllContainers();
+    if (errorCode == ErrorCode::NoError) {
+        emit removeAllContainersFinished(tr("All containers from server '") + serverName + ("' have been removed"));
+        return;
+    }
+    emit installationErrorOccurred(errorString(errorCode));
+}
+
+void InstallController::removeCurrentlyProcessedContainer()
+{
+    int serverIndex = m_serversModel->getCurrentlyProcessedServerIndex();
+    QString serverName = m_serversModel->data(serverIndex, ServersModel::Roles::NameRole).toString();
+
+    int container = m_containersModel->getCurrentlyProcessedContainerIndex();
+    QString containerName = m_containersModel->data(container, ContainersModel::Roles::NameRole).toString();
+
+    ErrorCode errorCode = m_containersModel->removeCurrentlyProcessedContainer();
+    if (errorCode == ErrorCode::NoError) {
+        emit removeCurrentlyProcessedContainerFinished(containerName + tr(" has been removed from the server '")
+                                                       + serverName + "'");
+        return;
+    }
+    emit installationErrorOccurred(errorString(errorCode));
+}
+
 QRegularExpression InstallController::ipAddressPortRegExp()
 {
     return Utils::ipAddressPortRegExp();
 }
 
+QRegularExpression InstallController::ipAddressRegExp()
+{
+    return Utils::ipAddressRegExp();
+}
+
 void InstallController::setCurrentlyInstalledServerCredentials(const QString &hostName, const QString &userName,
                                                                const QString &secretData)
 {
diff --git a/client/ui/controllers/installController.h b/client/ui/controllers/installController.h
index fdd0ebed..8bc04f39 100644
--- a/client/ui/controllers/installController.h
+++ b/client/ui/controllers/installController.h
@@ -28,18 +28,27 @@ public slots:
 
     void updateContainer(QJsonObject config);
 
+    void removeCurrentlyProcessedServer();
+    void removeAllContainers();
+    void removeCurrentlyProcessedContainer();
+
     QRegularExpression ipAddressPortRegExp();
+    QRegularExpression ipAddressRegExp();
 
     void mountSftpDrive(const QString &port, const QString &password, const QString &username);
 
 signals:
-    void installContainerFinished(bool isInstalledContainerFound);
-    void installServerFinished(bool isInstalledContainerFound);
+    void installContainerFinished(QString finishMessage);
+    void installServerFinished(QString finishMessage);
 
     void updateContainerFinished();
 
     void scanServerFinished(bool isInstalledContainerFound);
 
+    void removeCurrentlyProcessedServerFinished(QString finishedMessage);
+    void removeAllContainersFinished(QString finishedMessage);
+    void removeCurrentlyProcessedContainerFinished(QString finishedMessage);
+
     void installationErrorOccurred(QString errorMessage);
 
     void serverAlreadyExists(int serverIndex);
@@ -57,7 +66,9 @@ private:
 
     bool m_shouldCreateServer;
 
+#ifndef Q_OS_IOS
     QList<QSharedPointer<QProcess>> m_sftpMountProcesses;
+#endif
 };
 
 #endif // INSTALLCONTROLLER_H
diff --git a/client/ui/controllers/pageController.h b/client/ui/controllers/pageController.h
index 8087d0fe..4273ed25 100644
--- a/client/ui/controllers/pageController.h
+++ b/client/ui/controllers/pageController.h
@@ -84,7 +84,7 @@ signals:
     void replaceStartPage();
 
     void showErrorMessage(QString errorMessage);
-    void showInfoMessage(QString message);
+    void showNotificationMessage(QString message);
 
     void showBusyIndicator(bool visible);
 
diff --git a/client/ui/controllers/protocolSettingsController.cpp b/client/ui/controllers/protocolSettingsController.cpp
deleted file mode 100644
index 11b6a904..00000000
--- a/client/ui/controllers/protocolSettingsController.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
-#include "protocolSettingsController.h"
-
-ProtocolSettingsController::ProtocolSettingsController(const QSharedPointer<ServersModel> &serversModel,
-                                                       const QSharedPointer<ContainersModel> &containersModel,
-                                                       const std::shared_ptr<Settings> &settings, QObject *parent)
-    : QObject(parent), m_serversModel(serversModel), m_containersModel(containersModel), m_settings(settings)
-{
-}
-
-QByteArray ProtocolSettingsController::getOpenVpnConfig()
-{
-    auto containerIndex = m_containersModel->index(m_containersModel->getCurrentlyProcessedContainerIndex());
-    auto config = m_containersModel->data(containerIndex, ContainersModel::Roles::ConfigRole);
-    return QByteArray();
-}
diff --git a/client/ui/controllers/protocolSettingsController.h b/client/ui/controllers/protocolSettingsController.h
deleted file mode 100644
index 730cbda7..00000000
--- a/client/ui/controllers/protocolSettingsController.h
+++ /dev/null
@@ -1,31 +0,0 @@
-#ifndef PROTOCOLSETTINGSCONTROLLER_H
-#define PROTOCOLSETTINGSCONTROLLER_H
-
-#include <QObject>
-
-#include "containers/containers_defs.h"
-#include "core/defs.h"
-#include "ui/models/containers_model.h"
-#include "ui/models/servers_model.h"
-
-class ProtocolSettingsController : public QObject
-{
-    Q_OBJECT
-public:
-    explicit ProtocolSettingsController(const QSharedPointer<ServersModel> &serversModel,
-                                        const QSharedPointer<ContainersModel> &containersModel,
-                                        const std::shared_ptr<Settings> &settings,
-                                        QObject *parent = nullptr);
-
-public slots:
-    QByteArray getOpenVpnConfig();
-
-signals:
-
-private:
-    QSharedPointer<ServersModel> m_serversModel;
-    QSharedPointer<ContainersModel> m_containersModel;
-    std::shared_ptr<Settings> m_settings;
-};
-
-#endif // PROTOCOLSETTINGSCONTROLLER_H
diff --git a/client/ui/controllers/settingsController.cpp b/client/ui/controllers/settingsController.cpp
index b501d085..eda67919 100644
--- a/client/ui/controllers/settingsController.cpp
+++ b/client/ui/controllers/settingsController.cpp
@@ -84,9 +84,10 @@ void SettingsController::restoreAppConfig()
             Utils::getFileName(Q_NULLPTR, tr("Open backup"),
                                QStandardPaths::writableLocation(QStandardPaths::DocumentsLocation), "*.backup");
 
-    // todo error processing
-    if (fileName.isEmpty())
+    if (fileName.isEmpty()) {
+        emit changeSettingsErrorOccurred(tr("Backup file is empty"));
         return;
+    }
 
     QFile file(fileName);
     file.open(QIODevice::ReadOnly);
@@ -94,7 +95,10 @@ void SettingsController::restoreAppConfig()
 
     bool ok = m_settings->restoreAppConfig(data);
     if (ok) {
-        //        emit uiLogic()->showWarningMessage(tr("Can't import config, file is corrupted."));
+        m_serversModel->resetModel();
+        emit restoreBackupFinished();
+    } else {
+        emit changeSettingsErrorOccurred(tr("Backup file is corrupted"));
     }
 }
 
@@ -106,4 +110,5 @@ QString SettingsController::getAppVersion()
 void SettingsController::clearSettings()
 {
     m_settings->clearSettings();
+    m_serversModel->resetModel();
 }
diff --git a/client/ui/controllers/settingsController.h b/client/ui/controllers/settingsController.h
index 313f934d..ac85d300 100644
--- a/client/ui/controllers/settingsController.h
+++ b/client/ui/controllers/settingsController.h
@@ -47,6 +47,9 @@ signals:
     void secondaryDnsChanged();
     void loggingStateChanged();
 
+    void restoreBackupFinished();
+    void changeSettingsErrorOccurred(QString errorMessage);
+
 private:
     QSharedPointer<ServersModel> m_serversModel;
     QSharedPointer<ContainersModel> m_containersModel;
diff --git a/client/ui/models/containers_model.cpp b/client/ui/models/containers_model.cpp
index 922542dd..ea571a22 100644
--- a/client/ui/models/containers_model.cpp
+++ b/client/ui/models/containers_model.cpp
@@ -83,6 +83,12 @@ QVariant ContainersModel::data(const QModelIndex &index, int role) const
     return QVariant();
 }
 
+QVariant ContainersModel::data(const int index, int role) const
+{
+    QModelIndex modelIndex = this->index(index);
+    return data(modelIndex, role);
+}
+
 void ContainersModel::setCurrentlyProcessedServerIndex(const int index)
 {
     beginResetModel();
@@ -123,11 +129,12 @@ QJsonObject ContainersModel::getCurrentlyProcessedContainerConfig()
     return qvariant_cast<QJsonObject>(data(index(m_currentlyProcessedContainerIndex), ConfigRole));
 }
 
-void ContainersModel::removeAllContainers()
+ErrorCode ContainersModel::removeAllContainers()
 {
 
     ServerController serverController(m_settings);
-    auto errorCode = serverController.removeAllContainers(m_settings->serverCredentials(m_currentlyProcessedServerIndex));
+    ErrorCode errorCode =
+            serverController.removeAllContainers(m_settings->serverCredentials(m_currentlyProcessedServerIndex));
 
     if (errorCode == ErrorCode::NoError) {
         beginResetModel();
@@ -138,30 +145,32 @@ void ContainersModel::removeAllContainers()
         setData(index(DockerContainer::None, 0), true, IsDefaultRole);
         endResetModel();
     }
-
-    // todo process errors
+    return errorCode;
 }
 
-void ContainersModel::removeCurrentlyProcessedContainer()
+ErrorCode ContainersModel::removeCurrentlyProcessedContainer()
 {
     ServerController serverController(m_settings);
     auto credentials = m_settings->serverCredentials(m_currentlyProcessedServerIndex);
     auto dockerContainer = static_cast<DockerContainer>(m_currentlyProcessedContainerIndex);
 
-    ErrorCode e = serverController.removeContainer(credentials, dockerContainer);
+    ErrorCode errorCode = serverController.removeContainer(credentials, dockerContainer);
 
-    beginResetModel(); // todo change to begin remove rows?
-    m_settings->removeContainerConfig(m_currentlyProcessedServerIndex, dockerContainer);
-    m_containers = m_settings->containers(m_currentlyProcessedServerIndex);
+    if (errorCode == ErrorCode::NoError) {
+        beginResetModel(); // todo change to begin remove rows?
+        m_settings->removeContainerConfig(m_currentlyProcessedServerIndex, dockerContainer);
+        m_containers = m_settings->containers(m_currentlyProcessedServerIndex);
 
-    if (m_defaultContainerIndex == m_currentlyProcessedContainerIndex) {
-        if (m_containers.isEmpty()) {
-            setData(index(DockerContainer::None, 0), true, IsDefaultRole);
-        } else {
-            setData(index(m_containers.begin().key(), 0), true, IsDefaultRole);
+        if (m_defaultContainerIndex == m_currentlyProcessedContainerIndex) {
+            if (m_containers.isEmpty()) {
+                setData(index(DockerContainer::None, 0), true, IsDefaultRole);
+            } else {
+                setData(index(m_containers.begin().key(), 0), true, IsDefaultRole);
+            }
         }
+        endResetModel();
     }
-    endResetModel();
+    return errorCode;
 }
 
 void ContainersModel::clearCachedProfiles()
diff --git a/client/ui/models/containers_model.h b/client/ui/models/containers_model.h
index 75ba9114..690eff41 100644
--- a/client/ui/models/containers_model.h
+++ b/client/ui/models/containers_model.h
@@ -36,9 +36,9 @@ public:
 
     bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole) override;
     QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
+    QVariant data(const int index, int role) const;
 
-signals:
-    void defaultContainerChanged();
+    Q_PROPERTY(QString defaultContainerName READ getDefaultContainerName NOTIFY defaultContainerChanged)
 
 public slots:
     DockerContainer getDefaultContainer();
@@ -52,8 +52,8 @@ public slots:
     QString getCurrentlyProcessedContainerName();
     QJsonObject getCurrentlyProcessedContainerConfig();
 
-    void removeAllContainers();
-    void removeCurrentlyProcessedContainer();
+    ErrorCode removeAllContainers();
+    ErrorCode removeCurrentlyProcessedContainer();
     void clearCachedProfiles();
 
     bool isAmneziaDnsContainerInstalled();
@@ -62,6 +62,9 @@ public slots:
 protected:
     QHash<int, QByteArray> roleNames() const override;
 
+signals:
+    void defaultContainerChanged();
+
 private:
     QMap<DockerContainer, QJsonObject> m_containers;
 
diff --git a/client/ui/models/protocols_model.cpp b/client/ui/models/protocols_model.cpp
index da730f55..8c999470 100644
--- a/client/ui/models/protocols_model.cpp
+++ b/client/ui/models/protocols_model.cpp
@@ -17,6 +17,7 @@ QHash<int, QByteArray> ProtocolsModel::roleNames() const
 
     roles[ProtocolNameRole] = "protocolName";
     roles[ProtocolPageRole] = "protocolPage";
+    roles[ProtocolIndexRole] = "protocolIndex";
     roles[RawConfigRole] = "rawConfig";
 
     return roles;
@@ -35,6 +36,7 @@ QVariant ProtocolsModel::data(const QModelIndex &index, int role) const
     }
     case ProtocolPageRole:
         return static_cast<int>(protocolPage(ProtocolProps::protoFromString(m_content.keys().at(index.row()))));
+    case ProtocolIndexRole: return ProtocolProps::protoFromString(m_content.keys().at(index.row()));
     case RawConfigRole: {
         auto protocolConfig = m_content.value(ContainerProps::containerTypeToString(m_container)).toObject();
         auto lastConfigJsonDoc =
diff --git a/client/ui/models/protocols_model.h b/client/ui/models/protocols_model.h
index c4ad5c70..5ee8a3dd 100644
--- a/client/ui/models/protocols_model.h
+++ b/client/ui/models/protocols_model.h
@@ -14,6 +14,7 @@ public:
     enum Roles {
         ProtocolNameRole = Qt::UserRole + 1,
         ProtocolPageRole,
+        ProtocolIndexRole,
         RawConfigRole
     };
 
diff --git a/client/ui/models/servers_model.cpp b/client/ui/models/servers_model.cpp
index fabbb829..364fd71f 100644
--- a/client/ui/models/servers_model.cpp
+++ b/client/ui/models/servers_model.cpp
@@ -78,6 +78,15 @@ QVariant ServersModel::data(const int index, int role) const
     return data(modelIndex, role);
 }
 
+void ServersModel::resetModel()
+{
+    beginResetModel();
+    m_servers = m_settings->serversArray();
+    m_defaultServerIndex = m_settings->defaultServerIndex();
+    m_currentlyProcessedServerIndex = m_defaultServerIndex;
+    endResetModel();
+}
+
 void ServersModel::setDefaultServerIndex(const int index)
 {
     m_settings->setDefaultServer(index);
@@ -90,11 +99,31 @@ const int ServersModel::getDefaultServerIndex()
     return m_defaultServerIndex;
 }
 
+const QString ServersModel::getDefaultServerName()
+{
+    return qvariant_cast<QString>(data(m_defaultServerIndex, NameRole));
+}
+
+const QString ServersModel::getDefaultServerHostName()
+{
+    return qvariant_cast<QString>(data(m_defaultServerIndex, HostNameRole));
+}
+
 const int ServersModel::getServersCount()
 {
     return m_servers.count();
 }
 
+bool ServersModel::hasServerWithWriteAccess()
+{
+    for (size_t i = 0; i < getServersCount(); i++) {
+        if (qvariant_cast<bool>(data(i, HasWriteAccessRole))) {
+            return true;
+        }
+    }
+    return false;
+}
+
 void ServersModel::setCurrentlyProcessedServerIndex(const int index)
 {
     m_currentlyProcessedServerIndex = index;
@@ -123,7 +152,7 @@ bool ServersModel::isCurrentlyProcessedServerHasWriteAccess()
 
 bool ServersModel::isDefaultServerHasWriteAccess()
 {
-    return qvariant_cast<bool>(data(m_currentlyProcessedServerIndex, HasWriteAccessRole));
+    return qvariant_cast<bool>(data(m_defaultServerIndex, HasWriteAccessRole));
 }
 
 void ServersModel::addServer(const QJsonObject &server)
diff --git a/client/ui/models/servers_model.h b/client/ui/models/servers_model.h
index a31e3c04..60ec35b2 100644
--- a/client/ui/models/servers_model.h
+++ b/client/ui/models/servers_model.h
@@ -28,17 +28,24 @@ public:
     QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
     QVariant data(const int index, int role = Qt::DisplayRole) const;
 
+    void resetModel();
+
     Q_PROPERTY(int defaultIndex READ getDefaultServerIndex WRITE setDefaultServerIndex NOTIFY defaultServerIndexChanged)
+    Q_PROPERTY(QString defaultServerName READ getDefaultServerName NOTIFY defaultServerIndexChanged)
+    Q_PROPERTY(QString defaultServerHostName READ getDefaultServerHostName NOTIFY defaultServerIndexChanged)
     Q_PROPERTY(int currentlyProcessedIndex READ getCurrentlyProcessedServerIndex WRITE setCurrentlyProcessedServerIndex
                        NOTIFY currentlyProcessedServerIndexChanged)
 
 public slots:
     void setDefaultServerIndex(const int index);
     const int getDefaultServerIndex();
+    const QString getDefaultServerName();
+    const QString getDefaultServerHostName();
     bool isDefaultServerCurrentlyProcessed();
 
     bool isCurrentlyProcessedServerHasWriteAccess();
     bool isDefaultServerHasWriteAccess();
+    bool hasServerWithWriteAccess();
 
     const int getServersCount();
 
diff --git a/client/ui/qml/Components/HomeContainersListView.qml b/client/ui/qml/Components/HomeContainersListView.qml
index 28f81b2e..0c2408be 100644
--- a/client/ui/qml/Components/HomeContainersListView.qml
+++ b/client/ui/qml/Components/HomeContainersListView.qml
@@ -78,11 +78,5 @@ ListView {
                 Layout.fillWidth: true
             }
         }
-
-        Component.onCompleted: {
-            if (isDefault) {
-                root.currentContainerName = name
-            }
-        }
     }
 }
diff --git a/client/ui/qml/Components/SelectLanguageDrawer.qml b/client/ui/qml/Components/SelectLanguageDrawer.qml
index f1ffa416..d872a889 100644
--- a/client/ui/qml/Components/SelectLanguageDrawer.qml
+++ b/client/ui/qml/Components/SelectLanguageDrawer.qml
@@ -67,7 +67,7 @@ DrawerType {
 
                 delegate: Item {
                     implicitWidth: root.width
-                    implicitHeight: content.implicitHeight
+                    implicitHeight: delegateContent.implicitHeight
 
                     ColumnLayout {
                         id: delegateContent
diff --git a/client/ui/qml/Controls2/CheckBoxType.qml b/client/ui/qml/Controls2/CheckBoxType.qml
index e4b1703f..2724a30c 100644
--- a/client/ui/qml/Controls2/CheckBoxType.qml
+++ b/client/ui/qml/Controls2/CheckBoxType.qml
@@ -9,6 +9,11 @@ CheckBox {
     id: root
 
     property string descriptionText
+    property string descriptionTextColor: "#878B91"
+    property string descriptionTextDisabledColor: "#494B50"
+
+    property string textColor:  "#D7D8DB"
+    property string textDisabledColor: "#878B91"
 
     property string hoveredColor: Qt.rgba(1, 1, 1, 0.05)
     property string defaultColor: "transparent"
@@ -16,14 +21,16 @@ CheckBox {
 
     property string defaultBorderColor: "#D7D8DB"
     property string checkedBorderColor: "#FBB26A"
+    property string checkedBorderDisabledColor: "#5A330C"
 
     property string checkedImageColor: "#FBB26A"
     property string pressedImageColor: "#A85809"
     property string defaultImageColor: "transparent"
+    property string checkedDisabledImageColor: "#84603D"
 
     property string imageSource: "qrc:/images/controls/check.svg"
 
-    hoverEnabled: true
+    hoverEnabled: enabled ? true : false
 
     indicator: Rectangle {
         id: background
@@ -52,7 +59,7 @@ CheckBox {
             width: 24
             height: 24
             color: "transparent"
-            border.color: root.checked ? checkedBorderColor : defaultBorderColor
+            border.color: root.checked ? (root.enabled ? checkedBorderColor : checkedBorderDisabledColor) : defaultBorderColor
             border.width: 1
             radius: 4
 
@@ -63,7 +70,19 @@ CheckBox {
                 layer {
                     enabled: true
                     effect: ColorOverlay {
-                        color: root.pressed ? pressedImageColor : root.checked ? checkedImageColor : defaultImageColor
+                        color: {
+                            if (root.pressed) {
+                                return root.pressedImageColor
+                            } else if (root.checked) {
+                                if (root.enabled) {
+                                    return root.checkedImageColor
+                                } else {
+                                    return root.checkedDisabledImageColor
+                                }
+                            } else {
+                                return root.defaultImageColor
+                            }
+                        }
                     }
                 }
             }
@@ -90,6 +109,7 @@ CheckBox {
                 Layout.fillWidth: true
 
                 text: root.text
+                color: root.enabled ? root.textColor : root.textDisabledColor
             }
 
             CaptionTextType {
@@ -98,7 +118,7 @@ CheckBox {
                 Layout.fillWidth: true
 
                 text: root.descriptionText
-                color: "#878b91"
+                color: root.enabled ? root.descriptionTextColor : root.descriptionTextDisabledColor
 
                 visible: root.descriptionText !== ""
             }
diff --git a/client/ui/qml/Controls2/HorizontalRadioButton.qml b/client/ui/qml/Controls2/HorizontalRadioButton.qml
index 88fc2531..1ac5840a 100644
--- a/client/ui/qml/Controls2/HorizontalRadioButton.qml
+++ b/client/ui/qml/Controls2/HorizontalRadioButton.qml
@@ -9,14 +9,16 @@ RadioButton {
 
     property string hoveredColor: Qt.rgba(1, 1, 1, 0.05)
     property string defaultColor: Qt.rgba(1, 1, 1, 0)
-    property string disabledColor: Qt.rgba(1, 1, 1, 0)
-    property string selectedColor: Qt.rgba(1, 1, 1, 0)
+    property string checkedColor: Qt.rgba(1, 1, 1, 0)
+    property string disabledColor: "transparent"
 
-    property string textColor: "#0E0E11"
+    property string textColor:  "#D7D8DB"
+    property string textDisabledColor: "#878B91"
 
     property string pressedBorderColor: "#494B50"
-    property string selectedBorderColor: "#FBB26A"
+    property string checkedBorderColor: "#FBB26A"
     property string defaultBodredColor: "transparent"
+    property string checkedDisabledBorderColor: "#84603D"
     property int borderWidth: 0
 
     implicitWidth: content.implicitWidth
@@ -27,39 +29,39 @@ RadioButton {
         radius: 16
 
         color: {
-//            if (root.enabled) {
+            if (root.enabled) {
                 if (root.hovered) {
-                    return hoveredColor
+                    return root.hoveredColor
                 } else if (root.checked) {
-                    return selectedColor
+                    return root.checkedColor
                 }
-                return defaultColor
-//            } else {
-//                return disabledColor
-//            }
+                return root.defaultColor
+            } else {
+                return root.disabledColor
+            }
         }
 
         border.color: {
-//            if (root.enabled) {
+            if (root.enabled) {
                 if (root.pressed) {
-                    return pressedBorderColor
+                    return root.pressedBorderColor
                 } else if (root.checked) {
-                    return selectedBorderColor
+                    return root.checkedBorderColor
                 }
-                return defaultBodredColor
-//            }
-//            return defaultBodredColor
+                return root.defaultBodredColor
+            } else {
+                if (root.checked) {
+                    return root.checkedDisabledBorderColor
+                }
+                return root.defaultBodredColor
+            }
         }
 
         border.width: {
-//            if (root.enabled) {
-                if(root.checked) {
-                    return 1
-                }
-                return root.pressed ? 1 : 0
-//            } else {
-//                return 0
-//            }
+            if(root.checked) {
+                return 1
+            }
+            return root.pressed ? 1 : 0
         }
 
         Behavior on color {
@@ -77,6 +79,7 @@ RadioButton {
 
         ButtonTextType {
             text: root.text
+            color: root.enabled ? root.textColor : root.textDisabledColor
 
             Layout.fillWidth: true
             Layout.rightMargin: 16
diff --git a/client/ui/qml/Controls2/PopupType.qml b/client/ui/qml/Controls2/PopupType.qml
index 61bdfd18..e7bb16f4 100644
--- a/client/ui/qml/Controls2/PopupType.qml
+++ b/client/ui/qml/Controls2/PopupType.qml
@@ -7,7 +7,7 @@ import "TextTypes"
 Popup {
     id: root
 
-    property string popupErrorMessageText
+    property string text
     property bool closeButtonVisible: true
 
     leftMargin: 25
@@ -17,46 +17,56 @@ Popup {
     width: parent.width - leftMargin - rightMargin
 
     anchors.centerIn: parent
-    modal: true
+    modal: root.closeButtonVisible
     closePolicy: Popup.CloseOnEscape
 
     Overlay.modal: Rectangle {
+        visible: root.closeButtonVisible
         color: Qt.rgba(14/255, 14/255, 17/255, 0.8)
     }
 
     background: Rectangle {
         anchors.fill: parent
 
-        color: "white"//Qt.rgba(215/255, 216/255, 219/255, 0.95)
+        color: "white"
         radius: 4
     }
 
-    contentItem: RowLayout {
+    contentItem: Item {
+        implicitWidth: content.implicitWidth
+        implicitHeight: content.implicitHeight
+
         anchors.fill: parent
-        anchors.leftMargin: 16
-        anchors.rightMargin: 16
 
-        CaptionTextType {
-            horizontalAlignment: Text.AlignLeft
-            Layout.fillWidth: true
+        RowLayout {
+            id: content
 
-            text: root.popupErrorMessageText
-        }
+            anchors.fill: parent
+            anchors.leftMargin: 16
+            anchors.rightMargin: 16
 
-        BasicButtonType {
-            visible: closeButtonVisible
+            CaptionTextType {
+                horizontalAlignment: Text.AlignLeft
+                Layout.fillWidth: true
 
-            defaultColor: "white"//"transparent"//Qt.rgba(215/255, 216/255, 219/255, 0.95)
-            hoveredColor: "#C1C2C5"
-            pressedColor: "#AEB0B7"
-            disabledColor: "#494B50"
+                text: root.text
+            }
 
-            textColor: "#0E0E11"
-            borderWidth: 0
+            BasicButtonType {
+                visible: closeButtonVisible
 
-            text: qsTr("Close")
-            onClicked: {
-                root.close()
+                defaultColor: "white"
+                hoveredColor: "#C1C2C5"
+                pressedColor: "#AEB0B7"
+                disabledColor: "#494B50"
+
+                textColor: "#0E0E11"
+                borderWidth: 0
+
+                text: qsTr("Close")
+                onClicked: {
+                    root.close()
+                }
             }
         }
     }
diff --git a/client/ui/qml/Controls2/SwitcherType.qml b/client/ui/qml/Controls2/SwitcherType.qml
index b63c64fb..aca5ba0b 100644
--- a/client/ui/qml/Controls2/SwitcherType.qml
+++ b/client/ui/qml/Controls2/SwitcherType.qml
@@ -8,14 +8,24 @@ Switch {
     id: root
 
     property alias descriptionText: description.text
+    property string descriptionTextColor: "#878B91"
+    property string descriptionTextDisabledColor: "#494B50"
+
+    property string textColor:  "#D7D8DB"
+    property string textDisabledColor: "#878B91"
 
     property string checkedIndicatorColor: "#412102"
     property string defaultIndicatorColor: "transparent"
+    property string checkedDisabledIndicatorColor: "#5A330C"
+
     property string checkedIndicatorBorderColor: "#412102"
     property string defaultIndicatorBorderColor: "#494B50"
+    property string checkedDisabledIndicatorBorderColor: "#5A330C"
 
     property string checkedInnerCircleColor: "#FBB26A"
     property string defaultInnerCircleColor: "#D7D8DB"
+    property string checkedDisabledInnerCircleColor: "#84603D"
+    property string defaultDisabledInnerCircleColor: "#494B50"
 
     property string hoveredIndicatorBackgroundColor: Qt.rgba(1, 1, 1, 0.08)
     property string defaultIndicatorBackgroundColor: "transparent"
@@ -23,6 +33,8 @@ Switch {
     implicitWidth: content.implicitWidth + switcher.implicitWidth
     implicitHeight: content.implicitHeight
 
+    hoverEnabled: enabled ? true : false
+
     indicator: Rectangle {
         id: switcher
 
@@ -33,8 +45,10 @@ Switch {
         implicitHeight: 32
 
         radius: 16
-        color: root.checked ? checkedIndicatorColor : defaultIndicatorColor
-        border.color: root.checked ? checkedIndicatorBorderColor : defaultIndicatorBorderColor
+        color: root.checked ? (root.enabled ? root.checkedIndicatorColor : root.checkedDisabledIndicatorColor)
+                            : root.defaultIndicatorColor
+        border.color: root.checked ? (root.enabled ? root.checkedIndicatorBorderColor : root.checkedDisabledIndicatorBorderColor)
+                                   : root.defaultIndicatorBorderColor
 
         Behavior on color {
             PropertyAnimation { duration: 200 }
@@ -51,7 +65,8 @@ Switch {
             width: root.checked ? 24 : 16
             height: root.checked ? 24 : 16
             radius: 23
-            color: root.checked ? checkedInnerCircleColor : defaultInnerCircleColor
+            color: root.checked ? (root.enabled ? root.checkedInnerCircleColor : root.checkedDisabledInnerCircleColor)
+                                : (root.enabled ? root.defaultInnerCircleColor : root.defaultDisabledInnerCircleColor)
 
             Behavior on x {
                 PropertyAnimation { duration: 200 }
@@ -63,7 +78,7 @@ Switch {
             width: 40
             height: 40
             radius: 23
-            color: hovered ? hoveredIndicatorBackgroundColor : defaultIndicatorBackgroundColor
+            color: root.hovered ? root.hoveredIndicatorBackgroundColor : root.defaultIndicatorBackgroundColor
 
             Behavior on color {
                 PropertyAnimation { duration: 200 }
@@ -81,6 +96,7 @@ Switch {
             Layout.fillWidth: true
 
             text: root.text
+            color: root.enabled ? root.textColor : root.textDisabledColor
         }
 
         CaptionTextType {
@@ -88,7 +104,7 @@ Switch {
 
             Layout.fillWidth: true
 
-            color: "#878B91"
+            color: root.enabled ? root.descriptionTextColor : root.descriptionTextDisabledColor
 
             visible: text !== ""
         }
diff --git a/client/ui/qml/Pages2/PageHome.qml b/client/ui/qml/Pages2/PageHome.qml
index 76b9f94b..6a134e9b 100644
--- a/client/ui/qml/Pages2/PageHome.qml
+++ b/client/ui/qml/Pages2/PageHome.qml
@@ -22,22 +22,14 @@ PageType {
 
     property string borderColor: "#2C2D30"
 
-    property string currentServerName
-    property string currentServerHostName
-    property string currentContainerName
+    property string defaultServerName: ServersModel.defaultServerName
+    property string defaultServerHostName: ServersModel.defaultServerHostName
+    property string defaultContainerName: ContainersModel.defaultContainerName
 
     ConnectButton {
         anchors.centerIn: parent
     }
 
-    Connections {
-        target: ContainersModel
-
-        function onDefaultContainerChanged() {
-            root.currentContainerName = ContainersModel.getDefaultContainerName()
-        }
-    }
-
     Connections {
         target: PageController
 
@@ -79,7 +71,7 @@ PageType {
             Layout.alignment: Qt.AlignHCenter | Qt.AlignVCenter
 
             Header1TextType {
-                text: root.currentServerName
+                text: root.defaultServerName
             }
 
             Image {
@@ -107,7 +99,7 @@ PageType {
                     }
                 }
 
-                description += root.currentContainerName + " | " + root.currentServerHostName
+                description += root.defaultContainerName + " | " + root.defaultServerHostName
                 return description
             }
         }
@@ -139,14 +131,14 @@ PageType {
                 Layout.topMargin: 24
                 Layout.alignment: Qt.AlignHCenter | Qt.AlignVCenter
 
-                text: root.currentServerName
+                text: root.defaultServerName
             }
 
             LabelTextType {
                 Layout.bottomMargin: 24
                 Layout.alignment: Qt.AlignHCenter | Qt.AlignVCenter
 
-                text: root.currentServerHostName
+                text: root.defaultServerHostName
             }
 
             RowLayout {
@@ -161,7 +153,7 @@ PageType {
                     rootButtonImageColor: "#0E0E11"
                     rootButtonBackgroundColor: "#D7D8DB"
 
-                    text: root.currentContainerName
+                    text: root.defaultContainerName
                     textColor: "#0E0E11"
                     headerText: qsTr("Connection protocol")
                     headerBackButtonImage: "qrc:/images/controls/arrow-left.svg"
@@ -299,9 +291,6 @@ PageType {
 
                                         ServersModel.currentlyProcessedIndex = index
                                         ServersModel.defaultIndex = index
-
-                                        root.currentServerName = name
-                                        root.currentServerHostName = hostName
                                     }
 
                                     MouseArea {
@@ -331,13 +320,6 @@ PageType {
                                 Layout.fillWidth: true
                             }
                         }
-
-                        Component.onCompleted: {
-                            if (serversMenuContent.currentIndex === index) {
-                                root.currentServerName = name
-                                root.currentServerHostName = hostName
-                            }
-                        }
                     }
                 }
             }
diff --git a/client/ui/qml/Pages2/PageProtocolOpenVpnSettings.qml b/client/ui/qml/Pages2/PageProtocolOpenVpnSettings.qml
index 028f9fd3..65fcdc4b 100644
--- a/client/ui/qml/Pages2/PageProtocolOpenVpnSettings.qml
+++ b/client/ui/qml/Pages2/PageProtocolOpenVpnSettings.qml
@@ -425,16 +425,13 @@ PageType {
 
                             onClicked: {
                                 questionDrawer.headerText = qsTr("Remove OpenVpn from server?")
-//                                questionDrawer.descriptionText = qsTr("")
                                 questionDrawer.yesButtonText = qsTr("Continue")
                                 questionDrawer.noButtonText = qsTr("Cancel")
 
                                 questionDrawer.yesButtonFunction = function() {
                                     questionDrawer.visible = false
                                     goToPage(PageEnum.PageDeinstalling)
-                                    ContainersModel.removeCurrentlyProcessedContainer()
-                                    closePage()
-                                    closePage() //todo auto close to deinstall page?
+                                    InstallController.removeCurrentlyProcessedContainer()
                                 }
                                 questionDrawer.noButtonFunction = function() {
                                     questionDrawer.visible = false
diff --git a/client/ui/qml/Pages2/PageProtocolRaw.qml b/client/ui/qml/Pages2/PageProtocolRaw.qml
index 377d948e..e82b0ff5 100644
--- a/client/ui/qml/Pages2/PageProtocolRaw.qml
+++ b/client/ui/qml/Pages2/PageProtocolRaw.qml
@@ -173,8 +173,19 @@ PageType {
                 textColor: "#EB5757"
 
                 clickedFunction: function() {
-                    ContainersModel.removeCurrentlyProcessedContainer()
-                    closePage()
+                    questionDrawer.headerText = qsTr("Remove ") + ContainersModel.getCurrentlyProcessedContainerName() + qsTr(" from server?")
+                    questionDrawer.yesButtonText = qsTr("Continue")
+                    questionDrawer.noButtonText = qsTr("Cancel")
+
+                    questionDrawer.yesButtonFunction = function() {
+                        questionDrawer.visible = false
+                        goToPage(PageEnum.PageDeinstalling)
+                        InstallController.removeCurrentlyProcessedContainer()
+                    }
+                    questionDrawer.noButtonFunction = function() {
+                        questionDrawer.visible = false
+                    }
+                    questionDrawer.visible = true
                 }
 
                 MouseArea {
@@ -186,5 +197,9 @@ PageType {
 
             DividerType {}
         }
+
+        QuestionDrawer {
+            id: questionDrawer
+        }
     }
 }
diff --git a/client/ui/qml/Pages2/PageServiceSftpSettings.qml b/client/ui/qml/Pages2/PageServiceSftpSettings.qml
index ffa42859..0eabb076 100644
--- a/client/ui/qml/Pages2/PageServiceSftpSettings.qml
+++ b/client/ui/qml/Pages2/PageServiceSftpSettings.qml
@@ -258,9 +258,7 @@ PageType {
                                 questionDrawer.yesButtonFunction = function() {
                                     questionDrawer.visible = false
                                     goToPage(PageEnum.PageDeinstalling)
-                                    ContainersModel.removeCurrentlyProcessedContainer()
-                                    closePage()
-                                    closePage() //todo auto close to deinstall page?
+                                    InstallController.removeCurrentlyProcessedContainer()
                                 }
                                 questionDrawer.noButtonFunction = function() {
                                     questionDrawer.visible = false
diff --git a/client/ui/qml/Pages2/PageServiceTorWebsiteSettings.qml b/client/ui/qml/Pages2/PageServiceTorWebsiteSettings.qml
index a47a95e3..7cf2a81a 100644
--- a/client/ui/qml/Pages2/PageServiceTorWebsiteSettings.qml
+++ b/client/ui/qml/Pages2/PageServiceTorWebsiteSettings.qml
@@ -150,9 +150,7 @@ PageType {
                     questionDrawer.yesButtonFunction = function() {
                         questionDrawer.visible = false
                         goToPage(PageEnum.PageDeinstalling)
-                        ContainersModel.removeCurrentlyProcessedContainer()
-                        closePage()
-                        closePage() //todo auto close to deinstall page?
+                        InstallController.removeCurrentlyProcessedContainer()
                     }
                     questionDrawer.noButtonFunction = function() {
                         questionDrawer.visible = false
diff --git a/client/ui/qml/Pages2/PageSettingsApplication.qml b/client/ui/qml/Pages2/PageSettingsApplication.qml
index 54d315b0..2c7d8601 100644
--- a/client/ui/qml/Pages2/PageSettingsApplication.qml
+++ b/client/ui/qml/Pages2/PageSettingsApplication.qml
@@ -92,6 +92,7 @@ PageType {
                     questionDrawer.yesButtonFunction = function() {
                         questionDrawer.visible = false
                         SettingsController.clearSettings()
+                        PageController.replaceStartPage()
                     }
                     questionDrawer.noButtonFunction = function() {
                         questionDrawer.visible = false
diff --git a/client/ui/qml/Pages2/PageSettingsBackup.qml b/client/ui/qml/Pages2/PageSettingsBackup.qml
index 1c196aa3..cd0b3ee8 100644
--- a/client/ui/qml/Pages2/PageSettingsBackup.qml
+++ b/client/ui/qml/Pages2/PageSettingsBackup.qml
@@ -12,6 +12,20 @@ import "../Controls2/TextTypes"
 PageType {
     id: root
 
+    Connections {
+        target: SettingsController
+
+        function onChangeSettingsErrorOccurred(errorMessage) {
+            PageController.showErrorMessage(errorMessage)
+        }
+
+        function onRestoreBackupFinished() {
+            PageController.showNotificationMessage(qsTr("Settings restored from backup file"))
+            goToStartPage()
+            PageController.goToPageHome()
+        }
+    }
+
     BackButtonType {
         id: backButton
 
@@ -66,7 +80,9 @@ PageType {
                 text: qsTr("Make a backup")
 
                 onClicked: {
+                    PageController.showBusyIndicator(true)
                     SettingsController.backupAppConfig()
+                    PageController.showBusyIndicator(false)
                 }
             }
 
@@ -84,7 +100,9 @@ PageType {
                 text: qsTr("Restore from backup")
 
                 onClicked: {
+                    PageController.showBusyIndicator(true)
                     SettingsController.restoreAppConfig()
+                    PageController.showBusyIndicator(false)
                 }
             }
         }
diff --git a/client/ui/qml/Pages2/PageSettingsDns.qml b/client/ui/qml/Pages2/PageSettingsDns.qml
index c51f9092..2851e9b1 100644
--- a/client/ui/qml/Pages2/PageSettingsDns.qml
+++ b/client/ui/qml/Pages2/PageSettingsDns.qml
@@ -55,6 +55,9 @@ PageType {
                 headerText: "Primary DNS"
 
                 textFieldText: SettingsController.primaryDns
+                textField.validator: RegularExpressionValidator {
+                    regularExpression: InstallController.ipAddressRegExp()
+                }
             }
 
             TextFieldWithHeaderType {
@@ -64,6 +67,9 @@ PageType {
                 headerText: "Secondary DNS"
 
                 textFieldText: SettingsController.secondaryDns
+                textField.validator: RegularExpressionValidator {
+                    regularExpression: InstallController.ipAddressRegExp()
+                }
             }
 
             BasicButtonType {
diff --git a/client/ui/qml/Pages2/PageSettingsServerData.qml b/client/ui/qml/Pages2/PageSettingsServerData.qml
index 20afecd2..b24411c7 100644
--- a/client/ui/qml/Pages2/PageSettingsServerData.qml
+++ b/client/ui/qml/Pages2/PageSettingsServerData.qml
@@ -27,6 +27,32 @@ PageType {
 
             PageController.showErrorMessage(message)
         }
+
+        function onInstallationErrorOccurred(errorMessage) {
+            closePage() // close deInstalling page
+            PageController.showErrorMessage(errorMessage)
+        }
+
+        function onRemoveCurrentlyProcessedServerFinished(finishedMessage) {
+            if (!ServersModel.getServersCount()) {
+                PageController.replaceStartPage()
+            } else {
+                goToStartPage()
+                goToPage(PageEnum.PageSettingsServersList)
+            }
+            PageController.showNotificationMessage(finishedMessage)
+        }
+
+        function onRemoveAllContainersFinished(finishedMessage) {
+            closePage() // close deInstalling page
+            PageController.showNotificationMessage(finishedMessage)
+        }
+
+        function onRemoveCurrentlyProcessedContainerFinished(finishedMessage) {
+            closePage() // close deInstalling page
+            closePage() // close page with remove button
+            PageController.showNotificationMessage(finishedMessage)
+        }
     }
 
     Connections {
@@ -112,16 +138,12 @@ PageType {
 
                     questionDrawer.yesButtonFunction = function() {
                         questionDrawer.visible = false
+                        PageController.showBusyIndicator(true)
                         if (ServersModel.isDefaultServerCurrentlyProcessed && ConnectionController.isConnected) {
                             ConnectionController.closeConnection()
                         }
-                        ServersModel.removeServer()
-                        if (!ServersModel.getServersCount()) {
-                            PageController.replaceStartPage()
-                        } else {
-                            goToStartPage()
-                            goToPage(PageEnum.PageSettingsServersList)
-                        }
+                        InstallController.removeCurrentlyProcessedServer()
+                        PageController.showBusyIndicator(false)
                     }
                     questionDrawer.noButtonFunction = function() {
                         questionDrawer.visible = false
@@ -151,8 +173,7 @@ PageType {
                         if (ServersModel.isDefaultServerCurrentlyProcessed && ConnectionController.isConnected) {
                             ConnectionController.closeVpnConnection()
                         }
-                        ContainersModel.removeAllContainers()
-                        closePage()
+                        InstallController.removeAllContainers()
                     }
                     questionDrawer.noButtonFunction = function() {
                         questionDrawer.visible = false
diff --git a/client/ui/qml/Pages2/PageSettingsServerInfo.qml b/client/ui/qml/Pages2/PageSettingsServerInfo.qml
index 7b6dce68..cf748f54 100644
--- a/client/ui/qml/Pages2/PageSettingsServerInfo.qml
+++ b/client/ui/qml/Pages2/PageSettingsServerInfo.qml
@@ -93,6 +93,7 @@ PageType {
                             Layout.fillWidth: true
                             headerText: qsTr("Server name")
                             textFieldText: name
+                            textField.maximumLength: 20
                         }
 
                         BasicButtonType {
diff --git a/client/ui/qml/Pages2/PageSettingsServerProtocol.qml b/client/ui/qml/Pages2/PageSettingsServerProtocol.qml
index ec2ca91f..e417eea9 100644
--- a/client/ui/qml/Pages2/PageSettingsServerProtocol.qml
+++ b/client/ui/qml/Pages2/PageSettingsServerProtocol.qml
@@ -81,13 +81,12 @@ PageType {
                             rightImageSource: "qrc:/images/controls/chevron-right.svg"
 
                             clickedFunction: function() {
-                                var containerIndex = ContainersModel.getCurrentlyProcessedContainerIndex()
-                                switch (containerIndex) {
-                                case ContainerEnum.OpenVpn: OpenVpnConfigModel.updateModel(ProtocolsModel.getConfig()); break;
-                                case ContainerEnum.ShadowSocks: ShadowSocksConfigModel.updateModel(ProtocolsModel.getConfig()); break;
-                                case ContainerEnum.Cloak: CloakConfigModel.updateModel(ProtocolsModel.getConfig()); break;
-                                case ContainerEnum.WireGuard: WireGuardConfigModel.updateModel(ProtocolsModel.getConfig()); break;
-                                case ContainerEnum.Ipsec: Ikev2ConfigModel.updateModel(ProtocolsModel.getConfig()); break;
+                                switch (protocolIndex) {
+                                case ProtocolEnum.OpenVpn: OpenVpnConfigModel.updateModel(ProtocolsModel.getConfig()); break;
+                                case ProtocolEnum.ShadowSocks: ShadowSocksConfigModel.updateModel(ProtocolsModel.getConfig()); break;
+                                case ProtocolEnum.Cloak: CloakConfigModel.updateModel(ProtocolsModel.getConfig()); break;
+                                case ProtocolEnum.WireGuard: WireGuardConfigModel.updateModel(ProtocolsModel.getConfig()); break;
+                                case ProtocolEnum.Ipsec: Ikev2ConfigModel.updateModel(ProtocolsModel.getConfig()); break;
                                 }
                                 goToPage(protocolPage);
                             }
@@ -113,8 +112,19 @@ PageType {
                 textColor: "#EB5757"
 
                 clickedFunction: function() {
-                    ContainersModel.removeCurrentlyProcessedContainer()
-                    closePage()
+                    questionDrawer.headerText = qsTr("Remove ") + ContainersModel.getCurrentlyProcessedContainerName() + qsTr(" from server?")
+                    questionDrawer.yesButtonText = qsTr("Continue")
+                    questionDrawer.noButtonText = qsTr("Cancel")
+
+                    questionDrawer.yesButtonFunction = function() {
+                        questionDrawer.visible = false
+                        goToPage(PageEnum.PageDeinstalling)
+                        InstallController.removeCurrentlyProcessedContainer()
+                    }
+                    questionDrawer.noButtonFunction = function() {
+                        questionDrawer.visible = false
+                    }
+                    questionDrawer.visible = true
                 }
 
                 MouseArea {
@@ -126,5 +136,9 @@ PageType {
 
             DividerType {}
         }
+
+        QuestionDrawer {
+            id: questionDrawer
+        }
     }
 }
diff --git a/client/ui/qml/Pages2/PageSetupWizardInstalling.qml b/client/ui/qml/Pages2/PageSetupWizardInstalling.qml
index 92c95108..f254a474 100644
--- a/client/ui/qml/Pages2/PageSetupWizardInstalling.qml
+++ b/client/ui/qml/Pages2/PageSetupWizardInstalling.qml
@@ -22,7 +22,7 @@ PageType {
             PageController.showErrorMessage(errorMessage)
         }
 
-        function onInstallContainerFinished(isInstalledContainerFound) {
+        function onInstallContainerFinished(finishedMessage) {
             goToStartPage()
             if (stackView.currentItem.objectName === PageController.getPagePath(PageEnum.PageHome)) {
                 PageController.restorePageHomeState(true)
@@ -33,14 +33,10 @@ PageType {
                 goToPage(PageEnum.PageHome)
             }
 
-            if (isInstalledContainerFound) {
-                //todo change to info message
-                PageController.showErrorMessage(qsTr("The container you are trying to install is already installed on the server. " +
-                                                     "All installed containers have been added to the application"))
-            }
+            PageController.showNotificationMessage(finishedMessage)
         }
 
-        function onInstallServerFinished(isInstalledContainerFound) {
+        function onInstallServerFinished(finishedMessage) {
             goToStartPage()
             if (stackView.currentItem.objectName === PageController.getPagePath(PageEnum.PageHome)) {
                 PageController.restorePageHomeState()
@@ -50,10 +46,7 @@ PageType {
                 PageController.replaceStartPage()
             }
 
-            if (isInstalledContainerFound) {
-                PageController.showErrorMessage(qsTr("The container you are trying to install is already installed on the server. " +
-                                                     "All installed containers have been added to the application"))
-            }
+            PageController.showNotificationMessage(finishedMessage)
         }
 
         function onServerAlreadyExists(serverIndex) {
diff --git a/client/ui/qml/Pages2/PageSetupWizardProtocolSettings.qml b/client/ui/qml/Pages2/PageSetupWizardProtocolSettings.qml
index 29067cb2..65e00da8 100644
--- a/client/ui/qml/Pages2/PageSetupWizardProtocolSettings.qml
+++ b/client/ui/qml/Pages2/PageSetupWizardProtocolSettings.qml
@@ -123,15 +123,16 @@ PageType {
                                 anchors.bottom: parent.bottom
                                 contentHeight: {
                                     var emptySpaceHeight = parent.height - showDetailsBackButton.implicitHeight - showDetailsBackButton.anchors.topMargin
-
-                                    return (showDetailsDrawerContent.implicitHeight > emptySpaceHeight) ?
-                                                showDetailsDrawerContent.implicitHeight : emptySpaceHeight
+                                    return (showDetailsDrawerContent.height > emptySpaceHeight) ?
+                                                showDetailsDrawerContent.height : emptySpaceHeight
                                 }
 
                                 ColumnLayout {
                                     id: showDetailsDrawerContent
 
-                                    anchors.fill: parent
+                                    anchors.top: parent.top
+                                    anchors.left: parent.left
+                                    anchors.right: parent.right
                                     anchors.rightMargin: 16
                                     anchors.leftMargin: 16
 
diff --git a/client/ui/qml/Pages2/PageSetupWizardStart.qml b/client/ui/qml/Pages2/PageSetupWizardStart.qml
index 73438e34..a2f42cc2 100644
--- a/client/ui/qml/Pages2/PageSetupWizardStart.qml
+++ b/client/ui/qml/Pages2/PageSetupWizardStart.qml
@@ -16,11 +16,6 @@ PageType {
     Connections {
         target: PageController
 
-        function onShowErrorMessage(errorMessage) {
-            popupErrorMessage.popupErrorMessageText = errorMessage
-            popupErrorMessage.open()
-        }
-
         function onGoToPageViewConfig() {
             goToPage(PageEnum.PageSetupWizardViewConfig)
         }
@@ -98,16 +93,4 @@ PageType {
             id: connectionTypeSelection
         }
     }
-
-    Item {
-        anchors.right: parent.right
-        anchors.left: parent.left
-        anchors.bottom: parent.bottom
-
-        implicitHeight: popupErrorMessage.height
-
-        PopupType {
-            id: popupErrorMessage
-        }
-    }
 }
diff --git a/client/ui/qml/Pages2/PageShare.qml b/client/ui/qml/Pages2/PageShare.qml
index 201c630a..3d5851b1 100644
--- a/client/ui/qml/Pages2/PageShare.qml
+++ b/client/ui/qml/Pages2/PageShare.qml
@@ -58,7 +58,7 @@ PageType {
     property string fullConfigServerSelectorText
     property string connectionServerSelectorText
     property bool showContent: false
-    property bool shareButtonEnabled: false
+    property bool shareButtonEnabled: true
     property list<QtObject> connectionTypesModel: [
         amneziaConnectionFormat
     ]
@@ -140,6 +140,7 @@ PageType {
                         onClicked: {
                             accessTypeSelector.currentIndex = 1
                             serverSelector.text = root.fullConfigServerSelectorText
+                            root.shareButtonEnabled = true
                         }
                     }
                 }
diff --git a/client/ui/qml/Pages2/PageStart.qml b/client/ui/qml/Pages2/PageStart.qml
index f522bace..811fc923 100644
--- a/client/ui/qml/Pages2/PageStart.qml
+++ b/client/ui/qml/Pages2/PageStart.qml
@@ -31,11 +31,6 @@ PageType {
             tabBarStackView.push(pagePath, { "objectName" : pagePath }, StackView.PushTransition)
         }
 
-        function onShowErrorMessage(errorMessage) {
-            popupErrorMessage.popupErrorMessageText = errorMessage
-            popupErrorMessage.open()
-        }
-
         function onShowBusyIndicator(visible) {
             busyIndicator.visible = visible
             tabBarStackView.enabled = !visible
@@ -119,14 +114,15 @@ PageType {
             Connections {
                 target: ServersModel
 
-                function onDefaultServerIndexChanged() {
-                    shareTabButton.visible = ServersModel.isCurrentlyProcessedServerHasWriteAccess()
-                    shareTabButton.width = ServersModel.isCurrentlyProcessedServerHasWriteAccess() ? undefined : 0
+                function onModelReset() {
+                    var hasServerWithWriteAccess = ServersModel.hasServerWithWriteAccess()
+                    shareTabButton.visible = hasServerWithWriteAccess
+                    shareTabButton.width = hasServerWithWriteAccess ? undefined : 0
                 }
             }
 
-            visible: ServersModel.isCurrentlyProcessedServerHasWriteAccess()
-            width: ServersModel.isCurrentlyProcessedServerHasWriteAccess() ? undefined : 0
+            visible: ServersModel.hasServerWithWriteAccess()
+            width: ServersModel.hasServerWithWriteAccess() ? undefined : 0
 
             isSelected: tabBar.currentIndex === 1
             image: "qrc:/images/controls/share-2.svg"
@@ -151,18 +147,6 @@ PageType {
         enabled: false
     }
 
-    Item {
-        anchors.right: parent.right
-        anchors.left: parent.left
-        anchors.bottom: parent.bottom
-
-        implicitHeight: popupErrorMessage.height
-
-        PopupType {
-            id: popupErrorMessage
-        }
-    }
-
     BusyIndicatorType {
         id: busyIndicator
         anchors.centerIn: parent
diff --git a/client/ui/qml/main2.qml b/client/ui/qml/main2.qml
index 0b89d840..6b2bee2a 100644
--- a/client/ui/qml/main2.qml
+++ b/client/ui/qml/main2.qml
@@ -63,5 +63,52 @@ Window  {
         function onHideMainWindow() {
             root.hide()
         }
+
+        function onShowErrorMessage(errorMessage) {
+            popupErrorMessage.text = errorMessage
+            popupErrorMessage.open()
+        }
+
+        function onShowNotificationMessage(message) {
+            popupNotificationMessage.text = message
+            popupNotificationMessage.closeButtonVisible = false
+            popupNotificationMessage.open()
+            popupNotificationTimer.start()
+        }
+    }
+
+    Item {
+        anchors.right: parent.right
+        anchors.left: parent.left
+        anchors.bottom: parent.bottom
+
+        implicitHeight: popupNotificationMessage.height
+
+        PopupType {
+            id: popupNotificationMessage
+        }
+
+        Timer {
+            id: popupNotificationTimer
+
+            interval: 3000
+            repeat: false
+            running: false
+            onTriggered: {
+                popupNotificationMessage.close()
+            }
+        }
+    }
+
+    Item {
+        anchors.right: parent.right
+        anchors.left: parent.left
+        anchors.bottom: parent.bottom
+
+        implicitHeight: popupErrorMessage.height
+
+        PopupType {
+            id: popupErrorMessage
+        }
     }
 }

From 66f9a82f318de52159ef495dd1a3f87568f5500e Mon Sep 17 00:00:00 2001
From: "vladimir.kuznetsov" <nethiuswork@gmail.com>
Date: Mon, 31 Jul 2023 12:54:59 +0900
Subject: [PATCH 050/278] added icons for buttons in the drop-down window of
 connections sharing. - corrections in texts

---
 client/containers/containers_defs.cpp         | 180 +++++++++---------
 .../qml/Components/ShareConnectionDrawer.qml  |   2 +
 client/ui/qml/Controls2/BasicButtonType.qml   |  33 +++-
 client/ui/qml/Pages2/PageHome.qml             |   2 +-
 .../qml/Pages2/PageProtocolCloakSettings.qml  |   4 +-
 .../Pages2/PageProtocolOpenVpnSettings.qml    |   2 +-
 .../PageProtocolShadowSocksSettings.qml       |   2 +-
 .../ui/qml/Pages2/PageSettingsConnection.qml  |   2 +-
 .../ui/qml/Pages2/PageSettingsServerData.qml  |   2 +-
 .../qml/Pages2/PageSetupWizardCredentials.qml |   5 +-
 .../qml/Pages2/PageSetupWizardProtocols.qml   |   2 +-
 client/ui/qml/Pages2/PageSetupWizardStart.qml |   3 +-
 client/ui/qml/Pages2/PageShare.qml            |   6 +-
 13 files changed, 136 insertions(+), 109 deletions(-)

diff --git a/client/containers/containers_defs.cpp b/client/containers/containers_defs.cpp
index 8b979296..1e8046bf 100644
--- a/client/containers/containers_defs.cpp
+++ b/client/containers/containers_defs.cpp
@@ -8,18 +8,23 @@ QDebug operator<<(QDebug debug, const amnezia::DockerContainer &c)
     return debug;
 }
 
-amnezia::DockerContainer ContainerProps::containerFromString(const QString &container){
+amnezia::DockerContainer ContainerProps::containerFromString(const QString &container)
+{
     QMetaEnum metaEnum = QMetaEnum::fromType<DockerContainer>();
     for (int i = 0; i < metaEnum.keyCount(); ++i) {
         DockerContainer c = static_cast<DockerContainer>(i);
-        if (container == containerToString(c)) return c;
+        if (container == containerToString(c))
+            return c;
     }
     return DockerContainer::None;
 }
 
-QString ContainerProps::containerToString(amnezia::DockerContainer c){
-    if (c == DockerContainer::None) return "none";
-    if (c == DockerContainer::Cloak) return "amnezia-openvpn-cloak";
+QString ContainerProps::containerToString(amnezia::DockerContainer c)
+{
+    if (c == DockerContainer::None)
+        return "none";
+    if (c == DockerContainer::Cloak)
+        return "amnezia-openvpn-cloak";
 
     QMetaEnum metaEnum = QMetaEnum::fromType<DockerContainer>();
     QString containerKey = metaEnum.valueToKey(static_cast<int>(c));
@@ -27,9 +32,12 @@ QString ContainerProps::containerToString(amnezia::DockerContainer c){
     return "amnezia-" + containerKey.toLower();
 }
 
-QString ContainerProps::containerTypeToString(amnezia::DockerContainer c){
-    if (c == DockerContainer::None) return "none";
-    if (c == DockerContainer::Ipsec) return "ikev2";
+QString ContainerProps::containerTypeToString(amnezia::DockerContainer c)
+{
+    if (c == DockerContainer::None)
+        return "none";
+    if (c == DockerContainer::Ipsec)
+        return "ikev2";
 
     QMetaEnum metaEnum = QMetaEnum::fromType<DockerContainer>();
     QString containerKey = metaEnum.valueToKey(static_cast<int>(c));
@@ -40,29 +48,21 @@ QString ContainerProps::containerTypeToString(amnezia::DockerContainer c){
 QVector<amnezia::Proto> ContainerProps::protocolsForContainer(amnezia::DockerContainer container)
 {
     switch (container) {
-    case DockerContainer::None:
-        return { };
+    case DockerContainer::None: return {};
 
-    case DockerContainer::OpenVpn:
-        return { Proto::OpenVpn };
+    case DockerContainer::OpenVpn: return { Proto::OpenVpn };
 
-    case DockerContainer::ShadowSocks:
-        return { Proto::OpenVpn, Proto::ShadowSocks };
+    case DockerContainer::ShadowSocks: return { Proto::OpenVpn, Proto::ShadowSocks };
 
-    case DockerContainer::Cloak:
-        return { Proto::OpenVpn, Proto::ShadowSocks, Proto::Cloak };
+    case DockerContainer::Cloak: return { Proto::OpenVpn, Proto::ShadowSocks, Proto::Cloak };
 
-    case DockerContainer::Ipsec:
-        return { Proto::Ikev2 /*, Protocol::L2tp */};
+    case DockerContainer::Ipsec: return { Proto::Ikev2 /*, Protocol::L2tp */ };
 
-    case DockerContainer::Dns:
-        return { };
+    case DockerContainer::Dns: return {};
 
-    case DockerContainer::Sftp:
-        return { Proto::Sftp};
+    case DockerContainer::Sftp: return { Proto::Sftp };
 
-    default:
-        return { defaultProtocol(container) };
+    default: return { defaultProtocol(container) };
     }
 }
 
@@ -79,70 +79,67 @@ QList<DockerContainer> ContainerProps::allContainers()
 
 QMap<DockerContainer, QString> ContainerProps::containerHumanNames()
 {
-    return {
-        {DockerContainer::None, "Not installed"},
-        {DockerContainer::OpenVpn, "OpenVPN"},
-        {DockerContainer::ShadowSocks, "OpenVpn over ShadowSocks"},
-        {DockerContainer::Cloak, "OpenVpn over Cloak"},
-        {DockerContainer::WireGuard, "WireGuard"},
-        {DockerContainer::Ipsec, QObject::tr("IPsec")},
+    return { { DockerContainer::None, "Not installed" },
+             { DockerContainer::OpenVpn, "OpenVPN" },
+             { DockerContainer::ShadowSocks, "OpenVPN over ShadowSocks" },
+             { DockerContainer::Cloak, "OpenVPN over Cloak" },
+             { DockerContainer::WireGuard, "WireGuard" },
+             { DockerContainer::Ipsec, QObject::tr("IPsec") },
 
-        {DockerContainer::TorWebSite, QObject::tr("Web site in Tor network")},
-        {DockerContainer::Dns, QObject::tr("DNS Service")},
-        //{DockerContainer::FileShare, QObject::tr("SMB file sharing service")},
-        {DockerContainer::Sftp, QObject::tr("Sftp file sharing service")}
-    };
+             { DockerContainer::TorWebSite, QObject::tr("Web site in Tor network") },
+             { DockerContainer::Dns, QObject::tr("Amnezia DNS") },
+             //{DockerContainer::FileShare, QObject::tr("SMB file sharing service")},
+             { DockerContainer::Sftp, QObject::tr("Sftp file sharing service") } };
 }
 
 QMap<DockerContainer, QString> ContainerProps::containerDescriptions()
 {
-    return {
-        {DockerContainer::OpenVpn, QObject::tr("OpenVPN container")},
-        {DockerContainer::ShadowSocks, QObject::tr("Container with OpenVpn and ShadowSocks")},
-        {DockerContainer::Cloak, QObject::tr("Container with OpenVpn and ShadowSocks protocols "
-                                                        "configured with traffic masking by Cloak plugin")},
-        {DockerContainer::WireGuard, QObject::tr("WireGuard container")},
-        {DockerContainer::Ipsec, QObject::tr("IPsec container")},
+    return { { DockerContainer::OpenVpn, QObject::tr("OpenVPN container") },
+             { DockerContainer::ShadowSocks, QObject::tr("Container with OpenVpn and ShadowSocks") },
+             { DockerContainer::Cloak,
+               QObject::tr("Container with OpenVpn and ShadowSocks protocols "
+                           "configured with traffic masking by Cloak plugin") },
+             { DockerContainer::WireGuard, QObject::tr("WireGuard container") },
+             { DockerContainer::Ipsec, QObject::tr("IPsec container") },
 
-        {DockerContainer::TorWebSite, QObject::tr("Web site in Tor network")},
-        {DockerContainer::Dns, QObject::tr("DNS Service")},
-        //{DockerContainer::FileShare, QObject::tr("SMB file sharing service - is Window file sharing protocol")},
-        {DockerContainer::Sftp, QObject::tr("Sftp file sharing service - is secure FTP service")}
-    };
+             { DockerContainer::TorWebSite, QObject::tr("Web site in Tor network") },
+             { DockerContainer::Dns, QObject::tr("DNS Service") },
+             //{DockerContainer::FileShare, QObject::tr("SMB file sharing service - is Window file sharing protocol")},
+             { DockerContainer::Sftp, QObject::tr("Sftp file sharing service - is secure FTP service") } };
 }
 
 amnezia::ServiceType ContainerProps::containerService(DockerContainer c)
 {
     switch (c) {
-    case DockerContainer::None :         return ServiceType::None;
-    case DockerContainer::OpenVpn :      return ServiceType::Vpn;
-    case DockerContainer::Cloak :        return ServiceType::Vpn;
-    case DockerContainer::ShadowSocks :  return ServiceType::Vpn;
-    case DockerContainer::WireGuard :    return ServiceType::Vpn;
-    case DockerContainer::Ipsec :        return ServiceType::Vpn;
-    case DockerContainer::TorWebSite :   return ServiceType::Other;
-    case DockerContainer::Dns :          return ServiceType::Other;
-    //case DockerContainer::FileShare :    return ServiceType::Other;
-    case DockerContainer::Sftp :         return ServiceType::Other;
-    default:                             return ServiceType::Other;
+    case DockerContainer::None: return ServiceType::None;
+    case DockerContainer::OpenVpn: return ServiceType::Vpn;
+    case DockerContainer::Cloak: return ServiceType::Vpn;
+    case DockerContainer::ShadowSocks: return ServiceType::Vpn;
+    case DockerContainer::WireGuard: return ServiceType::Vpn;
+    case DockerContainer::Ipsec: return ServiceType::Vpn;
+    case DockerContainer::TorWebSite: return ServiceType::Other;
+    case DockerContainer::Dns: return ServiceType::Other;
+    // case DockerContainer::FileShare :    return ServiceType::Other;
+    case DockerContainer::Sftp: return ServiceType::Other;
+    default: return ServiceType::Other;
     }
 }
 
 Proto ContainerProps::defaultProtocol(DockerContainer c)
 {
     switch (c) {
-    case DockerContainer::None :         return Proto::Any;
-    case DockerContainer::OpenVpn :      return Proto::OpenVpn;
-    case DockerContainer::Cloak :        return Proto::Cloak;
-    case DockerContainer::ShadowSocks :  return Proto::ShadowSocks;
-    case DockerContainer::WireGuard :    return Proto::WireGuard;
-    case DockerContainer::Ipsec :        return Proto::Ikev2;
+    case DockerContainer::None: return Proto::Any;
+    case DockerContainer::OpenVpn: return Proto::OpenVpn;
+    case DockerContainer::Cloak: return Proto::Cloak;
+    case DockerContainer::ShadowSocks: return Proto::ShadowSocks;
+    case DockerContainer::WireGuard: return Proto::WireGuard;
+    case DockerContainer::Ipsec: return Proto::Ikev2;
 
-    case DockerContainer::TorWebSite :   return Proto::TorWebSite;
-    case DockerContainer::Dns :          return Proto::Dns;
-    //case DockerContainer::FileShare :    return Protocol::FileShare;
-    case DockerContainer::Sftp :         return Proto::Sftp;
-    default:                             return Proto::Any;
+    case DockerContainer::TorWebSite: return Proto::TorWebSite;
+    case DockerContainer::Dns: return Proto::Dns;
+    // case DockerContainer::FileShare :    return Protocol::FileShare;
+    case DockerContainer::Sftp: return Proto::Sftp;
+    default: return Proto::Any;
     }
 }
 
@@ -151,22 +148,23 @@ bool ContainerProps::isSupportedByCurrentPlatform(DockerContainer c)
 #ifdef Q_OS_WINDOWS
     return true;
 
-#elif defined (Q_OS_IOS)
+#elif defined(Q_OS_IOS)
     switch (c) {
     case DockerContainer::WireGuard: return true;
     case DockerContainer::OpenVpn: return true;
-    case DockerContainer::Cloak: return true;
-//    case DockerContainer::ShadowSocks: return true;
+    case DockerContainer::Cloak:
+        return true;
+        //    case DockerContainer::ShadowSocks: return true;
     default: return false;
     }
-#elif defined (Q_OS_MAC)
+#elif defined(Q_OS_MAC)
     switch (c) {
     case DockerContainer::WireGuard: return true;
     case DockerContainer::Ipsec: return false;
     default: return true;
     }
 
-#elif defined (Q_OS_ANDROID)
+#elif defined(Q_OS_ANDROID)
     switch (c) {
     case DockerContainer::WireGuard: return true;
     case DockerContainer::OpenVpn: return true;
@@ -175,7 +173,7 @@ bool ContainerProps::isSupportedByCurrentPlatform(DockerContainer c)
     default: return false;
     }
 
-#elif defined (Q_OS_LINUX)
+#elif defined(Q_OS_LINUX)
     switch (c) {
     case DockerContainer::WireGuard: return true;
     case DockerContainer::Ipsec: return false;
@@ -183,44 +181,44 @@ bool ContainerProps::isSupportedByCurrentPlatform(DockerContainer c)
     }
 
 #else
-return false;
+    return false;
 #endif
 }
 
 QStringList ContainerProps::fixedPortsForContainer(DockerContainer c)
 {
     switch (c) {
-    case DockerContainer::Ipsec :        return QStringList{"500", "4500"};
-    default:                             return {};
+    case DockerContainer::Ipsec: return QStringList { "500", "4500" };
+    default: return {};
     }
 }
 
 bool ContainerProps::isEasySetupContainer(DockerContainer container)
 {
     switch (container) {
-    case DockerContainer::OpenVpn :      return true;
-    case DockerContainer::Cloak :        return true;
-    case DockerContainer::ShadowSocks :  return true;
-    default:                             return false;
+    case DockerContainer::OpenVpn: return true;
+    case DockerContainer::Cloak: return true;
+    case DockerContainer::ShadowSocks: return true;
+    default: return false;
     }
 }
 
 QString ContainerProps::easySetupHeader(DockerContainer container)
 {
     switch (container) {
-    case DockerContainer::OpenVpn :      return tr("Low");
-    case DockerContainer::Cloak :        return tr("High");
-    case DockerContainer::ShadowSocks :  return tr("Medium");
-    default:                             return "";
+    case DockerContainer::OpenVpn: return tr("Low");
+    case DockerContainer::Cloak: return tr("High");
+    case DockerContainer::ShadowSocks: return tr("Medium");
+    default: return "";
     }
 }
 
 QString ContainerProps::easySetupDescription(DockerContainer container)
 {
     switch (container) {
-    case DockerContainer::OpenVpn :      return tr("Many foreign websites and VPN providers are blocked");
-    case DockerContainer::Cloak :        return tr("Some foreign sites are blocked, but VPN providers are not blocked");
-    case DockerContainer::ShadowSocks :  return tr("I just want to increase the level of privacy");
-    default:                             return "";
+    case DockerContainer::OpenVpn: return tr("I just want to increase the level of privacy");
+    case DockerContainer::Cloak: return tr("Some foreign sites are blocked, but VPN providers are not blocked");
+    case DockerContainer::ShadowSocks: return tr("Many foreign websites and VPN providers are blocked");
+    default: return "";
     }
 }
diff --git a/client/ui/qml/Components/ShareConnectionDrawer.qml b/client/ui/qml/Components/ShareConnectionDrawer.qml
index f133f27a..3f27396b 100644
--- a/client/ui/qml/Components/ShareConnectionDrawer.qml
+++ b/client/ui/qml/Components/ShareConnectionDrawer.qml
@@ -55,6 +55,7 @@ DrawerType {
                     Layout.topMargin: 16
 
                     text: qsTr("Share")
+                    imageSource: "qrc:/images/controls/share-2.svg"
 
                     onClicked: {
                         ExportController.saveFile()
@@ -73,6 +74,7 @@ DrawerType {
                     borderWidth: 1
 
                     text: qsTr("Copy")
+                    imageSource: "qrc:/images/controls/copy.svg"
 
                     onClicked: {
                         configText.selectAll()
diff --git a/client/ui/qml/Controls2/BasicButtonType.qml b/client/ui/qml/Controls2/BasicButtonType.qml
index d9168466..aa05774e 100644
--- a/client/ui/qml/Controls2/BasicButtonType.qml
+++ b/client/ui/qml/Controls2/BasicButtonType.qml
@@ -1,5 +1,7 @@
 import QtQuick
 import QtQuick.Controls
+import QtQuick.Layouts
+import Qt5Compat.GraphicalEffects
 
 import "TextTypes"
 
@@ -16,6 +18,8 @@ Button {
     property string borderColor: "#D7D8DB"
     property int borderWidth: 0
 
+    property string imageSource
+
     implicitHeight: 56
 
     hoverEnabled: true
@@ -48,11 +52,30 @@ Button {
         cursorShape: Qt.PointingHandCursor
     }
 
-    contentItem: ButtonTextType {
+    contentItem: Item {
         anchors.fill: background
-        color: textColor
-        text: root.text
-        horizontalAlignment: Text.AlignHCenter
-        verticalAlignment: Text.AlignVCenter
+        RowLayout {
+            anchors.centerIn: parent
+
+            Image {
+                source: root.imageSource
+                visible: root.imageSource === "" ? false : true
+
+                layer {
+                    enabled: true
+                    effect: ColorOverlay {
+                        color: textColor
+                    }
+                }
+            }
+
+            ButtonTextType {
+                color: textColor
+                text: root.text
+
+                horizontalAlignment: Text.AlignLeft
+                verticalAlignment: Text.AlignVCenter
+            }
+        }
     }
 }
diff --git a/client/ui/qml/Pages2/PageHome.qml b/client/ui/qml/Pages2/PageHome.qml
index 6a134e9b..ce5ddcd4 100644
--- a/client/ui/qml/Pages2/PageHome.qml
+++ b/client/ui/qml/Pages2/PageHome.qml
@@ -155,7 +155,7 @@ PageType {
 
                     text: root.defaultContainerName
                     textColor: "#0E0E11"
-                    headerText: qsTr("Connection protocol")
+                    headerText: qsTr("VPN protocol")
                     headerBackButtonImage: "qrc:/images/controls/arrow-left.svg"
 
                     rootButtonClickedFunction: function() {
diff --git a/client/ui/qml/Pages2/PageProtocolCloakSettings.qml b/client/ui/qml/Pages2/PageProtocolCloakSettings.qml
index 33d231b5..54c2ffb8 100644
--- a/client/ui/qml/Pages2/PageProtocolCloakSettings.qml
+++ b/client/ui/qml/Pages2/PageProtocolCloakSettings.qml
@@ -92,7 +92,7 @@ PageType {
                             Layout.fillWidth: true
                             Layout.topMargin: 32
 
-                            headerText: qsTr("Masquerading as traffic from")
+                            headerText: qsTr("Disguised as traffic from")
                             textFieldText: site
 
                             textField.onEditingFinished: {
@@ -161,7 +161,7 @@ PageType {
                             Layout.topMargin: 24
                             Layout.bottomMargin: 24
 
-                            text: qsTr("Save and Restart Amnesia")
+                            text: qsTr("Save and Restart Amnezia")
 
                             onClicked: {
                                 forceActiveFocus()
diff --git a/client/ui/qml/Pages2/PageProtocolOpenVpnSettings.qml b/client/ui/qml/Pages2/PageProtocolOpenVpnSettings.qml
index 65fcdc4b..26a9c495 100644
--- a/client/ui/qml/Pages2/PageProtocolOpenVpnSettings.qml
+++ b/client/ui/qml/Pages2/PageProtocolOpenVpnSettings.qml
@@ -445,7 +445,7 @@ PageType {
                             Layout.topMargin: 24
                             Layout.bottomMargin: 24
 
-                            text: qsTr("Save and Restart Amnesia")
+                            text: qsTr("Save and Restart Amnezia")
 
                             onClicked: {
                                 forceActiveFocus()
diff --git a/client/ui/qml/Pages2/PageProtocolShadowSocksSettings.qml b/client/ui/qml/Pages2/PageProtocolShadowSocksSettings.qml
index 730e3907..d873beac 100644
--- a/client/ui/qml/Pages2/PageProtocolShadowSocksSettings.qml
+++ b/client/ui/qml/Pages2/PageProtocolShadowSocksSettings.qml
@@ -147,7 +147,7 @@ PageType {
                             Layout.topMargin: 24
                             Layout.bottomMargin: 24
 
-                            text: qsTr("Save and Restart Amnesia")
+                            text: qsTr("Save and Restart Amnezia")
 
                             onClicked: {
                                 forceActiveFocus()
diff --git a/client/ui/qml/Pages2/PageSettingsConnection.qml b/client/ui/qml/Pages2/PageSettingsConnection.qml
index 1cf8a1a5..fd365edb 100644
--- a/client/ui/qml/Pages2/PageSettingsConnection.qml
+++ b/client/ui/qml/Pages2/PageSettingsConnection.qml
@@ -48,7 +48,7 @@ PageType {
                 Layout.leftMargin: 16
                 Layout.rightMargin: 16
 
-                text: qsTr("Use AmnesiaDNS if installed on the server")
+                text: qsTr("Use AmneziaDNS if installed on the server")
                 descriptionText: qsTr("Internal IP address 172.29.172.254")
 
                 checked: SettingsController.isAmneziaDnsEnabled()
diff --git a/client/ui/qml/Pages2/PageSettingsServerData.qml b/client/ui/qml/Pages2/PageSettingsServerData.qml
index b24411c7..3aec4242 100644
--- a/client/ui/qml/Pages2/PageSettingsServerData.qml
+++ b/client/ui/qml/Pages2/PageSettingsServerData.qml
@@ -110,7 +110,7 @@ PageType {
                 visible: content.isServerWithWriteAccess
                 Layout.fillWidth: true
 
-                text: qsTr("Check the server for previously installed Amnesia services")
+                text: qsTr("Check the server for previously installed Amnezia services")
                 descriptionText: qsTr("Add them to the application if they were not displayed")
 
                 clickedFunction: function() {
diff --git a/client/ui/qml/Pages2/PageSetupWizardCredentials.qml b/client/ui/qml/Pages2/PageSetupWizardCredentials.qml
index 487bdbde..b72fe988 100644
--- a/client/ui/qml/Pages2/PageSetupWizardCredentials.qml
+++ b/client/ui/qml/Pages2/PageSetupWizardCredentials.qml
@@ -49,7 +49,7 @@ PageType {
 
                 Layout.fillWidth: true
                 headerText: qsTr("Server IP address [:port]")
-                textFieldPlaceholderText: qsTr("Enter the address in the format 255.255.255.255:88")
+                textFieldPlaceholderText: qsTr("255.255.255.255:88")
                 textField.validator: RegularExpressionValidator {
                     regularExpression: InstallController.ipAddressPortRegExp()
                 }
@@ -60,13 +60,14 @@ PageType {
 
                 Layout.fillWidth: true
                 headerText: qsTr("Login to connect via SSH")
+                textFieldPlaceholderText: "root"
             }
 
             TextFieldWithHeaderType {
                 id: secretData
 
                 Layout.fillWidth: true
-                headerText: qsTr("Password / Private key")
+                headerText: qsTr("Password / SSH private key")
                 textField.echoMode: TextInput.Password
             }
 
diff --git a/client/ui/qml/Pages2/PageSetupWizardProtocols.qml b/client/ui/qml/Pages2/PageSetupWizardProtocols.qml
index f3de85b6..8c7f5de0 100644
--- a/client/ui/qml/Pages2/PageSetupWizardProtocols.qml
+++ b/client/ui/qml/Pages2/PageSetupWizardProtocols.qml
@@ -70,7 +70,7 @@ PageType {
 
                     width: parent.width
 
-                    headerText: qsTr("Connection protocol")
+                    headerText: qsTr("VPN protocol")
                     descriptionText: qsTr("Choose the one with the highest priority for you. Later, you can install other protocols and additional services, such as DNS proxy and SFTP.")
                 }
             }
diff --git a/client/ui/qml/Pages2/PageSetupWizardStart.qml b/client/ui/qml/Pages2/PageSetupWizardStart.qml
index a2f42cc2..eff17ab5 100644
--- a/client/ui/qml/Pages2/PageSetupWizardStart.qml
+++ b/client/ui/qml/Pages2/PageSetupWizardStart.qml
@@ -53,7 +53,8 @@ PageType {
                 Layout.leftMargin: 16
                 Layout.rightMargin: 16
 
-                text: qsTr("A free service to create a personal VPN on your server. We help you access blocked content without exposing your privacy even to VPN providers.")
+                text: qsTr("Free service for creating a personal VPN on your server.") +
+                      qsTr(" Helps you access blocked content without revealing your privacy, even to VPN providers.")
             }
 
             BasicButtonType {
diff --git a/client/ui/qml/Pages2/PageShare.qml b/client/ui/qml/Pages2/PageShare.qml
index 3d5851b1..ca9dedd4 100644
--- a/client/ui/qml/Pages2/PageShare.qml
+++ b/client/ui/qml/Pages2/PageShare.qml
@@ -65,7 +65,7 @@ PageType {
 
     QtObject {
         id: amneziaConnectionFormat
-        property string name: qsTr("For the AmnesiaVPN app")
+        property string name: qsTr("For the AmneziaVPN app")
         property var type: PageShare.ConfigType.AmneziaConnection
     }
     QtObject {
@@ -135,7 +135,7 @@ PageType {
                         checked: root.currentIndex === 1
 
                         implicitWidth: (root.width - 32) / 2
-                        text: qsTr("Full")
+                        text: qsTr("Full access")
 
                         onClicked: {
                             accessTypeSelector.currentIndex = 1
@@ -194,6 +194,8 @@ PageType {
                             protocolSelector.visible = true
                             root.shareButtonEnabled = false
                         } else {
+                            shareConnectionDrawer.headerText = qsTr("Accessing ") + serverSelector.text
+                            shareConnectionDrawer.configContentHeaderText = qsTr("File with connection settings to ") + serverSelector.text
                             serverSelector.menuVisible = false
                         }
                     }

From aa66133813e375c9ec151967a80b04ae6f51bf25 Mon Sep 17 00:00:00 2001
From: "vladimir.kuznetsov" <nethiuswork@gmail.com>
Date: Mon, 31 Jul 2023 14:29:49 +0900
Subject: [PATCH 051/278] added 'insert' button and 'show password' button for
 PageSetupWizardCredentials

---
 .gitignore                                    |  1 +
 CMakeLists.txt                                |  4 ++--
 client/images/controls/eye-off.svg            |  6 ++++++
 client/images/controls/eye.svg                |  4 ++++
 client/resources.qrc                          |  2 ++
 client/ui/qml/Config/GlobalConfig.qml         | 10 ++++-----
 client/ui/qml/Controls2/BasicButtonType.qml   |  5 +++++
 .../qml/Controls2/TextFieldWithHeaderType.qml |  5 ++++-
 .../Pages2/PageSetupWizardConfigSource.qml    |  6 ++++--
 .../qml/Pages2/PageSetupWizardCredentials.qml | 21 ++++++++++++++++++-
 10 files changed, 53 insertions(+), 11 deletions(-)
 create mode 100644 client/images/controls/eye-off.svg
 create mode 100644 client/images/controls/eye.svg

diff --git a/.gitignore b/.gitignore
index 88a3b397..7de64e4b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,6 +8,7 @@ deploy/build/*
 deploy/build_32/*
 deploy/build_64/*
 winbuild*.bat
+.cache/
 
 
 # Qt-es
diff --git a/CMakeLists.txt b/CMakeLists.txt
index ad9866e0..2ff60079 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,11 +2,11 @@ cmake_minimum_required(VERSION 3.25.0 FATAL_ERROR)
 
 set(PROJECT AmneziaVPN)
 
-project(${PROJECT} VERSION 3.0.8.1
+project(${PROJECT} VERSION 4.0.0.1
         DESCRIPTION "AmneziaVPN"
         HOMEPAGE_URL "https://amnezia.org/"
 )
-set(RELEASE_DATE "2023-07-15")
+set(RELEASE_DATE "2023-07-31")
 set(APP_MAJOR_VERSION ${CMAKE_PROJECT_VERSION_MAJOR}.${CMAKE_PROJECT_VERSION_MINOR}.${CMAKE_PROJECT_VERSION_PATCH})
 
 if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
diff --git a/client/images/controls/eye-off.svg b/client/images/controls/eye-off.svg
new file mode 100644
index 00000000..d05e0b85
--- /dev/null
+++ b/client/images/controls/eye-off.svg
@@ -0,0 +1,6 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M9.88 9.87988C9.58526 10.1545 9.34885 10.4857 9.18488 10.8537C9.02091 11.2217 8.93274 11.619 8.92564 12.0218C8.91853 12.4246 8.99263 12.8247 9.14351 13.1983C9.2944 13.5718 9.51898 13.9112 9.80385 14.196C10.0887 14.4809 10.4281 14.7055 10.8016 14.8564C11.1752 15.0073 11.5753 15.0814 11.9781 15.0742C12.3809 15.0671 12.7782 14.979 13.1462 14.815C13.5142 14.651 13.8454 14.4146 14.12 14.1199" stroke="#CBCBCB" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M10.73 5.08C11.1513 5.02751 11.5754 5.00079 12 5C19 5 22 12 22 12C21.5529 12.9571 20.9922 13.8569 20.33 14.68" stroke="#CBCBCB" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M6.61 6.61011C4.62125 7.96473 3.02987 9.82537 2 12.0001C2 12.0001 5 19.0001 12 19.0001C13.9159 19.0052 15.7908 18.4452 17.39 17.3901" stroke="#CBCBCB" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M2 2L22 22" stroke="#CBCBCB" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/client/images/controls/eye.svg b/client/images/controls/eye.svg
new file mode 100644
index 00000000..a01452af
--- /dev/null
+++ b/client/images/controls/eye.svg
@@ -0,0 +1,4 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M2 12C2 12 5 5 12 5C19 5 22 12 22 12C22 12 19 19 12 19C5 19 2 12 2 12Z" stroke="#CBCBCB" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M12 15C13.6569 15 15 13.6569 15 12C15 10.3431 13.6569 9 12 9C10.3431 9 9 10.3431 9 12C9 13.6569 10.3431 15 12 15Z" stroke="#CBCBCB" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/client/resources.qrc b/client/resources.qrc
index 85ee838f..625292c2 100644
--- a/client/resources.qrc
+++ b/client/resources.qrc
@@ -278,5 +278,7 @@
         <file>images/controls/copy.svg</file>
         <file>ui/qml/Pages2/PageServiceTorWebsiteSettings.qml</file>
         <file>ui/qml/Pages2/PageSetupWizardQrReader.qml</file>
+        <file>images/controls/eye.svg</file>
+        <file>images/controls/eye-off.svg</file>
     </qresource>
 </RCC>
diff --git a/client/ui/qml/Config/GlobalConfig.qml b/client/ui/qml/Config/GlobalConfig.qml
index 5bb71b6f..a9edd543 100644
--- a/client/ui/qml/Config/GlobalConfig.qml
+++ b/client/ui/qml/Config/GlobalConfig.qml
@@ -11,17 +11,17 @@ Item {
     readonly property int defaultMargin: 20
 
     function isMobile() {
-        if (Qt.platform.os == "android" ||
-                Qt.platform.os == "ios") {
+        if (Qt.platform.os === "android" ||
+                Qt.platform.os === "ios") {
             return true
         }
         return false
     }
 
     function isDesktop() {
-        if (Qt.platform.os == "windows" ||
-                Qt.platform.os == "linux" ||
-                Qt.platform.os == "osx") {
+        if (Qt.platform.os === "windows" ||
+                Qt.platform.os === "linux" ||
+                Qt.platform.os === "osx") {
             return true
         }
         return false
diff --git a/client/ui/qml/Controls2/BasicButtonType.qml b/client/ui/qml/Controls2/BasicButtonType.qml
index aa05774e..c69d51d7 100644
--- a/client/ui/qml/Controls2/BasicButtonType.qml
+++ b/client/ui/qml/Controls2/BasicButtonType.qml
@@ -54,7 +54,11 @@ Button {
 
     contentItem: Item {
         anchors.fill: background
+
+        implicitWidth: content.implicitWidth
+        implicitHeight: content.implicitHeight
         RowLayout {
+            id: content
             anchors.centerIn: parent
 
             Image {
@@ -72,6 +76,7 @@ Button {
             ButtonTextType {
                 color: textColor
                 text: root.text
+                visible: root.text === "" ? false : true
 
                 horizontalAlignment: Text.AlignLeft
                 verticalAlignment: Text.AlignVCenter
diff --git a/client/ui/qml/Controls2/TextFieldWithHeaderType.qml b/client/ui/qml/Controls2/TextFieldWithHeaderType.qml
index 13a7ea6e..1414b5ec 100644
--- a/client/ui/qml/Controls2/TextFieldWithHeaderType.qml
+++ b/client/ui/qml/Controls2/TextFieldWithHeaderType.qml
@@ -14,6 +14,7 @@ Item {
     property alias errorText: errorField.text
 
     property string buttonText
+    property string buttonImageSource
     property var clickedFunc
 
     property alias textField: textField
@@ -101,7 +102,7 @@ Item {
                 }
 
                 BasicButtonType {
-                    visible: root.buttonText !== ""
+                    visible: (root.buttonText !== "") || (root.buttonImageSource !== "")
 
                     defaultColor: "transparent"
                     hoveredColor: Qt.rgba(1, 1, 1, 0.08)
@@ -111,8 +112,10 @@ Item {
                     borderWidth: 0
 
                     text: root.buttonText
+                    imageSource: root.buttonImageSource
 
                     Layout.rightMargin: 24
+                    Layout.preferredHeight: 32
 
                     onClicked: {
                         if (root.clickedFunc && typeof root.clickedFunc === "function") {
diff --git a/client/ui/qml/Pages2/PageSetupWizardConfigSource.qml b/client/ui/qml/Pages2/PageSetupWizardConfigSource.qml
index 2d6b249d..cd0c08fb 100644
--- a/client/ui/qml/Pages2/PageSetupWizardConfigSource.qml
+++ b/client/ui/qml/Pages2/PageSetupWizardConfigSource.qml
@@ -76,9 +76,9 @@ It's okay if a friend passed the code.")
 
             DividerType {}
 
-            //todo ifdef mobile platforms
             LabelWithButtonType {
                 Layout.fillWidth: true
+                visible: GC.isMobile()
 
                 text: qsTr("QR-code")
                 rightImageSource: "qrc:/images/controls/chevron-right.svg"
@@ -90,7 +90,9 @@ It's okay if a friend passed the code.")
                 }
             }
 
-            DividerType {}
+            DividerType {
+                visible: GC.isMobile()
+            }
 
             LabelWithButtonType {
                 Layout.fillWidth: true
diff --git a/client/ui/qml/Pages2/PageSetupWizardCredentials.qml b/client/ui/qml/Pages2/PageSetupWizardCredentials.qml
index b72fe988..cc1197ad 100644
--- a/client/ui/qml/Pages2/PageSetupWizardCredentials.qml
+++ b/client/ui/qml/Pages2/PageSetupWizardCredentials.qml
@@ -53,6 +53,12 @@ PageType {
                 textField.validator: RegularExpressionValidator {
                     regularExpression: InstallController.ipAddressPortRegExp()
                 }
+                buttonText: qsTr("Insert")
+
+                clickedFunc: function() {
+                    textField.text = ""
+                    textField.paste()
+                }
             }
 
             TextFieldWithHeaderType {
@@ -61,14 +67,27 @@ PageType {
                 Layout.fillWidth: true
                 headerText: qsTr("Login to connect via SSH")
                 textFieldPlaceholderText: "root"
+                buttonText: qsTr("Insert")
+
+                clickedFunc: function() {
+                    textField.text = ""
+                    textField.paste()
+                }
             }
 
             TextFieldWithHeaderType {
                 id: secretData
 
+                property bool hidePassword: true
+
                 Layout.fillWidth: true
                 headerText: qsTr("Password / SSH private key")
-                textField.echoMode: TextInput.Password
+                textField.echoMode: hidePassword ? TextInput.Password : TextInput.Normal
+                buttonImageSource: hidePassword ? "qrc:/images/controls/eye.svg" : "qrc:/images/controls/eye-off.svg"
+
+                clickedFunc: function() {
+                    hidePassword = !hidePassword
+                }
             }
 
             BasicButtonType {

From 0058edc24ef1c8c84cbf1866a08e704f461e7d3a Mon Sep 17 00:00:00 2001
From: "vladimir.kuznetsov" <nethiuswork@gmail.com>
Date: Mon, 31 Jul 2023 20:38:13 +0900
Subject: [PATCH 052/278] added server availability check after entering
 credentials - moved the protocol self-selection button to the
 PageSetupWizardEasy page

---
 client/amnezia_application.cpp                |    9 +
 client/amnezia_application.h                  |    3 +
 client/translations/amneziavpn_ru.ts          | 1271 ++++++++++++-----
 client/ui/controllers/installController.cpp   |   21 +
 client/ui/controllers/installController.h     |    2 +
 client/ui/models/languageModel.cpp            |    2 +-
 client/ui/models/languageModel.h              |    6 +-
 .../qml/Components/SelectLanguageDrawer.qml   |    3 +-
 client/ui/qml/Controls2/PopupType.qml         |    2 +
 .../qml/Pages2/PageProtocolCloakSettings.qml  |    6 +-
 .../Pages2/PageProtocolOpenVpnSettings.qml    |    6 +-
 .../PageProtocolShadowSocksSettings.qml       |    6 +-
 .../ui/qml/Pages2/PageServiceSftpSettings.qml |    6 +-
 .../Pages2/PageServiceTorWebsiteSettings.qml  |    6 +-
 .../ui/qml/Pages2/PageSettingsApplication.qml |    2 +-
 .../ui/qml/Pages2/PageSettingsServerData.qml  |    5 -
 .../qml/Pages2/PageSetupWizardCredentials.qml |   47 +-
 client/ui/qml/Pages2/PageSetupWizardEasy.qml  |   34 +-
 .../qml/Pages2/PageSetupWizardInstalling.qml  |    5 -
 client/ui/qml/Pages2/PageSetupWizardStart.qml |    3 +-
 client/ui/qml/Pages2/PageStart.qml            |   20 +
 21 files changed, 1002 insertions(+), 463 deletions(-)

diff --git a/client/amnezia_application.cpp b/client/amnezia_application.cpp
index 2ee9af16..7d7a0376 100644
--- a/client/amnezia_application.cpp
+++ b/client/amnezia_application.cpp
@@ -221,6 +221,12 @@ void AmneziaApplication::updateTranslator(const QLocale &locale)
     QResource::registerResource(":/translations.qrc");
     if (!m_translator->isEmpty())
         QCoreApplication::removeTranslator(m_translator);
+
+    if (locale == QLocale::English) {
+        m_settings->setAppLanguage(locale);
+        m_engine->retranslate();
+    }
+
     if (m_translator->load(locale, QString("amneziavpn"), QLatin1String("_"), QLatin1String(":/i18n"))) {
         if (QCoreApplication::installTranslator(m_translator)) {
             m_settings->setAppLanguage(locale);
@@ -228,6 +234,8 @@ void AmneziaApplication::updateTranslator(const QLocale &locale)
 
         m_engine->retranslate();
     }
+
+    emit translationsUpdated();
 }
 
 bool AmneziaApplication::parseCommands()
@@ -271,6 +279,7 @@ void AmneziaApplication::initModels()
     m_languageModel.reset(new LanguageModel(m_settings, this));
     m_engine->rootContext()->setContextProperty("LanguageModel", m_languageModel.get());
     connect(m_languageModel.get(), &LanguageModel::updateTranslations, this, &AmneziaApplication::updateTranslator);
+    connect(this, &AmneziaApplication::translationsUpdated, m_languageModel.get(), &LanguageModel::translationsUpdated);
 
     m_protocolsModel.reset(new ProtocolsModel(m_settings, this));
     m_engine->rootContext()->setContextProperty("ProtocolsModel", m_protocolsModel.get());
diff --git a/client/amnezia_application.h b/client/amnezia_application.h
index 3ba42e41..2a10aa86 100644
--- a/client/amnezia_application.h
+++ b/client/amnezia_application.h
@@ -65,6 +65,9 @@ public:
 
     QQmlApplicationEngine *qmlEngine() const;
 
+signals:
+    void translationsUpdated();
+
 private:
     void initModels();
     void initControllers();
diff --git a/client/translations/amneziavpn_ru.ts b/client/translations/amneziavpn_ru.ts
index 197c9d40..f338216b 100644
--- a/client/translations/amneziavpn_ru.ts
+++ b/client/translations/amneziavpn_ru.ts
@@ -138,6 +138,24 @@
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>ConnectionTypeSelectionDrawer</name>
+    <message>
+        <location filename="../ui/qml/Components/ConnectionTypeSelectionDrawer.qml" line="31"/>
+        <source>Connection data</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Components/ConnectionTypeSelectionDrawer.qml" line="40"/>
+        <source>Server IP, login and password</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Components/ConnectionTypeSelectionDrawer.qml" line="54"/>
+        <source>QR code, key or configuration file</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>ContextMenu</name>
     <message>
@@ -164,11 +182,71 @@
 <context>
     <name>ExportController</name>
     <message>
-        <location filename="../ui/controllers/exportController.cpp" line="107"/>
+        <location filename="../ui/controllers/exportController.cpp" line="35"/>
+        <source>Access error!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/controllers/exportController.cpp" line="235"/>
         <source>Save AmneziaVPN config</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>ImportController</name>
+    <message>
+        <location filename="../ui/controllers/importController.cpp" line="84"/>
+        <source>Open config file</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>InstallController</name>
+    <message>
+        <location filename="../ui/controllers/installController.cpp" line="97"/>
+        <location filename="../ui/controllers/installController.cpp" line="149"/>
+        <source> installed successfully. </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/controllers/installController.cpp" line="100"/>
+        <location filename="../ui/controllers/installController.cpp" line="152"/>
+        <source> is already installed on the server. </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/controllers/installController.cpp" line="103"/>
+        <location filename="../ui/controllers/installController.cpp" line="171"/>
+        <source>
+Already installed containers were found on the server. All installed containers have been added to the application</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/controllers/installController.cpp" line="258"/>
+        <source>Server &apos;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/controllers/installController.cpp" line="258"/>
+        <source>&apos; was removed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/controllers/installController.cpp" line="268"/>
+        <source>All containers from server &apos;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/controllers/installController.cpp" line="284"/>
+        <source> has been removed from the server &apos;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/controllers/installController.cpp" line="408"/>
+        <source>Please login as the user</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>NotificationHandler</name>
     <message>
@@ -198,156 +276,6 @@
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>OpenVpnSettings</name>
-    <message>
-        <location filename="../ui/qml/Components/Protocols/OpenVpnSettings.qml" line="33"/>
-        <source>VPN Addresses Subnet</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Components/Protocols/OpenVpnSettings.qml" line="39"/>
-        <source>Network protocol</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Components/Protocols/OpenVpnSettings.qml" line="49"/>
-        <source>Port</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Components/Protocols/OpenVpnSettings.qml" line="54"/>
-        <source>Auto-negotiate encryption</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Components/Protocols/OpenVpnSettings.qml" line="62"/>
-        <location filename="../ui/qml/Components/Protocols/OpenVpnSettings.qml" line="63"/>
-        <source>Hash</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Components/Protocols/OpenVpnSettings.qml" line="69"/>
-        <source>SHA512</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Components/Protocols/OpenVpnSettings.qml" line="70"/>
-        <source>SHA384</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Components/Protocols/OpenVpnSettings.qml" line="71"/>
-        <source>SHA256</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Components/Protocols/OpenVpnSettings.qml" line="72"/>
-        <source>SHA3-512</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Components/Protocols/OpenVpnSettings.qml" line="73"/>
-        <source>SHA3-384</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Components/Protocols/OpenVpnSettings.qml" line="74"/>
-        <source>SHA3-256</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Components/Protocols/OpenVpnSettings.qml" line="75"/>
-        <source>whirlpool</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Components/Protocols/OpenVpnSettings.qml" line="76"/>
-        <source>BLAKE2b512</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Components/Protocols/OpenVpnSettings.qml" line="77"/>
-        <source>BLAKE2s256</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Components/Protocols/OpenVpnSettings.qml" line="78"/>
-        <source>SHA1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Components/Protocols/OpenVpnSettings.qml" line="98"/>
-        <location filename="../ui/qml/Components/Protocols/OpenVpnSettings.qml" line="99"/>
-        <source>Cipher</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Components/Protocols/OpenVpnSettings.qml" line="105"/>
-        <source>AES-256-GCM</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Components/Protocols/OpenVpnSettings.qml" line="106"/>
-        <source>AES-192-GCM</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Components/Protocols/OpenVpnSettings.qml" line="107"/>
-        <source>AES-128-GCM</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Components/Protocols/OpenVpnSettings.qml" line="108"/>
-        <source>AES-256-CBC</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Components/Protocols/OpenVpnSettings.qml" line="109"/>
-        <source>AES-192-CBC</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Components/Protocols/OpenVpnSettings.qml" line="110"/>
-        <source>AES-128-CBC</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Components/Protocols/OpenVpnSettings.qml" line="111"/>
-        <source>ChaCha20-Poly1305</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Components/Protocols/OpenVpnSettings.qml" line="112"/>
-        <source>ARIA-256-CBC</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Components/Protocols/OpenVpnSettings.qml" line="113"/>
-        <source>CAMELLIA-256-CBC</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Components/Protocols/OpenVpnSettings.qml" line="114"/>
-        <source>none</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Components/Protocols/OpenVpnSettings.qml" line="132"/>
-        <source>TLS auth</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Components/Protocols/OpenVpnSettings.qml" line="138"/>
-        <source>Block DNS requests outside of VPN</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Components/Protocols/OpenVpnSettings.qml" line="144"/>
-        <source>Additional configuration commands</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
     <name>PageAbout</name>
     <message>
@@ -545,6 +473,11 @@
         <source>Removing services from </source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageDeinstalling.qml" line="84"/>
+        <source>Usually it takes no more than 5 minutes</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PageGeneralSettings</name>
@@ -587,12 +520,12 @@
 <context>
     <name>PageHome</name>
     <message>
-        <location filename="../ui/qml/Pages2/PageHome.qml" line="167"/>
-        <source>Протокол подключения</source>
+        <location filename="../ui/qml/Pages2/PageHome.qml" line="158"/>
+        <source>VPN protocol</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageHome.qml" line="213"/>
+        <location filename="../ui/qml/Pages2/PageHome.qml" line="204"/>
         <source>Servers</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1049,6 +982,304 @@ If AmneziaDNS service is not installed on the same server, or this option is unc
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>PageProtocolCloakSettings</name>
+    <message>
+        <location filename="../ui/qml/Pages2/PageProtocolCloakSettings.qml" line="22"/>
+        <source>Settings updated successfully</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageProtocolCloakSettings.qml" line="84"/>
+        <source>Cloak settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageProtocolCloakSettings.qml" line="91"/>
+        <source>Disguised as traffic from</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageProtocolCloakSettings.qml" line="105"/>
+        <source>Port</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageProtocolCloakSettings.qml" line="121"/>
+        <location filename="../ui/qml/Pages2/PageProtocolCloakSettings.qml" line="122"/>
+        <source>Cipher</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageProtocolCloakSettings.qml" line="160"/>
+        <source>Save and Restart Amnezia</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PageProtocolOpenVpnSettings</name>
+    <message>
+        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="23"/>
+        <source>Settings updated successfully</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="85"/>
+        <source>OpenVPN settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="92"/>
+        <source>VPN Addresses Subnet</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="106"/>
+        <source>Network protocol</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="135"/>
+        <source>Port</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="151"/>
+        <source>Auto-negotiate encryption</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="169"/>
+        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="170"/>
+        <source>Hash</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="178"/>
+        <source>SHA512</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="179"/>
+        <source>SHA384</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="180"/>
+        <source>SHA256</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="181"/>
+        <source>SHA3-512</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="182"/>
+        <source>SHA3-384</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="183"/>
+        <source>SHA3-256</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="184"/>
+        <source>whirlpool</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="185"/>
+        <source>BLAKE2b512</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="186"/>
+        <source>BLAKE2s256</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="187"/>
+        <source>SHA1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="216"/>
+        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="217"/>
+        <source>Cipher</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="225"/>
+        <source>AES-256-GCM</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="226"/>
+        <source>AES-192-GCM</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="227"/>
+        <source>AES-128-GCM</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="228"/>
+        <source>AES-256-CBC</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="229"/>
+        <source>AES-192-CBC</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="230"/>
+        <source>AES-128-CBC</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="231"/>
+        <source>ChaCha20-Poly1305</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="232"/>
+        <source>ARIA-256-CBC</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="233"/>
+        <source>CAMELLIA-256-CBC</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="234"/>
+        <source>none</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="267"/>
+        <source>TLS auth</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="282"/>
+        <source>Block DNS requests outside of VPN</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="301"/>
+        <source>Additional client configuration commands</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="338"/>
+        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="396"/>
+        <source>Commands:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="359"/>
+        <source>Additional server configuration commands</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="420"/>
+        <source>Remove OpenVPN</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="423"/>
+        <source>Remove OpenVpn from server?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="424"/>
+        <source>Continue</source>
+        <translation type="unfinished">Продолжить</translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="425"/>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="444"/>
+        <source>Save and Restart Amnezia</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PageProtocolRaw</name>
+    <message>
+        <location filename="../ui/qml/Pages2/PageProtocolRaw.qml" line="38"/>
+        <source> settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageProtocolRaw.qml" line="78"/>
+        <source>Show connection options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageProtocolRaw.qml" line="130"/>
+        <source>Connection options </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageProtocolRaw.qml" line="172"/>
+        <location filename="../ui/qml/Pages2/PageProtocolRaw.qml" line="176"/>
+        <source>Remove </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageProtocolRaw.qml" line="176"/>
+        <source> from server?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageProtocolRaw.qml" line="177"/>
+        <source>Continue</source>
+        <translation type="unfinished">Продолжить</translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageProtocolRaw.qml" line="178"/>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PageProtocolShadowSocksSettings</name>
+    <message>
+        <location filename="../ui/qml/Pages2/PageProtocolShadowSocksSettings.qml" line="22"/>
+        <source>Settings updated successfully</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageProtocolShadowSocksSettings.qml" line="84"/>
+        <source>ShadowSocks settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageProtocolShadowSocksSettings.qml" line="91"/>
+        <source>Port</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageProtocolShadowSocksSettings.qml" line="107"/>
+        <location filename="../ui/qml/Pages2/PageProtocolShadowSocksSettings.qml" line="108"/>
+        <source>Cipher</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageProtocolShadowSocksSettings.qml" line="146"/>
+        <source>Save and Restart Amnezia</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>PageQrDecoderIos</name>
     <message>
@@ -1175,6 +1406,139 @@ If AmneziaDNS service is not installed on the same server, or this option is unc
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>PageServiceSftpSettings</name>
+    <message>
+        <location filename="../ui/qml/Pages2/PageServiceSftpSettings.qml" line="24"/>
+        <source>Settings updated successfully</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageServiceSftpSettings.qml" line="85"/>
+        <source>SFTP settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageServiceSftpSettings.qml" line="92"/>
+        <source>Host</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageServiceSftpSettings.qml" line="108"/>
+        <source>Port</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageServiceSftpSettings.qml" line="124"/>
+        <source>Login</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageServiceSftpSettings.qml" line="140"/>
+        <source>Password</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageServiceSftpSettings.qml" line="179"/>
+        <source>Mount folder on device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageServiceSftpSettings.qml" line="202"/>
+        <source>In order to mount remote SFTP folder as local drive, perform following steps: &lt;br&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageServiceSftpSettings.qml" line="204"/>
+        <location filename="../ui/qml/Pages2/PageServiceSftpSettings.qml" line="207"/>
+        <source>&lt;br&gt;1. Install the latest version of </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageServiceSftpSettings.qml" line="205"/>
+        <location filename="../ui/qml/Pages2/PageServiceSftpSettings.qml" line="208"/>
+        <source>&lt;br&gt;2. Install the latest version of </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageServiceSftpSettings.qml" line="229"/>
+        <source>Detailed instructions</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageServiceSftpSettings.qml" line="247"/>
+        <source>Remove SFTP and all data stored there</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageServiceSftpSettings.qml" line="250"/>
+        <source>Some description</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageServiceSftpSettings.qml" line="251"/>
+        <source>Continue</source>
+        <translation type="unfinished">Продолжить</translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageServiceSftpSettings.qml" line="252"/>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PageServiceTorWebsiteSettings</name>
+    <message>
+        <location filename="../ui/qml/Pages2/PageServiceTorWebsiteSettings.qml" line="25"/>
+        <source>Settings updated successfully</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageServiceTorWebsiteSettings.qml" line="62"/>
+        <source>Tor website settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageServiceTorWebsiteSettings.qml" line="69"/>
+        <source>Website address</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageServiceTorWebsiteSettings.qml" line="107"/>
+        <source>Use &lt;a href=&quot;https://www.torproject.org/download/&quot; style=&quot;color: #FBB26A;&quot;&gt;Tor Browser&lt;/a&gt; to open this url.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageServiceTorWebsiteSettings.qml" line="116"/>
+        <source>After installation it takes several minutes while your onion site will become available in the Tor Network.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageServiceTorWebsiteSettings.qml" line="125"/>
+        <source>When configuring WordPress set the domain as this onion address.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageServiceTorWebsiteSettings.qml" line="139"/>
+        <source>Remove website</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageServiceTorWebsiteSettings.qml" line="142"/>
+        <source>Some description</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageServiceTorWebsiteSettings.qml" line="143"/>
+        <source>Continue</source>
+        <translation type="unfinished">Продолжить</translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageServiceTorWebsiteSettings.qml" line="144"/>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>PageSettings</name>
     <message>
@@ -1275,65 +1639,85 @@ And if you don&apos;t like the app, all the more support it - the donation will
 <context>
     <name>PageSettingsApplication</name>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="44"/>
+        <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="43"/>
         <source>Application</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="51"/>
+        <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="50"/>
         <source>Language</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="67"/>
+        <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="69"/>
+        <source>Logging</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="70"/>
+        <source>Enabled</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="70"/>
+        <source>Disabled</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="83"/>
         <source>Reset settings and remove all data from the application</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="87"/>
+        <source>Reset settings and remove all data from the application?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="88"/>
+        <source>All settings will be reset to default. All installed AmneziaVPN services will still remain on the server.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="89"/>
+        <source>Continue</source>
+        <translation type="unfinished">Продолжить</translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="90"/>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PageSettingsBackup</name>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsBackup.qml" line="44"/>
+        <location filename="../ui/qml/Pages2/PageSettingsBackup.qml" line="58"/>
         <source>Backup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsBackup.qml" line="51"/>
-        <source>Save logs</source>
+        <location filename="../ui/qml/Pages2/PageSettingsBackup.qml" line="23"/>
+        <source>Settings restored from backup file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsBackup.qml" line="83"/>
-        <source>Open folder with logs</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Pages2/PageSettingsBackup.qml" line="107"/>
-        <source>Save logs to file</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Pages2/PageSettingsBackup.qml" line="131"/>
-        <source>Clear logs</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Pages2/PageSettingsBackup.qml" line="141"/>
+        <location filename="../ui/qml/Pages2/PageSettingsBackup.qml" line="65"/>
         <source>Configuration backup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsBackup.qml" line="148"/>
+        <location filename="../ui/qml/Pages2/PageSettingsBackup.qml" line="72"/>
         <source>It will help you instantly restore connection settings at the next installation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsBackup.qml" line="156"/>
+        <location filename="../ui/qml/Pages2/PageSettingsBackup.qml" line="80"/>
         <source>Make a backup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsBackup.qml" line="174"/>
+        <location filename="../ui/qml/Pages2/PageSettingsBackup.qml" line="100"/>
         <source>Restore from backup</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1347,7 +1731,7 @@ And if you don&apos;t like the app, all the more support it - the donation will
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsConnection.qml" line="51"/>
-        <source>Use AmnesiaDNS if installed on the server</source>
+        <source>Use AmneziaDNS if installed on the server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1399,11 +1783,39 @@ And if you don&apos;t like the app, all the more support it - the donation will
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsDns.qml" line="72"/>
+        <location filename="../ui/qml/Pages2/PageSettingsDns.qml" line="78"/>
         <source>Save</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>PageSettingsLogging</name>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsLogging.qml" line="44"/>
+        <source>Logging</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsLogging.qml" line="51"/>
+        <source>Save logs</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsLogging.qml" line="83"/>
+        <source>Open folder with logs</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsLogging.qml" line="107"/>
+        <source>Save logs to file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsLogging.qml" line="131"/>
+        <source>Clear logs</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>PageSettingsServerData</name>
     <message>
@@ -1413,80 +1825,80 @@ And if you don&apos;t like the app, all the more support it - the donation will
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsServerData.qml" line="25"/>
-        <source>Не найдено установленных контейнеров</source>
+        <source>No installed containers found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsServerData.qml" line="59"/>
+        <location filename="../ui/qml/Pages2/PageSettingsServerData.qml" line="80"/>
         <source>Clear Amnezia cache</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsServerData.qml" line="60"/>
+        <location filename="../ui/qml/Pages2/PageSettingsServerData.qml" line="81"/>
         <source>May be needed when changing other settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsServerData.qml" line="63"/>
+        <location filename="../ui/qml/Pages2/PageSettingsServerData.qml" line="84"/>
         <source>Clear cached profiles?</source>
         <translation>Очистить закешированные профили</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsServerData.qml" line="64"/>
+        <location filename="../ui/qml/Pages2/PageSettingsServerData.qml" line="85"/>
         <source>some description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsServerData.qml" line="65"/>
-        <location filename="../ui/qml/Pages2/PageSettingsServerData.qml" line="108"/>
-        <location filename="../ui/qml/Pages2/PageSettingsServerData.qml" line="143"/>
+        <location filename="../ui/qml/Pages2/PageSettingsServerData.qml" line="86"/>
+        <location filename="../ui/qml/Pages2/PageSettingsServerData.qml" line="131"/>
+        <location filename="../ui/qml/Pages2/PageSettingsServerData.qml" line="162"/>
         <source>Continue</source>
         <translation>Продолжить</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsServerData.qml" line="66"/>
-        <location filename="../ui/qml/Pages2/PageSettingsServerData.qml" line="109"/>
-        <location filename="../ui/qml/Pages2/PageSettingsServerData.qml" line="144"/>
+        <location filename="../ui/qml/Pages2/PageSettingsServerData.qml" line="87"/>
+        <location filename="../ui/qml/Pages2/PageSettingsServerData.qml" line="132"/>
+        <location filename="../ui/qml/Pages2/PageSettingsServerData.qml" line="163"/>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsServerData.qml" line="87"/>
-        <source>Проверить сервер на наличие ранее установленных сервисов Amnezia</source>
+        <location filename="../ui/qml/Pages2/PageSettingsServerData.qml" line="108"/>
+        <source>Check the server for previously installed Amnezia services</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsServerData.qml" line="88"/>
-        <source>Добавим их в приложение, если они не отображались</source>
+        <location filename="../ui/qml/Pages2/PageSettingsServerData.qml" line="109"/>
+        <source>Add them to the application if they were not displayed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsServerData.qml" line="102"/>
+        <location filename="../ui/qml/Pages2/PageSettingsServerData.qml" line="125"/>
         <source>Remove server from application</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsServerData.qml" line="106"/>
+        <location filename="../ui/qml/Pages2/PageSettingsServerData.qml" line="129"/>
         <source>Remove server?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsServerData.qml" line="107"/>
+        <location filename="../ui/qml/Pages2/PageSettingsServerData.qml" line="130"/>
         <source>All installed AmneziaVPN services will still remain on the server.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsServerData.qml" line="137"/>
+        <location filename="../ui/qml/Pages2/PageSettingsServerData.qml" line="156"/>
         <source>Clear server from Amnezia software</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsServerData.qml" line="141"/>
+        <location filename="../ui/qml/Pages2/PageSettingsServerData.qml" line="160"/>
         <source>Clear server from Amnezia software?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsServerData.qml" line="142"/>
+        <location filename="../ui/qml/Pages2/PageSettingsServerData.qml" line="161"/>
         <source> All containers will be deleted on the server. This means that configuration files, keys and certificates will be deleted.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1499,26 +1911,63 @@ And if you don&apos;t like the app, all the more support it - the donation will
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsServerInfo.qml" line="108"/>
+        <location filename="../ui/qml/Pages2/PageSettingsServerInfo.qml" line="109"/>
         <source>Save</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsServerInfo.qml" line="135"/>
+        <location filename="../ui/qml/Pages2/PageSettingsServerInfo.qml" line="136"/>
         <source>Protocols</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsServerInfo.qml" line="141"/>
+        <location filename="../ui/qml/Pages2/PageSettingsServerInfo.qml" line="142"/>
         <source>Services</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsServerInfo.qml" line="145"/>
+        <location filename="../ui/qml/Pages2/PageSettingsServerInfo.qml" line="146"/>
         <source>Data</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>PageSettingsServerProtocol</name>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsServerProtocol.qml" line="38"/>
+        <source> settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsServerProtocol.qml" line="111"/>
+        <location filename="../ui/qml/Pages2/PageSettingsServerProtocol.qml" line="115"/>
+        <source>Remove </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsServerProtocol.qml" line="115"/>
+        <source> from server?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsServerProtocol.qml" line="116"/>
+        <source>Continue</source>
+        <translation type="unfinished">Продолжить</translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsServerProtocol.qml" line="117"/>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PageSettingsServersList</name>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsServersList.qml" line="39"/>
+        <source>Servers</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>PageSetupWizard</name>
     <message>
@@ -1568,6 +2017,41 @@ OpenVPN profile will be installed.
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>PageSetupWizardConfigSource</name>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSetupWizardConfigSource.qml" line="49"/>
+        <source>Server connection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSetupWizardConfigSource.qml" line="50"/>
+        <source>Do not use connection code from public sources. It may have been created to intercept your data.
+
+It&apos;s okay if a friend passed the code.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSetupWizardConfigSource.qml" line="60"/>
+        <source>What do you have?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSetupWizardConfigSource.qml" line="67"/>
+        <source>File with connection settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSetupWizardConfigSource.qml" line="83"/>
+        <source>QR-code</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSetupWizardConfigSource.qml" line="100"/>
+        <source>Key as text</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>PageSetupWizardCredentials</name>
     <message>
@@ -1582,42 +2066,47 @@ OpenVPN profile will be installed.
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSetupWizardCredentials.qml" line="52"/>
-        <location filename="../ui/qml/Pages2/PageSetupWizardCredentials.qml" line="125"/>
+        <source>255.255.255.255:88</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSetupWizardCredentials.qml" line="56"/>
+        <location filename="../ui/qml/Pages2/PageSetupWizardCredentials.qml" line="70"/>
+        <source>Insert</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSetupWizardCredentials.qml" line="84"/>
+        <source>Password / SSH private key</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSetupWizardCredentials.qml" line="97"/>
+        <source>Continue</source>
+        <translation type="unfinished">Продолжить</translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSetupWizardCredentials.qml" line="152"/>
         <source>Enter the address in the format 255.255.255.255:88</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSetupWizardCredentials.qml" line="62"/>
+        <location filename="../ui/qml/Pages2/PageSetupWizardCredentials.qml" line="68"/>
         <source>Login to connect via SSH</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSetupWizardCredentials.qml" line="69"/>
-        <source>Password / Private key</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Pages2/PageSetupWizardCredentials.qml" line="77"/>
-        <source>Set up a server the easy way</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Pages2/PageSetupWizardCredentials.qml" line="102"/>
-        <source>Select protocol to install</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Pages2/PageSetupWizardCredentials.qml" line="122"/>
+        <location filename="../ui/qml/Pages2/PageSetupWizardCredentials.qml" line="149"/>
         <source>Ip address cannot be empty</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSetupWizardCredentials.qml" line="129"/>
+        <location filename="../ui/qml/Pages2/PageSetupWizardCredentials.qml" line="156"/>
         <source>Login cannot be empty</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSetupWizardCredentials.qml" line="133"/>
+        <location filename="../ui/qml/Pages2/PageSetupWizardCredentials.qml" line="160"/>
         <source>Password/private key cannot be empty</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1625,12 +2114,22 @@ OpenVPN profile will be installed.
 <context>
     <name>PageSetupWizardEasy</name>
     <message>
-        <location filename="../ui/qml/Pages2/PageSetupWizardEasy.qml" line="64"/>
+        <location filename="../ui/qml/Pages2/PageSetupWizardEasy.qml" line="66"/>
         <source>What is the level of internet control in your region?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSetupWizardEasy.qml" line="132"/>
+        <source>Set up a VPN yourself</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSetupWizardEasy.qml" line="133"/>
+        <source>I want to choose a VPN protocol</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSetupWizardEasy.qml" line="148"/>
         <source>Continue</source>
         <translation type="unfinished">Продолжить</translation>
     </message>
@@ -1670,14 +2169,18 @@ This protocol support exporting connection profiles to mobile devices by exporti
 <context>
     <name>PageSetupWizardInstalling</name>
     <message>
-        <location filename="../ui/qml/Pages2/PageSetupWizardInstalling.qml" line="40"/>
-        <location filename="../ui/qml/Pages2/PageSetupWizardInstalling.qml" line="57"/>
-        <source>The container you are trying to install is already installed on the server. All installed containers have been added to the application</source>
+        <location filename="../ui/qml/Pages2/PageSetupWizardInstalling.qml" line="52"/>
+        <source>The server has already been added to the application</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSetupWizardInstalling.qml" line="67"/>
-        <source>The server has already been added to the application</source>
+        <location filename="../ui/qml/Pages2/PageSetupWizardInstalling.qml" line="106"/>
+        <source>Installing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSetupWizardInstalling.qml" line="132"/>
+        <source>Usually it takes no more than 5 minutes</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -1751,31 +2254,72 @@ This protocol supports exporting connection profiles to mobile devices by using
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSetupWizardProtocolSettings.qml" line="161"/>
+        <location filename="../ui/qml/Pages2/PageSetupWizardProtocolSettings.qml" line="162"/>
         <source>detailed protocol description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSetupWizardProtocolSettings.qml" line="181"/>
+        <location filename="../ui/qml/Pages2/PageSetupWizardProtocolSettings.qml" line="182"/>
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSetupWizardProtocolSettings.qml" line="226"/>
-        <source>Установить</source>
+        <location filename="../ui/qml/Pages2/PageSetupWizardProtocolSettings.qml" line="197"/>
+        <source>Network protocol</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSetupWizardProtocolSettings.qml" line="213"/>
+        <source>Port</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSetupWizardProtocolSettings.qml" line="227"/>
+        <source>Install</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PageSetupWizardProtocols</name>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSetupWizardProtocols.qml" line="73"/>
+        <source>VPN protocol</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSetupWizardProtocols.qml" line="74"/>
+        <source>Choose the one with the highest priority for you. Later, you can install other protocols and additional services, such as DNS proxy and SFTP.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PageSetupWizardQrReader</name>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSetupWizardQrReader.qml" line="29"/>
+        <source>Point the camera at the QR code and hold for a couple of seconds.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PageSetupWizardStart</name>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSetupWizardStart.qml" line="56"/>
+        <source>Free service for creating a personal VPN on your server.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSetupWizardStart.qml" line="57"/>
+        <source> Helps you access blocked content without revealing your privacy, even to VPN providers.</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSetupWizardStart.qml" line="66"/>
-        <source>У меня есть данные для подключения</source>
+        <source>I have the data to connect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSetupWizardStart.qml" line="86"/>
-        <source>У меня ничего нет</source>
+        <source>I have nothing</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -1837,27 +2381,27 @@ Please note, you should add addresses to the list after VPN connection establish
 <context>
     <name>PageSetupWizardViewConfig</name>
     <message>
-        <location filename="../ui/qml/Pages2/PageSetupWizardViewConfig.qml" line="64"/>
+        <location filename="../ui/qml/Pages2/PageSetupWizardViewConfig.qml" line="63"/>
         <source>New connection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSetupWizardViewConfig.qml" line="90"/>
+        <location filename="../ui/qml/Pages2/PageSetupWizardViewConfig.qml" line="89"/>
         <source>Do not use connection code from public sources. It could be created to intercept your data.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSetupWizardViewConfig.qml" line="101"/>
+        <location filename="../ui/qml/Pages2/PageSetupWizardViewConfig.qml" line="100"/>
         <source>Collapse content</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSetupWizardViewConfig.qml" line="101"/>
+        <location filename="../ui/qml/Pages2/PageSetupWizardViewConfig.qml" line="100"/>
         <source>Show content</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSetupWizardViewConfig.qml" line="144"/>
+        <location filename="../ui/qml/Pages2/PageSetupWizardViewConfig.qml" line="143"/>
         <source>Connect</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1865,80 +2409,84 @@ Please note, you should add addresses to the list after VPN connection establish
 <context>
     <name>PageShare</name>
     <message>
-        <location filename="../ui/qml/Pages2/PageShare.qml" line="38"/>
-        <source>For the AmnesiaVPN app</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Pages2/PageShare.qml" line="45"/>
+        <location filename="../ui/qml/Pages2/PageShare.qml" line="73"/>
         <source>OpenVpn native format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageShare.qml" line="52"/>
+        <location filename="../ui/qml/Pages2/PageShare.qml" line="78"/>
         <source>WireGuard native format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageShare.qml" line="77"/>
+        <location filename="../ui/qml/Pages2/PageShare.qml" line="101"/>
         <source>VPN Access</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageShare.qml" line="102"/>
+        <location filename="../ui/qml/Pages2/PageShare.qml" line="126"/>
         <source>Connection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageShare.qml" line="113"/>
-        <source>Full</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Pages2/PageShare.qml" line="126"/>
+        <location filename="../ui/qml/Pages2/PageShare.qml" line="153"/>
         <source>VPN access without the ability to manage the server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageShare.qml" line="127"/>
+        <location filename="../ui/qml/Pages2/PageShare.qml" line="154"/>
         <source>Full access to server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageShare.qml" line="141"/>
+        <location filename="../ui/qml/Pages2/PageShare.qml" line="168"/>
         <source>Server and service</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageShare.qml" line="142"/>
+        <location filename="../ui/qml/Pages2/PageShare.qml" line="169"/>
         <source>Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageShare.qml" line="216"/>
+        <location filename="../ui/qml/Pages2/PageShare.qml" line="197"/>
+        <source>Accessing </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageShare.qml" line="256"/>
         <source>Protocols and services</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageShare.qml" line="241"/>
-        <location filename="../ui/qml/Pages2/PageShare.qml" line="253"/>
+        <location filename="../ui/qml/Pages2/PageShare.qml" line="303"/>
         <source>Connection to </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageShare.qml" line="242"/>
-        <location filename="../ui/qml/Pages2/PageShare.qml" line="254"/>
+        <location filename="../ui/qml/Pages2/PageShare.qml" line="198"/>
+        <location filename="../ui/qml/Pages2/PageShare.qml" line="304"/>
         <source>File with connection settings to </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageShare.qml" line="290"/>
-        <location filename="../ui/qml/Pages2/PageShare.qml" line="291"/>
+        <location filename="../ui/qml/Pages2/PageShare.qml" line="68"/>
+        <source>For the AmneziaVPN app</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageShare.qml" line="138"/>
+        <source>Full access</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageShare.qml" line="340"/>
+        <location filename="../ui/qml/Pages2/PageShare.qml" line="341"/>
         <source>Connection format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageShare.qml" line="323"/>
+        <location filename="../ui/qml/Pages2/PageShare.qml" line="375"/>
         <source>Share</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2298,87 +2846,6 @@ New encryption keys pair will be generated.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>PageTest</name>
-    <message>
-        <location filename="../ui/qml/Pages2/PageTest.qml" line="53"/>
-        <source>Протоколы</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Pages2/PageTest.qml" line="57"/>
-        <source>Сервисы</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Pages2/PageTest.qml" line="61"/>
-        <source>Данные</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Pages2/PageTest.qml" line="93"/>
-        <location filename="../ui/qml/Pages2/PageTest.qml" line="108"/>
-        <source>Forget this server</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Pages2/PageTest.qml" line="180"/>
-        <source>SHA512</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Pages2/PageTest.qml" line="181"/>
-        <source>SHA384</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Pages2/PageTest.qml" line="182"/>
-        <source>SHA256</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Pages2/PageTest.qml" line="183"/>
-        <source>SHA3-512</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Pages2/PageTest.qml" line="184"/>
-        <source>SHA3-384</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Pages2/PageTest.qml" line="185"/>
-        <source>SHA3-256</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Pages2/PageTest.qml" line="186"/>
-        <source>whirlpool</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Pages2/PageTest.qml" line="187"/>
-        <source>BLAKE2b512</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Pages2/PageTest.qml" line="188"/>
-        <source>BLAKE2s256</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Pages2/PageTest.qml" line="189"/>
-        <source>SHA1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Pages2/PageTest.qml" line="214"/>
-        <location filename="../ui/qml/Pages2/PageTest.qml" line="220"/>
-        <location filename="../ui/qml/Pages2/PageTest.qml" line="221"/>
-        <source>Auto-negotiate encryption</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
     <name>PageVPN</name>
     <message>
@@ -2470,7 +2937,7 @@ AmneziaVPN detected this profile may contain malicious scripts. Please, carefull
 <context>
     <name>PopupType</name>
     <message>
-        <location filename="../ui/qml/Controls2/PopupType.qml" line="57"/>
+        <location filename="../ui/qml/Controls2/PopupType.qml" line="68"/>
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2683,59 +3150,63 @@ AmneziaVPN detected this profile may contain malicious scripts. Please, carefull
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../containers/containers_defs.cpp" line="88"/>
+        <location filename="../containers/containers_defs.cpp" line="87"/>
         <source>IPsec</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../containers/containers_defs.cpp" line="90"/>
-        <location filename="../containers/containers_defs.cpp" line="107"/>
+        <location filename="../containers/containers_defs.cpp" line="89"/>
+        <location filename="../containers/containers_defs.cpp" line="105"/>
         <source>Web site in Tor network</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../containers/containers_defs.cpp" line="91"/>
-        <location filename="../containers/containers_defs.cpp" line="108"/>
+        <location filename="../containers/containers_defs.cpp" line="106"/>
         <source>DNS Service</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../containers/containers_defs.cpp" line="93"/>
+        <location filename="../containers/containers_defs.cpp" line="92"/>
         <source>Sftp file sharing service</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../containers/containers_defs.cpp" line="100"/>
+        <location filename="../containers/containers_defs.cpp" line="90"/>
+        <source>Amnezia DNS</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../containers/containers_defs.cpp" line="97"/>
         <source>OpenVPN container</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../containers/containers_defs.cpp" line="101"/>
+        <location filename="../containers/containers_defs.cpp" line="98"/>
         <source>Container with OpenVpn and ShadowSocks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../containers/containers_defs.cpp" line="102"/>
+        <location filename="../containers/containers_defs.cpp" line="100"/>
         <source>Container with OpenVpn and ShadowSocks protocols configured with traffic masking by Cloak plugin</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../containers/containers_defs.cpp" line="104"/>
+        <location filename="../containers/containers_defs.cpp" line="102"/>
         <source>WireGuard container</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../containers/containers_defs.cpp" line="105"/>
+        <location filename="../containers/containers_defs.cpp" line="103"/>
         <source>IPsec container</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../containers/containers_defs.cpp" line="110"/>
+        <location filename="../containers/containers_defs.cpp" line="108"/>
         <source>Sftp file sharing service - is secure FTP service</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../protocols/protocols_defs.cpp" line="82"/>
+        <location filename="../protocols/protocols_defs.cpp" line="72"/>
         <source>Sftp service</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2788,17 +3259,17 @@ AmneziaVPN detected this profile may contain malicious scripts. Please, carefull
 <context>
     <name>ServerContainersLogic</name>
     <message>
-        <location filename="../ui/pages_logic/ServerContainersLogic.cpp" line="117"/>
+        <location filename="../ui/pages_logic/ServerContainersLogic.cpp" line="124"/>
         <source>Error occurred while configuring server.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/pages_logic/ServerContainersLogic.cpp" line="118"/>
+        <location filename="../ui/pages_logic/ServerContainersLogic.cpp" line="124"/>
         <source>Error message: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/pages_logic/ServerContainersLogic.cpp" line="119"/>
+        <location filename="../ui/pages_logic/ServerContainersLogic.cpp" line="125"/>
         <source>See logs for details.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2807,17 +3278,17 @@ AmneziaVPN detected this profile may contain malicious scripts. Please, carefull
     <name>ServerSettingsLogic</name>
     <message>
         <location filename="../ui/pages_logic/ServerSettingsLogic.cpp" line="21"/>
-        <location filename="../ui/pages_logic/ServerSettingsLogic.cpp" line="90"/>
+        <location filename="../ui/pages_logic/ServerSettingsLogic.cpp" line="88"/>
         <source>Clear client cached profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/pages_logic/ServerSettingsLogic.cpp" line="47"/>
+        <location filename="../ui/pages_logic/ServerSettingsLogic.cpp" line="48"/>
         <source>Service: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/pages_logic/ServerSettingsLogic.cpp" line="82"/>
+        <location filename="../ui/pages_logic/ServerSettingsLogic.cpp" line="81"/>
         <source>Cache cleared</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2825,13 +3296,13 @@ AmneziaVPN detected this profile may contain malicious scripts. Please, carefull
 <context>
     <name>Settings</name>
     <message>
-        <location filename="../settings.cpp" line="29"/>
+        <location filename="../settings.cpp" line="26"/>
         <source>Server #1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settings.cpp" line="200"/>
-        <location filename="../settings.cpp" line="207"/>
+        <location filename="../settings.cpp" line="202"/>
+        <location filename="../settings.cpp" line="209"/>
         <source>Server</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2844,20 +3315,30 @@ AmneziaVPN detected this profile may contain malicious scripts. Please, carefull
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/controllers/settingsController.cpp" line="66"/>
+        <location filename="../ui/controllers/settingsController.cpp" line="67"/>
         <source>Save log</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/controllers/settingsController.cpp" line="77"/>
+        <location filename="../ui/controllers/settingsController.cpp" line="78"/>
         <source>Backup application config</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/controllers/settingsController.cpp" line="83"/>
+        <location filename="../ui/controllers/settingsController.cpp" line="84"/>
         <source>Open backup</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../ui/controllers/settingsController.cpp" line="88"/>
+        <source>Backup file is empty</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/controllers/settingsController.cpp" line="101"/>
+        <source>Backup file is corrupted</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ShareConnectionButtonCopyType</name>
@@ -2875,22 +3356,22 @@ AmneziaVPN detected this profile may contain malicious scripts. Please, carefull
 <context>
     <name>ShareConnectionDrawer</name>
     <message>
-        <location filename="../ui/qml/Components/ShareConnectionDrawer.qml" line="52"/>
-        <source>Save connection code</source>
+        <location filename="../ui/qml/Components/ShareConnectionDrawer.qml" line="57"/>
+        <source>Share</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Components/ShareConnectionDrawer.qml" line="70"/>
+        <location filename="../ui/qml/Components/ShareConnectionDrawer.qml" line="76"/>
         <source>Copy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Components/ShareConnectionDrawer.qml" line="89"/>
+        <location filename="../ui/qml/Components/ShareConnectionDrawer.qml" line="96"/>
         <source>Show content</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Components/ShareConnectionDrawer.qml" line="204"/>
+        <location filename="../ui/qml/Components/ShareConnectionDrawer.qml" line="218"/>
         <source>To read the QR code in the Amnezia app, select &quot;Add Server&quot; → &quot;I have connection details&quot;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2934,24 +3415,24 @@ AmneziaVPN detected this profile may contain malicious scripts. Please, carefull
 <context>
     <name>StartPageLogic</name>
     <message>
-        <location filename="../ui/pages_logic/StartPageLogic.cpp" line="54"/>
-        <location filename="../ui/pages_logic/StartPageLogic.cpp" line="174"/>
+        <location filename="../ui/pages_logic/StartPageLogic.cpp" line="55"/>
+        <location filename="../ui/pages_logic/StartPageLogic.cpp" line="171"/>
         <source>Connect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/pages_logic/StartPageLogic.cpp" line="96"/>
-        <location filename="../ui/pages_logic/StartPageLogic.cpp" line="103"/>
+        <location filename="../ui/pages_logic/StartPageLogic.cpp" line="95"/>
+        <location filename="../ui/pages_logic/StartPageLogic.cpp" line="100"/>
         <source>Please fill in all fields</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/pages_logic/StartPageLogic.cpp" line="132"/>
+        <location filename="../ui/pages_logic/StartPageLogic.cpp" line="129"/>
         <source>Connecting...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/pages_logic/StartPageLogic.cpp" line="187"/>
+        <location filename="../ui/pages_logic/StartPageLogic.cpp" line="185"/>
         <source>Open config file</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2987,17 +3468,17 @@ AmneziaVPN detected this profile may contain malicious scripts. Please, carefull
 <context>
     <name>UiLogic</name>
     <message>
-        <location filename="../ui/uilogic.cpp" line="380"/>
+        <location filename="../ui/uilogic.cpp" line="369"/>
         <source>Error occurred while configuring server.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/uilogic.cpp" line="381"/>
+        <location filename="../ui/uilogic.cpp" line="369"/>
         <source>Error message: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/uilogic.cpp" line="382"/>
+        <location filename="../ui/uilogic.cpp" line="370"/>
         <source>See logs for details.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3081,27 +3562,27 @@ AmneziaVPN detected this profile may contain malicious scripts. Please, carefull
 <context>
     <name>amnezia::ContainerProps</name>
     <message>
-        <location filename="../containers/containers_defs.cpp" line="207"/>
+        <location filename="../containers/containers_defs.cpp" line="209"/>
         <source>Low</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../containers/containers_defs.cpp" line="208"/>
+        <location filename="../containers/containers_defs.cpp" line="210"/>
         <source>High</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../containers/containers_defs.cpp" line="209"/>
+        <location filename="../containers/containers_defs.cpp" line="211"/>
         <source>Medium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../containers/containers_defs.cpp" line="217"/>
+        <location filename="../containers/containers_defs.cpp" line="221"/>
         <source>Many foreign websites and VPN providers are blocked</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../containers/containers_defs.cpp" line="218"/>
+        <location filename="../containers/containers_defs.cpp" line="220"/>
         <source>Some foreign sites are blocked, but VPN providers are not blocked</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/client/ui/controllers/installController.cpp b/client/ui/controllers/installController.cpp
index be235e42..d6c32fac 100644
--- a/client/ui/controllers/installController.cpp
+++ b/client/ui/controllers/installController.cpp
@@ -392,3 +392,24 @@ void InstallController::mountSftpDrive(const QString &port, const QString &passw
 
 #endif
 }
+
+bool InstallController::checkSshConnection()
+{
+    ServerController serverController(m_settings);
+
+    ErrorCode errorCode = ErrorCode::NoError;
+    QString output;
+    output = serverController.checkSshConnection(m_currentlyInstalledServerCredentials, &errorCode);
+
+    if (errorCode != ErrorCode::NoError) {
+        emit installationErrorOccurred(errorString(errorCode));
+        return false;
+    } else {
+        if (output.contains(tr("Please login as the user"))) {
+            output.replace("\n", "");
+            emit installationErrorOccurred(output);
+            return false;
+        }
+    }
+    return true;
+}
diff --git a/client/ui/controllers/installController.h b/client/ui/controllers/installController.h
index 8bc04f39..b25f2082 100644
--- a/client/ui/controllers/installController.h
+++ b/client/ui/controllers/installController.h
@@ -37,6 +37,8 @@ public slots:
 
     void mountSftpDrive(const QString &port, const QString &password, const QString &username);
 
+    bool checkSshConnection();
+
 signals:
     void installContainerFinished(QString finishMessage);
     void installServerFinished(QString finishMessage);
diff --git a/client/ui/models/languageModel.cpp b/client/ui/models/languageModel.cpp
index adbbdaaa..5135f348 100644
--- a/client/ui/models/languageModel.cpp
+++ b/client/ui/models/languageModel.cpp
@@ -55,7 +55,7 @@ int LanguageModel::getCurrentLanguageIndex()
     }
 }
 
-QString LanguageModel::getCurrentLanuageName()
+QString LanguageModel::getCurrentLanguageName()
 {
     return m_availableLanguages[getCurrentLanguageIndex()].name;
 }
diff --git a/client/ui/models/languageModel.h b/client/ui/models/languageModel.h
index 4e8a9092..b64862dd 100644
--- a/client/ui/models/languageModel.h
+++ b/client/ui/models/languageModel.h
@@ -43,13 +43,17 @@ public:
     int rowCount(const QModelIndex &parent = QModelIndex()) const override;
     QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
 
+    Q_PROPERTY(QString currentLanguageName READ getCurrentLanguageName NOTIFY translationsUpdated)
+    Q_PROPERTY(int currentLanguageIndex READ getCurrentLanguageIndex NOTIFY translationsUpdated)
+
 public slots:
     void changeLanguage(const LanguageSettings::AvailableLanguageEnum language);
     int getCurrentLanguageIndex();
-    QString getCurrentLanuageName();
+    QString getCurrentLanguageName();
 
 signals:
     void updateTranslations(const QLocale &locale);
+    void translationsUpdated();
 
 protected:
     QHash<int, QByteArray> roleNames() const override;
diff --git a/client/ui/qml/Components/SelectLanguageDrawer.qml b/client/ui/qml/Components/SelectLanguageDrawer.qml
index d872a889..d318aab8 100644
--- a/client/ui/qml/Components/SelectLanguageDrawer.qml
+++ b/client/ui/qml/Components/SelectLanguageDrawer.qml
@@ -59,7 +59,7 @@ DrawerType {
                 interactive: false
 
                 model: LanguageModel
-                currentIndex: LanguageModel.getCurrentLanguageIndex()
+                currentIndex: LanguageModel.currentLanguageIndex
 
                 ButtonGroup {
                     id: buttonGroup
@@ -127,6 +127,7 @@ DrawerType {
                             onClicked: {
                                 listView.currentIndex = index
                                 LanguageModel.changeLanguage(languageIndex)
+                                root.close()
                             }
                         }
                     }
diff --git a/client/ui/qml/Controls2/PopupType.qml b/client/ui/qml/Controls2/PopupType.qml
index e7bb16f4..e4d2a449 100644
--- a/client/ui/qml/Controls2/PopupType.qml
+++ b/client/ui/qml/Controls2/PopupType.qml
@@ -55,6 +55,8 @@ Popup {
             BasicButtonType {
                 visible: closeButtonVisible
 
+                implicitHeight: 32
+
                 defaultColor: "white"
                 hoveredColor: "#C1C2C5"
                 pressedColor: "#AEB0B7"
diff --git a/client/ui/qml/Pages2/PageProtocolCloakSettings.qml b/client/ui/qml/Pages2/PageProtocolCloakSettings.qml
index 54c2ffb8..cc764451 100644
--- a/client/ui/qml/Pages2/PageProtocolCloakSettings.qml
+++ b/client/ui/qml/Pages2/PageProtocolCloakSettings.qml
@@ -17,13 +17,9 @@ PageType {
     Connections {
         target: InstallController
 
-        function onInstallationErrorOccurred(errorMessage) {
-            PageController.showErrorMessage(errorMessage)
-        }
-
         function onUpdateContainerFinished() {
             //todo change to notification
-            PageController.showErrorMessage(qsTr("Settings updated successfully"))
+            PageController.showNotificationMessage(qsTr("Settings updated successfully"))
         }
     }
 
diff --git a/client/ui/qml/Pages2/PageProtocolOpenVpnSettings.qml b/client/ui/qml/Pages2/PageProtocolOpenVpnSettings.qml
index 26a9c495..7d38a2b0 100644
--- a/client/ui/qml/Pages2/PageProtocolOpenVpnSettings.qml
+++ b/client/ui/qml/Pages2/PageProtocolOpenVpnSettings.qml
@@ -18,13 +18,9 @@ PageType {
     Connections {
         target: InstallController
 
-        function onInstallationErrorOccurred(errorMessage) {
-            PageController.showErrorMessage(errorMessage)
-        }
-
         function onUpdateContainerFinished() {
             //todo change to notification
-            PageController.showErrorMessage(qsTr("Settings updated successfully"))
+            PageController.showNotificationMessage(qsTr("Settings updated successfully"))
         }
     }
 
diff --git a/client/ui/qml/Pages2/PageProtocolShadowSocksSettings.qml b/client/ui/qml/Pages2/PageProtocolShadowSocksSettings.qml
index d873beac..64390790 100644
--- a/client/ui/qml/Pages2/PageProtocolShadowSocksSettings.qml
+++ b/client/ui/qml/Pages2/PageProtocolShadowSocksSettings.qml
@@ -17,13 +17,9 @@ PageType {
     Connections {
         target: InstallController
 
-        function onInstallationErrorOccurred(errorMessage) {
-            PageController.showErrorMessage(errorMessage)
-        }
-
         function onUpdateContainerFinished() {
             //todo change to notification
-            PageController.showErrorMessage(qsTr("Settings updated successfully"))
+            PageController.showNotificationMessage(qsTr("Settings updated successfully"))
         }
     }
 
diff --git a/client/ui/qml/Pages2/PageServiceSftpSettings.qml b/client/ui/qml/Pages2/PageServiceSftpSettings.qml
index 0eabb076..d37562a1 100644
--- a/client/ui/qml/Pages2/PageServiceSftpSettings.qml
+++ b/client/ui/qml/Pages2/PageServiceSftpSettings.qml
@@ -19,13 +19,9 @@ PageType {
     Connections {
         target: InstallController
 
-        function onInstallationErrorOccurred(errorMessage) {
-            PageController.showErrorMessage(errorMessage)
-        }
-
         function onUpdateContainerFinished() {
             //todo change to notification
-            PageController.showErrorMessage(qsTr("Settings updated successfully"))
+            PageController.showNotificationMessage(qsTr("Settings updated successfully"))
         }
     }
 
diff --git a/client/ui/qml/Pages2/PageServiceTorWebsiteSettings.qml b/client/ui/qml/Pages2/PageServiceTorWebsiteSettings.qml
index 7cf2a81a..5ddb9ed6 100644
--- a/client/ui/qml/Pages2/PageServiceTorWebsiteSettings.qml
+++ b/client/ui/qml/Pages2/PageServiceTorWebsiteSettings.qml
@@ -20,13 +20,9 @@ PageType {
     Connections {
         target: InstallController
 
-        function onInstallationErrorOccurred(errorMessage) {
-            PageController.showErrorMessage(errorMessage)
-        }
-
         function onUpdateContainerFinished() {
             //todo change to notification
-            PageController.showErrorMessage(qsTr("Settings updated successfully"))
+            PageController.showNotificationMessage(qsTr("Settings updated successfully"))
         }
     }
 
diff --git a/client/ui/qml/Pages2/PageSettingsApplication.qml b/client/ui/qml/Pages2/PageSettingsApplication.qml
index 2c7d8601..2001e892 100644
--- a/client/ui/qml/Pages2/PageSettingsApplication.qml
+++ b/client/ui/qml/Pages2/PageSettingsApplication.qml
@@ -48,7 +48,7 @@ PageType {
                 Layout.topMargin: 16
 
                 text: qsTr("Language")
-                descriptionText: LanguageModel.getCurrentLanuageName()
+                descriptionText: LanguageModel.currentLanguageName
                 rightImageSource: "qrc:/images/controls/chevron-right.svg"
 
                 clickedFunction: function() {
diff --git a/client/ui/qml/Pages2/PageSettingsServerData.qml b/client/ui/qml/Pages2/PageSettingsServerData.qml
index 3aec4242..12e66269 100644
--- a/client/ui/qml/Pages2/PageSettingsServerData.qml
+++ b/client/ui/qml/Pages2/PageSettingsServerData.qml
@@ -28,11 +28,6 @@ PageType {
             PageController.showErrorMessage(message)
         }
 
-        function onInstallationErrorOccurred(errorMessage) {
-            closePage() // close deInstalling page
-            PageController.showErrorMessage(errorMessage)
-        }
-
         function onRemoveCurrentlyProcessedServerFinished(finishedMessage) {
             if (!ServersModel.getServersCount()) {
                 PageController.replaceStartPage()
diff --git a/client/ui/qml/Pages2/PageSetupWizardCredentials.qml b/client/ui/qml/Pages2/PageSetupWizardCredentials.qml
index cc1197ad..dab860c1 100644
--- a/client/ui/qml/Pages2/PageSetupWizardCredentials.qml
+++ b/client/ui/qml/Pages2/PageSetupWizardCredentials.qml
@@ -94,7 +94,7 @@ PageType {
                 Layout.fillWidth: true
                 Layout.topMargin: 24
 
-                text: qsTr("Set up a server the easy way")
+                text: qsTr("Continue")
 
                 onClicked: function() {
                     if (!isCredentialsFilled()) {
@@ -104,34 +104,41 @@ PageType {
                     InstallController.setShouldCreateServer(true)
                     InstallController.setCurrentlyInstalledServerCredentials(hostname.textField.text, username.textField.text, secretData.textField.text)
 
+                    PageController.showBusyIndicator(true)
+                    var isConnectionOpened = InstallController.checkSshConnection()
+                    PageController.showBusyIndicator(false)
+                    if (!isConnectionOpened) {
+                        return
+                    }
+
                     goToPage(PageEnum.PageSetupWizardEasy)
                 }
             }
 
-            BasicButtonType {
-                Layout.fillWidth: true
-                Layout.topMargin: -8
+//            BasicButtonType {
+//                Layout.fillWidth: true
+//                Layout.topMargin: -8
 
-                defaultColor: "transparent"
-                hoveredColor: Qt.rgba(1, 1, 1, 0.08)
-                pressedColor: Qt.rgba(1, 1, 1, 0.12)
-                disabledColor: "#878B91"
-                textColor: "#D7D8DB"
-                borderWidth: 1
+//                defaultColor: "transparent"
+//                hoveredColor: Qt.rgba(1, 1, 1, 0.08)
+//                pressedColor: Qt.rgba(1, 1, 1, 0.12)
+//                disabledColor: "#878B91"
+//                textColor: "#D7D8DB"
+//                borderWidth: 1
 
-                text: qsTr("Select protocol to install")
+//                text: qsTr("Select protocol to install")
 
-                onClicked: function() {
-                    if (!isCredentialsFilled()) {
-                        return
-                    }
+//                onClicked: function() {
+//                    if (!isCredentialsFilled()) {
+//                        return
+//                    }
 
-                    InstallController.setShouldCreateServer(true)
-                    InstallController.setCurrentlyInstalledServerCredentials(hostname.textField.text, username.textField.text, secretData.textField.text)
+//                    InstallController.setShouldCreateServer(true)
+//                    InstallController.setCurrentlyInstalledServerCredentials(hostname.textField.text, username.textField.text, secretData.textField.text)
 
-                    goToPage(PageEnum.PageSetupWizardProtocols)
-                }
-            }
+//                    goToPage(PageEnum.PageSetupWizardProtocols)
+//                }
+//            }
         }
     }
 
diff --git a/client/ui/qml/Pages2/PageSetupWizardEasy.qml b/client/ui/qml/Pages2/PageSetupWizardEasy.qml
index 2a6e1909..ac1c3a44 100644
--- a/client/ui/qml/Pages2/PageSetupWizardEasy.qml
+++ b/client/ui/qml/Pages2/PageSetupWizardEasy.qml
@@ -15,6 +15,8 @@ import "../Config"
 PageType {
     id: root
 
+    property bool isEasySetup: true
+
     SortFilterProxyModel {
         id: proxyContainersModel
         sourceModel: ContainersModel
@@ -64,6 +66,10 @@ PageType {
                 headerText: qsTr("What is the level of internet control in your region?")
             }
 
+            ButtonGroup {
+                id: buttonGroup
+            }
+
             ListView {
                 id: containers
                 width: parent.width
@@ -101,6 +107,7 @@ PageType {
                             ButtonGroup.group: buttonGroup
 
                             onClicked: function() {
+                                isEasySetup = true
                                 var defaultContainerProto =  ContainerProps.defaultProtocol(dockerContainer)
 
                                 containers.dockerContainer = dockerContainer
@@ -117,9 +124,18 @@ PageType {
                         }
                     }
                 }
+            }
 
-                ButtonGroup {
-                    id: buttonGroup
+            CardType {
+                implicitWidth: parent.width
+
+                headerText: qsTr("Set up a VPN yourself")
+                bodyText: qsTr("I want to choose a VPN protocol")
+
+                ButtonGroup.group: buttonGroup
+
+                onClicked: function() {
+                    isEasySetup = false
                 }
             }
 
@@ -132,11 +148,15 @@ PageType {
                 text: qsTr("Continue")
 
                 onClicked: function() {
-                    ContainersModel.setCurrentlyProcessedContainerIndex(containers.dockerContainer)
-                    goToPage(PageEnum.PageSetupWizardInstalling);
-                    InstallController.install(containers.dockerContainer,
-                                              containers.containerDefaultPort,
-                                              containers.containerDefaultTransportProto)
+                    if (root.isEasySetup) {
+                        ContainersModel.setCurrentlyProcessedContainerIndex(containers.dockerContainer)
+                        goToPage(PageEnum.PageSetupWizardInstalling);
+                        InstallController.install(containers.dockerContainer,
+                                                  containers.containerDefaultPort,
+                                                  containers.containerDefaultTransportProto)
+                    } else {
+                        goToPage(PageEnum.PageSetupWizardProtocols)
+                    }
                 }
             }
         }
diff --git a/client/ui/qml/Pages2/PageSetupWizardInstalling.qml b/client/ui/qml/Pages2/PageSetupWizardInstalling.qml
index f254a474..6c6d1a67 100644
--- a/client/ui/qml/Pages2/PageSetupWizardInstalling.qml
+++ b/client/ui/qml/Pages2/PageSetupWizardInstalling.qml
@@ -17,11 +17,6 @@ PageType {
     Connections {
         target: InstallController
 
-        function onInstallationErrorOccurred(errorMessage) {
-            closePage()
-            PageController.showErrorMessage(errorMessage)
-        }
-
         function onInstallContainerFinished(finishedMessage) {
             goToStartPage()
             if (stackView.currentItem.objectName === PageController.getPagePath(PageEnum.PageHome)) {
diff --git a/client/ui/qml/Pages2/PageSetupWizardStart.qml b/client/ui/qml/Pages2/PageSetupWizardStart.qml
index eff17ab5..11d7ba29 100644
--- a/client/ui/qml/Pages2/PageSetupWizardStart.qml
+++ b/client/ui/qml/Pages2/PageSetupWizardStart.qml
@@ -85,8 +85,7 @@ PageType {
 
                 text: qsTr("I have nothing")
 
-                onClicked: {
-                }
+                onClicked: Qt.openUrlExternally("https://ru-docs.amnezia.org/guides/hosting-instructions")
             }
         }
 
diff --git a/client/ui/qml/Pages2/PageStart.qml b/client/ui/qml/Pages2/PageStart.qml
index 811fc923..ec29b314 100644
--- a/client/ui/qml/Pages2/PageStart.qml
+++ b/client/ui/qml/Pages2/PageStart.qml
@@ -45,6 +45,26 @@ PageType {
         }
     }
 
+    Connections {
+        target: InstallController
+
+        function onInstallationErrorOccurred(errorMessage) {
+            PageController.showErrorMessage(errorMessage)
+
+            var needCloseCurrentPage = false
+            var currentPageName = stackView.currentItem.objectName
+
+            if (currentPageName === PageController.getPagePath(PageEnum.PageSetupWizardInstalling)) {
+                needCloseCurrentPage = true
+            } else if (currentPageName === PageController.getPagePath(PageEnum.PageDeinstalling)) {
+                needCloseCurrentPage = true
+            }
+            if (needCloseCurrentPage) {
+                PageController.closePage()
+            }
+        }
+    }
+
     StackViewType {
         id: tabBarStackView
 

From 925fd9f26805d03d53f2473993abc45d561734a8 Mon Sep 17 00:00:00 2001
From: "vladimir.kuznetsov" <nethiuswork@gmail.com>
Date: Tue, 1 Aug 2023 11:06:46 +0900
Subject: [PATCH 053/278] added display of installed services on the page
 PageSettingsServersList

---
 client/ui/models/containers_model.cpp         | 19 +++++++++++++++++++
 client/ui/models/containers_model.h           |  1 +
 .../ui/qml/Pages2/PageSettingsServersList.qml | 10 +++++++++-
 .../qml/Pages2/PageSetupWizardViewConfig.qml  |  6 +++++-
 4 files changed, 34 insertions(+), 2 deletions(-)

diff --git a/client/ui/models/containers_model.cpp b/client/ui/models/containers_model.cpp
index ea571a22..639cf962 100644
--- a/client/ui/models/containers_model.cpp
+++ b/client/ui/models/containers_model.cpp
@@ -129,6 +129,25 @@ QJsonObject ContainersModel::getCurrentlyProcessedContainerConfig()
     return qvariant_cast<QJsonObject>(data(index(m_currentlyProcessedContainerIndex), ConfigRole));
 }
 
+QStringList ContainersModel::getAllInstalledServicesName(const int serverIndex)
+{
+    QStringList servicesName;
+    const auto &containers = m_settings->containers(serverIndex);
+    for (const DockerContainer &container : containers.keys()) {
+        if (ContainerProps::containerService(container) == ServiceType::Other && m_containers.contains(container)) {
+            if (container == DockerContainer::Dns) {
+                servicesName.append("DNS");
+            } else if (container == DockerContainer::Sftp) {
+                servicesName.append("SFTP");
+            } else if (container == DockerContainer::TorWebSite) {
+                servicesName.append("TOR");
+            }
+        }
+    }
+    servicesName.sort();
+    return servicesName;
+}
+
 ErrorCode ContainersModel::removeAllContainers()
 {
 
diff --git a/client/ui/models/containers_model.h b/client/ui/models/containers_model.h
index 690eff41..a905890a 100644
--- a/client/ui/models/containers_model.h
+++ b/client/ui/models/containers_model.h
@@ -51,6 +51,7 @@ public slots:
 
     QString getCurrentlyProcessedContainerName();
     QJsonObject getCurrentlyProcessedContainerConfig();
+    QStringList getAllInstalledServicesName(const int serverIndex);
 
     ErrorCode removeAllContainers();
     ErrorCode removeCurrentlyProcessedContainer();
diff --git a/client/ui/qml/Pages2/PageSettingsServersList.qml b/client/ui/qml/Pages2/PageSettingsServersList.qml
index 496ed370..40e51e9e 100644
--- a/client/ui/qml/Pages2/PageSettingsServersList.qml
+++ b/client/ui/qml/Pages2/PageSettingsServersList.qml
@@ -85,7 +85,15 @@ PageType {
                             Layout.fillWidth: true
 
                             text: name
-                            descriptionText: hostName
+                            descriptionText: {
+                                var servicesNameString = ""
+                                var servicesName = ContainersModel.getAllInstalledServicesName(index)
+                                for (var i = 0; i < servicesName.length; i++) {
+                                    servicesNameString += servicesName[i] + " · "
+                                }
+
+                                return servicesNameString + hostName
+                            }
                             rightImageSource: "qrc:/images/controls/chevron-right.svg"
 
                             clickedFunction: function() {
diff --git a/client/ui/qml/Pages2/PageSetupWizardViewConfig.qml b/client/ui/qml/Pages2/PageSetupWizardViewConfig.qml
index 372a5cde..5f52a5ba 100644
--- a/client/ui/qml/Pages2/PageSetupWizardViewConfig.qml
+++ b/client/ui/qml/Pages2/PageSetupWizardViewConfig.qml
@@ -91,11 +91,15 @@ PageType {
             }
 
             BasicButtonType {
+                Layout.topMargin: 16
+                Layout.leftMargin: -8
+                implicitHeight: 32
+
                 defaultColor: "transparent"
                 hoveredColor: Qt.rgba(1, 1, 1, 0.08)
                 pressedColor: Qt.rgba(1, 1, 1, 0.12)
                 disabledColor: "#878B91"
-                textColor: "#D7D8DB"
+                textColor: "#FBB26A"
 
                 text: showContent ? qsTr("Collapse content") : qsTr("Show content")
 

From ebcca0c3b8802c294b69065ee0a13c69bf2528ef Mon Sep 17 00:00:00 2001
From: "vladimir.kuznetsov" <nethiuswork@gmail.com>
Date: Wed, 2 Aug 2023 20:37:43 +0900
Subject: [PATCH 054/278] added processing of private ssh keys

---
 client/amnezia_application.cpp                |  4 +
 client/ui/controllers/installController.cpp   | 32 +++++++-
 client/ui/controllers/installController.h     |  7 ++
 client/ui/controllers/pageController.h        |  3 +
 client/ui/models/containers_model.cpp         |  5 ++
 client/ui/models/containers_model.h           |  2 +
 .../Components/SettingsContainersListView.qml | 12 ++-
 .../ui/qml/Pages2/PageSettingsServerData.qml  |  4 +-
 client/ui/qml/Pages2/PageStart.qml            |  2 +-
 client/ui/qml/main2.qml                       | 74 +++++++++++++++++++
 10 files changed, 137 insertions(+), 8 deletions(-)

diff --git a/client/amnezia_application.cpp b/client/amnezia_application.cpp
index 7d7a0376..38126e43 100644
--- a/client/amnezia_application.cpp
+++ b/client/amnezia_application.cpp
@@ -315,6 +315,10 @@ void AmneziaApplication::initControllers()
 
     m_installController.reset(new InstallController(m_serversModel, m_containersModel, m_settings));
     m_engine->rootContext()->setContextProperty("InstallController", m_installController.get());
+    connect(m_installController.get(), &InstallController::passphraseRequestStarted, m_pageController.get(),
+            &PageController::showPassphraseRequestDrawer);
+    connect(m_pageController.get(), &PageController::passphraseRequestDrawerClosed, m_installController.get(),
+            &InstallController::setEncryptedPassphrase);
 
     m_importController.reset(new ImportController(m_serversModel, m_containersModel, m_settings));
     m_engine->rootContext()->setContextProperty("ImportController", m_importController.get());
diff --git a/client/ui/controllers/installController.cpp b/client/ui/controllers/installController.cpp
index d6c32fac..49c77708 100644
--- a/client/ui/controllers/installController.cpp
+++ b/client/ui/controllers/installController.cpp
@@ -1,6 +1,7 @@
 #include "installController.h"
 
 #include <QDesktopServices>
+#include <QEventLoop>
 #include <QJsonObject>
 #include <QStandardPaths>
 
@@ -396,8 +397,31 @@ void InstallController::mountSftpDrive(const QString &port, const QString &passw
 bool InstallController::checkSshConnection()
 {
     ServerController serverController(m_settings);
-
     ErrorCode errorCode = ErrorCode::NoError;
+    m_privateKeyPassphrase = "";
+
+    if (m_currentlyInstalledServerCredentials.secretData.contains("BEGIN")
+        && m_currentlyInstalledServerCredentials.secretData.contains("PRIVATE KEY")) {
+        auto passphraseCallback = [this]() {
+            emit passphraseRequestStarted();
+            QEventLoop loop;
+            QObject::connect(this, &InstallController::passphraseRequestFinished, &loop, &QEventLoop::quit);
+            loop.exec();
+
+            return m_privateKeyPassphrase;
+        };
+
+        QString decryptedPrivateKey;
+        errorCode = serverController.getDecryptedPrivateKey(m_currentlyInstalledServerCredentials, decryptedPrivateKey,
+                                                            passphraseCallback);
+        if (errorCode == ErrorCode::NoError) {
+            m_currentlyInstalledServerCredentials.secretData = decryptedPrivateKey;
+        } else {
+            emit installationErrorOccurred(errorString(errorCode));
+            return false;
+        }
+    }
+
     QString output;
     output = serverController.checkSshConnection(m_currentlyInstalledServerCredentials, &errorCode);
 
@@ -413,3 +437,9 @@ bool InstallController::checkSshConnection()
     }
     return true;
 }
+
+void InstallController::setEncryptedPassphrase(QString passphrase)
+{
+    m_privateKeyPassphrase = passphrase;
+    emit passphraseRequestFinished();
+}
diff --git a/client/ui/controllers/installController.h b/client/ui/controllers/installController.h
index b25f2082..54bcda31 100644
--- a/client/ui/controllers/installController.h
+++ b/client/ui/controllers/installController.h
@@ -39,6 +39,8 @@ public slots:
 
     bool checkSshConnection();
 
+    void setEncryptedPassphrase(QString passphrase);
+
 signals:
     void installContainerFinished(QString finishMessage);
     void installServerFinished(QString finishMessage);
@@ -55,6 +57,9 @@ signals:
 
     void serverAlreadyExists(int serverIndex);
 
+    void passphraseRequestStarted();
+    void passphraseRequestFinished();
+
 private:
     void installServer(DockerContainer container, QJsonObject &config);
     void installContainer(DockerContainer container, QJsonObject &config);
@@ -68,6 +73,8 @@ private:
 
     bool m_shouldCreateServer;
 
+    QString m_privateKeyPassphrase;
+
 #ifndef Q_OS_IOS
     QList<QSharedPointer<QProcess>> m_sftpMountProcesses;
 #endif
diff --git a/client/ui/controllers/pageController.h b/client/ui/controllers/pageController.h
index 4273ed25..8185b525 100644
--- a/client/ui/controllers/pageController.h
+++ b/client/ui/controllers/pageController.h
@@ -91,6 +91,9 @@ signals:
     void hideMainWindow();
     void raiseMainWindow();
 
+    void showPassphraseRequestDrawer();
+    void passphraseRequestDrawerClosed(QString passphrase);
+
 private:
     QSharedPointer<ServersModel> m_serversModel;
 };
diff --git a/client/ui/models/containers_model.cpp b/client/ui/models/containers_model.cpp
index 639cf962..8d24e019 100644
--- a/client/ui/models/containers_model.cpp
+++ b/client/ui/models/containers_model.cpp
@@ -211,6 +211,11 @@ bool ContainersModel::isAmneziaDnsContainerInstalled(const int serverIndex)
     return containers.contains(DockerContainer::Dns);
 }
 
+// bool ContainersModel::isOnlyServicesInstalled(const int serverIndex)
+//{
+
+//}
+
 QHash<int, QByteArray> ContainersModel::roleNames() const
 {
     QHash<int, QByteArray> roles;
diff --git a/client/ui/models/containers_model.h b/client/ui/models/containers_model.h
index a905890a..8978315c 100644
--- a/client/ui/models/containers_model.h
+++ b/client/ui/models/containers_model.h
@@ -60,6 +60,8 @@ public slots:
     bool isAmneziaDnsContainerInstalled();
     bool isAmneziaDnsContainerInstalled(const int serverIndex);
 
+    //    bool isOnlyServicesInstalled(const int serverIndex);
+
 protected:
     QHash<int, QByteArray> roleNames() const override;
 
diff --git a/client/ui/qml/Components/SettingsContainersListView.qml b/client/ui/qml/Components/SettingsContainersListView.qml
index eac473f4..bb578899 100644
--- a/client/ui/qml/Components/SettingsContainersListView.qml
+++ b/client/ui/qml/Components/SettingsContainersListView.qml
@@ -106,13 +106,17 @@ ListView {
                         break
                     }
                     case ContainerEnum.WireGuard: {
-                        WireGuardConfigModel.updateModel(config)
-                        goToPage(PageEnum.PageProtocolWireGuardSettings)
+                        ProtocolsModel.updateModel(config)
+                        goToPage(PageEnum.PageProtocolRaw)
+//                        WireGuardConfigModel.updateModel(config)
+//                        goToPage(PageEnum.PageProtocolWireGuardSettings)
                         break
                     }
                     case ContainerEnum.Ipsec: {
-                        Ikev2ConfigModel.updateModel(config)
-                        goToPage(PageEnum.PageProtocolIKev2Settings)
+                        ProtocolsModel.updateModel(config)
+                        goToPage(PageEnum.PageProtocolRaw)
+//                        Ikev2ConfigModel.updateModel(config)
+//                        goToPage(PageEnum.PageProtocolIKev2Settings)
                         break
                     }
                     case ContainerEnum.Sftp: {
diff --git a/client/ui/qml/Pages2/PageSettingsServerData.qml b/client/ui/qml/Pages2/PageSettingsServerData.qml
index 12e66269..7be35cac 100644
--- a/client/ui/qml/Pages2/PageSettingsServerData.qml
+++ b/client/ui/qml/Pages2/PageSettingsServerData.qml
@@ -134,7 +134,7 @@ PageType {
                     questionDrawer.yesButtonFunction = function() {
                         questionDrawer.visible = false
                         PageController.showBusyIndicator(true)
-                        if (ServersModel.isDefaultServerCurrentlyProcessed && ConnectionController.isConnected) {
+                        if (ServersModel.isDefaultServerCurrentlyProcessed() && ConnectionController.isConnected) {
                             ConnectionController.closeConnection()
                         }
                         InstallController.removeCurrentlyProcessedServer()
@@ -165,7 +165,7 @@ PageType {
                     questionDrawer.yesButtonFunction = function() {
                         questionDrawer.visible = false
                         goToPage(PageEnum.PageDeinstalling)
-                        if (ServersModel.isDefaultServerCurrentlyProcessed && ConnectionController.isConnected) {
+                        if (ServersModel.isDefaultServerCurrentlyProcessed() && ConnectionController.isConnected) {
                             ConnectionController.closeVpnConnection()
                         }
                         InstallController.removeAllContainers()
diff --git a/client/ui/qml/Pages2/PageStart.qml b/client/ui/qml/Pages2/PageStart.qml
index ec29b314..2cc64a91 100644
--- a/client/ui/qml/Pages2/PageStart.qml
+++ b/client/ui/qml/Pages2/PageStart.qml
@@ -52,7 +52,7 @@ PageType {
             PageController.showErrorMessage(errorMessage)
 
             var needCloseCurrentPage = false
-            var currentPageName = stackView.currentItem.objectName
+            var currentPageName = tabBarStackView.currentItem.objectName
 
             if (currentPageName === PageController.getPagePath(PageEnum.PageSetupWizardInstalling)) {
                 needCloseCurrentPage = true
diff --git a/client/ui/qml/main2.qml b/client/ui/qml/main2.qml
index 6b2bee2a..f07bcf5d 100644
--- a/client/ui/qml/main2.qml
+++ b/client/ui/qml/main2.qml
@@ -75,6 +75,10 @@ Window  {
             popupNotificationMessage.open()
             popupNotificationTimer.start()
         }
+
+        function onShowPassphraseRequestDrawer() {
+            privateKeyPassphraseDrawer.open()
+        }
     }
 
     Item {
@@ -111,4 +115,74 @@ Window  {
             id: popupErrorMessage
         }
     }
+
+    Item {
+        anchors.right: parent.right
+        anchors.left: parent.left
+        anchors.bottom: parent.bottom
+
+        implicitHeight: popupErrorMessage.height
+
+        DrawerType {
+            id: privateKeyPassphraseDrawer
+
+            width: root.width
+            height: root.height * 0.35
+
+            onVisibleChanged: {
+                if (privateKeyPassphraseDrawer.visible) {
+                    passphrase.textFieldText = ""
+                    passphrase.textField.forceActiveFocus()
+                }
+            }
+            onAboutToHide: {
+                PageController.showBusyIndicator(true)
+            }
+            onAboutToShow: {
+                PageController.showBusyIndicator(false)
+            }
+
+            ColumnLayout {
+                anchors.top: parent.top
+                anchors.left: parent.left
+                anchors.right: parent.right
+                anchors.topMargin: 16
+                anchors.leftMargin: 16
+                anchors.rightMargin: 16
+
+                TextFieldWithHeaderType {
+                    id: passphrase
+
+                    property bool hidePassword: true
+
+                    Layout.fillWidth: true
+                    headerText: qsTr("Private key passphrase")
+                    textField.echoMode: hidePassword ? TextInput.Password : TextInput.Normal
+                    buttonImageSource: hidePassword ? "qrc:/images/controls/eye.svg" : "qrc:/images/controls/eye-off.svg"
+
+                    clickedFunc: function() {
+                        hidePassword = !hidePassword
+                    }
+                }
+
+                BasicButtonType {
+                    Layout.fillWidth: true
+
+                    defaultColor: "transparent"
+                    hoveredColor: Qt.rgba(1, 1, 1, 0.08)
+                    pressedColor: Qt.rgba(1, 1, 1, 0.12)
+                    disabledColor: "#878B91"
+                    textColor: "#D7D8DB"
+                    borderWidth: 1
+
+                    text: qsTr("Save")
+
+                    onClicked: {
+                        privateKeyPassphraseDrawer.close()
+                        PageController.passphraseRequestDrawerClosed(passphrase.textFieldText)
+                    }
+                }
+            }
+        }
+    }
 }

From 2c429fd406461abd211b531575269c191dc6d755 Mon Sep 17 00:00:00 2001
From: "vladimir.kuznetsov" <nethiuswork@gmail.com>
Date: Wed, 2 Aug 2023 21:46:02 +0900
Subject: [PATCH 055/278] added removal of spaces when inserting ip addresses -
 fixed server sharing when sharing a server available only for connection when
 choosing a server with full access - removed the notification about an empty
 backup file when the user closes the file dialog without selecting anything

---
 client/ui/controllers/settingsController.cpp      |  1 -
 .../ui/qml/Pages2/PageSetupWizardCredentials.qml  | 15 ++++-----------
 client/ui/qml/Pages2/PageShare.qml                |  2 +-
 3 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/client/ui/controllers/settingsController.cpp b/client/ui/controllers/settingsController.cpp
index eda67919..6a83dcb1 100644
--- a/client/ui/controllers/settingsController.cpp
+++ b/client/ui/controllers/settingsController.cpp
@@ -85,7 +85,6 @@ void SettingsController::restoreAppConfig()
                                QStandardPaths::writableLocation(QStandardPaths::DocumentsLocation), "*.backup");
 
     if (fileName.isEmpty()) {
-        emit changeSettingsErrorOccurred(tr("Backup file is empty"));
         return;
     }
 
diff --git a/client/ui/qml/Pages2/PageSetupWizardCredentials.qml b/client/ui/qml/Pages2/PageSetupWizardCredentials.qml
index dab860c1..5187a6e3 100644
--- a/client/ui/qml/Pages2/PageSetupWizardCredentials.qml
+++ b/client/ui/qml/Pages2/PageSetupWizardCredentials.qml
@@ -53,11 +53,9 @@ PageType {
                 textField.validator: RegularExpressionValidator {
                     regularExpression: InstallController.ipAddressPortRegExp()
                 }
-                buttonText: qsTr("Insert")
 
-                clickedFunc: function() {
-                    textField.text = ""
-                    textField.paste()
+                onTextFieldTextChanged: {
+                    textField.text = textField.text.replace(/^\s+|\s+$/g, '');
                 }
             }
 
@@ -67,12 +65,6 @@ PageType {
                 Layout.fillWidth: true
                 headerText: qsTr("Login to connect via SSH")
                 textFieldPlaceholderText: "root"
-                buttonText: qsTr("Insert")
-
-                clickedFunc: function() {
-                    textField.text = ""
-                    textField.paste()
-                }
             }
 
             TextFieldWithHeaderType {
@@ -83,7 +75,8 @@ PageType {
                 Layout.fillWidth: true
                 headerText: qsTr("Password / SSH private key")
                 textField.echoMode: hidePassword ? TextInput.Password : TextInput.Normal
-                buttonImageSource: hidePassword ? "qrc:/images/controls/eye.svg" : "qrc:/images/controls/eye-off.svg"
+                buttonImageSource: textFieldText !== "" ? (hidePassword ? "qrc:/images/controls/eye.svg" : "qrc:/images/controls/eye-off.svg")
+                                                        : ""
 
                 clickedFunc: function() {
                     hidePassword = !hidePassword
diff --git a/client/ui/qml/Pages2/PageShare.qml b/client/ui/qml/Pages2/PageShare.qml
index ca9dedd4..6e3fecf2 100644
--- a/client/ui/qml/Pages2/PageShare.qml
+++ b/client/ui/qml/Pages2/PageShare.qml
@@ -208,7 +208,7 @@ PageType {
                         serverSelector.text = selectedText
                         root.fullConfigServerSelectorText = selectedText
                         root.connectionServerSelectorText = selectedText
-                        ServersModel.currentlyProcessedIndex = currentIndex
+                        ServersModel.currentlyProcessedIndex = proxyServersModel.mapToSource(currentIndex)
                     }
                 }
 

From 90ae0b3e44689be23013ce63955170d18fc8bf9e Mon Sep 17 00:00:00 2001
From: "vladimir.kuznetsov" <nethiuswork@gmail.com>
Date: Tue, 8 Aug 2023 19:10:14 +0500
Subject: [PATCH 056/278] added PageSettingsSplitTunneling - added a call to
 the context menu when clicking the right mouse button for textInput

---
 client/amnezia_application.cpp                |  25 +-
 client/amnezia_application.h                  |   4 +
 client/images/controls/more-vertical.svg      |   5 +
 client/images/controls/trash.svg              |   5 +
 client/resources.qrc                          |   5 +
 client/settings.cpp                           |  10 +-
 client/settings.h                             |   3 +-
 client/ui/Controls2                           |  34 ++
 client/ui/controllers/connectionController.h  |  12 +-
 client/ui/controllers/exportController.h      |   2 +-
 client/ui/controllers/importController.h      |   2 +-
 client/ui/controllers/installController.h     |  12 +-
 client/ui/controllers/pageController.h        |   5 +-
 client/ui/controllers/settingsController.cpp  |  14 +-
 client/ui/controllers/settingsController.h    |  11 +-
 client/ui/controllers/sitesController.cpp     | 149 +++++++
 client/ui/controllers/sitesController.h       |  36 ++
 client/ui/models/sites_model.cpp              | 137 ++++---
 client/ui/models/sites_model.h                |  31 +-
 client/ui/pages_logic/SitesLogic.cpp          |  70 ++--
 client/ui/qml/Controls2/BasicButtonType.qml   |  28 ++
 client/ui/qml/Controls2/ContextMenuType.qml   |  33 ++
 client/ui/qml/Controls2/DropDownType.qml      |  14 +-
 client/ui/qml/Controls2/TextAreaType.qml      |  70 ++++
 .../qml/Controls2/TextFieldWithHeaderType.qml |  42 +-
 client/ui/qml/Pages2/PageHome.qml             |   5 +-
 .../Pages2/PageProtocolOpenVpnSettings.qml    |  88 +---
 .../ui/qml/Pages2/PageSettingsApplication.qml |   2 +-
 .../ui/qml/Pages2/PageSettingsConnection.qml  |  21 +-
 client/ui/qml/Pages2/PageSettingsLogging.qml  |   6 +-
 .../qml/Pages2/PageSettingsSplitTunneling.qml | 377 ++++++++++++++++++
 31 files changed, 1018 insertions(+), 240 deletions(-)
 create mode 100644 client/images/controls/more-vertical.svg
 create mode 100644 client/images/controls/trash.svg
 create mode 100644 client/ui/Controls2
 create mode 100644 client/ui/controllers/sitesController.cpp
 create mode 100644 client/ui/controllers/sitesController.h
 create mode 100644 client/ui/qml/Controls2/ContextMenuType.qml
 create mode 100644 client/ui/qml/Controls2/TextAreaType.qml
 create mode 100644 client/ui/qml/Pages2/PageSettingsSplitTunneling.qml

diff --git a/client/amnezia_application.cpp b/client/amnezia_application.cpp
index 38126e43..933a6346 100644
--- a/client/amnezia_application.cpp
+++ b/client/amnezia_application.cpp
@@ -146,16 +146,15 @@ void AmneziaApplication::init()
     //     m_uiLogic->showOnStartup();
     // #endif
 
-//    // TODO - fix
-// #if !defined(Q_OS_ANDROID) && !defined(Q_OS_IOS)
-//    if (isPrimary()) {
-//        QObject::connect(this, &SingleApplication::instanceStarted, m_uiLogic, [this](){
-//            qDebug() << "Secondary instance started, showing this window instead";
-//            emit m_uiLogic->show();
-//            emit m_uiLogic->raise();
-//        });
-//    }
-// #endif
+    // TODO - fix
+#if !defined(Q_OS_ANDROID) && !defined(Q_OS_IOS)
+    if (isPrimary()) {
+        QObject::connect(this, &SingleApplication::instanceStarted, m_pageController.get(), [this]() {
+            qDebug() << "Secondary instance started, showing this window instead";
+            emit m_pageController->raiseMainWindow();
+        });
+    }
+#endif
 
 // Android TextField clipboard workaround
 // https://bugreports.qt.io/browse/QTBUG-113461
@@ -281,6 +280,9 @@ void AmneziaApplication::initModels()
     connect(m_languageModel.get(), &LanguageModel::updateTranslations, this, &AmneziaApplication::updateTranslator);
     connect(this, &AmneziaApplication::translationsUpdated, m_languageModel.get(), &LanguageModel::translationsUpdated);
 
+    m_sitesModel.reset(new SitesModel(m_settings, this));
+    m_engine->rootContext()->setContextProperty("SitesModel", m_sitesModel.get());
+
     m_protocolsModel.reset(new ProtocolsModel(m_settings, this));
     m_engine->rootContext()->setContextProperty("ProtocolsModel", m_protocolsModel.get());
 
@@ -328,4 +330,7 @@ void AmneziaApplication::initControllers()
 
     m_settingsController.reset(new SettingsController(m_serversModel, m_containersModel, m_settings));
     m_engine->rootContext()->setContextProperty("SettingsController", m_settingsController.get());
+
+    m_sitesController.reset(new SitesController(m_settings, m_vpnConnection, m_sitesModel));
+    m_engine->rootContext()->setContextProperty("SitesController", m_sitesController.get());
 }
diff --git a/client/amnezia_application.h b/client/amnezia_application.h
index 2a10aa86..81897c83 100644
--- a/client/amnezia_application.h
+++ b/client/amnezia_application.h
@@ -19,6 +19,7 @@
 #include "ui/controllers/installController.h"
 #include "ui/controllers/pageController.h"
 #include "ui/controllers/settingsController.h"
+#include "ui/controllers/sitesController.h"
 #include "ui/models/containers_model.h"
 #include "ui/models/languageModel.h"
 #include "ui/models/protocols/cloakConfigModel.h"
@@ -32,6 +33,7 @@
 #include "ui/models/protocols_model.h"
 #include "ui/models/servers_model.h"
 #include "ui/models/services/sftpConfigModel.h"
+#include "ui/models/sites_model.h"
 
 #define amnApp (static_cast<AmneziaApplication *>(QCoreApplication::instance()))
 
@@ -86,6 +88,7 @@ private:
     QSharedPointer<ServersModel> m_serversModel;
     QScopedPointer<LanguageModel> m_languageModel;
     QScopedPointer<ProtocolsModel> m_protocolsModel;
+    QSharedPointer<SitesModel> m_sitesModel;
 
     QScopedPointer<OpenVpnConfigModel> m_openVpnConfigModel;
     QScopedPointer<ShadowSocksConfigModel> m_shadowSocksConfigModel;
@@ -106,6 +109,7 @@ private:
     QScopedPointer<ImportController> m_importController;
     QScopedPointer<ExportController> m_exportController;
     QScopedPointer<SettingsController> m_settingsController;
+    QScopedPointer<SitesController> m_sitesController;
 };
 
 #endif // AMNEZIA_APPLICATION_H
diff --git a/client/images/controls/more-vertical.svg b/client/images/controls/more-vertical.svg
new file mode 100644
index 00000000..2110125d
--- /dev/null
+++ b/client/images/controls/more-vertical.svg
@@ -0,0 +1,5 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M12 13C12.5523 13 13 12.5523 13 12C13 11.4477 12.5523 11 12 11C11.4477 11 11 11.4477 11 12C11 12.5523 11.4477 13 12 13Z" stroke="#CBCBCB" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M12 6C12.5523 6 13 5.55228 13 5C13 4.44772 12.5523 4 12 4C11.4477 4 11 4.44772 11 5C11 5.55228 11.4477 6 12 6Z" stroke="#CBCBCB" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M12 20C12.5523 20 13 19.5523 13 19C13 18.4477 12.5523 18 12 18C11.4477 18 11 18.4477 11 19C11 19.5523 11.4477 20 12 20Z" stroke="#CBCBCB" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/client/images/controls/trash.svg b/client/images/controls/trash.svg
new file mode 100644
index 00000000..5f2f08bf
--- /dev/null
+++ b/client/images/controls/trash.svg
@@ -0,0 +1,5 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M3 6H21" stroke="#CBCBCB" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M19 6V20C19 21 18 22 17 22H7C6 22 5 21 5 20V6" stroke="#CBCBCB" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M8 6V4C8 3 9 2 10 2H14C15 2 16 3 16 4V6" stroke="#CBCBCB" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/client/resources.qrc b/client/resources.qrc
index 625292c2..2238f25d 100644
--- a/client/resources.qrc
+++ b/client/resources.qrc
@@ -280,5 +280,10 @@
         <file>ui/qml/Pages2/PageSetupWizardQrReader.qml</file>
         <file>images/controls/eye.svg</file>
         <file>images/controls/eye-off.svg</file>
+        <file>ui/qml/Pages2/PageSettingsSplitTunneling.qml</file>
+        <file>ui/qml/Controls2/ContextMenuType.qml</file>
+        <file>ui/qml/Controls2/TextAreaType.qml</file>
+        <file>images/controls/trash.svg</file>
+        <file>images/controls/more-vertical.svg</file>
     </qresource>
 </RCC>
diff --git a/client/settings.cpp b/client/settings.cpp
index fbdd63ce..af1fbf55 100644
--- a/client/settings.cpp
+++ b/client/settings.cpp
@@ -231,14 +231,15 @@ QString Settings::routeModeString(RouteMode mode) const
     }
 }
 
-void Settings::addVpnSite(RouteMode mode, const QString &site, const QString &ip)
+bool Settings::addVpnSite(RouteMode mode, const QString &site, const QString &ip)
 {
     QVariantMap sites = vpnSites(mode);
     if (sites.contains(site) && ip.isEmpty())
-        return;
+        return false;
 
     sites.insert(site, ip);
     setVpnSites(mode, sites);
+    return true;
 }
 
 void Settings::addVpnSites(RouteMode mode, const QMap<QString, QString> &sites)
@@ -308,6 +309,11 @@ void Settings::removeVpnSites(RouteMode mode, const QStringList &sites)
     setVpnSites(mode, sitesMap);
 }
 
+void Settings::removeAllVpnSites(RouteMode mode)
+{
+    setVpnSites(mode, QVariantMap());
+}
+
 QString Settings::primaryDns() const
 {
     return m_settings.value("Conf/primaryDns", cloudFlareNs1).toString();
diff --git a/client/settings.h b/client/settings.h
index 00b02c15..d7737347 100644
--- a/client/settings.h
+++ b/client/settings.h
@@ -127,13 +127,14 @@ public:
         m_settings.setValue("Conf/" + routeModeString(mode), sites);
         m_settings.sync();
     }
-    void addVpnSite(RouteMode mode, const QString &site, const QString &ip = "");
+    bool addVpnSite(RouteMode mode, const QString &site, const QString &ip = "");
     void addVpnSites(RouteMode mode, const QMap<QString, QString> &sites); // map <site, ip>
     QStringList getVpnIps(RouteMode mode) const;
     void removeVpnSite(RouteMode mode, const QString &site);
 
     void addVpnIps(RouteMode mode, const QStringList &ip);
     void removeVpnSites(RouteMode mode, const QStringList &sites);
+    void removeAllVpnSites(RouteMode mode);
 
     bool useAmneziaDns() const
     {
diff --git a/client/ui/Controls2 b/client/ui/Controls2
new file mode 100644
index 00000000..13f01bb7
--- /dev/null
+++ b/client/ui/Controls2
@@ -0,0 +1,34 @@
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+
+TextArea {
+    id: root
+
+    width: parent.width
+
+    topPadding: 16
+    leftPadding: 16
+
+    color: "#D7D8DB"
+    selectionColor:  "#412102"
+    selectedTextColor: "#D7D8DB"
+    placeholderTextColor: "#878B91"
+
+    font.pixelSize: 16
+    font.weight: Font.Medium
+    font.family: "PT Root UI VF"
+
+    wrapMode: Text.Wrap
+
+    MouseArea {
+        anchors.fill: parent
+        acceptedButtons: Qt.RightButton
+        onClicked: contextMenu.open()
+    }
+
+    ContextMenuType {
+        id: contextMenu
+        textObj: textField
+    }
+}
diff --git a/client/ui/controllers/connectionController.h b/client/ui/controllers/connectionController.h
index 421ae84f..a33d30c2 100644
--- a/client/ui/controllers/connectionController.h
+++ b/client/ui/controllers/connectionController.h
@@ -1,9 +1,9 @@
 #ifndef CONNECTIONCONTROLLER_H
 #define CONNECTIONCONTROLLER_H
 
-#include "ui/models/servers_model.h"
-#include "ui/models/containers_model.h"
 #include "protocols/vpnprotocol.h"
+#include "ui/models/containers_model.h"
+#include "ui/models/servers_model.h"
 #include "vpnconnection.h"
 
 class ConnectionController : public QObject
@@ -17,8 +17,7 @@ public:
 
     explicit ConnectionController(const QSharedPointer<ServersModel> &serversModel,
                                   const QSharedPointer<ContainersModel> &containersModel,
-                                  const QSharedPointer<VpnConnection> &vpnConnection,
-                                  QObject *parent = nullptr);
+                                  const QSharedPointer<VpnConnection> &vpnConnection, QObject *parent = nullptr);
 
     bool isConnected() const;
     bool isConnectionInProgress() const;
@@ -32,11 +31,12 @@ public slots:
     void onConnectionStateChanged(Vpn::ConnectionState state);
 
 signals:
-    void connectToVpn(int serverIndex, const ServerCredentials &credentials, DockerContainer container, const QJsonObject &containerConfig);
+    void connectToVpn(int serverIndex, const ServerCredentials &credentials, DockerContainer container,
+                      const QJsonObject &containerConfig);
     void disconnectFromVpn();
     void connectionStateChanged();
 
-    void connectionErrorOccurred(QString errorMessage);
+    void connectionErrorOccurred(const QString &errorMessage);
 
 private:
     QSharedPointer<ServersModel> m_serversModel;
diff --git a/client/ui/controllers/exportController.h b/client/ui/controllers/exportController.h
index 84575079..ce952096 100644
--- a/client/ui/controllers/exportController.h
+++ b/client/ui/controllers/exportController.h
@@ -39,7 +39,7 @@ public slots:
 
 signals:
     void generateConfig(int type);
-    void exportErrorOccurred(QString errorMessage);
+    void exportErrorOccurred(const QString &errorMessage);
 
     void exportConfigChanged();
 
diff --git a/client/ui/controllers/importController.h b/client/ui/controllers/importController.h
index 3bdb2252..9556bc6a 100644
--- a/client/ui/controllers/importController.h
+++ b/client/ui/controllers/importController.h
@@ -34,7 +34,7 @@ public slots:
 
 signals:
     void importFinished();
-    void importErrorOccurred(QString errorMessage);
+    void importErrorOccurred(const QString &errorMessage);
 
     void qrDecodingFinished();
 
diff --git a/client/ui/controllers/installController.h b/client/ui/controllers/installController.h
index 54bcda31..38e2e780 100644
--- a/client/ui/controllers/installController.h
+++ b/client/ui/controllers/installController.h
@@ -42,18 +42,18 @@ public slots:
     void setEncryptedPassphrase(QString passphrase);
 
 signals:
-    void installContainerFinished(QString finishMessage);
-    void installServerFinished(QString finishMessage);
+    void installContainerFinished(const QString &finishMessage);
+    void installServerFinished(const QString &finishMessage);
 
     void updateContainerFinished();
 
     void scanServerFinished(bool isInstalledContainerFound);
 
-    void removeCurrentlyProcessedServerFinished(QString finishedMessage);
-    void removeAllContainersFinished(QString finishedMessage);
-    void removeCurrentlyProcessedContainerFinished(QString finishedMessage);
+    void removeCurrentlyProcessedServerFinished(const QString &finishedMessage);
+    void removeAllContainersFinished(const QString &finishedMessage);
+    void removeCurrentlyProcessedContainerFinished(const QString &finishedMessage);
 
-    void installationErrorOccurred(QString errorMessage);
+    void installationErrorOccurred(const QString &errorMessage);
 
     void serverAlreadyExists(int serverIndex);
 
diff --git a/client/ui/controllers/pageController.h b/client/ui/controllers/pageController.h
index 8185b525..fd748347 100644
--- a/client/ui/controllers/pageController.h
+++ b/client/ui/controllers/pageController.h
@@ -28,6 +28,7 @@ namespace PageLoader
         PageSettingsBackup,
         PageSettingsAbout,
         PageSettingsLogging,
+        PageSettingsSplitTunneling,
 
         PageServiceSftpSettings,
         PageServiceTorWebsiteSettings,
@@ -83,8 +84,8 @@ signals:
     void restorePageHomeState(bool isContainerInstalled = false);
     void replaceStartPage();
 
-    void showErrorMessage(QString errorMessage);
-    void showNotificationMessage(QString message);
+    void showErrorMessage(const QString &errorMessage);
+    void showNotificationMessage(const QString &message);
 
     void showBusyIndicator(bool visible);
 
diff --git a/client/ui/controllers/settingsController.cpp b/client/ui/controllers/settingsController.cpp
index 6a83dcb1..571b03e8 100644
--- a/client/ui/controllers/settingsController.cpp
+++ b/client/ui/controllers/settingsController.cpp
@@ -14,7 +14,7 @@ SettingsController::SettingsController(const QSharedPointer<ServersModel> &serve
     m_appVersion = QString("%1: %2 (%3)").arg(tr("Software version"), QString(APP_MAJOR_VERSION), __DATE__);
 }
 
-void SettingsController::setAmneziaDns(bool enable)
+void SettingsController::toggleAmneziaDns(bool enable)
 {
     m_settings->setUseAmneziaDns(enable);
 }
@@ -46,7 +46,7 @@ void SettingsController::setSecondaryDns(const QString &dns)
     emit secondaryDnsChanged();
 }
 
-bool SettingsController::isLoggingEnable()
+bool SettingsController::isLoggingEnabled()
 {
     return m_settings->isSaveLogs();
 }
@@ -111,3 +111,13 @@ void SettingsController::clearSettings()
     m_settings->clearSettings();
     m_serversModel->resetModel();
 }
+
+bool SettingsController::isAutoConnectEnabled()
+{
+    return m_settings->isAutoConnect();
+}
+
+void SettingsController::toggleAutoConnect(bool enable)
+{
+    m_settings->setAutoConnect(enable);
+}
diff --git a/client/ui/controllers/settingsController.h b/client/ui/controllers/settingsController.h
index ac85d300..ffd72f69 100644
--- a/client/ui/controllers/settingsController.h
+++ b/client/ui/controllers/settingsController.h
@@ -16,10 +16,10 @@ public:
 
     Q_PROPERTY(QString primaryDns READ getPrimaryDns WRITE setPrimaryDns NOTIFY primaryDnsChanged)
     Q_PROPERTY(QString secondaryDns READ getSecondaryDns WRITE setSecondaryDns NOTIFY secondaryDnsChanged)
-    Q_PROPERTY(bool isLoggingEnable READ isLoggingEnable WRITE toggleLogging NOTIFY loggingStateChanged)
+    Q_PROPERTY(bool isLoggingEnabled READ isLoggingEnabled WRITE toggleLogging NOTIFY loggingStateChanged)
 
 public slots:
-    void setAmneziaDns(bool enable);
+    void toggleAmneziaDns(bool enable);
     bool isAmneziaDnsEnabled();
 
     QString getPrimaryDns();
@@ -28,7 +28,7 @@ public slots:
     QString getSecondaryDns();
     void setSecondaryDns(const QString &dns);
 
-    bool isLoggingEnable();
+    bool isLoggingEnabled();
     void toggleLogging(bool enable);
 
     void openLogsFolder();
@@ -42,13 +42,16 @@ public slots:
 
     void clearSettings();
 
+    bool isAutoConnectEnabled();
+    void toggleAutoConnect(bool enable);
+
 signals:
     void primaryDnsChanged();
     void secondaryDnsChanged();
     void loggingStateChanged();
 
     void restoreBackupFinished();
-    void changeSettingsErrorOccurred(QString errorMessage);
+    void changeSettingsErrorOccurred(const QString &errorMessage);
 
 private:
     QSharedPointer<ServersModel> m_serversModel;
diff --git a/client/ui/controllers/sitesController.cpp b/client/ui/controllers/sitesController.cpp
new file mode 100644
index 00000000..7f3f93e1
--- /dev/null
+++ b/client/ui/controllers/sitesController.cpp
@@ -0,0 +1,149 @@
+#include "sitesController.h"
+
+#include <QHostInfo>
+
+#include "utilities.h"
+
+SitesController::SitesController(const std::shared_ptr<Settings> &settings,
+                                 const QSharedPointer<VpnConnection> &vpnConnection,
+                                 const QSharedPointer<SitesModel> &sitesModel, QObject *parent)
+    : QObject(parent), m_settings(settings), m_vpnConnection(vpnConnection), m_sitesModel(sitesModel)
+{
+}
+
+void SitesController::addSite(QString hostname)
+{
+    if (hostname.isEmpty()) {
+        return;
+    }
+
+    if (!hostname.contains(".")) {
+        emit errorOccurred(tr("Hostname not look like ip adress or domain name"));
+        return;
+    }
+
+    if (!Utils::ipAddressWithSubnetRegExp().exactMatch(hostname)) {
+        // get domain name if it present
+        hostname.replace("https://", "");
+        hostname.replace("http://", "");
+        hostname.replace("ftp://", "");
+
+        hostname = hostname.split("/", Qt::SkipEmptyParts).first();
+    }
+
+    const auto &processSite = [this](const QString &hostname, const QString &ip) {
+        m_sitesModel->addSite(hostname, ip);
+
+        if (!ip.isEmpty()) {
+            m_vpnConnection->addRoutes(QStringList() << ip);
+            m_vpnConnection->flushDns();
+        } else if (Utils::ipAddressWithSubnetRegExp().exactMatch(hostname)) {
+            m_vpnConnection->addRoutes(QStringList() << hostname);
+            m_vpnConnection->flushDns();
+        }
+    };
+
+    const auto &resolveCallback = [this, processSite](const QHostInfo &hostInfo) {
+        const QList<QHostAddress> &addresses = hostInfo.addresses();
+        for (const QHostAddress &addr : hostInfo.addresses()) {
+            if (addr.protocol() == QAbstractSocket::NetworkLayerProtocol::IPv4Protocol) {
+                processSite(hostInfo.hostName(), addr.toString());
+                break;
+            }
+        }
+    };
+
+    if (Utils::ipAddressWithSubnetRegExp().exactMatch(hostname)) {
+        processSite(hostname, "");
+    } else {
+        processSite(hostname, "");
+        QHostInfo::lookupHost(hostname, this, resolveCallback);
+    }
+
+    emit finished(tr("New site added: ") + hostname);
+}
+
+void SitesController::removeSite(int index)
+{
+    auto modelIndex = m_sitesModel->index(index);
+    auto hostname = m_sitesModel->data(modelIndex, SitesModel::Roles::UrlRole).toString();
+    m_sitesModel->removeSite(modelIndex);
+
+    emit finished(tr("Site removed: ") + hostname);
+}
+
+void SitesController::importSites(bool replaceExisting)
+{
+    QString fileName = Utils::getFileName(Q_NULLPTR, tr("Open sites file"),
+                                          QStandardPaths::writableLocation(QStandardPaths::DocumentsLocation), "*.json");
+
+    if (fileName.isEmpty()) {
+        return;
+    }
+
+    QFile file(fileName);
+    if (!file.open(QIODevice::ReadOnly)) {
+        emit errorOccurred(tr("Can't open file: ") + fileName);
+        return;
+    }
+
+    QByteArray jsonData = file.readAll();
+    QJsonDocument jsonDocument = QJsonDocument::fromJson(jsonData);
+    if (jsonDocument.isNull()) {
+        emit errorOccurred(tr("Failed to parse JSON data from file: ") + fileName);
+        return;
+    }
+
+    if (!jsonDocument.isArray()) {
+        emit errorOccurred(tr("The JSON data is not an array in file: ") + fileName);
+        return;
+    }
+
+    auto jsonArray = jsonDocument.array();
+    QMap<QString, QString> sites;
+    QStringList ips;
+
+    for (auto jsonValue : jsonArray) {
+        auto jsonObject = jsonValue.toObject();
+        auto hostname = jsonObject.value("hostname").toString("");
+        auto ip = jsonObject.value("ip").toString("");
+
+        if (!hostname.contains(".") && !Utils::ipAddressWithSubnetRegExp().exactMatch(hostname)) {
+            qDebug() << hostname << " not look like ip adress or domain name";
+            continue;
+        }
+
+        if (ip.isEmpty()) {
+            ips.append(hostname);
+        } else {
+            ips.append(ip);
+        }
+        sites.insert(hostname, ip);
+    }
+
+    m_sitesModel->addSites(sites, replaceExisting);
+
+    m_vpnConnection->addRoutes(QStringList() << ips);
+    m_vpnConnection->flushDns();
+
+    emit finished(tr("Import completed"));
+}
+
+void SitesController::exportSites()
+{
+    auto sites = m_sitesModel->getCurrentSites();
+
+    QJsonArray jsonArray;
+
+    for (const auto &site : sites) {
+        QJsonObject jsonObject { { "hostname", site.first }, { "ip", site.second } };
+        jsonArray.append(jsonObject);
+    }
+
+    QJsonDocument jsonDocument(jsonArray);
+    QByteArray jsonData = jsonDocument.toJson();
+
+    Utils::saveFile(".json", tr("Export sites file"), "sites", jsonData);
+
+    emit finished(tr("Export completed"));
+}
diff --git a/client/ui/controllers/sitesController.h b/client/ui/controllers/sitesController.h
new file mode 100644
index 00000000..ff78c3de
--- /dev/null
+++ b/client/ui/controllers/sitesController.h
@@ -0,0 +1,36 @@
+#ifndef SITESCONTROLLER_H
+#define SITESCONTROLLER_H
+
+#include <QObject>
+
+#include "settings.h"
+#include "ui/models/sites_model.h"
+#include "vpnconnection.h"
+
+class SitesController : public QObject
+{
+    Q_OBJECT
+public:
+    explicit SitesController(const std::shared_ptr<Settings> &settings,
+                             const QSharedPointer<VpnConnection> &vpnConnection,
+                             const QSharedPointer<SitesModel> &sitesModel, QObject *parent = nullptr);
+
+public slots:
+    void addSite(QString hostname);
+    void removeSite(int index);
+
+    void importSites(bool replaceExisting);
+    void exportSites();
+
+signals:
+    void errorOccurred(const QString &errorMessage);
+    void finished(const QString &message);
+
+private:
+    std::shared_ptr<Settings> m_settings;
+
+    QSharedPointer<VpnConnection> m_vpnConnection;
+    QSharedPointer<SitesModel> m_sitesModel;
+};
+
+#endif // SITESCONTROLLER_H
diff --git a/client/ui/models/sites_model.cpp b/client/ui/models/sites_model.cpp
index fe0f4ccf..5fd9a38b 100644
--- a/client/ui/models/sites_model.cpp
+++ b/client/ui/models/sites_model.cpp
@@ -1,87 +1,118 @@
 #include "sites_model.h"
 
-SitesModel::SitesModel(std::shared_ptr<Settings> settings, Settings::RouteMode mode, QObject *parent)
-    : QAbstractListModel(parent),
-      m_settings(settings),
-      m_mode(mode)
+SitesModel::SitesModel(std::shared_ptr<Settings> settings, QObject *parent)
+    : QAbstractListModel(parent), m_settings(settings)
 {
-}
-
-void SitesModel::resetCache()
-{
-    beginResetModel();
-    m_ipsCache.clear();
-    m_cacheReady = false;
-    endResetModel();
+    m_currentRouteMode = m_settings->routeMode();
+    fillSites();
 }
 
 int SitesModel::rowCount(const QModelIndex &parent) const
 {
     Q_UNUSED(parent)
-    if (!m_cacheReady) genCache();
-    return m_ipsCache.size();
+    return m_sites.size();
 }
 
-
 QVariant SitesModel::data(const QModelIndex &index, int role) const
 {
-    if (!index.isValid())
+    if (!index.isValid() || index.row() < 0 || index.row() >= static_cast<int>(rowCount()))
         return QVariant();
 
-    if (!m_cacheReady) genCache();
-
-    if (role == SitesModel::UrlRole || role == SitesModel::IpRole) {
-        if (m_ipsCache.isEmpty()) return QVariant();
-
-        if (role == SitesModel::UrlRole) {
-            return m_ipsCache.at(index.row()).first;
-        }
-        if (role == SitesModel::IpRole) {
-            return m_ipsCache.at(index.row()).second;
-        }
+    switch (role) {
+    case UrlRole: {
+        return m_sites.at(index.row()).first;
+        break;
+    }
+    case IpRole: {
+        return m_sites.at(index.row()).second;
+        break;
+    }
+    default: {
+        return true;
+    }
     }
-
-    //    if (role == Qt::TextAlignmentRole && index.column() == 1) {
-    //        return Qt::AlignRight;
-    //    }
 
     return QVariant();
 }
 
-QVariant SitesModel::data(int row, int column)
+bool SitesModel::addSite(const QString &hostname, const QString &ip)
 {
-    if (row < 0 || row >= rowCount() || column < 0 || column >= 2) {
-        return QVariant();
+    if (!m_settings->addVpnSite(m_currentRouteMode, hostname, ip)) {
+        return false;
     }
-    if (!m_cacheReady) genCache();
-
-    if (column == 0) {
-        return m_ipsCache.at(row).first;
+    for (int i = 0; i < m_sites.size(); i++) {
+        if (m_sites[i].first == hostname && (m_sites[i].second.isEmpty() && !ip.isEmpty())) {
+            m_sites[i].second = ip;
+            QModelIndex index = createIndex(i, i);
+            emit dataChanged(index, index);
+            return true;
+        } else if (m_sites[i].first == hostname && (m_sites[i].second == ip)) {
+            return false;
+        }
     }
-    if (column == 1) {
-        return m_ipsCache.at(row).second;
-    }
-    return QVariant();
+    beginInsertRows(QModelIndex(), rowCount(), rowCount());
+    m_sites.append(qMakePair(hostname, ip));
+    endInsertRows();
+    return true;
 }
 
-void SitesModel::genCache() const
+void SitesModel::addSites(const QMap<QString, QString> &sites, bool replaceExisting)
 {
-    qDebug() << "SitesModel::genCache";
-    m_ipsCache.clear();
+    beginResetModel();
 
-    const QVariantMap &sites = m_settings->vpnSites(m_mode);
-    auto i = sites.constBegin();
-    while (i != sites.constEnd()) {
-        m_ipsCache.append(qMakePair(i.key(), i.value().toString()));
-        ++i;
+    if (replaceExisting) {
+        m_settings->removeAllVpnSites(m_currentRouteMode);
     }
+    m_settings->addVpnSites(m_currentRouteMode, sites);
+    fillSites();
 
-    m_cacheReady= true;
+    endResetModel();
 }
 
-QHash<int, QByteArray> SitesModel::roleNames() const {
+void SitesModel::removeSite(QModelIndex index)
+{
+    auto hostname = m_sites.at(index.row()).first;
+    beginRemoveRows(QModelIndex(), index.row(), index.row());
+    m_settings->removeVpnSite(m_currentRouteMode, hostname);
+    m_sites.removeAt(index.row());
+    endRemoveRows();
+}
+
+int SitesModel::getRouteMode()
+{
+    return m_currentRouteMode;
+}
+
+void SitesModel::setRouteMode(int routeMode)
+{
+    beginResetModel();
+    m_settings->setRouteMode(static_cast<Settings::RouteMode>(routeMode));
+    m_currentRouteMode = m_settings->routeMode();
+    fillSites();
+    endResetModel();
+    emit routeModeChanged();
+}
+
+QVector<QPair<QString, QString> > SitesModel::getCurrentSites()
+{
+    return m_sites;
+}
+
+QHash<int, QByteArray> SitesModel::roleNames() const
+{
     QHash<int, QByteArray> roles;
-    roles[UrlRole] = "url_path";
+    roles[UrlRole] = "url";
     roles[IpRole] = "ip";
     return roles;
 }
+
+void SitesModel::fillSites()
+{
+    m_sites.clear();
+    const QVariantMap &sites = m_settings->vpnSites(m_currentRouteMode);
+    auto i = sites.constBegin();
+    while (i != sites.constEnd()) {
+        m_sites.append(qMakePair(i.key(), i.value().toString()));
+        ++i;
+    }
+}
diff --git a/client/ui/models/sites_model.h b/client/ui/models/sites_model.h
index 7bf04b50..70def0ec 100644
--- a/client/ui/models/sites_model.h
+++ b/client/ui/models/sites_model.h
@@ -10,32 +10,43 @@ class SitesModel : public QAbstractListModel
     Q_OBJECT
 
 public:
-    enum SiteRoles {
+    enum Roles {
         UrlRole = Qt::UserRole + 1,
         IpRole
     };
 
-    explicit SitesModel(std::shared_ptr<Settings> settings, Settings::RouteMode mode, QObject *parent = nullptr);
-    void resetCache();
+    explicit SitesModel(std::shared_ptr<Settings> settings, QObject *parent = nullptr);
 
-    // Basic functionality:
     int rowCount(const QModelIndex &parent = QModelIndex()) const override;
 
     QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
-    QVariant data(int row, int column);
+
+    Q_PROPERTY(int routeMode READ getRouteMode WRITE setRouteMode NOTIFY routeModeChanged)
+
+public slots:
+    bool addSite(const QString &hostname, const QString &ip);
+    void addSites(const QMap<QString, QString> &sites, bool replaceExisting);
+    void removeSite(QModelIndex index);
+
+    int getRouteMode();
+    void setRouteMode(int routeMode);
+
+    QVector<QPair<QString, QString>> getCurrentSites();
+
+signals:
+    void routeModeChanged();
 
 protected:
     QHash<int, QByteArray> roleNames() const override;
 
 private:
-    void genCache() const;
+    void fillSites();
 
-private:
-    Settings::RouteMode m_mode;
     std::shared_ptr<Settings> m_settings;
 
-    mutable QVector<QPair<QString, QString>> m_ipsCache;
-    mutable bool m_cacheReady = false;
+    Settings::RouteMode m_currentRouteMode;
+
+    QVector<QPair<QString, QString>> m_sites;
 };
 
 #endif // SITESMODEL_H
diff --git a/client/ui/pages_logic/SitesLogic.cpp b/client/ui/pages_logic/SitesLogic.cpp
index bf926e56..7f653bfa 100644
--- a/client/ui/pages_logic/SitesLogic.cpp
+++ b/client/ui/pages_logic/SitesLogic.cpp
@@ -9,23 +9,24 @@
 #include "vpnconnection.h"
 #include <functional>
 
-#include "../uilogic.h"
 #include "../models/sites_model.h"
+#include "../uilogic.h"
 
-SitesLogic::SitesLogic(UiLogic *logic, QObject *parent):
-    PageLogicBase(logic, parent),
-    m_labelSitesAddCustomText{},
-    m_tableViewSitesModel{nullptr},
-    m_lineEditSitesAddCustomText{}
+SitesLogic::SitesLogic(UiLogic *logic, QObject *parent)
+    : PageLogicBase(logic, parent),
+      m_labelSitesAddCustomText {},
+      m_tableViewSitesModel { nullptr },
+      m_lineEditSitesAddCustomText {}
 {
-    sitesModels.insert(Settings::VpnOnlyForwardSites, new SitesModel(m_settings, Settings::VpnOnlyForwardSites));
-    sitesModels.insert(Settings::VpnAllExceptSites, new SitesModel(m_settings, Settings::VpnAllExceptSites));
+    //    sitesModels.insert(Settings::VpnOnlyForwardSites, new SitesModel(m_settings, Settings::VpnOnlyForwardSites));
+    //    sitesModels.insert(Settings::VpnAllExceptSites, new SitesModel(m_settings, Settings::VpnAllExceptSites));
 }
 
 void SitesLogic::onUpdatePage()
 {
     Settings::RouteMode m = m_settings->routeMode();
-    if (m == Settings::VpnAllSites) return;
+    if (m == Settings::VpnAllSites)
+        return;
 
     if (m == Settings::VpnOnlyForwardSites) {
         set_labelSitesAddCustomText(tr("These sites will be opened using VPN"));
@@ -35,7 +36,7 @@ void SitesLogic::onUpdatePage()
     }
 
     set_tableViewSitesModel(sitesModels.value(m));
-    sitesModels.value(m)->resetCache();
+    //    sitesModels.value(m)->resetCache();
 }
 
 void SitesLogic::onPushButtonAddCustomSitesClicked()
@@ -47,8 +48,10 @@ void SitesLogic::onPushButtonAddCustomSitesClicked()
 
     QString newSite = lineEditSitesAddCustomText();
 
-    if (newSite.isEmpty()) return;
-    if (!newSite.contains(".")) return;
+    if (newSite.isEmpty())
+        return;
+    if (!newSite.contains("."))
+        return;
 
     if (!Utils::ipAddressWithSubnetRegExp().exactMatch(newSite)) {
         // get domain name if it present
@@ -65,8 +68,7 @@ void SitesLogic::onPushButtonAddCustomSitesClicked()
         if (!ip.isEmpty()) {
             uiLogic()->m_vpnConnection->addRoutes(QStringList() << ip);
             uiLogic()->m_vpnConnection->flushDns();
-        }
-        else if (Utils::ipAddressWithSubnetRegExp().exactMatch(newSite)) {
+        } else if (Utils::ipAddressWithSubnetRegExp().exactMatch(newSite)) {
             uiLogic()->m_vpnConnection->addRoutes(QStringList() << newSite);
             uiLogic()->m_vpnConnection->flushDns();
         }
@@ -74,10 +76,10 @@ void SitesLogic::onPushButtonAddCustomSitesClicked()
         onUpdatePage();
     };
 
-    const auto &cbResolv = [this, cbProcess](const QHostInfo &hostInfo){
+    const auto &cbResolv = [this, cbProcess](const QHostInfo &hostInfo) {
         const QList<QHostAddress> &addresses = hostInfo.addresses();
         QString ipv4Addr;
-        for (const QHostAddress &addr: hostInfo.addresses()) {
+        for (const QHostAddress &addr : hostInfo.addresses()) {
             if (addr.protocol() == QAbstractSocket::NetworkLayerProtocol::IPv4Protocol) {
                 cbProcess(hostInfo.hostName(), addr.toString());
                 break;
@@ -90,8 +92,7 @@ void SitesLogic::onPushButtonAddCustomSitesClicked()
     if (Utils::ipAddressWithSubnetRegExp().exactMatch(newSite)) {
         cbProcess(newSite, "");
         return;
-    }
-    else {
+    } else {
         cbProcess(newSite, "");
         onUpdatePage();
         QHostInfo::lookupHost(newSite, this, cbResolv);
@@ -102,7 +103,7 @@ void SitesLogic::onPushButtonSitesDeleteClicked(QStringList items)
 {
     Settings::RouteMode mode = m_settings->routeMode();
 
-    auto siteModel = qobject_cast<SitesModel*> (tableViewSitesModel());
+    auto siteModel = qobject_cast<SitesModel *>(tableViewSitesModel());
     if (!siteModel || items.isEmpty()) {
         return;
     }
@@ -110,14 +111,15 @@ void SitesLogic::onPushButtonSitesDeleteClicked(QStringList items)
     QStringList sites;
     QStringList ips;
 
-    for (const QString &s: items) {
+    for (const QString &s : items) {
         bool ok;
         int row = s.toInt(&ok);
-        if (!ok || row < 0 || row >= siteModel->rowCount()) return;
-        sites.append(siteModel->data(row, 0).toString());
+        if (!ok || row < 0 || row >= siteModel->rowCount())
+            return;
+        //        sites.append(siteModel->data(row, 0).toString());
 
         if (uiLogic()->m_vpnConnection->connectionState() == Vpn::ConnectionState::Connected) {
-            ips.append(siteModel->data(row, 1).toString());
+            //            ips.append(siteModel->data(row, 1).toString());
         }
     }
 
@@ -131,11 +133,11 @@ void SitesLogic::onPushButtonSitesDeleteClicked(QStringList items)
     onUpdatePage();
 }
 
-void SitesLogic::onPushButtonSitesImportClicked(const QString& fileName)
+void SitesLogic::onPushButtonSitesImportClicked(const QString &fileName)
 {
-    QFile file(QUrl{fileName}.toLocalFile());
+    QFile file(QUrl { fileName }.toLocalFile());
     if (!file.open(QIODevice::ReadOnly)) {
-        qDebug() << "Can't open file " << QUrl{fileName}.toLocalFile();
+        qDebug() << "Can't open file " << QUrl { fileName }.toLocalFile();
         return;
     }
 
@@ -164,27 +166,24 @@ void SitesLogic::onPushButtonSitesImportClicked(const QString& fileName)
         }
 
         // domain regex cover ip regex, so remove ips from sites
-        for (const QString& ip: line_ips) {
+        for (const QString &ip : line_ips) {
             line_sites.removeAll(ip);
         }
 
         if (line_sites.size() == 1 && line_ips.size() == 1) {
             sites.insert(line_sites.at(0), line_ips.at(0));
-        }
-        else if (line_sites.size() > 0 && line_ips.size() == 0) {
-            for (const QString& site: line_sites) {
+        } else if (line_sites.size() > 0 && line_ips.size() == 0) {
+            for (const QString &site : line_sites) {
                 sites.insert(site, "");
             }
-        }
-        else {
-            for (const QString& site: line_sites) {
+        } else {
+            for (const QString &site : line_sites) {
                 sites.insert(site, "");
             }
-            for (const QString& ip: line_ips) {
+            for (const QString &ip : line_ips) {
                 ips.append(ip);
             }
         }
-
     }
 
     m_settings->addVpnIps(mode, ips);
@@ -208,4 +207,3 @@ void SitesLogic::onPushButtonSitesExportClicked()
     }
     uiLogic()->saveTextFile("Export Sites", "sites.txt", ".txt", data);
 }
-
diff --git a/client/ui/qml/Controls2/BasicButtonType.qml b/client/ui/qml/Controls2/BasicButtonType.qml
index c69d51d7..b0c39ddc 100644
--- a/client/ui/qml/Controls2/BasicButtonType.qml
+++ b/client/ui/qml/Controls2/BasicButtonType.qml
@@ -20,6 +20,8 @@ Button {
 
     property string imageSource
 
+    property bool squareLeftSide: false
+
     implicitHeight: 56
 
     hoverEnabled: true
@@ -44,6 +46,32 @@ Button {
         Behavior on color {
             PropertyAnimation { duration: 200 }
         }
+
+        Rectangle {
+            visible: root.squareLeftSide
+
+            z: 1
+
+            width: parent.radius
+            height: parent.radius
+            anchors.top: parent.top
+            anchors.bottom: parent.bottom
+            anchors.left: parent.left
+            color: {
+                if (root.enabled) {
+                    if (root.pressed) {
+                        return pressedColor
+                    }
+                    return root.hovered ? hoveredColor : defaultColor
+                } else {
+                    return disabledColor
+                }
+            }
+
+            Behavior on color {
+                PropertyAnimation { duration: 200 }
+            }
+        }
     }
 
     MouseArea {
diff --git a/client/ui/qml/Controls2/ContextMenuType.qml b/client/ui/qml/Controls2/ContextMenuType.qml
new file mode 100644
index 00000000..867fcb10
--- /dev/null
+++ b/client/ui/qml/Controls2/ContextMenuType.qml
@@ -0,0 +1,33 @@
+import QtQuick
+import QtQuick.Controls
+import Qt.labs.platform
+
+Menu {
+    property var textObj
+
+    MenuItem {
+        text: qsTr("C&ut")
+        shortcut: StandardKey.Cut
+        enabled: textObj.selectedText
+        onTriggered: textObj.cut()
+    }
+    MenuItem {
+        text: qsTr("&Copy")
+        shortcut: StandardKey.Copy
+        enabled: textObj.selectedText
+        onTriggered: textObj.copy()
+    }
+    MenuItem {
+        text: qsTr("&Paste")
+        shortcut: StandardKey.Paste
+        enabled: textObj.canPaste
+        onTriggered: textObj.paste()
+    }
+
+    MenuItem {
+        text: qsTr("&SelectAll")
+        shortcut: StandardKey.SelectAll
+        enabled: textObj.length > 0
+        onTriggered: textObj.selectAll()
+    }
+}
diff --git a/client/ui/qml/Controls2/DropDownType.qml b/client/ui/qml/Controls2/DropDownType.qml
index 7a4538ba..17151630 100644
--- a/client/ui/qml/Controls2/DropDownType.qml
+++ b/client/ui/qml/Controls2/DropDownType.qml
@@ -24,9 +24,11 @@ Item {
     property string rootButtonBackgroundColor: "#1C1D21"
 
     property string rootButtonHoveredBorderColor: "#494B50"
-    property string rootButtonDefaultBorderColor: "transparent"
+    property string rootButtonDefaultBorderColor: "#2C2D30"
     property string rootButtonPressedBorderColor: "#D7D8DB"
 
+    property int rootButtonTextMargins: 16
+
     property real drawerHeight: 0.9
     property Component listView
 
@@ -74,7 +76,9 @@ Item {
         spacing: 0
 
         ColumnLayout {
-            Layout.leftMargin: 16
+            Layout.leftMargin: rootButtonTextMargins
+            Layout.topMargin: rootButtonTextMargins
+            Layout.bottomMargin: rootButtonTextMargins
 
             LabelTextType {
                 Layout.fillWidth: true
@@ -96,16 +100,10 @@ Item {
 
                 color: root.enabled ? root.textColor : root.textDisabledColor
                 text: root.text
-
-                wrapMode: Text.NoWrap
-                elide: Text.ElideRight
             }
         }
 
         ImageButtonType {
-            Layout.leftMargin: 4
-            Layout.rightMargin: 16
-
             hoverEnabled: false
             image: rootButtonImage
             imageColor: rootButtonImageColor
diff --git a/client/ui/qml/Controls2/TextAreaType.qml b/client/ui/qml/Controls2/TextAreaType.qml
new file mode 100644
index 00000000..9958f2e9
--- /dev/null
+++ b/client/ui/qml/Controls2/TextAreaType.qml
@@ -0,0 +1,70 @@
+import QtQuick
+import QtQuick.Controls
+
+Rectangle {
+    id: root
+
+    property string placeholderText
+    property string text
+    property var onEditingFinished
+
+    height: 148
+    color: "#1C1D21"
+    border.width: 1
+    border.color: "#2C2D30"
+    radius: 16
+
+    FlickableType {
+        anchors.top: parent.top
+        anchors.bottom: parent.bottom
+        contentHeight: textArea.implicitHeight
+        TextArea {
+            id: textArea
+
+            width: parent.width
+
+            topPadding: 16
+            leftPadding: 16
+            anchors.topMargin: 16
+            anchors.bottomMargin: 16
+
+            color: "#D7D8DB"
+            selectionColor:  "#412102"
+            selectedTextColor: "#D7D8DB"
+            placeholderTextColor: "#878B91"
+
+            font.pixelSize: 16
+            font.weight: Font.Medium
+            font.family: "PT Root UI VF"
+
+            placeholderText: root.placeholderText
+            text: root.text
+
+            onEditingFinished: {
+                if (root.onEditingFinished && typeof root.onEditingFinished === "function") {
+                    root.onEditingFinished()
+                }
+            }
+
+            wrapMode: Text.Wrap
+
+            MouseArea {
+                anchors.fill: parent
+                acceptedButtons: Qt.RightButton
+                onClicked: contextMenu.open()
+            }
+
+            ContextMenuType {
+                id: contextMenu
+                textObj: textArea
+            }
+        }
+    }
+
+    //todo make whole background clickable, with code below we lose ability to select text by mouse
+//    MouseArea {
+//        anchors.fill: parent
+//        cursorShape: Qt.IBeamCursor
+//        onClicked: textArea.forceActiveFocus()
+//    }
+}
diff --git a/client/ui/qml/Controls2/TextFieldWithHeaderType.qml b/client/ui/qml/Controls2/TextFieldWithHeaderType.qml
index 1414b5ec..3f31c224 100644
--- a/client/ui/qml/Controls2/TextFieldWithHeaderType.qml
+++ b/client/ui/qml/Controls2/TextFieldWithHeaderType.qml
@@ -41,7 +41,7 @@ Item {
         Rectangle {
             id: backgroud
             Layout.fillWidth: true
-            Layout.preferredHeight: 74
+            Layout.preferredHeight: input.implicitHeight
             color: root.enabled ? root.backgroundColor : root.backgroundDisabledColor
             radius: 16
             border.color: textField.focus ? root.borderFocusedColor : root.borderColor
@@ -52,16 +52,17 @@ Item {
             }
 
             RowLayout {
+                id: input
                 anchors.fill: backgroud
                 ColumnLayout {
+                    Layout.margins: 16
                     LabelTextType {
                         text: root.headerText
                         color: root.enabled ? root.headerTextColor : root.headerTextDisabledColor
 
+                        visible: text !== ""
+
                         Layout.fillWidth: true
-                        Layout.rightMargin: 16
-                        Layout.leftMargin: 16
-                        Layout.topMargin: 16
                     }
 
                     TextField {
@@ -82,9 +83,7 @@ Item {
 
                         height: 24
                         Layout.fillWidth: true
-                        Layout.rightMargin: 16
-                        Layout.leftMargin: 16
-                        Layout.bottomMargin: 16
+
                         topPadding: 0
                         rightPadding: 0
                         leftPadding: 0
@@ -98,24 +97,37 @@ Item {
                         onTextChanged: {
                             root.errorText = ""
                         }
+
+                        MouseArea {
+                            anchors.fill: parent
+                            acceptedButtons: Qt.RightButton
+                            onClicked: contextMenu.open()
+                        }
+
+                        ContextMenuType {
+                            id: contextMenu
+                            textObj: textField
+                        }
                     }
                 }
 
                 BasicButtonType {
                     visible: (root.buttonText !== "") || (root.buttonImageSource !== "")
 
-                    defaultColor: "transparent"
-                    hoveredColor: Qt.rgba(1, 1, 1, 0.08)
-                    pressedColor: Qt.rgba(1, 1, 1, 0.12)
-                    disabledColor: "#878B91"
-                    textColor: "#D7D8DB"
-                    borderWidth: 0
+//                    defaultColor: "transparent"
+//                    hoveredColor: Qt.rgba(1, 1, 1, 0.08)
+//                    pressedColor: Qt.rgba(1, 1, 1, 0.12)
+//                    disabledColor: "#878B91"
+//                    textColor: "#D7D8DB"
+//                    borderWidth: 0
 
                     text: root.buttonText
                     imageSource: root.buttonImageSource
 
-                    Layout.rightMargin: 24
-                    Layout.preferredHeight: 32
+//                        Layout.rightMargin: 24
+                    Layout.preferredHeight: content.implicitHeight
+                    Layout.preferredWidth: content.implicitHeight
+                    squareLeftSide: true
 
                     onClicked: {
                         if (root.clickedFunc && typeof root.clickedFunc === "function") {
diff --git a/client/ui/qml/Pages2/PageHome.qml b/client/ui/qml/Pages2/PageHome.qml
index ce5ddcd4..b756511b 100644
--- a/client/ui/qml/Pages2/PageHome.qml
+++ b/client/ui/qml/Pages2/PageHome.qml
@@ -148,10 +148,11 @@ PageType {
                 DropDownType {
                     id: containersDropDown
 
-                    implicitHeight: 40
-
                     rootButtonImageColor: "#0E0E11"
                     rootButtonBackgroundColor: "#D7D8DB"
+                    rootButtonHoveredBorderColor: "transparent"
+                    rootButtonPressedBorderColor: "transparent"
+                    rootButtonTextMargins: 8
 
                     text: root.defaultContainerName
                     textColor: "#0E0E11"
diff --git a/client/ui/qml/Pages2/PageProtocolOpenVpnSettings.qml b/client/ui/qml/Pages2/PageProtocolOpenVpnSettings.qml
index 7d38a2b0..d25fb659 100644
--- a/client/ui/qml/Pages2/PageProtocolOpenVpnSettings.qml
+++ b/client/ui/qml/Pages2/PageProtocolOpenVpnSettings.qml
@@ -301,50 +301,18 @@ PageType {
                             text: qsTr("Additional client configuration commands")
                         }
 
-                        Rectangle {
+                        TextAreaType {
                             Layout.fillWidth: true
                             Layout.topMargin: 16
 
-                            height: 148
-                            color: "#1C1D21"
-                            border.width: 1
-                            border.color: "#2C2D30"
-                            radius: 16
                             visible: additionalClientCommandsSwitcher.checked
 
-                            FlickableType {
-                                anchors.top: parent.top
-                                anchors.bottom: parent.bottom
-                                contentHeight: additionalClientCommandsTextArea.implicitHeight
-                                TextArea {
-                                    id: additionalClientCommandsTextArea
+                            text: additionalClientCommands
+                            placeholderText: qsTr("Commands:")
 
-                                    width: parent.width
-                                    anchors.topMargin: 16
-                                    anchors.bottomMargin: 16
-
-                                    topPadding: 16
-                                    leftPadding: 16
-
-                                    color: "#D7D8DB"
-                                    selectionColor:  "#412102"
-                                    selectedTextColor: "#D7D8DB"
-                                    placeholderTextColor: "#878B91"
-
-                                    font.pixelSize: 16
-                                    font.weight: Font.Medium
-                                    font.family: "PT Root UI VF"
-
-                                    placeholderText: qsTr("Commands:")
-                                    text: additionalClientCommands
-
-                                    wrapMode: Text.Wrap
-
-                                    onEditingFinished: {
-                                        if (additionalClientCommands !== text) {
-                                            additionalClientCommands = text
-                                        }
-                                    }
+                            onEditingFinished: {
+                                if (additionalClientCommands !== text) {
+                                    additionalClientCommands = text
                                 }
                             }
                         }
@@ -359,50 +327,18 @@ PageType {
                             text: qsTr("Additional server configuration commands")
                         }
 
-                        Rectangle {
+                        TextAreaType {
                             Layout.fillWidth: true
                             Layout.topMargin: 16
 
-                            height: 148
-                            color: "#1C1D21"
-                            border.width: 1
-                            border.color: "#2C2D30"
-                            radius: 16
                             visible: additionalServerCommandsSwitcher.checked
 
-                            FlickableType {
-                                anchors.top: parent.top
-                                anchors.bottom: parent.bottom
-                                contentHeight: additionalServerCommandsTextArea.implicitHeight
-                                TextArea {
-                                    id: additionalServerCommandsTextArea
+                            text: additionalServerCommands
+                            placeholderText: qsTr("Commands:")
 
-                                    width: parent.width
-                                    anchors.topMargin: 16
-                                    anchors.bottomMargin: 16
-
-                                    topPadding: 16
-                                    leftPadding: 16
-
-                                    color: "#D7D8DB"
-                                    selectionColor:  "#412102"
-                                    selectedTextColor: "#D7D8DB"
-                                    placeholderTextColor: "#878B91"
-
-                                    font.pixelSize: 16
-                                    font.weight: Font.Medium
-                                    font.family: "PT Root UI VF"
-
-                                    placeholderText: qsTr("Commands:")
-                                    text: additionalServerCommands
-
-                                    wrapMode: Text.Wrap
-
-                                    onEditingFinished: {
-                                        if (additionalServerCommands !== text) {
-                                            additionalServerCommands = text
-                                        }
-                                    }
+                            onEditingFinished: {
+                                if (additionalServerCommands !== text) {
+                                    additionalServerCommands = text
                                 }
                             }
                         }
diff --git a/client/ui/qml/Pages2/PageSettingsApplication.qml b/client/ui/qml/Pages2/PageSettingsApplication.qml
index 2001e892..9f2fe91a 100644
--- a/client/ui/qml/Pages2/PageSettingsApplication.qml
+++ b/client/ui/qml/Pages2/PageSettingsApplication.qml
@@ -67,7 +67,7 @@ PageType {
                 Layout.fillWidth: true
 
                 text: qsTr("Logging")
-                descriptionText: SettingsController.isLoggingEnable ? qsTr("Enabled") : qsTr("Disabled")
+                descriptionText: SettingsController.isLoggingEnabled ? qsTr("Enabled") : qsTr("Disabled")
                 rightImageSource: "qrc:/images/controls/chevron-right.svg"
 
                 clickedFunction: function() {
diff --git a/client/ui/qml/Pages2/PageSettingsConnection.qml b/client/ui/qml/Pages2/PageSettingsConnection.qml
index fd365edb..6465e40e 100644
--- a/client/ui/qml/Pages2/PageSettingsConnection.qml
+++ b/client/ui/qml/Pages2/PageSettingsConnection.qml
@@ -41,6 +41,24 @@ PageType {
                 headerText: qsTr("Connection")
             }
 
+            SwitcherType {
+                Layout.fillWidth: true
+                Layout.topMargin: 16
+                Layout.bottomMargin: 16
+                Layout.leftMargin: 16
+                Layout.rightMargin: 16
+
+                text: qsTr("Auto connect")
+                descriptionText: qsTr("Connect to VPN on app start")
+
+                checked: SettingsController.isAutoConnectEnabled()
+                onCheckedChanged: {
+                    if (checked !== SettingsController.isAutoConnectEnabled()) {
+                        SettingsController.toggleAutoConnect(checked)
+                    }
+                }
+            }
+
             SwitcherType {
                 Layout.fillWidth: true
                 Layout.topMargin: 16
@@ -54,7 +72,7 @@ PageType {
                 checked: SettingsController.isAmneziaDnsEnabled()
                 onCheckedChanged: {
                     if (checked !== SettingsController.isAmneziaDnsEnabled()) {
-                        SettingsController.setAmneziaDns(checked)
+                        SettingsController.toggleAmneziaDns(checked)
                     }
                 }
             }
@@ -83,6 +101,7 @@ PageType {
                 rightImageSource: "qrc:/images/controls/chevron-right.svg"
 
                 clickedFunction: function() {
+                    goToPage(PageEnum.PageSettingsSplitTunneling)
                 }
             }
 
diff --git a/client/ui/qml/Pages2/PageSettingsLogging.qml b/client/ui/qml/Pages2/PageSettingsLogging.qml
index 998065e4..5138f9a3 100644
--- a/client/ui/qml/Pages2/PageSettingsLogging.qml
+++ b/client/ui/qml/Pages2/PageSettingsLogging.qml
@@ -50,10 +50,10 @@ PageType {
 
                 text: qsTr("Save logs")
 
-                checked: SettingsController.isLoggingEnable
+                checked: SettingsController.isLoggingEnabled
                 onCheckedChanged: {
-                    if (checked !== SettingsController.isLoggingEnable) {
-                        SettingsController.isLoggingEnable = checked
+                    if (checked !== SettingsController.isLoggingEnabled) {
+                        SettingsController.isLoggingEnabled = checked
                     }
                 }
             }
diff --git a/client/ui/qml/Pages2/PageSettingsSplitTunneling.qml b/client/ui/qml/Pages2/PageSettingsSplitTunneling.qml
new file mode 100644
index 00000000..a43e9e5e
--- /dev/null
+++ b/client/ui/qml/Pages2/PageSettingsSplitTunneling.qml
@@ -0,0 +1,377 @@
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+
+import SortFilterProxyModel 0.2
+
+import PageEnum 1.0
+import ProtocolEnum 1.0
+import ContainerProps 1.0
+
+import "./"
+import "../Controls2"
+import "../Controls2/TextTypes"
+import "../Config"
+import "../Components"
+
+PageType {
+    id: root
+
+    Connections {
+        target: SitesController
+
+        function onFinished(message) {
+            PageController.showNotificationMessage(message)
+        }
+
+        function onErrorOccurred(errorMessage) {
+            PageController.showErrorMessage(errorMessage)
+        }
+    }
+
+    QtObject {
+        id: routeMode
+        property int allSites: 0
+        property int onlyForwardSites: 1
+        property int allExceptSites: 2
+    }
+
+    property list<QtObject> routeModesModel: [
+        onlyForwardSites,
+        allExceptSites
+    ]
+
+    QtObject {
+        id: onlyForwardSites
+        property string name: qsTr("Addresses from the list should always open via VPN")
+        property int type: routeMode.onlyForwardSites
+    }
+    QtObject {
+        id: allExceptSites
+        property string name: qsTr("Addresses from the list should never be opened via VPN")
+        property int type: routeMode.allExceptSites
+    }
+
+    function getRouteModesModelIndex() {
+        var currentRouteMode = SitesModel.routeMode
+        if ((routeMode.onlyForwardSites === currentRouteMode) || (routeMode.allSites === currentRouteMode)) {
+            return 0
+        } else if (routeMode.allExceptSites === currentRouteMode) {
+            return 1
+        }
+    }
+
+    ColumnLayout {
+        id: header
+
+        anchors.top: parent.top
+        anchors.left: parent.left
+        anchors.right: parent.right
+
+        anchors.topMargin: 20
+
+        BackButtonType {
+        }
+
+        RowLayout {
+            HeaderType {
+                Layout.fillWidth: true
+                Layout.leftMargin: 16
+
+                headerText: qsTr("Split site tunneling")
+            }
+
+            SwitcherType {
+                id: switcher
+
+                property int lastActiveRouteMode: routeMode.onlyForwardSites
+
+                Layout.fillWidth: true
+                Layout.rightMargin: 16
+
+                checked: SitesModel.routeMode !== routeMode.allSites
+                onToggled: {
+                    if (checked) {
+                        SitesModel.routeMode = lastActiveRouteMode
+                    } else {
+                        lastActiveRouteMode = SitesModel.routeMode
+                        selector.text = root.routeModesModel[getRouteModesModelIndex()].name
+                        SitesModel.routeMode = routeMode.allSites
+                    }
+                }
+            }
+        }
+
+        DropDownType {
+            id: selector
+
+            Layout.fillWidth: true
+            Layout.topMargin: 32
+            Layout.leftMargin: 16
+            Layout.rightMargin: 16
+
+            drawerHeight: 0.4375
+
+            enabled: switcher.checked
+
+            headerText: qsTr("Mode")
+
+            listView: ListViewType {
+                rootWidth: root.width
+
+                model: root.routeModesModel
+
+                currentIndex: getRouteModesModelIndex()
+
+                clickedFunction: function() {
+                    selector.text = selectedText
+                    selector.menuVisible = false
+                    if (SitesModel.routeMode !== root.routeModesModel[currentIndex].type) {
+                        SitesModel.routeMode = root.routeModesModel[currentIndex].type
+                    }
+                }
+
+                Component.onCompleted: {
+                    if (root.routeModesModel[currentIndex].type === SitesModel.routeMode) {
+                        selector.text = selectedText
+                    } else {
+                        selector.text = root.routeModesModel[0].name
+                    }
+                }
+
+                Connections {
+                    target: SitesModel
+                    function onRouteModeChanged() {
+                        currentIndex = getRouteModesModelIndex()
+                    }
+                }
+            }
+        }
+    }
+
+    FlickableType {
+        anchors.top: header.bottom
+        anchors.topMargin: 16
+        contentHeight: col.implicitHeight + connectButton.implicitHeight + connectButton.anchors.bottomMargin + connectButton.anchors.topMargin
+
+        enabled: switcher.checked
+
+        Column {
+            id: col
+            anchors.top: parent.top
+            anchors.left: parent.left
+            anchors.right: parent.right
+
+            ListView {
+                id: sites
+                width: parent.width
+                height: sites.contentItem.height
+
+                model: SitesModel
+
+                clip: true
+                interactive: false
+
+                delegate: Item {
+                    implicitWidth: sites.width
+                    implicitHeight: delegateContent.implicitHeight
+
+                    ColumnLayout {
+                        id: delegateContent
+
+                        anchors.top: parent.top
+                        anchors.left: parent.left
+                        anchors.right: parent.right
+
+                        LabelWithButtonType {
+                            Layout.fillWidth: true
+
+                            text: url
+                            descriptionText: ip
+                            rightImageSource: "qrc:/images/controls/trash.svg"
+                            rightImageColor: "#D7D8DB"
+
+                            clickedFunction: function() {
+                                questionDrawer.headerText = qsTr("Remove ") + url + "?"
+                                questionDrawer.yesButtonText = qsTr("Continue")
+                                questionDrawer.noButtonText = qsTr("Cancel")
+
+                                questionDrawer.yesButtonFunction = function() {
+                                    questionDrawer.visible = false
+                                    SitesController.removeSite(index)
+                                }
+                                questionDrawer.noButtonFunction = function() {
+                                    questionDrawer.visible = false
+                                }
+                                questionDrawer.visible = true
+                            }
+                        }
+
+                        DividerType {}
+
+                        QuestionDrawer {
+                            id: questionDrawer
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    RowLayout {
+        id: connectButton
+
+        anchors.bottom: parent.bottom
+        anchors.left: parent.left
+        anchors.right: parent.right
+        anchors.topMargin: 24
+        anchors.rightMargin: 16
+        anchors.leftMargin: 16
+        anchors.bottomMargin: 24
+
+        TextFieldWithHeaderType {
+            Layout.fillWidth: true
+
+            textFieldPlaceholderText: qsTr("Site or IP")
+            buttonImageSource: "qrc:/images/controls/plus.svg"
+
+            clickedFunc: function() {
+                SitesController.addSite(textFieldText)
+                textFieldText = ""
+            }
+        }
+
+        ImageButtonType {
+            implicitWidth: 56
+            implicitHeight: 56
+
+            image: "qrc:/images/controls/more-vertical.svg"
+            imageColor: "#D7D8DB"
+
+            onClicked: function () {
+                moreActionsDrawer.open()
+            }
+        }
+    }
+
+    DrawerType {
+        id: moreActionsDrawer
+
+        width: parent.width
+        height: parent.height * 0.4375
+
+        FlickableType {
+            anchors.fill: parent
+            contentHeight: moreActionsDrawerContent.height
+            ColumnLayout {
+                id: moreActionsDrawerContent
+
+                anchors.top: parent.top
+                anchors.left: parent.left
+                anchors.right: parent.right
+
+                Header2Type {
+                    Layout.fillWidth: true
+                    Layout.margins: 16
+
+                    headerText: qsTr("Import/Export Sites")
+                }
+
+                LabelWithButtonType {
+                    Layout.fillWidth: true
+
+                    text: qsTr("Import")
+                    rightImageSource: "qrc:/images/controls/chevron-right.svg"
+
+                    clickedFunction: function() {
+                        importSitesDrawer.open()
+                    }
+                }
+
+                DividerType {}
+
+                LabelWithButtonType {
+                    Layout.fillWidth: true
+                    text: qsTr("Save site list")
+
+                    clickedFunction: function() {
+                        SitesController.exportSites()
+                        moreActionsDrawer.close()
+                    }
+                }
+
+                DividerType {}
+            }
+        }
+    }
+
+    DrawerType {
+        id: importSitesDrawer
+
+        width: parent.width
+        height: parent.height * 0.4375
+
+        BackButtonType {
+            id: importSitesDrawerBackButton
+
+            anchors.top: parent.top
+            anchors.left: parent.left
+            anchors.right: parent.right
+            anchors.topMargin: 16
+
+            backButtonFunction: function() {
+                importSitesDrawer.close()
+            }
+        }
+
+        FlickableType {
+            anchors.top: importSitesDrawerBackButton.bottom
+            anchors.left: parent.left
+            anchors.right: parent.right
+            anchors.bottom: parent.bottom
+
+            contentHeight: importSitesDrawerContent.height
+            ColumnLayout {
+                id: importSitesDrawerContent
+
+                anchors.top: parent.top
+                anchors.left: parent.left
+                anchors.right: parent.right
+
+                Header2Type {
+                    Layout.fillWidth: true
+                    Layout.margins: 16
+
+                    headerText: qsTr("Import a list of sites")
+                }
+
+                LabelWithButtonType {
+                    Layout.fillWidth: true
+
+                    text: qsTr("Replace site list")
+
+                    clickedFunction: function() {
+                        SitesController.importSites(true)
+                        importSitesDrawer.close()
+                        moreActionsDrawer.close()
+                    }
+                }
+
+                DividerType {}
+
+                LabelWithButtonType {
+                    Layout.fillWidth: true
+                    text: qsTr("Add imported sites to existing ones")
+
+                    clickedFunction: function() {
+                        SitesController.importSites(false)
+                        importSitesDrawer.close()
+                        moreActionsDrawer.close()
+                    }
+                }
+
+                DividerType {}
+            }
+        }
+    }
+}

From 0c40a954fad64efc89092490601ef68698c3a450 Mon Sep 17 00:00:00 2001
From: "vladimir.kuznetsov" <nethiuswork@gmail.com>
Date: Tue, 8 Aug 2023 19:39:08 +0500
Subject: [PATCH 057/278] fixed include in sitesController for android build

---
 client/ui/controllers/sitesController.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/client/ui/controllers/sitesController.cpp b/client/ui/controllers/sitesController.cpp
index 7f3f93e1..98790630 100644
--- a/client/ui/controllers/sitesController.cpp
+++ b/client/ui/controllers/sitesController.cpp
@@ -1,6 +1,7 @@
 #include "sitesController.h"
 
 #include <QHostInfo>
+#include <QStandardPaths>
 
 #include "utilities.h"
 

From 591d98d8b60aef386141ad6dc67559764fd64e02 Mon Sep 17 00:00:00 2001
From: "vladimir.kuznetsov" <nethiuswork@gmail.com>
Date: Wed, 9 Aug 2023 18:17:29 +0500
Subject: [PATCH 058/278] moved vpnConnection to separate thread - added tabbar
 blocking when installing/removing containers

---
 client/amnezia_application.cpp                |  23 ++++
 client/amnezia_application.h                  |   1 +
 client/main.cpp                               |  19 ++--
 client/protocols/openvpnprotocol.cpp          | 103 +++++++++---------
 client/ui/controllers/pageController.h        |   1 +
 client/ui/controllers/sitesController.cpp     |  17 ++-
 client/ui/pages_logic/SitesLogic.cpp          |  32 ++----
 client/ui/qml/Pages2/PageDeinstalling.qml     |   3 +
 .../Pages2/PageProtocolOpenVpnSettings.qml    |   6 +
 client/ui/qml/Pages2/PageSettingsBackup.qml   |   2 +-
 .../ui/qml/Pages2/PageSettingsServerData.qml  |   2 +-
 .../qml/Pages2/PageSetupWizardInstalling.qml  |   3 +
 client/ui/qml/Pages2/PageStart.qml            |   8 +-
 client/ui/uilogic.cpp                         |   3 -
 14 files changed, 128 insertions(+), 95 deletions(-)

diff --git a/client/amnezia_application.cpp b/client/amnezia_application.cpp
index 933a6346..20b5ac3d 100644
--- a/client/amnezia_application.cpp
+++ b/client/amnezia_application.cpp
@@ -57,6 +57,27 @@ AmneziaApplication::AmneziaApplication(int &argc, char *argv[], bool allowSecond
 
 AmneziaApplication::~AmneziaApplication()
 {
+    //    emit hide();
+
+    // #ifdef AMNEZIA_DESKTOP
+    //     if (m_vpnConnection->connectionState() != Vpn::ConnectionState::Disconnected) {
+    //         m_vpnConnection->disconnectFromVpn();
+    //         for (int i = 0; i < 50; i++) {
+    //             qApp->processEvents(QEventLoop::ExcludeUserInputEvents);
+    //             QThread::msleep(100);
+    //             if (m_vpnConnection->isDisconnected()) {
+    //                 break;
+    //             }
+    //         }
+    //     }
+    // #endif
+
+    //    m_vpnConnection->deleteLater();
+    //    m_vpnConnectionThread.quit();
+    //    m_vpnConnectionThread.wait(3000);
+
+    //    qDebug() << "Application closed";
+
     if (m_engine) {
         QObject::disconnect(m_engine, 0, 0, 0);
         delete m_engine;
@@ -87,6 +108,8 @@ void AmneziaApplication::init()
 
     m_configurator = std::shared_ptr<VpnConfigurator>(new VpnConfigurator(m_settings, this));
     m_vpnConnection.reset(new VpnConnection(m_settings, m_configurator));
+    m_vpnConnection->moveToThread(&m_vpnConnectionThread);
+    m_vpnConnectionThread.start();
 
     initModels();
     initControllers();
diff --git a/client/amnezia_application.h b/client/amnezia_application.h
index 81897c83..675ffd81 100644
--- a/client/amnezia_application.h
+++ b/client/amnezia_application.h
@@ -101,6 +101,7 @@ private:
     QScopedPointer<SftpConfigModel> m_sftpConfigModel;
 
     QSharedPointer<VpnConnection> m_vpnConnection;
+    QThread m_vpnConnectionThread;
     QScopedPointer<NotificationHandler> m_notificationHandler;
 
     QScopedPointer<ConnectionController> m_connectionController;
diff --git a/client/main.cpp b/client/main.cpp
index 72ed6018..e78a74ff 100644
--- a/client/main.cpp
+++ b/client/main.cpp
@@ -2,20 +2,19 @@
 #include <QTimer>
 
 #include "amnezia_application.h"
-#include "version.h"
 #include "migrations.h"
+#include "version.h"
 
 #include <QTimer>
 
 #ifdef Q_OS_WIN
-#include "Windows.h"
+    #include "Windows.h"
 #endif
 
 #if defined(Q_OS_IOS)
-#include "platforms/ios/QtAppDelegate-C-Interface.h"
+    #include "platforms/ios/QtAppDelegate-C-Interface.h"
 #endif
 
-
 int main(int argc, char *argv[])
 {
     Migrations migrationsManager;
@@ -27,16 +26,14 @@ int main(int argc, char *argv[])
     AllowSetForegroundWindow(ASFW_ANY);
 #endif
 
-
 #if defined(Q_OS_ANDROID) || defined(Q_OS_IOS)
     AmneziaApplication app(argc, argv);
 #else
-    AmneziaApplication app(argc, argv, true, SingleApplication::Mode::User | SingleApplication::Mode::SecondaryNotification);
+    AmneziaApplication app(argc, argv, true,
+                           SingleApplication::Mode::User | SingleApplication::Mode::SecondaryNotification);
 
     if (!app.isPrimary()) {
-        QTimer::singleShot(1000, &app, [&](){
-            app.quit();
-        });
+        QTimer::singleShot(1000, &app, [&]() { app.quit(); });
         return app.exec();
     }
 #endif
@@ -63,6 +60,10 @@ int main(int argc, char *argv[])
 
     if (doExec) {
         app.init();
+
+        qInfo().noquote() << QString("Started %1 version %2").arg(APPLICATION_NAME, APP_VERSION);
+        qInfo().noquote() << QString("%1 (%2)").arg(QSysInfo::prettyProductName(), QSysInfo::currentCpuArchitecture());
+
         return app.exec();
     }
     return 0;
diff --git a/client/protocols/openvpnprotocol.cpp b/client/protocols/openvpnprotocol.cpp
index 7db64231..9551cb46 100644
--- a/client/protocols/openvpnprotocol.cpp
+++ b/client/protocols/openvpnprotocol.cpp
@@ -1,21 +1,20 @@
 #include <QCoreApplication>
 #include <QFileInfo>
 #include <QProcess>
-#include <QTcpSocket>
-#include <QTcpServer>
 #include <QRandomGenerator>
+#include <QTcpServer>
+#include <QTcpSocket>
 
 #include "logger.h"
-#include "version.h"
-#include "utilities.h"
 #include "openvpnprotocol.h"
+#include "utilities.h"
+#include "version.h"
 
-
-OpenVpnProtocol::OpenVpnProtocol(const QJsonObject &configuration, QObject* parent) :
-    VpnProtocol(configuration, parent)
+OpenVpnProtocol::OpenVpnProtocol(const QJsonObject &configuration, QObject *parent) : VpnProtocol(configuration, parent)
 {
     readOpenVpnConfiguration(configuration);
-    connect(&m_managementServer, &ManagementServer::readyRead, this, &OpenVpnProtocol::onReadyReadDataFromManagementServer);
+    connect(&m_managementServer, &ManagementServer::readyRead, this,
+            &OpenVpnProtocol::onReadyReadDataFromManagementServer);
 }
 
 OpenVpnProtocol::~OpenVpnProtocol()
@@ -27,7 +26,7 @@ OpenVpnProtocol::~OpenVpnProtocol()
 
 QString OpenVpnProtocol::defaultConfigFileName()
 {
-    //qDebug() << "OpenVpnProtocol::defaultConfigFileName" << defaultConfigPath() + QString("/%1.ovpn").arg(APPLICATION_NAME);
+    // qDebug() << "OpenVpnProtocol::defaultConfigFileName" << defaultConfigPath() + QString("/%1.ovpn").arg(APPLICATION_NAME);
     return defaultConfigPath() + QString("/%1.ovpn").arg(APPLICATION_NAME);
 }
 
@@ -42,21 +41,20 @@ QString OpenVpnProtocol::defaultConfigPath()
 void OpenVpnProtocol::stop()
 {
     qDebug() << "OpenVpnProtocol::stop()";
-    setConnectionState(VpnProtocol::Disconnecting);
+    setConnectionState(Vpn::ConnectionState::Disconnecting);
 
     // TODO: need refactoring
     // sendTermSignal() will even return true while server connected ???
-    if ((m_connectionState == Vpn::ConnectionState::Preparing) ||
-            (m_connectionState == Vpn::ConnectionState::Connecting) ||
-            (m_connectionState == Vpn::ConnectionState::Connected) ||
-            (m_connectionState == Vpn::ConnectionState::Reconnecting)) {
+    if ((m_connectionState == Vpn::ConnectionState::Preparing) || (m_connectionState == Vpn::ConnectionState::Connecting)
+        || (m_connectionState == Vpn::ConnectionState::Connected)
+        || (m_connectionState == Vpn::ConnectionState::Reconnecting)) {
         if (!sendTermSignal()) {
             killOpenVpnProcess();
         }
         QThread::msleep(10);
         m_managementServer.stop();
     }
-    setConnectionState(VpnProtocol::Disconnected);
+    setConnectionState(Vpn::ConnectionState::Disconnected);
 }
 
 ErrorCode OpenVpnProtocol::prepare()
@@ -68,18 +66,19 @@ ErrorCode OpenVpnProtocol::prepare()
     QRemoteObjectPendingReply<QStringList> resultCheck = IpcClient::Interface()->getTapList();
     resultCheck.waitForFinished();
 
-    if (resultCheck.returnValue().isEmpty()){
+    if (resultCheck.returnValue().isEmpty()) {
         QRemoteObjectPendingReply<bool> resultInstall = IpcClient::Interface()->checkAndInstallDriver();
         resultInstall.waitForFinished();
 
-        if (!resultInstall.returnValue()) return ErrorCode::OpenVpnTapAdapterError;
+        if (!resultInstall.returnValue())
+            return ErrorCode::OpenVpnTapAdapterError;
     }
     return ErrorCode::NoError;
 }
 
 void OpenVpnProtocol::killOpenVpnProcess()
 {
-    if (m_openVpnProcess){
+    if (m_openVpnProcess) {
         m_openVpnProcess->close();
     }
 }
@@ -113,9 +112,9 @@ QString OpenVpnProtocol::configPath() const
     return m_configFileName;
 }
 
-void OpenVpnProtocol::sendManagementCommand(const QString& command)
+void OpenVpnProtocol::sendManagementCommand(const QString &command)
 {
-    QIODevice *device = dynamic_cast<QIODevice*>(m_managementServer.socket().data());
+    QIODevice *device = dynamic_cast<QIODevice *>(m_managementServer.socket().data());
     if (device) {
         QTextStream stream(device);
         stream << command << Qt::endl;
@@ -127,11 +126,12 @@ uint OpenVpnProtocol::selectMgmtPort()
 
     for (int i = 0; i < 100; ++i) {
         quint32 port = QRandomGenerator::global()->generate();
-        port = (double)(65000-15001) * port / UINT32_MAX + 15001;
+        port = (double)(65000 - 15001) * port / UINT32_MAX + 15001;
 
         QTcpServer s;
         bool ok = s.listen(QHostAddress::LocalHost, port);
-        if (ok) return port;
+        if (ok)
+            return port;
     }
 
     return m_managementPort;
@@ -141,7 +141,8 @@ void OpenVpnProtocol::updateRouteGateway(QString line)
 {
     // TODO: fix for macos
     line = line.split("ROUTE_GATEWAY", Qt::SkipEmptyParts).at(1);
-    if (!line.contains("/")) return;
+    if (!line.contains("/"))
+        return;
     m_routeGateway = line.split("/", Qt::SkipEmptyParts).first();
     m_routeGateway.replace(" ", "");
     qDebug() << "Set VPN route gateway" << m_routeGateway;
@@ -149,7 +150,7 @@ void OpenVpnProtocol::updateRouteGateway(QString line)
 
 ErrorCode OpenVpnProtocol::start()
 {
-    //qDebug() << "Start OpenVPN connection";
+    // qDebug() << "Start OpenVPN connection";
     OpenVpnProtocol::stop();
 
     if (!QFileInfo::exists(Utils::openVpnExecPath())) {
@@ -167,24 +168,25 @@ ErrorCode OpenVpnProtocol::start()
     QProcess p;
     p.setProcessChannelMode(QProcess::MergedChannels);
 
-    p.start("route", QStringList() << "-n" << "get" << "default");
+    p.start("route",
+            QStringList() << "-n"
+                          << "get"
+                          << "default");
     p.waitForFinished();
-    QString s =  p.readAll();
+    QString s = p.readAll();
 
     QRegularExpression rx(R"(gateway:\s*(\d+\.\d+\.\d+\.\d+))");
     QRegularExpressionMatch match = rx.match(s);
     if (match.hasMatch()) {
         m_routeGateway = match.captured(1);
         qDebug() << "Set VPN route gateway" << m_routeGateway;
-    }
-    else {
+    } else {
         qWarning() << "Unable to set VPN route gateway, output:\n" << s;
     }
 #endif
 
-
-//    QString vpnLogFileNamePath = Utils::systemLogPath() + "/openvpn.log";
-//    Utils::createEmptyFile(vpnLogFileNamePath);
+    //    QString vpnLogFileNamePath = Utils::systemLogPath() + "/openvpn.log";
+    //    Utils::createEmptyFile(vpnLogFileNamePath);
 
     uint mgmtPort = selectMgmtPort();
     qDebug() << "OpenVpnProtocol::start mgmt port selected:" << mgmtPort;
@@ -199,7 +201,7 @@ ErrorCode OpenVpnProtocol::start()
     m_openVpnProcess = IpcClient::CreatePrivilegedProcess();
 
     if (!m_openVpnProcess) {
-        //qWarning() << "IpcProcess replica is not created!";
+        // qWarning() << "IpcProcess replica is not created!";
         setLastError(ErrorCode::AmneziaServiceConnectionFailed);
         return ErrorCode::AmneziaServiceConnectionFailed;
     }
@@ -211,28 +213,25 @@ ErrorCode OpenVpnProtocol::start()
         return ErrorCode::AmneziaServiceConnectionFailed;
     }
     m_openVpnProcess->setProgram(PermittedProcess::OpenVPN);
-    QStringList arguments({"--config" , configPath(),
-                      "--management", m_managementHost, QString::number(mgmtPort),
-                      "--management-client"/*, "--log", vpnLogFileNamePath */
-                     });
+    QStringList arguments({
+            "--config", configPath(), "--management", m_managementHost, QString::number(mgmtPort),
+            "--management-client" /*, "--log", vpnLogFileNamePath */
+    });
     m_openVpnProcess->setArguments(arguments);
 
     qDebug() << arguments.join(" ");
-    connect(m_openVpnProcess.data(), &PrivilegedProcess::errorOccurred, [&](QProcess::ProcessError error) {
-        qDebug() << "PrivilegedProcess errorOccurred" << error;
-    });
+    connect(m_openVpnProcess.data(), &PrivilegedProcess::errorOccurred,
+            [&](QProcess::ProcessError error) { qDebug() << "PrivilegedProcess errorOccurred" << error; });
 
-    connect(m_openVpnProcess.data(), &PrivilegedProcess::stateChanged, [&](QProcess::ProcessState newState) {
-        qDebug() << "PrivilegedProcess stateChanged" << newState;
-    });
+    connect(m_openVpnProcess.data(), &PrivilegedProcess::stateChanged,
+            [&](QProcess::ProcessState newState) { qDebug() << "PrivilegedProcess stateChanged" << newState; });
 
-    connect(m_openVpnProcess.data(), &PrivilegedProcess::finished, this, [&]() {
-        setConnectionState(Vpn::ConnectionState::Disconnected);
-    });
+    connect(m_openVpnProcess.data(), &PrivilegedProcess::finished, this,
+            [&]() { setConnectionState(Vpn::ConnectionState::Disconnected); });
 
     m_openVpnProcess->start();
 
-    //startTimeoutTimer();
+    // startTimeoutTimer();
 
     return ErrorCode::NoError;
 }
@@ -255,7 +254,7 @@ void OpenVpnProtocol::sendInitialData()
 
 void OpenVpnProtocol::onReadyReadDataFromManagementServer()
 {
-    for (;;)  {
+    for (;;) {
         QString line = m_managementServer.readLine().simplified();
 
         if (line.isEmpty()) {
@@ -268,14 +267,14 @@ void OpenVpnProtocol::onReadyReadDataFromManagementServer()
 
         if (line.contains(">INFO:OpenVPN Management Interface")) {
             sendInitialData();
-        }  else if (line.startsWith(">STATE")) {
+        } else if (line.startsWith(">STATE")) {
             if (line.contains("CONNECTED,SUCCESS")) {
                 sendByteCount();
                 stopTimeoutTimer();
                 setConnectionState(Vpn::ConnectionState::Connected);
                 continue;
             } else if (line.contains("EXITING,SIGTER")) {
-                //openVpnStateSigTermHandler();
+                // openVpnStateSigTermHandler();
                 setConnectionState(Vpn::ConnectionState::Disconnecting);
                 continue;
             } else if (line.contains("RECONNECTING")) {
@@ -295,8 +294,7 @@ void OpenVpnProtocol::onReadyReadDataFromManagementServer()
         if (line.contains("FATAL")) {
             if (line.contains("tap-windows6 adapters on this system are currently in use or disabled")) {
                 emit protocolError(ErrorCode::OpenVpnAdaptersInUseError);
-            }
-            else {
+            } else {
                 emit protocolError(ErrorCode::OpenVpnUnknownError);
             }
             return;
@@ -321,7 +319,8 @@ void OpenVpnProtocol::onReadyReadDataFromManagementServer()
 void OpenVpnProtocol::updateVpnGateway(const QString &line)
 {
     // line looks like
-    // PUSH: Received control message: 'PUSH_REPLY,route 10.8.0.1,topology net30,ping 10,ping-restart 120,ifconfig 10.8.0.6 10.8.0.5,peer-id 0,cipher AES-256-GCM'
+    // PUSH: Received control message: 'PUSH_REPLY,route 10.8.0.1,topology net30,ping 10,ping-restart
+    // 120,ifconfig 10.8.0.6 10.8.0.5,peer-id 0,cipher AES-256-GCM'
 
     QStringList params = line.split(",");
     for (const QString &l : params) {
diff --git a/client/ui/controllers/pageController.h b/client/ui/controllers/pageController.h
index fd748347..049201e4 100644
--- a/client/ui/controllers/pageController.h
+++ b/client/ui/controllers/pageController.h
@@ -88,6 +88,7 @@ signals:
     void showNotificationMessage(const QString &message);
 
     void showBusyIndicator(bool visible);
+    void enableTabBar(bool enabled);
 
     void hideMainWindow();
     void raiseMainWindow();
diff --git a/client/ui/controllers/sitesController.cpp b/client/ui/controllers/sitesController.cpp
index 98790630..d8bc99c8 100644
--- a/client/ui/controllers/sitesController.cpp
+++ b/client/ui/controllers/sitesController.cpp
@@ -36,12 +36,13 @@ void SitesController::addSite(QString hostname)
         m_sitesModel->addSite(hostname, ip);
 
         if (!ip.isEmpty()) {
-            m_vpnConnection->addRoutes(QStringList() << ip);
-            m_vpnConnection->flushDns();
+            QMetaObject::invokeMethod(m_vpnConnection.get(), "addRoutes", Qt::QueuedConnection,
+                                      Q_ARG(QStringList, QStringList() << ip));
         } else if (Utils::ipAddressWithSubnetRegExp().exactMatch(hostname)) {
-            m_vpnConnection->addRoutes(QStringList() << hostname);
-            m_vpnConnection->flushDns();
+            QMetaObject::invokeMethod(m_vpnConnection.get(), "addRoutes", Qt::QueuedConnection,
+                                      Q_ARG(QStringList, QStringList() << hostname));
         }
+        QMetaObject::invokeMethod(m_vpnConnection.get(), "flushDns", Qt::QueuedConnection);
     };
 
     const auto &resolveCallback = [this, processSite](const QHostInfo &hostInfo) {
@@ -70,6 +71,10 @@ void SitesController::removeSite(int index)
     auto hostname = m_sitesModel->data(modelIndex, SitesModel::Roles::UrlRole).toString();
     m_sitesModel->removeSite(modelIndex);
 
+    QMetaObject::invokeMethod(m_vpnConnection.get(), "deleteRoutes", Qt::QueuedConnection,
+                              Q_ARG(QStringList, QStringList() << hostname));
+    QMetaObject::invokeMethod(m_vpnConnection.get(), "flushDns", Qt::QueuedConnection);
+
     emit finished(tr("Site removed: ") + hostname);
 }
 
@@ -124,8 +129,8 @@ void SitesController::importSites(bool replaceExisting)
 
     m_sitesModel->addSites(sites, replaceExisting);
 
-    m_vpnConnection->addRoutes(QStringList() << ips);
-    m_vpnConnection->flushDns();
+    QMetaObject::invokeMethod(m_vpnConnection.get(), "addRoutes", Qt::QueuedConnection, Q_ARG(QStringList, ips));
+    QMetaObject::invokeMethod(m_vpnConnection.get(), "flushDns", Qt::QueuedConnection);
 
     emit finished(tr("Import completed"));
 }
diff --git a/client/ui/pages_logic/SitesLogic.cpp b/client/ui/pages_logic/SitesLogic.cpp
index b5760dfb..aaf8f73d 100644
--- a/client/ui/pages_logic/SitesLogic.cpp
+++ b/client/ui/pages_logic/SitesLogic.cpp
@@ -66,18 +66,14 @@ void SitesLogic::onPushButtonAddCustomSitesClicked()
         m_settings->addVpnSite(mode, newSite, ip);
 
         if (!ip.isEmpty()) {
-            QMetaObject::invokeMethod(uiLogic()->m_vpnConnection, "addRoutes",
-                                      Qt::QueuedConnection,
+            QMetaObject::invokeMethod(uiLogic()->m_vpnConnection, "addRoutes", Qt::QueuedConnection,
                                       Q_ARG(QStringList, QStringList() << ip));
-        }
-        else if (Utils::ipAddressWithSubnetRegExp().exactMatch(newSite)) {
-            QMetaObject::invokeMethod(uiLogic()->m_vpnConnection, "addRoutes",
-                                      Qt::QueuedConnection,
+        } else if (Utils::ipAddressWithSubnetRegExp().exactMatch(newSite)) {
+            QMetaObject::invokeMethod(uiLogic()->m_vpnConnection, "addRoutes", Qt::QueuedConnection,
                                       Q_ARG(QStringList, QStringList() << newSite));
         }
 
-        QMetaObject::invokeMethod(uiLogic()->m_vpnConnection, "flushDns",
-                                  Qt::QueuedConnection);
+        QMetaObject::invokeMethod(uiLogic()->m_vpnConnection, "flushDns", Qt::QueuedConnection);
 
         onUpdatePage();
     };
@@ -124,19 +120,16 @@ void SitesLogic::onPushButtonSitesDeleteClicked(QStringList items)
             return;
         //        sites.append(siteModel->data(row, 0).toString());
 
-        if (uiLogic()->m_vpnConnection && uiLogic()->m_vpnConnection->connectionState() == VpnProtocol::Connected) {
-            ips.append(siteModel->data(row, 1).toString());
-        }
+        //        if (uiLogic()->m_vpnConnection && uiLogic()->m_vpnConnection->connectionState() == VpnProtocol::Connected) {
+        //            ips.append(siteModel->data(row, 1).toString());
+        //    }
     }
 
     m_settings->removeVpnSites(mode, sites);
 
-    QMetaObject::invokeMethod(uiLogic()->m_vpnConnection, "deleteRoutes",
-                              Qt::QueuedConnection,
-                              Q_ARG(QStringList, ips));
+    QMetaObject::invokeMethod(uiLogic()->m_vpnConnection, "deleteRoutes", Qt::QueuedConnection, Q_ARG(QStringList, ips));
 
-    QMetaObject::invokeMethod(uiLogic()->m_vpnConnection, "flushDns",
-                              Qt::QueuedConnection);
+    QMetaObject::invokeMethod(uiLogic()->m_vpnConnection, "flushDns", Qt::QueuedConnection);
 
     onUpdatePage();
 }
@@ -197,12 +190,9 @@ void SitesLogic::onPushButtonSitesImportClicked(const QString &fileName)
     m_settings->addVpnIps(mode, ips);
     m_settings->addVpnSites(mode, sites);
 
-    QMetaObject::invokeMethod(uiLogic()->m_vpnConnection, "addRoutes",
-                              Qt::QueuedConnection,
-                              Q_ARG(QStringList, ips));
+    QMetaObject::invokeMethod(uiLogic()->m_vpnConnection, "addRoutes", Qt::QueuedConnection, Q_ARG(QStringList, ips));
 
-    QMetaObject::invokeMethod(uiLogic()->m_vpnConnection, "flushDns",
-                              Qt::QueuedConnection);
+    QMetaObject::invokeMethod(uiLogic()->m_vpnConnection, "flushDns", Qt::QueuedConnection);
 
     onUpdatePage();
 }
diff --git a/client/ui/qml/Pages2/PageDeinstalling.qml b/client/ui/qml/Pages2/PageDeinstalling.qml
index 49bcdb9a..eff58055 100644
--- a/client/ui/qml/Pages2/PageDeinstalling.qml
+++ b/client/ui/qml/Pages2/PageDeinstalling.qml
@@ -14,6 +14,9 @@ import "../Config"
 PageType {
     id: root
 
+    Component.onCompleted: PageController.enableTabBar(false)
+    Component.onDestruction: PageController.enableTabBar(true)
+
     SortFilterProxyModel {
         id: proxyServersModel
         sourceModel: ServersModel
diff --git a/client/ui/qml/Pages2/PageProtocolOpenVpnSettings.qml b/client/ui/qml/Pages2/PageProtocolOpenVpnSettings.qml
index d25fb659..bea239c7 100644
--- a/client/ui/qml/Pages2/PageProtocolOpenVpnSettings.qml
+++ b/client/ui/qml/Pages2/PageProtocolOpenVpnSettings.qml
@@ -299,6 +299,12 @@ PageType {
                             checked: additionalClientCommands !== ""
 
                             text: qsTr("Additional client configuration commands")
+
+                            onCheckedChanged: {
+                                if (!checked) {
+                                    additionalClientCommands = ""
+                                }
+                            }
                         }
 
                         TextAreaType {
diff --git a/client/ui/qml/Pages2/PageSettingsBackup.qml b/client/ui/qml/Pages2/PageSettingsBackup.qml
index cd0b3ee8..39cad732 100644
--- a/client/ui/qml/Pages2/PageSettingsBackup.qml
+++ b/client/ui/qml/Pages2/PageSettingsBackup.qml
@@ -21,7 +21,7 @@ PageType {
 
         function onRestoreBackupFinished() {
             PageController.showNotificationMessage(qsTr("Settings restored from backup file"))
-            goToStartPage()
+            //goToStartPage()
             PageController.goToPageHome()
         }
     }
diff --git a/client/ui/qml/Pages2/PageSettingsServerData.qml b/client/ui/qml/Pages2/PageSettingsServerData.qml
index 7be35cac..407194e1 100644
--- a/client/ui/qml/Pages2/PageSettingsServerData.qml
+++ b/client/ui/qml/Pages2/PageSettingsServerData.qml
@@ -166,7 +166,7 @@ PageType {
                         questionDrawer.visible = false
                         goToPage(PageEnum.PageDeinstalling)
                         if (ServersModel.isDefaultServerCurrentlyProcessed() && ConnectionController.isConnected) {
-                            ConnectionController.closeVpnConnection()
+                            ConnectionController.closeConnection()
                         }
                         InstallController.removeAllContainers()
                     }
diff --git a/client/ui/qml/Pages2/PageSetupWizardInstalling.qml b/client/ui/qml/Pages2/PageSetupWizardInstalling.qml
index 6c6d1a67..e194c21c 100644
--- a/client/ui/qml/Pages2/PageSetupWizardInstalling.qml
+++ b/client/ui/qml/Pages2/PageSetupWizardInstalling.qml
@@ -14,6 +14,9 @@ import "../Config"
 PageType {
     id: root
 
+    Component.onCompleted: PageController.enableTabBar(false)
+    Component.onDestruction: PageController.enableTabBar(true)
+
     Connections {
         target: InstallController
 
diff --git a/client/ui/qml/Pages2/PageStart.qml b/client/ui/qml/Pages2/PageStart.qml
index 2cc64a91..5c2a13df 100644
--- a/client/ui/qml/Pages2/PageStart.qml
+++ b/client/ui/qml/Pages2/PageStart.qml
@@ -18,12 +18,12 @@ PageType {
 
         function onGoToPageHome() {
             tabBar.currentIndex = 0
-            tabBarStackView.goToTabBarPage(PageController.getPagePath(PageEnum.PageHome))
+            tabBarStackView.goToTabBarPage(PageEnum.PageHome)
         }
 
         function onGoToPageSettings() {
             tabBar.currentIndex = 2
-            tabBarStackView.goToTabBarPage(PageController.getPagePath(PageEnum.PageSettings))
+            tabBarStackView.goToTabBarPage(PageEnum.PageSettings)
         }
 
         function onGoToPageViewConfig() {
@@ -37,6 +37,10 @@ PageType {
             tabBar.enabled = !visible
         }
 
+        function onEnableTabBar(enabled) {
+            tabBar.enabled = enabled
+        }
+
         function onClosePage() {
             if (tabBarStackView.depth <= 1) {
                 return
diff --git a/client/ui/uilogic.cpp b/client/ui/uilogic.cpp
index aefcc49c..27a4e971 100644
--- a/client/ui/uilogic.cpp
+++ b/client/ui/uilogic.cpp
@@ -157,9 +157,6 @@ void UiLogic::initializeUiLogic()
     //    }
 
     m_selectedServerIndex = m_settings->defaultServerIndex();
-
-    qInfo().noquote() << QString("Started %1 version %2").arg(APPLICATION_NAME).arg(APP_VERSION);
-    qInfo().noquote() << QString("%1 (%2)").arg(QSysInfo::prettyProductName()).arg(QSysInfo::currentCpuArchitecture());
 }
 
 void UiLogic::showOnStartup()

From c1c68cf72dfe5e6b45e50b5535562f730b9a2928 Mon Sep 17 00:00:00 2001
From: "vladimir.kuznetsov" <nethiuswork@gmail.com>
Date: Thu, 10 Aug 2023 10:02:13 +0500
Subject: [PATCH 059/278] fixed ability to share warguard in native format

---
 CMakeLists.txt                             | 4 ++--
 client/ui/qml/Components/ConnectButton.qml | 1 +
 client/ui/qml/Pages2/PageShare.qml         | 8 +++++---
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2ff60079..be5daeac 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,11 +2,11 @@ cmake_minimum_required(VERSION 3.25.0 FATAL_ERROR)
 
 set(PROJECT AmneziaVPN)
 
-project(${PROJECT} VERSION 4.0.0.1
+project(${PROJECT} VERSION 4.0.1.1
         DESCRIPTION "AmneziaVPN"
         HOMEPAGE_URL "https://amnezia.org/"
 )
-set(RELEASE_DATE "2023-07-31")
+set(RELEASE_DATE "2023-08-10")
 set(APP_MAJOR_VERSION ${CMAKE_PROJECT_VERSION_MAJOR}.${CMAKE_PROJECT_VERSION_MINOR}.${CMAKE_PROJECT_VERSION_PATCH})
 
 if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
diff --git a/client/ui/qml/Components/ConnectButton.qml b/client/ui/qml/Components/ConnectButton.qml
index 85cc345a..ab28d0d0 100644
--- a/client/ui/qml/Components/ConnectButton.qml
+++ b/client/ui/qml/Components/ConnectButton.qml
@@ -41,6 +41,7 @@ Button {
             anchors.right: parent.right
             layer.enabled: true
             layer.samples: 4
+            layer.smooth: true
             layer.effect: DropShadow {
                 anchors.fill: backgroundCircle
                 horizontalOffset: 0
diff --git a/client/ui/qml/Pages2/PageShare.qml b/client/ui/qml/Pages2/PageShare.qml
index 6e3fecf2..e88372d6 100644
--- a/client/ui/qml/Pages2/PageShare.qml
+++ b/client/ui/qml/Pages2/PageShare.qml
@@ -310,10 +310,12 @@ PageType {
                                 function fillConnectionTypeModel() {
                                     root.connectionTypesModel = [amneziaConnectionFormat]
 
-                                    if (currentIndex === ContainerProps.containerFromString("OpenVpn")) {
+                                    var index = proxyContainersModel.mapToSource(currentIndex)
+
+                                    if (index === ContainerProps.containerFromString("amnezia-openvpn")) {
                                         root.connectionTypesModel.push(openVpnConnectionFormat)
-                                    } else if (currentIndex === ContainerProps.containerFromString("wireGuardConnectionType")) {
-                                        root.connectionTypesModel.push(amneziaConnectionFormat)
+                                    } else if (index === ContainerProps.containerFromString("amnezia-wireguard")) {
+                                        root.connectionTypesModel.push(wireGuardConnectionFormat)
                                     }
                                 }
                             }

From 14fa0b4fd374ad80422309eac044c268221f7e20 Mon Sep 17 00:00:00 2001
From: "vladimir.kuznetsov" <nethiuswork@gmail.com>
Date: Sun, 13 Aug 2023 11:28:32 +0500
Subject: [PATCH 060/278] added qr code scanner for ios

---
 client/amnezia_application.h                  |  1 +
 client/containers/containers_defs.cpp         |  4 +-
 client/platforms/ios/QRCodeReaderBase.mm      |  7 +-
 client/ui/controllers/importController.cpp    | 53 ++++++++---
 client/ui/controllers/importController.h      | 13 ++-
 client/ui/models/containers_model.cpp         |  2 +-
 .../models/protocols/openvpnConfigModel.cpp   |  3 +-
 client/ui/models/servers_model.cpp            |  1 -
 .../qml/Pages2/PageProtocolCloakSettings.qml  |  2 -
 .../Pages2/PageProtocolOpenVpnSettings.qml    |  1 -
 .../PageProtocolShadowSocksSettings.qml       |  2 -
 .../ui/qml/Pages2/PageServiceSftpSettings.qml |  2 -
 .../Pages2/PageServiceTorWebsiteSettings.qml  |  2 -
 .../qml/Pages2/PageSettingsServerProtocol.qml |  7 +-
 .../Pages2/PageSetupWizardConfigSource.qml    |  3 +-
 .../qml/Pages2/PageSetupWizardInstalling.qml  |  2 -
 .../PageSetupWizardProtocolSettings.qml       |  1 -
 .../ui/qml/Pages2/PageSetupWizardQrReader.qml | 87 +++++++++++++------
 client/vpnconnection.cpp                      |  4 +-
 19 files changed, 128 insertions(+), 69 deletions(-)

diff --git a/client/amnezia_application.h b/client/amnezia_application.h
index 675ffd81..02c60001 100644
--- a/client/amnezia_application.h
+++ b/client/amnezia_application.h
@@ -7,6 +7,7 @@
 #include <QCommandLineParser>
 #include <QQmlApplicationEngine>
 #include <QQmlContext>
+#include <QThread>
 
 #include "settings.h"
 #include "vpnconnection.h"
diff --git a/client/containers/containers_defs.cpp b/client/containers/containers_defs.cpp
index 1e8046bf..27f6f1dd 100644
--- a/client/containers/containers_defs.cpp
+++ b/client/containers/containers_defs.cpp
@@ -217,8 +217,8 @@ QString ContainerProps::easySetupDescription(DockerContainer container)
 {
     switch (container) {
     case DockerContainer::OpenVpn: return tr("I just want to increase the level of privacy");
-    case DockerContainer::Cloak: return tr("Some foreign sites are blocked, but VPN providers are not blocked");
-    case DockerContainer::ShadowSocks: return tr("Many foreign websites and VPN providers are blocked");
+    case DockerContainer::Cloak: return tr("Many foreign websites and VPN providers are blocked");
+    case DockerContainer::ShadowSocks: return tr("Some foreign sites are blocked, but VPN providers are not blocked");
     default: return "";
     }
 }
diff --git a/client/platforms/ios/QRCodeReaderBase.mm b/client/platforms/ios/QRCodeReaderBase.mm
index bd0dbac3..af879e2f 100644
--- a/client/platforms/ios/QRCodeReaderBase.mm
+++ b/client/platforms/ios/QRCodeReaderBase.mm
@@ -49,14 +49,15 @@
 
     _videoPreviewPlayer = [[AVCaptureVideoPreviewLayer alloc] initWithSession: _captureSession];
     
-    CGFloat tabBarHeight = 20.0;
+    CGFloat statusBarHeight = [UIApplication sharedApplication].statusBarFrame.size.height;
+
     QRect cameraRect = _qrCodeReader->cameraSize();
     CGRect cameraCGRect = CGRectMake(cameraRect.x(),
-                                     cameraRect.y() + tabBarHeight,
+                                     cameraRect.y() + statusBarHeight,
                                      cameraRect.width(),
                                      cameraRect.height());
 
-    [_videoPreviewPlayer setVideoGravity: AVLayerVideoGravityResizeAspect];
+    [_videoPreviewPlayer setVideoGravity: AVLayerVideoGravityResizeAspectFill];
     [_videoPreviewPlayer setFrame: cameraCGRect];
 
     CALayer* layer = [UIApplication sharedApplication].keyWindow.layer;
diff --git a/client/ui/controllers/importController.cpp b/client/ui/controllers/importController.cpp
index 8e2ad5d1..4ff972cc 100644
--- a/client/ui/controllers/importController.cpp
+++ b/client/ui/controllers/importController.cpp
@@ -42,8 +42,11 @@ namespace
         return ConfigTypes::Amnezia;
     }
 
-#ifdef Q_OS_ANDROID
+#if defined Q_OS_ANDROID
     ImportController *mInstance = nullptr;
+#endif
+
+#ifdef Q_OS_ANDROID
     constexpr auto AndroidCameraActivity = "org.amnezia.vpn.qt.CameraActivity";
 #endif
 } // namespace
@@ -264,17 +267,6 @@ QJsonObject ImportController::extractWireGuardConfig(const QString &data)
 }
 
 #ifdef Q_OS_ANDROID
-void ImportController::startDecodingQr()
-{
-    AndroidController::instance()->startQrReaderActivity();
-}
-
-void ImportController::stopDecodingQr()
-{
-    QJniObject::callStaticMethod<void>(AndroidCameraActivity, "stopQrCodeReader", "()V");
-    emit qrDecodingFinished();
-}
-
 void ImportController::onNewQrCodeDataChunk(JNIEnv *env, jobject thiz, jstring data)
 {
     Q_UNUSED(thiz);
@@ -296,6 +288,30 @@ void ImportController::onNewQrCodeDataChunk(JNIEnv *env, jobject thiz, jstring d
         mInstance->parseQrCodeChunk(parcelBody);
     }
 }
+#endif
+
+#if defined Q_OS_ANDROID || defined Q_OS_IOS
+void ImportController::startDecodingQr()
+{
+    m_qrCodeChunks.clear();
+    m_totalQrCodeChunksCount = 0;
+    m_receivedQrCodeChunksCount = 0;
+
+    #if defined Q_OS_IOS
+    m_isQrCodeProcessed = true;
+    #endif
+    #if defined Q_OS_ANDROID
+    AndroidController::instance()->startQrReaderActivity();
+    #endif
+}
+
+void ImportController::stopDecodingQr()
+{
+    #if defined Q_OS_ANDROID
+    QJniObject::callStaticMethod<void>(AndroidCameraActivity, "stopQrCodeReader", "()V");
+    #endif
+    emit qrDecodingFinished();
+}
 
 void ImportController::parseQrCodeChunk(const QString &code)
 {
@@ -333,8 +349,10 @@ void ImportController::parseQrCodeChunk(const QString &code)
             bool ok = extractConfigFromQr(data);
             if (ok) {
                 m_isQrCodeProcessed = false;
+                qDebug() << "stopDecodingQr";
                 stopDecodingQr();
             } else {
+                qDebug() << "error while extracting data from qr";
                 m_qrCodeChunks.clear();
                 m_totalQrCodeChunksCount = 0;
                 m_receivedQrCodeChunksCount = 0;
@@ -344,8 +362,19 @@ void ImportController::parseQrCodeChunk(const QString &code)
         bool ok = extractConfigFromQr(ba);
         if (ok) {
             m_isQrCodeProcessed = false;
+            qDebug() << "stopDecodingQr";
             stopDecodingQr();
         }
     }
 }
+
+double ImportController::getQrCodeScanProgressBarValue()
+{
+    return (1.0 / m_totalQrCodeChunksCount) * m_receivedQrCodeChunksCount;
+}
+
+QString ImportController::getQrCodeScanProgressString()
+{
+    return tr("Scanned %1 of %2.").arg(m_receivedQrCodeChunksCount).arg(m_totalQrCodeChunksCount);
+}
 #endif
diff --git a/client/ui/controllers/importController.h b/client/ui/controllers/importController.h
index 9556bc6a..cccdf4b7 100644
--- a/client/ui/controllers/importController.h
+++ b/client/ui/controllers/importController.h
@@ -28,8 +28,12 @@ public slots:
     QString getConfig();
     QString getConfigFileName();
 
-#if defined Q_OS_ANDROID
+#if defined Q_OS_ANDROID || defined Q_OS_IOS
     void startDecodingQr();
+    void parseQrCodeChunk(const QString &code);
+
+    double getQrCodeScanProgressBarValue();
+    QString getQrCodeScanProgressString();
 #endif
 
 signals:
@@ -43,10 +47,11 @@ private:
     QJsonObject extractOpenVpnConfig(const QString &data);
     QJsonObject extractWireGuardConfig(const QString &data);
 
-#if defined Q_OS_ANDROID
+#if defined Q_OS_ANDROID || defined Q_OS_IOS
     void stopDecodingQr();
+#endif
+#if defined Q_OS_ANDROID
     static void onNewQrCodeDataChunk(JNIEnv *env, jobject thiz, jstring data);
-    void parseQrCodeChunk(const QString &code);
 #endif
 
     QSharedPointer<ServersModel> m_serversModel;
@@ -56,7 +61,7 @@ private:
     QJsonObject m_config;
     QString m_configFileName;
 
-#if defined Q_OS_ANDROID
+#if defined Q_OS_ANDROID || defined Q_OS_IOS
     QMap<int, QByteArray> m_qrCodeChunks;
     bool m_isQrCodeProcessed;
     int m_totalQrCodeChunksCount;
diff --git a/client/ui/models/containers_model.cpp b/client/ui/models/containers_model.cpp
index 8d24e019..dd1d8d4e 100644
--- a/client/ui/models/containers_model.cpp
+++ b/client/ui/models/containers_model.cpp
@@ -176,7 +176,7 @@ ErrorCode ContainersModel::removeCurrentlyProcessedContainer()
     ErrorCode errorCode = serverController.removeContainer(credentials, dockerContainer);
 
     if (errorCode == ErrorCode::NoError) {
-        beginResetModel(); // todo change to begin remove rows?
+        beginResetModel();
         m_settings->removeContainerConfig(m_currentlyProcessedServerIndex, dockerContainer);
         m_containers = m_settings->containers(m_currentlyProcessedServerIndex);
 
diff --git a/client/ui/models/protocols/openvpnConfigModel.cpp b/client/ui/models/protocols/openvpnConfigModel.cpp
index 1b73c987..7ef3af5b 100644
--- a/client/ui/models/protocols/openvpnConfigModel.cpp
+++ b/client/ui/models/protocols/openvpnConfigModel.cpp
@@ -79,8 +79,7 @@ QVariant OpenVpnConfigModel::data(const QModelIndex &index, int role) const
 void OpenVpnConfigModel::updateModel(const QJsonObject &config)
 {
     beginResetModel();
-    m_container =
-            ContainerProps::containerFromString(config.value(config_key::container).toString()); // todo maybe unused
+    m_container = ContainerProps::containerFromString(config.value(config_key::container).toString());
 
     m_fullConfig = config;
     QJsonObject protocolConfig = config.value(config_key::openvpn).toObject();
diff --git a/client/ui/models/servers_model.cpp b/client/ui/models/servers_model.cpp
index 364fd71f..0a117e35 100644
--- a/client/ui/models/servers_model.cpp
+++ b/client/ui/models/servers_model.cpp
@@ -157,7 +157,6 @@ bool ServersModel::isDefaultServerHasWriteAccess()
 
 void ServersModel::addServer(const QJsonObject &server)
 {
-    // todo  beginInsertRows()?
     beginResetModel();
     m_settings->addServer(server);
     m_servers = m_settings->serversArray();
diff --git a/client/ui/qml/Pages2/PageProtocolCloakSettings.qml b/client/ui/qml/Pages2/PageProtocolCloakSettings.qml
index cc764451..8e9085ed 100644
--- a/client/ui/qml/Pages2/PageProtocolCloakSettings.qml
+++ b/client/ui/qml/Pages2/PageProtocolCloakSettings.qml
@@ -13,12 +13,10 @@ import "../Components"
 PageType {
     id: root
 
-    //todo move to main?
     Connections {
         target: InstallController
 
         function onUpdateContainerFinished() {
-            //todo change to notification
             PageController.showNotificationMessage(qsTr("Settings updated successfully"))
         }
     }
diff --git a/client/ui/qml/Pages2/PageProtocolOpenVpnSettings.qml b/client/ui/qml/Pages2/PageProtocolOpenVpnSettings.qml
index bea239c7..ca13d7e5 100644
--- a/client/ui/qml/Pages2/PageProtocolOpenVpnSettings.qml
+++ b/client/ui/qml/Pages2/PageProtocolOpenVpnSettings.qml
@@ -19,7 +19,6 @@ PageType {
         target: InstallController
 
         function onUpdateContainerFinished() {
-            //todo change to notification
             PageController.showNotificationMessage(qsTr("Settings updated successfully"))
         }
     }
diff --git a/client/ui/qml/Pages2/PageProtocolShadowSocksSettings.qml b/client/ui/qml/Pages2/PageProtocolShadowSocksSettings.qml
index 64390790..1189290f 100644
--- a/client/ui/qml/Pages2/PageProtocolShadowSocksSettings.qml
+++ b/client/ui/qml/Pages2/PageProtocolShadowSocksSettings.qml
@@ -13,12 +13,10 @@ import "../Components"
 PageType {
     id: root
 
-    //todo move to main?
     Connections {
         target: InstallController
 
         function onUpdateContainerFinished() {
-            //todo change to notification
             PageController.showNotificationMessage(qsTr("Settings updated successfully"))
         }
     }
diff --git a/client/ui/qml/Pages2/PageServiceSftpSettings.qml b/client/ui/qml/Pages2/PageServiceSftpSettings.qml
index d37562a1..6783fecd 100644
--- a/client/ui/qml/Pages2/PageServiceSftpSettings.qml
+++ b/client/ui/qml/Pages2/PageServiceSftpSettings.qml
@@ -15,12 +15,10 @@ import "../Components"
 PageType {
     id: root
 
-    //todo move to main?
     Connections {
         target: InstallController
 
         function onUpdateContainerFinished() {
-            //todo change to notification
             PageController.showNotificationMessage(qsTr("Settings updated successfully"))
         }
     }
diff --git a/client/ui/qml/Pages2/PageServiceTorWebsiteSettings.qml b/client/ui/qml/Pages2/PageServiceTorWebsiteSettings.qml
index 5ddb9ed6..40e1b339 100644
--- a/client/ui/qml/Pages2/PageServiceTorWebsiteSettings.qml
+++ b/client/ui/qml/Pages2/PageServiceTorWebsiteSettings.qml
@@ -16,12 +16,10 @@ import "../Components"
 PageType {
     id: root
 
-    //todo move to main?
     Connections {
         target: InstallController
 
         function onUpdateContainerFinished() {
-            //todo change to notification
             PageController.showNotificationMessage(qsTr("Settings updated successfully"))
         }
     }
diff --git a/client/ui/qml/Pages2/PageSettingsServerProtocol.qml b/client/ui/qml/Pages2/PageSettingsServerProtocol.qml
index e417eea9..db86f7b2 100644
--- a/client/ui/qml/Pages2/PageSettingsServerProtocol.qml
+++ b/client/ui/qml/Pages2/PageSettingsServerProtocol.qml
@@ -55,16 +55,15 @@ PageType {
             anchors.topMargin: 32
 
             ListView {
-                // todo change id naming
-                id: container
+                id: protocols
                 width: parent.width
-                height: container.contentItem.height
+                height: protocols.contentItem.height
                 clip: true
                 interactive: false
                 model: ProtocolsModel
 
                 delegate: Item {
-                    implicitWidth: container.width
+                    implicitWidth: protocols.width
                     implicitHeight: delegateContent.implicitHeight
 
                     ColumnLayout {
diff --git a/client/ui/qml/Pages2/PageSetupWizardConfigSource.qml b/client/ui/qml/Pages2/PageSetupWizardConfigSource.qml
index cd0c08fb..f0155667 100644
--- a/client/ui/qml/Pages2/PageSetupWizardConfigSource.qml
+++ b/client/ui/qml/Pages2/PageSetupWizardConfigSource.qml
@@ -17,6 +17,7 @@ PageType {
         target: ImportController
 
         function onQrDecodingFinished() {
+            closePage()
             goToPage(PageEnum.PageSetupWizardViewConfig)
         }
     }
@@ -86,7 +87,7 @@ It's okay if a friend passed the code.")
 
                 clickedFunction: function() {
                     ImportController.startDecodingQr()
-//                    goToPage(PageEnum.PageSetupWizardQrReader)
+                    goToPage(PageEnum.PageSetupWizardQrReader)
                 }
             }
 
diff --git a/client/ui/qml/Pages2/PageSetupWizardInstalling.qml b/client/ui/qml/Pages2/PageSetupWizardInstalling.qml
index e194c21c..3f135c15 100644
--- a/client/ui/qml/Pages2/PageSetupWizardInstalling.qml
+++ b/client/ui/qml/Pages2/PageSetupWizardInstalling.qml
@@ -68,7 +68,6 @@ PageType {
     }
 
     FlickableType {
-        id: fl
         anchors.fill: parent
         contentHeight: content.height
 
@@ -82,7 +81,6 @@ PageType {
             spacing: 16
 
             ListView {
-                // todo change id naming
                 id: container
                 width: parent.width
                 height: container.contentItem.height
diff --git a/client/ui/qml/Pages2/PageSetupWizardProtocolSettings.qml b/client/ui/qml/Pages2/PageSetupWizardProtocolSettings.qml
index 65e00da8..f9d55ddf 100644
--- a/client/ui/qml/Pages2/PageSetupWizardProtocolSettings.qml
+++ b/client/ui/qml/Pages2/PageSetupWizardProtocolSettings.qml
@@ -233,7 +233,6 @@ PageType {
                         }
 
                         Component.onCompleted: {
-                            //todo move to protocols model?
                             var defaultContainerProto =  ContainerProps.defaultProtocol(dockerContainer)
 
                             if (ProtocolProps.defaultPort(defaultContainerProto) < 0) {
diff --git a/client/ui/qml/Pages2/PageSetupWizardQrReader.qml b/client/ui/qml/Pages2/PageSetupWizardQrReader.qml
index 65d233ef..695175fd 100644
--- a/client/ui/qml/Pages2/PageSetupWizardQrReader.qml
+++ b/client/ui/qml/Pages2/PageSetupWizardQrReader.qml
@@ -14,39 +14,76 @@ import "../Config"
 PageType {
     id: root
 
-    ColumnLayout {
-        anchors.fill: parent
+    BackButtonType {
+        id: backButton
+        anchors.left: parent.left
+        anchors.top: parent.top
 
-        spacing: 0
+        anchors.topMargin: 20
+    }
 
-        BackButtonType {
-            Layout.topMargin: 20
-        }
+    ParagraphTextType {
+        id: header
 
-        ParagraphTextType {
-            Layout.fillWidth: true
+        property string progressString
 
-            text: qsTr("Point the camera at the QR code and hold for a couple of seconds.")
-        }
+        anchors.left: parent.left
+        anchors.top: backButton.bottom
+        anchors.right: parent.right
 
-        ProgressBarType {
+        anchors.leftMargin: 16
+        anchors.rightMargin: 16
 
-        }
+        text: qsTr("Point the camera at the QR code and hold for a couple of seconds. ") + progressString
+    }
 
-        Item {
-            Layout.fillHeight: true
-            Layout.fillWidth: true
+    ProgressBarType {
+        id: progressBar
 
-            QRCodeReader {
-               id: qrCodeReader
-               Component.onCompleted: {
-                   qrCodeReader.setCameraSize(Qt.rect(parent.x,
-                                                      parent.y,
-                                                      parent.width,
-                                                      parent.height))
-                   qrCodeReader.startReading()
-               }
-            }
+        anchors.left: parent.left
+        anchors.top: header.bottom
+        anchors.right: parent.right
+
+        anchors.leftMargin: 16
+        anchors.rightMargin: 16
+    }
+
+    Rectangle {
+        id: qrCodeRectange
+        anchors.right: parent.right
+        anchors.left: parent.left
+        anchors.bottom: parent.bottom
+        anchors.top: progressBar.bottom
+
+        anchors.topMargin: 34
+        anchors.leftMargin: 16
+        anchors.rightMargin: 16
+        anchors.bottomMargin: 34
+
+        color: "transparent"
+        //radius: 16
+
+        QRCodeReader {
+           id: qrCodeReader
+
+           onCodeReaded: function(code) {
+               ImportController.parseQrCodeChunk(code)
+               progressBar.value = ImportController.getQrCodeScanProgressBarValue()
+               header.progressString = ImportController.getQrCodeScanProgressString()
+           }
+
+           Component.onCompleted: {
+               console.log(qrCodeRectange.x)
+               console.log(qrCodeRectange.y)
+               console.log(qrCodeRectange.width)
+
+               qrCodeReader.setCameraSize(Qt.rect(qrCodeRectange.x,
+                                                  qrCodeRectange.y,
+                                                  qrCodeRectange.width,
+                                                  qrCodeRectange.height))
+               qrCodeReader.startReading()
+           }
+           Component.onDestruction: qrCodeReader.stopReading()
         }
     }
 }
diff --git a/client/vpnconnection.cpp b/client/vpnconnection.cpp
index 5f3511d4..99ca700d 100644
--- a/client/vpnconnection.cpp
+++ b/client/vpnconnection.cpp
@@ -96,7 +96,7 @@ void VpnConnection::onConnectionStateChanged(Vpn::ConnectionState state)
 #endif
 
 #ifdef Q_OS_IOS
-    if (state == VpnProtocol::Connected) {
+    if (state == Vpn::ConnectionState::Connected) {
         m_checkTimer.start();
     }
     else {
@@ -337,7 +337,7 @@ void VpnConnection::connectToVpn(int serverIndex,
 
     if (!iosVpnProtocol->initialize()) {
          qDebug() << QString("Init failed") ;
-         emit VpnProtocol::Error;
+         emit Vpn::ConnectionState::Error;
          iosVpnProtocol->deleteLater();
          return;
     }

From e157160337a43671342857c4b8495e95f4e4e2b6 Mon Sep 17 00:00:00 2001
From: "vladimir.kuznetsov" <nethiuswork@gmail.com>
Date: Wed, 16 Aug 2023 12:11:34 +0500
Subject: [PATCH 061/278] added disconnection from vpn when closing application
 for desktop - many small ui fixes

---
 client/amnezia_application.cpp                | 51 ++++++-------------
 client/amnezia_application.h                  |  8 +--
 .../ui/controllers/connectionController.cpp   | 17 +++++++
 client/ui/controllers/connectionController.h  |  2 +
 client/ui/controllers/installController.cpp   |  2 +-
 client/ui/controllers/installController.h     |  2 +-
 client/ui/controllers/pageController.h        |  2 +
 client/ui/controllers/settingsController.cpp  | 18 ++++++-
 client/ui/controllers/settingsController.h    |  5 ++
 client/ui/models/servers_model.cpp            |  5 ++
 client/ui/models/servers_model.h              |  3 +-
 .../qml/Components/ShareConnectionDrawer.qml  |  2 +
 client/ui/qml/Controls2/ListViewType.qml      |  6 +++
 .../qml/Pages2/PageProtocolCloakSettings.qml  |  2 +-
 .../Pages2/PageProtocolOpenVpnSettings.qml    |  5 +-
 .../PageProtocolShadowSocksSettings.qml       |  2 +-
 .../ui/qml/Pages2/PageSettingsServerData.qml  |  7 +++
 .../ui/qml/Pages2/PageSettingsServerInfo.qml  | 15 +++---
 .../qml/Pages2/PageSettingsServerProtocol.qml |  2 +
 .../qml/Pages2/PageSetupWizardInstalling.qml  |  5 +-
 .../PageSetupWizardProtocolSettings.qml       |  1 +
 .../qml/Pages2/PageSetupWizardViewConfig.qml  |  1 +
 client/ui/qml/Pages2/PageShare.qml            | 15 +++---
 client/ui/qml/main2.qml                       |  7 +++
 24 files changed, 121 insertions(+), 64 deletions(-)

diff --git a/client/amnezia_application.cpp b/client/amnezia_application.cpp
index 20b5ac3d..d9120042 100644
--- a/client/amnezia_application.cpp
+++ b/client/amnezia_application.cpp
@@ -57,36 +57,13 @@ AmneziaApplication::AmneziaApplication(int &argc, char *argv[], bool allowSecond
 
 AmneziaApplication::~AmneziaApplication()
 {
-    //    emit hide();
-
-    // #ifdef AMNEZIA_DESKTOP
-    //     if (m_vpnConnection->connectionState() != Vpn::ConnectionState::Disconnected) {
-    //         m_vpnConnection->disconnectFromVpn();
-    //         for (int i = 0; i < 50; i++) {
-    //             qApp->processEvents(QEventLoop::ExcludeUserInputEvents);
-    //             QThread::msleep(100);
-    //             if (m_vpnConnection->isDisconnected()) {
-    //                 break;
-    //             }
-    //         }
-    //     }
-    // #endif
-
-    //    m_vpnConnection->deleteLater();
-    //    m_vpnConnectionThread.quit();
-    //    m_vpnConnectionThread.wait(3000);
-
-    //    qDebug() << "Application closed";
+    m_vpnConnectionThread.quit();
+    m_vpnConnectionThread.wait(3000);
 
     if (m_engine) {
         QObject::disconnect(m_engine, 0, 0, 0);
         delete m_engine;
     }
-
-    if (m_protocolProps)
-        delete m_protocolProps;
-    if (m_containerProps)
-        delete m_containerProps;
 }
 
 void AmneziaApplication::init()
@@ -208,11 +185,11 @@ void AmneziaApplication::registerTypes()
 
     qmlRegisterType<QRCodeReader>("QRCodeReader", 1, 0, "QRCodeReader");
 
-    m_containerProps = new ContainerProps;
-    qmlRegisterSingletonInstance("ContainerProps", 1, 0, "ContainerProps", m_containerProps);
+    m_containerProps.reset(new ContainerProps());
+    qmlRegisterSingletonInstance("ContainerProps", 1, 0, "ContainerProps", m_containerProps.get());
 
-    m_protocolProps = new ProtocolProps;
-    qmlRegisterSingletonInstance("ProtocolProps", 1, 0, "ProtocolProps", m_protocolProps);
+    m_protocolProps.reset(new ProtocolProps());
+    qmlRegisterSingletonInstance("ProtocolProps", 1, 0, "ProtocolProps", m_protocolProps.get());
 
     qmlRegisterSingletonType(QUrl("qrc:/ui/qml/Filters/ContainersModelFilters.qml"), "ContainersModelFilters", 1, 0,
                              "ContainersModelFilters");
@@ -232,9 +209,13 @@ void AmneziaApplication::loadFonts()
 void AmneziaApplication::loadTranslator()
 {
     auto locale = m_settings->getAppLanguage();
-    m_translator = new QTranslator;
-    if (m_translator->load(locale, QString("amneziavpn"), QLatin1String("_"), QLatin1String(":/i18n"))) {
-        installTranslator(m_translator);
+    if (locale != QLocale::English) {
+        m_translator.reset(new QTranslator());
+        if (m_translator->load(locale, QString("amneziavpn"), QLatin1String("_"), QLatin1String(":/i18n"))) {
+            if (QCoreApplication::installTranslator(m_translator.get())) {
+                m_settings->setAppLanguage(locale);
+            }
+        }
     }
 }
 
@@ -242,7 +223,7 @@ void AmneziaApplication::updateTranslator(const QLocale &locale)
 {
     QResource::registerResource(":/translations.qrc");
     if (!m_translator->isEmpty())
-        QCoreApplication::removeTranslator(m_translator);
+        QCoreApplication::removeTranslator(m_translator.get());
 
     if (locale == QLocale::English) {
         m_settings->setAppLanguage(locale);
@@ -250,7 +231,7 @@ void AmneziaApplication::updateTranslator(const QLocale &locale)
     }
 
     if (m_translator->load(locale, QString("amneziavpn"), QLatin1String("_"), QLatin1String(":/i18n"))) {
-        if (QCoreApplication::installTranslator(m_translator)) {
+        if (QCoreApplication::installTranslator(m_translator.get())) {
             m_settings->setAppLanguage(locale);
         }
 
@@ -351,7 +332,7 @@ void AmneziaApplication::initControllers()
     m_exportController.reset(new ExportController(m_serversModel, m_containersModel, m_settings, m_configurator));
     m_engine->rootContext()->setContextProperty("ExportController", m_exportController.get());
 
-    m_settingsController.reset(new SettingsController(m_serversModel, m_containersModel, m_settings));
+    m_settingsController.reset(new SettingsController(m_serversModel, m_containersModel, m_languageModel, m_settings));
     m_engine->rootContext()->setContextProperty("SettingsController", m_settingsController.get());
 
     m_sitesController.reset(new SitesController(m_settings, m_vpnConnection, m_sitesModel));
diff --git a/client/amnezia_application.h b/client/amnezia_application.h
index 02c60001..c4f33753 100644
--- a/client/amnezia_application.h
+++ b/client/amnezia_application.h
@@ -79,15 +79,15 @@ private:
     std::shared_ptr<Settings> m_settings;
     std::shared_ptr<VpnConfigurator> m_configurator;
 
-    ContainerProps *m_containerProps {};
-    ProtocolProps *m_protocolProps {};
+    QSharedPointer<ContainerProps> m_containerProps;
+    QSharedPointer<ProtocolProps> m_protocolProps;
 
-    QTranslator *m_translator;
+    QSharedPointer<QTranslator> m_translator;
     QCommandLineParser m_parser;
 
     QSharedPointer<ContainersModel> m_containersModel;
     QSharedPointer<ServersModel> m_serversModel;
-    QScopedPointer<LanguageModel> m_languageModel;
+    QSharedPointer<LanguageModel> m_languageModel;
     QScopedPointer<ProtocolsModel> m_protocolsModel;
     QSharedPointer<SitesModel> m_sitesModel;
 
diff --git a/client/ui/controllers/connectionController.cpp b/client/ui/controllers/connectionController.cpp
index 7d1b6bed..45f24d7f 100644
--- a/client/ui/controllers/connectionController.cpp
+++ b/client/ui/controllers/connectionController.cpp
@@ -17,6 +17,23 @@ ConnectionController::ConnectionController(const QSharedPointer<ServersModel> &s
             Qt::QueuedConnection);
 }
 
+ConnectionController::~ConnectionController()
+{
+// todo use ConnectionController instead of using m_vpnConnection directly
+#ifdef AMNEZIA_DESKTOP
+    if (m_vpnConnection->connectionState() != Vpn::ConnectionState::Disconnected) {
+        m_vpnConnection->disconnectFromVpn();
+        for (int i = 0; i < 50; i++) {
+            qApp->processEvents(QEventLoop::ExcludeUserInputEvents);
+            QThread::msleep(100);
+            if (m_vpnConnection->isDisconnected()) {
+                break;
+            }
+        }
+    }
+#endif
+}
+
 void ConnectionController::openConnection()
 {
     int serverIndex = m_serversModel->getDefaultServerIndex();
diff --git a/client/ui/controllers/connectionController.h b/client/ui/controllers/connectionController.h
index a33d30c2..5a35f9d8 100644
--- a/client/ui/controllers/connectionController.h
+++ b/client/ui/controllers/connectionController.h
@@ -19,6 +19,8 @@ public:
                                   const QSharedPointer<ContainersModel> &containersModel,
                                   const QSharedPointer<VpnConnection> &vpnConnection, QObject *parent = nullptr);
 
+    ~ConnectionController();
+
     bool isConnected() const;
     bool isConnectionInProgress() const;
     QString connectionStateText() const;
diff --git a/client/ui/controllers/installController.cpp b/client/ui/controllers/installController.cpp
index 49c77708..7e71aef8 100644
--- a/client/ui/controllers/installController.cpp
+++ b/client/ui/controllers/installController.cpp
@@ -173,7 +173,7 @@ void InstallController::installContainer(DockerContainer container, QJsonObject
                                 "All installed containers have been added to the application");
         }
 
-        emit installContainerFinished(finishMessage);
+        emit installContainerFinished(finishMessage, ContainerProps::containerService(container) == ServiceType::Other);
         return;
     }
 
diff --git a/client/ui/controllers/installController.h b/client/ui/controllers/installController.h
index 38e2e780..b74835d9 100644
--- a/client/ui/controllers/installController.h
+++ b/client/ui/controllers/installController.h
@@ -42,7 +42,7 @@ public slots:
     void setEncryptedPassphrase(QString passphrase);
 
 signals:
-    void installContainerFinished(const QString &finishMessage);
+    void installContainerFinished(const QString &finishMessage, bool isServiceInstall);
     void installServerFinished(const QString &finishMessage);
 
     void updateContainerFinished();
diff --git a/client/ui/controllers/pageController.h b/client/ui/controllers/pageController.h
index 049201e4..1948ed11 100644
--- a/client/ui/controllers/pageController.h
+++ b/client/ui/controllers/pageController.h
@@ -79,6 +79,8 @@ signals:
     void goToPageHome();
     void goToPageSettings();
     void goToPageViewConfig();
+    void goToPageSettingsServerServices();
+
     void closePage();
 
     void restorePageHomeState(bool isContainerInstalled = false);
diff --git a/client/ui/controllers/settingsController.cpp b/client/ui/controllers/settingsController.cpp
index 571b03e8..531de14d 100644
--- a/client/ui/controllers/settingsController.cpp
+++ b/client/ui/controllers/settingsController.cpp
@@ -8,8 +8,13 @@
 
 SettingsController::SettingsController(const QSharedPointer<ServersModel> &serversModel,
                                        const QSharedPointer<ContainersModel> &containersModel,
+                                       const QSharedPointer<LanguageModel> &languageModel,
                                        const std::shared_ptr<Settings> &settings, QObject *parent)
-    : QObject(parent), m_serversModel(serversModel), m_containersModel(containersModel), m_settings(settings)
+    : QObject(parent),
+      m_serversModel(serversModel),
+      m_containersModel(containersModel),
+      m_languageModel(languageModel),
+      m_settings(settings)
 {
     m_appVersion = QString("%1: %2 (%3)").arg(tr("Software version"), QString(APP_MAJOR_VERSION), __DATE__);
 }
@@ -95,6 +100,8 @@ void SettingsController::restoreAppConfig()
     bool ok = m_settings->restoreAppConfig(data);
     if (ok) {
         m_serversModel->resetModel();
+        m_languageModel->changeLanguage(
+                static_cast<LanguageSettings::AvailableLanguageEnum>(m_languageModel->getCurrentLanguageIndex()));
         emit restoreBackupFinished();
     } else {
         emit changeSettingsErrorOccurred(tr("Backup file is corrupted"));
@@ -110,6 +117,15 @@ void SettingsController::clearSettings()
 {
     m_settings->clearSettings();
     m_serversModel->resetModel();
+    m_languageModel->changeLanguage(
+            static_cast<LanguageSettings::AvailableLanguageEnum>(m_languageModel->getCurrentLanguageIndex()));
+    emit changeSettingsFinished(tr("All settings have been reset to default values"));
+}
+
+void SettingsController::clearCachedProfiles()
+{
+    m_containersModel->clearCachedProfiles();
+    emit changeSettingsFinished(tr("Cached profiles cleared"));
 }
 
 bool SettingsController::isAutoConnectEnabled()
diff --git a/client/ui/controllers/settingsController.h b/client/ui/controllers/settingsController.h
index ffd72f69..a0a29ebf 100644
--- a/client/ui/controllers/settingsController.h
+++ b/client/ui/controllers/settingsController.h
@@ -4,6 +4,7 @@
 #include <QObject>
 
 #include "ui/models/containers_model.h"
+#include "ui/models/languageModel.h"
 #include "ui/models/servers_model.h"
 
 class SettingsController : public QObject
@@ -12,6 +13,7 @@ class SettingsController : public QObject
 public:
     explicit SettingsController(const QSharedPointer<ServersModel> &serversModel,
                                 const QSharedPointer<ContainersModel> &containersModel,
+                                const QSharedPointer<LanguageModel> &languageModel,
                                 const std::shared_ptr<Settings> &settings, QObject *parent = nullptr);
 
     Q_PROPERTY(QString primaryDns READ getPrimaryDns WRITE setPrimaryDns NOTIFY primaryDnsChanged)
@@ -41,6 +43,7 @@ public slots:
     QString getAppVersion();
 
     void clearSettings();
+    void clearCachedProfiles();
 
     bool isAutoConnectEnabled();
     void toggleAutoConnect(bool enable);
@@ -51,11 +54,13 @@ signals:
     void loggingStateChanged();
 
     void restoreBackupFinished();
+    void changeSettingsFinished(const QString &finishedMessage);
     void changeSettingsErrorOccurred(const QString &errorMessage);
 
 private:
     QSharedPointer<ServersModel> m_serversModel;
     QSharedPointer<ContainersModel> m_containersModel;
+    QSharedPointer<LanguageModel> m_languageModel;
     std::shared_ptr<Settings> m_settings;
 
     QString m_appVersion;
diff --git a/client/ui/models/servers_model.cpp b/client/ui/models/servers_model.cpp
index 0a117e35..7eea94e5 100644
--- a/client/ui/models/servers_model.cpp
+++ b/client/ui/models/servers_model.cpp
@@ -6,6 +6,8 @@ ServersModel::ServersModel(std::shared_ptr<Settings> settings, QObject *parent)
     m_servers = m_settings->serversArray();
     m_defaultServerIndex = m_settings->defaultServerIndex();
     m_currentlyProcessedServerIndex = m_defaultServerIndex;
+
+    connect(this, &ServersModel::defaultServerIndexChanged, this, &ServersModel::defaultServerNameChanged);
 }
 
 int ServersModel::rowCount(const QModelIndex &parent) const
@@ -27,6 +29,9 @@ bool ServersModel::setData(const QModelIndex &index, const QVariant &value, int
         server.insert(config_key::description, value.toString());
         m_settings->editServer(index.row(), server);
         m_servers.replace(index.row(), server);
+        if (index.row() == m_defaultServerIndex) {
+            emit defaultServerNameChanged();
+        }
         break;
     }
     default: {
diff --git a/client/ui/models/servers_model.h b/client/ui/models/servers_model.h
index 60ec35b2..d7b15844 100644
--- a/client/ui/models/servers_model.h
+++ b/client/ui/models/servers_model.h
@@ -31,7 +31,7 @@ public:
     void resetModel();
 
     Q_PROPERTY(int defaultIndex READ getDefaultServerIndex WRITE setDefaultServerIndex NOTIFY defaultServerIndexChanged)
-    Q_PROPERTY(QString defaultServerName READ getDefaultServerName NOTIFY defaultServerIndexChanged)
+    Q_PROPERTY(QString defaultServerName READ getDefaultServerName NOTIFY defaultServerNameChanged)
     Q_PROPERTY(QString defaultServerHostName READ getDefaultServerHostName NOTIFY defaultServerIndexChanged)
     Q_PROPERTY(int currentlyProcessedIndex READ getCurrentlyProcessedServerIndex WRITE setCurrentlyProcessedServerIndex
                        NOTIFY currentlyProcessedServerIndexChanged)
@@ -65,6 +65,7 @@ protected:
 signals:
     void currentlyProcessedServerIndexChanged(const int index);
     void defaultServerIndexChanged();
+    void defaultServerNameChanged();
 
 private:
     ServerCredentials serverCredentials(int index) const;
diff --git a/client/ui/qml/Components/ShareConnectionDrawer.qml b/client/ui/qml/Components/ShareConnectionDrawer.qml
index 3f27396b..7ad724ea 100644
--- a/client/ui/qml/Components/ShareConnectionDrawer.qml
+++ b/client/ui/qml/Components/ShareConnectionDrawer.qml
@@ -80,6 +80,7 @@ DrawerType {
                         configText.selectAll()
                         configText.copy()
                         configText.select(0, 0)
+                        PageController.showNotificationMessage(qsTr("Copied"))
                     }
                 }
 
@@ -92,6 +93,7 @@ DrawerType {
                     pressedColor: Qt.rgba(1, 1, 1, 0.12)
                     disabledColor: "#878B91"
                     textColor: "#D7D8DB"
+                    borderWidth: 1
 
                     text: qsTr("Show content")
 
diff --git a/client/ui/qml/Controls2/ListViewType.qml b/client/ui/qml/Controls2/ListViewType.qml
index 4251f0fd..926ec038 100644
--- a/client/ui/qml/Controls2/ListViewType.qml
+++ b/client/ui/qml/Controls2/ListViewType.qml
@@ -8,11 +8,17 @@ ListView {
     id: menuContent
 
     property var rootWidth
+
     property var selectedText
+
     property string imageSource
+
     property var clickedFunction
+
     property bool dividerVisible: false
 
+    currentIndex: 0
+
     width: rootWidth
     height: menuContent.contentItem.height
 
diff --git a/client/ui/qml/Pages2/PageProtocolCloakSettings.qml b/client/ui/qml/Pages2/PageProtocolCloakSettings.qml
index 8e9085ed..c19118b5 100644
--- a/client/ui/qml/Pages2/PageProtocolCloakSettings.qml
+++ b/client/ui/qml/Pages2/PageProtocolCloakSettings.qml
@@ -102,6 +102,7 @@ PageType {
 
                             headerText: qsTr("Port")
                             textFieldText: port
+                            textField.maximumLength: 5
 
                             textField.onEditingFinished: {
                                 if (textFieldText !== port) {
@@ -114,7 +115,6 @@ PageType {
                             id: cipherDropDown
                             Layout.fillWidth: true
                             Layout.topMargin: 16
-                            implicitHeight: 74
 
                             descriptionText: qsTr("Cipher")
                             headerText: qsTr("Cipher")
diff --git a/client/ui/qml/Pages2/PageProtocolOpenVpnSettings.qml b/client/ui/qml/Pages2/PageProtocolOpenVpnSettings.qml
index ca13d7e5..a8f7bb77 100644
--- a/client/ui/qml/Pages2/PageProtocolOpenVpnSettings.qml
+++ b/client/ui/qml/Pages2/PageProtocolOpenVpnSettings.qml
@@ -133,6 +133,7 @@ PageType {
 
                             headerText: qsTr("Port")
                             textFieldText: port
+                            textField.maximumLength: 5
 
                             textField.onEditingFinished: {
                                 if (textFieldText !== port) {
@@ -161,7 +162,6 @@ PageType {
                             id: hashDropDown
                             Layout.fillWidth: true
                             Layout.topMargin: 20
-                            implicitHeight: 74
 
                             enabled: !autoNegotiateEncryprionSwitcher.checked
 
@@ -208,7 +208,6 @@ PageType {
                             id: cipherDropDown
                             Layout.fillWidth: true
                             Layout.topMargin: 16
-                            implicitHeight: 74
 
                             enabled: !autoNegotiateEncryprionSwitcher.checked
 
@@ -393,7 +392,7 @@ PageType {
                         }
                     }
                 }
-            }
+            }  
         }
 
         QuestionDrawer {
diff --git a/client/ui/qml/Pages2/PageProtocolShadowSocksSettings.qml b/client/ui/qml/Pages2/PageProtocolShadowSocksSettings.qml
index 1189290f..38a6be06 100644
--- a/client/ui/qml/Pages2/PageProtocolShadowSocksSettings.qml
+++ b/client/ui/qml/Pages2/PageProtocolShadowSocksSettings.qml
@@ -88,6 +88,7 @@ PageType {
 
                             headerText: qsTr("Port")
                             textFieldText: port
+                            textField.maximumLength: 5
 
                             textField.onEditingFinished: {
                                 if (textFieldText !== port) {
@@ -100,7 +101,6 @@ PageType {
                             id: cipherDropDown
                             Layout.fillWidth: true
                             Layout.topMargin: 20
-                            implicitHeight: 74
 
                             descriptionText: qsTr("Cipher")
                             headerText: qsTr("Cipher")
diff --git a/client/ui/qml/Pages2/PageSettingsServerData.qml b/client/ui/qml/Pages2/PageSettingsServerData.qml
index 407194e1..9ff99193 100644
--- a/client/ui/qml/Pages2/PageSettingsServerData.qml
+++ b/client/ui/qml/Pages2/PageSettingsServerData.qml
@@ -50,6 +50,13 @@ PageType {
         }
     }
 
+    Connections {
+        target: SettingsController
+        function onChangeSettingsFinished(finishedMessage) {
+            PageController.showNotificationMessage(finishedMessage)
+        }
+    }
+
     Connections {
         target: ServersModel
 
diff --git a/client/ui/qml/Pages2/PageSettingsServerInfo.qml b/client/ui/qml/Pages2/PageSettingsServerInfo.qml
index cf748f54..62a7a67b 100644
--- a/client/ui/qml/Pages2/PageSettingsServerInfo.qml
+++ b/client/ui/qml/Pages2/PageSettingsServerInfo.qml
@@ -18,6 +18,14 @@ import "../Components"
 PageType {
     id: root
 
+    Connections {
+        target: PageController
+
+        function onGoToPageSettingsServerServices() {
+            tabBar.currentIndex = 1
+        }
+    }
+
     SortFilterProxyModel {
         id: proxyServersModel
         sourceModel: ServersModel
@@ -99,13 +107,6 @@ PageType {
                         BasicButtonType {
                             Layout.fillWidth: true
 
-                            defaultColor: "transparent"
-                            hoveredColor: Qt.rgba(1, 1, 1, 0.08)
-                            pressedColor: Qt.rgba(1, 1, 1, 0.12)
-                            disabledColor: "#878B91"
-                            textColor: "#D7D8DB"
-                            borderWidth: 1
-
                             text: qsTr("Save")
 
                             onClicked: {
diff --git a/client/ui/qml/Pages2/PageSettingsServerProtocol.qml b/client/ui/qml/Pages2/PageSettingsServerProtocol.qml
index db86f7b2..f1f067c2 100644
--- a/client/ui/qml/Pages2/PageSettingsServerProtocol.qml
+++ b/client/ui/qml/Pages2/PageSettingsServerProtocol.qml
@@ -107,6 +107,8 @@ PageType {
 
                 width: parent.width
 
+                visible: ServersModel.isCurrentlyProcessedServerHasWriteAccess()
+
                 text: qsTr("Remove ") + ContainersModel.getCurrentlyProcessedContainerName()
                 textColor: "#EB5757"
 
diff --git a/client/ui/qml/Pages2/PageSetupWizardInstalling.qml b/client/ui/qml/Pages2/PageSetupWizardInstalling.qml
index 3f135c15..10daa0be 100644
--- a/client/ui/qml/Pages2/PageSetupWizardInstalling.qml
+++ b/client/ui/qml/Pages2/PageSetupWizardInstalling.qml
@@ -20,13 +20,16 @@ PageType {
     Connections {
         target: InstallController
 
-        function onInstallContainerFinished(finishedMessage) {
+        function onInstallContainerFinished(finishedMessage, isServiceInstall) {
             goToStartPage()
             if (stackView.currentItem.objectName === PageController.getPagePath(PageEnum.PageHome)) {
                 PageController.restorePageHomeState(true)
             } else if (stackView.currentItem.objectName === PageController.getPagePath(PageEnum.PageSettings)) {
                 goToPage(PageEnum.PageSettingsServersList, false)
                 goToPage(PageEnum.PageSettingsServerInfo, false)
+                if (isServiceInstall) {
+                    PageController.goToPageSettingsServerServices()
+                }
             } else {
                 goToPage(PageEnum.PageHome)
             }
diff --git a/client/ui/qml/Pages2/PageSetupWizardProtocolSettings.qml b/client/ui/qml/Pages2/PageSetupWizardProtocolSettings.qml
index f9d55ddf..f5f07609 100644
--- a/client/ui/qml/Pages2/PageSetupWizardProtocolSettings.qml
+++ b/client/ui/qml/Pages2/PageSetupWizardProtocolSettings.qml
@@ -211,6 +211,7 @@ PageType {
                             Layout.topMargin: 16
 
                             headerText: qsTr("Port")
+                            textField.maximumLength: 5
                         }
 
                         Rectangle {
diff --git a/client/ui/qml/Pages2/PageSetupWizardViewConfig.qml b/client/ui/qml/Pages2/PageSetupWizardViewConfig.qml
index 5f52a5ba..222fbd11 100644
--- a/client/ui/qml/Pages2/PageSetupWizardViewConfig.qml
+++ b/client/ui/qml/Pages2/PageSetupWizardViewConfig.qml
@@ -79,6 +79,7 @@ PageType {
                     Layout.fillWidth: true
 
                     text: ImportController.getConfigFileName()
+                    wrapMode: Text.Wrap
                 }
             }
 
diff --git a/client/ui/qml/Pages2/PageShare.qml b/client/ui/qml/Pages2/PageShare.qml
index e88372d6..f2ed4607 100644
--- a/client/ui/qml/Pages2/PageShare.qml
+++ b/client/ui/qml/Pages2/PageShare.qml
@@ -161,11 +161,9 @@ PageType {
                 Layout.fillWidth: true
                 Layout.topMargin: 24
 
-                implicitHeight: 74
-
                 drawerHeight: 0.4375
 
-                descriptionText: qsTr("Server and service")
+                descriptionText: accessTypeSelector.currentIndex === 0 ? qsTr("Server and service") : qsTr("Server")
                 headerText: qsTr("Server")
 
                 listView: ListViewType {
@@ -261,7 +259,7 @@ PageType {
                                 rootWidth: root.width
                                 dividerVisible: true
 
-                                imageSource: "qrc:/images/controls/chevron-right.svg"
+                                imageSource: "qrc:/images/controls/check.svg"
 
                                 model: SortFilterProxyModel {
                                     id: proxyContainersModel
@@ -327,13 +325,11 @@ PageType {
             DropDownType {
                 id: exportTypeSelector
 
-                property int currentIndex
+                property int currentIndex: 0
 
                 Layout.fillWidth: true
                 Layout.topMargin: 16
 
-                implicitHeight: 74
-
                 drawerHeight: 0.4375
 
                 visible: accessTypeSelector.currentIndex === 0
@@ -343,13 +339,15 @@ PageType {
                 headerText: qsTr("Connection format")
 
                 listView: ListViewType {
+                    id: exportTypeListView
+
                     rootWidth: root.width
                     dividerVisible: true
 
                     imageSource: "qrc:/images/controls/chevron-right.svg"
 
                     model: root.connectionTypesModel
-                    currentIndex: 0
+                    currentIndex: exportTypeSelector.currentIndex
 
                     clickedFunction: function() {
                         exportTypeSelector.text = selectedText
@@ -375,6 +373,7 @@ PageType {
                 enabled: shareButtonEnabled
 
                 text: qsTr("Share")
+                imageSource: "qrc:/images/controls/share-2.svg"
 
                 onClicked: {
                     if (accessTypeSelector.currentIndex === 0) {
diff --git a/client/ui/qml/main2.qml b/client/ui/qml/main2.qml
index f07bcf5d..6ae434d7 100644
--- a/client/ui/qml/main2.qml
+++ b/client/ui/qml/main2.qml
@@ -81,6 +81,13 @@ Window  {
         }
     }
 
+    Connections {
+        target: SettingsController
+        function onChangeSettingsFinished(finishedMessage) {
+            PageController.showNotificationMessage(finishedMessage)
+        }
+    }
+
     Item {
         anchors.right: parent.right
         anchors.left: parent.left

From a8deb3593be83eae01b17d5b8aba8936cb59f22f Mon Sep 17 00:00:00 2001
From: "vladimir.kuznetsov" <nethiuswork@gmail.com>
Date: Wed, 16 Aug 2023 22:45:05 +0500
Subject: [PATCH 062/278] dropdown list fixes to match design layout

---
 client/resources.qrc                          |   3 +-
 .../Components/SettingsContainersListView.qml | 179 +++++++-----------
 .../qml/Controls2/ListViewWithLabelsType.qml  |  70 +++++++
 ...pe.qml => ListViewWithRadioButtonType.qml} |  21 +-
 client/ui/qml/Controls2/PageType.qml          |  10 +
 .../qml/Pages2/PageProtocolCloakSettings.qml  |   2 +-
 .../Pages2/PageProtocolOpenVpnSettings.qml    |   6 +-
 .../PageProtocolShadowSocksSettings.qml       |   2 +-
 .../ui/qml/Pages2/PageServiceSftpSettings.qml |  10 +-
 .../Pages2/PageServiceTorWebsiteSettings.qml  |   1 +
 .../qml/Pages2/PageSettingsSplitTunneling.qml |   2 +-
 client/ui/qml/Pages2/PageShare.qml            |  10 +-
 12 files changed, 177 insertions(+), 139 deletions(-)
 create mode 100644 client/ui/qml/Controls2/ListViewWithLabelsType.qml
 rename client/ui/qml/Controls2/{ListViewType.qml => ListViewWithRadioButtonType.qml} (85%)

diff --git a/client/resources.qrc b/client/resources.qrc
index 2238f25d..782b6446 100644
--- a/client/resources.qrc
+++ b/client/resources.qrc
@@ -250,7 +250,7 @@
         <file>ui/qml/Controls2/BackButtonType.qml</file>
         <file>ui/qml/Pages2/PageSettingsServerProtocol.qml</file>
         <file>ui/qml/Components/TransportProtoSelector.qml</file>
-        <file>ui/qml/Controls2/ListViewType.qml</file>
+        <file>ui/qml/Controls2/ListViewWithRadioButtonType.qml</file>
         <file>images/controls/radio-button.svg</file>
         <file>images/controls/radio-button-inner-circle.png</file>
         <file>images/controls/radio-button-pressed.svg</file>
@@ -285,5 +285,6 @@
         <file>ui/qml/Controls2/TextAreaType.qml</file>
         <file>images/controls/trash.svg</file>
         <file>images/controls/more-vertical.svg</file>
+        <file>ui/qml/Controls2/ListViewWithLabelsType.qml</file>
     </qresource>
 </RCC>
diff --git a/client/ui/qml/Components/SettingsContainersListView.qml b/client/ui/qml/Components/SettingsContainersListView.qml
index bb578899..2489323b 100644
--- a/client/ui/qml/Components/SettingsContainersListView.qml
+++ b/client/ui/qml/Components/SettingsContainersListView.qml
@@ -22,133 +22,86 @@ ListView {
     clip: true
     interactive: false
 
-    ButtonGroup {
-        id: containersRadioButtonGroup
-    }
-
     delegate: Item {
         implicitWidth: root.width
-        implicitHeight: containerRadioButton.implicitHeight
+        implicitHeight: delegateContent.implicitHeight
 
-        RadioButton {
-            id: containerRadioButton
+        ColumnLayout {
+            id: delegateContent
 
-            implicitWidth: parent.width
-            implicitHeight: containerRadioButtonContent.implicitHeight
+            anchors.fill: parent
 
-            hoverEnabled: true
+            LabelWithButtonType {
+                implicitWidth: parent.width
 
-            ButtonGroup.group: containersRadioButtonGroup
+                text: name
+                descriptionText: description
+                rightImageSource: isInstalled ? "qrc:/images/controls/chevron-right.svg" : "qrc:/images/controls/download.svg"
 
-            indicator: Rectangle {
-                anchors.fill: parent
-                color: containerRadioButton.hovered ? Qt.rgba(1, 1, 1, 0.08) : "transparent"
+                clickedFunction: function() {
+                    if (isInstalled) {
+                        var containerIndex = root.model.mapToSource(index)
+                        ContainersModel.setCurrentlyProcessedContainerIndex(containerIndex)
 
-                Behavior on color {
-                    PropertyAnimation { duration: 200 }
-                }
-            }
-
-            checkable: isInstalled
-
-            RowLayout {
-                id: containerRadioButtonContent
-                anchors.fill: parent
-
-                anchors.rightMargin: 16
-                anchors.leftMargin: 16
-
-                z: 1
-
-                ColumnLayout {
-                    Layout.topMargin: 20
-                    Layout.bottomMargin: 20
-
-                    ListItemTitleType {
-                        Layout.fillWidth: true
-
-                        text: name
-                    }
-
-                    CaptionTextType {
-                        Layout.fillWidth: true
-
-                        text: description
-                        color: "#878B91"
-                    }
-                }
-
-                Image {
-                    source: isInstalled ? "qrc:/images/controls/chevron-right.svg" : "qrc:/images/controls/download.svg"
-
-                    width: 24
-                    height: 24
-
-                    Layout.rightMargin: 8
-                }
-            }
-
-            onClicked: {
-                if (isInstalled) {
-                    var containerIndex = root.model.mapToSource(index)
-                    ContainersModel.setCurrentlyProcessedContainerIndex(containerIndex)
-
-                    if (config[ContainerProps.containerTypeToString(containerIndex)]["isThirdPartyConfig"]) {
-                        ProtocolsModel.updateModel(config)
-                        goToPage(PageEnum.PageProtocolRaw)
-                        return
-                    }
-
-                    switch (containerIndex) {
-                    case ContainerEnum.OpenVpn: {
-                        OpenVpnConfigModel.updateModel(config)
-                        goToPage(PageEnum.PageProtocolOpenVpnSettings)
-                        break
-                    }
-                    case ContainerEnum.WireGuard: {
-                        ProtocolsModel.updateModel(config)
-                        goToPage(PageEnum.PageProtocolRaw)
-//                        WireGuardConfigModel.updateModel(config)
-//                        goToPage(PageEnum.PageProtocolWireGuardSettings)
-                        break
-                    }
-                    case ContainerEnum.Ipsec: {
-                        ProtocolsModel.updateModel(config)
-                        goToPage(PageEnum.PageProtocolRaw)
-//                        Ikev2ConfigModel.updateModel(config)
-//                        goToPage(PageEnum.PageProtocolIKev2Settings)
-                        break
-                    }
-                    case ContainerEnum.Sftp: {
-                        SftpConfigModel.updateModel(config)
-                        goToPage(PageEnum.PageServiceSftpSettings)
-                        break
-                    }
-                    case ContainerEnum.TorWebSite: {
-                        goToPage(PageEnum.PageServiceTorWebsiteSettings)
-                        break
-                    }
-
-                    default: {
-                        if (serviceType !== ProtocolEnum.Other) { //todo disable settings for dns container
+                        if (config[ContainerProps.containerTypeToString(containerIndex)]["isThirdPartyConfig"]) {
                             ProtocolsModel.updateModel(config)
-                            goToPage(PageEnum.PageSettingsServerProtocol)
+                            goToPage(PageEnum.PageProtocolRaw)
+                            return
                         }
-                    }
-                    }
 
-                } else {
-                    ContainersModel.setCurrentlyProcessedContainerIndex(root.model.mapToSource(index))
-                    InstallController.setShouldCreateServer(false)
-                    goToPage(PageEnum.PageSetupWizardProtocolSettings)
+                        switch (containerIndex) {
+                        case ContainerEnum.OpenVpn: {
+                            OpenVpnConfigModel.updateModel(config)
+                            goToPage(PageEnum.PageProtocolOpenVpnSettings)
+                            break
+                        }
+                        case ContainerEnum.WireGuard: {
+                            ProtocolsModel.updateModel(config)
+                            goToPage(PageEnum.PageProtocolRaw)
+    //                        WireGuardConfigModel.updateModel(config)
+    //                        goToPage(PageEnum.PageProtocolWireGuardSettings)
+                            break
+                        }
+                        case ContainerEnum.Ipsec: {
+                            ProtocolsModel.updateModel(config)
+                            goToPage(PageEnum.PageProtocolRaw)
+    //                        Ikev2ConfigModel.updateModel(config)
+    //                        goToPage(PageEnum.PageProtocolIKev2Settings)
+                            break
+                        }
+                        case ContainerEnum.Sftp: {
+                            SftpConfigModel.updateModel(config)
+                            goToPage(PageEnum.PageServiceSftpSettings)
+                            break
+                        }
+                        case ContainerEnum.TorWebSite: {
+                            goToPage(PageEnum.PageServiceTorWebsiteSettings)
+                            break
+                        }
+
+                        default: {
+                            if (serviceType !== ProtocolEnum.Other) { //todo disable settings for dns container
+                                ProtocolsModel.updateModel(config)
+                                goToPage(PageEnum.PageSettingsServerProtocol)
+                            }
+                        }
+                        }
+
+                    } else {
+                        ContainersModel.setCurrentlyProcessedContainerIndex(root.model.mapToSource(index))
+                        InstallController.setShouldCreateServer(false)
+                        goToPage(PageEnum.PageSetupWizardProtocolSettings)
+                    }
+                }
+
+                MouseArea {
+                    anchors.fill: parent
+                    cursorShape: Qt.PointingHandCursor
+                    enabled: false
                 }
             }
 
-            MouseArea {
-                anchors.fill: containerRadioButton
-                cursorShape: Qt.PointingHandCursor
-                enabled: false
-            }
+            DividerType {}
         }
     }
 }
diff --git a/client/ui/qml/Controls2/ListViewWithLabelsType.qml b/client/ui/qml/Controls2/ListViewWithLabelsType.qml
new file mode 100644
index 00000000..5b614c43
--- /dev/null
+++ b/client/ui/qml/Controls2/ListViewWithLabelsType.qml
@@ -0,0 +1,70 @@
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+
+import "TextTypes"
+
+ListView {
+    id: menuContent
+
+    property var rootWidth
+
+    property var selectedText
+
+    property string imageSource: "qrc:/images/controls/check.svg"
+
+    property var clickedFunction
+
+    property bool dividerVisible: false
+
+    currentIndex: 0
+
+    width: rootWidth
+    height: menuContent.contentItem.height
+
+    clip: true
+    interactive: false
+
+    ButtonGroup {
+        id: buttonGroup
+    }
+
+    delegate: Item {
+        implicitWidth: rootWidth
+        implicitHeight: content.implicitHeight
+
+        ColumnLayout {
+            id: content
+
+            anchors.fill: parent
+
+            LabelWithButtonType {
+                Layout.fillWidth: true
+
+                text: name
+                rightImageSource: imageSource
+
+                clickedFunction: function() {
+                    menuContent.currentIndex = index
+                    menuContent.selectedText = name
+                    if (menuContent.clickedFunction && typeof menuContent.clickedFunction === "function") {
+                        menuContent.clickedFunction()
+                    }
+                }
+            }
+
+            DividerType {
+                Layout.fillWidth: true
+                Layout.bottomMargin: 4
+
+                visible: dividerVisible
+            }
+        }
+
+        Component.onCompleted: {
+            if (menuContent.currentIndex === index) {
+                menuContent.selectedText = name
+            }
+        }
+    }
+}
diff --git a/client/ui/qml/Controls2/ListViewType.qml b/client/ui/qml/Controls2/ListViewWithRadioButtonType.qml
similarity index 85%
rename from client/ui/qml/Controls2/ListViewType.qml
rename to client/ui/qml/Controls2/ListViewWithRadioButtonType.qml
index 926ec038..f7f99dec 100644
--- a/client/ui/qml/Controls2/ListViewType.qml
+++ b/client/ui/qml/Controls2/ListViewWithRadioButtonType.qml
@@ -11,12 +11,10 @@ ListView {
 
     property var selectedText
 
-    property string imageSource
+    property string imageSource: "qrc:/images/controls/check.svg"
 
     property var clickedFunction
 
-    property bool dividerVisible: false
-
     currentIndex: 0
 
     width: rootWidth
@@ -53,6 +51,12 @@ ListView {
                     Behavior on color {
                         PropertyAnimation { duration: 200 }
                     }
+
+                    MouseArea {
+                        anchors.fill: parent
+                        cursorShape: Qt.PointingHandCursor
+                        enabled: false
+                    }
                 }
 
                 RowLayout {
@@ -73,8 +77,8 @@ ListView {
                     }
 
                     Image {
-                        source: imageSource ? imageSource : "qrc:/images/controls/check.svg"
-                        visible: imageSource ? true : radioButton.checked
+                        source: imageSource
+                        visible: radioButton.checked
 
                         width: 24
                         height: 24
@@ -94,13 +98,6 @@ ListView {
                     }
                 }
             }
-
-            DividerType {
-                Layout.fillWidth: true
-                Layout.bottomMargin: 4
-
-                visible: dividerVisible
-            }
         }
 
         Component.onCompleted: {
diff --git a/client/ui/qml/Controls2/PageType.qml b/client/ui/qml/Controls2/PageType.qml
index 296fcc8c..cb6fa142 100644
--- a/client/ui/qml/Controls2/PageType.qml
+++ b/client/ui/qml/Controls2/PageType.qml
@@ -28,4 +28,14 @@ Item {
             root.stackView.pop()
         }
     }
+
+    MouseArea {
+        z: -1
+        anchors.fill: parent
+
+        onClicked: {
+            console.log("base mouse area pressed")
+            focus = true
+        }
+    }
 }
diff --git a/client/ui/qml/Pages2/PageProtocolCloakSettings.qml b/client/ui/qml/Pages2/PageProtocolCloakSettings.qml
index c19118b5..7273b86d 100644
--- a/client/ui/qml/Pages2/PageProtocolCloakSettings.qml
+++ b/client/ui/qml/Pages2/PageProtocolCloakSettings.qml
@@ -119,7 +119,7 @@ PageType {
                             descriptionText: qsTr("Cipher")
                             headerText: qsTr("Cipher")
 
-                            listView: ListViewType {
+                            listView: ListViewWithRadioButtonType {
                                 id: cipherListView
 
                                 rootWidth: root.width
diff --git a/client/ui/qml/Pages2/PageProtocolOpenVpnSettings.qml b/client/ui/qml/Pages2/PageProtocolOpenVpnSettings.qml
index a8f7bb77..fb2258c5 100644
--- a/client/ui/qml/Pages2/PageProtocolOpenVpnSettings.qml
+++ b/client/ui/qml/Pages2/PageProtocolOpenVpnSettings.qml
@@ -168,7 +168,7 @@ PageType {
                             descriptionText: qsTr("Hash")
                             headerText: qsTr("Hash")
 
-                            listView: ListViewType {
+                            listView: ListViewWithRadioButtonType {
                                 id: hashListView
 
                                 rootWidth: root.width
@@ -214,7 +214,7 @@ PageType {
                             descriptionText: qsTr("Cipher")
                             headerText: qsTr("Cipher")
 
-                            listView: ListViewType {
+                            listView: ListViewWithRadioButtonType {
                                 id: cipherListView
 
                                 rootWidth: root.width
@@ -392,7 +392,7 @@ PageType {
                         }
                     }
                 }
-            }  
+            }
         }
 
         QuestionDrawer {
diff --git a/client/ui/qml/Pages2/PageProtocolShadowSocksSettings.qml b/client/ui/qml/Pages2/PageProtocolShadowSocksSettings.qml
index 38a6be06..7b78bc07 100644
--- a/client/ui/qml/Pages2/PageProtocolShadowSocksSettings.qml
+++ b/client/ui/qml/Pages2/PageProtocolShadowSocksSettings.qml
@@ -105,7 +105,7 @@ PageType {
                             descriptionText: qsTr("Cipher")
                             headerText: qsTr("Cipher")
 
-                            listView: ListViewType {
+                            listView: ListViewWithRadioButtonType {
                                 id: cipherListView
 
                                 rootWidth: root.width
diff --git a/client/ui/qml/Pages2/PageServiceSftpSettings.qml b/client/ui/qml/Pages2/PageServiceSftpSettings.qml
index 6783fecd..32c0c170 100644
--- a/client/ui/qml/Pages2/PageServiceSftpSettings.qml
+++ b/client/ui/qml/Pages2/PageServiceSftpSettings.qml
@@ -97,6 +97,7 @@ PageType {
 
                             clickedFunction: function() {
                                 col.copyToClipBoard(descriptionText)
+                                PageController.showNotificationMessage(qsTr("Copied"))
                             }
                         }
 
@@ -113,6 +114,7 @@ PageType {
 
                             clickedFunction: function() {
                                 col.copyToClipBoard(descriptionText)
+                                PageController.showNotificationMessage(qsTr("Copied"))
                             }
                         }
 
@@ -129,6 +131,7 @@ PageType {
 
                             clickedFunction: function() {
                                 col.copyToClipBoard(descriptionText)
+                                PageController.showNotificationMessage(qsTr("Copied"))
                             }
                         }
 
@@ -145,6 +148,7 @@ PageType {
 
                             clickedFunction: function() {
                                 col.copyToClipBoard(descriptionText)
+                                PageController.showNotificationMessage(qsTr("Copied"))
                             }
                         }
 
@@ -194,7 +198,9 @@ PageType {
                             readonly property string macosFirstLink: "<a href=\"https://osxfuse.github.io/\" style=\"color: #FBB26A;\">macFUSE</a>"
                             readonly property string macosSecondLink: "<a href=\"https://osxfuse.github.io/\" style=\"color: #FBB26A;\">SSHFS</a>"
 
-                            onLinkActivated: Qt.openUrlExternally(link)
+                            onLinkActivated: function(link) {
+                                Qt.openUrlExternally(link)
+                            }
                             textFormat: Text.RichText
                             text: {
                                 var str = qsTr("In order to mount remote SFTP folder as local drive, perform following steps: <br>")
@@ -210,6 +216,8 @@ PageType {
 
                                 return str
                             }
+
+
                         }
 
                         BasicButtonType {
diff --git a/client/ui/qml/Pages2/PageServiceTorWebsiteSettings.qml b/client/ui/qml/Pages2/PageServiceTorWebsiteSettings.qml
index 40e1b339..080f5ee6 100644
--- a/client/ui/qml/Pages2/PageServiceTorWebsiteSettings.qml
+++ b/client/ui/qml/Pages2/PageServiceTorWebsiteSettings.qml
@@ -79,6 +79,7 @@ PageType {
 
                 clickedFunction: function() {
                     content.copyToClipBoard(descriptionText)
+                    PageController.showNotificationMessage(qsTr("Copied"))
                 }
             }
 
diff --git a/client/ui/qml/Pages2/PageSettingsSplitTunneling.qml b/client/ui/qml/Pages2/PageSettingsSplitTunneling.qml
index a43e9e5e..5cd0d095 100644
--- a/client/ui/qml/Pages2/PageSettingsSplitTunneling.qml
+++ b/client/ui/qml/Pages2/PageSettingsSplitTunneling.qml
@@ -116,7 +116,7 @@ PageType {
 
             headerText: qsTr("Mode")
 
-            listView: ListViewType {
+            listView: ListViewWithRadioButtonType {
                 rootWidth: root.width
 
                 model: root.routeModesModel
diff --git a/client/ui/qml/Pages2/PageShare.qml b/client/ui/qml/Pages2/PageShare.qml
index f2ed4607..065bda12 100644
--- a/client/ui/qml/Pages2/PageShare.qml
+++ b/client/ui/qml/Pages2/PageShare.qml
@@ -166,7 +166,7 @@ PageType {
                 descriptionText: accessTypeSelector.currentIndex === 0 ? qsTr("Server and service") : qsTr("Server")
                 headerText: qsTr("Server")
 
-                listView: ListViewType {
+                listView: ListViewWithLabelsType {
                     rootWidth: root.width
                     dividerVisible: true
 
@@ -255,9 +255,8 @@ PageType {
                                 wrapMode: Text.WordWrap
                             }
 
-                            ListViewType {
+                            ListViewWithRadioButtonType {
                                 rootWidth: root.width
-                                dividerVisible: true
 
                                 imageSource: "qrc:/images/controls/check.svg"
 
@@ -274,7 +273,7 @@ PageType {
 
                                 currentIndex: 0
 
-                                clickedFunction: function () {
+                                clickedFunction: function() {
                                     handler()
 
                                     protocolSelector.visible = false
@@ -338,11 +337,10 @@ PageType {
                 descriptionText: qsTr("Connection format")
                 headerText: qsTr("Connection format")
 
-                listView: ListViewType {
+                listView: ListViewWithRadioButtonType {
                     id: exportTypeListView
 
                     rootWidth: root.width
-                    dividerVisible: true
 
                     imageSource: "qrc:/images/controls/chevron-right.svg"
 

From a40f365a543d0545ab31217fe8fef44b223dea20 Mon Sep 17 00:00:00 2001
From: "vladimir.kuznetsov" <nethiuswork@gmail.com>
Date: Wed, 16 Aug 2023 23:48:25 +0500
Subject: [PATCH 063/278] "added display of busy server package manager on the
 PageSetupWizardInstalling"

---
 client/ui/controllers/installController.cpp   |  3 +++
 client/ui/controllers/installController.h     |  2 ++
 client/ui/qml/Pages2/PageDeinstalling.qml     |  2 +-
 .../qml/Pages2/PageSetupWizardInstalling.qml  | 23 ++++++++++++++++---
 4 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/client/ui/controllers/installController.cpp b/client/ui/controllers/installController.cpp
index 7e71aef8..06a5c554 100644
--- a/client/ui/controllers/installController.cpp
+++ b/client/ui/controllers/installController.cpp
@@ -85,6 +85,7 @@ void InstallController::install(DockerContainer container, int port, TransportPr
 void InstallController::installServer(DockerContainer container, QJsonObject &config)
 {
     ServerController serverController(m_settings);
+    connect(&serverController, &ServerController::serverIsBusy, this, &InstallController::serverIsBusy);
 
     QMap<DockerContainer, QJsonObject> installedContainers;
     ErrorCode errorCode =
@@ -138,6 +139,7 @@ void InstallController::installContainer(DockerContainer container, QJsonObject
             qvariant_cast<ServerCredentials>(m_serversModel->data(serverIndex, ServersModel::Roles::CredentialsRole));
 
     ServerController serverController(m_settings);
+    connect(&serverController, &ServerController::serverIsBusy, this, &InstallController::serverIsBusy);
 
     QMap<DockerContainer, QJsonObject> installedContainers;
     ErrorCode errorCode = serverController.getAlreadyInstalledContainers(serverCredentials, installedContainers);
@@ -239,6 +241,7 @@ void InstallController::updateContainer(QJsonObject config)
             qvariant_cast<QJsonObject>(m_containersModel->data(modelIndex, ContainersModel::Roles::ConfigRole));
 
     ServerController serverController(m_settings);
+    connect(&serverController, &ServerController::serverIsBusy, this, &InstallController::serverIsBusy);
 
     auto errorCode = serverController.updateContainer(serverCredentials, container, oldContainerConfig, config);
     if (errorCode == ErrorCode::NoError) {
diff --git a/client/ui/controllers/installController.h b/client/ui/controllers/installController.h
index b74835d9..63d4c714 100644
--- a/client/ui/controllers/installController.h
+++ b/client/ui/controllers/installController.h
@@ -60,6 +60,8 @@ signals:
     void passphraseRequestStarted();
     void passphraseRequestFinished();
 
+    void serverIsBusy(const bool isBusy);
+
 private:
     void installServer(DockerContainer container, QJsonObject &config);
     void installContainer(DockerContainer container, QJsonObject &config);
diff --git a/client/ui/qml/Pages2/PageDeinstalling.qml b/client/ui/qml/Pages2/PageDeinstalling.qml
index eff58055..243b1205 100644
--- a/client/ui/qml/Pages2/PageDeinstalling.qml
+++ b/client/ui/qml/Pages2/PageDeinstalling.qml
@@ -75,7 +75,7 @@ PageType {
                                 repeat: true
                                 running: true
                                 onTriggered: {
-                                    progressBar.value += 0.001
+                                    progressBar.value += 0.003
                                 }
                             }
                         }
diff --git a/client/ui/qml/Pages2/PageSetupWizardInstalling.qml b/client/ui/qml/Pages2/PageSetupWizardInstalling.qml
index 10daa0be..20c589ee 100644
--- a/client/ui/qml/Pages2/PageSetupWizardInstalling.qml
+++ b/client/ui/qml/Pages2/PageSetupWizardInstalling.qml
@@ -17,6 +17,9 @@ PageType {
     Component.onCompleted: PageController.enableTabBar(false)
     Component.onDestruction: PageController.enableTabBar(true)
 
+    property bool isTimerRunning: true
+    property string progressBarText: qsTr("Usually it takes no more than 5 minutes")
+
     Connections {
         target: InstallController
 
@@ -57,6 +60,18 @@ PageType {
 
             PageController.showErrorMessage(qsTr("The server has already been added to the application"))
         }
+
+        function onServerIsBusy(isBusy) {
+            if (isBusy) {
+                root.progressBarText = qsTr("Amnesia has detected that your server is currently ") +
+                                       qsTr("busy installing other software. Amnesia installation ") +
+                                       qsTr("will pause until the server finishes installing other software")
+                root.isTimerRunning = false
+            } else {
+                root.progressBarText = qsTr("Usually it takes no more than 5 minutes")
+                root.isTimerRunning = true
+            }
+        }
     }
 
     SortFilterProxyModel {
@@ -122,18 +137,20 @@ PageType {
 
                                 interval: 300
                                 repeat: true
-                                running: true
+                                running: root.isTimerRunning
                                 onTriggered: {
-                                    progressBar.value += 0.001
+                                    progressBar.value += 0.003
                                 }
                             }
                         }
 
                         ParagraphTextType {
+                            id: progressText
+
                             Layout.fillWidth: true
                             Layout.topMargin: 8
 
-                            text: qsTr("Usually it takes no more than 5 minutes")
+                            text: root.progressBarText
                         }
                     }
                 }

From ddaa5b784d89946f3b3b9523920c579c0220cd68 Mon Sep 17 00:00:00 2001
From: "vladimir.kuznetsov" <nethiuswork@gmail.com>
Date: Fri, 18 Aug 2023 14:14:45 +0500
Subject: [PATCH 064/278] minor ui fixes

---
 .../ui/qml/Controls2/LabelWithButtonType.qml  | 27 +++++++++++++------
 .../ui/qml/Controls2/VerticalRadioButton.qml  |  1 +
 client/ui/qml/Pages2/PageSettingsAbout.qml    |  8 +++---
 3 files changed, 25 insertions(+), 11 deletions(-)

diff --git a/client/ui/qml/Controls2/LabelWithButtonType.qml b/client/ui/qml/Controls2/LabelWithButtonType.qml
index 3aca1d57..82aef55a 100644
--- a/client/ui/qml/Controls2/LabelWithButtonType.qml
+++ b/client/ui/qml/Controls2/LabelWithButtonType.qml
@@ -17,7 +17,9 @@ Item {
 
     property string textColor: "#d7d8db"
     property string descriptionColor: "#878B91"
-    property string rightImageColor: "#878B91"
+    property real textOpacity: 1.0
+
+    property string rightImageColor: "#d7d8db"
 
     property bool descriptionOnTop: false
 
@@ -67,6 +69,8 @@ Item {
                 text: root.text
                 color: root.descriptionOnTop ? root.descriptionColor : root.textColor
 
+                opacity: root.textOpacity
+
                 Layout.fillWidth: true
 
                 lineHeight: root.descriptionOnTop ? parent.descriptionTextLineHeight : parent.textLineHeight
@@ -75,14 +79,20 @@ Item {
 
                 horizontalAlignment: Text.AlignLeft
                 verticalAlignment: Text.AlignVCenter
+
+                Behavior on opacity {
+                    PropertyAnimation { duration: 200 }
+                }
             }
 
 
             CaptionTextType {
                 id: description
 
-                color: root.descriptionOnTop ? root.textColor : root.descriptionColor
                 text: root.descriptionText
+                color: root.descriptionOnTop ? root.textColor : root.descriptionColor
+
+                opacity: root.textOpacity
 
                 visible: root.descriptionText !== ""
 
@@ -94,6 +104,10 @@ Item {
 
                 horizontalAlignment: Text.AlignLeft
                 verticalAlignment: Text.AlignVCenter
+
+                Behavior on opacity {
+                    PropertyAnimation { duration: 200 }
+                }
             }
         }
 
@@ -141,9 +155,8 @@ Item {
                 rightImageBackground.color = rightImage.hoveredColor
             } else if (leftImageSource) {
                 leftImageBackground.color = rightImage.hoveredColor
-            } else {
-                background.color = rightImage.hoveredColor
             }
+            root.textOpacity = 0.8
         }
 
         onExited: {
@@ -151,9 +164,8 @@ Item {
                 rightImageBackground.color = rightImage.defaultColor
             } else if (leftImageSource) {
                 leftImageBackground.color = rightImage.defaultColor
-            } else {
-                background.color = rightImage.defaultColor
             }
+            root.textOpacity = 1
         }
 
         onPressedChanged: {
@@ -161,9 +173,8 @@ Item {
                 rightImageBackground.color = pressed ? rightImage.pressedColor : entered ? rightImage.hoveredColor : rightImage.defaultColor
             } else if (leftImageSource) {
                 leftImageBackground.color = pressed ? rightImage.pressedColor : entered ? rightImage.hoveredColor : rightImage.defaultColor
-            } else {
-                background.color = pressed ? rightImage.pressedColor : entered ? rightImage.hoveredColor : rightImage.defaultColor
             }
+            root.textOpacity = 0.7
         }
 
         onClicked: {
diff --git a/client/ui/qml/Controls2/VerticalRadioButton.qml b/client/ui/qml/Controls2/VerticalRadioButton.qml
index f44fa751..8229c959 100644
--- a/client/ui/qml/Controls2/VerticalRadioButton.qml
+++ b/client/ui/qml/Controls2/VerticalRadioButton.qml
@@ -67,6 +67,7 @@ RadioButton {
             width: 24
             height: 24
         }
+
         Image {
             source: {
                 if (showImage) {
diff --git a/client/ui/qml/Pages2/PageSettingsAbout.qml b/client/ui/qml/Pages2/PageSettingsAbout.qml
index 1875f085..9fc23c15 100644
--- a/client/ui/qml/Pages2/PageSettingsAbout.qml
+++ b/client/ui/qml/Pages2/PageSettingsAbout.qml
@@ -81,7 +81,8 @@ And if you don't like the app, all the more support it - the donation will be us
 
                 text: qsTr("Card on Patreon")
 
-                onClicked: {
+                clickedFunction: function() {
+                    Qt.openUrlExternally(qsTr("https://www.patreon.com/amneziavpn"))
                 }
             }
 
@@ -121,7 +122,7 @@ And if you don't like the app, all the more support it - the donation will be us
                 leftImageSource: "qrc:/images/controls/telegram.svg"
 
                 clickedFunction: function() {
-                    Qt.openUrlExternally("https://t.me/amnezia_vpn_dev")
+                    Qt.openUrlExternally(qsTr("https://t.me/amnezia_vpn_dev"))
                 }
             }
 
@@ -147,7 +148,7 @@ And if you don't like the app, all the more support it - the donation will be us
                 leftImageSource: "qrc:/images/controls/github.svg"
 
                 clickedFunction: function() {
-                    Qt.openUrlExternally("https://github.com/amnezia-vpn/amnezia-client")
+                    Qt.openUrlExternally(qsTr("https://github.com/amnezia-vpn/amnezia-client"))
                 }
             }
 
@@ -160,6 +161,7 @@ And if you don't like the app, all the more support it - the donation will be us
                 leftImageSource: "qrc:/images/controls/amnezia.svg"
 
                 clickedFunction: function() {
+                    Qt.openUrlExternally(qsTr("amnezia.org/"))
                 }
             }
 

From 0060f57b634236aff626f708cb239ba82a97b6ab Mon Sep 17 00:00:00 2001
From: "vladimir.kuznetsov" <nethiuswork@gmail.com>
Date: Sat, 19 Aug 2023 13:12:54 +0500
Subject: [PATCH 065/278] fixed selection of connection type on PageShare when
 changing protocol

---
 client/ui/qml/Pages2/PageShare.qml | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/client/ui/qml/Pages2/PageShare.qml b/client/ui/qml/Pages2/PageShare.qml
index 065bda12..28f5ca06 100644
--- a/client/ui/qml/Pages2/PageShare.qml
+++ b/client/ui/qml/Pages2/PageShare.qml
@@ -338,14 +338,18 @@ PageType {
                 headerText: qsTr("Connection format")
 
                 listView: ListViewWithRadioButtonType {
-                    id: exportTypeListView
+                    onCurrentIndexChanged: {
+                        console.log(currentIndex)
+                        exportTypeSelector.currentIndex = currentIndex
+                        exportTypeSelector.text = selectedText
+                    }
 
                     rootWidth: root.width
 
-                    imageSource: "qrc:/images/controls/chevron-right.svg"
+                    imageSource: "qrc:/images/controls/check.svg"
 
                     model: root.connectionTypesModel
-                    currentIndex: exportTypeSelector.currentIndex
+                    currentIndex: 0
 
                     clickedFunction: function() {
                         exportTypeSelector.text = selectedText

From b5e1c78461a9cf52e8743a17e7e675a35a3831f7 Mon Sep 17 00:00:00 2001
From: "vladimir.kuznetsov" <nethiuswork@gmail.com>
Date: Sun, 20 Aug 2023 13:36:54 +0500
Subject: [PATCH 066/278] minor ui fixes

---
 client/containers/containers_defs.cpp         |  29 ++++-
 client/containers/containers_defs.h           | 105 +++++++++---------
 client/ui/controllers/installController.cpp   |  15 +++
 client/ui/controllers/installController.h     |   2 +
 client/ui/models/containers_model.cpp         |   8 +-
 client/ui/models/containers_model.h           |   3 +-
 .../Pages2/PageServiceTorWebsiteSettings.qml  |   2 +-
 client/ui/qml/Pages2/PageSettingsAbout.qml    |   2 +-
 .../qml/Pages2/PageSettingsSplitTunneling.qml |   2 +-
 client/ui/qml/Pages2/PageSetupWizardEasy.qml  |  26 ++++-
 .../PageSetupWizardProtocolSettings.qml       |   4 +-
 11 files changed, 132 insertions(+), 66 deletions(-)

diff --git a/client/containers/containers_defs.cpp b/client/containers/containers_defs.cpp
index 27f6f1dd..fc4570f4 100644
--- a/client/containers/containers_defs.cpp
+++ b/client/containers/containers_defs.cpp
@@ -81,7 +81,7 @@ QMap<DockerContainer, QString> ContainerProps::containerHumanNames()
 {
     return { { DockerContainer::None, "Not installed" },
              { DockerContainer::OpenVpn, "OpenVPN" },
-             { DockerContainer::ShadowSocks, "OpenVPN over ShadowSocks" },
+             { DockerContainer::ShadowSocks, "ShadowSocks" },
              { DockerContainer::Cloak, "OpenVPN over Cloak" },
              { DockerContainer::WireGuard, "WireGuard" },
              { DockerContainer::Ipsec, QObject::tr("IPsec") },
@@ -93,6 +93,33 @@ QMap<DockerContainer, QString> ContainerProps::containerHumanNames()
 }
 
 QMap<DockerContainer, QString> ContainerProps::containerDescriptions()
+{
+    return { { DockerContainer::OpenVpn,
+               QObject::tr("OpenVPN is the most popular VPN protocol, with flexible configuration options. It uses its "
+                           "own security protocol with SSL/TLS for key exchange.") },
+             { DockerContainer::ShadowSocks,
+               QObject::tr("ShadowSocks - masks VPN traffic, making it similar to normal web traffic, but is "
+                           "recognised by analysis systems in some highly censored regions.") },
+             { DockerContainer::Cloak,
+               QObject::tr("OpenVPN over Cloak - OpenVPN with VPN masquerading as web traffic and protection against "
+                           "active-probbing detection. Ideal for bypassing blocking in regions with the highest levels "
+                           "of censorship.") },
+             { DockerContainer::WireGuard,
+               QObject::tr("WireGuard - New popular VPN protocol with high performance, high speed and low power "
+                           "consumption. Recommended for regions with low levels of censorship.") },
+             { DockerContainer::Ipsec,
+               QObject::tr("IKEv2 -  Modern stable protocol, a bit faster than others, restores connection after "
+                           "signal loss. It has native support on the latest versions of Android and iOS.") },
+
+             { DockerContainer::TorWebSite, QObject::tr("Deploy a WordPress site on the Tor network in two clicks.") },
+             { DockerContainer::Dns,
+               QObject::tr("Replace the current DNS server with your own. This will increase your privacy level.") },
+             //{DockerContainer::FileShare, QObject::tr("SMB file sharing service - is Window file sharing protocol")},
+             { DockerContainer::Sftp,
+               QObject::tr("Creates a file vault on your server to securely store and transfer files.") } };
+}
+
+QMap<DockerContainer, QString> ContainerProps::containerDetailedDescriptions()
 {
     return { { DockerContainer::OpenVpn, QObject::tr("OpenVPN container") },
              { DockerContainer::ShadowSocks, QObject::tr("Container with OpenVpn and ShadowSocks") },
diff --git a/client/containers/containers_defs.h b/client/containers/containers_defs.h
index d4a35d26..a84d997c 100644
--- a/client/containers/containers_defs.h
+++ b/client/containers/containers_defs.h
@@ -8,72 +8,69 @@
 
 using namespace amnezia;
 
-namespace amnezia {
-
-namespace ContainerEnumNS {
-Q_NAMESPACE
-enum DockerContainer {
-    None = 0,
-    OpenVpn,
-    ShadowSocks,
-    Cloak,
-    WireGuard,
-    Ipsec,
-
-    //non-vpn
-    TorWebSite,
-    Dns,
-    //FileShare,
-    Sftp
-};
-Q_ENUM_NS(DockerContainer)
-} // namespace ContainerEnumNS
-
-using namespace ContainerEnumNS;
-using namespace ProtocolEnumNS;
-
-class ContainerProps : public QObject
+namespace amnezia
 {
-    Q_OBJECT
 
-public:
-    Q_INVOKABLE static amnezia::DockerContainer containerFromString(const QString &container);
-    Q_INVOKABLE static QString containerToString(amnezia::DockerContainer container);
-    Q_INVOKABLE static QString containerTypeToString(amnezia::DockerContainer c);
+    namespace ContainerEnumNS
+    {
+        Q_NAMESPACE
+        enum DockerContainer {
+            None = 0,
+            OpenVpn,
+            ShadowSocks,
+            Cloak,
+            WireGuard,
+            Ipsec,
 
-    Q_INVOKABLE static QList<amnezia::DockerContainer> allContainers();
+            // non-vpn
+            TorWebSite,
+            Dns,
+            // FileShare,
+            Sftp
+        };
+        Q_ENUM_NS(DockerContainer)
+    } // namespace ContainerEnumNS
 
-    Q_INVOKABLE static QMap<amnezia::DockerContainer, QString> containerHumanNames();
-    Q_INVOKABLE static QMap<amnezia::DockerContainer, QString> containerDescriptions();
+    using namespace ContainerEnumNS;
+    using namespace ProtocolEnumNS;
 
-    // these protocols will be displayed in container settings
-    Q_INVOKABLE static QVector<amnezia::Proto> protocolsForContainer(amnezia::DockerContainer container);
+    class ContainerProps : public QObject
+    {
+        Q_OBJECT
 
-    Q_INVOKABLE static amnezia::ServiceType containerService(amnezia::DockerContainer c);
+    public:
+        Q_INVOKABLE static amnezia::DockerContainer containerFromString(const QString &container);
+        Q_INVOKABLE static QString containerToString(amnezia::DockerContainer container);
+        Q_INVOKABLE static QString containerTypeToString(amnezia::DockerContainer c);
 
-    // binding between Docker container and main protocol of given container
-    // it may be changed fot future containers :)
-    Q_INVOKABLE static amnezia::Proto defaultProtocol(amnezia::DockerContainer c);
+        Q_INVOKABLE static QList<amnezia::DockerContainer> allContainers();
 
-    Q_INVOKABLE static bool isSupportedByCurrentPlatform(amnezia::DockerContainer c);
-    Q_INVOKABLE static QStringList fixedPortsForContainer(amnezia::DockerContainer c);
+        Q_INVOKABLE static QMap<amnezia::DockerContainer, QString> containerHumanNames();
+        Q_INVOKABLE static QMap<amnezia::DockerContainer, QString> containerDescriptions();
+        Q_INVOKABLE static QMap<amnezia::DockerContainer, QString> containerDetailedDescriptions();
 
-    static bool isEasySetupContainer(amnezia::DockerContainer container);
-    static QString easySetupHeader(amnezia::DockerContainer container);
-    static QString easySetupDescription(amnezia::DockerContainer container);
-};
+        // these protocols will be displayed in container settings
+        Q_INVOKABLE static QVector<amnezia::Proto> protocolsForContainer(amnezia::DockerContainer container);
 
+        Q_INVOKABLE static amnezia::ServiceType containerService(amnezia::DockerContainer c);
 
+        // binding between Docker container and main protocol of given container
+        // it may be changed fot future containers :)
+        Q_INVOKABLE static amnezia::Proto defaultProtocol(amnezia::DockerContainer c);
 
-static void declareQmlContainerEnum() {   
-    qmlRegisterUncreatableMetaObject(
-                ContainerEnumNS::staticMetaObject,
-                "ContainerEnum",
-                1, 0,
-                "ContainerEnum",
-                "Error: only enums"
-                );
-}
+        Q_INVOKABLE static bool isSupportedByCurrentPlatform(amnezia::DockerContainer c);
+        Q_INVOKABLE static QStringList fixedPortsForContainer(amnezia::DockerContainer c);
+
+        static bool isEasySetupContainer(amnezia::DockerContainer container);
+        static QString easySetupHeader(amnezia::DockerContainer container);
+        static QString easySetupDescription(amnezia::DockerContainer container);
+    };
+
+    static void declareQmlContainerEnum()
+    {
+        qmlRegisterUncreatableMetaObject(ContainerEnumNS::staticMetaObject, "ContainerEnum", 1, 0, "ContainerEnum",
+                                         "Error: only enums");
+    }
 
 } // namespace amnezia
 
diff --git a/client/ui/controllers/installController.cpp b/client/ui/controllers/installController.cpp
index 06a5c554..18588aef 100644
--- a/client/ui/controllers/installController.cpp
+++ b/client/ui/controllers/installController.cpp
@@ -446,3 +446,18 @@ void InstallController::setEncryptedPassphrase(QString passphrase)
     m_privateKeyPassphrase = passphrase;
     emit passphraseRequestFinished();
 }
+
+void InstallController::addEmptyServer()
+{
+    QJsonObject server;
+    server.insert(config_key::hostName, m_currentlyInstalledServerCredentials.hostName);
+    server.insert(config_key::userName, m_currentlyInstalledServerCredentials.userName);
+    server.insert(config_key::password, m_currentlyInstalledServerCredentials.secretData);
+    server.insert(config_key::port, m_currentlyInstalledServerCredentials.port);
+    server.insert(config_key::description, m_settings->nextAvailableServerName());
+
+    m_serversModel->addServer(server);
+    m_serversModel->setDefaultServerIndex(m_serversModel->getServersCount() - 1);
+
+    emit installServerFinished(tr("Server added successfully"));
+}
diff --git a/client/ui/controllers/installController.h b/client/ui/controllers/installController.h
index 63d4c714..4060c97c 100644
--- a/client/ui/controllers/installController.h
+++ b/client/ui/controllers/installController.h
@@ -41,6 +41,8 @@ public slots:
 
     void setEncryptedPassphrase(QString passphrase);
 
+    void addEmptyServer();
+
 signals:
     void installContainerFinished(const QString &finishMessage, bool isServiceInstall);
     void installServerFinished(const QString &finishMessage);
diff --git a/client/ui/models/containers_model.cpp b/client/ui/models/containers_model.cpp
index dd1d8d4e..0a07895c 100644
--- a/client/ui/models/containers_model.cpp
+++ b/client/ui/models/containers_model.cpp
@@ -24,7 +24,7 @@ bool ContainersModel::setData(const QModelIndex &index, const QVariant &value, i
     switch (role) {
     case NameRole:
         //        return ContainerProps::containerHumanNames().value(container);
-    case DescRole:
+    case DescriptionRole:
         //        return ContainerProps::containerDescriptions().value(container);
     case ConfigRole: {
         m_settings->setContainerConfig(m_currentlyProcessedServerIndex, container, value.toJsonObject());
@@ -62,7 +62,8 @@ QVariant ContainersModel::data(const QModelIndex &index, int role) const
 
     switch (role) {
     case NameRole: return ContainerProps::containerHumanNames().value(container);
-    case DescRole: return ContainerProps::containerDescriptions().value(container);
+    case DescriptionRole: return ContainerProps::containerDescriptions().value(container);
+    case DetailedDescriptionRole: return ContainerProps::containerDetailedDescriptions().value(container);
     case ConfigRole: {
         if (container == DockerContainer::None) {
             return QJsonObject();
@@ -220,7 +221,8 @@ QHash<int, QByteArray> ContainersModel::roleNames() const
 {
     QHash<int, QByteArray> roles;
     roles[NameRole] = "name";
-    roles[DescRole] = "description";
+    roles[DescriptionRole] = "description";
+    roles[DetailedDescriptionRole] = "detailedDescription";
     roles[ServiceTypeRole] = "serviceType";
     roles[DockerContainerRole] = "dockerContainer";
     roles[ConfigRole] = "config";
diff --git a/client/ui/models/containers_model.h b/client/ui/models/containers_model.h
index 8978315c..cde77526 100644
--- a/client/ui/models/containers_model.h
+++ b/client/ui/models/containers_model.h
@@ -17,7 +17,8 @@ public:
 
     enum Roles {
         NameRole = Qt::UserRole + 1,
-        DescRole,
+        DescriptionRole,
+        DetailedDescriptionRole,
         ServiceTypeRole,
         ConfigRole,
         DockerContainerRole,
diff --git a/client/ui/qml/Pages2/PageServiceTorWebsiteSettings.qml b/client/ui/qml/Pages2/PageServiceTorWebsiteSettings.qml
index 080f5ee6..38490375 100644
--- a/client/ui/qml/Pages2/PageServiceTorWebsiteSettings.qml
+++ b/client/ui/qml/Pages2/PageServiceTorWebsiteSettings.qml
@@ -138,7 +138,7 @@ PageType {
                 text: qsTr("Remove website")
 
                 onClicked: {
-                    questionDrawer.headerText = qsTr("Some description")
+                    questionDrawer.headerText = qsTr("The site with all data will be removed from the tor network.")
                     questionDrawer.yesButtonText = qsTr("Continue")
                     questionDrawer.noButtonText = qsTr("Cancel")
 
diff --git a/client/ui/qml/Pages2/PageSettingsAbout.qml b/client/ui/qml/Pages2/PageSettingsAbout.qml
index 9fc23c15..67dada43 100644
--- a/client/ui/qml/Pages2/PageSettingsAbout.qml
+++ b/client/ui/qml/Pages2/PageSettingsAbout.qml
@@ -81,7 +81,7 @@ And if you don't like the app, all the more support it - the donation will be us
 
                 text: qsTr("Card on Patreon")
 
-                clickedFunction: function() {
+                onClicked: function() {
                     Qt.openUrlExternally(qsTr("https://www.patreon.com/amneziavpn"))
                 }
             }
diff --git a/client/ui/qml/Pages2/PageSettingsSplitTunneling.qml b/client/ui/qml/Pages2/PageSettingsSplitTunneling.qml
index 5cd0d095..71f2ba29 100644
--- a/client/ui/qml/Pages2/PageSettingsSplitTunneling.qml
+++ b/client/ui/qml/Pages2/PageSettingsSplitTunneling.qml
@@ -43,7 +43,7 @@ PageType {
 
     QtObject {
         id: onlyForwardSites
-        property string name: qsTr("Addresses from the list should always open via VPN")
+        property string name: qsTr("Only the addresses in the list must be opened via VPN")
         property int type: routeMode.onlyForwardSites
     }
     QtObject {
diff --git a/client/ui/qml/Pages2/PageSetupWizardEasy.qml b/client/ui/qml/Pages2/PageSetupWizardEasy.qml
index ac1c3a44..f2600f65 100644
--- a/client/ui/qml/Pages2/PageSetupWizardEasy.qml
+++ b/client/ui/qml/Pages2/PageSetupWizardEasy.qml
@@ -126,6 +126,8 @@ PageType {
                 }
             }
 
+            DividerType {}
+
             CardType {
                 implicitWidth: parent.width
 
@@ -143,14 +145,14 @@ PageType {
                 id: continueButton
 
                 implicitWidth: parent.width
-                anchors.bottomMargin: 24
+                anchors.topMargin: 24
 
                 text: qsTr("Continue")
 
                 onClicked: function() {
                     if (root.isEasySetup) {
                         ContainersModel.setCurrentlyProcessedContainerIndex(containers.dockerContainer)
-                        goToPage(PageEnum.PageSetupWizardInstalling);
+                        goToPage(PageEnum.PageSetupWizardInstalling)
                         InstallController.install(containers.dockerContainer,
                                                   containers.containerDefaultPort,
                                                   containers.containerDefaultTransportProto)
@@ -159,6 +161,26 @@ PageType {
                     }
                 }
             }
+
+            BasicButtonType {
+                implicitWidth: parent.width
+                anchors.topMargin: 8
+                anchors.bottomMargin: 24
+
+                defaultColor: "transparent"
+                hoveredColor: Qt.rgba(1, 1, 1, 0.08)
+                pressedColor: Qt.rgba(1, 1, 1, 0.12)
+                disabledColor: "#878B91"
+                textColor: "#D7D8DB"
+                borderWidth: 1
+
+                text: qsTr("Set up later")
+
+                onClicked: function() {
+                    goToPage(PageEnum.PageSetupWizardInstalling)
+                    InstallController.addEmptyServer()
+                }
+            }
         }
     }
 }
diff --git a/client/ui/qml/Pages2/PageSetupWizardProtocolSettings.qml b/client/ui/qml/Pages2/PageSetupWizardProtocolSettings.qml
index f5f07609..2f5ed569 100644
--- a/client/ui/qml/Pages2/PageSetupWizardProtocolSettings.qml
+++ b/client/ui/qml/Pages2/PageSetupWizardProtocolSettings.qml
@@ -73,7 +73,7 @@ PageType {
                             Layout.fillWidth: true
 
                             headerText: qsTr("Installing ") + name
-                            descriptionText: qsTr("protocol description")
+                            descriptionText: description
                         }
 
                         BasicButtonType {
@@ -159,7 +159,7 @@ PageType {
                                         font.weight: Font.Medium
                                         font.family: "PT Root UI VF"
 
-                                        text: qsTr("detailed protocol description")
+                                        text: detailedDescription
 
                                         wrapMode: Text.WordWrap
 

From 420c616e9d875890449f07731cc7d8e007c6374c Mon Sep 17 00:00:00 2001
From: "vladimir.kuznetsov" <nethiuswork@gmail.com>
Date: Sun, 20 Aug 2023 13:43:27 +0500
Subject: [PATCH 067/278] added authResultReceiver to android.cmake

---
 client/cmake/android.cmake | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/client/cmake/android.cmake b/client/cmake/android.cmake
index dd37e0a6..9440ad10 100644
--- a/client/cmake/android.cmake
+++ b/client/cmake/android.cmake
@@ -10,6 +10,7 @@ set(HEADERS ${HEADERS}
     ${CMAKE_CURRENT_SOURCE_DIR}/platforms/android/android_notificationhandler.h
     ${CMAKE_CURRENT_SOURCE_DIR}/platforms/android/androidutils.h
     ${CMAKE_CURRENT_SOURCE_DIR}/platforms/android/androidvpnactivity.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/platforms/android/authResultReceiver.h
     ${CMAKE_CURRENT_SOURCE_DIR}/protocols/android_vpnprotocol.h
 )
 
@@ -18,6 +19,7 @@ set(SOURCES ${SOURCES}
     ${CMAKE_CURRENT_SOURCE_DIR}/platforms/android/android_notificationhandler.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/platforms/android/androidutils.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/platforms/android/androidvpnactivity.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/platforms/android/authResultReceiver.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/protocols/android_vpnprotocol.cpp
 )
 

From f7926847ac9139bb23bf77a185c73d99cf1764c4 Mon Sep 17 00:00:00 2001
From: "vladimir.kuznetsov" <nethiuswork@gmail.com>
Date: Tue, 22 Aug 2023 14:37:29 +0500
Subject: [PATCH 068/278] minor ui fixes

---
 client/containers/containers_defs.cpp         | 10 ++++++++
 client/containers/containers_defs.h           |  2 ++
 client/ui/controllers/exportController.cpp    | 25 +++----------------
 client/ui/controllers/exportController.h      |  2 +-
 client/ui/models/containers_model.cpp         |  2 ++
 client/ui/models/containers_model.h           |  3 ++-
 .../qml/Components/ShareConnectionDrawer.qml  | 12 ++++++++-
 client/ui/qml/Pages2/PageSettingsAbout.qml    |  2 +-
 .../ui/qml/Pages2/PageSettingsConnection.qml  |  1 -
 .../ui/qml/Pages2/PageSetupWizardQrReader.qml |  4 ---
 client/ui/qml/Pages2/PageShare.qml            | 21 +++++++++++++---
 11 files changed, 50 insertions(+), 34 deletions(-)

diff --git a/client/containers/containers_defs.cpp b/client/containers/containers_defs.cpp
index fc4570f4..98b2d0da 100644
--- a/client/containers/containers_defs.cpp
+++ b/client/containers/containers_defs.cpp
@@ -249,3 +249,13 @@ QString ContainerProps::easySetupDescription(DockerContainer container)
     default: return "";
     }
 }
+
+bool ContainerProps::isShareable(DockerContainer container)
+{
+    switch (container) {
+    case DockerContainer::TorWebSite: return false;
+    case DockerContainer::Dns: return false;
+    case DockerContainer::Sftp: return false;
+    default: return true;
+    }
+}
diff --git a/client/containers/containers_defs.h b/client/containers/containers_defs.h
index a84d997c..24782407 100644
--- a/client/containers/containers_defs.h
+++ b/client/containers/containers_defs.h
@@ -64,6 +64,8 @@ namespace amnezia
         static bool isEasySetupContainer(amnezia::DockerContainer container);
         static QString easySetupHeader(amnezia::DockerContainer container);
         static QString easySetupDescription(amnezia::DockerContainer container);
+
+        static bool isShareable(amnezia::DockerContainer container);
     };
 
     static void declareQmlContainerEnum()
diff --git a/client/ui/controllers/exportController.cpp b/client/ui/controllers/exportController.cpp
index 8fbd69f1..abe9fda2 100644
--- a/client/ui/controllers/exportController.cpp
+++ b/client/ui/controllers/exportController.cpp
@@ -12,6 +12,7 @@
 #include "configurators/openvpn_configurator.h"
 #include "configurators/wireguard_configurator.h"
 #include "core/errorstrings.h"
+#include "utilities.h"
 #ifdef Q_OS_ANDROID
     #include "platforms/android/android_controller.h"
     #include "platforms/android/androidutils.h"
@@ -201,7 +202,7 @@ QList<QString> ExportController::getQrCodes()
     return m_qrCodes;
 }
 
-void ExportController::saveFile()
+void ExportController::saveFile(const QString &fileExtension, const QString &caption, const QString &fileName)
 {
 #if defined Q_OS_IOS
 //    ext.replace("*", "");
@@ -229,27 +230,7 @@ void ExportController::saveFile()
     return;
 #endif
 
-    QString fileExtension = ".vpn";
-    QString docDir = QStandardPaths::writableLocation(QStandardPaths::DocumentsLocation);
-    QUrl fileName;
-    fileName = QFileDialog::getSaveFileUrl(nullptr, tr("Save AmneziaVPN config"),
-                                           QUrl::fromLocalFile(docDir + "/" + "amnezia_config"), "*" + fileExtension);
-    if (fileName.isEmpty())
-        return;
-    if (!fileName.toString().endsWith(fileExtension)) {
-        fileName = QUrl(fileName.toString() + fileExtension);
-    }
-    if (fileName.isEmpty())
-        return;
-
-    QFile save(fileName.toLocalFile());
-
-    save.open(QIODevice::WriteOnly);
-    save.write(m_config.toUtf8());
-    save.close();
-
-    QFileInfo fi(fileName.toLocalFile());
-    QDesktopServices::openUrl(fi.absoluteDir().absolutePath());
+    Utils::saveFile(fileExtension, caption, fileName, m_config);
 }
 
 QList<QString> ExportController::generateQrCodeImageSeries(const QByteArray &data)
diff --git a/client/ui/controllers/exportController.h b/client/ui/controllers/exportController.h
index ce952096..913dfc3a 100644
--- a/client/ui/controllers/exportController.h
+++ b/client/ui/controllers/exportController.h
@@ -35,7 +35,7 @@ public slots:
     QString getConfig();
     QList<QString> getQrCodes();
 
-    void saveFile();
+    void saveFile(const QString &fileExtension, const QString &caption, const QString &fileName);
 
 signals:
     void generateConfig(int type);
diff --git a/client/ui/models/containers_model.cpp b/client/ui/models/containers_model.cpp
index 0a07895c..67847727 100644
--- a/client/ui/models/containers_model.cpp
+++ b/client/ui/models/containers_model.cpp
@@ -79,6 +79,7 @@ QVariant ContainersModel::data(const QModelIndex &index, int role) const
     case IsCurrentlyProcessedRole: return container == static_cast<DockerContainer>(m_currentlyProcessedContainerIndex);
     case IsDefaultRole: return container == m_defaultContainerIndex;
     case IsSupportedRole: return ContainerProps::isSupportedByCurrentPlatform(container);
+    case IsShareableRole: return ContainerProps::isShareable(container);
     }
 
     return QVariant();
@@ -235,5 +236,6 @@ QHash<int, QByteArray> ContainersModel::roleNames() const
     roles[IsCurrentlyProcessedRole] = "isCurrentlyProcessed";
     roles[IsDefaultRole] = "isDefault";
     roles[IsSupportedRole] = "isSupported";
+    roles[IsShareableRole] = "isShareable";
     return roles;
 }
diff --git a/client/ui/models/containers_model.h b/client/ui/models/containers_model.h
index cde77526..547eea83 100644
--- a/client/ui/models/containers_model.h
+++ b/client/ui/models/containers_model.h
@@ -30,7 +30,8 @@ public:
         IsInstalledRole,
         IsCurrentlyProcessedRole,
         IsDefaultRole,
-        IsSupportedRole
+        IsSupportedRole,
+        IsShareableRole
     };
 
     int rowCount(const QModelIndex &parent = QModelIndex()) const override;
diff --git a/client/ui/qml/Components/ShareConnectionDrawer.qml b/client/ui/qml/Components/ShareConnectionDrawer.qml
index 7ad724ea..368d503a 100644
--- a/client/ui/qml/Components/ShareConnectionDrawer.qml
+++ b/client/ui/qml/Components/ShareConnectionDrawer.qml
@@ -19,9 +19,19 @@ DrawerType {
     property alias configContentHeaderText: configContentHeader.headerText
     property alias contentVisible: content.visible
 
+    property string configExtension: ".vpn"
+    property string configCaption: qsTr("Save AmneziaVPN config")
+    property string configFileName: "amnezia_config.vpn"
+
     width: parent.width
     height: parent.height * 0.9
 
+    onClosed: {
+        configExtension = ".vpn"
+        configCaption = qsTr("Save AmneziaVPN config")
+        configFileName = "amnezia_config.vpn"
+    }
+
     Item {
         anchors.fill: parent
 
@@ -58,7 +68,7 @@ DrawerType {
                     imageSource: "qrc:/images/controls/share-2.svg"
 
                     onClicked: {
-                        ExportController.saveFile()
+                        ExportController.saveFile(configExtension, configCaption, configFileName)
                     }
                 }
 
diff --git a/client/ui/qml/Pages2/PageSettingsAbout.qml b/client/ui/qml/Pages2/PageSettingsAbout.qml
index 67dada43..1a6f7e80 100644
--- a/client/ui/qml/Pages2/PageSettingsAbout.qml
+++ b/client/ui/qml/Pages2/PageSettingsAbout.qml
@@ -161,7 +161,7 @@ And if you don't like the app, all the more support it - the donation will be us
                 leftImageSource: "qrc:/images/controls/amnezia.svg"
 
                 clickedFunction: function() {
-                    Qt.openUrlExternally(qsTr("amnezia.org/"))
+                    Qt.openUrlExternally(qsTr("https://amnezia.org"))
                 }
             }
 
diff --git a/client/ui/qml/Pages2/PageSettingsConnection.qml b/client/ui/qml/Pages2/PageSettingsConnection.qml
index 6465e40e..0765f7d2 100644
--- a/client/ui/qml/Pages2/PageSettingsConnection.qml
+++ b/client/ui/qml/Pages2/PageSettingsConnection.qml
@@ -67,7 +67,6 @@ PageType {
                 Layout.rightMargin: 16
 
                 text: qsTr("Use AmneziaDNS if installed on the server")
-                descriptionText: qsTr("Internal IP address 172.29.172.254")
 
                 checked: SettingsController.isAmneziaDnsEnabled()
                 onCheckedChanged: {
diff --git a/client/ui/qml/Pages2/PageSetupWizardQrReader.qml b/client/ui/qml/Pages2/PageSetupWizardQrReader.qml
index 695175fd..1fa71592 100644
--- a/client/ui/qml/Pages2/PageSetupWizardQrReader.qml
+++ b/client/ui/qml/Pages2/PageSetupWizardQrReader.qml
@@ -73,10 +73,6 @@ PageType {
            }
 
            Component.onCompleted: {
-               console.log(qrCodeRectange.x)
-               console.log(qrCodeRectange.y)
-               console.log(qrCodeRectange.width)
-
                qrCodeReader.setCameraSize(Qt.rect(qrCodeRectange.x,
                                                   qrCodeRectange.y,
                                                   qrCodeRectange.width,
diff --git a/client/ui/qml/Pages2/PageShare.qml b/client/ui/qml/Pages2/PageShare.qml
index 28f5ca06..120e04fc 100644
--- a/client/ui/qml/Pages2/PageShare.qml
+++ b/client/ui/qml/Pages2/PageShare.qml
@@ -41,8 +41,20 @@ PageType {
                 }
                 break;
             }
-            case PageShare.ConfigType.OpenVpn: ExportController.generateOpenVpnConfig(); break;
-            case PageShare.ConfigType.WireGuard: ExportController.generateWireGuardConfig(); break;
+            case PageShare.ConfigType.OpenVpn: {
+                ExportController.generateOpenVpnConfig();
+                shareConnectionDrawer.configCaption = qsTr("Save OpenVPN config")
+                shareConnectionDrawer.configExtension = ".ovpn"
+                shareConnectionDrawer.configFileName = "amnezia_for_openvpn"
+                break;
+            }
+            case PageShare.ConfigType.WireGuard: {
+                ExportController.generateWireGuardConfig();
+                shareConnectionDrawer.configCaption = qsTr("Save WireGuard config")
+                shareConnectionDrawer.configExtension = ".conf"
+                shareConnectionDrawer.configFileName = "amnezia_for_wireguard"
+                break;
+            }
             }
 
             PageController.showBusyIndicator(false)
@@ -267,6 +279,10 @@ PageType {
                                         ValueFilter {
                                             roleName: "isInstalled"
                                             value: true
+                                        },
+                                        ValueFilter {
+                                            roleName: "isShareable"
+                                            value: true
                                         }
                                     ]
                                 }
@@ -339,7 +355,6 @@ PageType {
 
                 listView: ListViewWithRadioButtonType {
                     onCurrentIndexChanged: {
-                        console.log(currentIndex)
                         exportTypeSelector.currentIndex = currentIndex
                         exportTypeSelector.text = selectedText
                     }

From 23ad006187b1bf6f3e073f6ae0e3f1f022f9af0c Mon Sep 17 00:00:00 2001
From: "vladimir.kuznetsov" <nethiuswork@gmail.com>
Date: Wed, 23 Aug 2023 00:20:59 +0500
Subject: [PATCH 069/278] removed Widgets from service part

---
 client/amnezia_application.cpp               |  10 --
 client/fileUtilites.cpp                      |  47 ++++++
 client/fileUtilites.h                        |  19 +++
 client/ui/controllers/exportController.cpp   |   5 +-
 client/ui/controllers/importController.cpp   |   8 +-
 client/ui/controllers/installController.cpp  |   1 +
 client/ui/controllers/settingsController.cpp |  10 +-
 client/ui/controllers/sitesController.cpp    |   9 +-
 client/utilities.cpp                         | 154 +++++++------------
 client/utilities.h                           |  73 +++++----
 service/server/CMakeLists.txt                |   4 +-
 11 files changed, 178 insertions(+), 162 deletions(-)
 create mode 100644 client/fileUtilites.cpp
 create mode 100644 client/fileUtilites.h

diff --git a/client/amnezia_application.cpp b/client/amnezia_application.cpp
index d6d346ab..ba4499a1 100644
--- a/client/amnezia_application.cpp
+++ b/client/amnezia_application.cpp
@@ -10,7 +10,6 @@
 #include <QTimer>
 #include <QTranslator>
 
-#include "core/servercontroller.h"
 #include "logger.h"
 #include "version.h"
 
@@ -20,7 +19,6 @@
 #endif
 
 #include "protocols/qml_register_protocols.h"
-#include "ui/pages.h"
 
 #if defined(Q_OS_IOS)
     #include "platforms/ios/QtAppDelegate-C-Interface.h"
@@ -81,8 +79,6 @@ void AmneziaApplication::init()
 
     m_engine->rootContext()->setContextProperty("Debug", &Logger::Instance());
 
-    //
-
     m_configurator = std::shared_ptr<VpnConfigurator>(new VpnConfigurator(m_settings, this));
     m_vpnConnection.reset(new VpnConnection(m_settings, m_configurator));
     m_vpnConnection->moveToThread(&m_vpnConnectionThread);
@@ -125,14 +121,8 @@ void AmneziaApplication::init()
     connect(m_notificationHandler.get(), &NotificationHandler::disconnectRequested, m_connectionController.get(),
             &ConnectionController::closeConnection);
 
-    //
-
     m_engine->load(url);
 
-    //    if (m_engine->rootObjects().size() > 0) {
-    //        m_uiLogic->setQmlRoot(m_engine->rootObjects().at(0));
-    //    }
-
     if (m_settings->isSaveLogs()) {
         if (!Logger::init()) {
             qWarning() << "Initialization of debug subsystem failed";
diff --git a/client/fileUtilites.cpp b/client/fileUtilites.cpp
new file mode 100644
index 00000000..87fa7aed
--- /dev/null
+++ b/client/fileUtilites.cpp
@@ -0,0 +1,47 @@
+#include "fileUtilites.h"
+
+#include <QDesktopServices>
+#include <QStandardPaths>
+
+void FileUtilites::saveFile(const QString &fileExtension, const QString &caption, const QString &fileName,
+                            const QString &data)
+{
+    QString docDir = QStandardPaths::writableLocation(QStandardPaths::DocumentsLocation);
+    QUrl fileUrl = QFileDialog::getSaveFileUrl(nullptr, caption, QUrl::fromLocalFile(docDir + "/" + fileName),
+                                               "*" + fileExtension);
+    if (fileUrl.isEmpty())
+        return;
+    if (!fileUrl.toString().endsWith(fileExtension)) {
+        fileUrl = QUrl(fileUrl.toString() + fileExtension);
+    }
+    if (fileUrl.isEmpty())
+        return;
+
+    QFile save(fileUrl.toLocalFile());
+
+    // todo check if save successful
+    save.open(QIODevice::WriteOnly);
+    save.write(data.toUtf8());
+    save.close();
+
+    QFileInfo fi(fileUrl.toLocalFile());
+    QDesktopServices::openUrl(fi.absoluteDir().absolutePath());
+}
+
+QString FileUtilites::getFileName(QWidget *parent, const QString &caption, const QString &dir, const QString &filter,
+                                  QString *selectedFilter, QFileDialog::Options options)
+{
+    QString fileName = QFileDialog::getOpenFileName(parent, caption, dir, filter, selectedFilter, options);
+
+#ifdef Q_OS_ANDROID
+    // patch for files containing spaces etc
+    const QString sep { "raw%3A%2F" };
+    if (fileName.startsWith("content://") && fileName.contains(sep)) {
+        QString contentUrl = fileName.split(sep).at(0);
+        QString rawUrl = fileName.split(sep).at(1);
+        rawUrl.replace(" ", "%20");
+        fileName = contentUrl + sep + rawUrl;
+    }
+#endif
+    return fileName;
+}
diff --git a/client/fileUtilites.h b/client/fileUtilites.h
new file mode 100644
index 00000000..8cf4807c
--- /dev/null
+++ b/client/fileUtilites.h
@@ -0,0 +1,19 @@
+#ifndef FILEUTILITES_H
+#define FILEUTILITES_H
+
+#include <QFileDialog>
+
+class FileUtilites : public QObject
+{
+    Q_OBJECT
+
+public:
+    static void saveFile(const QString &fileExtension, const QString &caption, const QString &fileName,
+                         const QString &data);
+
+    static QString getFileName(QWidget *parent = nullptr, const QString &caption = QString(),
+                               const QString &dir = QString(), const QString &filter = QString(),
+                               QString *selectedFilter = nullptr, QFileDialog::Options options = QFileDialog::Options());
+};
+
+#endif // FILEUTILITES_H
diff --git a/client/ui/controllers/exportController.cpp b/client/ui/controllers/exportController.cpp
index abe9fda2..4cee1dc9 100644
--- a/client/ui/controllers/exportController.cpp
+++ b/client/ui/controllers/exportController.cpp
@@ -4,7 +4,6 @@
 #include <QDataStream>
 #include <QDesktopServices>
 #include <QFile>
-#include <QFileDialog>
 #include <QFileInfo>
 #include <QImage>
 #include <QStandardPaths>
@@ -12,7 +11,7 @@
 #include "configurators/openvpn_configurator.h"
 #include "configurators/wireguard_configurator.h"
 #include "core/errorstrings.h"
-#include "utilities.h"
+#include "fileUtilites.h"
 #ifdef Q_OS_ANDROID
     #include "platforms/android/android_controller.h"
     #include "platforms/android/androidutils.h"
@@ -230,7 +229,7 @@ void ExportController::saveFile(const QString &fileExtension, const QString &cap
     return;
 #endif
 
-    Utils::saveFile(fileExtension, caption, fileName, m_config);
+    FileUtilites::saveFile(fileExtension, caption, fileName, m_config);
 }
 
 QList<QString> ExportController::generateQrCodeImageSeries(const QByteArray &data)
diff --git a/client/ui/controllers/importController.cpp b/client/ui/controllers/importController.cpp
index 4ff972cc..b5d10abf 100644
--- a/client/ui/controllers/importController.cpp
+++ b/client/ui/controllers/importController.cpp
@@ -10,7 +10,7 @@
     #include "../../platforms/android/androidutils.h"
     #include <QJniObject>
 #endif
-#include "utilities.h"
+#include "fileUtilites.h"
 
 namespace
 {
@@ -84,9 +84,9 @@ ImportController::ImportController(const QSharedPointer<ServersModel> &serversMo
 
 void ImportController::extractConfigFromFile()
 {
-    QString fileName = Utils::getFileName(Q_NULLPTR, tr("Open config file"),
-                                          QStandardPaths::writableLocation(QStandardPaths::DocumentsLocation),
-                                          "*.vpn *.ovpn *.conf");
+    QString fileName = FileUtilites::getFileName(Q_NULLPTR, tr("Open config file"),
+                                                 QStandardPaths::writableLocation(QStandardPaths::DocumentsLocation),
+                                                 "*.vpn *.ovpn *.conf");
     QFile file(fileName);
     if (file.open(QIODevice::ReadOnly)) {
         QString data = file.readAll();
diff --git a/client/ui/controllers/installController.cpp b/client/ui/controllers/installController.cpp
index 18588aef..7d6ba590 100644
--- a/client/ui/controllers/installController.cpp
+++ b/client/ui/controllers/installController.cpp
@@ -7,6 +7,7 @@
 
 #include "core/errorstrings.h"
 #include "core/servercontroller.h"
+#include "fileUtilites.h"
 #include "utilities.h"
 
 namespace
diff --git a/client/ui/controllers/settingsController.cpp b/client/ui/controllers/settingsController.cpp
index 531de14d..b56e48ad 100644
--- a/client/ui/controllers/settingsController.cpp
+++ b/client/ui/controllers/settingsController.cpp
@@ -2,8 +2,8 @@
 
 #include <QStandardPaths>
 
+#include "fileUtilites.h"
 #include "logger.h"
-#include "utilities.h"
 #include "version.h"
 
 SettingsController::SettingsController(const QSharedPointer<ServersModel> &serversModel,
@@ -69,7 +69,7 @@ void SettingsController::openLogsFolder()
 
 void SettingsController::exportLogsFile()
 {
-    Utils::saveFile(".log", tr("Save log"), "AmneziaVPN", Logger::getLogFile());
+    FileUtilites::saveFile(".log", tr("Save log"), "AmneziaVPN", Logger::getLogFile());
 }
 
 void SettingsController::clearLogs()
@@ -80,14 +80,14 @@ void SettingsController::clearLogs()
 
 void SettingsController::backupAppConfig()
 {
-    Utils::saveFile(".backup", tr("Backup application config"), "AmneziaVPN", m_settings->backupAppConfig());
+    FileUtilites::saveFile(".backup", tr("Backup application config"), "AmneziaVPN", m_settings->backupAppConfig());
 }
 
 void SettingsController::restoreAppConfig()
 {
     QString fileName =
-            Utils::getFileName(Q_NULLPTR, tr("Open backup"),
-                               QStandardPaths::writableLocation(QStandardPaths::DocumentsLocation), "*.backup");
+            FileUtilites::getFileName(Q_NULLPTR, tr("Open backup"),
+                                      QStandardPaths::writableLocation(QStandardPaths::DocumentsLocation), "*.backup");
 
     if (fileName.isEmpty()) {
         return;
diff --git a/client/ui/controllers/sitesController.cpp b/client/ui/controllers/sitesController.cpp
index d8bc99c8..d19f5758 100644
--- a/client/ui/controllers/sitesController.cpp
+++ b/client/ui/controllers/sitesController.cpp
@@ -3,7 +3,7 @@
 #include <QHostInfo>
 #include <QStandardPaths>
 
-#include "utilities.h"
+#include "fileUtilites.h"
 
 SitesController::SitesController(const std::shared_ptr<Settings> &settings,
                                  const QSharedPointer<VpnConnection> &vpnConnection,
@@ -80,8 +80,9 @@ void SitesController::removeSite(int index)
 
 void SitesController::importSites(bool replaceExisting)
 {
-    QString fileName = Utils::getFileName(Q_NULLPTR, tr("Open sites file"),
-                                          QStandardPaths::writableLocation(QStandardPaths::DocumentsLocation), "*.json");
+    QString fileName =
+            FileUtilites::getFileName(Q_NULLPTR, tr("Open sites file"),
+                                      QStandardPaths::writableLocation(QStandardPaths::DocumentsLocation), "*.json");
 
     if (fileName.isEmpty()) {
         return;
@@ -149,7 +150,7 @@ void SitesController::exportSites()
     QJsonDocument jsonDocument(jsonArray);
     QByteArray jsonData = jsonDocument.toJson();
 
-    Utils::saveFile(".json", tr("Export sites file"), "sites", jsonData);
+    FileUtilites::saveFile(".json", tr("Export sites file"), "sites", jsonData);
 
     emit finished(tr("Export completed"));
 }
diff --git a/client/utilities.cpp b/client/utilities.cpp
index f984e9a8..158bce93 100644
--- a/client/utilities.cpp
+++ b/client/utilities.cpp
@@ -1,6 +1,5 @@
 #include <QCoreApplication>
 #include <QDebug>
-#include <QDesktopServices>
 #include <QDir>
 #include <QHostAddress>
 #include <QHostInfo>
@@ -10,15 +9,15 @@
 #include <QStandardPaths>
 #include <QUrl>
 
-#include "version.h"
 #include "utilities.h"
+#include "version.h"
 
 QString Utils::getRandomString(int len)
 {
     const QString possibleCharacters("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789");
 
     QString randomString;
-    for(int i=0; i<len; ++i) {
+    for (int i = 0; i < len; ++i) {
         quint32 index = QRandomGenerator::global()->generate() % possibleCharacters.length();
         QChar nextChar = possibleCharacters.at(index);
         randomString.append(nextChar);
@@ -31,7 +30,7 @@ QString Utils::systemLogPath()
 #ifdef Q_OS_WIN
     QStringList locationList = QStandardPaths::standardLocations(QStandardPaths::GenericDataLocation);
     QString primaryLocation = "ProgramData";
-    foreach (const QString& location, locationList) {
+    foreach (const QString &location, locationList) {
         if (location.contains(primaryLocation)) {
             return QString("%1/%2/log").arg(location).arg(APPLICATION_NAME);
         }
@@ -42,7 +41,7 @@ QString Utils::systemLogPath()
 #endif
 }
 
-bool Utils::initializePath(const QString& path)
+bool Utils::initializePath(const QString &path)
 {
     QDir dir;
     if (!dir.mkpath(path)) {
@@ -52,13 +51,13 @@ bool Utils::initializePath(const QString& path)
     return true;
 }
 
-bool Utils::createEmptyFile(const QString& path)
+bool Utils::createEmptyFile(const QString &path)
 {
     QFile f(path);
     return f.open(QIODevice::WriteOnly | QIODevice::Truncate);
 }
 
-QString Utils::executable(const QString& baseName, bool absPath)
+QString Utils::executable(const QString &baseName, bool absPath)
 {
     QString ext;
 #ifdef Q_OS_WIN
@@ -71,7 +70,7 @@ QString Utils::executable(const QString& baseName, bool absPath)
     return QCoreApplication::applicationDirPath() + "/" + fileName;
 }
 
-QString Utils::usrExecutable(const QString& baseName)
+QString Utils::usrExecutable(const QString &baseName)
 {
     if (QFileInfo::exists("/usr/sbin/" + baseName))
         return ("/usr/sbin/" + baseName);
@@ -79,18 +78,22 @@ QString Utils::usrExecutable(const QString& baseName)
         return ("/usr/bin/" + baseName);
 }
 
-bool Utils::processIsRunning(const QString& fileName)
+bool Utils::processIsRunning(const QString &fileName)
 {
 #ifdef Q_OS_WIN
     QProcess process;
     process.setReadChannel(QProcess::StandardOutput);
     process.setProcessChannelMode(QProcess::MergedChannels);
-    process.start("wmic.exe", QStringList() << "/OUTPUT:STDOUT" << "PROCESS" << "get" << "Caption");
+    process.start("wmic.exe",
+                  QStringList() << "/OUTPUT:STDOUT"
+                                << "PROCESS"
+                                << "get"
+                                << "Caption");
     process.waitForStarted();
     process.waitForFinished();
     QString processData(process.readAll());
-    QStringList processList = processData.split(QRegularExpression("[\r\n]"),Qt::SkipEmptyParts);
-    foreach (const QString& rawLine, processList) {
+    QStringList processList = processData.split(QRegularExpression("[\r\n]"), Qt::SkipEmptyParts);
+    foreach (const QString &rawLine, processList) {
         const QString line = rawLine.simplified();
         if (line.isEmpty()) {
             continue;
@@ -99,7 +102,6 @@ bool Utils::processIsRunning(const QString& fileName)
         if (line == fileName) {
             return true;
         }
-
     }
     return false;
 #elif defined(Q_OS_IOS)
@@ -107,7 +109,7 @@ bool Utils::processIsRunning(const QString& fileName)
 #else
     QProcess process;
     process.setProcessChannelMode(QProcess::MergedChannels);
-    process.start("pgrep", QStringList({fileName}));
+    process.start("pgrep", QStringList({ fileName }));
     process.waitForFinished();
     if (process.exitStatus() == QProcess::NormalExit) {
         return (process.readAll().toUInt() > 0);
@@ -116,7 +118,7 @@ bool Utils::processIsRunning(const QString& fileName)
 #endif
 }
 
-QString Utils::getIPAddress(const QString& host)
+QString Utils::getIPAddress(const QString &host)
 {
     if (ipAddressRegExp().match(host).hasMatch()) {
         return host;
@@ -130,42 +132,48 @@ QString Utils::getIPAddress(const QString& host)
     return "";
 }
 
-QString Utils::getStringBetween(const QString& s, const QString& a, const QString& b)
+QString Utils::getStringBetween(const QString &s, const QString &a, const QString &b)
 {
     int ap = s.indexOf(a), bp = s.indexOf(b, ap + a.length());
-    if(ap < 0 || bp < 0)
+    if (ap < 0 || bp < 0)
         return QString();
     ap += a.length();
-    if(bp - ap <= 0)
+    if (bp - ap <= 0)
         return QString();
     return s.mid(ap, bp - ap).trimmed();
 }
 
-bool Utils::checkIPv4Format(const QString& ip)
+bool Utils::checkIPv4Format(const QString &ip)
 {
-    if (ip.isEmpty()) return false;
+    if (ip.isEmpty())
+        return false;
     int count = ip.count(".");
-    if(count != 3) return false;
+    if (count != 3)
+        return false;
 
     QHostAddress addr(ip);
-    return  (addr.protocol() == QAbstractSocket::NetworkLayerProtocol::IPv4Protocol);
+    return (addr.protocol() == QAbstractSocket::NetworkLayerProtocol::IPv4Protocol);
 }
 
 bool Utils::checkIpSubnetFormat(const QString &ip)
 {
-    if (!ip.contains("/")) return checkIPv4Format(ip);
+    if (!ip.contains("/"))
+        return checkIPv4Format(ip);
 
     QStringList parts = ip.split("/");
-    if (parts.size() != 2) return false;
+    if (parts.size() != 2)
+        return false;
 
     bool ok;
     int subnet = parts.at(1).toInt(&ok);
-    if (subnet >= 0 && subnet <= 32 && ok) return checkIPv4Format(parts.at(0));
-    else return false;
+    if (subnet >= 0 && subnet <= 32 && ok)
+        return checkIPv4Format(parts.at(0));
+    else
+        return false;
 }
 
 void Utils::killProcessByName(const QString &name)
-{           
+{
     qDebug().noquote() << "Kill process" << name;
 #ifdef Q_OS_WIN
     QProcess::execute("taskkill", QStringList() << "/IM" << name << "/F");
@@ -178,40 +186,39 @@ void Utils::killProcessByName(const QString &name)
 
 QString Utils::netMaskFromIpWithSubnet(const QString ip)
 {
-    if (!ip.contains("/")) return "255.255.255.255";
+    if (!ip.contains("/"))
+        return "255.255.255.255";
 
     bool ok;
     int prefix = ip.split("/").at(1).toInt(&ok);
-    if (!ok) return "255.255.255.255";
+    if (!ok)
+        return "255.255.255.255";
 
     unsigned long mask = (0xFFFFFFFF << (32 - prefix)) & 0xFFFFFFFF;
 
-    return QString("%1.%2.%3.%4")
-            .arg(mask >> 24)
-            .arg((mask >> 16) & 0xFF)
-            .arg((mask >> 8) & 0xFF)
-            .arg( mask & 0xFF);
+    return QString("%1.%2.%3.%4").arg(mask >> 24).arg((mask >> 16) & 0xFF).arg((mask >> 8) & 0xFF).arg(mask & 0xFF);
 }
 
 QString Utils::ipAddressFromIpWithSubnet(const QString ip)
 {
-    if (ip.count(".") != 3) return "";
+    if (ip.count(".") != 3)
+        return "";
     return ip.split("/").first();
 }
 
 QStringList Utils::summarizeRoutes(const QStringList &ips, const QString cidr)
 {
-//    QMap<int, int>
-//    QHostAddress
+    //    QMap<int, int>
+    //    QHostAddress
 
-//    QMap<QString, QStringList> subnets; // <"a.b", <list subnets>>
+    //    QMap<QString, QStringList> subnets; // <"a.b", <list subnets>>
 
-//    for (const QString &ip : ips) {
-//        if (ip.count(".") != 3) continue;
+    //    for (const QString &ip : ips) {
+    //        if (ip.count(".") != 3) continue;
 
-//        const QStringList &parts = ip.split(".");
-//        subnets[parts.at(0) + "." + parts.at(1)].append(ip);
-//    }
+    //        const QStringList &parts = ip.split(".");
+    //        subnets[parts.at(0) + "." + parts.at(1)].append(ip);
+    //    }
 
     return QStringList();
 }
@@ -252,58 +259,6 @@ QString Utils::certUtilPath()
 #endif
 }
 
-void Utils::saveFile(const QString &fileExtension,
-                     const QString &caption,
-                     const QString &fileName,
-                     const QString &data)
-{
-    QString docDir = QStandardPaths::writableLocation(QStandardPaths::DocumentsLocation);
-    QUrl fileUrl = QFileDialog::getSaveFileUrl(nullptr,
-                                               caption,
-                                               QUrl::fromLocalFile(docDir + "/" + fileName),
-                                               "*" + fileExtension);
-    if (fileUrl.isEmpty())
-        return;
-    if (!fileUrl.toString().endsWith(fileExtension)) {
-        fileUrl = QUrl(fileUrl.toString() + fileExtension);
-    }
-    if (fileUrl.isEmpty())
-        return;
-
-    QFile save(fileUrl.toLocalFile());
-
-    //todo check if save successful
-    save.open(QIODevice::WriteOnly);
-    save.write(data.toUtf8());
-    save.close();
-
-    QFileInfo fi(fileUrl.toLocalFile());
-    QDesktopServices::openUrl(fi.absoluteDir().absolutePath());
-}
-
-QString Utils::getFileName(QWidget *parent,
-                           const QString &caption,
-                           const QString &dir,
-                           const QString &filter,
-                           QString *selectedFilter,
-                           QFileDialog::Options options)
-{
-    QString fileName
-        = QFileDialog::getOpenFileName(parent, caption, dir, filter, selectedFilter, options);
-
-#ifdef Q_OS_ANDROID
-    // patch for files containing spaces etc
-    const QString sep{"raw%3A%2F"};
-    if (fileName.startsWith("content://") && fileName.contains(sep)) {
-        QString contentUrl = fileName.split(sep).at(0);
-        QString rawUrl = fileName.split(sep).at(1);
-        rawUrl.replace(" ", "%20");
-        fileName = contentUrl + sep + rawUrl;
-    }
-#endif
-    return fileName;
-}
-
 #ifdef Q_OS_WIN
 // Inspired from http://stackoverflow.com/a/15281070/1529139
 // and http://stackoverflow.com/q/40059902/1529139
@@ -315,8 +270,7 @@ bool Utils::signalCtrl(DWORD dwProcessId, DWORD dwCtrlEvent)
     // (otherwise AttachConsole will return ERROR_ACCESS_DENIED)
     bool consoleDetached = (FreeConsole() != FALSE);
 
-    if (AttachConsole(dwProcessId) != FALSE)
-    {
+    if (AttachConsole(dwProcessId) != FALSE) {
         // Add a fake Ctrl-C handler for avoid instant kill is this console
         // WARNING: do not revert it or current program will be also killed
         SetConsoleCtrlHandler(nullptr, true);
@@ -324,11 +278,9 @@ bool Utils::signalCtrl(DWORD dwProcessId, DWORD dwCtrlEvent)
         FreeConsole();
     }
 
-    if (consoleDetached)
-    {
+    if (consoleDetached) {
         // Create a new console if previous was deleted by OS
-        if (AttachConsole(thisConsoleId) == FALSE)
-        {
+        if (AttachConsole(thisConsoleId) == FALSE) {
             int errorCode = GetLastError();
             if (errorCode == 31) // 31=ERROR_GEN_FAILURE
             {
diff --git a/client/utilities.h b/client/utilities.h
index 191fa5c1..7ef0cd3f 100644
--- a/client/utilities.h
+++ b/client/utilities.h
@@ -1,45 +1,64 @@
 #ifndef UTILITIES_H
 #define UTILITIES_H
 
-#include <QFileDialog>
 #include <QRegExp>
 #include <QRegularExpression>
 #include <QString>
 
 #ifdef Q_OS_WIN
-#include "Windows.h"
+    #include "Windows.h"
 #endif
 
-class Utils : public QObject {
+class Utils : public QObject
+{
     Q_OBJECT
 
 public:
     static QString getRandomString(int len);
 
-    static QString executable(const QString& baseName, bool absPath);
-    static QString usrExecutable(const QString& baseName);
+    static QString executable(const QString &baseName, bool absPath);
+    static QString usrExecutable(const QString &baseName);
     static QString systemLogPath();
-    static bool createEmptyFile(const QString& path);
-    static bool initializePath(const QString& path);
+    static bool createEmptyFile(const QString &path);
+    static bool initializePath(const QString &path);
 
-    static QString getIPAddress(const QString& host);
-    static QString getStringBetween(const QString& s, const QString& a, const QString& b);
-    static bool checkIPv4Format(const QString& ip);
-    static bool checkIpSubnetFormat(const QString& ip);
-    static QRegularExpression ipAddressRegExp() { return QRegularExpression("^((25[0-5]|(2[0-4]|1[0-9]|[1-9]|)[0-9])(\\.(?!$)|$)){4}$"); }
-    static QRegularExpression ipAddressPortRegExp() { return QRegularExpression("^(?:(?:25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9][0-9]|[0-9])\\.){3}"
-        "(?:25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9][0-9]|[0-9])(\\:[0-9]{1,5}){0,1}$"); }
+    static QString getIPAddress(const QString &host);
+    static QString getStringBetween(const QString &s, const QString &a, const QString &b);
+    static bool checkIPv4Format(const QString &ip);
+    static bool checkIpSubnetFormat(const QString &ip);
+    static QRegularExpression ipAddressRegExp()
+    {
+        return QRegularExpression("^((25[0-5]|(2[0-4]|1[0-9]|[1-9]|)[0-9])(\\.(?!$)|$)){4}$");
+    }
+    static QRegularExpression ipAddressPortRegExp()
+    {
+        return QRegularExpression("^(?:(?:25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9][0-9]|[0-9])\\.){3}"
+                                  "(?:25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9][0-9]|[0-9])(\\:[0-9]{1,5}){0,1}$");
+    }
 
-    static QRegExp ipAddressWithSubnetRegExp() { return QRegExp("(?:(?:25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9][0-9]|[0-9])\\.){3}"
-        "(?:25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9][0-9]|[0-9])(\\/[0-9]{1,2}){0,1}"); }
+    static QRegExp ipAddressWithSubnetRegExp()
+    {
+        return QRegExp("(?:(?:25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9][0-9]|[0-9])\\.){3}"
+                       "(?:25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9][0-9]|[0-9])(\\/[0-9]{1,2}){0,1}");
+    }
 
-    static QRegExp ipNetwork24RegExp() { return QRegExp("^(?:(?:25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9][0-9]|[0-9])\\.){3}"
-        "0$"); }
+    static QRegExp ipNetwork24RegExp()
+    {
+        return QRegExp("^(?:(?:25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9][0-9]|[0-9])\\.){3}"
+                       "0$");
+    }
 
-    static QRegExp ipPortRegExp() { return QRegExp("^()([1-9]|[1-5]?[0-9]{2,4}|6[1-4][0-9]{3}|65[1-4][0-9]{2}|655[1-2][0-9]|6553[1-5])$"); }
+    static QRegExp ipPortRegExp()
+    {
+        return QRegExp("^()([1-9]|[1-5]?[0-9]{2,4}|6[1-4][0-9]{3}|65[1-4][0-9]{2}|655[1-2][0-9]|6553[1-5])$");
+    }
 
-    static QRegExp domainRegExp() { return QRegExp("(((?!\\-))(xn\\-\\-)?[a-z0-9\\-_]{0,61}[a-z0-9]{1,1}\\.)*(xn\\-\\-)?([a-z0-9\\-]{1,61}|[a-z0-9\\-]{1,30})\\.[a-z]{2,}"); }
-    static bool processIsRunning(const QString& fileName);
+    static QRegExp domainRegExp()
+    {
+        return QRegExp("(((?!\\-))(xn\\-\\-)?[a-z0-9\\-_]{0,61}[a-z0-9]{1,1}\\.)*(xn\\-\\-)?([a-z0-9\\-]{1,61}|[a-z0-"
+                       "9\\-]{1,30})\\.[a-z]{2,}");
+    }
+    static bool processIsRunning(const QString &fileName);
     static void killProcessByName(const QString &name);
 
     static QString netMaskFromIpWithSubnet(const QString ip);
@@ -51,18 +70,6 @@ public:
     static QString wireguardExecPath();
     static QString certUtilPath();
 
-    static void saveFile(const QString &fileExtension,
-                         const QString &caption,
-                         const QString &fileName,
-                         const QString &data);
-
-    static QString getFileName(QWidget *parent = nullptr,
-                               const QString &caption = QString(),
-                               const QString &dir = QString(),
-                               const QString &filter = QString(),
-                               QString *selectedFilter = nullptr,
-                               QFileDialog::Options options = QFileDialog::Options());
-
 #ifdef Q_OS_WIN
     static bool signalCtrl(DWORD dwProcessId, DWORD dwCtrlEvent);
 #endif
diff --git a/service/server/CMakeLists.txt b/service/server/CMakeLists.txt
index 9046f687..5d421763 100644
--- a/service/server/CMakeLists.txt
+++ b/service/server/CMakeLists.txt
@@ -6,7 +6,7 @@ project(${PROJECT})
 set(CMAKE_CXX_STANDARD 20)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
-find_package(Qt6 REQUIRED COMPONENTS Core Network RemoteObjects Core5Compat Widgets)
+find_package(Qt6 REQUIRED COMPONENTS Core Network RemoteObjects Core5Compat)
 qt_standard_project_setup()
 
 configure_file(${CMAKE_SOURCE_DIR}/version.h.in ${CMAKE_CURRENT_BINARY_DIR}/version.h)
@@ -188,7 +188,7 @@ include_directories(
 )
 
 add_executable(${PROJECT} ${SOURCES} ${HEADERS})
-target_link_libraries(${PROJECT} PRIVATE Qt6::Core Qt6::Network Qt6::RemoteObjects Qt6::Core5Compat Qt6::Widgets ${LIBS})
+target_link_libraries(${PROJECT} PRIVATE Qt6::Core Qt6::Network Qt6::RemoteObjects Qt6::Core5Compat ${LIBS})
 target_compile_definitions(${PROJECT} PRIVATE "MZ_$<UPPER_CASE:${MZ_PLATFORM_NAME}>")
 
 if(CMAKE_BUILD_TYPE STREQUAL "Debug")

From 4c79905f5bd56f21b0e9778f5599e9a8504cd56f Mon Sep 17 00:00:00 2001
From: "vladimir.kuznetsov" <nethiuswork@gmail.com>
Date: Thu, 24 Aug 2023 14:53:52 +0500
Subject: [PATCH 070/278] added autostart and start minimized options - added
 disabling split tunneling when selecting the wireguard protocol - if for
 macos the application is minimized to tray, then now it is not displayed in
 the dock

---
 client/amnezia_application.cpp                | 26 +++++--
 client/ui/controllers/pageController.cpp      | 24 +++++-
 client/ui/controllers/pageController.h        |  7 +-
 client/ui/controllers/settingsController.cpp  | 21 ++++++
 client/ui/controllers/settingsController.h    |  6 ++
 client/ui/macos_util.mm                       | 74 +++++++++++++------
 .../ui/qml/Pages2/PageSettingsApplication.qml | 43 ++++++++++-
 .../ui/qml/Pages2/PageSettingsConnection.qml  | 16 ++--
 8 files changed, 173 insertions(+), 44 deletions(-)

diff --git a/client/amnezia_application.cpp b/client/amnezia_application.cpp
index ba4499a1..9ecc5df4 100644
--- a/client/amnezia_application.cpp
+++ b/client/amnezia_application.cpp
@@ -129,14 +129,16 @@ void AmneziaApplication::init()
         }
     }
 
-    // #ifdef Q_OS_WIN
-    //     if (m_parser.isSet("a")) m_uiLogic->showOnStartup();
-    //     else emit m_uiLogic->show();
-    // #else
-    //     m_uiLogic->showOnStartup();
-    // #endif
+#ifdef Q_OS_WIN
+    if (m_parser.isSet("a"))
+        m_pageController->showOnStartup();
+    else
+        emit m_pageController->raiseMainWindow();
+#else
+    m_pageController->showOnStartup();
+#endif
 
-    // TODO - fix
+        // TODO - fix
 #if !defined(Q_OS_ANDROID) && !defined(Q_OS_IOS)
     if (isPrimary()) {
         QObject::connect(this, &SingleApplication::instanceStarted, m_pageController.get(), [this]() {
@@ -276,6 +278,14 @@ void AmneziaApplication::initModels()
 
     m_sitesModel.reset(new SitesModel(m_settings, this));
     m_engine->rootContext()->setContextProperty("SitesModel", m_sitesModel.get());
+    connect(m_containersModel.get(), &ContainersModel::defaultContainerChanged, this, [this]() {
+        if (m_containersModel->getDefaultContainer() == DockerContainer::WireGuard
+            && m_sitesModel->getRouteMode() != Settings::RouteMode::VpnAllSites) {
+            m_sitesModel->setRouteMode(Settings::RouteMode::VpnAllSites);
+            emit m_pageController->showNotificationMessage(
+                    tr("Split tunneling for WireGuard is not implemented, the option was disabled"));
+        }
+    });
 
     m_protocolsModel.reset(new ProtocolsModel(m_settings, this));
     m_engine->rootContext()->setContextProperty("ProtocolsModel", m_protocolsModel.get());
@@ -306,7 +316,7 @@ void AmneziaApplication::initControllers()
     m_connectionController.reset(new ConnectionController(m_serversModel, m_containersModel, m_vpnConnection));
     m_engine->rootContext()->setContextProperty("ConnectionController", m_connectionController.get());
 
-    m_pageController.reset(new PageController(m_serversModel));
+    m_pageController.reset(new PageController(m_serversModel, m_settings));
     m_engine->rootContext()->setContextProperty("PageController", m_pageController.get());
 
     m_installController.reset(new InstallController(m_serversModel, m_containersModel, m_settings));
diff --git a/client/ui/controllers/pageController.cpp b/client/ui/controllers/pageController.cpp
index 36d5ba7c..d0c219c1 100644
--- a/client/ui/controllers/pageController.cpp
+++ b/client/ui/controllers/pageController.cpp
@@ -5,9 +5,13 @@
     #include "../../platforms/android/androidutils.h"
     #include <QJniObject>
 #endif
+#if defined Q_OS_MAC
+    #include "ui/macos_util.h"
+#endif
 
-PageController::PageController(const QSharedPointer<ServersModel> &serversModel, QObject *parent)
-    : QObject(parent), m_serversModel(serversModel)
+PageController::PageController(const QSharedPointer<ServersModel> &serversModel,
+                               const std::shared_ptr<Settings> &settings, QObject *parent)
+    : QObject(parent), m_serversModel(serversModel), m_settings(settings)
 {
 #ifdef Q_OS_ANDROID
     // Change color of navigation and status bar's
@@ -23,6 +27,9 @@ PageController::PageController(const QSharedPointer<ServersModel> &serversModel,
         }
     });
 #endif
+
+    connect(this, &PageController::raiseMainWindow, []() { setDockIconVisible(true); });
+    connect(this, &PageController::hideMainWindow, []() { setDockIconVisible(false); });
 }
 
 QString PageController::getInitialPage()
@@ -88,3 +95,16 @@ void PageController::updateNavigationBarColor(const int color)
     });
 #endif
 }
+
+void PageController::showOnStartup()
+{
+    if (!m_settings->isStartMinimized()) {
+        emit raiseMainWindow();
+    } else {
+#ifdef Q_OS_WIN
+        emit hideMainWindow();
+#elif defined Q_OS_MACX
+        setDockIconVisible(false);
+#endif
+    }
+}
diff --git a/client/ui/controllers/pageController.h b/client/ui/controllers/pageController.h
index 1948ed11..1dd16090 100644
--- a/client/ui/controllers/pageController.h
+++ b/client/ui/controllers/pageController.h
@@ -63,7 +63,8 @@ class PageController : public QObject
 {
     Q_OBJECT
 public:
-    explicit PageController(const QSharedPointer<ServersModel> &serversModel, QObject *parent = nullptr);
+    explicit PageController(const QSharedPointer<ServersModel> &serversModel, const std::shared_ptr<Settings> &settings,
+                            QObject *parent = nullptr);
 
 public slots:
     QString getInitialPage();
@@ -75,6 +76,8 @@ public slots:
     unsigned int getInitialPageNavigationBarColor();
     void updateNavigationBarColor(const int color);
 
+    void showOnStartup();
+
 signals:
     void goToPageHome();
     void goToPageSettings();
@@ -100,6 +103,8 @@ signals:
 
 private:
     QSharedPointer<ServersModel> m_serversModel;
+
+    std::shared_ptr<Settings> m_settings;
 };
 
 #endif // PAGECONTROLLER_H
diff --git a/client/ui/controllers/settingsController.cpp b/client/ui/controllers/settingsController.cpp
index b56e48ad..f09ebc21 100644
--- a/client/ui/controllers/settingsController.cpp
+++ b/client/ui/controllers/settingsController.cpp
@@ -4,6 +4,7 @@
 
 #include "fileUtilites.h"
 #include "logger.h"
+#include "ui/qautostart.h"
 #include "version.h"
 
 SettingsController::SettingsController(const QSharedPointer<ServersModel> &serversModel,
@@ -137,3 +138,23 @@ void SettingsController::toggleAutoConnect(bool enable)
 {
     m_settings->setAutoConnect(enable);
 }
+
+bool SettingsController::isAutoStartEnabled()
+{
+    return Autostart::isAutostart();
+}
+
+void SettingsController::toggleAutoStart(bool enable)
+{
+    Autostart::setAutostart(enable);
+}
+
+bool SettingsController::isStartMinimizedEnabled()
+{
+    return m_settings->isStartMinimized();
+}
+
+void SettingsController::toggleStartMinimized(bool enable)
+{
+    m_settings->setStartMinimized(enable);
+}
diff --git a/client/ui/controllers/settingsController.h b/client/ui/controllers/settingsController.h
index a0a29ebf..3ad602b7 100644
--- a/client/ui/controllers/settingsController.h
+++ b/client/ui/controllers/settingsController.h
@@ -48,6 +48,12 @@ public slots:
     bool isAutoConnectEnabled();
     void toggleAutoConnect(bool enable);
 
+    bool isAutoStartEnabled();
+    void toggleAutoStart(bool enable);
+
+    bool isStartMinimizedEnabled();
+    void toggleStartMinimized(bool enable);
+
 signals:
     void primaryDnsChanged();
     void secondaryDnsChanged();
diff --git a/client/ui/macos_util.mm b/client/ui/macos_util.mm
index 8adda58a..3947b89b 100644
--- a/client/ui/macos_util.mm
+++ b/client/ui/macos_util.mm
@@ -1,60 +1,86 @@
-#include <QMainWindow>
-#include <Cocoa/Cocoa.h>
 #include "macos_util.h"
 
+#include <QMainWindow>
+#include <QProcess>
+
+#include <Cocoa/Cocoa.h>
 
-#import <Foundation/Foundation.h>
 #import <AppKit/AppKit.h>
+#import <Foundation/Foundation.h>
+
+// void setDockIconVisible(bool visible)
+//{
+//     QProcess process;
+//     process.start(
+//             "osascript",
+//             { "-e tell application \"System Events\" to get properties of (get application process \"AmneziaVPN\")" });
+//     process.waitForFinished(3000);
+//     const auto output = QString::fromLocal8Bit(process.readAllStandardOutput());
+
+//    qDebug() << output;
+
+//    if (visible) {
+//        [NSApp setActivationPolicy:NSApplicationActivationPolicyAccessory];
+//    } else {
+//        [NSApp setActivationPolicy:NSApplicationActivationPolicyRegular];
+//    }
+//}
 
 void setDockIconVisible(bool visible)
 {
-    if (!visible) {
-        [NSApp setActivationPolicy: NSApplicationActivationPolicyAccessory];
+    ProcessSerialNumber psn = { 0, kCurrentProcess };
+    if (visible) {
+        TransformProcessType(&psn, kProcessTransformToForegroundApplication);
     } else {
-        [NSApp setActivationPolicy: NSApplicationActivationPolicyRegular];
+        TransformProcessType(&psn, kProcessTransformToBackgroundApplication);
     }
 }
 
-//this Objective-c class is used to override the action of system close button and zoom button
-//https://stackoverflow.com/questions/27643659/setting-c-function-as-selector-for-nsbutton-produces-no-results
-@interface ButtonPasser : NSObject{
+// this Objective-c class is used to override the action of system close button and zoom button
+// https://stackoverflow.com/questions/27643659/setting-c-function-as-selector-for-nsbutton-produces-no-results
+@interface ButtonPasser : NSObject {
 }
-@property(readwrite) QMainWindow* window;
+@property (readwrite) QMainWindow *window;
 + (void)closeButtonAction:(id)sender;
 - (void)zoomButtonAction:(id)sender;
 @end
 
-@implementation ButtonPasser{
+@implementation ButtonPasser {
 }
 + (void)closeButtonAction:(id)sender
 {
     Q_UNUSED(sender);
     ProcessSerialNumber pn;
-    GetFrontProcess (&pn);
-    ShowHideProcess(&pn,false);
+    GetFrontProcess(&pn);
+    ShowHideProcess(&pn, false);
 }
 - (void)zoomButtonAction:(id)sender
 {
     Q_UNUSED(sender);
-    if (0 == self.window) return;
-    if (self.window->isMaximized()) self.window->showNormal();
-    else self.window->showMaximized();
+    if (0 == self.window)
+        return;
+    if (self.window->isMaximized())
+        self.window->showNormal();
+    else
+        self.window->showMaximized();
 }
 @end
 
 void fixWidget(QWidget *widget)
 {
     NSView *view = (NSView *)widget->winId();
-    if (0 == view) return;
+    if (0 == view)
+        return;
     NSWindow *window = view.window;
-    if (0 == window) return;
+    if (0 == window)
+        return;
 
-    //override the action of close button
-    //https://stackoverflow.com/questions/27643659/setting-c-function-as-selector-for-nsbutton-produces-no-results
-    //https://developer.apple.com/library/content/documentation/General/Conceptual/CocoaEncyclopedia/Target-Action/Target-Action.html
-//    NSButton *closeButton = [window standardWindowButton:NSWindowCloseButton];
-//    [closeButton setTarget:[ButtonPasser class]];
-//    [closeButton setAction:@selector(closeButtonAction:)];
+    // override the action of close button
+    // https://stackoverflow.com/questions/27643659/setting-c-function-as-selector-for-nsbutton-produces-no-results
+    // https://developer.apple.com/library/content/documentation/General/Conceptual/CocoaEncyclopedia/Target-Action/Target-Action.html
+    //    NSButton *closeButton = [window standardWindowButton:NSWindowCloseButton];
+    //    [closeButton setTarget:[ButtonPasser class]];
+    //    [closeButton setAction:@selector(closeButtonAction:)];
 
     [[window standardWindowButton:NSWindowZoomButton] setHidden:YES];
     [[window standardWindowButton:NSWindowMiniaturizeButton] setHidden:YES];
diff --git a/client/ui/qml/Pages2/PageSettingsApplication.qml b/client/ui/qml/Pages2/PageSettingsApplication.qml
index 9f2fe91a..7b628037 100644
--- a/client/ui/qml/Pages2/PageSettingsApplication.qml
+++ b/client/ui/qml/Pages2/PageSettingsApplication.qml
@@ -43,9 +43,50 @@ PageType {
                 headerText: qsTr("Application")
             }
 
+            SwitcherType {
+                visible: !GC.isMobile()
+
+                Layout.fillWidth: true
+                Layout.margins: 16
+
+                text: qsTr("Auto start")
+                descriptionText: qsTr("Launch the application every time ") + Qt.platform.os + qsTr(" starts")
+
+                checked: SettingsController.isAutoStartEnabled()
+                onCheckedChanged: {
+                    if (checked !== SettingsController.isAutoStartEnabled()) {
+                        SettingsController.toggleAutoStart(checked)
+                    }
+                }
+            }
+
+            DividerType {
+                visible: !GC.isMobile()
+            }
+
+            SwitcherType {
+                visible: !GC.isMobile()
+
+                Layout.fillWidth: true
+                Layout.margins: 16
+
+                text: qsTr("Start minimized")
+                descriptionText: qsTr("Launch application minimized")
+
+                checked: SettingsController.isStartMinimizedEnabled()
+                onCheckedChanged: {
+                    if (checked !== SettingsController.isStartMinimizedEnabled()) {
+                        SettingsController.toggleStartMinimized(checked)
+                    }
+                }
+            }
+
+            DividerType {
+                visible: !GC.isMobile()
+            }
+
             LabelWithButtonType {
                 Layout.fillWidth: true
-                Layout.topMargin: 16
 
                 text: qsTr("Language")
                 descriptionText: LanguageModel.currentLanguageName
diff --git a/client/ui/qml/Pages2/PageSettingsConnection.qml b/client/ui/qml/Pages2/PageSettingsConnection.qml
index 0765f7d2..0692abda 100644
--- a/client/ui/qml/Pages2/PageSettingsConnection.qml
+++ b/client/ui/qml/Pages2/PageSettingsConnection.qml
@@ -42,11 +42,10 @@ PageType {
             }
 
             SwitcherType {
+                visible: !GC.isMobile()
+
                 Layout.fillWidth: true
-                Layout.topMargin: 16
-                Layout.bottomMargin: 16
-                Layout.leftMargin: 16
-                Layout.rightMargin: 16
+                Layout.margins: 16
 
                 text: qsTr("Auto connect")
                 descriptionText: qsTr("Connect to VPN on app start")
@@ -59,12 +58,13 @@ PageType {
                 }
             }
 
+            DividerType {
+                visible: !GC.isMobile()
+            }
+
             SwitcherType {
                 Layout.fillWidth: true
-                Layout.topMargin: 16
-                Layout.bottomMargin: 16
-                Layout.leftMargin: 16
-                Layout.rightMargin: 16
+                Layout.margins: 16
 
                 text: qsTr("Use AmneziaDNS if installed on the server")
 

From c271235d169c9edb4dfe9d556ecd5f28ef2a71ba Mon Sep 17 00:00:00 2001
From: "vladimir.kuznetsov" <nethiuswork@gmail.com>
Date: Thu, 24 Aug 2023 16:22:55 +0500
Subject: [PATCH 071/278] added confirmation dialog when clearing logs and
 notification after clearing

---
 client/ui/qml/Pages2/PageSettingsLogging.qml | 24 ++++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)

diff --git a/client/ui/qml/Pages2/PageSettingsLogging.qml b/client/ui/qml/Pages2/PageSettingsLogging.qml
index 5138f9a3..e14be439 100644
--- a/client/ui/qml/Pages2/PageSettingsLogging.qml
+++ b/client/ui/qml/Pages2/PageSettingsLogging.qml
@@ -4,9 +4,9 @@ import QtQuick.Layouts
 
 import PageEnum 1.0
 
-import "./"
 import "../Controls2"
 import "../Config"
+import "../Components"
 import "../Controls2/TextTypes"
 
 PageType {
@@ -121,7 +121,23 @@ PageType {
 
                         image: "qrc:/images/controls/delete.svg"
 
-                        onClicked: SettingsController.clearLogs()
+                        onClicked: function() {
+                            questionDrawer.headerText = qsTr("Clear logs?")
+                            questionDrawer.yesButtonText = qsTr("Continue")
+                            questionDrawer.noButtonText = qsTr("Cancel")
+
+                            questionDrawer.yesButtonFunction = function() {
+                                questionDrawer.visible = false
+                                PageController.showBusyIndicator(true)
+                                SettingsController.clearLogs()
+                                PageController.showBusyIndicator(false)
+                                PageController.showNotificationMessage(qsTr("Logs have been cleaned up"))
+                            }
+                            questionDrawer.noButtonFunction = function() {
+                                questionDrawer.visible = false
+                            }
+                            questionDrawer.visible = true
+                        }
                     }
 
                     CaptionTextType {
@@ -133,6 +149,10 @@ PageType {
                     }
                 }
             }
+
+            QuestionDrawer {
+                id: questionDrawer
+            }
         }
     }
 }

From 259eff3fea891b674df4feb031fd5cddc8e814f1 Mon Sep 17 00:00:00 2001
From: "vladimir.kuznetsov" <nethiuswork@gmail.com>
Date: Thu, 24 Aug 2023 16:25:51 +0500
Subject: [PATCH 072/278] upgraded app version

---
 CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index eac7f0a9..e7231c56 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.25.0 FATAL_ERROR)
 
 set(PROJECT AmneziaVPN)
 
-project(${PROJECT} VERSION 4.0.1.1
+project(${PROJECT} VERSION 4.0.2.1
         DESCRIPTION "AmneziaVPN"
         HOMEPAGE_URL "https://amnezia.org/"
 )

From 3f7e7f260113b65db04b7d595be921212041bec2 Mon Sep 17 00:00:00 2001
From: "vladimir.kuznetsov" <nethiuswork@gmail.com>
Date: Fri, 25 Aug 2023 09:20:42 +0500
Subject: [PATCH 073/278] fixed native wireguard config import if there is no
 port in the Endpoint field

---
 client/ui/controllers/importController.cpp | 9 +++++++--
 client/ui/controllers/pageController.cpp   | 2 ++
 client/ui/controllers/sitesController.cpp  | 1 +
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/client/ui/controllers/importController.cpp b/client/ui/controllers/importController.cpp
index b5d10abf..81ab313b 100644
--- a/client/ui/controllers/importController.cpp
+++ b/client/ui/controllers/importController.cpp
@@ -225,12 +225,17 @@ QJsonObject ImportController::extractWireGuardConfig(const QString &data)
     QJsonObject lastConfig;
     lastConfig[config_key::config] = data;
 
-    const static QRegularExpression hostNameAndPortRegExp("Endpoint = (.*):([0-9]*)");
+    const static QRegularExpression hostNameAndPortRegExp("Endpoint = (.*)(?::([0-9]*))?");
     QRegularExpressionMatch hostNameAndPortMatch = hostNameAndPortRegExp.match(data);
     QString hostName;
     QString port;
-    if (hostNameAndPortMatch.hasMatch()) {
+    if (hostNameAndPortMatch.hasCaptured(1)) {
         hostName = hostNameAndPortMatch.captured(1);
+    } /*else {
+        qDebug() << "send error?"
+    }*/
+
+    if (hostNameAndPortMatch.hasCaptured(2)) {
         port = hostNameAndPortMatch.captured(2);
     }
 
diff --git a/client/ui/controllers/pageController.cpp b/client/ui/controllers/pageController.cpp
index d0c219c1..84d2ebf2 100644
--- a/client/ui/controllers/pageController.cpp
+++ b/client/ui/controllers/pageController.cpp
@@ -28,8 +28,10 @@ PageController::PageController(const QSharedPointer<ServersModel> &serversModel,
     });
 #endif
 
+#if defined Q_OS_MACX
     connect(this, &PageController::raiseMainWindow, []() { setDockIconVisible(true); });
     connect(this, &PageController::hideMainWindow, []() { setDockIconVisible(false); });
+#endif
 }
 
 QString PageController::getInitialPage()
diff --git a/client/ui/controllers/sitesController.cpp b/client/ui/controllers/sitesController.cpp
index d19f5758..80cac698 100644
--- a/client/ui/controllers/sitesController.cpp
+++ b/client/ui/controllers/sitesController.cpp
@@ -4,6 +4,7 @@
 #include <QStandardPaths>
 
 #include "fileUtilites.h"
+#include "utilities.h"
 
 SitesController::SitesController(const std::shared_ptr<Settings> &settings,
                                  const QSharedPointer<VpnConnection> &vpnConnection,

From 29bef052c7bf3fead0afa76a1e2c0af890c329d7 Mon Sep 17 00:00:00 2001
From: "vladimir.kuznetsov" <nethiuswork@gmail.com>
Date: Sat, 26 Aug 2023 10:08:50 +0300
Subject: [PATCH 074/278] minor ui fixes

---
 CMakeLists.txt                                      |  2 +-
 client/ui/qml/Components/ShareConnectionDrawer.qml  |  2 +-
 client/ui/qml/Controls2/CheckBoxType.qml            |  2 +-
 client/ui/qml/Controls2/DropDownType.qml            | 12 ++++++++----
 client/ui/qml/Controls2/HorizontalRadioButton.qml   | 11 ++++++-----
 client/ui/qml/Controls2/ProgressBarType.qml         |  2 +-
 client/ui/qml/Controls2/SwitcherType.qml            |  9 +++++----
 client/ui/qml/Controls2/TabButtonType.qml           |  8 +++++++-
 client/ui/qml/Controls2/TabImageButtonType.qml      |  9 ++++++++-
 client/ui/qml/Controls2/TextAreaType.qml            |  2 +-
 client/ui/qml/Controls2/TextFieldWithHeaderType.qml |  2 +-
 client/ui/qml/Pages2/PageHome.qml                   |  8 +++++++-
 client/ui/qml/Pages2/PageProtocolRaw.qml            |  2 +-
 client/ui/qml/Pages2/PageSettings.qml               |  4 +++-
 client/ui/qml/Pages2/PageShare.qml                  |  9 ++++++---
 client/ui/qml/Pages2/PageStart.qml                  |  8 --------
 16 files changed, 57 insertions(+), 35 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e7231c56..4560bdd0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -6,7 +6,7 @@ project(${PROJECT} VERSION 4.0.2.1
         DESCRIPTION "AmneziaVPN"
         HOMEPAGE_URL "https://amnezia.org/"
 )
-set(RELEASE_DATE "2023-08-16")
+set(RELEASE_DATE "2023-08-25")
 set(APP_MAJOR_VERSION ${CMAKE_PROJECT_VERSION_MAJOR}.${CMAKE_PROJECT_VERSION_MINOR}.${CMAKE_PROJECT_VERSION_PATCH})
 
 if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
diff --git a/client/ui/qml/Components/ShareConnectionDrawer.qml b/client/ui/qml/Components/ShareConnectionDrawer.qml
index 368d503a..05684ba8 100644
--- a/client/ui/qml/Components/ShareConnectionDrawer.qml
+++ b/client/ui/qml/Components/ShareConnectionDrawer.qml
@@ -163,7 +163,7 @@ DrawerType {
                                 height: 24
 
                                 color: "#D7D8DB"
-                                selectionColor:  "#412102"
+                                selectionColor:  "#633303"
                                 selectedTextColor: "#D7D8DB"
 
                                 font.pixelSize: 16
diff --git a/client/ui/qml/Controls2/CheckBoxType.qml b/client/ui/qml/Controls2/CheckBoxType.qml
index 2724a30c..1ad3b412 100644
--- a/client/ui/qml/Controls2/CheckBoxType.qml
+++ b/client/ui/qml/Controls2/CheckBoxType.qml
@@ -21,7 +21,7 @@ CheckBox {
 
     property string defaultBorderColor: "#D7D8DB"
     property string checkedBorderColor: "#FBB26A"
-    property string checkedBorderDisabledColor: "#5A330C"
+    property string checkedBorderDisabledColor: "#402102"
 
     property string checkedImageColor: "#FBB26A"
     property string pressedImageColor: "#A85809"
diff --git a/client/ui/qml/Controls2/DropDownType.qml b/client/ui/qml/Controls2/DropDownType.qml
index 17151630..c21fa48f 100644
--- a/client/ui/qml/Controls2/DropDownType.qml
+++ b/client/ui/qml/Controls2/DropDownType.qml
@@ -27,7 +27,9 @@ Item {
     property string rootButtonDefaultBorderColor: "#2C2D30"
     property string rootButtonPressedBorderColor: "#D7D8DB"
 
-    property int rootButtonTextMargins: 16
+    property int rootButtonTextLeftMargins: 16
+    property int rootButtonTextTopMargin: 16
+    property int rootButtonTextBottomMargin: 16
 
     property real drawerHeight: 0.9
     property Component listView
@@ -76,9 +78,9 @@ Item {
         spacing: 0
 
         ColumnLayout {
-            Layout.leftMargin: rootButtonTextMargins
-            Layout.topMargin: rootButtonTextMargins
-            Layout.bottomMargin: rootButtonTextMargins
+            Layout.leftMargin: rootButtonTextLeftMargins
+            Layout.topMargin: rootButtonTextTopMargin
+            Layout.bottomMargin: rootButtonTextBottomMargin
 
             LabelTextType {
                 Layout.fillWidth: true
@@ -104,6 +106,8 @@ Item {
         }
 
         ImageButtonType {
+            Layout.rightMargin: 16
+
             hoverEnabled: false
             image: rootButtonImage
             imageColor: rootButtonImageColor
diff --git a/client/ui/qml/Controls2/HorizontalRadioButton.qml b/client/ui/qml/Controls2/HorizontalRadioButton.qml
index 1ac5840a..81cc8ec0 100644
--- a/client/ui/qml/Controls2/HorizontalRadioButton.qml
+++ b/client/ui/qml/Controls2/HorizontalRadioButton.qml
@@ -75,19 +75,20 @@ RadioButton {
     ColumnLayout {
         id: content
         anchors.fill: parent
-        spacing: 16
+        spacing: 0
 
         ButtonTextType {
             text: root.text
             color: root.enabled ? root.textColor : root.textDisabledColor
 
             Layout.fillWidth: true
-            Layout.rightMargin: 16
-            Layout.leftMargin: 16
-            Layout.topMargin: 16
-            Layout.bottomMargin: 16
+            Layout.rightMargin: 24
+            Layout.leftMargin: 24
+            Layout.topMargin: 12
+            Layout.bottomMargin: 12
 
             horizontalAlignment: Qt.AlignHCenter
+            verticalAlignment: Qt.AlignVCenter
         }
     }
 
diff --git a/client/ui/qml/Controls2/ProgressBarType.qml b/client/ui/qml/Controls2/ProgressBarType.qml
index 183c3736..e642c3eb 100644
--- a/client/ui/qml/Controls2/ProgressBarType.qml
+++ b/client/ui/qml/Controls2/ProgressBarType.qml
@@ -8,7 +8,7 @@ ProgressBar {
     implicitHeight: 4
 
     background: Rectangle {
-        color: "#412102"
+        color: "#633303"
     }
 
     contentItem: Item {
diff --git a/client/ui/qml/Controls2/SwitcherType.qml b/client/ui/qml/Controls2/SwitcherType.qml
index aca5ba0b..ee7372f5 100644
--- a/client/ui/qml/Controls2/SwitcherType.qml
+++ b/client/ui/qml/Controls2/SwitcherType.qml
@@ -14,13 +14,13 @@ Switch {
     property string textColor:  "#D7D8DB"
     property string textDisabledColor: "#878B91"
 
-    property string checkedIndicatorColor: "#412102"
+    property string checkedIndicatorColor: "#633303"
     property string defaultIndicatorColor: "transparent"
-    property string checkedDisabledIndicatorColor: "#5A330C"
+    property string checkedDisabledIndicatorColor: "#402102"
 
-    property string checkedIndicatorBorderColor: "#412102"
+    property string checkedIndicatorBorderColor: "#633303"
     property string defaultIndicatorBorderColor: "#494B50"
-    property string checkedDisabledIndicatorBorderColor: "#5A330C"
+    property string checkedDisabledIndicatorBorderColor: "#402102"
 
     property string checkedInnerCircleColor: "#FBB26A"
     property string defaultInnerCircleColor: "#D7D8DB"
@@ -40,6 +40,7 @@ Switch {
 
         anchors.left: content.right
         anchors.verticalCenter: parent.verticalCenter
+        anchors.leftMargin: 4
 
         implicitWidth: 52
         implicitHeight: 32
diff --git a/client/ui/qml/Controls2/TabButtonType.qml b/client/ui/qml/Controls2/TabButtonType.qml
index 4699dfcd..f8011f0d 100644
--- a/client/ui/qml/Controls2/TabButtonType.qml
+++ b/client/ui/qml/Controls2/TabButtonType.qml
@@ -4,7 +4,7 @@ import QtQuick.Controls
 TabButton {
     id: root
 
-    property string hoveredColor: "#412102"
+    property string hoveredColor: "#633303"
     property string defaultColor: "#2C2D30"
     property string selectedColor: "#FBB26A"
 
@@ -39,6 +39,12 @@ TabButton {
         }
     }
 
+    MouseArea {
+        anchors.fill: background
+        cursorShape: Qt.PointingHandCursor
+        enabled: false
+    }
+
     contentItem: Text {
         anchors.fill: background
         height: 24
diff --git a/client/ui/qml/Controls2/TabImageButtonType.qml b/client/ui/qml/Controls2/TabImageButtonType.qml
index 06b77e6a..4d745a0b 100644
--- a/client/ui/qml/Controls2/TabImageButtonType.qml
+++ b/client/ui/qml/Controls2/TabImageButtonType.qml
@@ -4,7 +4,7 @@ import QtQuick.Controls
 TabButton {
     id: root
 
-    property string hoveredColor: "#412102"
+    property string hoveredColor: "#633303"
     property string defaultColor: "#D7D8DB"
     property string selectedColor: "#FBB26A"
 
@@ -18,7 +18,14 @@ TabButton {
     icon.color: isSelected ? selectedColor : defaultColor
 
     background: Rectangle {
+        id: background
         anchors.fill: parent
         color: "transparent"
     }
+
+    MouseArea {
+        anchors.fill: background
+        cursorShape: Qt.PointingHandCursor
+        enabled: false
+    }
 }
diff --git a/client/ui/qml/Controls2/TextAreaType.qml b/client/ui/qml/Controls2/TextAreaType.qml
index 9958f2e9..a75ea55d 100644
--- a/client/ui/qml/Controls2/TextAreaType.qml
+++ b/client/ui/qml/Controls2/TextAreaType.qml
@@ -29,7 +29,7 @@ Rectangle {
             anchors.bottomMargin: 16
 
             color: "#D7D8DB"
-            selectionColor:  "#412102"
+            selectionColor:  "#633303"
             selectedTextColor: "#D7D8DB"
             placeholderTextColor: "#878B91"
 
diff --git a/client/ui/qml/Controls2/TextFieldWithHeaderType.qml b/client/ui/qml/Controls2/TextFieldWithHeaderType.qml
index 3f31c224..048a564d 100644
--- a/client/ui/qml/Controls2/TextFieldWithHeaderType.qml
+++ b/client/ui/qml/Controls2/TextFieldWithHeaderType.qml
@@ -74,7 +74,7 @@ Item {
                         placeholderText: root.textFieldPlaceholderText
                         placeholderTextColor: "#494B50"
 
-                        selectionColor:  "#412102"
+                        selectionColor:  "#633303"
                         selectedTextColor: "#D7D8DB"
 
                         font.pixelSize: 16
diff --git a/client/ui/qml/Pages2/PageHome.qml b/client/ui/qml/Pages2/PageHome.qml
index b756511b..c5add5d8 100644
--- a/client/ui/qml/Pages2/PageHome.qml
+++ b/client/ui/qml/Pages2/PageHome.qml
@@ -70,6 +70,8 @@ PageType {
             Layout.topMargin: 24
             Layout.alignment: Qt.AlignHCenter | Qt.AlignVCenter
 
+            spacing: 0
+
             Header1TextType {
                 text: root.defaultServerName
             }
@@ -78,6 +80,8 @@ PageType {
                 Layout.preferredWidth: 18
                 Layout.preferredHeight: 18
 
+                Layout.leftMargin: 12
+
                 source: "qrc:/images/controls/chevron-down.svg"
             }
         }
@@ -152,7 +156,8 @@ PageType {
                     rootButtonBackgroundColor: "#D7D8DB"
                     rootButtonHoveredBorderColor: "transparent"
                     rootButtonPressedBorderColor: "transparent"
-                    rootButtonTextMargins: 8
+                    rootButtonTextTopMargin: 8
+                    rootButtonTextBottomMargin: 8
 
                     text: root.defaultContainerName
                     textColor: "#0E0E11"
@@ -303,6 +308,7 @@ PageType {
 
                                 ImageButtonType {
                                     image: "qrc:/images/controls/settings.svg"
+                                    imageColor: "#D7D8DB"
 
                                     implicitWidth: 56
                                     implicitHeight: 56
diff --git a/client/ui/qml/Pages2/PageProtocolRaw.qml b/client/ui/qml/Pages2/PageProtocolRaw.qml
index e82b0ff5..5c70b1c0 100644
--- a/client/ui/qml/Pages2/PageProtocolRaw.qml
+++ b/client/ui/qml/Pages2/PageProtocolRaw.qml
@@ -142,7 +142,7 @@ PageType {
                                         height: 24
 
                                         color: "#D7D8DB"
-                                        selectionColor:  "#412102"
+                                        selectionColor:  "#633303"
                                         selectedTextColor: "#D7D8DB"
 
                                         font.pixelSize: 16
diff --git a/client/ui/qml/Pages2/PageSettings.qml b/client/ui/qml/Pages2/PageSettings.qml
index f430a004..6c088a70 100644
--- a/client/ui/qml/Pages2/PageSettings.qml
+++ b/client/ui/qml/Pages2/PageSettings.qml
@@ -26,9 +26,11 @@ PageType {
             anchors.left: parent.left
             anchors.right: parent.right
 
+            spacing: 0
+
             HeaderType {
                 Layout.fillWidth: true
-                Layout.topMargin: 20
+                Layout.topMargin: 24
                 Layout.rightMargin: 16
                 Layout.leftMargin: 16
 
diff --git a/client/ui/qml/Pages2/PageShare.qml b/client/ui/qml/Pages2/PageShare.qml
index 120e04fc..135c7fbc 100644
--- a/client/ui/qml/Pages2/PageShare.qml
+++ b/client/ui/qml/Pages2/PageShare.qml
@@ -106,9 +106,11 @@ PageType {
             anchors.rightMargin: 16
             anchors.leftMargin: 16
 
+            spacing: 0
+
             HeaderType {
                 Layout.fillWidth: true
-                Layout.topMargin: 20
+                Layout.topMargin: 24
 
                 headerText: qsTr("VPN Access")
             }
@@ -161,6 +163,7 @@ PageType {
             ParagraphTextType {
                 Layout.fillWidth: true
                 Layout.topMargin: 24
+                Layout.bottomMargin: 24
 
                 text: accessTypeSelector.currentIndex === 0 ? qsTr("VPN access without the ability to manage the server") :
                                                               qsTr("Full access to server")
@@ -171,7 +174,7 @@ PageType {
                 id: serverSelector
 
                 Layout.fillWidth: true
-                Layout.topMargin: 24
+                Layout.topMargin: 16
 
                 drawerHeight: 0.4375
 
@@ -385,7 +388,7 @@ PageType {
 
             BasicButtonType {
                 Layout.fillWidth: true
-                Layout.topMargin: 32
+                Layout.topMargin: 40
 
                 enabled: shareButtonEnabled
 
diff --git a/client/ui/qml/Pages2/PageStart.qml b/client/ui/qml/Pages2/PageStart.qml
index 5c2a13df..e4cc02ee 100644
--- a/client/ui/qml/Pages2/PageStart.qml
+++ b/client/ui/qml/Pages2/PageStart.qml
@@ -163,14 +163,6 @@ PageType {
         }
     }
 
-    MouseArea {
-        anchors.fill: tabBar
-        anchors.leftMargin: shareTabButton.visible ? 96 : 128
-        anchors.rightMargin: shareTabButton.visible ? 96 : 128
-        cursorShape: Qt.PointingHandCursor
-        enabled: false
-    }
-
     BusyIndicatorType {
         id: busyIndicator
         anchors.centerIn: parent

From fe08fd3f0af9e7a7385229db8c4687055260a3d8 Mon Sep 17 00:00:00 2001
From: "vladimir.kuznetsov" <nethiuswork@gmail.com>
Date: Mon, 28 Aug 2023 11:06:58 +0300
Subject: [PATCH 075/278] moved the connect button to the center of the screen

---
 CMakeLists.txt                                 | 4 ++--
 client/ui/controllers/connectionController.cpp | 2 +-
 client/ui/qml/Pages2/PageHome.qml              | 5 ++++-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4560bdd0..aec2a974 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,11 +2,11 @@ cmake_minimum_required(VERSION 3.25.0 FATAL_ERROR)
 
 set(PROJECT AmneziaVPN)
 
-project(${PROJECT} VERSION 4.0.2.1
+project(${PROJECT} VERSION 4.0.3.1
         DESCRIPTION "AmneziaVPN"
         HOMEPAGE_URL "https://amnezia.org/"
 )
-set(RELEASE_DATE "2023-08-25")
+set(RELEASE_DATE "2023-08-26")
 set(APP_MAJOR_VERSION ${CMAKE_PROJECT_VERSION_MAJOR}.${CMAKE_PROJECT_VERSION_MINOR}.${CMAKE_PROJECT_VERSION_PATCH})
 
 if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
diff --git a/client/ui/controllers/connectionController.cpp b/client/ui/controllers/connectionController.cpp
index 45f24d7f..d3813086 100644
--- a/client/ui/controllers/connectionController.cpp
+++ b/client/ui/controllers/connectionController.cpp
@@ -72,7 +72,7 @@ void ConnectionController::onConnectionStateChanged(Vpn::ConnectionState state)
     case Vpn::ConnectionState::Connected: {
         m_isConnectionInProgress = false;
         m_isConnected = true;
-        m_connectionStateText = tr("Disconnect");
+        m_connectionStateText = tr("Connected");
         break;
     }
     case Vpn::ConnectionState::Connecting: {
diff --git a/client/ui/qml/Pages2/PageHome.qml b/client/ui/qml/Pages2/PageHome.qml
index c5add5d8..d40f8748 100644
--- a/client/ui/qml/Pages2/PageHome.qml
+++ b/client/ui/qml/Pages2/PageHome.qml
@@ -27,7 +27,10 @@ PageType {
     property string defaultContainerName: ContainersModel.defaultContainerName
 
     ConnectButton {
-        anchors.centerIn: parent
+        anchors.top: parent.top
+        anchors.bottom: buttonBackground.top
+        anchors.right: parent.right
+        anchors.left: parent.left
     }
 
     Connections {

From 639c18395b32081c422eab99cf5b01c7f7bbfedd Mon Sep 17 00:00:00 2001
From: "vladimir.kuznetsov" <nethiuswork@gmail.com>
Date: Mon, 28 Aug 2023 14:18:41 +0300
Subject: [PATCH 076/278] fixed display of notification about successful
 clearing of cached profiles - limited the input for the Port field to only
 numeric values, in the range 1-65535

---
 .../qml/Components/ShareConnectionDrawer.qml  |  2 +-
 .../qml/Pages2/PageProtocolCloakSettings.qml  |  1 +
 .../Pages2/PageProtocolOpenVpnSettings.qml    |  1 +
 .../PageProtocolShadowSocksSettings.qml       |  1 +
 .../ui/qml/Pages2/PageSettingsServerData.qml  |  8 +++---
 .../Pages2/PageSetupWizardConfigSource.qml    |  2 +-
 .../qml/Pages2/PageSetupWizardCredentials.qml | 25 -------------------
 client/ui/qml/Pages2/PageSetupWizardEasy.qml  | 13 ++++++++--
 .../PageSetupWizardProtocolSettings.qml       |  1 +
 9 files changed, 22 insertions(+), 32 deletions(-)

diff --git a/client/ui/qml/Components/ShareConnectionDrawer.qml b/client/ui/qml/Components/ShareConnectionDrawer.qml
index 05684ba8..c369af42 100644
--- a/client/ui/qml/Components/ShareConnectionDrawer.qml
+++ b/client/ui/qml/Components/ShareConnectionDrawer.qml
@@ -227,7 +227,7 @@ DrawerType {
                     visible: ExportController.qrCodesCount > 0
 
                     horizontalAlignment: Text.AlignHCenter
-                    text: qsTr("To read the QR code in the Amnezia app, select \"Add Server\" → \"I have connection details\"")
+                    text: qsTr("To read the QR code in the Amnezia app, select \"Add server\" → \"I have data to connect\" → \"QR code, key or settings file\"")
                 }
             }
         }
diff --git a/client/ui/qml/Pages2/PageProtocolCloakSettings.qml b/client/ui/qml/Pages2/PageProtocolCloakSettings.qml
index 7273b86d..b53fdfdf 100644
--- a/client/ui/qml/Pages2/PageProtocolCloakSettings.qml
+++ b/client/ui/qml/Pages2/PageProtocolCloakSettings.qml
@@ -103,6 +103,7 @@ PageType {
                             headerText: qsTr("Port")
                             textFieldText: port
                             textField.maximumLength: 5
+                            textField.validator: IntValidator { bottom: 1; top: 65535 }
 
                             textField.onEditingFinished: {
                                 if (textFieldText !== port) {
diff --git a/client/ui/qml/Pages2/PageProtocolOpenVpnSettings.qml b/client/ui/qml/Pages2/PageProtocolOpenVpnSettings.qml
index fb2258c5..659193ca 100644
--- a/client/ui/qml/Pages2/PageProtocolOpenVpnSettings.qml
+++ b/client/ui/qml/Pages2/PageProtocolOpenVpnSettings.qml
@@ -134,6 +134,7 @@ PageType {
                             headerText: qsTr("Port")
                             textFieldText: port
                             textField.maximumLength: 5
+                            textField.validator: IntValidator { bottom: 1; top: 65535 }
 
                             textField.onEditingFinished: {
                                 if (textFieldText !== port) {
diff --git a/client/ui/qml/Pages2/PageProtocolShadowSocksSettings.qml b/client/ui/qml/Pages2/PageProtocolShadowSocksSettings.qml
index 7b78bc07..fe0ef8c3 100644
--- a/client/ui/qml/Pages2/PageProtocolShadowSocksSettings.qml
+++ b/client/ui/qml/Pages2/PageProtocolShadowSocksSettings.qml
@@ -89,6 +89,7 @@ PageType {
                             headerText: qsTr("Port")
                             textFieldText: port
                             textField.maximumLength: 5
+                            textField.validator: IntValidator { bottom: 1; top: 65535 }
 
                             textField.onEditingFinished: {
                                 if (textFieldText !== port) {
diff --git a/client/ui/qml/Pages2/PageSettingsServerData.qml b/client/ui/qml/Pages2/PageSettingsServerData.qml
index 9ff99193..15c5e531 100644
--- a/client/ui/qml/Pages2/PageSettingsServerData.qml
+++ b/client/ui/qml/Pages2/PageSettingsServerData.qml
@@ -89,13 +89,15 @@ PageType {
 
                 clickedFunction: function() {
                     questionDrawer.headerText = qsTr("Clear cached profiles?")
-                    questionDrawer.descriptionText = qsTr("some description")
+                    questionDrawer.descriptionText = qsTr("")
                     questionDrawer.yesButtonText = qsTr("Continue")
                     questionDrawer.noButtonText = qsTr("Cancel")
 
                     questionDrawer.yesButtonFunction = function() {
                         questionDrawer.visible = false
-                        ContainersModel.clearCachedProfiles()
+                        PageController.showBusyIndicator(true)
+                        SettingsController.clearCachedProfiles()
+                        PageController.showBusyIndicator(false)
                     }
                     questionDrawer.noButtonFunction = function() {
                         questionDrawer.visible = false
@@ -165,7 +167,7 @@ PageType {
 
                 clickedFunction: function() {
                     questionDrawer.headerText = qsTr("Clear server from Amnezia software?")
-                    questionDrawer.descriptionText = qsTr(" All containers will be deleted on the server. This means that configuration files, keys and certificates will be deleted.")
+                    questionDrawer.descriptionText = qsTr("All containers will be deleted on the server. This means that configuration files, keys and certificates will be deleted.")
                     questionDrawer.yesButtonText = qsTr("Continue")
                     questionDrawer.noButtonText = qsTr("Cancel")
 
diff --git a/client/ui/qml/Pages2/PageSetupWizardConfigSource.qml b/client/ui/qml/Pages2/PageSetupWizardConfigSource.qml
index f0155667..45aad9d0 100644
--- a/client/ui/qml/Pages2/PageSetupWizardConfigSource.qml
+++ b/client/ui/qml/Pages2/PageSetupWizardConfigSource.qml
@@ -49,7 +49,7 @@ PageType {
 
                 headerText: qsTr("Server connection")
                 descriptionText: qsTr("Do not use connection code from public sources. It may have been created to intercept your data.\n
-It's okay if a friend passed the code.")
+It's okay as long as it's from someone you trust.")
             }
 
             Header2TextType {
diff --git a/client/ui/qml/Pages2/PageSetupWizardCredentials.qml b/client/ui/qml/Pages2/PageSetupWizardCredentials.qml
index 5187a6e3..d089a70d 100644
--- a/client/ui/qml/Pages2/PageSetupWizardCredentials.qml
+++ b/client/ui/qml/Pages2/PageSetupWizardCredentials.qml
@@ -107,31 +107,6 @@ PageType {
                     goToPage(PageEnum.PageSetupWizardEasy)
                 }
             }
-
-//            BasicButtonType {
-//                Layout.fillWidth: true
-//                Layout.topMargin: -8
-
-//                defaultColor: "transparent"
-//                hoveredColor: Qt.rgba(1, 1, 1, 0.08)
-//                pressedColor: Qt.rgba(1, 1, 1, 0.12)
-//                disabledColor: "#878B91"
-//                textColor: "#D7D8DB"
-//                borderWidth: 1
-
-//                text: qsTr("Select protocol to install")
-
-//                onClicked: function() {
-//                    if (!isCredentialsFilled()) {
-//                        return
-//                    }
-
-//                    InstallController.setShouldCreateServer(true)
-//                    InstallController.setCurrentlyInstalledServerCredentials(hostname.textField.text, username.textField.text, secretData.textField.text)
-
-//                    goToPage(PageEnum.PageSetupWizardProtocols)
-//                }
-//            }
         }
     }
 
diff --git a/client/ui/qml/Pages2/PageSetupWizardEasy.qml b/client/ui/qml/Pages2/PageSetupWizardEasy.qml
index f2600f65..375a8332 100644
--- a/client/ui/qml/Pages2/PageSetupWizardEasy.qml
+++ b/client/ui/qml/Pages2/PageSetupWizardEasy.qml
@@ -45,7 +45,7 @@ PageType {
         id: fl
         anchors.top: backButton.bottom
         anchors.bottom: parent.bottom
-        contentHeight: content.implicitHeight + continueButton.anchors.bottomMargin
+        contentHeight: content.implicitHeight + setupLaterButton.anchors.bottomMargin
 
         Column {
             id: content
@@ -126,7 +126,9 @@ PageType {
                 }
             }
 
-            DividerType {}
+            DividerType {
+                implicitWidth: parent.width
+            }
 
             CardType {
                 implicitWidth: parent.width
@@ -141,6 +143,11 @@ PageType {
                 }
             }
 
+            Item {
+                implicitWidth: 1
+                implicitHeight: 1
+            }
+
             BasicButtonType {
                 id: continueButton
 
@@ -163,6 +170,8 @@ PageType {
             }
 
             BasicButtonType {
+                id: setupLaterButton
+
                 implicitWidth: parent.width
                 anchors.topMargin: 8
                 anchors.bottomMargin: 24
diff --git a/client/ui/qml/Pages2/PageSetupWizardProtocolSettings.qml b/client/ui/qml/Pages2/PageSetupWizardProtocolSettings.qml
index 2f5ed569..d64fa097 100644
--- a/client/ui/qml/Pages2/PageSetupWizardProtocolSettings.qml
+++ b/client/ui/qml/Pages2/PageSetupWizardProtocolSettings.qml
@@ -212,6 +212,7 @@ PageType {
 
                             headerText: qsTr("Port")
                             textField.maximumLength: 5
+                            textField.validator: IntValidator { bottom: 1; top: 65535 }
                         }
 
                         Rectangle {

From 8f6aa950cd4a7c34cf8f9e9d855505f63120e3e5 Mon Sep 17 00:00:00 2001
From: "vladimir.kuznetsov" <nethiuswork@gmail.com>
Date: Mon, 28 Aug 2023 22:03:28 +0300
Subject: [PATCH 077/278] fixed conflicts after merge

---
 client/amnezia_application.cpp               |   7 +-
 client/ui/controllers/importController.cpp   |  15 ++
 client/ui/controllers/settingsController.cpp |  12 ++
 client/ui/controllers/sitesController.cpp    |  12 ++
 client/ui/pages_logic/StartPageLogic.cpp     |  23 +--
 client/vpnconnection.cpp                     | 175 ++++++++++---------
 6 files changed, 140 insertions(+), 104 deletions(-)

diff --git a/client/amnezia_application.cpp b/client/amnezia_application.cpp
index 93f73cd6..c4586748 100644
--- a/client/amnezia_application.cpp
+++ b/client/amnezia_application.cpp
@@ -21,8 +21,8 @@
 #include "protocols/qml_register_protocols.h"
 
 #if defined(Q_OS_IOS)
-#include "platforms/ios/QtAppDelegate-C-Interface.h"
-#include "platforms/ios/ios_controller.h"
+    #include "platforms/ios/QtAppDelegate-C-Interface.h"
+    #include "platforms/ios/ios_controller.h"
 #endif
 
 #if defined(Q_OS_ANDROID) || defined(Q_OS_IOS)
@@ -108,6 +108,9 @@ void AmneziaApplication::init()
             &ImportController::extractConfigFromData);
     connect(AndroidController::instance(), &AndroidController::importConfigFromOutside, m_pageController.get(),
             &PageController::goToPageViewConfig);
+#endif
+
+#ifdef Q_OS_IOS
     IosController::Instance()->initialize();
 #endif
 
diff --git a/client/ui/controllers/importController.cpp b/client/ui/controllers/importController.cpp
index 81ab313b..7f8b82a9 100644
--- a/client/ui/controllers/importController.cpp
+++ b/client/ui/controllers/importController.cpp
@@ -10,6 +10,9 @@
     #include "../../platforms/android/androidutils.h"
     #include <QJniObject>
 #endif
+#ifdef Q_OS_IOS
+    #include <CoreFoundation/CoreFoundation.h>
+#endif
 #include "fileUtilites.h"
 
 namespace
@@ -88,6 +91,18 @@ void ImportController::extractConfigFromFile()
                                                  QStandardPaths::writableLocation(QStandardPaths::DocumentsLocation),
                                                  "*.vpn *.ovpn *.conf");
     QFile file(fileName);
+
+#ifdef Q_OS_IOS
+    CFURLRef url = CFURLCreateWithFileSystemPath(
+            kCFAllocatorDefault,
+            CFStringCreateWithCharacters(0, reinterpret_cast<const UniChar *>(fileName.unicode()), fileName.length()),
+            kCFURLPOSIXPathStyle, 0);
+
+    if (!CFURLStartAccessingSecurityScopedResource(url)) {
+        qDebug() << "Could not access path " << QUrl::fromLocalFile(fileName).toString();
+    }
+#endif
+
     if (file.open(QIODevice::ReadOnly)) {
         QString data = file.readAll();
 
diff --git a/client/ui/controllers/settingsController.cpp b/client/ui/controllers/settingsController.cpp
index f09ebc21..531d3c50 100644
--- a/client/ui/controllers/settingsController.cpp
+++ b/client/ui/controllers/settingsController.cpp
@@ -95,6 +95,18 @@ void SettingsController::restoreAppConfig()
     }
 
     QFile file(fileName);
+
+#ifdef Q_OS_IOS
+    CFURLRef url = CFURLCreateWithFileSystemPath(
+            kCFAllocatorDefault,
+            CFStringCreateWithCharacters(0, reinterpret_cast<const UniChar *>(fileName.unicode()), fileName.length()),
+            kCFURLPOSIXPathStyle, 0);
+
+    if (!CFURLStartAccessingSecurityScopedResource(url)) {
+        qDebug() << "Could not access path " << QUrl::fromLocalFile(fileName).toString();
+    }
+#endif
+
     file.open(QIODevice::ReadOnly);
     QByteArray data = file.readAll();
 
diff --git a/client/ui/controllers/sitesController.cpp b/client/ui/controllers/sitesController.cpp
index 80cac698..891ddb6f 100644
--- a/client/ui/controllers/sitesController.cpp
+++ b/client/ui/controllers/sitesController.cpp
@@ -90,6 +90,18 @@ void SitesController::importSites(bool replaceExisting)
     }
 
     QFile file(fileName);
+
+#ifdef Q_OS_IOS
+    CFURLRef url = CFURLCreateWithFileSystemPath(
+            kCFAllocatorDefault,
+            CFStringCreateWithCharacters(0, reinterpret_cast<const UniChar *>(fileName.unicode()), fileName.length()),
+            kCFURLPOSIXPathStyle, 0);
+
+    if (!CFURLStartAccessingSecurityScopedResource(url)) {
+        qDebug() << "Could not access path " << QUrl::fromLocalFile(fileName).toString();
+    }
+#endif
+
     if (!file.open(QIODevice::ReadOnly)) {
         emit errorOccurred(tr("Can't open file: ") + fileName);
         return;
diff --git a/client/ui/pages_logic/StartPageLogic.cpp b/client/ui/pages_logic/StartPageLogic.cpp
index 9b89781f..891d67fb 100644
--- a/client/ui/pages_logic/StartPageLogic.cpp
+++ b/client/ui/pages_logic/StartPageLogic.cpp
@@ -19,17 +19,10 @@
 #endif
 
 #ifdef Q_OS_IOS
-#include <CoreFoundation/CoreFoundation.h>
+    #include <CoreFoundation/CoreFoundation.h>
 #endif
 
-namespace {
-enum class ConfigTypes {
-    Amnezia,
-    OpenVpn,
-    WireGuard
-};
-
-ConfigTypes checkConfigFormat(const QString &config)
+namespace
 {
     enum class ConfigTypes {
         Amnezia,
@@ -200,18 +193,18 @@ void StartPageLogic::onPushButtonImportOpenFile()
         return;
 
     QFile file(fileName);
-    
+
 #ifdef Q_OS_IOS
     CFURLRef url = CFURLCreateWithFileSystemPath(
-                kCFAllocatorDefault,   CFStringCreateWithCharacters(0, reinterpret_cast<const UniChar *>(fileName.unicode()),
-                                                                    fileName.length()),
-                kCFURLPOSIXPathStyle, 0);
-    
+            kCFAllocatorDefault,
+            CFStringCreateWithCharacters(0, reinterpret_cast<const UniChar *>(fileName.unicode()), fileName.length()),
+            kCFURLPOSIXPathStyle, 0);
+
     if (!CFURLStartAccessingSecurityScopedResource(url)) {
         qDebug() << "Could not access path " << QUrl::fromLocalFile(fileName).toString();
     }
 #endif
-    
+
     file.open(QIODevice::ReadOnly);
     QByteArray data = file.readAll();
 
diff --git a/client/vpnconnection.cpp b/client/vpnconnection.cpp
index 5c9e4c3e..1e8fd60a 100644
--- a/client/vpnconnection.cpp
+++ b/client/vpnconnection.cpp
@@ -5,41 +5,40 @@
 #include <QHostInfo>
 #include <QJsonObject>
 
-#include <configurators/openvpn_configurator.h>
 #include <configurators/cloak_configurator.h>
+#include <configurators/openvpn_configurator.h>
 #include <configurators/shadowsocks_configurator.h>
-#include <configurators/wireguard_configurator.h>
 #include <configurators/vpn_configurator.h>
+#include <configurators/wireguard_configurator.h>
 #include <core/servercontroller.h>
 
 #ifdef AMNEZIA_DESKTOP
-#include "ipc.h"
-#include "core/ipcclient.h"
-#include <protocols/wireguardprotocol.h>
+    #include "core/ipcclient.h"
+    #include "ipc.h"
+    #include <protocols/wireguardprotocol.h>
 #endif
 
 #ifdef Q_OS_ANDROID
-#include "../../platforms/android/android_controller.h"
+    #include "../../platforms/android/android_controller.h"
 #endif
 
 #ifdef Q_OS_IOS
-#include "platforms/ios/ios_controller.h"
+    #include "platforms/ios/ios_controller.h"
 #endif
 
 #include "utilities.h"
 #include "vpnconnection.h"
 
-VpnConnection::VpnConnection(std::shared_ptr<Settings> settings,
-    std::shared_ptr<VpnConfigurator> configurator, QObject* parent) : QObject(parent),
-    m_settings(settings),
-    m_configurator(configurator),
-    m_checkTimer(new QTimer(this))
+VpnConnection::VpnConnection(std::shared_ptr<Settings> settings, std::shared_ptr<VpnConfigurator> configurator,
+                             QObject *parent)
+    : QObject(parent), m_settings(settings), m_configurator(configurator), m_checkTimer(new QTimer(this))
 {
     m_checkTimer.setInterval(1000);
 #ifdef Q_OS_IOS
-    connect(IosController::Instance(), &IosController::connectionStateChanged, this, &VpnConnection::onConnectionStateChanged);
+    connect(IosController::Instance(), &IosController::connectionStateChanged, this,
+            &VpnConnection::onConnectionStateChanged);
     connect(IosController::Instance(), &IosController::bytesChanged, this, &VpnConnection::onBytesChanged);
-    
+
 #endif
 }
 
@@ -60,27 +59,23 @@ void VpnConnection::onConnectionStateChanged(Vpn::ConnectionState state)
 
 #ifdef AMNEZIA_DESKTOP
     if (IpcClient::Interface()) {
-        if (state == Vpn::ConnectionState::Connected){
+        if (state == Vpn::ConnectionState::Connected) {
             IpcClient::Interface()->resetIpStack();
             IpcClient::Interface()->flushDns();
 
             if (m_settings->routeMode() != Settings::VpnAllSites) {
                 IpcClient::Interface()->routeDeleteList(m_vpnProtocol->vpnGateway(), QStringList() << "0.0.0.0");
-                //qDebug() << "VpnConnection::onConnectionStateChanged :: adding custom routes, count:" << forwardIps.size();
+                // qDebug() << "VpnConnection::onConnectionStateChanged :: adding custom routes, count:" << forwardIps.size();
             }
             QString dns1 = m_vpnConfiguration.value(config_key::dns1).toString();
             QString dns2 = m_vpnConfiguration.value(config_key::dns1).toString();
 
-            IpcClient::Interface()->routeAddList(m_vpnProtocol->vpnGateway(),
-                QStringList() << dns1 << dns2);
-
+            IpcClient::Interface()->routeAddList(m_vpnProtocol->vpnGateway(), QStringList() << dns1 << dns2);
 
             if (m_settings->routeMode() == Settings::VpnOnlyForwardSites) {
-                QTimer::singleShot(1000, m_vpnProtocol.data(), [this](){
-                    addSitesRoutes(m_vpnProtocol->vpnGateway(), m_settings->routeMode());
-                });
-            }
-            else if (m_settings->routeMode() == Settings::VpnAllExceptSites) {
+                QTimer::singleShot(1000, m_vpnProtocol.data(),
+                                   [this]() { addSitesRoutes(m_vpnProtocol->vpnGateway(), m_settings->routeMode()); });
+            } else if (m_settings->routeMode() == Settings::VpnAllExceptSites) {
                 IpcClient::Interface()->routeAddList(m_vpnProtocol->vpnGateway(), QStringList() << "0.0.0.0/1");
                 IpcClient::Interface()->routeAddList(m_vpnProtocol->vpnGateway(), QStringList() << "128.0.0.0/1");
 
@@ -88,9 +83,7 @@ void VpnConnection::onConnectionStateChanged(Vpn::ConnectionState state)
                 addSitesRoutes(m_vpnProtocol->routeGateway(), m_settings->routeMode());
             }
 
-
-        }
-        else if (state == Vpn::ConnectionState::Error) {
+        } else if (state == Vpn::ConnectionState::Error) {
             IpcClient::Interface()->flushDns();
 
             if (m_settings->routeMode() == Settings::VpnOnlyForwardSites) {
@@ -103,8 +96,7 @@ void VpnConnection::onConnectionStateChanged(Vpn::ConnectionState state)
 #ifdef Q_OS_IOS
     if (state == Vpn::ConnectionState::Connected) {
         m_checkTimer.start();
-    }
-    else {
+    } else {
         m_checkTimer.stop();
     }
 #endif
@@ -125,8 +117,7 @@ void VpnConnection::addSitesRoutes(const QString &gw, Settings::RouteMode mode)
     for (auto i = m.constBegin(); i != m.constEnd(); ++i) {
         if (Utils::checkIpSubnetFormat(i.key())) {
             ips.append(i.key());
-        }
-        else {
+        } else {
             if (Utils::checkIpSubnetFormat(i.value().toString())) {
                 ips.append(i.value().toString());
             }
@@ -139,24 +130,24 @@ void VpnConnection::addSitesRoutes(const QString &gw, Settings::RouteMode mode)
     IpcClient::Interface()->routeAddList(gw, ips);
 
     // re-resolve domains
-    for (const QString &site: sites) {
-            const auto &cbResolv = [this, site, gw, mode, ips](const QHostInfo &hostInfo){
-                const QList<QHostAddress> &addresses = hostInfo.addresses();
-                QString ipv4Addr;
-                for (const QHostAddress &addr: hostInfo.addresses()) {
-                    if (addr.protocol() == QAbstractSocket::NetworkLayerProtocol::IPv4Protocol) {
-                        const QString &ip = addr.toString();
-                        //qDebug() << "VpnConnection::addSitesRoutes updating site" << site << ip;
-                        if (!ips.contains(ip)) {
-                            IpcClient::Interface()->routeAddList(gw, QStringList() << ip);
-                            m_settings->addVpnSite(mode, site, ip);
-                        }
-                        flushDns();
-                        break;
+    for (const QString &site : sites) {
+        const auto &cbResolv = [this, site, gw, mode, ips](const QHostInfo &hostInfo) {
+            const QList<QHostAddress> &addresses = hostInfo.addresses();
+            QString ipv4Addr;
+            for (const QHostAddress &addr : hostInfo.addresses()) {
+                if (addr.protocol() == QAbstractSocket::NetworkLayerProtocol::IPv4Protocol) {
+                    const QString &ip = addr.toString();
+                    // qDebug() << "VpnConnection::addSitesRoutes updating site" << site << ip;
+                    if (!ips.contains(ip)) {
+                        IpcClient::Interface()->routeAddList(gw, QStringList() << ip);
+                        m_settings->addVpnSite(mode, site, ip);
                     }
+                    flushDns();
+                    break;
                 }
-            };
-            QHostInfo::lookupHost(site, this, cbResolv);
+            }
+        };
+        QHostInfo::lookupHost(site, this, cbResolv);
     }
 #endif
 }
@@ -172,8 +163,7 @@ void VpnConnection::addRoutes(const QStringList &ips)
     if (connectionState() == Vpn::ConnectionState::Connected && IpcClient::Interface()) {
         if (m_settings->routeMode() == Settings::VpnOnlyForwardSites) {
             IpcClient::Interface()->routeAddList(m_vpnProtocol->vpnGateway(), ips);
-        }
-        else if (m_settings->routeMode() == Settings::VpnAllExceptSites) {
+        } else if (m_settings->routeMode() == Settings::VpnAllExceptSites) {
             IpcClient::Interface()->routeAddList(m_vpnProtocol->routeGateway(), ips);
         }
     }
@@ -186,8 +176,7 @@ void VpnConnection::deleteRoutes(const QStringList &ips)
     if (connectionState() == Vpn::ConnectionState::Connected && IpcClient::Interface()) {
         if (m_settings->routeMode() == Settings::VpnOnlyForwardSites) {
             IpcClient::Interface()->routeDeleteList(vpnProtocol()->vpnGateway(), ips);
-        }
-        else if (m_settings->routeMode() == Settings::VpnAllExceptSites) {
+        } else if (m_settings->routeMode() == Settings::VpnAllExceptSites) {
             IpcClient::Interface()->routeDeleteList(m_vpnProtocol->routeGateway(), ips);
         }
     }
@@ -197,7 +186,8 @@ void VpnConnection::deleteRoutes(const QStringList &ips)
 void VpnConnection::flushDns()
 {
 #ifdef AMNEZIA_DESKTOP
-    if (IpcClient::Interface()) IpcClient::Interface()->flushDns();
+    if (IpcClient::Interface())
+        IpcClient::Interface()->flushDns();
 #endif
 }
 
@@ -213,18 +203,22 @@ ErrorCode VpnConnection::lastError() const
 QMap<Proto, QString> VpnConnection::getLastVpnConfig(const QJsonObject &containerConfig)
 {
     QMap<Proto, QString> configs;
-    for (Proto proto: ProtocolProps::allProtocols()) {
+    for (Proto proto : ProtocolProps::allProtocols()) {
 
-        QString cfg = containerConfig.value(ProtocolProps::protoToString(proto)).toObject().value(config_key::last_config).toString();
+        QString cfg = containerConfig.value(ProtocolProps::protoToString(proto))
+                              .toObject()
+                              .value(config_key::last_config)
+                              .toString();
 
-        if (!cfg.isEmpty()) configs.insert(proto, cfg);
+        if (!cfg.isEmpty())
+            configs.insert(proto, cfg);
     }
     return configs;
 }
 
-QString VpnConnection::createVpnConfigurationForProto(int serverIndex,
-    const ServerCredentials &credentials, DockerContainer container, const QJsonObject &containerConfig, Proto proto,
-    ErrorCode *errorCode)
+QString VpnConnection::createVpnConfigurationForProto(int serverIndex, const ServerCredentials &credentials,
+                                                      DockerContainer container, const QJsonObject &containerConfig,
+                                                      Proto proto, ErrorCode *errorCode)
 {
     QMap<Proto, QString> lastVpnConfig = getLastVpnConfig(containerConfig);
 
@@ -232,10 +226,8 @@ QString VpnConnection::createVpnConfigurationForProto(int serverIndex,
     if (lastVpnConfig.contains(proto)) {
         configData = lastVpnConfig.value(proto);
         configData = m_configurator->processConfigWithLocalSettings(serverIndex, container, proto, configData);
-    }
-    else {
-        configData = m_configurator->genVpnProtocolConfig(credentials,
-            container, containerConfig, proto, errorCode);
+    } else {
+        configData = m_configurator->genVpnProtocolConfig(credentials, container, containerConfig, proto, errorCode);
 
         if (errorCode && *errorCode) {
             return "";
@@ -246,7 +238,8 @@ QString VpnConnection::createVpnConfigurationForProto(int serverIndex,
         configData = m_configurator->processConfigWithLocalSettings(serverIndex, container, proto, configData);
 
         if (serverIndex >= 0) {
-            qDebug() << "VpnConnection::createVpnConfiguration: saving config for server #" << serverIndex << container << proto;
+            qDebug() << "VpnConnection::createVpnConfiguration: saving config for server #" << serverIndex << container
+                     << proto;
             QJsonObject protoObject = m_settings->protocolConfig(serverIndex, container, proto);
             protoObject.insert(config_key::last_config, configDataBeforeLocalProcessing);
             m_settings->setProtocolConfig(serverIndex, container, proto, protoObject);
@@ -256,17 +249,18 @@ QString VpnConnection::createVpnConfigurationForProto(int serverIndex,
     return configData;
 }
 
-QJsonObject VpnConnection::createVpnConfiguration(int serverIndex,
-    const ServerCredentials &credentials, DockerContainer container,
-    const QJsonObject &containerConfig, ErrorCode *errorCode)
+QJsonObject VpnConnection::createVpnConfiguration(int serverIndex, const ServerCredentials &credentials,
+                                                  DockerContainer container, const QJsonObject &containerConfig,
+                                                  ErrorCode *errorCode)
 {
     QJsonObject vpnConfiguration;
 
     for (ProtocolEnumNS::Proto proto : ContainerProps::protocolsForContainer(container)) {
-        QJsonObject vpnConfigData = QJsonDocument::fromJson(
-            createVpnConfigurationForProto(
-                serverIndex, credentials, container, containerConfig, proto, errorCode).toUtf8()).
-                    object();
+        QJsonObject vpnConfigData =
+                QJsonDocument::fromJson(createVpnConfigurationForProto(serverIndex, credentials, container,
+                                                                       containerConfig, proto, errorCode)
+                                                .toUtf8())
+                        .object();
 
         if (errorCode && *errorCode) {
             return {};
@@ -293,12 +287,14 @@ QJsonObject VpnConnection::createVpnConfiguration(int serverIndex,
     return vpnConfiguration;
 }
 
-void VpnConnection::connectToVpn(int serverIndex,
-    const ServerCredentials &credentials, DockerContainer container, const QJsonObject &containerConfig)
+void VpnConnection::connectToVpn(int serverIndex, const ServerCredentials &credentials, DockerContainer container,
+                                 const QJsonObject &containerConfig)
 {
     qDebug() << QString("ConnectToVpn, Server index is %1, container is %2, route mode is")
-                    .arg(serverIndex).arg(ContainerProps::containerToString(container)) << m_settings->routeMode();
-#if !defined (Q_OS_ANDROID) && !defined (Q_OS_IOS)
+                        .arg(serverIndex)
+                        .arg(ContainerProps::containerToString(container))
+             << m_settings->routeMode();
+#if !defined(Q_OS_ANDROID) && !defined(Q_OS_IOS)
     if (!m_IpcClient) {
         m_IpcClient = new IpcClient(this);
     }
@@ -331,8 +327,8 @@ void VpnConnection::connectToVpn(int serverIndex,
         emit connectionStateChanged(Vpn::ConnectionState::Error);
         return;
     }
-    
-#if !defined (Q_OS_ANDROID) && !defined (Q_OS_IOS)
+
+#if !defined(Q_OS_ANDROID) && !defined(Q_OS_IOS)
     m_vpnProtocol.reset(VpnProtocol::factory(container, m_vpnConfiguration));
     if (!m_vpnProtocol) {
         emit connectionStateChanged(Vpn::ConnectionState::Error);
@@ -354,17 +350,21 @@ void VpnConnection::connectToVpn(int serverIndex,
     createProtocolConnections();
 
     e = m_vpnProtocol.data()->start();
-    if (e) emit connectionStateChanged(Vpn::ConnectionState::Error);
+    if (e)
+        emit connectionStateChanged(Vpn::ConnectionState::Error);
 }
 
-void VpnConnection::createProtocolConnections() {
+void VpnConnection::createProtocolConnections()
+{
     connect(m_vpnProtocol.data(), &VpnProtocol::protocolError, this, &VpnConnection::vpnProtocolError);
-    connect(m_vpnProtocol.data(), SIGNAL(connectionStateChanged(Vpn::ConnectionState)), this, SLOT(onConnectionStateChanged(Vpn::ConnectionState)));
+    connect(m_vpnProtocol.data(), SIGNAL(connectionStateChanged(Vpn::ConnectionState)), this,
+            SLOT(onConnectionStateChanged(Vpn::ConnectionState)));
     connect(m_vpnProtocol.data(), SIGNAL(bytesChanged(quint64, quint64)), this, SLOT(onBytesChanged(quint64, quint64)));
 }
 
 #ifdef Q_OS_ANDROID
-void VpnConnection::restoreConnection() {
+void VpnConnection::restoreConnection()
+{
     createAndroidConnections();
 
     m_vpnProtocol.reset(androidVpnProtocol);
@@ -384,11 +384,13 @@ void VpnConnection::createAndroidConnections(DockerContainer container)
 {
     androidVpnProtocol = createDefaultAndroidVpnProtocol(container);
 
-    connect(AndroidController::instance(), &AndroidController::connectionStateChanged, androidVpnProtocol, &AndroidVpnProtocol::setConnectionState);
-    connect(AndroidController::instance(), &AndroidController::statusUpdated, androidVpnProtocol, &AndroidVpnProtocol::connectionDataUpdated);
+    connect(AndroidController::instance(), &AndroidController::connectionStateChanged, androidVpnProtocol,
+            &AndroidVpnProtocol::setConnectionState);
+    connect(AndroidController::instance(), &AndroidController::statusUpdated, androidVpnProtocol,
+            &AndroidVpnProtocol::connectionDataUpdated);
 }
 
-AndroidVpnProtocol* VpnConnection::createDefaultAndroidVpnProtocol(DockerContainer container)
+AndroidVpnProtocol *VpnConnection::createDefaultAndroidVpnProtocol(DockerContainer container)
 {
     Proto proto = ContainerProps::defaultProtocol(container);
     AndroidVpnProtocol *androidVpnProtocol = new AndroidVpnProtocol(proto, m_vpnConfiguration);
@@ -415,8 +417,6 @@ void VpnConnection::disconnectFromVpn()
     }
 #endif
 
-    if (!m_vpnProtocol.data()) {
-        emit connectionStateChanged(Vpn::ConnectionState::Disconnected);
 #ifdef Q_OS_ANDROID
     AndroidController::instance()->stop();
 #endif
@@ -427,7 +427,7 @@ void VpnConnection::disconnectFromVpn()
 #endif
 
     if (!m_vpnProtocol.data()) {
-        emit connectionStateChanged(VpnProtocol::Disconnected);
+        emit connectionStateChanged(Vpn::ConnectionState::Disconnected);
         return;
     }
 
@@ -439,7 +439,8 @@ void VpnConnection::disconnectFromVpn()
 
 Vpn::ConnectionState VpnConnection::connectionState()
 {
-    if (!m_vpnProtocol) return Vpn::ConnectionState::Disconnected;
+    if (!m_vpnProtocol)
+        return Vpn::ConnectionState::Disconnected;
     return m_vpnProtocol->connectionState();
 }
 

From 810da0db615bf457ac817af8bc843962d1e399c7 Mon Sep 17 00:00:00 2001
From: pokamest <pokamest@gmail.com>
Date: Mon, 28 Aug 2023 14:14:10 -0700
Subject: [PATCH 078/278] Fixes for iOS

---
 client/platforms/ios/ios_controller.h        |  2 +-
 client/platforms/ios/ios_controller.mm       | 28 ++++++++++----------
 client/ui/controllers/settingsController.cpp |  4 +++
 client/ui/controllers/sitesController.cpp    |  4 +++
 4 files changed, 23 insertions(+), 15 deletions(-)

diff --git a/client/platforms/ios/ios_controller.h b/client/platforms/ios/ios_controller.h
index 0750f7cd..4d1122b2 100644
--- a/client/platforms/ios/ios_controller.h
+++ b/client/platforms/ios/ios_controller.h
@@ -47,7 +47,7 @@ public:
     void getBackendLogs(std::function<void (const QString &)> &&callback);
     void checkStatus();
 signals:
-    void connectionStateChanged(VpnProtocol::VpnConnectionState state);
+    void connectionStateChanged(Vpn::ConnectionState state);
     void bytesChanged(quint64 receivedBytes, quint64 sentBytes);
 
 protected slots:
diff --git a/client/platforms/ios/ios_controller.mm b/client/platforms/ios/ios_controller.mm
index c8e27252..6f23ac81 100644
--- a/client/platforms/ios/ios_controller.mm
+++ b/client/platforms/ios/ios_controller.mm
@@ -30,22 +30,22 @@ const char* MessageKey::host = "host";
 const char* MessageKey::port = "port";
 const char* MessageKey::isOnDemand = "is-on-demand";
 
-VpnProtocol::VpnConnectionState iosStatusToState(NEVPNStatus status) {
+Vpn::ConnectionState iosStatusToState(NEVPNStatus status) {
   switch (status) {
     case NEVPNStatusInvalid:
-        return VpnProtocol::VpnConnectionState::Unknown;
+        return Vpn::ConnectionState::Unknown;
     case NEVPNStatusDisconnected:
-        return VpnProtocol::VpnConnectionState::Disconnected;
+        return Vpn::ConnectionState::Disconnected;
     case NEVPNStatusConnecting:
-        return VpnProtocol::VpnConnectionState::Connecting;
+        return Vpn::ConnectionState::Connecting;
     case NEVPNStatusConnected:
-        return VpnProtocol::VpnConnectionState::Connected;
+        return Vpn::ConnectionState::Connected;
     case NEVPNStatusReasserting:
-        return VpnProtocol::VpnConnectionState::Connecting;
+        return Vpn::ConnectionState::Connecting;
     case NEVPNStatusDisconnecting:
-        return VpnProtocol::VpnConnectionState::Disconnecting;
+        return Vpn::ConnectionState::Disconnecting;
     default:
-        return VpnProtocol::VpnConnectionState::Unknown;
+        return Vpn::ConnectionState::Unknown;
 }
 }
 
@@ -85,7 +85,7 @@ bool IosController::initialize()
         @try {
             if (error) {
                 qDebug() << "IosController::initialize : Error:" << [error.localizedDescription UTF8String];
-                emit connectionStateChanged(VpnProtocol::VpnConnectionState::Error);
+                emit connectionStateChanged(Vpn::ConnectionState::Error);
                 ok = false;
                 return;
             }
@@ -147,7 +147,7 @@ bool IosController::connectVpn(amnezia::Proto proto, const QJsonObject& configur
         @try {
             if (error) {
                 qDebug() << "IosController::connectVpn : Error:" << [error.localizedDescription UTF8String];
-                emit connectionStateChanged(VpnProtocol::VpnConnectionState::Error);
+                emit connectionStateChanged(Vpn::ConnectionState::Error);
                 ok = false;
                 return;
             }
@@ -161,7 +161,7 @@ bool IosController::connectVpn(amnezia::Proto proto, const QJsonObject& configur
                     m_currentTunnel = manager;
                     qDebug() << "IosController::connectVpn : Using existing tunnel";
                     if (manager.connection.status == NEVPNStatusConnected) {
-                        emit connectionStateChanged(VpnProtocol::VpnConnectionState::Connected);
+                        emit connectionStateChanged(Vpn::ConnectionState::Connected);
                         return;
                     }
 
@@ -356,7 +356,7 @@ void IosController::startTunnel()
 
             if (saveError) {
                 qDebug() << "IosController::startOpenVPN : Connect OpenVPN Tunnel Save Error" << saveError.localizedDescription.UTF8String;
-                emit connectionStateChanged(VpnProtocol::VpnConnectionState::Error);
+                emit connectionStateChanged(Vpn::ConnectionState::Error);
                 return;
             }
 
@@ -365,7 +365,7 @@ void IosController::startTunnel()
 
                     if (loadError) {
                         qDebug() << "IosController::startOpenVPN : Connect OpenVPN Tunnel Load Error" << loadError.localizedDescription.UTF8String;
-                        emit connectionStateChanged(VpnProtocol::VpnConnectionState::Error);
+                        emit connectionStateChanged(Vpn::ConnectionState::Error);
                         return;
                     }
 
@@ -389,7 +389,7 @@ void IosController::startTunnel()
                     if (!started || startError) {
                         qDebug() << "IosController::startOpenVPN : Connect OpenVPN Tunnel Start Error"
                             << (startError ? startError.localizedDescription.UTF8String : "");
-                        emit connectionStateChanged(VpnProtocol::VpnConnectionState::Error);
+                        emit connectionStateChanged(Vpn::ConnectionState::Error);
                     } else {
                         qDebug() << "IosController::startOpenVPN : Starting the tunnel succeeded";
                     }
diff --git a/client/ui/controllers/settingsController.cpp b/client/ui/controllers/settingsController.cpp
index 531d3c50..7d1bf643 100644
--- a/client/ui/controllers/settingsController.cpp
+++ b/client/ui/controllers/settingsController.cpp
@@ -2,6 +2,10 @@
 
 #include <QStandardPaths>
 
+#ifdef Q_OS_IOS
+    #include <CoreFoundation/CoreFoundation.h>
+#endif
+
 #include "fileUtilites.h"
 #include "logger.h"
 #include "ui/qautostart.h"
diff --git a/client/ui/controllers/sitesController.cpp b/client/ui/controllers/sitesController.cpp
index 891ddb6f..00704bca 100644
--- a/client/ui/controllers/sitesController.cpp
+++ b/client/ui/controllers/sitesController.cpp
@@ -3,6 +3,10 @@
 #include <QHostInfo>
 #include <QStandardPaths>
 
+#ifdef Q_OS_IOS
+    #include <CoreFoundation/CoreFoundation.h>
+#endif
+
 #include "fileUtilites.h"
 #include "utilities.h"
 

From 0eda42f29fa9d49540fea3dd93da7935cef575f9 Mon Sep 17 00:00:00 2001
From: Mykola Baibuz <mykola.baibuz@gmail.com>
Date: Wed, 30 Aug 2023 01:17:14 +0300
Subject: [PATCH 079/278] Savefile for iOS

---
 client/fileUtilites.cpp | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/client/fileUtilites.cpp b/client/fileUtilites.cpp
index 87fa7aed..94ef077e 100644
--- a/client/fileUtilites.cpp
+++ b/client/fileUtilites.cpp
@@ -1,4 +1,5 @@
 #include "fileUtilites.h"
+#include "platforms/ios/MobileUtils.h"
 
 #include <QDesktopServices>
 #include <QStandardPaths>
@@ -6,9 +7,15 @@
 void FileUtilites::saveFile(const QString &fileExtension, const QString &caption, const QString &fileName,
                             const QString &data)
 {
+
+#ifdef Q_OS_IOS
+    QUrl fileUrl = QDir::tempPath() + "/" + fileName;
+#else
     QString docDir = QStandardPaths::writableLocation(QStandardPaths::DocumentsLocation);
     QUrl fileUrl = QFileDialog::getSaveFileUrl(nullptr, caption, QUrl::fromLocalFile(docDir + "/" + fileName),
                                                "*" + fileExtension);
+#endif
+    
     if (fileUrl.isEmpty())
         return;
     if (!fileUrl.toString().endsWith(fileExtension)) {
@@ -17,13 +24,24 @@ void FileUtilites::saveFile(const QString &fileExtension, const QString &caption
     if (fileUrl.isEmpty())
         return;
 
+#ifdef Q_OS_IOS
+    QFile save(fileUrl.toString());
+#else
     QFile save(fileUrl.toLocalFile());
+#endif
 
     // todo check if save successful
     save.open(QIODevice::WriteOnly);
     save.write(data.toUtf8());
     save.close();
 
+#ifdef Q_OS_IOS
+    QStringList filesToSend;
+    filesToSend.append(fileUrl.toString());
+    MobileUtils::shareText(filesToSend);
+    return;
+#endif
+
     QFileInfo fi(fileUrl.toLocalFile());
     QDesktopServices::openUrl(fi.absoluteDir().absolutePath());
 }

From 1c1a82696b52d0f5a8d86923f7137a1d6e629998 Mon Sep 17 00:00:00 2001
From: Mykola Baibuz <mykola.baibuz@gmail.com>
Date: Wed, 30 Aug 2023 17:23:55 -0400
Subject: [PATCH 080/278] Fix qrDecoder for Android

---
 client/ui/qml/Pages2/PageSetupWizardConfigSource.qml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/client/ui/qml/Pages2/PageSetupWizardConfigSource.qml b/client/ui/qml/Pages2/PageSetupWizardConfigSource.qml
index 45aad9d0..68544497 100644
--- a/client/ui/qml/Pages2/PageSetupWizardConfigSource.qml
+++ b/client/ui/qml/Pages2/PageSetupWizardConfigSource.qml
@@ -87,7 +87,9 @@ It's okay as long as it's from someone you trust.")
 
                 clickedFunction: function() {
                     ImportController.startDecodingQr()
-                    goToPage(PageEnum.PageSetupWizardQrReader)
+                    if (Qt.platform.os === "ios") {
+                        goToPage(PageEnum.PageSetupWizardQrReader)
+                    }
                 }
             }
 

From e8862a3811d7b0de79881f391bebb5ddbd617a4d Mon Sep 17 00:00:00 2001
From: "vladimir.kuznetsov" <nethiuswork@gmail.com>
Date: Wed, 30 Aug 2023 15:10:44 +0500
Subject: [PATCH 081/278] removed the use of QFileDialog

---
 client/CMakeLists.txt                         | 23 ++++---
 client/amnezia_application.h                  | 10 +--
 client/core/servercontroller.cpp              |  1 -
 client/fileUtilites.cpp                       | 69 +++++++++++++------
 client/fileUtilites.h                         | 11 ++-
 client/platforms/ios/ios_controller.h         |  2 +-
 client/ui/controllers/exportController.cpp    | 31 +--------
 client/ui/controllers/exportController.h      |  2 +-
 client/ui/controllers/importController.cpp    | 18 +----
 client/ui/controllers/importController.h      |  2 +-
 client/ui/controllers/settingsController.cpp  | 32 ++-------
 client/ui/controllers/settingsController.h    |  6 +-
 client/ui/controllers/sitesController.cpp     | 27 ++------
 client/ui/controllers/sitesController.h       |  4 +-
 .../qml/Components/ShareConnectionDrawer.qml  | 17 ++++-
 .../qml/Controls2/TextFieldWithHeaderType.qml | 10 +++
 client/ui/qml/Pages2/PageSettingsBackup.qml   | 42 +++++++++--
 client/ui/qml/Pages2/PageSettingsLogging.qml  | 18 ++++-
 .../qml/Pages2/PageSettingsSplitTunneling.qml | 44 +++++++++---
 .../Pages2/PageSetupWizardConfigSource.qml    | 13 +++-
 client/ui/uilogic.cpp                         |  4 +-
 client/vpnconnection.cpp                      |  2 +-
 22 files changed, 224 insertions(+), 164 deletions(-)

diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt
index 713a9165..47264fe6 100644
--- a/client/CMakeLists.txt
+++ b/client/CMakeLists.txt
@@ -10,31 +10,34 @@ set_property(GLOBAL PROPERTY AUTOMOC_TARGETS_FOLDER "Autogen")
 set_property(GLOBAL PROPERTY PREDEFINED_TARGETS_FOLDER "Autogen")
 
 set(PACKAGES
-    Widgets Core Gui Network Xml
+    Core Gui Network Xml
     RemoteObjects Quick Svg QuickControls2
     Core5Compat Concurrent LinguistTools
 )
+
 if(IOS)
-    set(PACKAGES
-        ${PACKAGES}
-        Multimedia
-	)
+    set(PACKAGES ${PACKAGES} Multimedia)
+endif()
+
+if(WIN32 OR (APPLE AND NOT IOS) OR (LINUX AND NOT ANDROID))
+    set(PACKAGES ${PACKAGES} Widgets)
 endif()
 
 find_package(Qt6 REQUIRED COMPONENTS ${PACKAGES})
 
 set(LIBS ${LIBS} 
-    Qt6::Widgets Qt6::Core Qt6::Gui
+    Qt6::Core Qt6::Gui
     Qt6::Network Qt6::Xml Qt6::RemoteObjects
     Qt6::Quick Qt6::Svg Qt6::QuickControls2
     Qt6::Core5Compat Qt6::Concurrent
 )
 
 if(IOS)
-    set(LIBS
-        ${LIBS}
-        Qt6::Multimedia
-    )
+    set(LIBS ${LIBS} Qt6::Multimedia)
+endif()
+
+if(WIN32 OR (APPLE AND NOT IOS) OR (LINUX AND NOT ANDROID))
+    set(LIBS ${LIBS} Qt6::Widgets)
 endif()
 
 qt_standard_project_setup()
diff --git a/client/amnezia_application.h b/client/amnezia_application.h
index c4f33753..e18fb70c 100644
--- a/client/amnezia_application.h
+++ b/client/amnezia_application.h
@@ -1,13 +1,15 @@
 #ifndef AMNEZIA_APPLICATION_H
 #define AMNEZIA_APPLICATION_H
 
-#include <QApplication>
-#include <QGuiApplication>
-
 #include <QCommandLineParser>
 #include <QQmlApplicationEngine>
 #include <QQmlContext>
 #include <QThread>
+#if defined(Q_OS_ANDROID) || defined(Q_OS_IOS)
+    #include <QGuiApplication>
+#else
+    #include <QApplication>
+#endif
 
 #include "settings.h"
 #include "vpnconnection.h"
@@ -39,7 +41,7 @@
 #define amnApp (static_cast<AmneziaApplication *>(QCoreApplication::instance()))
 
 #if defined(Q_OS_ANDROID) || defined(Q_OS_IOS)
-    #define AMNEZIA_BASE_CLASS QApplication
+    #define AMNEZIA_BASE_CLASS QGuiApp
 #else
     #define AMNEZIA_BASE_CLASS SingleApplication
     #define QAPPLICATION_CLASS QApplication
diff --git a/client/core/servercontroller.cpp b/client/core/servercontroller.cpp
index cbb87f11..0dad3020 100644
--- a/client/core/servercontroller.cpp
+++ b/client/core/servercontroller.cpp
@@ -1,6 +1,5 @@
 #include "servercontroller.h"
 
-#include <QApplication>
 #include <QCryptographicHash>
 #include <QDir>
 #include <QEventLoop>
diff --git a/client/fileUtilites.cpp b/client/fileUtilites.cpp
index 87fa7aed..659243aa 100644
--- a/client/fileUtilites.cpp
+++ b/client/fileUtilites.cpp
@@ -3,35 +3,59 @@
 #include <QDesktopServices>
 #include <QStandardPaths>
 
-void FileUtilites::saveFile(const QString &fileExtension, const QString &caption, const QString &fileName,
-                            const QString &data)
-{
-    QString docDir = QStandardPaths::writableLocation(QStandardPaths::DocumentsLocation);
-    QUrl fileUrl = QFileDialog::getSaveFileUrl(nullptr, caption, QUrl::fromLocalFile(docDir + "/" + fileName),
-                                               "*" + fileExtension);
-    if (fileUrl.isEmpty())
-        return;
-    if (!fileUrl.toString().endsWith(fileExtension)) {
-        fileUrl = QUrl(fileUrl.toString() + fileExtension);
-    }
-    if (fileUrl.isEmpty())
-        return;
+#ifdef Q_OS_ANDROID
+    #include "platforms/android/android_controller.h"
+#endif
 
-    QFile save(fileUrl.toLocalFile());
+#ifdef Q_OS_IOS
+    #include "platforms/ios/MobileUtils.h"
+    #include <CoreFoundation/CoreFoundation.h>
+#endif
+
+void FileUtilites::saveFile(QString fileName, const QString &data)
+{
+#if defined Q_OS_ANDROID
+    AndroidController::instance()->shareConfig(data, fileName);
+    return;
+#endif
+
+#ifdef Q_OS_IOS
+    QFile file(fileName);
+#else
+    QUrl fileUrl = QUrl(fileName);
+    QFile file(fileUrl.toLocalFile());
+#endif
 
     // todo check if save successful
-    save.open(QIODevice::WriteOnly);
-    save.write(data.toUtf8());
-    save.close();
+    file.open(QIODevice::WriteOnly);
+    file.write(data.toUtf8());
+    file.close();
+
+#ifdef Q_OS_IOS
+    QStringList filesToSend;
+    filesToSend.append(fileName);
+    MobileUtils::shareText(filesToSend);
+    return;
+#endif
 
     QFileInfo fi(fileUrl.toLocalFile());
     QDesktopServices::openUrl(fi.absoluteDir().absolutePath());
 }
 
-QString FileUtilites::getFileName(QWidget *parent, const QString &caption, const QString &dir, const QString &filter,
-                                  QString *selectedFilter, QFileDialog::Options options)
+QString FileUtilites::getFileName(QString fileName)
 {
-    QString fileName = QFileDialog::getOpenFileName(parent, caption, dir, filter, selectedFilter, options);
+#ifdef Q_OS_IOS
+    CFURLRef url = CFURLCreateWithFileSystemPath(
+            kCFAllocatorDefault,
+            CFStringCreateWithCharacters(0, reinterpret_cast<const UniChar *>(fileName.unicode()), fileName.length()),
+            kCFURLPOSIXPathStyle, 0);
+
+    if (!CFURLStartAccessingSecurityScopedResource(url)) {
+        qDebug() << "Could not access path " << QUrl::fromLocalFile(fileName).toString();
+    }
+
+    return fileName;
+#endif
 
 #ifdef Q_OS_ANDROID
     // patch for files containing spaces etc
@@ -42,6 +66,9 @@ QString FileUtilites::getFileName(QWidget *parent, const QString &caption, const
         rawUrl.replace(" ", "%20");
         fileName = contentUrl + sep + rawUrl;
     }
-#endif
+
     return fileName;
+#endif
+
+    return QUrl(FileUtilites::getFileName(fileName)).toLocalFile();
 }
diff --git a/client/fileUtilites.h b/client/fileUtilites.h
index 8cf4807c..21cb03a9 100644
--- a/client/fileUtilites.h
+++ b/client/fileUtilites.h
@@ -1,19 +1,16 @@
 #ifndef FILEUTILITES_H
 #define FILEUTILITES_H
 
-#include <QFileDialog>
+#include <QObject>
+#include <QString>
 
 class FileUtilites : public QObject
 {
     Q_OBJECT
 
 public:
-    static void saveFile(const QString &fileExtension, const QString &caption, const QString &fileName,
-                         const QString &data);
-
-    static QString getFileName(QWidget *parent = nullptr, const QString &caption = QString(),
-                               const QString &dir = QString(), const QString &filter = QString(),
-                               QString *selectedFilter = nullptr, QFileDialog::Options options = QFileDialog::Options());
+    static void saveFile(QString fileName, const QString &data);
+    static QString getFileName(QString fileName);
 };
 
 #endif // FILEUTILITES_H
diff --git a/client/platforms/ios/ios_controller.h b/client/platforms/ios/ios_controller.h
index 0750f7cd..4d1122b2 100644
--- a/client/platforms/ios/ios_controller.h
+++ b/client/platforms/ios/ios_controller.h
@@ -47,7 +47,7 @@ public:
     void getBackendLogs(std::function<void (const QString &)> &&callback);
     void checkStatus();
 signals:
-    void connectionStateChanged(VpnProtocol::VpnConnectionState state);
+    void connectionStateChanged(Vpn::ConnectionState state);
     void bytesChanged(quint64 receivedBytes, quint64 sentBytes);
 
 protected slots:
diff --git a/client/ui/controllers/exportController.cpp b/client/ui/controllers/exportController.cpp
index 4cee1dc9..ddc976cc 100644
--- a/client/ui/controllers/exportController.cpp
+++ b/client/ui/controllers/exportController.cpp
@@ -13,7 +13,6 @@
 #include "core/errorstrings.h"
 #include "fileUtilites.h"
 #ifdef Q_OS_ANDROID
-    #include "platforms/android/android_controller.h"
     #include "platforms/android/androidutils.h"
 #endif
 #include "qrcodegen.hpp"
@@ -201,35 +200,9 @@ QList<QString> ExportController::getQrCodes()
     return m_qrCodes;
 }
 
-void ExportController::saveFile(const QString &fileExtension, const QString &caption, const QString &fileName)
+void ExportController::saveFile(const QString &fileName)
 {
-#if defined Q_OS_IOS
-//    ext.replace("*", "");
-//    QString fileName = QDir::tempPath() + "/" + suggestedName;
-//
-//    if (fileName.isEmpty())
-//        return;
-//    if (!fileName.endsWith(ext))
-//        fileName.append(ext);
-//
-//    QFile::remove(fileName);
-//
-//    QFile save(fileName);
-//    save.open(QIODevice::WriteOnly);
-//    save.write(data.toUtf8());
-//    save.close();
-//
-//    QStringList filesToSend;
-//    filesToSend.append(fileName);
-//    MobileUtils::shareText(filesToSend);
-//    return;
-#endif
-#if defined Q_OS_ANDROID
-    AndroidController::instance()->shareConfig(m_config, "amnezia_config");
-    return;
-#endif
-
-    FileUtilites::saveFile(fileExtension, caption, fileName, m_config);
+    FileUtilites::saveFile(fileName, m_config);
 }
 
 QList<QString> ExportController::generateQrCodeImageSeries(const QByteArray &data)
diff --git a/client/ui/controllers/exportController.h b/client/ui/controllers/exportController.h
index 913dfc3a..b526521e 100644
--- a/client/ui/controllers/exportController.h
+++ b/client/ui/controllers/exportController.h
@@ -35,7 +35,7 @@ public slots:
     QString getConfig();
     QList<QString> getQrCodes();
 
-    void saveFile(const QString &fileExtension, const QString &caption, const QString &fileName);
+    void saveFile(const QString &fileName);
 
 signals:
     void generateConfig(int type);
diff --git a/client/ui/controllers/importController.cpp b/client/ui/controllers/importController.cpp
index 7f8b82a9..9a374aa1 100644
--- a/client/ui/controllers/importController.cpp
+++ b/client/ui/controllers/importController.cpp
@@ -85,23 +85,9 @@ ImportController::ImportController(const QSharedPointer<ServersModel> &serversMo
 #endif
 }
 
-void ImportController::extractConfigFromFile()
+void ImportController::extractConfigFromFile(const QString &fileName)
 {
-    QString fileName = FileUtilites::getFileName(Q_NULLPTR, tr("Open config file"),
-                                                 QStandardPaths::writableLocation(QStandardPaths::DocumentsLocation),
-                                                 "*.vpn *.ovpn *.conf");
-    QFile file(fileName);
-
-#ifdef Q_OS_IOS
-    CFURLRef url = CFURLCreateWithFileSystemPath(
-            kCFAllocatorDefault,
-            CFStringCreateWithCharacters(0, reinterpret_cast<const UniChar *>(fileName.unicode()), fileName.length()),
-            kCFURLPOSIXPathStyle, 0);
-
-    if (!CFURLStartAccessingSecurityScopedResource(url)) {
-        qDebug() << "Could not access path " << QUrl::fromLocalFile(fileName).toString();
-    }
-#endif
+    QFile file(FileUtilites::getFileName(fileName));
 
     if (file.open(QIODevice::ReadOnly)) {
         QString data = file.readAll();
diff --git a/client/ui/controllers/importController.h b/client/ui/controllers/importController.h
index cccdf4b7..7def7733 100644
--- a/client/ui/controllers/importController.h
+++ b/client/ui/controllers/importController.h
@@ -21,7 +21,7 @@ public:
 
 public slots:
     void importConfig();
-    void extractConfigFromFile();
+    void extractConfigFromFile(const QString &fileName);
     void extractConfigFromData(QString &data);
     void extractConfigFromCode(QString code);
     bool extractConfigFromQr(const QByteArray &data);
diff --git a/client/ui/controllers/settingsController.cpp b/client/ui/controllers/settingsController.cpp
index 531d3c50..7c7402e0 100644
--- a/client/ui/controllers/settingsController.cpp
+++ b/client/ui/controllers/settingsController.cpp
@@ -68,9 +68,9 @@ void SettingsController::openLogsFolder()
     Logger::openLogsFolder();
 }
 
-void SettingsController::exportLogsFile()
+void SettingsController::exportLogsFile(const QString &fileName)
 {
-    FileUtilites::saveFile(".log", tr("Save log"), "AmneziaVPN", Logger::getLogFile());
+    FileUtilites::saveFile(fileName, Logger::getLogFile());
 }
 
 void SettingsController::clearLogs()
@@ -79,35 +79,17 @@ void SettingsController::clearLogs()
     Logger::clearServiceLogs();
 }
 
-void SettingsController::backupAppConfig()
+void SettingsController::backupAppConfig(const QString &fileName)
 {
-    FileUtilites::saveFile(".backup", tr("Backup application config"), "AmneziaVPN", m_settings->backupAppConfig());
+    FileUtilites::saveFile(fileName, m_settings->backupAppConfig());
 }
 
-void SettingsController::restoreAppConfig()
+void SettingsController::restoreAppConfig(const QString &fileName)
 {
-    QString fileName =
-            FileUtilites::getFileName(Q_NULLPTR, tr("Open backup"),
-                                      QStandardPaths::writableLocation(QStandardPaths::DocumentsLocation), "*.backup");
-
-    if (fileName.isEmpty()) {
-        return;
-    }
-
-    QFile file(fileName);
-
-#ifdef Q_OS_IOS
-    CFURLRef url = CFURLCreateWithFileSystemPath(
-            kCFAllocatorDefault,
-            CFStringCreateWithCharacters(0, reinterpret_cast<const UniChar *>(fileName.unicode()), fileName.length()),
-            kCFURLPOSIXPathStyle, 0);
-
-    if (!CFURLStartAccessingSecurityScopedResource(url)) {
-        qDebug() << "Could not access path " << QUrl::fromLocalFile(fileName).toString();
-    }
-#endif
+    QFile file(FileUtilites::getFileName(fileName));
 
     file.open(QIODevice::ReadOnly);
+
     QByteArray data = file.readAll();
 
     bool ok = m_settings->restoreAppConfig(data);
diff --git a/client/ui/controllers/settingsController.h b/client/ui/controllers/settingsController.h
index 3ad602b7..af816d46 100644
--- a/client/ui/controllers/settingsController.h
+++ b/client/ui/controllers/settingsController.h
@@ -34,11 +34,11 @@ public slots:
     void toggleLogging(bool enable);
 
     void openLogsFolder();
-    void exportLogsFile();
+    void exportLogsFile(const QString &fileName);
     void clearLogs();
 
-    void backupAppConfig();
-    void restoreAppConfig();
+    void backupAppConfig(const QString &fileName);
+    void restoreAppConfig(const QString &fileName);
 
     QString getAppVersion();
 
diff --git a/client/ui/controllers/sitesController.cpp b/client/ui/controllers/sitesController.cpp
index 891ddb6f..9eafe6ba 100644
--- a/client/ui/controllers/sitesController.cpp
+++ b/client/ui/controllers/sitesController.cpp
@@ -79,28 +79,9 @@ void SitesController::removeSite(int index)
     emit finished(tr("Site removed: ") + hostname);
 }
 
-void SitesController::importSites(bool replaceExisting)
+void SitesController::importSites(const QString &fileName, bool replaceExisting)
 {
-    QString fileName =
-            FileUtilites::getFileName(Q_NULLPTR, tr("Open sites file"),
-                                      QStandardPaths::writableLocation(QStandardPaths::DocumentsLocation), "*.json");
-
-    if (fileName.isEmpty()) {
-        return;
-    }
-
-    QFile file(fileName);
-
-#ifdef Q_OS_IOS
-    CFURLRef url = CFURLCreateWithFileSystemPath(
-            kCFAllocatorDefault,
-            CFStringCreateWithCharacters(0, reinterpret_cast<const UniChar *>(fileName.unicode()), fileName.length()),
-            kCFURLPOSIXPathStyle, 0);
-
-    if (!CFURLStartAccessingSecurityScopedResource(url)) {
-        qDebug() << "Could not access path " << QUrl::fromLocalFile(fileName).toString();
-    }
-#endif
+    QFile file(FileUtilites::getFileName(fileName));
 
     if (!file.open(QIODevice::ReadOnly)) {
         emit errorOccurred(tr("Can't open file: ") + fileName);
@@ -149,7 +130,7 @@ void SitesController::importSites(bool replaceExisting)
     emit finished(tr("Import completed"));
 }
 
-void SitesController::exportSites()
+void SitesController::exportSites(const QString &fileName)
 {
     auto sites = m_sitesModel->getCurrentSites();
 
@@ -163,7 +144,7 @@ void SitesController::exportSites()
     QJsonDocument jsonDocument(jsonArray);
     QByteArray jsonData = jsonDocument.toJson();
 
-    FileUtilites::saveFile(".json", tr("Export sites file"), "sites", jsonData);
+    FileUtilites::saveFile(fileName, jsonData);
 
     emit finished(tr("Export completed"));
 }
diff --git a/client/ui/controllers/sitesController.h b/client/ui/controllers/sitesController.h
index ff78c3de..2171e7b4 100644
--- a/client/ui/controllers/sitesController.h
+++ b/client/ui/controllers/sitesController.h
@@ -19,8 +19,8 @@ public slots:
     void addSite(QString hostname);
     void removeSite(int index);
 
-    void importSites(bool replaceExisting);
-    void exportSites();
+    void importSites(const QString &fileName, bool replaceExisting);
+    void exportSites(const QString &fileName);
 
 signals:
     void errorOccurred(const QString &errorMessage);
diff --git a/client/ui/qml/Components/ShareConnectionDrawer.qml b/client/ui/qml/Components/ShareConnectionDrawer.qml
index c369af42..41dd2ab2 100644
--- a/client/ui/qml/Components/ShareConnectionDrawer.qml
+++ b/client/ui/qml/Components/ShareConnectionDrawer.qml
@@ -3,6 +3,8 @@ import QtQuick.Controls
 import QtQuick.Layouts
 import QtQuick.Dialogs
 
+import QtCore
+
 import SortFilterProxyModel 0.2
 
 import PageEnum 1.0
@@ -67,8 +69,19 @@ DrawerType {
                     text: qsTr("Share")
                     imageSource: "qrc:/images/controls/share-2.svg"
 
-                    onClicked: {
-                        ExportController.saveFile(configExtension, configCaption, configFileName)
+                    onClicked: fileDialog.open()
+
+                    FileDialog {
+                        id: fileDialog
+                        acceptLabel: configCaption
+                        nameFilters: [ "Config files (*" + configExtension + ")" ]
+                        fileMode: FileDialog.SaveFile
+
+                        currentFile: StandardPaths.standardLocations(StandardPaths.DocumentsLocation) + "/" + configFileName
+                        defaultSuffix: configExtension
+                        onAccepted: {
+                            ExportController.saveFile(fileDialog.currentFile.toString())
+                        }
                     }
                 }
 
diff --git a/client/ui/qml/Controls2/TextFieldWithHeaderType.qml b/client/ui/qml/Controls2/TextFieldWithHeaderType.qml
index 048a564d..3f80428e 100644
--- a/client/ui/qml/Controls2/TextFieldWithHeaderType.qml
+++ b/client/ui/qml/Controls2/TextFieldWithHeaderType.qml
@@ -146,4 +146,14 @@ Item {
             color: "#EB5757"
         }
     }
+
+    MouseArea {
+        anchors.fill: root
+        cursorShape: Qt.PointingHandCursor
+
+        onPressed: function(mouse) {
+            textField.forceActiveFocus()
+            mouse.accepted = false
+        }
+    }
 }
diff --git a/client/ui/qml/Pages2/PageSettingsBackup.qml b/client/ui/qml/Pages2/PageSettingsBackup.qml
index 39cad732..363bc66f 100644
--- a/client/ui/qml/Pages2/PageSettingsBackup.qml
+++ b/client/ui/qml/Pages2/PageSettingsBackup.qml
@@ -1,6 +1,9 @@
 import QtQuick
 import QtQuick.Controls
 import QtQuick.Layouts
+import QtQuick.Dialogs
+
+import QtCore
 
 import PageEnum 1.0
 
@@ -74,14 +77,36 @@ PageType {
             }
 
             BasicButtonType {
+                id: makeBackupButton
                 Layout.fillWidth: true
                 Layout.topMargin: 14
 
                 text: qsTr("Make a backup")
 
                 onClicked: {
+                    if (GC.isMobile()) {
+                        backupAppConfig("AmneziaVPN.backup")
+                    } else {
+                        saveFileDialog.open()
+                    }
+                }
+
+                FileDialog {
+                    id: saveFileDialog
+                    acceptLabel: qsTr("Save backup file")
+                    nameFilters: [ "Backup files (*.backup)" ]
+                    fileMode: FileDialog.SaveFile
+
+                    currentFile: StandardPaths.standardLocations(StandardPaths.DocumentsLocation) + "/AmneziaVPN"
+                    defaultSuffix: ".backup"
+                    onAccepted: {
+                        makeBackupButton.backupAppConfig(saveFileDialog.currentFile.toString())
+                    }
+                }
+
+                function backupAppConfig(fileName) {
                     PageController.showBusyIndicator(true)
-                    SettingsController.backupAppConfig()
+                    SettingsController.backupAppConfig(fileName)
                     PageController.showBusyIndicator(false)
                 }
             }
@@ -100,9 +125,18 @@ PageType {
                 text: qsTr("Restore from backup")
 
                 onClicked: {
-                    PageController.showBusyIndicator(true)
-                    SettingsController.restoreAppConfig()
-                    PageController.showBusyIndicator(false)
+                    openFileDialog.open()
+                }
+
+                FileDialog {
+                    id: openFileDialog
+                    acceptLabel: qsTr("Open backup file")
+                    nameFilters: [ "Backup files (*.backup)" ]
+                    onAccepted: {
+                        PageController.showBusyIndicator(true)
+                        SettingsController.restoreAppConfig(openFileDialog.selectedFile.toString())
+                        PageController.showBusyIndicator(false)
+                    }
                 }
             }
         }
diff --git a/client/ui/qml/Pages2/PageSettingsLogging.qml b/client/ui/qml/Pages2/PageSettingsLogging.qml
index e14be439..cfe7d7c9 100644
--- a/client/ui/qml/Pages2/PageSettingsLogging.qml
+++ b/client/ui/qml/Pages2/PageSettingsLogging.qml
@@ -1,6 +1,9 @@
 import QtQuick
 import QtQuick.Controls
 import QtQuick.Layouts
+import QtQuick.Dialogs
+
+import QtCore
 
 import PageEnum 1.0
 
@@ -97,7 +100,20 @@ PageType {
 
                         image: "qrc:/images/controls/save.svg"
 
-                        onClicked: SettingsController.exportLogsFile()
+                        onClicked: fileDialog.open()
+
+                        FileDialog {
+                            id: fileDialog
+                            acceptLabel: qsTr("Save logs")
+                            nameFilters: [ "Logs files (*.log)" ]
+                            fileMode: FileDialog.SaveFile
+
+                            currentFile: StandardPaths.standardLocations(StandardPaths.DocumentsLocation) + "/AmneziaVPN"
+                            defaultSuffix: ".log"
+                            onAccepted: {
+                                ExportController.saveFile(fileDialog.currentFile.toString())
+                            }
+                        }
                     }
 
                     CaptionTextType {
diff --git a/client/ui/qml/Pages2/PageSettingsSplitTunneling.qml b/client/ui/qml/Pages2/PageSettingsSplitTunneling.qml
index 71f2ba29..535ab18c 100644
--- a/client/ui/qml/Pages2/PageSettingsSplitTunneling.qml
+++ b/client/ui/qml/Pages2/PageSettingsSplitTunneling.qml
@@ -1,6 +1,9 @@
 import QtQuick
 import QtQuick.Controls
 import QtQuick.Layouts
+import QtQuick.Dialogs
+
+import QtCore
 
 import SortFilterProxyModel 0.2
 
@@ -41,6 +44,8 @@ PageType {
         allExceptSites
     ]
 
+    property bool replaceExistingSites
+
     QtObject {
         id: onlyForwardSites
         property string name: qsTr("Only the addresses in the list must be opened via VPN")
@@ -295,8 +300,21 @@ PageType {
                     text: qsTr("Save site list")
 
                     clickedFunction: function() {
-                        SitesController.exportSites()
-                        moreActionsDrawer.close()
+                        saveFileDialog.open()
+                    }
+
+                    FileDialog {
+                        id: saveFileDialog
+                        acceptLabel: qsTr("Save sites")
+                        nameFilters: [ "Sites files (*.json)" ]
+                        fileMode: FileDialog.SaveFile
+
+                        currentFile: StandardPaths.standardLocations(StandardPaths.DocumentsLocation) + "/sites"
+                        defaultSuffix: ".json"
+                        onAccepted: {
+                            SitesController.exportSites(saveFileDialog.currentFile.toString())
+                            moreActionsDrawer.close()
+                        }
                     }
                 }
 
@@ -331,6 +349,7 @@ PageType {
             anchors.bottom: parent.bottom
 
             contentHeight: importSitesDrawerContent.height
+
             ColumnLayout {
                 id: importSitesDrawerContent
 
@@ -351,9 +370,8 @@ PageType {
                     text: qsTr("Replace site list")
 
                     clickedFunction: function() {
-                        SitesController.importSites(true)
-                        importSitesDrawer.close()
-                        moreActionsDrawer.close()
+                        root.replaceExistingSites = true
+                        openFileDialog.open()
                     }
                 }
 
@@ -364,13 +382,23 @@ PageType {
                     text: qsTr("Add imported sites to existing ones")
 
                     clickedFunction: function() {
-                        SitesController.importSites(false)
-                        importSitesDrawer.close()
-                        moreActionsDrawer.close()
+                        root.replaceExistingSites = false
+                        openFileDialog.open()
                     }
                 }
 
                 DividerType {}
+
+                FileDialog {
+                    id: openFileDialog
+                    acceptLabel: qsTr("Open sites file")
+                    nameFilters: [ "Sites files (*.json)" ]
+                    onAccepted: {
+                        SitesController.importSites(openFileDialog.selectedFile.toString(), replaceExistingSites)
+                        importSitesDrawer.close()
+                        moreActionsDrawer.close()
+                    }
+                }
             }
         }
     }
diff --git a/client/ui/qml/Pages2/PageSetupWizardConfigSource.qml b/client/ui/qml/Pages2/PageSetupWizardConfigSource.qml
index 45aad9d0..6986509d 100644
--- a/client/ui/qml/Pages2/PageSetupWizardConfigSource.qml
+++ b/client/ui/qml/Pages2/PageSetupWizardConfigSource.qml
@@ -70,8 +70,17 @@ It's okay as long as it's from someone you trust.")
                 leftImageSource: "qrc:/images/controls/folder-open.svg"
 
                 clickedFunction: function() {
-                    ImportController.extractConfigFromFile()
-                    goToPage(PageEnum.PageSetupWizardViewConfig)
+                    fileDialog.open()
+                }
+
+                FileDialog {
+                    id: fileDialog
+                    acceptLabel: qsTr("Open config file")
+                    nameFilters: [ "Config files (*.vpn *.ovpn *.conf)" ]
+                    onAccepted: {
+                        ImportController.extractConfigFromFile(fileDialog.selectedFile.toString())
+                        goToPage(PageEnum.PageSetupWizardViewConfig)
+                    }
                 }
             }
 
diff --git a/client/ui/uilogic.cpp b/client/ui/uilogic.cpp
index 546b18cb..e7d90f85 100644
--- a/client/ui/uilogic.cpp
+++ b/client/ui/uilogic.cpp
@@ -1,4 +1,3 @@
-#include <QApplication>
 #include <QClipboard>
 #include <QDebug>
 #include <QDesktopServices>
@@ -175,7 +174,8 @@ void UiLogic::showOnStartup()
 void UiLogic::onUpdateAllPages()
 {
     for (auto logic : m_logicMap) {
-        if (dynamic_cast<ClientInfoLogic*>(logic) || dynamic_cast<ClientManagementLogic*>(logic) || dynamic_cast<QrDecoderLogic*>(logic)) {
+        if (dynamic_cast<ClientInfoLogic *>(logic) || dynamic_cast<ClientManagementLogic *>(logic)
+            || dynamic_cast<QrDecoderLogic *>(logic)) {
             continue;
         }
         logic->onUpdatePage();
diff --git a/client/vpnconnection.cpp b/client/vpnconnection.cpp
index 1e8fd60a..1cff01e6 100644
--- a/client/vpnconnection.cpp
+++ b/client/vpnconnection.cpp
@@ -1,5 +1,5 @@
 #include "qtimer.h"
-#include <QApplication>
+
 #include <QDebug>
 #include <QFile>
 #include <QHostInfo>

From 4baa003c0dc4995ba7dfacb898ff11b1dfe34280 Mon Sep 17 00:00:00 2001
From: "vladimir.kuznetsov" <nethiuswork@gmail.com>
Date: Thu, 31 Aug 2023 16:00:41 +0500
Subject: [PATCH 082/278] removed old ui files

---
 client/CMakeLists.txt                         |   2 -
 client/amnezia_application.cpp                |   2 +-
 client/amnezia_application.h                  |   2 +-
 client/configurators/ikev2_configurator.cpp   |  48 +-
 client/configurators/openvpn_configurator.cpp | 128 ++--
 client/configurators/ssh_configurator.cpp     |  59 +-
 .../configurators/wireguard_configurator.cpp  |  98 +--
 client/fileUtilites.cpp                       |   4 +-
 client/platforms/android/androidutils.cpp     |  81 +--
 .../platforms/android/androidvpnactivity.cpp  | 112 ++--
 client/resources.qrc                          |  73 ---
 .../ui/controllers/connectionController.cpp   |   6 +-
 client/ui/controllers/pageController.cpp      |   7 +-
 client/ui/controllers/settingsController.cpp  |   4 -
 client/ui/controllers/sitesController.cpp     |   5 +-
 .../AdvancedServerSettingsLogic.cpp           |  88 ---
 .../pages_logic/AdvancedServerSettingsLogic.h |  31 -
 client/ui/pages_logic/AppSettingsLogic.cpp    | 119 ----
 client/ui/pages_logic/AppSettingsLogic.h      |  37 --
 client/ui/pages_logic/ClientInfoLogic.cpp     | 213 ------
 client/ui/pages_logic/ClientInfoLogic.h       |  42 --
 .../ui/pages_logic/ClientManagementLogic.cpp  | 143 ----
 client/ui/pages_logic/ClientManagementLogic.h |  33 -
 .../ui/pages_logic/GeneralSettingsLogic.cpp   |  40 --
 client/ui/pages_logic/GeneralSettingsLogic.h  |  25 -
 .../ui/pages_logic/NetworkSettingsLogic.cpp   |  52 --
 client/ui/pages_logic/NetworkSettingsLogic.h  |  35 -
 .../pages_logic/NewServerProtocolsLogic.cpp   |  34 -
 .../ui/pages_logic/NewServerProtocolsLogic.h  |  25 -
 client/ui/pages_logic/PageLogicBase.cpp       |  16 -
 client/ui/pages_logic/PageLogicBase.h         |  35 -
 client/ui/pages_logic/QrDecoderLogic.cpp      | 125 ----
 client/ui/pages_logic/QrDecoderLogic.h        |  41 --
 .../ServerConfiguringProgressLogic.cpp        | 187 ------
 .../ServerConfiguringProgressLogic.h          |  73 ---
 .../ui/pages_logic/ServerContainersLogic.cpp  | 128 ----
 client/ui/pages_logic/ServerContainersLogic.h |  29 -
 client/ui/pages_logic/ServerListLogic.cpp     |  47 --
 client/ui/pages_logic/ServerListLogic.h       |  30 -
 client/ui/pages_logic/ServerSettingsLogic.cpp | 144 -----
 client/ui/pages_logic/ServerSettingsLogic.h   |  62 --
 .../ui/pages_logic/ShareConnectionLogic.cpp   | 293 ---------
 client/ui/pages_logic/ShareConnectionLogic.h  |  54 --
 client/ui/pages_logic/SitesLogic.cpp          | 211 ------
 client/ui/pages_logic/SitesLogic.h            |  33 -
 client/ui/pages_logic/StartPageLogic.cpp      | 374 -----------
 client/ui/pages_logic/StartPageLogic.h        |  56 --
 client/ui/pages_logic/ViewConfigLogic.cpp     |  93 ---
 client/ui/pages_logic/ViewConfigLogic.h       |  47 --
 client/ui/pages_logic/VpnLogic.cpp            | 245 -------
 client/ui/pages_logic/VpnLogic.h              |  70 --
 client/ui/pages_logic/WizardLogic.cpp         |  70 --
 client/ui/pages_logic/WizardLogic.h           |  31 -
 .../ui/pages_logic/protocols/CloakLogic.cpp   | 137 ----
 client/ui/pages_logic/protocols/CloakLogic.h  |  46 --
 .../ui/pages_logic/protocols/OpenVpnLogic.cpp | 203 ------
 .../ui/pages_logic/protocols/OpenVpnLogic.h   |  63 --
 .../protocols/OtherProtocolsLogic.cpp         | 169 -----
 .../protocols/OtherProtocolsLogic.h           |  45 --
 .../protocols/PageProtocolLogicBase.cpp       |   8 -
 .../protocols/PageProtocolLogicBase.h         |  24 -
 .../protocols/ShadowSocksLogic.cpp            | 127 ----
 .../pages_logic/protocols/ShadowSocksLogic.h  |  44 --
 .../pages_logic/protocols/WireGuardLogic.cpp  |  30 -
 .../ui/pages_logic/protocols/WireGuardLogic.h |  26 -
 client/ui/qml/Controls/BackButton.qml         |  33 -
 client/ui/qml/Controls/BasicButtonType.qml    |  17 -
 client/ui/qml/Controls/BlueButtonType.qml     |  28 -
 client/ui/qml/Controls/Caption.qml            |  17 -
 client/ui/qml/Controls/CheckBoxType.qml       |  27 -
 client/ui/qml/Controls/ComboBoxType.qml       |  11 -
 client/ui/qml/Controls/ContextMenu.qml        |  33 -
 client/ui/qml/Controls/FadeBehavior.qml       |  35 -
 client/ui/qml/Controls/FlickableType.qml      |  26 -
 client/ui/qml/Controls/ImageButtonType.qml    |  17 -
 client/ui/qml/Controls/LabelType.qml          |  17 -
 client/ui/qml/Controls/Logo.qml               |   8 -
 client/ui/qml/Controls/PopupWarning.qml       |  34 -
 client/ui/qml/Controls/PopupWithQuestion.qml  |  62 --
 client/ui/qml/Controls/PopupWithTextField.qml |  62 --
 client/ui/qml/Controls/RadioButtonType.qml    |  36 --
 client/ui/qml/Controls/RichLabelType.qml      |  17 -
 client/ui/qml/Controls/SettingButtonType.qml  |  33 -
 .../ShareConnectionButtonCopyType.qml         |  26 -
 .../Controls/ShareConnectionButtonType.qml    |  27 -
 .../qml/Controls/ShareConnectionContent.qml   |  65 --
 client/ui/qml/Controls/SvgButtonType.qml      |  16 -
 client/ui/qml/Controls/SvgImageType.qml       |  23 -
 client/ui/qml/Controls/TextAreaType.qml       |  63 --
 client/ui/qml/Controls/TextFieldType.qml      |  52 --
 client/ui/qml/Controls/UrlButtonType.qml      |  25 -
 client/ui/qml/Controls/VisibleBehavior.qml    |   6 -
 .../Pages/ClientInfo/PageClientInfoBase.qml   |  15 -
 .../ClientInfo/PageClientInfoOpenVPN.qml      | 115 ----
 .../ClientInfo/PageClientInfoWireGuard.qml    | 100 ---
 .../InstallSettings/InstallSettingsBase.qml   |  75 ---
 .../Pages/InstallSettings/SelectContainer.qml | 200 ------
 client/ui/qml/Pages/PageAbout.qml             |  90 ---
 .../qml/Pages/PageAdvancedServerSettings.qml  | 118 ----
 client/ui/qml/Pages/PageAppSetting.qml        | 152 -----
 client/ui/qml/Pages/PageBase.qml              |  20 -
 client/ui/qml/Pages/PageClientManagement.qml  | 119 ----
 client/ui/qml/Pages/PageGeneralSettings.qml   | 166 -----
 client/ui/qml/Pages/PageNetworkSetting.qml    | 113 ----
 client/ui/qml/Pages/PageNewServer.qml         |  61 --
 .../ui/qml/Pages/PageNewServerProtocols.qml   | 154 -----
 client/ui/qml/Pages/PageQrDecoderIos.qml      |  94 ---
 .../Pages/PageServerConfiguringProgress.qml   | 121 ----
 client/ui/qml/Pages/PageServerContainers.qml  | 434 -------------
 client/ui/qml/Pages/PageServerList.qml        | 185 ------
 client/ui/qml/Pages/PageServerSettings.qml    | 140 ----
 client/ui/qml/Pages/PageSetupWizard.qml       | 108 ----
 .../ui/qml/Pages/PageSetupWizardHighLevel.qml |  96 ---
 .../ui/qml/Pages/PageSetupWizardLowLevel.qml  |  65 --
 .../qml/Pages/PageSetupWizardMediumLevel.qml  |  60 --
 .../ui/qml/Pages/PageSetupWizardVPNMode.qml   |  65 --
 client/ui/qml/Pages/PageShareConnection.qml   |  87 ---
 client/ui/qml/Pages/PageSites.qml             | 315 ---------
 client/ui/qml/Pages/PageStart.qml             | 356 ----------
 client/ui/qml/Pages/PageVPN.qml               | 387 -----------
 client/ui/qml/Pages/PageViewConfig.qml        | 138 ----
 .../ui/qml/Pages/Protocols/PageProtoCloak.qml | 194 ------
 .../qml/Pages/Protocols/PageProtoOpenVPN.qml  | 454 -------------
 .../ui/qml/Pages/Protocols/PageProtoSftp.qml  | 140 ----
 .../Pages/Protocols/PageProtoShadowSocks.qml  | 175 -----
 .../Pages/Protocols/PageProtoTorWebSite.qml   |  69 --
 .../Pages/Protocols/PageProtoWireGuard.qml    |  60 --
 .../qml/Pages/Protocols/PageProtocolBase.qml  |  13 -
 .../qml/Pages/Share/PageShareProtoAmnezia.qml | 145 -----
 .../qml/Pages/Share/PageShareProtoCloak.qml   |  99 ---
 .../qml/Pages/Share/PageShareProtoIkev2.qml   | 131 ----
 .../qml/Pages/Share/PageShareProtoOpenVPN.qml |  96 ---
 .../ui/qml/Pages/Share/PageShareProtoSftp.qml |  21 -
 .../Pages/Share/PageShareProtoShadowSocks.qml | 115 ----
 .../Pages/Share/PageShareProtoTorWebSite.qml  |  20 -
 .../Pages/Share/PageShareProtoWireGuard.qml   | 103 ---
 .../qml/Pages/Share/PageShareProtocolBase.qml |  19 -
 client/ui/qml/main.qml                        | 387 -----------
 client/ui/uilogic.cpp                         | 609 ------------------
 client/ui/uilogic.h                           | 201 ------
 140 files changed, 285 insertions(+), 12695 deletions(-)
 delete mode 100644 client/ui/pages_logic/AdvancedServerSettingsLogic.cpp
 delete mode 100644 client/ui/pages_logic/AdvancedServerSettingsLogic.h
 delete mode 100644 client/ui/pages_logic/AppSettingsLogic.cpp
 delete mode 100644 client/ui/pages_logic/AppSettingsLogic.h
 delete mode 100644 client/ui/pages_logic/ClientInfoLogic.cpp
 delete mode 100644 client/ui/pages_logic/ClientInfoLogic.h
 delete mode 100644 client/ui/pages_logic/ClientManagementLogic.cpp
 delete mode 100644 client/ui/pages_logic/ClientManagementLogic.h
 delete mode 100644 client/ui/pages_logic/GeneralSettingsLogic.cpp
 delete mode 100644 client/ui/pages_logic/GeneralSettingsLogic.h
 delete mode 100644 client/ui/pages_logic/NetworkSettingsLogic.cpp
 delete mode 100644 client/ui/pages_logic/NetworkSettingsLogic.h
 delete mode 100644 client/ui/pages_logic/NewServerProtocolsLogic.cpp
 delete mode 100644 client/ui/pages_logic/NewServerProtocolsLogic.h
 delete mode 100644 client/ui/pages_logic/PageLogicBase.cpp
 delete mode 100644 client/ui/pages_logic/PageLogicBase.h
 delete mode 100644 client/ui/pages_logic/QrDecoderLogic.cpp
 delete mode 100644 client/ui/pages_logic/QrDecoderLogic.h
 delete mode 100644 client/ui/pages_logic/ServerConfiguringProgressLogic.cpp
 delete mode 100644 client/ui/pages_logic/ServerConfiguringProgressLogic.h
 delete mode 100644 client/ui/pages_logic/ServerContainersLogic.cpp
 delete mode 100644 client/ui/pages_logic/ServerContainersLogic.h
 delete mode 100644 client/ui/pages_logic/ServerListLogic.cpp
 delete mode 100644 client/ui/pages_logic/ServerListLogic.h
 delete mode 100644 client/ui/pages_logic/ServerSettingsLogic.cpp
 delete mode 100644 client/ui/pages_logic/ServerSettingsLogic.h
 delete mode 100644 client/ui/pages_logic/ShareConnectionLogic.cpp
 delete mode 100644 client/ui/pages_logic/ShareConnectionLogic.h
 delete mode 100644 client/ui/pages_logic/SitesLogic.cpp
 delete mode 100644 client/ui/pages_logic/SitesLogic.h
 delete mode 100644 client/ui/pages_logic/StartPageLogic.cpp
 delete mode 100644 client/ui/pages_logic/StartPageLogic.h
 delete mode 100644 client/ui/pages_logic/ViewConfigLogic.cpp
 delete mode 100644 client/ui/pages_logic/ViewConfigLogic.h
 delete mode 100644 client/ui/pages_logic/VpnLogic.cpp
 delete mode 100644 client/ui/pages_logic/VpnLogic.h
 delete mode 100644 client/ui/pages_logic/WizardLogic.cpp
 delete mode 100644 client/ui/pages_logic/WizardLogic.h
 delete mode 100644 client/ui/pages_logic/protocols/CloakLogic.cpp
 delete mode 100644 client/ui/pages_logic/protocols/CloakLogic.h
 delete mode 100644 client/ui/pages_logic/protocols/OpenVpnLogic.cpp
 delete mode 100644 client/ui/pages_logic/protocols/OpenVpnLogic.h
 delete mode 100644 client/ui/pages_logic/protocols/OtherProtocolsLogic.cpp
 delete mode 100644 client/ui/pages_logic/protocols/OtherProtocolsLogic.h
 delete mode 100644 client/ui/pages_logic/protocols/PageProtocolLogicBase.cpp
 delete mode 100644 client/ui/pages_logic/protocols/PageProtocolLogicBase.h
 delete mode 100644 client/ui/pages_logic/protocols/ShadowSocksLogic.cpp
 delete mode 100644 client/ui/pages_logic/protocols/ShadowSocksLogic.h
 delete mode 100644 client/ui/pages_logic/protocols/WireGuardLogic.cpp
 delete mode 100644 client/ui/pages_logic/protocols/WireGuardLogic.h
 delete mode 100644 client/ui/qml/Controls/BackButton.qml
 delete mode 100644 client/ui/qml/Controls/BasicButtonType.qml
 delete mode 100644 client/ui/qml/Controls/BlueButtonType.qml
 delete mode 100644 client/ui/qml/Controls/Caption.qml
 delete mode 100644 client/ui/qml/Controls/CheckBoxType.qml
 delete mode 100644 client/ui/qml/Controls/ComboBoxType.qml
 delete mode 100644 client/ui/qml/Controls/ContextMenu.qml
 delete mode 100644 client/ui/qml/Controls/FadeBehavior.qml
 delete mode 100644 client/ui/qml/Controls/FlickableType.qml
 delete mode 100644 client/ui/qml/Controls/ImageButtonType.qml
 delete mode 100644 client/ui/qml/Controls/LabelType.qml
 delete mode 100644 client/ui/qml/Controls/Logo.qml
 delete mode 100644 client/ui/qml/Controls/PopupWarning.qml
 delete mode 100644 client/ui/qml/Controls/PopupWithQuestion.qml
 delete mode 100644 client/ui/qml/Controls/PopupWithTextField.qml
 delete mode 100644 client/ui/qml/Controls/RadioButtonType.qml
 delete mode 100644 client/ui/qml/Controls/RichLabelType.qml
 delete mode 100644 client/ui/qml/Controls/SettingButtonType.qml
 delete mode 100644 client/ui/qml/Controls/ShareConnectionButtonCopyType.qml
 delete mode 100644 client/ui/qml/Controls/ShareConnectionButtonType.qml
 delete mode 100644 client/ui/qml/Controls/ShareConnectionContent.qml
 delete mode 100644 client/ui/qml/Controls/SvgButtonType.qml
 delete mode 100644 client/ui/qml/Controls/SvgImageType.qml
 delete mode 100644 client/ui/qml/Controls/TextAreaType.qml
 delete mode 100644 client/ui/qml/Controls/TextFieldType.qml
 delete mode 100644 client/ui/qml/Controls/UrlButtonType.qml
 delete mode 100644 client/ui/qml/Controls/VisibleBehavior.qml
 delete mode 100644 client/ui/qml/Pages/ClientInfo/PageClientInfoBase.qml
 delete mode 100644 client/ui/qml/Pages/ClientInfo/PageClientInfoOpenVPN.qml
 delete mode 100644 client/ui/qml/Pages/ClientInfo/PageClientInfoWireGuard.qml
 delete mode 100644 client/ui/qml/Pages/InstallSettings/InstallSettingsBase.qml
 delete mode 100644 client/ui/qml/Pages/InstallSettings/SelectContainer.qml
 delete mode 100644 client/ui/qml/Pages/PageAbout.qml
 delete mode 100644 client/ui/qml/Pages/PageAdvancedServerSettings.qml
 delete mode 100644 client/ui/qml/Pages/PageAppSetting.qml
 delete mode 100644 client/ui/qml/Pages/PageBase.qml
 delete mode 100644 client/ui/qml/Pages/PageClientManagement.qml
 delete mode 100644 client/ui/qml/Pages/PageGeneralSettings.qml
 delete mode 100644 client/ui/qml/Pages/PageNetworkSetting.qml
 delete mode 100644 client/ui/qml/Pages/PageNewServer.qml
 delete mode 100644 client/ui/qml/Pages/PageNewServerProtocols.qml
 delete mode 100644 client/ui/qml/Pages/PageQrDecoderIos.qml
 delete mode 100644 client/ui/qml/Pages/PageServerConfiguringProgress.qml
 delete mode 100644 client/ui/qml/Pages/PageServerContainers.qml
 delete mode 100644 client/ui/qml/Pages/PageServerList.qml
 delete mode 100644 client/ui/qml/Pages/PageServerSettings.qml
 delete mode 100644 client/ui/qml/Pages/PageSetupWizard.qml
 delete mode 100644 client/ui/qml/Pages/PageSetupWizardHighLevel.qml
 delete mode 100644 client/ui/qml/Pages/PageSetupWizardLowLevel.qml
 delete mode 100644 client/ui/qml/Pages/PageSetupWizardMediumLevel.qml
 delete mode 100644 client/ui/qml/Pages/PageSetupWizardVPNMode.qml
 delete mode 100644 client/ui/qml/Pages/PageShareConnection.qml
 delete mode 100644 client/ui/qml/Pages/PageSites.qml
 delete mode 100644 client/ui/qml/Pages/PageStart.qml
 delete mode 100644 client/ui/qml/Pages/PageVPN.qml
 delete mode 100644 client/ui/qml/Pages/PageViewConfig.qml
 delete mode 100644 client/ui/qml/Pages/Protocols/PageProtoCloak.qml
 delete mode 100644 client/ui/qml/Pages/Protocols/PageProtoOpenVPN.qml
 delete mode 100644 client/ui/qml/Pages/Protocols/PageProtoSftp.qml
 delete mode 100644 client/ui/qml/Pages/Protocols/PageProtoShadowSocks.qml
 delete mode 100644 client/ui/qml/Pages/Protocols/PageProtoTorWebSite.qml
 delete mode 100644 client/ui/qml/Pages/Protocols/PageProtoWireGuard.qml
 delete mode 100644 client/ui/qml/Pages/Protocols/PageProtocolBase.qml
 delete mode 100644 client/ui/qml/Pages/Share/PageShareProtoAmnezia.qml
 delete mode 100644 client/ui/qml/Pages/Share/PageShareProtoCloak.qml
 delete mode 100644 client/ui/qml/Pages/Share/PageShareProtoIkev2.qml
 delete mode 100644 client/ui/qml/Pages/Share/PageShareProtoOpenVPN.qml
 delete mode 100644 client/ui/qml/Pages/Share/PageShareProtoSftp.qml
 delete mode 100644 client/ui/qml/Pages/Share/PageShareProtoShadowSocks.qml
 delete mode 100644 client/ui/qml/Pages/Share/PageShareProtoTorWebSite.qml
 delete mode 100644 client/ui/qml/Pages/Share/PageShareProtoWireGuard.qml
 delete mode 100644 client/ui/qml/Pages/Share/PageShareProtocolBase.qml
 delete mode 100644 client/ui/qml/main.qml
 delete mode 100644 client/ui/uilogic.cpp
 delete mode 100644 client/ui/uilogic.h

diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt
index 47264fe6..ca5161cf 100644
--- a/client/CMakeLists.txt
+++ b/client/CMakeLists.txt
@@ -95,7 +95,6 @@ set(HEADERS ${HEADERS}
     ${CMAKE_CURRENT_LIST_DIR}/ui/notificationhandler.h
     ${CMAKE_CURRENT_LIST_DIR}/ui/pages.h
     ${CMAKE_CURRENT_LIST_DIR}/ui/property_helper.h
-    ${CMAKE_CURRENT_LIST_DIR}/ui/uilogic.h
     ${CMAKE_CURRENT_LIST_DIR}/ui/qautostart.h
     ${CMAKE_CURRENT_LIST_DIR}/protocols/vpnprotocol.h
     ${CMAKE_CURRENT_BINARY_DIR}/version.h
@@ -132,7 +131,6 @@ set(SOURCES ${SOURCES}
     ${CMAKE_CURRENT_LIST_DIR}/core/servercontroller.cpp
     ${CMAKE_CURRENT_LIST_DIR}/protocols/protocols_defs.cpp
     ${CMAKE_CURRENT_LIST_DIR}/ui/notificationhandler.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/ui/uilogic.cpp
     ${CMAKE_CURRENT_LIST_DIR}/ui/qautostart.cpp
     ${CMAKE_CURRENT_LIST_DIR}/protocols/vpnprotocol.cpp
     ${CMAKE_CURRENT_LIST_DIR}/core/sshclient.cpp
diff --git a/client/amnezia_application.cpp b/client/amnezia_application.cpp
index c4586748..d14917f0 100644
--- a/client/amnezia_application.cpp
+++ b/client/amnezia_application.cpp
@@ -156,7 +156,7 @@ void AmneziaApplication::init()
 // Android TextField clipboard workaround
 // https://bugreports.qt.io/browse/QTBUG-113461
 #ifdef Q_OS_ANDROID
-    QObject::connect(qApp, &QApplication::applicationStateChanged, [](Qt::ApplicationState state) {
+    QObject::connect(qApp, &QGuiApplication::applicationStateChanged, [](Qt::ApplicationState state) {
         if (state == Qt::ApplicationActive) {
             if (qApp->clipboard()->mimeData()->formats().contains("text/html")) {
                 QTextDocument doc;
diff --git a/client/amnezia_application.h b/client/amnezia_application.h
index e18fb70c..40ea81b4 100644
--- a/client/amnezia_application.h
+++ b/client/amnezia_application.h
@@ -41,7 +41,7 @@
 #define amnApp (static_cast<AmneziaApplication *>(QCoreApplication::instance()))
 
 #if defined(Q_OS_ANDROID) || defined(Q_OS_IOS)
-    #define AMNEZIA_BASE_CLASS QGuiApp
+    #define AMNEZIA_BASE_CLASS QGuiApplication
 #else
     #define AMNEZIA_BASE_CLASS SingleApplication
     #define QAPPLICATION_CLASS QApplication
diff --git a/client/configurators/ikev2_configurator.cpp b/client/configurators/ikev2_configurator.cpp
index 7ed83da1..4ca0e5da 100644
--- a/client/configurators/ikev2_configurator.cpp
+++ b/client/configurators/ikev2_configurator.cpp
@@ -1,28 +1,26 @@
 #include "ikev2_configurator.h"
-#include <QApplication>
+
+#include <QDebug>
+#include <QJsonDocument>
 #include <QProcess>
 #include <QString>
 #include <QTemporaryDir>
-#include <QDebug>
 #include <QTemporaryFile>
-#include <QJsonDocument>
 #include <QUuid>
 
 #include "containers/containers_defs.h"
-#include "core/server_defs.h"
 #include "core/scripts_registry.h"
-#include "utilities.h"
+#include "core/server_defs.h"
 #include "core/servercontroller.h"
+#include "utilities.h"
 
-
-Ikev2Configurator::Ikev2Configurator(std::shared_ptr<Settings> settings, QObject *parent):
-    ConfiguratorBase(settings, parent)
+Ikev2Configurator::Ikev2Configurator(std::shared_ptr<Settings> settings, QObject *parent)
+    : ConfiguratorBase(settings, parent)
 {
-
 }
 
 Ikev2Configurator::ConnectionData Ikev2Configurator::prepareIkev2Config(const ServerCredentials &credentials,
-    DockerContainer container, ErrorCode *errorCode)
+                                                                        DockerContainer container, ErrorCode *errorCode)
 {
     Ikev2Configurator::ConnectionData connData;
     connData.host = credentials.hostName;
@@ -32,26 +30,27 @@ Ikev2Configurator::ConnectionData Ikev2Configurator::prepareIkev2Config(const Se
 
     QString certFileName = "/opt/amnezia/ikev2/clients/" + connData.clientId + ".p12";
 
-    QString scriptCreateCert = QString("certutil -z <(head -c 1024 /dev/urandom) "\
-                             "-S -c \"IKEv2 VPN CA\" -n \"%1\" "\
-                             "-s \"O=IKEv2 VPN,CN=%1\" "\
-                             "-k rsa -g 3072 -v 120 "\
-                             "-d sql:/etc/ipsec.d -t \",,\" "\
-                             "--keyUsage digitalSignature,keyEncipherment "\
-                             "--extKeyUsage serverAuth,clientAuth -8 \"%1\"")
-            .arg(connData.clientId);
+    QString scriptCreateCert = QString("certutil -z <(head -c 1024 /dev/urandom) "
+                                       "-S -c \"IKEv2 VPN CA\" -n \"%1\" "
+                                       "-s \"O=IKEv2 VPN,CN=%1\" "
+                                       "-k rsa -g 3072 -v 120 "
+                                       "-d sql:/etc/ipsec.d -t \",,\" "
+                                       "--keyUsage digitalSignature,keyEncipherment "
+                                       "--extKeyUsage serverAuth,clientAuth -8 \"%1\"")
+                                       .arg(connData.clientId);
 
     ServerController serverController(m_settings);
     ErrorCode e = serverController.runContainerScript(credentials, container, scriptCreateCert);
 
     QString scriptExportCert = QString("pk12util -W \"%1\" -d sql:/etc/ipsec.d -n \"%2\" -o \"%3\"")
-            .arg(connData.password)
-            .arg(connData.clientId)
-            .arg(certFileName);
+                                       .arg(connData.password)
+                                       .arg(connData.clientId)
+                                       .arg(certFileName);
     e = serverController.runContainerScript(credentials, container, scriptExportCert);
 
     connData.clientCert = serverController.getTextFileFromContainer(container, credentials, certFileName, &e);
-    connData.caCert = serverController.getTextFileFromContainer(container, credentials, "/etc/ipsec.d/ca_cert_base64.p12", &e);
+    connData.caCert =
+            serverController.getTextFileFromContainer(container, credentials, "/etc/ipsec.d/ca_cert_base64.p12", &e);
 
     qDebug() << "Ikev2Configurator::ConnectionData client cert size:" << connData.clientCert.size();
     qDebug() << "Ikev2Configurator::ConnectionData ca cert size:" << connData.caCert.size();
@@ -59,8 +58,8 @@ Ikev2Configurator::ConnectionData Ikev2Configurator::prepareIkev2Config(const Se
     return connData;
 }
 
-QString Ikev2Configurator::genIkev2Config(const ServerCredentials &credentials,
-    DockerContainer container, const QJsonObject &containerConfig, ErrorCode *errorCode)
+QString Ikev2Configurator::genIkev2Config(const ServerCredentials &credentials, DockerContainer container,
+                                          const QJsonObject &containerConfig, ErrorCode *errorCode)
 {
     Q_UNUSED(containerConfig)
 
@@ -120,4 +119,3 @@ QString Ikev2Configurator::genStrongSwanConfig(const ConnectionData &connData)
 
     return config;
 }
-
diff --git a/client/configurators/openvpn_configurator.cpp b/client/configurators/openvpn_configurator.cpp
index 3bc6676a..bfde4a91 100644
--- a/client/configurators/openvpn_configurator.cpp
+++ b/client/configurators/openvpn_configurator.cpp
@@ -1,82 +1,89 @@
 #include "openvpn_configurator.h"
-#include <QApplication>
+
+#include <QDebug>
+#include <QJsonDocument>
+#include <QJsonObject>
 #include <QProcess>
 #include <QString>
 #include <QTemporaryDir>
-#include <QDebug>
 #include <QTemporaryFile>
-#include <QJsonObject>
-#include <QJsonDocument>
 
 #include "containers/containers_defs.h"
+#include "core/scripts_registry.h"
 #include "core/server_defs.h"
 #include "core/servercontroller.h"
-#include "core/scripts_registry.h"
-#include "utilities.h"
 #include "settings.h"
+#include "utilities.h"
 
+#include <openssl/pem.h>
 #include <openssl/rsa.h>
 #include <openssl/x509.h>
-#include <openssl/pem.h>
 
-OpenVpnConfigurator::OpenVpnConfigurator(std::shared_ptr<Settings> settings, QObject *parent):
-    ConfiguratorBase(settings, parent)
+OpenVpnConfigurator::OpenVpnConfigurator(std::shared_ptr<Settings> settings, QObject *parent)
+    : ConfiguratorBase(settings, parent)
 {
-
 }
 
 OpenVpnConfigurator::ConnectionData OpenVpnConfigurator::prepareOpenVpnConfig(const ServerCredentials &credentials,
-    DockerContainer container, ErrorCode *errorCode)
+                                                                              DockerContainer container,
+                                                                              ErrorCode *errorCode)
 {
     OpenVpnConfigurator::ConnectionData connData = OpenVpnConfigurator::createCertRequest();
     connData.host = credentials.hostName;
 
     if (connData.privKey.isEmpty() || connData.request.isEmpty()) {
-        if (errorCode) *errorCode = ErrorCode::OpenSslFailed;
+        if (errorCode)
+            *errorCode = ErrorCode::OpenSslFailed;
         return connData;
     }
 
-    QString reqFileName = QString("%1/%2.req").
-            arg(amnezia::protocols::openvpn::clientsDirPath).
-            arg(connData.clientId);
+    QString reqFileName = QString("%1/%2.req").arg(amnezia::protocols::openvpn::clientsDirPath).arg(connData.clientId);
 
     ServerController serverController(m_settings);
     ErrorCode e = serverController.uploadTextFileToContainer(container, credentials, connData.request, reqFileName);
     if (e) {
-        if (errorCode) *errorCode = e;
+        if (errorCode)
+            *errorCode = e;
         return connData;
     }
 
     e = signCert(container, credentials, connData.clientId);
     if (e) {
-        if (errorCode) *errorCode = e;
+        if (errorCode)
+            *errorCode = e;
         return connData;
     }
 
-    connData.caCert = serverController.getTextFileFromContainer(container, credentials, amnezia::protocols::openvpn::caCertPath, &e);
-    connData.clientCert = serverController.getTextFileFromContainer(container, credentials,
-        QString("%1/%2.crt").arg(amnezia::protocols::openvpn::clientCertPath).arg(connData.clientId), &e);
+    connData.caCert = serverController.getTextFileFromContainer(container, credentials,
+                                                                amnezia::protocols::openvpn::caCertPath, &e);
+    connData.clientCert = serverController.getTextFileFromContainer(
+            container, credentials,
+            QString("%1/%2.crt").arg(amnezia::protocols::openvpn::clientCertPath).arg(connData.clientId), &e);
 
     if (e) {
-        if (errorCode) *errorCode = e;
+        if (errorCode)
+            *errorCode = e;
         return connData;
     }
 
-    connData.taKey = serverController.getTextFileFromContainer(container, credentials, amnezia::protocols::openvpn::taKeyPath, &e);
+    connData.taKey = serverController.getTextFileFromContainer(container, credentials,
+                                                               amnezia::protocols::openvpn::taKeyPath, &e);
 
     if (connData.caCert.isEmpty() || connData.clientCert.isEmpty() || connData.taKey.isEmpty()) {
-        if (errorCode) *errorCode = ErrorCode::SshSftpFailureError;
+        if (errorCode)
+            *errorCode = ErrorCode::SshSftpFailureError;
     }
 
     return connData;
 }
 
-QString OpenVpnConfigurator::genOpenVpnConfig(const ServerCredentials &credentials,
-    DockerContainer container, const QJsonObject &containerConfig, ErrorCode *errorCode)
+QString OpenVpnConfigurator::genOpenVpnConfig(const ServerCredentials &credentials, DockerContainer container,
+                                              const QJsonObject &containerConfig, ErrorCode *errorCode)
 {
     ServerController serverController(m_settings);
-    QString config = serverController.replaceVars(amnezia::scriptData(ProtocolScriptType::openvpn_template, container),
-            serverController.genVarsForScript(credentials, container, containerConfig));
+    QString config =
+            serverController.replaceVars(amnezia::scriptData(ProtocolScriptType::openvpn_template, container),
+                                         serverController.genVarsForScript(credentials, container, containerConfig));
 
     ConnectionData connData = prepareOpenVpnConfig(credentials, container, errorCode);
     if (errorCode && *errorCode) {
@@ -89,8 +96,7 @@ QString OpenVpnConfigurator::genOpenVpnConfig(const ServerCredentials &credentia
 
     if (config.contains("$OPENVPN_TA_KEY")) {
         config.replace("$OPENVPN_TA_KEY", connData.taKey);
-    }
-    else {
+    } else {
         config.replace("<tls-auth>", "");
         config.replace("</tls-auth>", "");
     }
@@ -133,12 +139,11 @@ QString OpenVpnConfigurator::processConfigWithLocalSettings(QString jsonConfig)
     config.replace("block-outside-dns", "");
 #endif
 
-#if (defined (MZ_MACOS) || defined(MZ_LINUX))
-    QString dnsConf = QString(
-                "\nscript-security 2\n"
-                "up %1/update-resolv-conf.sh\n"
-                "down %1/update-resolv-conf.sh\n").
-            arg(qApp->applicationDirPath());
+#if (defined(MZ_MACOS) || defined(MZ_LINUX))
+    QString dnsConf = QString("\nscript-security 2\n"
+                              "up %1/update-resolv-conf.sh\n"
+                              "down %1/update-resolv-conf.sh\n")
+                              .arg(qApp->applicationDirPath());
 
     config.append(dnsConf);
 #endif
@@ -168,23 +173,23 @@ QString OpenVpnConfigurator::processConfigWithExportSettings(QString jsonConfig)
     return QJsonDocument(json).toJson();
 }
 
-ErrorCode OpenVpnConfigurator::signCert(DockerContainer container,
-    const ServerCredentials &credentials, QString clientId)
+ErrorCode OpenVpnConfigurator::signCert(DockerContainer container, const ServerCredentials &credentials, QString clientId)
 {
     QString script_import = QString("sudo docker exec -i %1 bash -c \"cd /opt/amnezia/openvpn && "
-                             "easyrsa import-req %2/%3.req %3\"")
-            .arg(ContainerProps::containerToString(container))
-            .arg(amnezia::protocols::openvpn::clientsDirPath)
-            .arg(clientId);
+                                    "easyrsa import-req %2/%3.req %3\"")
+                                    .arg(ContainerProps::containerToString(container))
+                                    .arg(amnezia::protocols::openvpn::clientsDirPath)
+                                    .arg(clientId);
 
     QString script_sign = QString("sudo docker exec -i %1 bash -c \"export EASYRSA_BATCH=1; cd /opt/amnezia/openvpn && "
-                                    "easyrsa sign-req client %2\"")
-            .arg(ContainerProps::containerToString(container))
-            .arg(clientId);
+                                  "easyrsa sign-req client %2\"")
+                                  .arg(ContainerProps::containerToString(container))
+                                  .arg(clientId);
 
     ServerController serverController(m_settings);
-    QStringList scriptList {script_import, script_sign};
-    QString script = serverController.replaceVars(scriptList.join("\n"), serverController.genVarsForScript(credentials, container));
+    QStringList scriptList { script_import, script_sign };
+    QString script = serverController.replaceVars(scriptList.join("\n"),
+                                                  serverController.genVarsForScript(credentials, container));
 
     return serverController.runScript(credentials, script);
 }
@@ -194,18 +199,17 @@ OpenVpnConfigurator::ConnectionData OpenVpnConfigurator::createCertRequest()
     ConnectionData connData;
     connData.clientId = Utils::getRandomString(32);
 
-    int             ret = 0;
-    int             nVersion = 1;
+    int ret = 0;
+    int nVersion = 1;
 
     QByteArray clientIdUtf8 = connData.clientId.toUtf8();
 
-    EVP_PKEY * pKey = EVP_PKEY_new();
+    EVP_PKEY *pKey = EVP_PKEY_new();
     q_check_ptr(pKey);
-    RSA * rsa = RSA_generate_key(2048, RSA_F4, nullptr, nullptr);
+    RSA *rsa = RSA_generate_key(2048, RSA_F4, nullptr, nullptr);
     q_check_ptr(rsa);
     EVP_PKEY_assign_RSA(pKey, rsa);
 
-
     // 2. set version of x509 req
     X509_REQ *x509_req = X509_REQ_new();
     ret = X509_REQ_set_version(x509_req, nVersion);
@@ -219,16 +223,14 @@ OpenVpnConfigurator::ConnectionData OpenVpnConfigurator::createCertRequest()
     // 3. set subject of x509 req
     X509_NAME *x509_name = X509_REQ_get_subject_name(x509_req);
 
-    X509_NAME_add_entry_by_txt(x509_name, "C",  MBSTRING_ASC,
-                               (unsigned char *)"ORG", -1, -1, 0);
-    X509_NAME_add_entry_by_txt(x509_name, "O",  MBSTRING_ASC,
-                               (unsigned char *)"", -1, -1, 0);
+    X509_NAME_add_entry_by_txt(x509_name, "C", MBSTRING_ASC, (unsigned char *)"ORG", -1, -1, 0);
+    X509_NAME_add_entry_by_txt(x509_name, "O", MBSTRING_ASC, (unsigned char *)"", -1, -1, 0);
     X509_NAME_add_entry_by_txt(x509_name, "CN", MBSTRING_ASC,
                                reinterpret_cast<unsigned char const *>(clientIdUtf8.data()), clientIdUtf8.size(), -1, 0);
 
     // 4. set public key of x509 req
     ret = X509_REQ_set_pubkey(x509_req, pKey);
-    if (ret != 1){
+    if (ret != 1) {
         qWarning() << "Could not set pubkey!";
         X509_REQ_free(x509_req);
         EVP_PKEY_free(pKey);
@@ -236,8 +238,8 @@ OpenVpnConfigurator::ConnectionData OpenVpnConfigurator::createCertRequest()
     }
 
     // 5. set sign key of x509 req
-    ret = X509_REQ_sign(x509_req, pKey, EVP_sha256());    // return x509_req->signature->length
-    if (ret <= 0){
+    ret = X509_REQ_sign(x509_req, pKey, EVP_sha256()); // return x509_req->signature->length
+    if (ret <= 0) {
         qWarning() << "Could not sign request!";
         X509_REQ_free(x509_req);
         EVP_PKEY_free(pKey);
@@ -245,10 +247,9 @@ OpenVpnConfigurator::ConnectionData OpenVpnConfigurator::createCertRequest()
     }
 
     // save private key
-    BIO * bp_private = BIO_new(BIO_s_mem());
+    BIO *bp_private = BIO_new(BIO_s_mem());
     q_check_ptr(bp_private);
-    if (PEM_write_bio_PrivateKey(bp_private, pKey, nullptr, nullptr, 0, nullptr, nullptr) != 1)
-    {
+    if (PEM_write_bio_PrivateKey(bp_private, pKey, nullptr, nullptr, 0, nullptr, nullptr) != 1) {
         qFatal("PEM_write_bio_PrivateKey");
         EVP_PKEY_free(pKey);
         BIO_free_all(bp_private);
@@ -256,7 +257,7 @@ OpenVpnConfigurator::ConnectionData OpenVpnConfigurator::createCertRequest()
         return connData;
     }
 
-    const char * buffer = nullptr;
+    const char *buffer = nullptr;
     size_t size = BIO_get_mem_data(bp_private, &buffer);
     q_check_ptr(buffer);
     connData.privKey = QByteArray(buffer, size);
@@ -270,7 +271,7 @@ OpenVpnConfigurator::ConnectionData OpenVpnConfigurator::createCertRequest()
     BIO_free_all(bp_private);
 
     // save req
-    BIO * bio_req = BIO_new(BIO_s_mem());
+    BIO *bio_req = BIO_new(BIO_s_mem());
     PEM_write_bio_X509_REQ(bio_req, x509_req);
 
     BUF_MEM *bio_buf;
@@ -278,7 +279,6 @@ OpenVpnConfigurator::ConnectionData OpenVpnConfigurator::createCertRequest()
     connData.request = QByteArray(bio_buf->data, bio_buf->length);
     BIO_free(bio_req);
 
-
     EVP_PKEY_free(pKey); // this will also free the rsa key
 
     return connData;
diff --git a/client/configurators/ssh_configurator.cpp b/client/configurators/ssh_configurator.cpp
index d94e4468..42e7eb47 100644
--- a/client/configurators/ssh_configurator.cpp
+++ b/client/configurators/ssh_configurator.cpp
@@ -1,24 +1,25 @@
 #include "ssh_configurator.h"
-#include <QApplication>
+
+#include <QDebug>
+#include <QObject>
 #include <QProcess>
 #include <QString>
 #include <QTemporaryDir>
-#include <QDebug>
 #include <QTemporaryFile>
 #include <QThread>
-#include <QObject>
-#include <QTextEdit>
-#include <QPlainTextEdit>
 #include <qtimer.h>
+#if defined(Q_OS_ANDROID) || defined(Q_OS_IOS)
+    #include <QGuiApplication>
+#else
+    #include <QApplication>
+#endif
 
 #include "core/server_defs.h"
 #include "utilities.h"
 
-
-SshConfigurator::SshConfigurator(std::shared_ptr<Settings> settings, QObject *parent):
-    ConfiguratorBase(settings, parent)
+SshConfigurator::SshConfigurator(std::shared_ptr<Settings> settings, QObject *parent)
+    : ConfiguratorBase(settings, parent)
 {
-
 }
 
 QString SshConfigurator::convertOpenSShKey(const QString &key)
@@ -28,23 +29,30 @@ QString SshConfigurator::convertOpenSShKey(const QString &key)
     p.setProcessChannelMode(QProcess::MergedChannels);
 
     QTemporaryFile tmp;
-#ifdef QT_DEBUG
+    #ifdef QT_DEBUG
     tmp.setAutoRemove(false);
-#endif
+    #endif
     tmp.open();
     tmp.write(key.toUtf8());
     tmp.close();
 
     // ssh-keygen -p -P "" -N "" -m pem -f id_ssh
 
-#ifdef Q_OS_WIN
+    #ifdef Q_OS_WIN
     p.setProcessEnvironment(prepareEnv());
     p.setProgram("cmd.exe");
     p.setNativeArguments(QString("/C \"ssh-keygen.exe -p -P \"\" -N \"\" -m pem -f \"%1\"\"").arg(tmp.fileName()));
-#else
+    #else
     p.setProgram("ssh-keygen");
-    p.setArguments(QStringList() << "-p" << "-P" << "" << "-N" << "" << "-m" << "pem" << "-f" << tmp.fileName());
-#endif
+    p.setArguments(QStringList() << "-p"
+                                 << "-P"
+                                 << ""
+                                 << "-N"
+                                 << ""
+                                 << "-m"
+                                 << "pem"
+                                 << "-f" << tmp.fileName());
+    #endif
 
     p.start();
     p.waitForFinished();
@@ -65,22 +73,21 @@ void SshConfigurator::openSshTerminal(const ServerCredentials &credentials)
     QProcess *p = new QProcess();
     p->setProcessChannelMode(QProcess::SeparateChannels);
 
-#ifdef Q_OS_WIN
+    #ifdef Q_OS_WIN
     p->setProcessEnvironment(prepareEnv());
     p->setProgram(qApp->applicationDirPath() + "\\cygwin\\putty.exe");
 
     if (credentials.secretData.contains("PRIVATE KEY")) {
         // todo: connect by key
-//        p->setNativeArguments(QString("%1@%2")
-//            .arg(credentials.userName).arg(credentials.hostName).arg(credentials.secretData));
+        //        p->setNativeArguments(QString("%1@%2")
+        //            .arg(credentials.userName).arg(credentials.hostName).arg(credentials.secretData));
+    } else {
+        p->setNativeArguments(
+                QString("%1@%2 -pw %3").arg(credentials.userName).arg(credentials.hostName).arg(credentials.secretData));
     }
-    else {
-        p->setNativeArguments(QString("%1@%2 -pw %3")
-            .arg(credentials.userName).arg(credentials.hostName).arg(credentials.secretData));
-    }
-#else
+    #else
     p->setProgram("/bin/bash");
-#endif
+    #endif
 
     p->startDetached();
 #endif
@@ -95,11 +102,11 @@ QProcessEnvironment SshConfigurator::prepareEnv()
     pathEnvVar.clear();
     pathEnvVar.prepend(QDir::toNativeSeparators(QApplication::applicationDirPath()) + "\\cygwin;");
     pathEnvVar.prepend(QDir::toNativeSeparators(QApplication::applicationDirPath()) + "\\openvpn;");
-#else
+#elif defined(Q_OS_MACX)
     pathEnvVar.prepend(QDir::toNativeSeparators(QApplication::applicationDirPath()) + "/Contents/MacOS");
 #endif
 
     env.insert("PATH", pathEnvVar);
-    //qDebug().noquote() << "ENV PATH" << pathEnvVar;
+    // qDebug().noquote() << "ENV PATH" << pathEnvVar;
     return env;
 }
diff --git a/client/configurators/wireguard_configurator.cpp b/client/configurators/wireguard_configurator.cpp
index 54ee320c..14059977 100644
--- a/client/configurators/wireguard_configurator.cpp
+++ b/client/configurators/wireguard_configurator.cpp
@@ -1,30 +1,27 @@
 #include "wireguard_configurator.h"
-#include <QApplication>
+
+#include <QDebug>
+#include <QJsonDocument>
 #include <QProcess>
 #include <QString>
 #include <QTemporaryDir>
-#include <QDebug>
 #include <QTemporaryFile>
-#include <QJsonDocument>
-
 
+#include <openssl/pem.h>
 #include <openssl/rand.h>
 #include <openssl/rsa.h>
 #include <openssl/x509.h>
-#include <openssl/pem.h>
-
 
 #include "containers/containers_defs.h"
-#include "core/server_defs.h"
 #include "core/scripts_registry.h"
-#include "utilities.h"
+#include "core/server_defs.h"
 #include "core/servercontroller.h"
 #include "settings.h"
+#include "utilities.h"
 
-WireguardConfigurator::WireguardConfigurator(std::shared_ptr<Settings> settings, QObject *parent):
-    ConfiguratorBase(settings, parent)
+WireguardConfigurator::WireguardConfigurator(std::shared_ptr<Settings> settings, QObject *parent)
+    : ConfiguratorBase(settings, parent)
 {
-
 }
 
 WireguardConfigurator::ConnectionData WireguardConfigurator::genClientKeys()
@@ -36,37 +33,40 @@ WireguardConfigurator::ConnectionData WireguardConfigurator::genClientKeys()
 
     unsigned char buff[EDDSA_KEY_LENGTH];
     int ret = RAND_priv_bytes(buff, EDDSA_KEY_LENGTH);
-    if (ret <=0) return connData;
+    if (ret <= 0)
+        return connData;
 
-    EVP_PKEY * pKey = EVP_PKEY_new();
+    EVP_PKEY *pKey = EVP_PKEY_new();
     q_check_ptr(pKey);
     pKey = EVP_PKEY_new_raw_private_key(EVP_PKEY_X25519, NULL, &buff[0], EDDSA_KEY_LENGTH);
 
-
     size_t keySize = EDDSA_KEY_LENGTH;
 
     // save private key
     unsigned char priv[EDDSA_KEY_LENGTH];
     EVP_PKEY_get_raw_private_key(pKey, priv, &keySize);
-    connData.clientPrivKey = QByteArray::fromRawData((char*)priv, keySize).toBase64();
+    connData.clientPrivKey = QByteArray::fromRawData((char *)priv, keySize).toBase64();
 
     // save public key
     unsigned char pub[EDDSA_KEY_LENGTH];
     EVP_PKEY_get_raw_public_key(pKey, pub, &keySize);
-    connData.clientPubKey = QByteArray::fromRawData((char*)pub, keySize).toBase64();
+    connData.clientPubKey = QByteArray::fromRawData((char *)pub, keySize).toBase64();
 
     return connData;
 }
 
 WireguardConfigurator::ConnectionData WireguardConfigurator::prepareWireguardConfig(const ServerCredentials &credentials,
-    DockerContainer container, const QJsonObject &containerConfig, ErrorCode *errorCode)
+                                                                                    DockerContainer container,
+                                                                                    const QJsonObject &containerConfig,
+                                                                                    ErrorCode *errorCode)
 {
     WireguardConfigurator::ConnectionData connData = WireguardConfigurator::genClientKeys();
     connData.host = credentials.hostName;
     connData.port = containerConfig.value(config_key::port).toString(protocols::wireguard::defaultPort);
 
     if (connData.clientPrivKey.isEmpty() || connData.clientPubKey.isEmpty()) {
-        if (errorCode) *errorCode = ErrorCode::InternalError;
+        if (errorCode)
+            *errorCode = ErrorCode::InternalError;
         return connData;
     }
 
@@ -96,22 +96,24 @@ WireguardConfigurator::ConnectionData WireguardConfigurator::prepareWireguardCon
         // Calc next IP address
         if (ips.isEmpty()) {
             nextIpNumber = "2";
-        }
-        else {
+        } else {
             int next = ips.last().split(".").last().toInt() + 1;
             if (next > 254) {
-                if (errorCode) *errorCode = ErrorCode::AddressPoolError;
+                if (errorCode)
+                    *errorCode = ErrorCode::AddressPoolError;
                 return connData;
             }
             nextIpNumber = QString::number(next);
         }
     }
 
-    QString subnetIp = containerConfig.value(config_key::subnet_address).toString(protocols::wireguard::defaultSubnetAddress);
+    QString subnetIp =
+            containerConfig.value(config_key::subnet_address).toString(protocols::wireguard::defaultSubnetAddress);
     {
         QStringList l = subnetIp.split(".", Qt::SkipEmptyParts);
         if (l.isEmpty()) {
-            if (errorCode) *errorCode = ErrorCode::AddressPoolError;
+            if (errorCode)
+                *errorCode = ErrorCode::AddressPoolError;
             return connData;
         }
         l.removeLast();
@@ -121,52 +123,60 @@ WireguardConfigurator::ConnectionData WireguardConfigurator::prepareWireguardCon
     }
 
     // Get keys
-    connData.serverPubKey = serverController.getTextFileFromContainer(container, credentials, amnezia::protocols::wireguard::serverPublicKeyPath, &e);
+    connData.serverPubKey = serverController.getTextFileFromContainer(
+            container, credentials, amnezia::protocols::wireguard::serverPublicKeyPath, &e);
     connData.serverPubKey.replace("\n", "");
     if (e) {
-        if (errorCode) *errorCode = e;
+        if (errorCode)
+            *errorCode = e;
         return connData;
     }
 
-    connData.pskKey = serverController.getTextFileFromContainer(container, credentials, amnezia::protocols::wireguard::serverPskKeyPath, &e);
+    connData.pskKey = serverController.getTextFileFromContainer(container, credentials,
+                                                                amnezia::protocols::wireguard::serverPskKeyPath, &e);
     connData.pskKey.replace("\n", "");
 
     if (e) {
-        if (errorCode) *errorCode = e;
+        if (errorCode)
+            *errorCode = e;
         return connData;
     }
 
     // Add client to config
-    QString configPart = QString(
-        "[Peer]\n"
-        "PublicKey = %1\n"
-        "PresharedKey = %2\n"
-        "AllowedIPs = %3/32\n\n").
-            arg(connData.clientPubKey).
-            arg(connData.pskKey).
-            arg(connData.clientIP);
+    QString configPart = QString("[Peer]\n"
+                                 "PublicKey = %1\n"
+                                 "PresharedKey = %2\n"
+                                 "AllowedIPs = %3/32\n\n")
+                                 .arg(connData.clientPubKey)
+                                 .arg(connData.pskKey)
+                                 .arg(connData.clientIP);
 
     e = serverController.uploadTextFileToContainer(container, credentials, configPart,
-        protocols::wireguard::serverConfigPath, libssh::SftpOverwriteMode::SftpAppendToExisting);
+                                                   protocols::wireguard::serverConfigPath,
+                                                   libssh::SftpOverwriteMode::SftpAppendToExisting);
 
     if (e) {
-        if (errorCode) *errorCode = e;
+        if (errorCode)
+            *errorCode = e;
         return connData;
     }
 
-    e = serverController.runScript(credentials,
-        serverController.replaceVars("sudo docker exec -i $CONTAINER_NAME bash -c 'wg syncconf wg0 <(wg-quick strip /opt/amnezia/wireguard/wg0.conf)'",
-            serverController.genVarsForScript(credentials, container)));
+    e = serverController.runScript(
+            credentials,
+            serverController.replaceVars("sudo docker exec -i $CONTAINER_NAME bash -c 'wg syncconf wg0 <(wg-quick "
+                                         "strip /opt/amnezia/wireguard/wg0.conf)'",
+                                         serverController.genVarsForScript(credentials, container)));
 
     return connData;
 }
 
-QString WireguardConfigurator::genWireguardConfig(const ServerCredentials &credentials,
-    DockerContainer container, const QJsonObject &containerConfig, ErrorCode *errorCode)
+QString WireguardConfigurator::genWireguardConfig(const ServerCredentials &credentials, DockerContainer container,
+                                                  const QJsonObject &containerConfig, ErrorCode *errorCode)
 {
     ServerController serverController(m_settings);
-    QString config = serverController.replaceVars(amnezia::scriptData(ProtocolScriptType::wireguard_template, container),
-                                                  serverController.genVarsForScript(credentials, container, containerConfig));
+    QString config =
+            serverController.replaceVars(amnezia::scriptData(ProtocolScriptType::wireguard_template, container),
+                                         serverController.genVarsForScript(credentials, container, containerConfig));
 
     ConnectionData connData = prepareWireguardConfig(credentials, container, containerConfig, errorCode);
     if (errorCode && *errorCode) {
diff --git a/client/fileUtilites.cpp b/client/fileUtilites.cpp
index c1b60966..b3c65216 100644
--- a/client/fileUtilites.cpp
+++ b/client/fileUtilites.cpp
@@ -1,7 +1,9 @@
 #include "fileUtilites.h"
-#include "platforms/ios/MobileUtils.h"
 
 #include <QDesktopServices>
+#include <QDir>
+#include <QFile>
+#include <QFileInfo>
 #include <QStandardPaths>
 
 #ifdef Q_OS_ANDROID
diff --git a/client/platforms/android/androidutils.cpp b/client/platforms/android/androidutils.cpp
index 5e9f094c..7cc39824 100644
--- a/client/platforms/android/androidutils.cpp
+++ b/client/platforms/android/androidutils.cpp
@@ -4,23 +4,25 @@
 
 #include "androidutils.h"
 
-#include <QApplication>
+#include <QGuiApplication>
 #include <QJniEnvironment>
 #include <QJniObject>
 #include <QJsonDocument>
 #include <QJsonObject>
 #include <QNetworkCookieJar>
-#include <QUrlQuery>
 #include <QTimer>
+#include <QUrlQuery>
 
 #include "jni.h"
 
-namespace {
-    AndroidUtils* s_instance = nullptr;
-}  // namespace
+namespace
+{
+    AndroidUtils *s_instance = nullptr;
+} // namespace
 
 // static
-QString AndroidUtils::GetDeviceName() {
+QString AndroidUtils::GetDeviceName()
+{
     QJniEnvironment env;
     jclass BUILD = env->FindClass("android/os/Build");
     jfieldID model = env->GetStaticFieldID(BUILD, "MODEL", "Ljava/lang/String;");
@@ -30,7 +32,7 @@ QString AndroidUtils::GetDeviceName() {
         return QString("Android Device");
     }
 
-    const char* buffer = env->GetStringUTFChars(value, nullptr);
+    const char *buffer = env->GetStringUTFChars(value, nullptr);
     if (!buffer) {
         return QString("Android Device");
     }
@@ -42,7 +44,8 @@ QString AndroidUtils::GetDeviceName() {
 };
 
 // static
-AndroidUtils* AndroidUtils::instance() {
+AndroidUtils *AndroidUtils::instance()
+{
     if (!s_instance) {
         Q_ASSERT(qApp);
         s_instance = new AndroidUtils(qApp);
@@ -51,19 +54,22 @@ AndroidUtils* AndroidUtils::instance() {
     return s_instance;
 }
 
-AndroidUtils::AndroidUtils(QObject* parent) : QObject(parent) {
+AndroidUtils::AndroidUtils(QObject *parent) : QObject(parent)
+{
     Q_ASSERT(!s_instance);
     s_instance = this;
 }
 
-AndroidUtils::~AndroidUtils() {
+AndroidUtils::~AndroidUtils()
+{
     Q_ASSERT(s_instance == this);
     s_instance = nullptr;
 }
 
 // static
-void AndroidUtils::dispatchToMainThread(std::function<void()> callback) {
-    QTimer* timer = new QTimer();
+void AndroidUtils::dispatchToMainThread(std::function<void()> callback)
+{
+    QTimer *timer = new QTimer();
     timer->moveToThread(qApp->thread());
     timer->setSingleShot(true);
     QObject::connect(timer, &QTimer::timeout, [=]() {
@@ -74,8 +80,9 @@ void AndroidUtils::dispatchToMainThread(std::function<void()> callback) {
 }
 
 // static
-QByteArray AndroidUtils::getQByteArrayFromJString(JNIEnv* env, jstring data) {
-    const char* buffer = env->GetStringUTFChars(data, nullptr);
+QByteArray AndroidUtils::getQByteArrayFromJString(JNIEnv *env, jstring data)
+{
+    const char *buffer = env->GetStringUTFChars(data, nullptr);
     if (!buffer) {
         qDebug() << "getQByteArrayFromJString - failed to parse data.";
         return QByteArray();
@@ -87,8 +94,9 @@ QByteArray AndroidUtils::getQByteArrayFromJString(JNIEnv* env, jstring data) {
 }
 
 // static
-QString AndroidUtils::getQStringFromJString(JNIEnv* env, jstring data) {
-    const char* buffer = env->GetStringUTFChars(data, nullptr);
+QString AndroidUtils::getQStringFromJString(JNIEnv *env, jstring data)
+{
+    const char *buffer = env->GetStringUTFChars(data, nullptr);
     if (!buffer) {
         qDebug() << "getQStringFromJString - failed to parse data.";
         return QString();
@@ -100,15 +108,14 @@ QString AndroidUtils::getQStringFromJString(JNIEnv* env, jstring data) {
 }
 
 // static
-QJsonObject AndroidUtils::getQJsonObjectFromJString(JNIEnv* env, jstring data) {
+QJsonObject AndroidUtils::getQJsonObjectFromJString(JNIEnv *env, jstring data)
+{
     QByteArray raw(getQByteArrayFromJString(env, data));
     QJsonParseError jsonError;
     QJsonDocument json = QJsonDocument::fromJson(raw, &jsonError);
     if (QJsonParseError::NoError != jsonError.error) {
-        qDebug() << "getQJsonObjectFromJstring - error parsing json. Code: "
-                       << jsonError.error << "Offset: " << jsonError.offset
-                       << "Message: " << jsonError.errorString()
-                       << "Data: " << raw;
+        qDebug() << "getQJsonObjectFromJstring - error parsing json. Code: " << jsonError.error
+                 << "Offset: " << jsonError.offset << "Message: " << jsonError.errorString() << "Data: " << raw;
         return QJsonObject();
     }
 
@@ -120,11 +127,13 @@ QJsonObject AndroidUtils::getQJsonObjectFromJString(JNIEnv* env, jstring data) {
     return json.object();
 }
 
-QJniObject AndroidUtils::getActivity() {
+QJniObject AndroidUtils::getActivity()
+{
     return QNativeInterface::QAndroidApplication::context();
 }
 
-int AndroidUtils::GetSDKVersion() {
+int AndroidUtils::GetSDKVersion()
+{
     QJniEnvironment env;
     jclass versionClass = env->FindClass("android/os/Build$VERSION");
     jfieldID sdkIntFieldID = env->GetStaticFieldID(versionClass, "SDK_INT", "I");
@@ -133,15 +142,14 @@ int AndroidUtils::GetSDKVersion() {
     return sdk;
 }
 
-QString AndroidUtils::GetManufacturer() {
+QString AndroidUtils::GetManufacturer()
+{
     QJniEnvironment env;
     jclass buildClass = env->FindClass("android/os/Build");
-    jfieldID manuFacturerField =
-        env->GetStaticFieldID(buildClass, "MANUFACTURER", "Ljava/lang/String;");
-    jstring value =
-        (jstring)env->GetStaticObjectField(buildClass, manuFacturerField);
+    jfieldID manuFacturerField = env->GetStaticFieldID(buildClass, "MANUFACTURER", "Ljava/lang/String;");
+    jstring value = (jstring)env->GetStaticObjectField(buildClass, manuFacturerField);
 
-    const char* buffer = env->GetStringUTFChars(value, nullptr);
+    const char *buffer = env->GetStringUTFChars(value, nullptr);
 
     if (!buffer) {
         qDebug() << "Failed to fetch MANUFACTURER";
@@ -154,21 +162,22 @@ QString AndroidUtils::GetManufacturer() {
     return res;
 }
 
-void AndroidUtils::runOnAndroidThreadSync(const std::function<void()> runnable) {
-    QNativeInterface::QAndroidApplication::runOnAndroidMainThread(runnable)
-        .waitForFinished();
+void AndroidUtils::runOnAndroidThreadSync(const std::function<void()> runnable)
+{
+    QNativeInterface::QAndroidApplication::runOnAndroidMainThread(runnable).waitForFinished();
 }
 
-void AndroidUtils::runOnAndroidThreadAsync(const std::function<void()> runnable) {
+void AndroidUtils::runOnAndroidThreadAsync(const std::function<void()> runnable)
+{
     QNativeInterface::QAndroidApplication::runOnAndroidMainThread(runnable);
 }
 
 // Static
 // Creates a copy of the passed QByteArray in the JVM and passes back a ref
-jbyteArray AndroidUtils::tojByteArray(const QByteArray& data) {
+jbyteArray AndroidUtils::tojByteArray(const QByteArray &data)
+{
     QJniEnvironment env;
     jbyteArray out = env->NewByteArray(data.size());
-    env->SetByteArrayRegion(out, 0, data.size(),
-                            reinterpret_cast<const jbyte*>(data.constData()));
+    env->SetByteArrayRegion(out, 0, data.size(), reinterpret_cast<const jbyte *>(data.constData()));
     return out;
 }
diff --git a/client/platforms/android/androidvpnactivity.cpp b/client/platforms/android/androidvpnactivity.cpp
index 2076280d..e81e694b 100644
--- a/client/platforms/android/androidvpnactivity.cpp
+++ b/client/platforms/android/androidvpnactivity.cpp
@@ -4,7 +4,6 @@
 
 #include "androidvpnactivity.h"
 
-#include <QApplication>
 #include <QJniEnvironment>
 #include <QJniObject>
 #include <QJsonDocument>
@@ -13,19 +12,21 @@
 #include "androidutils.h"
 #include "jni.h"
 
-namespace {
-    AndroidVPNActivity* s_instance = nullptr;
+namespace
+{
+    AndroidVPNActivity *s_instance = nullptr;
     constexpr auto CLASSNAME = "org.amnezia.vpn.qt.VPNActivity";
 }
 
-AndroidVPNActivity::AndroidVPNActivity() {
+AndroidVPNActivity::AndroidVPNActivity()
+{
     AndroidUtils::runOnAndroidThreadAsync([]() {
-        JNINativeMethod methods[]{
-            {"handleBackButton", "()Z", reinterpret_cast<bool*>(handleBackButton)},
-            {"onServiceMessage", "(ILjava/lang/String;)V", reinterpret_cast<void*>(onServiceMessage)},
-            {"qtOnServiceConnected", "()V", reinterpret_cast<void*>(onServiceConnected)},
-            {"qtOnServiceDisconnected", "()V", reinterpret_cast<void*>(onServiceDisconnected)},
-            {"onActivityMessage", "(ILjava/lang/String;)V", reinterpret_cast<void*>(onAndroidVpnActivityMessage)}
+        JNINativeMethod methods[] {
+            { "handleBackButton", "()Z", reinterpret_cast<bool *>(handleBackButton) },
+            { "onServiceMessage", "(ILjava/lang/String;)V", reinterpret_cast<void *>(onServiceMessage) },
+            { "qtOnServiceConnected", "()V", reinterpret_cast<void *>(onServiceConnected) },
+            { "qtOnServiceDisconnected", "()V", reinterpret_cast<void *>(onServiceDisconnected) },
+            { "onActivityMessage", "(ILjava/lang/String;)V", reinterpret_cast<void *>(onAndroidVpnActivityMessage) }
         };
 
         QJniObject javaClass(CLASSNAME);
@@ -36,19 +37,22 @@ AndroidVPNActivity::AndroidVPNActivity() {
     });
 }
 
-void AndroidVPNActivity::maybeInit() {
+void AndroidVPNActivity::maybeInit()
+{
     if (s_instance == nullptr) {
         s_instance = new AndroidVPNActivity();
     }
 }
 
 // static
-bool AndroidVPNActivity::handleBackButton(JNIEnv* env, jobject thiz) {
+bool AndroidVPNActivity::handleBackButton(JNIEnv *env, jobject thiz)
+{
     Q_UNUSED(env);
     Q_UNUSED(thiz);
 }
 
-void AndroidVPNActivity::connectService() {
+void AndroidVPNActivity::connectService()
+{
     QJniObject::callStaticMethod<void>(CLASSNAME, "connectService", "()V");
 }
 
@@ -57,16 +61,16 @@ void AndroidVPNActivity::startQrCodeReader()
     QJniObject::callStaticMethod<void>(CLASSNAME, "startQrCodeReader", "()V");
 }
 
-void AndroidVPNActivity::saveFileAs(QString fileContent, QString suggestedFilename) {
-    QJniObject::callStaticMethod<void>(
-                CLASSNAME,
-                "saveFileAs", "(Ljava/lang/String;Ljava/lang/String;)V",
-                QJniObject::fromString(fileContent).object<jstring>(),
-                QJniObject::fromString(suggestedFilename).object<jstring>());
+void AndroidVPNActivity::saveFileAs(QString fileContent, QString suggestedFilename)
+{
+    QJniObject::callStaticMethod<void>(CLASSNAME, "saveFileAs", "(Ljava/lang/String;Ljava/lang/String;)V",
+                                       QJniObject::fromString(fileContent).object<jstring>(),
+                                       QJniObject::fromString(suggestedFilename).object<jstring>());
 }
 
 // static
-AndroidVPNActivity* AndroidVPNActivity::instance() {
+AndroidVPNActivity *AndroidVPNActivity::instance()
+{
     if (s_instance == nullptr) {
         AndroidVPNActivity::maybeInit();
     }
@@ -75,21 +79,19 @@ AndroidVPNActivity* AndroidVPNActivity::instance() {
 }
 
 // static
-void AndroidVPNActivity::sendToService(ServiceAction type, const QString& data) {
+void AndroidVPNActivity::sendToService(ServiceAction type, const QString &data)
+{
     int messageType = (int)type;
 
-    QJniObject::callStaticMethod<void>(
-        CLASSNAME,
-        "sendToService", "(ILjava/lang/String;)V",
-        static_cast<int>(messageType),
-        QJniObject::fromString(data).object<jstring>());
+    QJniObject::callStaticMethod<void>(CLASSNAME, "sendToService", "(ILjava/lang/String;)V",
+                                       static_cast<int>(messageType), QJniObject::fromString(data).object<jstring>());
 }
 
 // static
-void AndroidVPNActivity::onServiceMessage(JNIEnv* env, jobject thiz,
-                                          jint messageType, jstring body) {
+void AndroidVPNActivity::onServiceMessage(JNIEnv *env, jobject thiz, jint messageType, jstring body)
+{
     Q_UNUSED(thiz);
-    const char* buffer = env->GetStringUTFChars(body, nullptr);
+    const char *buffer = env->GetStringUTFChars(body, nullptr);
     if (!buffer) {
         return;
     }
@@ -97,38 +99,23 @@ void AndroidVPNActivity::onServiceMessage(JNIEnv* env, jobject thiz,
     QString parcelBody(buffer);
     env->ReleaseStringUTFChars(body, buffer);
     AndroidUtils::dispatchToMainThread([messageType, parcelBody] {
-        AndroidVPNActivity::instance()->handleServiceMessage(messageType,
-                                                            parcelBody);
+        AndroidVPNActivity::instance()->handleServiceMessage(messageType, parcelBody);
     });
 }
 
-void AndroidVPNActivity::handleServiceMessage(int code, const QString& data) {
+void AndroidVPNActivity::handleServiceMessage(int code, const QString &data)
+{
     auto mode = (ServiceEvents)code;
 
     switch (mode) {
-    case ServiceEvents::EVENT_INIT:
-        emit eventInitialized(data);
-        break;
-    case ServiceEvents::EVENT_CONNECTED:
-        emit eventConnected(data);
-        break;
-    case ServiceEvents::EVENT_DISCONNECTED:
-        emit eventDisconnected(data);
-        break;
-    case ServiceEvents::EVENT_STATISTIC_UPDATE:
-        emit eventStatisticUpdate(data);
-        break;
-    case ServiceEvents::EVENT_BACKEND_LOGS:
-        emit eventBackendLogs(data);
-        break;
-    case ServiceEvents::EVENT_ACTIVATION_ERROR:
-        emit eventActivationError(data);
-        break;
-    case ServiceEvents::EVENT_CONFIG_IMPORT:
-        emit eventConfigImport(data);
-        break;
-    default:
-        Q_ASSERT(false);
+    case ServiceEvents::EVENT_INIT: emit eventInitialized(data); break;
+    case ServiceEvents::EVENT_CONNECTED: emit eventConnected(data); break;
+    case ServiceEvents::EVENT_DISCONNECTED: emit eventDisconnected(data); break;
+    case ServiceEvents::EVENT_STATISTIC_UPDATE: emit eventStatisticUpdate(data); break;
+    case ServiceEvents::EVENT_BACKEND_LOGS: emit eventBackendLogs(data); break;
+    case ServiceEvents::EVENT_ACTIVATION_ERROR: emit eventActivationError(data); break;
+    case ServiceEvents::EVENT_CONFIG_IMPORT: emit eventConfigImport(data); break;
+    default: Q_ASSERT(false);
     }
 }
 
@@ -137,22 +124,21 @@ void AndroidVPNActivity::handleActivityMessage(int code, const QString &data)
     auto mode = (UIEvents)code;
 
     switch (mode) {
-    case UIEvents::QR_CODED_DECODED:
-        emit eventQrCodeReceived(data);
-        break;
-    default:
-        Q_ASSERT(false);
+    case UIEvents::QR_CODED_DECODED: emit eventQrCodeReceived(data); break;
+    default: Q_ASSERT(false);
     }
 }
 
-void AndroidVPNActivity::onServiceConnected(JNIEnv* env, jobject thiz) {
+void AndroidVPNActivity::onServiceConnected(JNIEnv *env, jobject thiz)
+{
     Q_UNUSED(env);
     Q_UNUSED(thiz);
 
     emit AndroidVPNActivity::instance()->serviceConnected();
 }
 
-void AndroidVPNActivity::onServiceDisconnected(JNIEnv* env, jobject thiz) {
+void AndroidVPNActivity::onServiceDisconnected(JNIEnv *env, jobject thiz)
+{
     Q_UNUSED(env);
     Q_UNUSED(thiz);
 
@@ -162,7 +148,7 @@ void AndroidVPNActivity::onServiceDisconnected(JNIEnv* env, jobject thiz) {
 void AndroidVPNActivity::onAndroidVpnActivityMessage(JNIEnv *env, jobject thiz, jint messageType, jstring message)
 {
     Q_UNUSED(thiz);
-    const char* buffer = env->GetStringUTFChars(message, nullptr);
+    const char *buffer = env->GetStringUTFChars(message, nullptr);
     if (!buffer) {
         return;
     }
diff --git a/client/resources.qrc b/client/resources.qrc
index 782b6446..d0ff176f 100644
--- a/client/resources.qrc
+++ b/client/resources.qrc
@@ -56,75 +56,6 @@
         <file>server_scripts/wireguard/template.conf</file>
         <file>server_scripts/website_tor/configure_container.sh</file>
         <file>server_scripts/website_tor/run_container.sh</file>
-        <file>ui/qml/main.qml</file>
-        <file>ui/qml/Pages/PageBase.qml</file>
-        <file>ui/qml/Pages/PageAppSetting.qml</file>
-        <file>ui/qml/Pages/PageGeneralSettings.qml</file>
-        <file>ui/qml/Pages/PageNetworkSetting.qml</file>
-        <file>ui/qml/Pages/PageNewServer.qml</file>
-        <file>ui/qml/Pages/PageServerConfiguringProgress.qml</file>
-        <file>ui/qml/Pages/PageNewServerProtocols.qml</file>
-        <file>ui/qml/Pages/PageServerList.qml</file>
-        <file>ui/qml/Pages/PageServerContainers.qml</file>
-        <file>ui/qml/Pages/PageServerSettings.qml</file>
-        <file>ui/qml/Pages/PageSetupWizard.qml</file>
-        <file>ui/qml/Pages/PageSetupWizardHighLevel.qml</file>
-        <file>ui/qml/Pages/PageSetupWizardLowLevel.qml</file>
-        <file>ui/qml/Pages/PageSetupWizardMediumLevel.qml</file>
-        <file>ui/qml/Pages/PageSetupWizardVPNMode.qml</file>
-        <file>ui/qml/Pages/PageShareConnection.qml</file>
-        <file>ui/qml/Pages/PageSites.qml</file>
-        <file>ui/qml/Pages/PageStart.qml</file>
-        <file>ui/qml/Pages/PageVPN.qml</file>
-        <file>ui/qml/Pages/PageAbout.qml</file>
-        <file>ui/qml/Pages/PageQrDecoderIos.qml</file>
-        <file>ui/qml/Pages/PageViewConfig.qml</file>
-        <file>ui/qml/Pages/PageClientManagement.qml</file>
-        <file>ui/qml/Pages/ClientInfo/PageClientInfoBase.qml</file>
-        <file>ui/qml/Pages/ClientInfo/PageClientInfoOpenVPN.qml</file>
-        <file>ui/qml/Pages/ClientInfo/PageClientInfoWireGuard.qml</file>
-        <file>ui/qml/Pages/Protocols/PageProtoCloak.qml</file>
-        <file>ui/qml/Pages/Protocols/PageProtoOpenVPN.qml</file>
-        <file>ui/qml/Pages/Protocols/PageProtoShadowSocks.qml</file>
-        <file>ui/qml/Pages/Protocols/PageProtoSftp.qml</file>
-        <file>ui/qml/Pages/Protocols/PageProtoTorWebSite.qml</file>
-        <file>ui/qml/Pages/Protocols/PageProtocolBase.qml</file>
-        <file>ui/qml/Pages/Protocols/PageProtoWireGuard.qml</file>
-        <file>ui/qml/Pages/InstallSettings/InstallSettingsBase.qml</file>
-        <file>ui/qml/Pages/InstallSettings/SelectContainer.qml</file>
-        <file>ui/qml/Pages/Share/PageShareProtoCloak.qml</file>
-        <file>ui/qml/Pages/Share/PageShareProtocolBase.qml</file>
-        <file>ui/qml/Pages/Share/PageShareProtoOpenVPN.qml</file>
-        <file>ui/qml/Pages/Share/PageShareProtoSftp.qml</file>
-        <file>ui/qml/Pages/Share/PageShareProtoShadowSocks.qml</file>
-        <file>ui/qml/Pages/Share/PageShareProtoTorWebSite.qml</file>
-        <file>ui/qml/Pages/Share/PageShareProtoAmnezia.qml</file>
-        <file>ui/qml/Pages/Share/PageShareProtoWireGuard.qml</file>
-        <file>ui/qml/Pages/Share/PageShareProtoIkev2.qml</file>
-        <file>ui/qml/Controls/BasicButtonType.qml</file>
-        <file>ui/qml/Controls/BlueButtonType.qml</file>
-        <file>ui/qml/Controls/CheckBoxType.qml</file>
-        <file>ui/qml/Controls/ComboBoxType.qml</file>
-        <file>ui/qml/Controls/ImageButtonType.qml</file>
-        <file>ui/qml/Controls/LabelType.qml</file>
-        <file>ui/qml/Controls/RadioButtonType.qml</file>
-        <file>ui/qml/Controls/SettingButtonType.qml</file>
-        <file>ui/qml/Controls/ShareConnectionButtonType.qml</file>
-        <file>ui/qml/Controls/ShareConnectionContent.qml</file>
-        <file>ui/qml/Controls/TextFieldType.qml</file>
-        <file>ui/qml/Controls/RichLabelType.qml</file>
-        <file>ui/qml/Controls/SvgImageType.qml</file>
-        <file>ui/qml/Controls/FlickableType.qml</file>
-        <file>ui/qml/Controls/UrlButtonType.qml</file>
-        <file>ui/qml/Controls/TextAreaType.qml</file>
-        <file>ui/qml/Controls/ContextMenu.qml</file>
-        <file>ui/qml/Controls/FadeBehavior.qml</file>
-        <file>ui/qml/Controls/VisibleBehavior.qml</file>
-        <file>ui/qml/Controls/Caption.qml</file>
-        <file>ui/qml/Controls/Logo.qml</file>
-        <file>ui/qml/Controls/BackButton.qml</file>
-        <file>ui/qml/Controls/ShareConnectionButtonCopyType.qml</file>
-        <file>ui/qml/Controls/SvgButtonType.qml</file>
         <file>ui/qml/Config/GlobalConfig.qml</file>
         <file>ui/qml/Config/qmldir</file>
         <file>server_scripts/check_server_is_busy.sh</file>
@@ -161,10 +92,6 @@
         <file>images/svg/control_point_black_24dp.svg</file>
         <file>images/svg/settings_suggest_black_24dp.svg</file>
         <file>server_scripts/website_tor/Dockerfile</file>
-        <file>ui/qml/Controls/PopupWithQuestion.qml</file>
-        <file>ui/qml/Pages/PageAdvancedServerSettings.qml</file>
-        <file>ui/qml/Controls/PopupWarning.qml</file>
-        <file>ui/qml/Controls/PopupWithTextField.qml</file>
         <file>server_scripts/check_user_in_sudo.sh</file>
         <file>ui/qml/Controls2/BasicButtonType.qml</file>
         <file>ui/qml/Controls2/TextFieldWithHeaderType.qml</file>
diff --git a/client/ui/controllers/connectionController.cpp b/client/ui/controllers/connectionController.cpp
index d3813086..0754b024 100644
--- a/client/ui/controllers/connectionController.cpp
+++ b/client/ui/controllers/connectionController.cpp
@@ -1,6 +1,10 @@
 #include "connectionController.h"
 
-#include <QApplication>
+#if defined(Q_OS_ANDROID) || defined(Q_OS_IOS)
+    #include <QGuiApplication>
+#else
+    #include <QApplication>
+#endif
 
 #include "core/errorstrings.h"
 
diff --git a/client/ui/controllers/pageController.cpp b/client/ui/controllers/pageController.cpp
index 84d2ebf2..46a1b1fd 100644
--- a/client/ui/controllers/pageController.cpp
+++ b/client/ui/controllers/pageController.cpp
@@ -1,6 +1,11 @@
 #include "pageController.h"
 
-#include <QApplication>
+#if defined(Q_OS_ANDROID) || defined(Q_OS_IOS)
+    #include <QGuiApplication>
+#else
+    #include <QApplication>
+#endif
+
 #ifdef Q_OS_ANDROID
     #include "../../platforms/android/androidutils.h"
     #include <QJniObject>
diff --git a/client/ui/controllers/settingsController.cpp b/client/ui/controllers/settingsController.cpp
index 203d53bd..7c7402e0 100644
--- a/client/ui/controllers/settingsController.cpp
+++ b/client/ui/controllers/settingsController.cpp
@@ -2,10 +2,6 @@
 
 #include <QStandardPaths>
 
-#ifdef Q_OS_IOS
-    #include <CoreFoundation/CoreFoundation.h>
-#endif
-
 #include "fileUtilites.h"
 #include "logger.h"
 #include "ui/qautostart.h"
diff --git a/client/ui/controllers/sitesController.cpp b/client/ui/controllers/sitesController.cpp
index 16225aa8..5821b371 100644
--- a/client/ui/controllers/sitesController.cpp
+++ b/client/ui/controllers/sitesController.cpp
@@ -1,12 +1,9 @@
 #include "sitesController.h"
 
+#include <QFile>
 #include <QHostInfo>
 #include <QStandardPaths>
 
-#ifdef Q_OS_IOS
-    #include <CoreFoundation/CoreFoundation.h>
-#endif
-
 #include "fileUtilites.h"
 #include "utilities.h"
 
diff --git a/client/ui/pages_logic/AdvancedServerSettingsLogic.cpp b/client/ui/pages_logic/AdvancedServerSettingsLogic.cpp
deleted file mode 100644
index a96827b6..00000000
--- a/client/ui/pages_logic/AdvancedServerSettingsLogic.cpp
+++ /dev/null
@@ -1,88 +0,0 @@
-#include "AdvancedServerSettingsLogic.h"
-
-#include "VpnLogic.h"
-#include "ui/uilogic.h"
-#include "core/errorstrings.h"
-#include "core/servercontroller.h"
-
-AdvancedServerSettingsLogic::AdvancedServerSettingsLogic(UiLogic *uiLogic, QObject *parent): PageLogicBase(uiLogic, parent),
-      m_labelWaitInfoVisible{true},
-      m_pushButtonClearVisible{true},
-      m_pushButtonClearText{tr("Clear server from Amnezia software")}
-{
-}
-
-void AdvancedServerSettingsLogic::onUpdatePage()
-{
-    set_labelWaitInfoVisible(false);
-    set_labelWaitInfoText("");
-    set_pushButtonClearVisible(m_settings->haveAuthData(uiLogic()->m_selectedServerIndex));
-    const QJsonObject &server = m_settings->server(uiLogic()->m_selectedServerIndex);
-    const QString &port = server.value(config_key::port).toString();
-
-    const QString &userName = server.value(config_key::userName).toString();
-    const QString &hostName = server.value(config_key::hostName).toString();
-    QString name = QString("%1%2%3%4%5").arg(userName,
-                                             userName.isEmpty() ? "" : "@",
-                                             hostName,
-                                             port.isEmpty() ? "" : ":",
-                                             port);
-
-    set_labelServerText(name);
-
-    DockerContainer selectedContainer = m_settings->defaultContainer(uiLogic()->m_selectedServerIndex);
-    QString selectedContainerName = ContainerProps::containerHumanNames().value(selectedContainer);
-    set_labelCurrentVpnProtocolText(tr("Service: ") + selectedContainerName);
-}
-
-void AdvancedServerSettingsLogic::onPushButtonClearServerClicked()
-{
-    set_pageEnabled(false);
-    set_pushButtonClearText(tr("Uninstalling Amnezia software..."));
-
-    if (m_settings->defaultServerIndex() == uiLogic()->m_selectedServerIndex) {
-        uiLogic()->pageLogic<VpnLogic>()->onDisconnect();
-    }
-
-    ServerController serverController(m_settings);
-    ErrorCode errorCode = serverController.removeAllContainers(m_settings->serverCredentials(uiLogic()->m_selectedServerIndex));
-    if (errorCode) {
-        emit uiLogic()->showWarningMessage(tr("Error occurred while cleaning the server.") + "\n" +
-                                           tr("Error message: ") + errorString(errorCode) + "\n" +
-                                           tr("See logs for details."));
-    } else {
-        set_labelWaitInfoVisible(true);
-        set_labelWaitInfoText(tr("Amnezia server successfully uninstalled"));
-    }
-
-    m_settings->setContainers(uiLogic()->m_selectedServerIndex, {});
-    m_settings->setDefaultContainer(uiLogic()->m_selectedServerIndex, DockerContainer::None);
-
-    set_pageEnabled(true);
-    set_pushButtonClearText(tr("Clear server from Amnezia software"));
-}
-
-void AdvancedServerSettingsLogic::onPushButtonScanServerClicked()
-{
-    set_labelWaitInfoVisible(false);
-    set_pageEnabled(false);
-
-    bool isServerCreated;
-    auto containersCount = m_settings->containers(uiLogic()->m_selectedServerIndex).size();
-    ErrorCode errorCode = uiLogic()->addAlreadyInstalledContainersGui(isServerCreated);
-    if (errorCode != ErrorCode::NoError) {
-        emit uiLogic()->showWarningMessage(tr("Error occurred while scanning the server.") + "\n" +
-                                           tr("Error message: ") + errorString(errorCode) + "\n" +
-                                           tr("See logs for details."));
-    }
-    auto newContainersCount = m_settings->containers(uiLogic()->m_selectedServerIndex).size();
-    if (containersCount != newContainersCount) {
-        emit uiLogic()->showWarningMessage(tr("All containers installed on the server are added to the GUI"));
-    } else {
-        emit uiLogic()->showWarningMessage(tr("No installed containers found on the server"));
-    }
-
-
-    onUpdatePage();
-    set_pageEnabled(true);
-}
diff --git a/client/ui/pages_logic/AdvancedServerSettingsLogic.h b/client/ui/pages_logic/AdvancedServerSettingsLogic.h
deleted file mode 100644
index 692968f1..00000000
--- a/client/ui/pages_logic/AdvancedServerSettingsLogic.h
+++ /dev/null
@@ -1,31 +0,0 @@
-#ifndef ADVANCEDSERVERSETTINGSLOGIC_H
-#define ADVANCEDSERVERSETTINGSLOGIC_H
-
-#include "PageLogicBase.h"
-
-class UiLogic;
-
-class AdvancedServerSettingsLogic : public PageLogicBase
-{
-    Q_OBJECT
-
-    AUTO_PROPERTY(bool, labelWaitInfoVisible)
-    AUTO_PROPERTY(QString, labelWaitInfoText)
-
-    AUTO_PROPERTY(QString, pushButtonClearText)
-    AUTO_PROPERTY(bool, pushButtonClearVisible)
-
-    AUTO_PROPERTY(QString, labelServerText)
-    AUTO_PROPERTY(QString, labelCurrentVpnProtocolText)
-
-public:
-    explicit AdvancedServerSettingsLogic(UiLogic *uiLogic, QObject *parent = nullptr);
-    ~AdvancedServerSettingsLogic() = default;
-
-    Q_INVOKABLE void onUpdatePage() override;
-
-    Q_INVOKABLE void onPushButtonClearServerClicked();
-    Q_INVOKABLE void onPushButtonScanServerClicked();
-};
-
-#endif // ADVANCEDSERVERSETTINGSLOGIC_H
diff --git a/client/ui/pages_logic/AppSettingsLogic.cpp b/client/ui/pages_logic/AppSettingsLogic.cpp
deleted file mode 100644
index 044b97b8..00000000
--- a/client/ui/pages_logic/AppSettingsLogic.cpp
+++ /dev/null
@@ -1,119 +0,0 @@
-#include "AppSettingsLogic.h"
-
-#include "logger.h"
-#include "version.h"
-#include "ui/qautostart.h"
-#include "ui/uilogic.h"
-
-#include <QDesktopServices>
-#include <QFileDialog>
-#include <QStandardPaths>
-#include <utilities.h>
-
-#ifdef Q_OS_IOS
-#include <CoreFoundation/CoreFoundation.h>
-#endif
-
-using namespace amnezia;
-using namespace PageEnumNS;
-
-AppSettingsLogic::AppSettingsLogic(UiLogic *logic, QObject *parent):
-    PageLogicBase(logic, parent),
-    m_checkBoxAutostartChecked{false},
-    m_checkBoxAutoConnectChecked{false},
-    m_checkBoxStartMinimizedChecked{false},
-    m_checkBoxSaveLogsChecked{false}
-{
-
-}
-
-void AppSettingsLogic::onUpdatePage()
-{
-    set_checkBoxAutostartChecked(Autostart::isAutostart());
-    set_checkBoxAutoConnectChecked(m_settings->isAutoConnect());
-    set_checkBoxStartMinimizedChecked(m_settings->isStartMinimized());
-    set_checkBoxSaveLogsChecked(m_settings->isSaveLogs());
-
-    QString ver = QString("%1: %2 (%3)")
-            .arg(tr("Software version"))
-            .arg(QString(APP_MAJOR_VERSION))
-            .arg(__DATE__);
-    set_labelVersionText(ver);
-}
-
-void AppSettingsLogic::onCheckBoxAutostartToggled(bool checked)
-{
-    if (!checked) {
-        set_checkBoxAutoConnectChecked(false);
-    }
-    Autostart::setAutostart(checked);
-}
-
-void AppSettingsLogic::onCheckBoxAutoconnectToggled(bool checked)
-{
-    m_settings->setAutoConnect(checked);
-}
-
-void AppSettingsLogic::onCheckBoxStartMinimizedToggled(bool checked)
-{
-    m_settings->setStartMinimized(checked);
-}
-
-void AppSettingsLogic::onCheckBoxSaveLogsCheckedToggled(bool checked)
-{
-    m_settings->setSaveLogs(checked);
-}
-
-void AppSettingsLogic::onPushButtonOpenLogsClicked()
-{
-    Logger::openLogsFolder();
-}
-
-void AppSettingsLogic::onPushButtonExportLogsClicked()
-{
-    uiLogic()->saveTextFile(tr("Save log"), "AmneziaVPN.log", ".log", Logger::getLogFile());
-}
-
-void AppSettingsLogic::onPushButtonClearLogsClicked()
-{
-    Logger::clearLogs();
-    Logger::clearServiceLogs();
-}
-
-void AppSettingsLogic::onPushButtonBackupAppConfigClicked()
-{
-    uiLogic()->saveTextFile("Backup application config", "AmneziaVPN.backup", ".backup", m_settings->backupAppConfig());
-}
-
-void AppSettingsLogic::onPushButtonRestoreAppConfigClicked()
-{
-    QString fileName = UiLogic::getOpenFileName(Q_NULLPTR, tr("Open backup"),
-        QStandardPaths::writableLocation(QStandardPaths::DocumentsLocation), "*.backup");
-
-    if (fileName.isEmpty()) return;
-
-    QFile file(fileName);
-    
-#ifdef Q_OS_IOS
-    CFURLRef url = CFURLCreateWithFileSystemPath(
-                kCFAllocatorDefault,   CFStringCreateWithCharacters(0, reinterpret_cast<const UniChar *>(fileName.unicode()),
-                                                                    fileName.length()),
-                kCFURLPOSIXPathStyle, 0);
-    
-    if (!CFURLStartAccessingSecurityScopedResource(url)) {
-        qDebug() << "Could not access path " << QUrl::fromLocalFile(fileName).toString();
-    }
-#endif
-    
-    file.open(QIODevice::ReadOnly);
-    QByteArray data = file.readAll();
-
-    bool ok = m_settings->restoreAppConfig(data);
-    if (ok) {
-        emit uiLogic()->goToPage(Page::Vpn);
-        emit uiLogic()->setStartPage(Page::Vpn);
-    } else {
-        emit uiLogic()->showWarningMessage(tr("Can't import config, file is corrupted."));
-    }
-}
-
diff --git a/client/ui/pages_logic/AppSettingsLogic.h b/client/ui/pages_logic/AppSettingsLogic.h
deleted file mode 100644
index fc9f0da7..00000000
--- a/client/ui/pages_logic/AppSettingsLogic.h
+++ /dev/null
@@ -1,37 +0,0 @@
-#ifndef APP_SETTINGS_LOGIC_H
-#define APP_SETTINGS_LOGIC_H
-
-#include "PageLogicBase.h"
-
-class UiLogic;
-
-class AppSettingsLogic : public PageLogicBase
-{
-    Q_OBJECT
-    AUTO_PROPERTY(bool, checkBoxAutostartChecked)
-    AUTO_PROPERTY(bool, checkBoxAutoConnectChecked)
-    AUTO_PROPERTY(bool, checkBoxStartMinimizedChecked)
-    AUTO_PROPERTY(bool, checkBoxSaveLogsChecked)
-    AUTO_PROPERTY(QString, labelVersionText)
-
-public:
-    Q_INVOKABLE void onUpdatePage() override;
-
-    Q_INVOKABLE void onCheckBoxAutostartToggled(bool checked);
-    Q_INVOKABLE void onCheckBoxAutoconnectToggled(bool checked);
-    Q_INVOKABLE void onCheckBoxStartMinimizedToggled(bool checked);
-    Q_INVOKABLE void onCheckBoxSaveLogsCheckedToggled(bool checked);
-    Q_INVOKABLE void onPushButtonOpenLogsClicked();
-    Q_INVOKABLE void onPushButtonExportLogsClicked();
-    Q_INVOKABLE void onPushButtonClearLogsClicked();
-
-    Q_INVOKABLE void onPushButtonBackupAppConfigClicked();
-    Q_INVOKABLE void onPushButtonRestoreAppConfigClicked();
-
-
-public:
-    explicit AppSettingsLogic(UiLogic *uiLogic, QObject *parent = nullptr);
-    ~AppSettingsLogic() = default;
-
-};
-#endif // APP_SETTINGS_LOGIC_H
diff --git a/client/ui/pages_logic/ClientInfoLogic.cpp b/client/ui/pages_logic/ClientInfoLogic.cpp
deleted file mode 100644
index dca0b9fd..00000000
--- a/client/ui/pages_logic/ClientInfoLogic.cpp
+++ /dev/null
@@ -1,213 +0,0 @@
-#include "ClientInfoLogic.h"
-
-#include <QMessageBox>
-
-#include "version.h"
-#include "core/errorstrings.h"
-#include "core/servercontroller.h"
-#include "ui/models/clientManagementModel.h"
-#include "ui/uilogic.h"
-
-namespace {
-    bool isErrorOccured(ErrorCode error) {
-        if (error != ErrorCode::NoError) {
-            QMessageBox::warning(nullptr, APPLICATION_NAME,
-                                 QObject::tr("An error occurred while saving the list of clients.") + "\n" + errorString(error));
-            return true;
-        }
-        return false;
-    }
-}
-
-ClientInfoLogic::ClientInfoLogic(UiLogic *logic, QObject *parent):
-    PageLogicBase(logic, parent)
-{
-
-}
-
-void ClientInfoLogic::setCurrentClientId(int index)
-{
-    m_currentClientIndex = index;
-}
-
-void ClientInfoLogic::onUpdatePage()
-{
-    set_pageContentVisible(false);
-    set_busyIndicatorIsRunning(true);
-
-    const ServerCredentials credentials = m_settings->serverCredentials(uiLogic()->m_selectedServerIndex);
-    const DockerContainer container = m_settings->defaultContainer(uiLogic()->m_selectedServerIndex);
-    const QString containerNameString = ContainerProps::containerHumanNames().value(container);
-    set_labelCurrentVpnProtocolText(tr("Service: ") + containerNameString);
-
-    const QVector<amnezia::Proto> protocols = ContainerProps::protocolsForContainer(container);
-    if (!protocols.empty()) {
-        const Proto currentMainProtocol = protocols.front();
-
-        auto model = qobject_cast<ClientManagementModel*>(uiLogic()->clientManagementModel());
-        const QModelIndex modelIndex = model->index(m_currentClientIndex);
-
-        set_lineEditNameAliasText(model->data(modelIndex, ClientManagementModel::ClientRoles::NameRole).toString());
-        if (currentMainProtocol == Proto::OpenVpn) {
-            const QString certId = model->data(modelIndex, ClientManagementModel::ClientRoles::OpenVpnCertIdRole).toString();
-            QString certData = model->data(modelIndex, ClientManagementModel::ClientRoles::OpenVpnCertDataRole).toString();
-
-            if (certData.isEmpty() && !certId.isEmpty()) {
-                QString stdOut;
-                auto cbReadStdOut = [&](const QString &data, libssh::Client &) {
-                    stdOut += data + "\n";
-                    return ErrorCode::NoError;
-                };
-
-                const QString getOpenVpnCertData = QString("sudo docker exec -i $CONTAINER_NAME bash -c 'cat /opt/amnezia/openvpn/pki/issued/%1.crt'")
-                                                           .arg(certId);
-                ServerController serverController(m_settings);
-                const QString script = serverController.replaceVars(getOpenVpnCertData, serverController.genVarsForScript(credentials, container));
-                ErrorCode error = serverController.runScript(credentials, script, cbReadStdOut);
-                certData = stdOut;
-                if (isErrorOccured(error)) {
-                    set_busyIndicatorIsRunning(false);
-                    emit uiLogic()->closePage();
-                    return;
-                }
-            }
-            set_labelOpenVpnCertId(certId);
-            set_textAreaOpenVpnCertData(certData);
-        } else if (currentMainProtocol == Proto::WireGuard) {
-            set_textAreaWireGuardKeyData(model->data(modelIndex, ClientManagementModel::ClientRoles::WireGuardPublicKey).toString());
-        }
-    }
-    set_pageContentVisible(true);
-    set_busyIndicatorIsRunning(false);
-}
-
-void ClientInfoLogic::onLineEditNameAliasEditingFinished()
-{
-    set_busyIndicatorIsRunning(true);
-
-    auto model = qobject_cast<ClientManagementModel*>(uiLogic()->clientManagementModel());
-    const QModelIndex modelIndex = model->index(m_currentClientIndex);
-    model->setData(modelIndex, m_lineEditNameAliasText, ClientManagementModel::ClientRoles::NameRole);
-
-    const DockerContainer selectedContainer = m_settings->defaultContainer(uiLogic()->m_selectedServerIndex);
-    const ServerCredentials credentials = m_settings->serverCredentials(uiLogic()->m_selectedServerIndex);
-    const QVector<amnezia::Proto> protocols = ContainerProps::protocolsForContainer(selectedContainer);
-    if (!protocols.empty()) {
-        const Proto currentMainProtocol = protocols.front();
-        const QJsonObject clientsTable = model->getContent(currentMainProtocol);
-        ErrorCode error = setClientsList(credentials,
-                                         selectedContainer,
-                                         currentMainProtocol,
-                                         clientsTable);
-        isErrorOccured(error);
-    }
-
-    set_busyIndicatorIsRunning(false);
-}
-
-void ClientInfoLogic::onRevokeOpenVpnCertificateClicked()
-{
-    set_busyIndicatorIsRunning(true);
-    const DockerContainer container = m_settings->defaultContainer(uiLogic()->m_selectedServerIndex);
-    const ServerCredentials credentials = m_settings->serverCredentials(uiLogic()->m_selectedServerIndex);
-
-    auto model = qobject_cast<ClientManagementModel*>(uiLogic()->clientManagementModel());
-    const QModelIndex modelIndex = model->index(m_currentClientIndex);
-    const QString certId = model->data(modelIndex, ClientManagementModel::ClientRoles::OpenVpnCertIdRole).toString();
-
-    const QString getOpenVpnCertData = QString("sudo docker exec -i $CONTAINER_NAME bash -c '"
-                                               "cd /opt/amnezia/openvpn ;\\"
-                                               "easyrsa revoke %1 ;\\"
-                                               "easyrsa gen-crl ;\\"
-                                               "cp pki/crl.pem .'").arg(certId);
-    ServerController serverController(m_settings);
-    const QString script = serverController.replaceVars(getOpenVpnCertData,
-                                                        serverController.genVarsForScript(credentials, container));
-    auto error = serverController.runScript(credentials, script);
-    if (isErrorOccured(error)) {
-        set_busyIndicatorIsRunning(false);
-        emit uiLogic()->goToPage(Page::ServerSettings);
-        return;
-    }
-
-    model->removeRows(m_currentClientIndex);
-    const QJsonObject clientsTable = model->getContent(Proto::OpenVpn);
-    error = setClientsList(credentials, container, Proto::OpenVpn, clientsTable);
-    if (isErrorOccured(error)) {
-        set_busyIndicatorIsRunning(false);
-        return;
-    }
-
-    const QJsonObject &containerConfig = m_settings->containerConfig(uiLogic()->m_selectedServerIndex, container);
-    error = serverController.startupContainerWorker(credentials, container, containerConfig);
-    if (isErrorOccured(error)) {
-        set_busyIndicatorIsRunning(false);
-        return;
-    }
-
-    set_busyIndicatorIsRunning(false);
-}
-
-void ClientInfoLogic::onRevokeWireGuardKeyClicked()
-{
-    set_busyIndicatorIsRunning(true);
-    ErrorCode error;
-    const DockerContainer container = m_settings->defaultContainer(uiLogic()->m_selectedServerIndex);
-    const ServerCredentials credentials = m_settings->serverCredentials(uiLogic()->m_selectedServerIndex);
-
-    ServerController serverController(m_settings);
-
-    const QString wireGuardConfigFile = "opt/amnezia/wireguard/wg0.conf";
-    const QString wireguardConfigString = serverController.getTextFileFromContainer(container, credentials, wireGuardConfigFile, &error);
-    if (isErrorOccured(error)) {
-        set_busyIndicatorIsRunning(false);
-        return;
-    }
-
-    auto model = qobject_cast<ClientManagementModel*>(uiLogic()->clientManagementModel());
-    const QModelIndex modelIndex = model->index(m_currentClientIndex);
-    const QString key = model->data(modelIndex, ClientManagementModel::ClientRoles::WireGuardPublicKey).toString();
-
-    auto configSections = wireguardConfigString.split("[", Qt::SkipEmptyParts);
-    for (auto &section : configSections) {
-        if (section.contains(key)) {
-            configSections.removeOne(section);
-        }
-    }
-    QString newWireGuardConfig = configSections.join("[");
-    newWireGuardConfig.insert(0, "[");
-    error = serverController.uploadTextFileToContainer(container, credentials, newWireGuardConfig,
-                                                       protocols::wireguard::serverConfigPath,
-                                                       libssh::SftpOverwriteMode::SftpOverwriteExisting);
-    if (isErrorOccured(error)) {
-        set_busyIndicatorIsRunning(false);
-        return;
-    }
-
-    model->removeRows(m_currentClientIndex);
-    const QJsonObject clientsTable = model->getContent(Proto::WireGuard);
-    error = setClientsList(credentials, container, Proto::WireGuard, clientsTable);
-    if (isErrorOccured(error)) {
-        set_busyIndicatorIsRunning(false);
-        return;
-    }
-
-    const QString script = "sudo docker exec -i $CONTAINER_NAME bash -c 'wg syncconf wg0 <(wg-quick strip /opt/amnezia/wireguard/wg0.conf)'";
-    error = serverController.runScript(credentials,
-                                       serverController.replaceVars(script, serverController.genVarsForScript(credentials, container)));
-    if (isErrorOccured(error)) {
-        set_busyIndicatorIsRunning(false);
-        return;
-    }
-
-    set_busyIndicatorIsRunning(false);
-}
-
-ErrorCode ClientInfoLogic::setClientsList(const ServerCredentials &credentials, DockerContainer container, Proto mainProtocol, const QJsonObject &clietns)
-{
-    const QString mainProtocolString = ProtocolProps::protoToString(mainProtocol);
-    const QString clientsTableFile = QString("opt/amnezia/%1/clientsTable").arg(mainProtocolString);
-    ServerController serverController(m_settings);
-    ErrorCode error = serverController.uploadTextFileToContainer(container, credentials, QJsonDocument(clietns).toJson(), clientsTableFile);
-    return error;
-}
diff --git a/client/ui/pages_logic/ClientInfoLogic.h b/client/ui/pages_logic/ClientInfoLogic.h
deleted file mode 100644
index 5ba19887..00000000
--- a/client/ui/pages_logic/ClientInfoLogic.h
+++ /dev/null
@@ -1,42 +0,0 @@
-#ifndef CLIENTINFOLOGIC_H
-#define CLIENTINFOLOGIC_H
-
-#include "PageLogicBase.h"
-
-#include "core/defs.h"
-#include "containers/containers_defs.h"
-#include "protocols/protocols_defs.h"
-
-class UiLogic;
-
-class ClientInfoLogic : public PageLogicBase
-{
-    Q_OBJECT
-
-    AUTO_PROPERTY(QString, lineEditNameAliasText)
-    AUTO_PROPERTY(QString, labelOpenVpnCertId)
-    AUTO_PROPERTY(QString, textAreaOpenVpnCertData)
-    AUTO_PROPERTY(QString, labelCurrentVpnProtocolText)
-    AUTO_PROPERTY(QString, textAreaWireGuardKeyData)
-    AUTO_PROPERTY(bool, busyIndicatorIsRunning);
-    AUTO_PROPERTY(bool, pageContentVisible);
-
-public:
-    ClientInfoLogic(UiLogic *uiLogic, QObject *parent = nullptr);
-    ~ClientInfoLogic() = default;
-
-    void setCurrentClientId(int index);
-
-public slots:
-    void onUpdatePage() override;
-    void onLineEditNameAliasEditingFinished();
-    void onRevokeOpenVpnCertificateClicked();
-    void onRevokeWireGuardKeyClicked();
-
-private:
-    ErrorCode setClientsList(const ServerCredentials &credentials, DockerContainer container, Proto mainProtocol, const QJsonObject &clietns);
-
-    int m_currentClientIndex;
-};
-
-#endif // CLIENTINFOLOGIC_H
diff --git a/client/ui/pages_logic/ClientManagementLogic.cpp b/client/ui/pages_logic/ClientManagementLogic.cpp
deleted file mode 100644
index 673ee9ab..00000000
--- a/client/ui/pages_logic/ClientManagementLogic.cpp
+++ /dev/null
@@ -1,143 +0,0 @@
-#include "ClientManagementLogic.h"
-
-#include <QMessageBox>
-
-#include "version.h"
-#include "core/errorstrings.h"
-#include "core/servercontroller.h"
-#include "ui/pages_logic/ClientInfoLogic.h"
-#include "ui/models/clientManagementModel.h"
-#include "ui/uilogic.h"
-
-ClientManagementLogic::ClientManagementLogic(UiLogic *logic, QObject *parent):
-    PageLogicBase(logic, parent)
-{
-
-}
-
-void ClientManagementLogic::onUpdatePage()
-{
-    set_busyIndicatorIsRunning(true);
-
-    qobject_cast<ClientManagementModel*>(uiLogic()->clientManagementModel())->clearData();
-    DockerContainer selectedContainer = m_settings->defaultContainer(uiLogic()->m_selectedServerIndex);
-    QString selectedContainerName = ContainerProps::containerHumanNames().value(selectedContainer);
-    set_labelCurrentVpnProtocolText(tr("Service: ") + selectedContainerName);
-
-    QJsonObject clients;
-
-    auto protocols = ContainerProps::protocolsForContainer(selectedContainer);
-    if (!protocols.empty()) {
-        m_currentMainProtocol = protocols.front();
-
-        const ServerCredentials credentials = m_settings->serverCredentials(uiLogic()->m_selectedServerIndex);
-
-        ErrorCode error = getClientsList(credentials, selectedContainer, m_currentMainProtocol, clients);
-        if (error != ErrorCode::NoError) {
-            QMessageBox::warning(nullptr, APPLICATION_NAME,
-                                 tr("An error occurred while getting the list of clients.") + "\n" + errorString(error));
-            set_busyIndicatorIsRunning(false);
-            return;
-        }
-    }
-    QVector<QVariant> clientsArray;
-    for (auto &clientId : clients.keys()) {
-        clientsArray.push_back(clients[clientId].toObject());
-    }
-    qobject_cast<ClientManagementModel*>(uiLogic()->clientManagementModel())->setContent(clientsArray);
-
-    set_busyIndicatorIsRunning(false);
-}
-
-void ClientManagementLogic::onClientItemClicked(int index)
-{
-    uiLogic()->pageLogic<ClientInfoLogic>()->setCurrentClientId(index);
-    emit uiLogic()->goToClientInfoPage(m_currentMainProtocol);
-}
-
-ErrorCode ClientManagementLogic::getClientsList(const ServerCredentials &credentials, DockerContainer container, Proto mainProtocol, QJsonObject &clietns)
-{
-    ErrorCode error = ErrorCode::NoError;
-    QString stdOut;
-    auto cbReadStdOut = [&](const QString &data, libssh::Client &) {
-        stdOut += data + "\n";
-        return ErrorCode::NoError;
-    };
-
-    const QString mainProtocolString = ProtocolProps::protoToString(mainProtocol);
-
-    ServerController serverController(m_settings);
-
-    const QString clientsTableFile = QString("/opt/amnezia/%1/clientsTable").arg(mainProtocolString);
-    const QByteArray clientsTableString = serverController.getTextFileFromContainer(container, credentials, clientsTableFile, &error);
-    if (error != ErrorCode::NoError) {
-        return error;
-    }
-    QJsonObject clientsTable = QJsonDocument::fromJson(clientsTableString).object();
-    int count = 0;
-
-    if (mainProtocol == Proto::OpenVpn) {
-        const QString getOpenVpnClientsList = "sudo docker exec -i $CONTAINER_NAME bash -c 'ls /opt/amnezia/openvpn/pki/issued'";
-        QString script = serverController.replaceVars(getOpenVpnClientsList, serverController.genVarsForScript(credentials, container));
-        error = serverController.runScript(credentials, script, cbReadStdOut);
-        if (error != ErrorCode::NoError) {
-            return error;
-        }
-
-        if (!stdOut.isEmpty()) {
-            QStringList certsIds = stdOut.split("\n", Qt::SkipEmptyParts);
-            certsIds.removeAll("AmneziaReq.crt");
-
-            for (auto &openvpnCertId : certsIds) {
-                openvpnCertId.replace(".crt", "");
-                if (!clientsTable.contains(openvpnCertId)) {
-
-                    QJsonObject client;
-                    client["openvpnCertId"] = openvpnCertId;
-                    client["clientName"] = QString("Client %1").arg(count);
-                    client["openvpnCertData"] = "";
-                    clientsTable[openvpnCertId] = client;
-                    count++;
-                }
-            }
-        }
-    } else if (mainProtocol == Proto::WireGuard) {
-        const QString wireGuardConfigFile = "opt/amnezia/wireguard/wg0.conf";
-        const QString wireguardConfigString = serverController.getTextFileFromContainer(container, credentials, wireGuardConfigFile, &error);
-        if (error != ErrorCode::NoError) {
-            return error;
-        }
-
-        auto configLines = wireguardConfigString.split("\n", Qt::SkipEmptyParts);
-        QStringList wireguardKeys;
-        for (const auto &line : configLines) {
-            auto configPair = line.split(" = ", Qt::SkipEmptyParts);
-            if (configPair.front() == "PublicKey") {
-                wireguardKeys.push_back(configPair.back());
-            }
-        }
-
-        for (auto &wireguardKey : wireguardKeys) {
-            if (!clientsTable.contains(wireguardKey)) {
-                QJsonObject client;
-                client["clientName"] = QString("Client %1").arg(count);
-                client["wireguardPublicKey"] = wireguardKey;
-                clientsTable[wireguardKey] = client;
-                count++;
-            }
-        }
-    }
-
-    const QByteArray newClientsTableString = QJsonDocument(clientsTable).toJson();
-    if (clientsTableString != newClientsTableString) {
-        error = serverController.uploadTextFileToContainer(container, credentials, newClientsTableString, clientsTableFile);
-    }
-
-    if (error != ErrorCode::NoError) {
-        return error;
-    }
-
-    clietns = clientsTable;
-
-    return error;
-}
diff --git a/client/ui/pages_logic/ClientManagementLogic.h b/client/ui/pages_logic/ClientManagementLogic.h
deleted file mode 100644
index 9c181716..00000000
--- a/client/ui/pages_logic/ClientManagementLogic.h
+++ /dev/null
@@ -1,33 +0,0 @@
-#ifndef CLIENTMANAGMENTLOGIC_H
-#define CLIENTMANAGMENTLOGIC_H
-
-#include "PageLogicBase.h"
-
-#include "core/defs.h"
-#include "containers/containers_defs.h"
-#include "protocols/protocols_defs.h"
-
-class UiLogic;
-
-class ClientManagementLogic : public PageLogicBase
-{
-    Q_OBJECT
-
-    AUTO_PROPERTY(QString, labelCurrentVpnProtocolText)
-    AUTO_PROPERTY(bool, busyIndicatorIsRunning);
-
-public:
-    ClientManagementLogic(UiLogic *uiLogic, QObject *parent = nullptr);
-    ~ClientManagementLogic() = default;
-
-public slots:
-    void onUpdatePage() override;
-    void onClientItemClicked(int index);
-
-private:
-    ErrorCode getClientsList(const ServerCredentials &credentials, DockerContainer container, Proto mainProtocol, QJsonObject &clietns);
-
-    amnezia::Proto m_currentMainProtocol;
-};
-
-#endif // CLIENTMANAGMENTLOGIC_H
diff --git a/client/ui/pages_logic/GeneralSettingsLogic.cpp b/client/ui/pages_logic/GeneralSettingsLogic.cpp
deleted file mode 100644
index 141308f4..00000000
--- a/client/ui/pages_logic/GeneralSettingsLogic.cpp
+++ /dev/null
@@ -1,40 +0,0 @@
-#include "GeneralSettingsLogic.h"
-#include "ShareConnectionLogic.h"
-
-#include "../models/protocols_model.h"
-#include "../uilogic.h"
-
-GeneralSettingsLogic::GeneralSettingsLogic(UiLogic *logic, QObject *parent) : PageLogicBase(logic, parent)
-{
-}
-
-void GeneralSettingsLogic::onUpdatePage()
-{
-    uiLogic()->m_selectedServerIndex = m_settings->defaultServerIndex();
-    set_existsAnyServer(m_settings->serversCount() > 0);
-    uiLogic()->m_selectedDockerContainer = m_settings->defaultContainer(m_settings->defaultServerIndex());
-
-    set_pushButtonGeneralSettingsShareConnectionEnable(m_settings->haveAuthData(m_settings->defaultServerIndex()));
-}
-
-void GeneralSettingsLogic::onPushButtonGeneralSettingsServerSettingsClicked()
-{
-    uiLogic()->m_selectedServerIndex = m_settings->defaultServerIndex();
-    uiLogic()->m_selectedDockerContainer = m_settings->defaultContainer(m_settings->defaultServerIndex());
-
-    emit uiLogic()->goToPage(Page::ServerSettings);
-}
-
-void GeneralSettingsLogic::onPushButtonGeneralSettingsShareConnectionClicked()
-{
-    uiLogic()->m_selectedServerIndex = m_settings->defaultServerIndex();
-    uiLogic()->m_selectedDockerContainer = m_settings->defaultContainer(uiLogic()->m_selectedServerIndex);
-
-    //    qobject_cast<ProtocolsModel
-    //    *>(uiLogic()->protocolsModel())->setSelectedServerIndex(uiLogic()->m_selectedServerIndex); qobject_cast<ProtocolsModel
-    //    *>(uiLogic()->protocolsModel())->setSelectedDockerContainer(uiLogic()->m_selectedDockerContainer);
-
-    uiLogic()->pageLogic<ShareConnectionLogic>()->updateSharingPage(uiLogic()->m_selectedServerIndex,
-                                                                    uiLogic()->m_selectedDockerContainer);
-    emit uiLogic()->goToPage(Page::ShareConnection);
-}
diff --git a/client/ui/pages_logic/GeneralSettingsLogic.h b/client/ui/pages_logic/GeneralSettingsLogic.h
deleted file mode 100644
index a0cff333..00000000
--- a/client/ui/pages_logic/GeneralSettingsLogic.h
+++ /dev/null
@@ -1,25 +0,0 @@
-#ifndef GENERAL_SETTINGS_LOGIC_H
-#define GENERAL_SETTINGS_LOGIC_H
-
-#include "PageLogicBase.h"
-
-class UiLogic;
-
-class GeneralSettingsLogic : public PageLogicBase
-{
-    Q_OBJECT
-
-    AUTO_PROPERTY(bool, pushButtonGeneralSettingsShareConnectionEnable)
-    AUTO_PROPERTY(bool, existsAnyServer)
-
-public:
-    Q_INVOKABLE void onUpdatePage() override;
-    Q_INVOKABLE void onPushButtonGeneralSettingsServerSettingsClicked();
-    Q_INVOKABLE void onPushButtonGeneralSettingsShareConnectionClicked();
-
-public:
-    explicit GeneralSettingsLogic(UiLogic *uiLogic, QObject *parent = nullptr);
-    ~GeneralSettingsLogic() = default;
-
-};
-#endif // GENERAL_SETTINGS_LOGIC_H
diff --git a/client/ui/pages_logic/NetworkSettingsLogic.cpp b/client/ui/pages_logic/NetworkSettingsLogic.cpp
deleted file mode 100644
index 1315aa10..00000000
--- a/client/ui/pages_logic/NetworkSettingsLogic.cpp
+++ /dev/null
@@ -1,52 +0,0 @@
-#include "NetworkSettingsLogic.h"
-
-#include "version.h"
-#include "utilities.h"
-#include "settings.h"
-
-NetworkSettingsLogic::NetworkSettingsLogic(UiLogic *logic, QObject *parent):
-    PageLogicBase(logic, parent),
-    m_checkBoxUseAmneziaDnsChecked{false},
-    m_ipAddressRegex{Utils::ipAddressRegExp()}
-{
-
-}
-
-void NetworkSettingsLogic::onUpdatePage()
-{
-    set_checkBoxUseAmneziaDnsChecked(m_settings->useAmneziaDns());
-
-    set_lineEditDns1Text(m_settings->primaryDns());
-    set_lineEditDns2Text(m_settings->secondaryDns());
-}
-
-void NetworkSettingsLogic::onLineEditDns1EditFinished(const QString &text)
-{
-    if (ipAddressRegex().match(text).hasMatch()) {
-        m_settings->setPrimaryDns(text);
-    }
-}
-
-void NetworkSettingsLogic::onLineEditDns2EditFinished(const QString &text)
-{
-    if (ipAddressRegex().match(text).hasMatch()) {
-        m_settings->setSecondaryDns(text);
-    }
-}
-
-void NetworkSettingsLogic::onPushButtonResetDns1Clicked()
-{
-    m_settings->setPrimaryDns(m_settings->cloudFlareNs1);
-    onUpdatePage();
-}
-
-void NetworkSettingsLogic::onPushButtonResetDns2Clicked()
-{
-    m_settings->setSecondaryDns(m_settings->cloudFlareNs2);
-    onUpdatePage();
-}
-
-void NetworkSettingsLogic::onCheckBoxUseAmneziaDnsToggled(bool checked)
-{
-    m_settings->setUseAmneziaDns(checked);
-}
diff --git a/client/ui/pages_logic/NetworkSettingsLogic.h b/client/ui/pages_logic/NetworkSettingsLogic.h
deleted file mode 100644
index 237706eb..00000000
--- a/client/ui/pages_logic/NetworkSettingsLogic.h
+++ /dev/null
@@ -1,35 +0,0 @@
-#ifndef NETWORK_SETTINGS_LOGIC_H
-#define NETWORK_SETTINGS_LOGIC_H
-
-#include "PageLogicBase.h"
-
-#include <QRegularExpression>
-
-class UiLogic;
-
-class NetworkSettingsLogic : public PageLogicBase
-{
-    Q_OBJECT
-
-    AUTO_PROPERTY(bool, checkBoxUseAmneziaDnsChecked)
-
-    AUTO_PROPERTY(QString, lineEditDns1Text)
-    AUTO_PROPERTY(QString, lineEditDns2Text)
-    READONLY_PROPERTY(QRegularExpression, ipAddressRegex)
-
-public:
-    Q_INVOKABLE void onUpdatePage() override;
-
-    Q_INVOKABLE void onLineEditDns1EditFinished(const QString& text);
-    Q_INVOKABLE void onLineEditDns2EditFinished(const QString& text);
-    Q_INVOKABLE void onPushButtonResetDns1Clicked();
-    Q_INVOKABLE void onPushButtonResetDns2Clicked();
-
-    Q_INVOKABLE void onCheckBoxUseAmneziaDnsToggled(bool checked);
-
-public:
-    explicit NetworkSettingsLogic(UiLogic *uiLogic, QObject *parent = nullptr);
-    ~NetworkSettingsLogic() = default;
-
-};
-#endif // NETWORK_SETTINGS_LOGIC_H
diff --git a/client/ui/pages_logic/NewServerProtocolsLogic.cpp b/client/ui/pages_logic/NewServerProtocolsLogic.cpp
deleted file mode 100644
index a1db7565..00000000
--- a/client/ui/pages_logic/NewServerProtocolsLogic.cpp
+++ /dev/null
@@ -1,34 +0,0 @@
-#include "NewServerProtocolsLogic.h"
-#include "../uilogic.h"
-
-NewServerProtocolsLogic::NewServerProtocolsLogic(UiLogic *logic, QObject *parent):
-    PageLogicBase(logic, parent),
-    m_progressBarConnectionMinimum{0},
-    m_progressBarConnectionMaximum{100}
-{
-}
-
-
-void NewServerProtocolsLogic::onUpdatePage()
-{
-    set_progressBarConnectionMinimum(0);
-    set_progressBarConnectionMaximum(300);
-}
-
-void NewServerProtocolsLogic::onPushButtonConfigureClicked(DockerContainer c, int port, TransportProto tp)
-{
-    Proto mainProto = ContainerProps::defaultProtocol(c);
-
-    QJsonObject config {
-        { config_key::container, ContainerProps::containerToString(c) },
-        { ProtocolProps::protoToString(mainProto), QJsonObject {
-                { config_key::port, QString::number(port) },
-                { config_key::transport_proto, ProtocolProps::transportProtoToString(tp, mainProto) }}
-        }
-    };
-
-    QPair<DockerContainer, QJsonObject> container(c, config);
-
-    uiLogic()->installServer(container);
-}
-
diff --git a/client/ui/pages_logic/NewServerProtocolsLogic.h b/client/ui/pages_logic/NewServerProtocolsLogic.h
deleted file mode 100644
index abf3d102..00000000
--- a/client/ui/pages_logic/NewServerProtocolsLogic.h
+++ /dev/null
@@ -1,25 +0,0 @@
-#ifndef NEW_SERVER_PROTOCOLS_LOGIC_H
-#define NEW_SERVER_PROTOCOLS_LOGIC_H
-
-#include "PageLogicBase.h"
-#include "containers/containers_defs.h"
-
-class UiLogic;
-
-class NewServerProtocolsLogic : public PageLogicBase
-{
-    Q_OBJECT
-
-    AUTO_PROPERTY(double, progressBarConnectionMinimum)
-    AUTO_PROPERTY(double, progressBarConnectionMaximum)
-
-public:
-    Q_INVOKABLE void onUpdatePage() override;
-    Q_INVOKABLE void onPushButtonConfigureClicked(DockerContainer c, int port, TransportProto tp);
-
-public:
-    explicit NewServerProtocolsLogic(UiLogic *uiLogic, QObject *parent = nullptr);
-    ~NewServerProtocolsLogic() = default;
-
-};
-#endif // NEW_SERVER_PROTOCOLS_LOGIC_H
diff --git a/client/ui/pages_logic/PageLogicBase.cpp b/client/ui/pages_logic/PageLogicBase.cpp
deleted file mode 100644
index 05c4e3a1..00000000
--- a/client/ui/pages_logic/PageLogicBase.cpp
+++ /dev/null
@@ -1,16 +0,0 @@
-#include "PageLogicBase.h"
-
-#include "ui/uilogic.h"
-#include "settings.h"
-#include "configurators/vpn_configurator.h"
-
-PageLogicBase::PageLogicBase(UiLogic *logic, QObject *parent):
-    QObject(parent),
-    m_pageEnabled{true},
-    m_uiLogic(logic)
-{
-    m_settings = logic->m_settings;
-    m_configurator = logic->m_configurator;
-}
-
-
diff --git a/client/ui/pages_logic/PageLogicBase.h b/client/ui/pages_logic/PageLogicBase.h
deleted file mode 100644
index 6616de9d..00000000
--- a/client/ui/pages_logic/PageLogicBase.h
+++ /dev/null
@@ -1,35 +0,0 @@
-#ifndef PAGE_LOGIC_BASE_H
-#define PAGE_LOGIC_BASE_H
-
-#include "../pages.h"
-#include "../property_helper.h"
-
-using namespace PageEnumNS;
-
-class UiLogic;
-class Settings;
-class VpnConfigurator;
-class ServerController;
-
-class PageLogicBase : public QObject
-{
-    Q_OBJECT
-    AUTO_PROPERTY(bool, pageEnabled)
-
-public:
-    explicit PageLogicBase(UiLogic *uiLogic, QObject *parent = nullptr);
-    ~PageLogicBase() = default;
-
-    Q_INVOKABLE virtual void onUpdatePage() {}
-
-protected:
-    UiLogic *m_uiLogic;
-    UiLogic *uiLogic() const { return m_uiLogic; }
-
-    std::shared_ptr<Settings> m_settings;
-    std::shared_ptr<VpnConfigurator> m_configurator;
-
-signals:
-    void updatePage();
-};
-#endif // PAGE_LOGIC_BASE_H
diff --git a/client/ui/pages_logic/QrDecoderLogic.cpp b/client/ui/pages_logic/QrDecoderLogic.cpp
deleted file mode 100644
index e1845c77..00000000
--- a/client/ui/pages_logic/QrDecoderLogic.cpp
+++ /dev/null
@@ -1,125 +0,0 @@
-#include "QrDecoderLogic.h"
-
-#include "ui/uilogic.h"
-#include "ui/pages_logic/StartPageLogic.h"
-
-#ifdef Q_OS_ANDROID
-#include <QJniEnvironment>
-#include <QJniObject>
-#include "../../platforms/android/androidutils.h"
-#endif
-
-using namespace amnezia;
-using namespace PageEnumNS;
-
-namespace {
-    QrDecoderLogic* mInstance = nullptr;
-    constexpr auto CLASSNAME = "org.amnezia.vpn.qt.CameraActivity";
-}
-
-QrDecoderLogic::QrDecoderLogic(UiLogic *logic, QObject *parent):
-    PageLogicBase(logic, parent)
-{
-    mInstance = this;
-
-    #if (defined(Q_OS_ANDROID))
-        AndroidUtils::runOnAndroidThreadAsync([]() {
-            JNINativeMethod methods[]{
-                {"passDataToDecoder", "(Ljava/lang/String;)V", reinterpret_cast<void*>(onNewDataChunk)},
-            };
-
-            QJniObject javaClass(CLASSNAME);
-            QJniEnvironment env;
-            jclass objectClass = env->GetObjectClass(javaClass.object<jobject>());
-            env->RegisterNatives(objectClass, methods, sizeof(methods) / sizeof(methods[0]));
-            env->DeleteLocalRef(objectClass);
-        });
-    #endif
-}
-
-void QrDecoderLogic::stopDecodingQr()
-{
-    #if (defined(Q_OS_ANDROID))
-        QJniObject::callStaticMethod<void>(CLASSNAME, "stopQrCodeReader", "()V");
-    #endif
-
-    emit stopDecode();
-}
-
-#ifdef Q_OS_ANDROID
-void QrDecoderLogic::onNewDataChunk(JNIEnv *env, jobject thiz, jstring data)
-{
-    Q_UNUSED(thiz);
-    const char* buffer = env->GetStringUTFChars(data, nullptr);
-    if (!buffer) {
-        return;
-    }
-
-    QString parcelBody(buffer);
-    env->ReleaseStringUTFChars(data, buffer);
-
-    if (mInstance != nullptr) {
-        if (!mInstance->m_detectingEnabled) {
-            mInstance->onUpdatePage();
-        }
-        mInstance->onDetectedQrCode(parcelBody);
-    }
-}
-#endif
-
-void QrDecoderLogic::onUpdatePage()
-{
-    m_chunks.clear();
-    set_detectingEnabled(true);
-    set_totalChunksCount(0);
-    set_receivedChunksCount(0);
-    emit startDecode();
-}
-
-void QrDecoderLogic::onDetectedQrCode(const QString &code)
-{
-    //qDebug() << code;
-    if (!detectingEnabled()) return;
-
-    // check if chunk received
-    QByteArray ba = QByteArray::fromBase64(code.toUtf8(), QByteArray::Base64UrlEncoding | QByteArray::OmitTrailingEquals);
-    QDataStream s(&ba, QIODevice::ReadOnly);
-    qint16 magic; s >> magic;
-
-    if (magic == amnezia::qrMagicCode) {
-        quint8 chunksCount; s >> chunksCount;
-        if (totalChunksCount() != chunksCount) {
-            m_chunks.clear();
-        }
-
-        set_totalChunksCount(chunksCount);
-
-        quint8 chunkId; s >> chunkId;
-        s >> m_chunks[chunkId];
-        set_receivedChunksCount(m_chunks.size());
-
-        if (m_chunks.size() == totalChunksCount()) {
-            QByteArray data;
-
-            for (int i = 0; i < totalChunksCount(); ++i) {
-                data.append(m_chunks.value(i));
-            }
-
-            bool ok = uiLogic()->pageLogic<StartPageLogic>()->importConnectionFromQr(data);
-            if (ok) {
-                set_detectingEnabled(false);
-                stopDecodingQr();
-            } else {
-                m_chunks.clear();
-                set_totalChunksCount(0);
-                set_receivedChunksCount(0);
-            }
-        }
-    } else {
-        bool ok = uiLogic()->pageLogic<StartPageLogic>()->importConnectionFromQr(ba);
-        if (ok) {
-            set_detectingEnabled(false);
-            stopDecodingQr();
-        }
-    }
-}
diff --git a/client/ui/pages_logic/QrDecoderLogic.h b/client/ui/pages_logic/QrDecoderLogic.h
deleted file mode 100644
index 2b24bf27..00000000
--- a/client/ui/pages_logic/QrDecoderLogic.h
+++ /dev/null
@@ -1,41 +0,0 @@
-#ifndef QR_DECODER_LOGIC_H
-#define QR_DECODER_LOGIC_H
-
-#include "PageLogicBase.h"
-
-#ifdef Q_OS_ANDROID
-#include "jni.h"
-#endif
-
-class UiLogic;
-
-class QrDecoderLogic : public PageLogicBase
-{
-    Q_OBJECT
-    AUTO_PROPERTY(bool, detectingEnabled)
-    AUTO_PROPERTY(int, totalChunksCount)
-    AUTO_PROPERTY(int, receivedChunksCount)
-
-public:
-    Q_INVOKABLE void onUpdatePage() override;
-    Q_INVOKABLE void onDetectedQrCode(const QString &code);
-
-#ifdef Q_OS_ANDROID
-    static void onNewDataChunk(JNIEnv *env, jobject thiz, jstring data);
-#endif
-
-public:
-    explicit QrDecoderLogic(UiLogic *uiLogic, QObject *parent = nullptr);
-    ~QrDecoderLogic() = default;
-
-private:
-    void stopDecodingQr();
-
-signals:
-    void startDecode();
-    void stopDecode();
-
-private:
-    QMap<int, QByteArray> m_chunks;
-};
-#endif // QR_DECODER_LOGIC_H
diff --git a/client/ui/pages_logic/ServerConfiguringProgressLogic.cpp b/client/ui/pages_logic/ServerConfiguringProgressLogic.cpp
deleted file mode 100644
index 2b42fac9..00000000
--- a/client/ui/pages_logic/ServerConfiguringProgressLogic.cpp
+++ /dev/null
@@ -1,187 +0,0 @@
-#include "ServerConfiguringProgressLogic.h"
-#include "version.h"
-#include "core/errorstrings.h"
-#include <QTimer>
-#include <QEventLoop>
-
-#include "core/servercontroller.h"
-
-ServerConfiguringProgressLogic::ServerConfiguringProgressLogic(UiLogic *logic, QObject *parent):
-    PageLogicBase(logic, parent),
-    m_progressBarValue{0},
-    m_labelWaitInfoVisible{true},
-    m_labelWaitInfoText{tr("Please wait, configuring process may take up to 5 minutes")},
-    m_progressBarVisible{true},
-    m_progressBarMaximum{100},
-    m_progressBarTextVisible{true},
-    m_progressBarText{tr("Configuring...")},
-    m_labelServerBusyVisible{false},
-    m_labelServerBusyText{""}
-{
-
-}
-
-void ServerConfiguringProgressLogic::onUpdatePage()
-{
-    set_progressBarValue(0);
-}
-
-
-ErrorCode ServerConfiguringProgressLogic::doInstallAction(const std::function<ErrorCode()> &action)
-{
-    PageFunc page;
-    page.setEnabledFunc = [this] (bool enabled) -> void {
-        set_pageEnabled(enabled);
-    };
-    ButtonFunc noButton;
-    LabelFunc noWaitInfo;
-    ProgressFunc progress;
-    progress.setVisibleFunc = [this] (bool visible) -> void {
-        set_progressBarVisible(visible);
-    };
-
-    progress.setValueFunc = [this] (int value) -> void {
-        set_progressBarValue(value);
-    };
-    progress.getValueFunc = [this] (void) -> int {
-        return progressBarValue();
-    };
-    progress.getMaximumFunc = [this] (void) -> int {
-        return progressBarMaximum();
-    };
-
-    LabelFunc busyInfo;
-    busyInfo.setTextFunc = [this] (const QString& text) -> void {
-        set_labelServerBusyText(text);
-    };
-    busyInfo.setVisibleFunc = [this] (bool visible) -> void {
-        set_labelServerBusyVisible(visible);
-    };
-
-    ButtonFunc cancelButton;
-    cancelButton.setVisibleFunc = [this] (bool visible) -> void {
-        set_pushButtonCancelVisible(visible);
-    };
-
-    return doInstallAction(action, page, progress, noButton, noWaitInfo, busyInfo, cancelButton);
-}
-
-ErrorCode ServerConfiguringProgressLogic::doInstallAction(const std::function<ErrorCode()> &action,
-                                                          const PageFunc &page,
-                                                          const ProgressFunc &progress,
-                                                          const ButtonFunc &saveButton,
-                                                          const LabelFunc &waitInfo,
-                                                          const LabelFunc &serverBusyInfo,
-                                                          const ButtonFunc &cancelButton)
-{
-    progress.setVisibleFunc(true);
-    if (page.setEnabledFunc) {
-        page.setEnabledFunc(false);
-    }
-    if (saveButton.setVisibleFunc) {
-        saveButton.setVisibleFunc(false);
-    }
-    if (waitInfo.setVisibleFunc) {
-        waitInfo.setVisibleFunc(true);
-    }
-    if (waitInfo.setTextFunc) {
-        waitInfo.setTextFunc(tr("Please wait, configuring process may take up to 5 minutes"));
-    }
-
-    QTimer timer;
-    connect(&timer, &QTimer::timeout, [progress](){
-        progress.setValueFunc(progress.getValueFunc() + 1);
-    });
-
-    progress.setValueFunc(0);
-    timer.start(1000);
-
-    ServerController serverController(m_settings);
-
-    QMetaObject::Connection cancelDoInstallActionConnection;
-    if (cancelButton.setVisibleFunc) {
-        cancelDoInstallActionConnection = connect(this, &ServerConfiguringProgressLogic::cancelDoInstallAction,
-                &serverController, &ServerController::setCancelInstallation);
-    }
-
-
-    QMetaObject::Connection serverBusyConnection;
-    if (serverBusyInfo.setVisibleFunc && serverBusyInfo.setTextFunc) {
-        auto onServerIsBusy = [&serverBusyInfo, &timer, &cancelButton](const bool isBusy) {
-            isBusy ? timer.stop() : timer.start(1000);
-            serverBusyInfo.setVisibleFunc(isBusy);
-            serverBusyInfo.setTextFunc(isBusy ? "Amnesia has detected that your server is currently "
-                                                "busy installing other software. Amnesia installation "
-                                                "will pause until the server finishes installing other software"
-                                              : "");
-            if (cancelButton.setVisibleFunc) {
-                cancelButton.setVisibleFunc(isBusy ? true : false);
-            }
-        };
-
-        serverBusyConnection = connect(&serverController, &ServerController::serverIsBusy, this, onServerIsBusy);
-    }
-
-    ErrorCode e = action();
-    qDebug() << "doInstallAction finished with code" << e;
-    if (cancelButton.setVisibleFunc) {
-        disconnect(cancelDoInstallActionConnection);
-    }
-
-    if (serverBusyInfo.setVisibleFunc && serverBusyInfo.setTextFunc) {
-        disconnect(serverBusyConnection);
-    }
-
-    if (e) {
-        if (page.setEnabledFunc) {
-            page.setEnabledFunc(true);
-        }
-        if (saveButton.setVisibleFunc) {
-            saveButton.setVisibleFunc(true);
-        }
-        if (waitInfo.setVisibleFunc) {
-            waitInfo.setVisibleFunc(false);
-        }
-
-        progress.setVisibleFunc(false);
-        return e;
-    }
-
-    // just ui progressbar tweak
-    timer.stop();
-
-    int remainingVal = progress.getMaximumFunc() - progress.getValueFunc();
-
-    if (remainingVal > 0) {
-        QTimer timer1;
-        QEventLoop loop1;
-
-        connect(&timer1, &QTimer::timeout, [&](){
-            progress.setValueFunc(progress.getValueFunc() + 1);
-            if (progress.getValueFunc() >= progress.getMaximumFunc()) {
-                loop1.quit();
-            }
-        });
-
-        timer1.start(5);
-        loop1.exec();
-    }
-
-
-    progress.setVisibleFunc(false);
-    if (saveButton.setVisibleFunc) {
-        saveButton.setVisibleFunc(true);
-    }
-    if (page.setEnabledFunc) {
-        page.setEnabledFunc(true);
-    }
-    if (waitInfo.setTextFunc) {
-        waitInfo.setTextFunc(tr("Operation finished"));
-    }
-    return ErrorCode::NoError;
-}
-
-void ServerConfiguringProgressLogic::onPushButtonCancelClicked()
-{
-    emit cancelDoInstallAction(true);
-}
diff --git a/client/ui/pages_logic/ServerConfiguringProgressLogic.h b/client/ui/pages_logic/ServerConfiguringProgressLogic.h
deleted file mode 100644
index 9f10bc87..00000000
--- a/client/ui/pages_logic/ServerConfiguringProgressLogic.h
+++ /dev/null
@@ -1,73 +0,0 @@
-#ifndef SERVER_CONFIGURING_PROGRESS_LOGIC_H
-#define SERVER_CONFIGURING_PROGRESS_LOGIC_H
-
-#include <functional>
-#include "PageLogicBase.h"
-#include "core/defs.h"
-
-using namespace amnezia;
-
-class UiLogic;
-
-class ServerConfiguringProgressLogic : public PageLogicBase
-{
-    Q_OBJECT
-
-    AUTO_PROPERTY(double, progressBarValue)
-    AUTO_PROPERTY(bool, labelWaitInfoVisible)
-    AUTO_PROPERTY(QString, labelWaitInfoText)
-    AUTO_PROPERTY(bool, progressBarVisible)
-    AUTO_PROPERTY(int, progressBarMaximum)
-    AUTO_PROPERTY(bool, progressBarTextVisible)
-    AUTO_PROPERTY(QString, progressBarText)
-    AUTO_PROPERTY(bool, labelServerBusyVisible)
-    AUTO_PROPERTY(QString, labelServerBusyText)
-    AUTO_PROPERTY(bool, pushButtonCancelVisible)
-
-public:
-    Q_INVOKABLE void onPushButtonCancelClicked();
-
-private:
-    struct ProgressFunc {
-        std::function<void(bool)> setVisibleFunc;
-        std::function<void(int)> setValueFunc;
-        std::function<int(void)> getValueFunc;
-        std::function<int(void)> getMaximumFunc;
-        std::function<void(bool)> setTextVisibleFunc;
-        std::function<void(const QString&)> setTextFunc;
-    };
-    struct PageFunc {
-        std::function<void(bool)> setEnabledFunc;
-    };
-    struct ButtonFunc {
-        std::function<void(bool)> setVisibleFunc;
-    };
-    struct LabelFunc {
-        std::function<void(bool)> setVisibleFunc;
-        std::function<void(const QString&)> setTextFunc;
-    };
-
-public:
-    explicit ServerConfiguringProgressLogic(UiLogic *uiLogic, QObject *parent = nullptr);
-    ~ServerConfiguringProgressLogic() = default;
-
-    friend class OpenVpnLogic;
-    friend class ShadowSocksLogic;
-    friend class CloakLogic;
-    friend class UiLogic;
-
-    void onUpdatePage() override;
-    ErrorCode doInstallAction(const std::function<ErrorCode()> &action);
-    ErrorCode doInstallAction(const std::function<ErrorCode()> &action,
-                              const PageFunc &page,
-                              const ProgressFunc &progress,
-                              const ButtonFunc &saveButton,
-                              const LabelFunc &waitInfo,
-                              const LabelFunc &serverBusyInfo,
-                              const ButtonFunc &cancelButton);
-
-signals:
-    void cancelDoInstallAction(const bool cancel);
-
-};
-#endif // SERVER_CONFIGURING_PROGRESS_LOGIC_H
diff --git a/client/ui/pages_logic/ServerContainersLogic.cpp b/client/ui/pages_logic/ServerContainersLogic.cpp
deleted file mode 100644
index 89eeb6c8..00000000
--- a/client/ui/pages_logic/ServerContainersLogic.cpp
+++ /dev/null
@@ -1,128 +0,0 @@
-#include "ServerContainersLogic.h"
-#include "ServerConfiguringProgressLogic.h"
-#include "ShareConnectionLogic.h"
-
-#include <QApplication>
-
-#include "protocols/PageProtocolLogicBase.h"
-
-#include "core/servercontroller.h"
-#include <functional>
-
-#include "../pages_logic/VpnLogic.h"
-#include "../uilogic.h"
-#include "core/errorstrings.h"
-#include "vpnconnection.h"
-
-ServerContainersLogic::ServerContainersLogic(UiLogic *logic, QObject *parent) : PageLogicBase(logic, parent)
-{
-}
-
-void ServerContainersLogic::onUpdatePage()
-{
-    //    ContainersModel *c_model = qobject_cast<ContainersModel *>(uiLogic()->containersModel());
-    //    c_model->setSelectedServerIndex(uiLogic()->m_selectedServerIndex);
-
-    ProtocolsModel *p_model = qobject_cast<ProtocolsModel *>(uiLogic()->protocolsModel());
-    //    p_model->setSelectedServerIndex(uiLogic()->m_selectedServerIndex);
-
-    set_isManagedServer(m_settings->haveAuthData(uiLogic()->m_selectedServerIndex));
-    uiLogic()->m_installCredentials = m_settings->serverCredentials(uiLogic()->m_selectedServerIndex);
-    emit updatePage();
-}
-
-void ServerContainersLogic::onPushButtonProtoSettingsClicked(DockerContainer c, Proto p)
-{
-    qDebug() << "ServerContainersLogic::onPushButtonProtoSettingsClicked" << c << p;
-    uiLogic()->m_selectedDockerContainer = c;
-    uiLogic()->protocolLogic(p)->updateProtocolPage(
-            m_settings->protocolConfig(uiLogic()->m_selectedServerIndex, uiLogic()->m_selectedDockerContainer, p),
-            uiLogic()->m_selectedDockerContainer, m_settings->haveAuthData(uiLogic()->m_selectedServerIndex));
-
-    emit uiLogic()->goToProtocolPage(p);
-}
-
-void ServerContainersLogic::onPushButtonDefaultClicked(DockerContainer c)
-{
-    if (m_settings->defaultContainer(uiLogic()->m_selectedServerIndex) == c)
-        return;
-
-    m_settings->setDefaultContainer(uiLogic()->m_selectedServerIndex, c);
-    uiLogic()->onUpdateAllPages();
-
-    if (uiLogic()->m_selectedServerIndex != m_settings->defaultServerIndex())
-        return;
-    if (!uiLogic()->m_vpnConnection)
-        return;
-    if (!uiLogic()->m_vpnConnection->isConnected())
-        return;
-
-    uiLogic()->pageLogic<VpnLogic>()->onDisconnect();
-    uiLogic()->pageLogic<VpnLogic>()->onConnect();
-}
-
-void ServerContainersLogic::onPushButtonShareClicked(DockerContainer c)
-{
-    uiLogic()->pageLogic<ShareConnectionLogic>()->updateSharingPage(uiLogic()->m_selectedServerIndex, c);
-    emit uiLogic()->goToPage(Page::ShareConnection);
-}
-
-void ServerContainersLogic::onPushButtonRemoveClicked(DockerContainer container)
-{
-    // buttonSetEnabledFunc(false);
-    ServerController serverController(m_settings);
-    ErrorCode e =
-            serverController.removeContainer(m_settings->serverCredentials(uiLogic()->m_selectedServerIndex), container);
-    m_settings->removeContainerConfig(uiLogic()->m_selectedServerIndex, container);
-    // buttonSetEnabledFunc(true);
-
-    if (m_settings->defaultContainer(uiLogic()->m_selectedServerIndex) == container) {
-        const auto &c = m_settings->containers(uiLogic()->m_selectedServerIndex);
-        if (c.isEmpty())
-            m_settings->setDefaultContainer(uiLogic()->m_selectedServerIndex, DockerContainer::None);
-        else
-            m_settings->setDefaultContainer(uiLogic()->m_selectedServerIndex, c.keys().first());
-    }
-    uiLogic()->onUpdateAllPages();
-}
-
-void ServerContainersLogic::onPushButtonContinueClicked(DockerContainer c, int port, TransportProto tp)
-{
-    ServerController serverController(m_settings);
-    QJsonObject config; // = serverController.createContainerInitialConfig(c, port, tp);
-
-    emit uiLogic()->goToPage(Page::ServerConfiguringProgress);
-    qApp->processEvents();
-
-    bool isServerCreated = false;
-    ErrorCode errorCode = uiLogic()->addAlreadyInstalledContainersGui(isServerCreated);
-
-    if (errorCode == ErrorCode::NoError) {
-        if (!uiLogic()->isContainerAlreadyAddedToGui(c)) {
-            auto installAction = [this, c, &config]() {
-                ServerController serverController(m_settings);
-                return serverController.setupContainer(m_settings->serverCredentials(uiLogic()->m_selectedServerIndex),
-                                                       c, config);
-            };
-            errorCode = uiLogic()->pageLogic<ServerConfiguringProgressLogic>()->doInstallAction(installAction);
-
-            if (errorCode == ErrorCode::NoError) {
-                m_settings->setContainerConfig(uiLogic()->m_selectedServerIndex, c, config);
-                if (ContainerProps::containerService(c) == ServiceType::Vpn) {
-                    m_settings->setDefaultContainer(uiLogic()->m_selectedServerIndex, c);
-                }
-            }
-        } else {
-            emit uiLogic()->showWarningMessage(
-                    "Attention! The container you are trying to install is already installed on the server. "
-                    "All installed containers have been added to the application ");
-        }
-
-        uiLogic()->onUpdateAllPages();
-    }
-    if (errorCode != ErrorCode::NoError) {
-        emit uiLogic()->showWarningMessage(tr("Error occurred while configuring server.") + "\n" + tr("Error message: ")
-                                           + errorString(errorCode) + "\n" + tr("See logs for details."));
-    }
-    emit uiLogic()->closePage();
-}
diff --git a/client/ui/pages_logic/ServerContainersLogic.h b/client/ui/pages_logic/ServerContainersLogic.h
deleted file mode 100644
index d0081516..00000000
--- a/client/ui/pages_logic/ServerContainersLogic.h
+++ /dev/null
@@ -1,29 +0,0 @@
-#ifndef SERVER_CONTAINERS_LOGIC_H
-#define SERVER_CONTAINERS_LOGIC_H
-
-#include "PageLogicBase.h"
-#include "containers/containers_defs.h"
-
-class UiLogic;
-
-class ServerContainersLogic : public PageLogicBase
-{
-    Q_OBJECT
-
-public:
-    Q_INVOKABLE void onUpdatePage() override;
-
-    Q_INVOKABLE void onPushButtonProtoSettingsClicked(DockerContainer c, Proto p);
-    Q_INVOKABLE void onPushButtonDefaultClicked(DockerContainer c);
-    Q_INVOKABLE void onPushButtonShareClicked(DockerContainer c);
-    Q_INVOKABLE void onPushButtonRemoveClicked(DockerContainer c);
-    Q_INVOKABLE void onPushButtonContinueClicked(DockerContainer c, int port, TransportProto tp);
-
-    AUTO_PROPERTY(bool, isManagedServer)
-
-public:
-    explicit ServerContainersLogic(UiLogic *uiLogic, QObject *parent = nullptr);
-    ~ServerContainersLogic() = default;
-
-};
-#endif // SERVER_CONTAINERS_LOGIC_H
diff --git a/client/ui/pages_logic/ServerListLogic.cpp b/client/ui/pages_logic/ServerListLogic.cpp
deleted file mode 100644
index 16775bc0..00000000
--- a/client/ui/pages_logic/ServerListLogic.cpp
+++ /dev/null
@@ -1,47 +0,0 @@
-#include "ServerListLogic.h"
-
-#include "../models/servers_model.h"
-#include "../uilogic.h"
-#include "vpnconnection.h"
-
-ServerListLogic::ServerListLogic(UiLogic *logic, QObject *parent)
-    : PageLogicBase(logic, parent), m_serverListModel { new ServersModel(m_settings, this) }
-{
-}
-
-void ServerListLogic::onServerListPushbuttonDefaultClicked(int index)
-{
-    m_settings->setDefaultServer(index);
-    uiLogic()->onUpdateAllPages();
-    emit currServerIdxChanged();
-}
-
-void ServerListLogic::onServerListPushbuttonSettingsClicked(int index)
-{
-    uiLogic()->m_selectedServerIndex = index;
-    uiLogic()->goToPage(Page::ServerSettings);
-}
-
-int ServerListLogic::currServerIdx() const
-{
-    return m_settings->defaultServerIndex();
-}
-
-void ServerListLogic::onUpdatePage()
-{
-    //    const QJsonArray &servers = m_settings->serversArray();
-    //    int defaultServer = m_settings->defaultServerIndex();
-    //    QVector<ServerModelContent> serverListContent;
-    //    for(int i = 0; i < servers.size(); i++) {
-    //        ServerModelContent c;
-    //        auto server = servers.at(i).toObject();
-    //        c.desc = server.value(config_key::description).toString();
-    //        c.address = server.value(config_key::hostName).toString();
-    //        if (c.desc.isEmpty()) {
-    //            c.desc = c.address;
-    //        }
-    //        c.isDefault = (i == defaultServer);
-    //        serverListContent.push_back(c);
-    //    }
-    //    qobject_cast<ServersModel*>(m_serverListModel)->setContent(serverListContent);
-}
diff --git a/client/ui/pages_logic/ServerListLogic.h b/client/ui/pages_logic/ServerListLogic.h
deleted file mode 100644
index b4f47547..00000000
--- a/client/ui/pages_logic/ServerListLogic.h
+++ /dev/null
@@ -1,30 +0,0 @@
-#ifndef SERVER_LIST_LOGIC_H
-#define SERVER_LIST_LOGIC_H
-
-#include "PageLogicBase.h"
-
-class UiLogic;
-
-class ServerListLogic : public PageLogicBase
-{
-    Q_OBJECT
-
-    READONLY_PROPERTY(QObject *, serverListModel)
-    Q_PROPERTY(int currServerIdx READ currServerIdx NOTIFY currServerIdxChanged)
-
-public:
-    int currServerIdx() const;
-
-    Q_INVOKABLE void onUpdatePage() override;
-    Q_INVOKABLE void onServerListPushbuttonDefaultClicked(int index);
-    Q_INVOKABLE void onServerListPushbuttonSettingsClicked(int index);
-
-public:
-    explicit ServerListLogic(UiLogic *uiLogic, QObject *parent = nullptr);
-    ~ServerListLogic() = default;
-
-signals:
-    void currServerIdxChanged();
-
-};
-#endif // SERVER_LIST_LOGIC_H
diff --git a/client/ui/pages_logic/ServerSettingsLogic.cpp b/client/ui/pages_logic/ServerSettingsLogic.cpp
deleted file mode 100644
index 4c68b549..00000000
--- a/client/ui/pages_logic/ServerSettingsLogic.cpp
+++ /dev/null
@@ -1,144 +0,0 @@
-#include "ServerSettingsLogic.h"
-#include "vpnconnection.h"
-
-#include "../uilogic.h"
-#include "ShareConnectionLogic.h"
-#include "VpnLogic.h"
-
-#include "core/errorstrings.h"
-#include <QTimer>
-#include <core/servercontroller.h>
-
-#if defined(Q_OS_ANDROID)
-    #include "../../platforms/android/androidutils.h"
-#endif
-
-ServerSettingsLogic::ServerSettingsLogic(UiLogic *logic, QObject *parent)
-    : PageLogicBase(logic, parent),
-      m_labelWaitInfoVisible { true },
-      m_pushButtonClearClientCacheVisible { true },
-      m_pushButtonShareFullVisible { true },
-      m_pushButtonClearClientCacheText { tr("Clear client cached profile") }
-{
-}
-
-void ServerSettingsLogic::onUpdatePage()
-{
-    set_labelWaitInfoVisible(false);
-    set_labelWaitInfoText("");
-    set_pushButtonClearClientCacheVisible(m_settings->haveAuthData(uiLogic()->m_selectedServerIndex));
-    set_pushButtonShareFullVisible(m_settings->haveAuthData(uiLogic()->m_selectedServerIndex));
-    const QJsonObject &server = m_settings->server(uiLogic()->m_selectedServerIndex);
-    const QString &port = server.value(config_key::port).toString();
-
-    const QString &userName = server.value(config_key::userName).toString();
-    const QString &hostName = server.value(config_key::hostName).toString();
-    QString name = QString("%1%2%3%4%5")
-                           .arg(userName)
-                           .arg(userName.isEmpty() ? "" : "@")
-                           .arg(hostName)
-                           .arg(port.isEmpty() ? "" : ":")
-                           .arg(port);
-
-    set_labelServerText(name);
-    set_lineEditDescriptionText(server.value(config_key::description).toString());
-
-    DockerContainer selectedContainer = m_settings->defaultContainer(uiLogic()->m_selectedServerIndex);
-    QString selectedContainerName = ContainerProps::containerHumanNames().value(selectedContainer);
-    set_labelCurrentVpnProtocolText(tr("Service: ") + selectedContainerName);
-}
-
-void ServerSettingsLogic::onPushButtonForgetServer()
-{
-    if (m_settings->defaultServerIndex() == uiLogic()->m_selectedServerIndex
-        && uiLogic()->m_vpnConnection->isConnected()) {
-        uiLogic()->pageLogic<VpnLogic>()->onDisconnect();
-    }
-    m_settings->removeServer(uiLogic()->m_selectedServerIndex);
-
-    if (m_settings->defaultServerIndex() == uiLogic()->m_selectedServerIndex) {
-        m_settings->setDefaultServer(0);
-    } else if (m_settings->defaultServerIndex() > uiLogic()->m_selectedServerIndex) {
-        m_settings->setDefaultServer(m_settings->defaultServerIndex() - 1);
-    }
-
-    if (m_settings->serversCount() == 0) {
-        m_settings->setDefaultServer(-1);
-    }
-
-    uiLogic()->m_selectedServerIndex = -1;
-    uiLogic()->onUpdateAllPages();
-
-    if (m_settings->serversCount() == 0) {
-        uiLogic()->setStartPage(Page::Start);
-    } else {
-        uiLogic()->closePage();
-    }
-}
-
-void ServerSettingsLogic::onPushButtonClearClientCacheClicked()
-{
-    set_pushButtonClearClientCacheText(tr("Cache cleared"));
-
-    const auto &containers = m_settings->containers(uiLogic()->m_selectedServerIndex);
-    for (DockerContainer container : containers.keys()) {
-        m_settings->clearLastConnectionConfig(uiLogic()->m_selectedServerIndex, container);
-    }
-
-    QTimer::singleShot(3000, this, [this]() { set_pushButtonClearClientCacheText(tr("Clear client cached profile")); });
-}
-
-void ServerSettingsLogic::onLineEditDescriptionEditingFinished()
-{
-    const QString &newText = lineEditDescriptionText();
-    QJsonObject server = m_settings->server(uiLogic()->m_selectedServerIndex);
-    server.insert(config_key::description, newText);
-    m_settings->editServer(uiLogic()->m_selectedServerIndex, server);
-    uiLogic()->onUpdateAllPages();
-}
-
-bool ServerSettingsLogic::isCurrentServerHasCredentials()
-{
-    return m_settings->haveAuthData(uiLogic()->m_selectedServerIndex);
-}
-
-#if defined(Q_OS_ANDROID)
-/* Auth result handler for Android */
-void authResultReceiver::handleActivityResult(int receiverRequestCode, int resultCode, const QJniObject &data)
-{
-    qDebug() << "receiverRequestCode" << receiverRequestCode << "resultCode" << resultCode;
-
-    if (resultCode == -1) { // ResultOK
-        uiLogic()->pageLogic<ShareConnectionLogic>()->updateSharingPage(m_serverIndex, DockerContainer::None);
-        emit uiLogic()->goToShareProtocolPage(Proto::Any);
-    }
-}
-#endif
-
-void ServerSettingsLogic::onPushButtonShareFullClicked()
-{
-#if defined(Q_OS_ANDROID)
-    /* We use builtin keyguard for ssh key export protection on Android */
-    QJniObject activity = AndroidUtils::getActivity();
-    auto appContext = activity.callObjectMethod("getApplicationContext", "()Landroid/content/Context;");
-    if (appContext.isValid()) {
-        QAndroidActivityResultReceiver *receiver = new authResultReceiver(uiLogic(), uiLogic()->m_selectedServerIndex);
-        auto intent = QJniObject::callStaticObjectMethod("org/amnezia/vpn/AuthHelper", "getAuthIntent",
-                                                         "(Landroid/content/Context;)Landroid/content/Intent;",
-                                                         appContext.object());
-        if (intent.isValid()) {
-            if (intent.object<jobject>() != nullptr) {
-                QtAndroidPrivate::startActivity(intent.object<jobject>(), 1, receiver);
-            }
-        } else {
-            uiLogic()->pageLogic<ShareConnectionLogic>()->updateSharingPage(uiLogic()->m_selectedServerIndex,
-                                                                            DockerContainer::None);
-            emit uiLogic()->goToShareProtocolPage(Proto::Any);
-        }
-    }
-#else
-    uiLogic()->pageLogic<ShareConnectionLogic>()->updateSharingPage(uiLogic()->m_selectedServerIndex,
-                                                                    DockerContainer::None);
-    emit uiLogic()->goToShareProtocolPage(Proto::Any);
-#endif
-}
diff --git a/client/ui/pages_logic/ServerSettingsLogic.h b/client/ui/pages_logic/ServerSettingsLogic.h
deleted file mode 100644
index 3ce26164..00000000
--- a/client/ui/pages_logic/ServerSettingsLogic.h
+++ /dev/null
@@ -1,62 +0,0 @@
-#ifndef SERVER_SETTINGS_LOGIC_H
-#define SERVER_SETTINGS_LOGIC_H
-
-#include "PageLogicBase.h"
-
-#if defined(Q_OS_ANDROID)
-#include <QJniObject>
-#include <private/qandroidextras_p.h>
-#endif
-
-class UiLogic;
-
-class ServerSettingsLogic : public PageLogicBase
-{
-    Q_OBJECT
-
-    AUTO_PROPERTY(bool, labelWaitInfoVisible)
-    AUTO_PROPERTY(QString, labelWaitInfoText)
-    AUTO_PROPERTY(QString, pushButtonClearClientCacheText)
-    AUTO_PROPERTY(bool, pushButtonClearClientCacheVisible)
-    AUTO_PROPERTY(bool, pushButtonShareFullVisible)
-    AUTO_PROPERTY(QString, labelServerText)
-    AUTO_PROPERTY(QString, lineEditDescriptionText)
-    AUTO_PROPERTY(QString, labelCurrentVpnProtocolText)
-
-public:
-    Q_INVOKABLE void onUpdatePage() override;
-
-    Q_INVOKABLE void onPushButtonForgetServer();
-    Q_INVOKABLE void onPushButtonShareFullClicked();
-    Q_INVOKABLE void onPushButtonClearClientCacheClicked();
-    Q_INVOKABLE void onLineEditDescriptionEditingFinished();
-
-    Q_INVOKABLE bool isCurrentServerHasCredentials();
-
-public:
-    explicit ServerSettingsLogic(UiLogic *uiLogic, QObject *parent = nullptr);
-    ~ServerSettingsLogic() = default;
-
-};
-
-#if defined(Q_OS_ANDROID)
-/* Auth result handler for Android */
-class authResultReceiver  final : public PageLogicBase, public QAndroidActivityResultReceiver
-{
-Q_OBJECT
-
-public:
-    authResultReceiver(UiLogic *uiLogic, int serverIndex , QObject *parent = nullptr) : PageLogicBase(uiLogic, parent) {
-        m_serverIndex = serverIndex;
-    }
-    ~authResultReceiver() {}
-
-public:
-    void handleActivityResult(int receiverRequestCode, int resultCode, const QJniObject &data) override;
-
-private:
-    int  m_serverIndex;
-};
-#endif
-
-#endif // SERVER_SETTINGS_LOGIC_H
diff --git a/client/ui/pages_logic/ShareConnectionLogic.cpp b/client/ui/pages_logic/ShareConnectionLogic.cpp
deleted file mode 100644
index 911c872c..00000000
--- a/client/ui/pages_logic/ShareConnectionLogic.cpp
+++ /dev/null
@@ -1,293 +0,0 @@
-#include <QBuffer>
-#include <QImage>
-#include <QDataStream>
-
-#include "qrcodegen.hpp"
-
-#include "ShareConnectionLogic.h"
-
-#include "configurators/cloak_configurator.h"
-#include "configurators/vpn_configurator.h"
-#include "configurators/openvpn_configurator.h"
-#include "configurators/shadowsocks_configurator.h"
-#include "configurators/wireguard_configurator.h"
-#include "configurators/ikev2_configurator.h"
-#include "configurators/ssh_configurator.h"
-
-#include "version.h"
-#include "core/defs.h"
-#include "core/errorstrings.h"
-#include "core/servercontroller.h"
-#include <functional>
-
-#include "../uilogic.h"
-
-#ifdef __linux__
-    #include <math.h>
-#endif
-
-using namespace qrcodegen;
-
-ShareConnectionLogic::ShareConnectionLogic(UiLogic *logic, QObject *parent):
-    PageLogicBase(logic, parent),
-    m_textEditShareOpenVpnCodeText{},
-    m_lineEditShareShadowSocksStringText{},
-    m_shareShadowSocksQrCodeText{},
-    m_textEditShareCloakText{},
-    m_textEditShareAmneziaCodeText{}
-{
-}
-
-void ShareConnectionLogic::onUpdatePage()
-{
-    set_textEditShareAmneziaCodeText(tr(""));
-    set_shareAmneziaQrCodeTextSeries({});
-    set_shareAmneziaQrCodeTextSeriesLength(0);
-
-    set_textEditShareOpenVpnCodeText("");
-
-    set_shareShadowSocksQrCodeText("");
-    set_textEditShareShadowSocksText("");
-    set_lineEditShareShadowSocksStringText("");
-
-    set_textEditShareCloakText("");
-
-    set_textEditShareWireGuardCodeText("");
-    set_shareWireGuardQrCodeText("");
-
-    set_textEditShareIkev2CertText("");
-    set_textEditShareIkev2MobileConfigText("");
-    set_textEditShareIkev2StrongSwanConfigText("");
-}
-
-void ShareConnectionLogic::onPushButtonShareAmneziaGenerateClicked()
-{
-    set_textEditShareAmneziaCodeText("");
-    set_shareAmneziaQrCodeTextSeries({});
-    set_shareAmneziaQrCodeTextSeriesLength(0);
-
-    QJsonObject serverConfig;
-    int serverIndex = uiLogic()->m_selectedServerIndex;
-    DockerContainer container = uiLogic()->m_selectedDockerContainer;
-
-    // Full access
-    if (shareFullAccess()) {
-        serverConfig = m_settings->server(serverIndex);
-    }
-    // Container share
-    else {
-        ServerCredentials credentials = m_settings->serverCredentials(serverIndex);
-        QJsonObject containerConfig = m_settings->containerConfig(serverIndex, container);
-        containerConfig.insert(config_key::container, ContainerProps::containerToString(container));
-
-        ErrorCode e = ErrorCode::NoError;
-        for (Proto p: ContainerProps::protocolsForContainer(container)) {
-            QJsonObject protoConfig = m_settings->protocolConfig(serverIndex, container, p);
-
-            QString cfg = m_configurator->genVpnProtocolConfig(credentials, container, containerConfig, p, &e);
-            if (e) {
-                cfg = "Error generating config";
-                break;
-            }
-            protoConfig.insert(config_key::last_config, cfg);
-            containerConfig.insert(ProtocolProps::protoToString(p), protoConfig);
-        }
-
-        QByteArray ba;
-        if (!e) {
-            serverConfig = m_settings->server(serverIndex);
-            serverConfig.remove(config_key::userName);
-            serverConfig.remove(config_key::password);
-            serverConfig.remove(config_key::port);
-            serverConfig.insert(config_key::containers, QJsonArray {containerConfig});
-            serverConfig.insert(config_key::defaultContainer, ContainerProps::containerToString(container));
-
-            auto dns = m_configurator->getDnsForConfig(serverIndex);
-            serverConfig.insert(config_key::dns1, dns.first);
-            serverConfig.insert(config_key::dns2, dns.second);
-
-        }
-        else {
-            set_textEditShareAmneziaCodeText(tr("Error while generating connection profile"));
-            return;
-        }
-    }
-
-    QByteArray ba = QJsonDocument(serverConfig).toJson();
-    ba = qCompress(ba, 8);
-    QString code = QString("vpn://%1").arg(QString(ba.toBase64(QByteArray::Base64UrlEncoding | QByteArray::OmitTrailingEquals)));
-    set_textEditShareAmneziaCodeText(code);
-
-
-    QList<QString> qrChunks = genQrCodeImageSeries(ba);
-    set_shareAmneziaQrCodeTextSeries(qrChunks);
-    set_shareAmneziaQrCodeTextSeriesLength(qrChunks.size());
-}
-
-void ShareConnectionLogic::onPushButtonShareOpenVpnGenerateClicked()
-{
-    int serverIndex = uiLogic()->m_selectedServerIndex;
-    DockerContainer container = uiLogic()->m_selectedDockerContainer;
-    ServerCredentials credentials = m_settings->serverCredentials(serverIndex);
-
-    const QJsonObject &containerConfig = m_settings->containerConfig(serverIndex, container);
-
-    ErrorCode e = ErrorCode::NoError;
-    QString cfg = m_configurator->openVpnConfigurator->genOpenVpnConfig(credentials, container, containerConfig, &e);
-    cfg = m_configurator->processConfigWithExportSettings(serverIndex, container, Proto::OpenVpn, cfg);
-
-    set_textEditShareOpenVpnCodeText(QJsonDocument::fromJson(cfg.toUtf8()).object()[config_key::config].toString());
-}
-
-void ShareConnectionLogic::onPushButtonShareShadowSocksGenerateClicked()
-{
-    int serverIndex = uiLogic()->m_selectedServerIndex;
-    DockerContainer container = uiLogic()->m_selectedDockerContainer;
-    ServerCredentials credentials = m_settings->serverCredentials(serverIndex);
-
-    QJsonObject protoConfig = m_settings->protocolConfig(serverIndex, container, Proto::ShadowSocks);
-    QString cfg = protoConfig.value(config_key::last_config).toString();
-
-    if (cfg.isEmpty()) {
-        const QJsonObject &containerConfig = m_settings->containerConfig(serverIndex, container);
-
-        ErrorCode e = ErrorCode::NoError;
-        cfg = m_configurator->shadowSocksConfigurator->genShadowSocksConfig(credentials, container, containerConfig, &e);
-    }
-
-    QJsonObject ssConfig = QJsonDocument::fromJson(cfg.toUtf8()).object();
-
-    QString ssString = QString("%1:%2@%3:%4")
-            .arg(ssConfig.value("method").toString())
-            .arg(ssConfig.value("password").toString())
-            .arg(ssConfig.value("server").toString())
-            .arg(ssConfig.value("server_port").toString());
-
-    ssString = "ss://" + ssString.toUtf8().toBase64();
-    set_lineEditShareShadowSocksStringText(ssString);
-
-    QrCode qr = QrCode::encodeText(ssString.toUtf8(), QrCode::Ecc::LOW);
-    QString svg = QString::fromStdString(toSvgString(qr, 0));
-
-    set_shareShadowSocksQrCodeText(svgToBase64(svg));
-
-    QString humanString = QString("Server: %3\n"
-                                  "Port: %4\n"
-                                  "Encryption: %1\n"
-                                  "Password: %2")
-            .arg(ssConfig.value("method").toString())
-            .arg(ssConfig.value("password").toString())
-            .arg(ssConfig.value("server").toString())
-            .arg(ssConfig.value("server_port").toString());
-
-    set_textEditShareShadowSocksText(humanString);
-}
-
-void ShareConnectionLogic::onPushButtonShareCloakGenerateClicked()
-{
-    int serverIndex = uiLogic()->m_selectedServerIndex;
-    DockerContainer container = uiLogic()->m_selectedDockerContainer;
-    ServerCredentials credentials = m_settings->serverCredentials(serverIndex);
-
-    QJsonObject protoConfig = m_settings->protocolConfig(serverIndex, container, Proto::Cloak);
-    QString cfg = protoConfig.value(config_key::last_config).toString();
-
-    if (cfg.isEmpty()) {
-        const QJsonObject &containerConfig = m_settings->containerConfig(serverIndex, container);
-
-        ErrorCode e = ErrorCode::NoError;
-        cfg = m_configurator->cloakConfigurator->genCloakConfig(credentials, container, containerConfig, &e);
-    }
-
-    QJsonObject cloakConfig = QJsonDocument::fromJson(cfg.toUtf8()).object();
-    cloakConfig.remove(config_key::transport_proto);
-    cloakConfig.insert("ProxyMethod", "shadowsocks");
-
-    set_textEditShareCloakText(QJsonDocument(cloakConfig).toJson());
-}
-
-void ShareConnectionLogic::onPushButtonShareWireGuardGenerateClicked()
-{
-    int serverIndex = uiLogic()->m_selectedServerIndex;
-    DockerContainer container = uiLogic()->m_selectedDockerContainer;
-    ServerCredentials credentials = m_settings->serverCredentials(serverIndex);
-
-    const QJsonObject &containerConfig = m_settings->containerConfig(serverIndex, container);
-
-    ErrorCode e = ErrorCode::NoError;
-    QString cfg = m_configurator->wireguardConfigurator->genWireguardConfig(credentials, container, containerConfig, &e);
-    if (e) {
-        emit uiLogic()->showWarningMessage(tr("Error occurred while generating the config.") + "\n" +
-                                           tr("Error message: ") + errorString(e) + "\n" +
-                                           tr("See logs for details."));
-        return;
-    }
-    cfg = m_configurator->processConfigWithExportSettings(serverIndex, container, Proto::WireGuard, cfg);
-    cfg = QJsonDocument::fromJson(cfg.toUtf8()).object()[config_key::config].toString();
-
-    set_textEditShareWireGuardCodeText(cfg);
-
-    QrCode qr = QrCode::encodeText(cfg.toUtf8(), QrCode::Ecc::LOW);
-    QString svg = QString::fromStdString(toSvgString(qr, 0));
-
-    set_shareWireGuardQrCodeText(svgToBase64(svg));
-}
-
-void ShareConnectionLogic::onPushButtonShareIkev2GenerateClicked()
-{
-    int serverIndex = uiLogic()->m_selectedServerIndex;
-    DockerContainer container = uiLogic()->m_selectedDockerContainer;
-    ServerCredentials credentials = m_settings->serverCredentials(serverIndex);
-
-    Ikev2Configurator::ConnectionData connData = m_configurator->ikev2Configurator->prepareIkev2Config(credentials, container);
-
-    QString cfg = m_configurator->ikev2Configurator->genIkev2Config(connData);
-    cfg = m_configurator->processConfigWithExportSettings(serverIndex, container, Proto::Ikev2, cfg);
-    cfg = QJsonDocument::fromJson(cfg.toUtf8()).object()[config_key::cert].toString();
-
-    set_textEditShareIkev2CertText(cfg);
-
-    QString mobileCfg = m_configurator->ikev2Configurator->genMobileConfig(connData);
-    set_textEditShareIkev2MobileConfigText(mobileCfg);
-
-    QString strongSwanCfg = m_configurator->ikev2Configurator->genStrongSwanConfig(connData);
-    set_textEditShareIkev2StrongSwanConfigText(strongSwanCfg);
-
-}
-
-
-void ShareConnectionLogic::updateSharingPage(int serverIndex, DockerContainer container)
-{
-    uiLogic()->m_selectedDockerContainer = container;
-    uiLogic()->m_selectedServerIndex = serverIndex;
-    set_shareFullAccess(container == DockerContainer::None);
-
-    m_shareAmneziaQrCodeTextSeries.clear();
-    set_shareAmneziaQrCodeTextSeriesLength(0);
-}
-
-QList<QString> ShareConnectionLogic::genQrCodeImageSeries(const QByteArray &data)
-{
-    double k = 850;
-
-    quint8 chunksCount = std::ceil(data.size() / k);
-    QList<QString> chunks;
-    for (int i = 0; i < data.size(); i = i + k) {
-        QByteArray chunk;
-        QDataStream s(&chunk, QIODevice::WriteOnly);
-        s << amnezia::qrMagicCode << chunksCount << (quint8)std::round(i/k) << data.mid(i, k);
-
-        QByteArray ba = chunk.toBase64(QByteArray::Base64UrlEncoding | QByteArray::OmitTrailingEquals);
-
-        QrCode qr = QrCode::encodeText(ba, QrCode::Ecc::LOW);
-        QString svg = QString::fromStdString(toSvgString(qr, 0));
-        chunks.append(svgToBase64(svg));
-    }
-
-    return chunks;
-}
-
-QString ShareConnectionLogic::svgToBase64(const QString &image)
-{
-    return "data:image/svg;base64," + QString::fromLatin1(image.toUtf8().toBase64().data());
-}
diff --git a/client/ui/pages_logic/ShareConnectionLogic.h b/client/ui/pages_logic/ShareConnectionLogic.h
deleted file mode 100644
index 3b9655aa..00000000
--- a/client/ui/pages_logic/ShareConnectionLogic.h
+++ /dev/null
@@ -1,54 +0,0 @@
-#ifndef SHARE_CONNECTION_LOGIC_H
-#define SHARE_CONNECTION_LOGIC_H
-
-#include "PageLogicBase.h"
-#include "containers/containers_defs.h"
-
-class UiLogic;
-
-class ShareConnectionLogic: public PageLogicBase
-{
-    Q_OBJECT
-
-public:
-    AUTO_PROPERTY(bool, shareFullAccess)
-
-    AUTO_PROPERTY(QString, textEditShareAmneziaCodeText)
-    AUTO_PROPERTY(QStringList, shareAmneziaQrCodeTextSeries)
-    AUTO_PROPERTY(int, shareAmneziaQrCodeTextSeriesLength)
-
-    AUTO_PROPERTY(QString, textEditShareOpenVpnCodeText)
-
-    AUTO_PROPERTY(QString, textEditShareShadowSocksText)
-    AUTO_PROPERTY(QString, lineEditShareShadowSocksStringText)
-    AUTO_PROPERTY(QString, shareShadowSocksQrCodeText)
-
-    AUTO_PROPERTY(QString, textEditShareCloakText)
-
-    AUTO_PROPERTY(QString, textEditShareWireGuardCodeText)
-    AUTO_PROPERTY(QString, shareWireGuardQrCodeText)
-
-    AUTO_PROPERTY(QString, textEditShareIkev2CertText)
-    AUTO_PROPERTY(QString, textEditShareIkev2MobileConfigText)
-    AUTO_PROPERTY(QString, textEditShareIkev2StrongSwanConfigText)
-
-public:
-    Q_INVOKABLE void onPushButtonShareAmneziaGenerateClicked();
-    Q_INVOKABLE void onPushButtonShareOpenVpnGenerateClicked();
-    Q_INVOKABLE void onPushButtonShareShadowSocksGenerateClicked();
-    Q_INVOKABLE void onPushButtonShareCloakGenerateClicked();
-    Q_INVOKABLE void onPushButtonShareWireGuardGenerateClicked();
-    Q_INVOKABLE void onPushButtonShareIkev2GenerateClicked();
-
-    Q_INVOKABLE virtual void onUpdatePage() override;
-
-public:
-    explicit ShareConnectionLogic(UiLogic *uiLogic, QObject *parent = nullptr);
-    ~ShareConnectionLogic() = default;
-
-    void updateSharingPage(int serverIndex, DockerContainer container);
-    QList<QString> genQrCodeImageSeries(const QByteArray &data);
-
-    QString svgToBase64(const QString &image);
-};
-#endif // SHARE_CONNECTION_LOGIC_H
diff --git a/client/ui/pages_logic/SitesLogic.cpp b/client/ui/pages_logic/SitesLogic.cpp
deleted file mode 100644
index aaf8f73d..00000000
--- a/client/ui/pages_logic/SitesLogic.cpp
+++ /dev/null
@@ -1,211 +0,0 @@
-#include <QDebug>
-#include <QDesktopServices>
-#include <QFile>
-#include <QHostInfo>
-
-#include "SitesLogic.h"
-#include "VpnLogic.h"
-#include "utilities.h"
-#include "vpnconnection.h"
-#include <functional>
-
-#include "../models/sites_model.h"
-#include "../uilogic.h"
-
-SitesLogic::SitesLogic(UiLogic *logic, QObject *parent)
-    : PageLogicBase(logic, parent),
-      m_labelSitesAddCustomText {},
-      m_tableViewSitesModel { nullptr },
-      m_lineEditSitesAddCustomText {}
-{
-    //    sitesModels.insert(Settings::VpnOnlyForwardSites, new SitesModel(m_settings, Settings::VpnOnlyForwardSites));
-    //    sitesModels.insert(Settings::VpnAllExceptSites, new SitesModel(m_settings, Settings::VpnAllExceptSites));
-}
-
-void SitesLogic::onUpdatePage()
-{
-    Settings::RouteMode m = m_settings->routeMode();
-    if (m == Settings::VpnAllSites)
-        return;
-
-    if (m == Settings::VpnOnlyForwardSites) {
-        set_labelSitesAddCustomText(tr("These sites will be opened using VPN"));
-    }
-    if (m == Settings::VpnAllExceptSites) {
-        set_labelSitesAddCustomText(tr("These sites will be excepted from VPN"));
-    }
-
-    set_tableViewSitesModel(sitesModels.value(m));
-    //    sitesModels.value(m)->resetCache();
-}
-
-void SitesLogic::onPushButtonAddCustomSitesClicked()
-{
-    if (uiLogic()->pageLogic<VpnLogic>()->radioButtonVpnModeAllSitesChecked()) {
-        return;
-    }
-    Settings::RouteMode mode = m_settings->routeMode();
-
-    QString newSite = lineEditSitesAddCustomText();
-
-    if (newSite.isEmpty())
-        return;
-    if (!newSite.contains("."))
-        return;
-
-    if (!Utils::ipAddressWithSubnetRegExp().exactMatch(newSite)) {
-        // get domain name if it present
-        newSite.replace("https://", "");
-        newSite.replace("http://", "");
-        newSite.replace("ftp://", "");
-
-        newSite = newSite.split("/", Qt::SkipEmptyParts).first();
-    }
-
-    const auto &cbProcess = [this, mode](const QString &newSite, const QString &ip) {
-        m_settings->addVpnSite(mode, newSite, ip);
-
-        if (!ip.isEmpty()) {
-            QMetaObject::invokeMethod(uiLogic()->m_vpnConnection, "addRoutes", Qt::QueuedConnection,
-                                      Q_ARG(QStringList, QStringList() << ip));
-        } else if (Utils::ipAddressWithSubnetRegExp().exactMatch(newSite)) {
-            QMetaObject::invokeMethod(uiLogic()->m_vpnConnection, "addRoutes", Qt::QueuedConnection,
-                                      Q_ARG(QStringList, QStringList() << newSite));
-        }
-
-        QMetaObject::invokeMethod(uiLogic()->m_vpnConnection, "flushDns", Qt::QueuedConnection);
-
-        onUpdatePage();
-    };
-
-    const auto &cbResolv = [this, cbProcess](const QHostInfo &hostInfo) {
-        const QList<QHostAddress> &addresses = hostInfo.addresses();
-        QString ipv4Addr;
-        for (const QHostAddress &addr : hostInfo.addresses()) {
-            if (addr.protocol() == QAbstractSocket::NetworkLayerProtocol::IPv4Protocol) {
-                cbProcess(hostInfo.hostName(), addr.toString());
-                break;
-            }
-        }
-    };
-
-    set_lineEditSitesAddCustomText("");
-
-    if (Utils::ipAddressWithSubnetRegExp().exactMatch(newSite)) {
-        cbProcess(newSite, "");
-        return;
-    } else {
-        cbProcess(newSite, "");
-        onUpdatePage();
-        QHostInfo::lookupHost(newSite, this, cbResolv);
-    }
-}
-
-void SitesLogic::onPushButtonSitesDeleteClicked(QStringList items)
-{
-    Settings::RouteMode mode = m_settings->routeMode();
-
-    auto siteModel = qobject_cast<SitesModel *>(tableViewSitesModel());
-    if (!siteModel || items.isEmpty()) {
-        return;
-    }
-
-    QStringList sites;
-    QStringList ips;
-
-    for (const QString &s : items) {
-        bool ok;
-        int row = s.toInt(&ok);
-        if (!ok || row < 0 || row >= siteModel->rowCount())
-            return;
-        //        sites.append(siteModel->data(row, 0).toString());
-
-        //        if (uiLogic()->m_vpnConnection && uiLogic()->m_vpnConnection->connectionState() == VpnProtocol::Connected) {
-        //            ips.append(siteModel->data(row, 1).toString());
-        //    }
-    }
-
-    m_settings->removeVpnSites(mode, sites);
-
-    QMetaObject::invokeMethod(uiLogic()->m_vpnConnection, "deleteRoutes", Qt::QueuedConnection, Q_ARG(QStringList, ips));
-
-    QMetaObject::invokeMethod(uiLogic()->m_vpnConnection, "flushDns", Qt::QueuedConnection);
-
-    onUpdatePage();
-}
-
-void SitesLogic::onPushButtonSitesImportClicked(const QString &fileName)
-{
-    QFile file(QUrl { fileName }.toLocalFile());
-    if (!file.open(QIODevice::ReadOnly)) {
-        qDebug() << "Can't open file " << QUrl { fileName }.toLocalFile();
-        return;
-    }
-
-    Settings::RouteMode mode = m_settings->routeMode();
-
-    QStringList ips;
-    QMap<QString, QString> sites;
-
-    while (!file.atEnd()) {
-        QString line = file.readLine();
-        QStringList line_ips;
-        QStringList line_sites;
-
-        int posDomain = 0;
-        QRegExp domainRx = Utils::domainRegExp();
-        while ((posDomain = domainRx.indexIn(line, posDomain)) != -1) {
-            line_sites.append(domainRx.cap(0));
-            posDomain += domainRx.matchedLength();
-        }
-
-        int posIp = 0;
-        QRegExp ipRx = Utils::ipAddressWithSubnetRegExp();
-        while ((posIp = ipRx.indexIn(line, posIp)) != -1) {
-            line_ips.append(ipRx.cap(0));
-            posIp += ipRx.matchedLength();
-        }
-
-        // domain regex cover ip regex, so remove ips from sites
-        for (const QString &ip : line_ips) {
-            line_sites.removeAll(ip);
-        }
-
-        if (line_sites.size() == 1 && line_ips.size() == 1) {
-            sites.insert(line_sites.at(0), line_ips.at(0));
-        } else if (line_sites.size() > 0 && line_ips.size() == 0) {
-            for (const QString &site : line_sites) {
-                sites.insert(site, "");
-            }
-        } else {
-            for (const QString &site : line_sites) {
-                sites.insert(site, "");
-            }
-            for (const QString &ip : line_ips) {
-                ips.append(ip);
-            }
-        }
-    }
-
-    m_settings->addVpnIps(mode, ips);
-    m_settings->addVpnSites(mode, sites);
-
-    QMetaObject::invokeMethod(uiLogic()->m_vpnConnection, "addRoutes", Qt::QueuedConnection, Q_ARG(QStringList, ips));
-
-    QMetaObject::invokeMethod(uiLogic()->m_vpnConnection, "flushDns", Qt::QueuedConnection);
-
-    onUpdatePage();
-}
-
-void SitesLogic::onPushButtonSitesExportClicked()
-{
-    Settings::RouteMode mode = m_settings->routeMode();
-
-    QVariantMap sites = m_settings->vpnSites(mode);
-
-    QString data;
-    for (auto s : sites.keys()) {
-        data += s + "\t" + sites.value(s).toString() + "\n";
-    }
-    uiLogic()->saveTextFile("Export Sites", "sites.txt", ".txt", data);
-}
diff --git a/client/ui/pages_logic/SitesLogic.h b/client/ui/pages_logic/SitesLogic.h
deleted file mode 100644
index 35bf1f90..00000000
--- a/client/ui/pages_logic/SitesLogic.h
+++ /dev/null
@@ -1,33 +0,0 @@
-#ifndef SITES_LOGIC_H
-#define SITES_LOGIC_H
-
-#include "PageLogicBase.h"
-#include "settings.h"
-
-class UiLogic;
-class SitesModel;
-
-class SitesLogic : public PageLogicBase
-{
-    Q_OBJECT
-
-    AUTO_PROPERTY(QString, labelSitesAddCustomText)
-    AUTO_PROPERTY(QObject*, tableViewSitesModel)
-    AUTO_PROPERTY(QString, lineEditSitesAddCustomText)
-
-public:
-    Q_INVOKABLE void onUpdatePage() override;
-
-    Q_INVOKABLE void onPushButtonAddCustomSitesClicked();
-    Q_INVOKABLE void onPushButtonSitesDeleteClicked(QStringList items);
-    Q_INVOKABLE void onPushButtonSitesImportClicked(const QString &fileName);
-    Q_INVOKABLE void onPushButtonSitesExportClicked();
-
-
-public:
-    explicit SitesLogic(UiLogic *uiLogic, QObject *parent = nullptr);
-    ~SitesLogic() = default;
-
-    QMap<Settings::RouteMode, SitesModel *> sitesModels;
-};
-#endif // SITES_LOGIC_H
diff --git a/client/ui/pages_logic/StartPageLogic.cpp b/client/ui/pages_logic/StartPageLogic.cpp
deleted file mode 100644
index 891d67fb..00000000
--- a/client/ui/pages_logic/StartPageLogic.cpp
+++ /dev/null
@@ -1,374 +0,0 @@
-#include "StartPageLogic.h"
-#include "ViewConfigLogic.h"
-
-#include "../uilogic.h"
-#include "configurators/ssh_configurator.h"
-#include "configurators/vpn_configurator.h"
-#include "core/errorstrings.h"
-#include "core/servercontroller.h"
-#include "utilities.h"
-
-#include <QEventLoop>
-#include <QFileDialog>
-#include <QStandardPaths>
-
-#ifdef Q_OS_ANDROID
-    #include "../../platforms/android/android_controller.h"
-    #include "../../platforms/android/androidutils.h"
-    #include <QJniObject>
-#endif
-
-#ifdef Q_OS_IOS
-    #include <CoreFoundation/CoreFoundation.h>
-#endif
-
-namespace
-{
-    enum class ConfigTypes {
-        Amnezia,
-        OpenVpn,
-        WireGuard
-    };
-
-    ConfigTypes checkConfigFormat(const QString &config)
-    {
-        const QString openVpnConfigPatternCli = "client";
-        const QString openVpnConfigPatternProto1 = "proto tcp";
-        const QString openVpnConfigPatternProto2 = "proto udp";
-        const QString openVpnConfigPatternDriver1 = "dev tun";
-        const QString openVpnConfigPatternDriver2 = "dev tap";
-
-        const QString wireguardConfigPatternSectionInterface = "[Interface]";
-        const QString wireguardConfigPatternSectionPeer = "[Peer]";
-
-        if (config.contains(openVpnConfigPatternCli)
-            && (config.contains(openVpnConfigPatternProto1) || config.contains(openVpnConfigPatternProto2))
-            && (config.contains(openVpnConfigPatternDriver1) || config.contains(openVpnConfigPatternDriver2))) {
-            return ConfigTypes::OpenVpn;
-        } else if (config.contains(wireguardConfigPatternSectionInterface)
-                   && config.contains(wireguardConfigPatternSectionPeer))
-            return ConfigTypes::WireGuard;
-        return ConfigTypes::Amnezia;
-    }
-
-}
-
-StartPageLogic::StartPageLogic(UiLogic *logic, QObject *parent)
-    : PageLogicBase(logic, parent),
-      m_pushButtonConnectEnabled { true },
-      m_pushButtonConnectText { tr("Connect") },
-      m_pushButtonConnectKeyChecked { false },
-      m_labelWaitInfoVisible { true },
-      m_pushButtonBackFromStartVisible { true },
-      m_ipAddressPortRegex { Utils::ipAddressPortRegExp() }
-{
-#ifdef Q_OS_ANDROID
-    // Set security screen for Android app
-    AndroidUtils::runOnAndroidThreadSync([]() {
-        QJniObject activity = AndroidUtils::getActivity();
-        QJniObject window = activity.callObjectMethod("getWindow", "()Landroid/view/Window;");
-        if (window.isValid()) {
-            const int FLAG_SECURE = 8192;
-            window.callMethod<void>("addFlags", "(I)V", FLAG_SECURE);
-        }
-    });
-#endif
-}
-
-void StartPageLogic::onUpdatePage()
-{
-    set_lineEditStartExistingCodeText("");
-    set_textEditSshKeyText("");
-    set_lineEditIpText("");
-    set_lineEditPasswordText("");
-    set_textEditSshKeyText("");
-    set_lineEditLoginText("");
-
-    set_labelWaitInfoVisible(false);
-    set_labelWaitInfoText("");
-
-    set_pushButtonConnectKeyChecked(false);
-
-    set_pushButtonBackFromStartVisible(uiLogic()->pagesStackDepth() > 0);
-}
-
-void StartPageLogic::onPushButtonConnect()
-{
-    if (pushButtonConnectKeyChecked()) {
-        if (lineEditIpText().isEmpty() || lineEditLoginText().isEmpty() || textEditSshKeyText().isEmpty()) {
-            set_labelWaitInfoText(tr("Please fill in all fields"));
-            return;
-        }
-    } else {
-        if (lineEditIpText().isEmpty() || lineEditLoginText().isEmpty() || lineEditPasswordText().isEmpty()) {
-            set_labelWaitInfoText(tr("Please fill in all fields"));
-            return;
-        }
-    }
-
-    ServerCredentials serverCredentials;
-    serverCredentials.hostName = lineEditIpText();
-    if (serverCredentials.hostName.contains(":")) {
-        serverCredentials.port = serverCredentials.hostName.split(":").at(1).toInt();
-        serverCredentials.hostName = serverCredentials.hostName.split(":").at(0);
-    }
-    serverCredentials.userName = lineEditLoginText();
-    if (pushButtonConnectKeyChecked()) {
-        QString key = textEditSshKeyText();
-        if (key.startsWith("ssh-rsa")) {
-            emit uiLogic()->showPublicKeyWarning();
-            return;
-        }
-
-        if (key.contains("OPENSSH") && key.contains("BEGIN") && key.contains("PRIVATE KEY")) {
-            key = m_configurator->sshConfigurator->convertOpenSShKey(key);
-        }
-
-        serverCredentials.secretData = key;
-    } else {
-        serverCredentials.secretData = lineEditPasswordText();
-    }
-
-    set_pushButtonConnectEnabled(false);
-    set_pushButtonConnectText(tr("Connecting..."));
-
-    ServerController serverController(m_settings);
-    ErrorCode errorCode = ErrorCode::NoError;
-
-    if (pushButtonConnectKeyChecked()) {
-        auto passphraseCallback = [this, &serverController]() {
-            emit showPassphraseRequestMessage();
-            QEventLoop loop;
-            QObject::connect(this, &StartPageLogic::passphraseDialogClosed, &loop, &QEventLoop::quit);
-            loop.exec();
-
-            return m_privateKeyPassphrase;
-        };
-
-        QString decryptedPrivateKey;
-        errorCode = serverController.getDecryptedPrivateKey(serverCredentials, decryptedPrivateKey, passphraseCallback);
-        if (errorCode == ErrorCode::NoError) {
-            serverCredentials.secretData = decryptedPrivateKey;
-        }
-    }
-
-    QString output;
-    if (errorCode == ErrorCode::NoError) {
-        output = serverController.checkSshConnection(serverCredentials, &errorCode);
-    }
-
-    bool ok = true;
-    if (errorCode) {
-        set_labelWaitInfoVisible(true);
-        set_labelWaitInfoText(errorString(errorCode));
-        ok = false;
-    } else {
-        if (output.contains("Please login as the user")) {
-            output.replace("\n", "");
-            set_labelWaitInfoVisible(true);
-            set_labelWaitInfoText(output);
-            ok = false;
-        }
-    }
-
-    set_pushButtonConnectEnabled(true);
-    set_pushButtonConnectText(tr("Connect"));
-
-    uiLogic()->m_installCredentials = serverCredentials;
-    if (ok)
-        emit uiLogic()->goToPage(Page::NewServer);
-}
-
-void StartPageLogic::onPushButtonImport()
-{
-    importConnectionFromCode(lineEditStartExistingCodeText());
-}
-
-void StartPageLogic::onPushButtonImportOpenFile()
-{
-    QString fileName = UiLogic::getOpenFileName(Q_NULLPTR, tr("Open config file"),
-                                                QStandardPaths::writableLocation(QStandardPaths::DocumentsLocation),
-                                                "*.vpn *.ovpn *.conf");
-    if (fileName.isEmpty())
-        return;
-
-    QFile file(fileName);
-
-#ifdef Q_OS_IOS
-    CFURLRef url = CFURLCreateWithFileSystemPath(
-            kCFAllocatorDefault,
-            CFStringCreateWithCharacters(0, reinterpret_cast<const UniChar *>(fileName.unicode()), fileName.length()),
-            kCFURLPOSIXPathStyle, 0);
-
-    if (!CFURLStartAccessingSecurityScopedResource(url)) {
-        qDebug() << "Could not access path " << QUrl::fromLocalFile(fileName).toString();
-    }
-#endif
-
-    file.open(QIODevice::ReadOnly);
-    QByteArray data = file.readAll();
-
-    importAnyFile(QString(data));
-}
-
-#ifdef Q_OS_ANDROID
-void StartPageLogic::startQrDecoder()
-{
-    AndroidController::instance()->startQrReaderActivity();
-}
-#endif
-
-void StartPageLogic::importAnyFile(const QString &configData)
-{
-    auto configFormat = checkConfigFormat(configData);
-    if (configFormat == ConfigTypes::OpenVpn) {
-        importConnectionFromOpenVpnConfig(configData);
-    } else if (configFormat == ConfigTypes::WireGuard) {
-        importConnectionFromWireguardConfig(configData);
-    } else {
-        importConnectionFromCode(configData);
-    }
-}
-
-bool StartPageLogic::importConnection(const QJsonObject &profile)
-{
-    ServerCredentials credentials;
-    credentials.hostName = profile.value(config_key::hostName).toString();
-    credentials.port = profile.value(config_key::port).toInt();
-    credentials.userName = profile.value(config_key::userName).toString();
-    credentials.secretData = profile.value(config_key::password).toString();
-
-    if (credentials.isValid() || profile.contains(config_key::containers)) {
-        // check config
-        uiLogic()->pageLogic<ViewConfigLogic>()->set_configJson(profile);
-        emit uiLogic()->goToPage(Page::ViewConfig);
-    } else {
-        qDebug() << "Failed to import profile";
-        qDebug().noquote() << QJsonDocument(profile).toJson();
-        return false;
-    }
-
-    return true;
-}
-
-bool StartPageLogic::importConnectionFromCode(QString code)
-{
-    code.replace("vpn://", "");
-    QByteArray ba = QByteArray::fromBase64(code.toUtf8(), QByteArray::Base64UrlEncoding | QByteArray::OmitTrailingEquals);
-
-    QByteArray ba_uncompressed = qUncompress(ba);
-    if (!ba_uncompressed.isEmpty()) {
-        ba = ba_uncompressed;
-    }
-
-    QJsonObject o;
-    o = QJsonDocument::fromJson(ba).object();
-    if (!o.isEmpty()) {
-        return importConnection(o);
-    }
-
-    return false;
-}
-
-bool StartPageLogic::importConnectionFromQr(const QByteArray &data)
-{
-    QJsonObject dataObj = QJsonDocument::fromJson(data).object();
-    if (!dataObj.isEmpty()) {
-        return importConnection(dataObj);
-    }
-
-    QByteArray ba_uncompressed = qUncompress(data);
-    if (!ba_uncompressed.isEmpty()) {
-        return importConnection(QJsonDocument::fromJson(ba_uncompressed).object());
-    }
-
-    return false;
-}
-
-bool StartPageLogic::importConnectionFromOpenVpnConfig(const QString &config)
-{
-    QJsonObject openVpnConfig;
-    openVpnConfig[config_key::config] = config;
-
-    QJsonObject lastConfig;
-    lastConfig[config_key::last_config] = QString(QJsonDocument(openVpnConfig).toJson());
-    lastConfig[config_key::isThirdPartyConfig] = true;
-
-    QJsonObject containers;
-    containers.insert(config_key::container, QJsonValue("amnezia-openvpn"));
-    containers.insert(config_key::openvpn, QJsonValue(lastConfig));
-
-    QJsonArray arr;
-    arr.push_back(containers);
-
-    QString hostName;
-    const static QRegularExpression hostNameRegExp("remote (.*) [0-9]*");
-    QRegularExpressionMatch hostNameMatch = hostNameRegExp.match(config);
-    if (hostNameMatch.hasMatch()) {
-        hostName = hostNameMatch.captured(1);
-    }
-
-    QJsonObject o;
-    o[config_key::containers] = arr;
-    o[config_key::defaultContainer] = "amnezia-openvpn";
-    o[config_key::description] = m_settings->nextAvailableServerName();
-
-    const static QRegularExpression dnsRegExp("dhcp-option DNS (\\b\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}\\b)");
-    QRegularExpressionMatchIterator dnsMatch = dnsRegExp.globalMatch(config);
-    if (dnsMatch.hasNext()) {
-        o[config_key::dns1] = dnsMatch.next().captured(1);
-    }
-    if (dnsMatch.hasNext()) {
-        o[config_key::dns2] = dnsMatch.next().captured(1);
-    }
-
-    o[config_key::hostName] = hostName;
-
-    return importConnection(o);
-}
-
-bool StartPageLogic::importConnectionFromWireguardConfig(const QString &config)
-{
-    QJsonObject lastConfig;
-    lastConfig[config_key::config] = config;
-
-    const static QRegularExpression hostNameAndPortRegExp("Endpoint = (.*):([0-9]*)");
-    QRegularExpressionMatch hostNameAndPortMatch = hostNameAndPortRegExp.match(config);
-    QString hostName;
-    QString port;
-    if (hostNameAndPortMatch.hasMatch()) {
-        hostName = hostNameAndPortMatch.captured(1);
-        port = hostNameAndPortMatch.captured(2);
-    }
-
-    QJsonObject wireguardConfig;
-    wireguardConfig[config_key::last_config] = QString(QJsonDocument(lastConfig).toJson());
-    wireguardConfig[config_key::isThirdPartyConfig] = true;
-    wireguardConfig[config_key::port] = port;
-    wireguardConfig[config_key::transport_proto] = "udp";
-
-    QJsonObject containers;
-    containers.insert(config_key::container, QJsonValue("amnezia-wireguard"));
-    containers.insert(config_key::wireguard, QJsonValue(wireguardConfig));
-
-    QJsonArray arr;
-    arr.push_back(containers);
-
-    QJsonObject o;
-    o[config_key::containers] = arr;
-    o[config_key::defaultContainer] = "amnezia-wireguard";
-    o[config_key::description] = m_settings->nextAvailableServerName();
-
-    const static QRegularExpression dnsRegExp(
-            "DNS = "
-            "(\\b\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}\\b).*(\\b\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}\\b)");
-    QRegularExpressionMatch dnsMatch = dnsRegExp.match(config);
-    if (dnsMatch.hasMatch()) {
-        o[config_key::dns1] = dnsMatch.captured(1);
-        o[config_key::dns2] = dnsMatch.captured(2);
-    }
-
-    o[config_key::hostName] = hostName;
-
-    return importConnection(o);
-}
diff --git a/client/ui/pages_logic/StartPageLogic.h b/client/ui/pages_logic/StartPageLogic.h
deleted file mode 100644
index 9025a052..00000000
--- a/client/ui/pages_logic/StartPageLogic.h
+++ /dev/null
@@ -1,56 +0,0 @@
-#ifndef START_PAGE_LOGIC_H
-#define START_PAGE_LOGIC_H
-
-#include "PageLogicBase.h"
-
-#include <QRegularExpression>
-
-class UiLogic;
-
-class StartPageLogic : public PageLogicBase
-{
-    Q_OBJECT
-
-    AUTO_PROPERTY(bool, pushButtonConnectEnabled)
-    AUTO_PROPERTY(bool, pushButtonConnectKeyChecked)
-    AUTO_PROPERTY(QString, pushButtonConnectText)
-    AUTO_PROPERTY(QString, lineEditStartExistingCodeText)
-    AUTO_PROPERTY(QString, textEditSshKeyText)
-    AUTO_PROPERTY(QString, lineEditIpText)
-    AUTO_PROPERTY(QString, lineEditPasswordText)
-    AUTO_PROPERTY(QString, lineEditLoginText)
-    AUTO_PROPERTY(bool, labelWaitInfoVisible)
-    AUTO_PROPERTY(QString, labelWaitInfoText)
-    AUTO_PROPERTY(bool, pushButtonBackFromStartVisible)
-
-    AUTO_PROPERTY(QString, privateKeyPassphrase)
-
-    READONLY_PROPERTY(QRegularExpression, ipAddressPortRegex)
-public:
-    Q_INVOKABLE void onUpdatePage() override;
-
-    Q_INVOKABLE void onPushButtonConnect();
-    Q_INVOKABLE void onPushButtonImport();
-    Q_INVOKABLE void onPushButtonImportOpenFile();
-
-#ifdef Q_OS_ANDROID
-    Q_INVOKABLE void startQrDecoder();
-#endif
-
-    void importAnyFile(const QString &configData);
-
-    bool importConnection(const QJsonObject &profile);
-    bool importConnectionFromCode(QString code);
-    bool importConnectionFromQr(const QByteArray &data);
-    bool importConnectionFromOpenVpnConfig(const QString &config);
-    bool importConnectionFromWireguardConfig(const QString &config);
-
-public:
-    explicit StartPageLogic(UiLogic *uiLogic, QObject *parent = nullptr);
-    ~StartPageLogic() = default;
-
-signals:
-    void showPassphraseRequestMessage();
-    void passphraseDialogClosed();
-};
-#endif // START_PAGE_LOGIC_H
diff --git a/client/ui/pages_logic/ViewConfigLogic.cpp b/client/ui/pages_logic/ViewConfigLogic.cpp
deleted file mode 100644
index 5f711498..00000000
--- a/client/ui/pages_logic/ViewConfigLogic.cpp
+++ /dev/null
@@ -1,93 +0,0 @@
-#include "ViewConfigLogic.h"
-#include "core/errorstrings.h"
-#include "../uilogic.h"
-
-
-ViewConfigLogic::ViewConfigLogic(UiLogic *logic, QObject *parent):
-    PageLogicBase(logic, parent)
-{
-
-}
-
-void ViewConfigLogic::onUpdatePage()
-{
-    set_configText(QJsonDocument(configJson()).toJson());
-
-    auto s = configJson()[config_key::isThirdPartyConfig].toBool();
-
-    m_openVpnLastConfigs = m_openVpnMalStrings =
-            "<style> \
-            div { line-height: 0.5; } \
-            </style><div>";
-
-    m_warningStringNumber = 3;
-    m_warningActive = false;
-
-    const QJsonArray &containers = configJson()[config_key::containers].toArray();
-    int i = 0;
-    for (const QJsonValue &v: containers) {
-        auto containerName = v.toObject()[config_key::container].toString();
-        QJsonObject containerConfig = v.toObject()[containerName.replace("amnezia-", "")].toObject();
-        if (containerConfig[config_key::isThirdPartyConfig].toBool()) {
-            auto lastConfig = containerConfig.value(config_key::last_config).toString();
-            auto lastConfigJson = QJsonDocument::fromJson(lastConfig.toUtf8()).object();
-            QStringList lines = lastConfigJson.value(config_key::config).toString().replace("\r", "").split("\n");
-            QString lastConfigText;
-            for (const QString &l: lines) {
-                    lastConfigText.append(l + "\n");
-            }
-            set_configText(lastConfigText);
-        }
-
-
-        if (v.toObject()[config_key::container].toString() == "amnezia-openvpn") {
-            QString lastConfig = v.toObject()[ProtocolProps::protoToString(Proto::OpenVpn)]
-                    .toObject()[config_key::last_config].toString();
-
-            QString lastConfigJson = QJsonDocument::fromJson(lastConfig.toUtf8()).object()[config_key::config]
-                    .toString();
-
-            QStringList lines = lastConfigJson.replace("\r", "").split("\n");
-            for (const QString &l: lines) {
-                i++;
-                QRegularExpressionMatch match = m_re.match(l);
-                if (dangerousTags.contains(match.captured(0))) {
-                    QString t = QString("<p><font color=\"red\">%1</font>").arg(l);
-                    m_openVpnLastConfigs.append(t + "\n");
-                    m_openVpnMalStrings.append(t);
-                    if (m_warningStringNumber == 3) m_warningStringNumber = i - 3;
-                    m_warningActive = true;
-                    qDebug() << "ViewConfigLogic : malicious scripts warning:" << l;
-                }
-                else {
-                    m_openVpnLastConfigs.append("<p>" + l + "&nbsp;\n");
-                }
-            }
-        }
-    }
-
-    emit openVpnLastConfigsChanged(m_openVpnLastConfigs);
-    emit openVpnMalStringsChanged(m_openVpnMalStrings);
-    emit warningStringNumberChanged(m_warningStringNumber);
-    emit warningActiveChanged(m_warningActive);
-}
-
-void ViewConfigLogic::importConfig()
-{
-    m_settings->addServer(configJson());
-    m_settings->setDefaultServer(m_settings->serversCount() - 1);
-
-
-    if (!configJson().contains(config_key::containers) || configJson().value(config_key::containers).toArray().isEmpty()) {
-        uiLogic()->m_selectedServerIndex = m_settings->defaultServerIndex();
-        uiLogic()->m_selectedDockerContainer = m_settings->defaultContainer(uiLogic()->m_selectedServerIndex);
-        uiLogic()->onUpdateAllPages();
-        emit uiLogic()->goToPage(Page::Vpn);
-        emit uiLogic()->setStartPage(Page::Vpn);
-        emit uiLogic()->goToPage(Page::ServerContainers);
-    } else {
-        emit uiLogic()->goToPage(Page::Vpn);
-        emit uiLogic()->setStartPage(Page::Vpn);
-    }
-}
-
diff --git a/client/ui/pages_logic/ViewConfigLogic.h b/client/ui/pages_logic/ViewConfigLogic.h
deleted file mode 100644
index 4713158e..00000000
--- a/client/ui/pages_logic/ViewConfigLogic.h
+++ /dev/null
@@ -1,47 +0,0 @@
-#ifndef VIEW_CONFIG_LOGIC_H
-#define VIEW_CONFIG_LOGIC_H
-
-#include "PageLogicBase.h"
-
-#include <QJsonObject>
-
-class UiLogic;
-
-class ViewConfigLogic : public PageLogicBase
-{
-    Q_OBJECT
-
-    AUTO_PROPERTY(QString, configText)
-    AUTO_PROPERTY(QString, openVpnLastConfigs)
-    AUTO_PROPERTY(QString, openVpnMalStrings)
-    AUTO_PROPERTY(QJsonObject, configJson)
-    AUTO_PROPERTY(int, warningStringNumber)
-    AUTO_PROPERTY(bool, warningActive)
-
-public:
-    Q_INVOKABLE void onUpdatePage() override;
-    Q_INVOKABLE void importConfig();
-
-
-public:
-    explicit ViewConfigLogic(UiLogic *uiLogic, QObject *parent = nullptr);
-    ~ViewConfigLogic() = default;
-
-private:
-    QRegularExpression m_re {"(\\w+-\\w+|\\w+)"};
-
-    // https://github.com/OpenVPN/openvpn/blob/master/doc/man-sections/script-options.rst
-    QStringList dangerousTags {
-        "up",
-        "tls-verify",
-        "ipchange",
-        "client-connect",
-        "route-up",
-        "route-pre-down",
-        "client-disconnect",
-        "down",
-        "learn-address",
-        "auth-user-pass-verify"
-    };
-};
-#endif // VIEW_CONFIG_LOGIC_H
diff --git a/client/ui/pages_logic/VpnLogic.cpp b/client/ui/pages_logic/VpnLogic.cpp
deleted file mode 100644
index 2f5e7b65..00000000
--- a/client/ui/pages_logic/VpnLogic.cpp
+++ /dev/null
@@ -1,245 +0,0 @@
-#include <QApplication>
-
-#include "VpnLogic.h"
-
-#include "core/errorstrings.h"
-#include "vpnconnection.h"
-#include <QTimer>
-#include <functional>
-#include "../uilogic.h"
-#include "version.h"
-#include <configurators/vpn_configurator.h>
-
-
-VpnLogic::VpnLogic(UiLogic *logic, QObject *parent):
-    PageLogicBase(logic, parent),
-    m_pushButtonConnectChecked{false},
-
-    m_radioButtonVpnModeAllSitesChecked{true},
-    m_radioButtonVpnModeForwardSitesChecked{false},
-    m_radioButtonVpnModeExceptSitesChecked{false},
-
-    m_labelSpeedReceivedText{tr("0 Mbps")},
-    m_labelSpeedSentText{tr("0 Mbps")},
-    m_labelStateText{},
-    m_isContainerHaveAuthData{false},
-    m_isContainerSupportedByCurrentPlatform{false},
-    m_widgetVpnModeEnabled{false}
-{
-    connect(uiLogic()->m_vpnConnection, &VpnConnection::bytesChanged, this, &VpnLogic::onBytesChanged);
-    connect(uiLogic()->m_vpnConnection, &VpnConnection::connectionStateChanged, this, &VpnLogic::onConnectionStateChanged);
-    connect(uiLogic()->m_vpnConnection, &VpnConnection::vpnProtocolError, this, &VpnLogic::onVpnProtocolError);
-
-    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);
-            onConnect();
-        });
-    }
-    else {
-        onConnectionStateChanged(Vpn::ConnectionState::Disconnected);
-    }
-}
-
-
-void VpnLogic::onUpdatePage()
-{
-    Settings::RouteMode mode = m_settings->routeMode();
-    DockerContainer selectedContainer = m_settings->defaultContainer(m_settings->defaultServerIndex());
-
-    set_isCustomRoutesSupported  (selectedContainer == DockerContainer::OpenVpn ||
-                                  selectedContainer == DockerContainer::ShadowSocks||
-                                  selectedContainer == DockerContainer::Cloak);
-
-    set_isContainerHaveAuthData(m_settings->haveAuthData(m_settings->defaultServerIndex()));
-
-    set_radioButtonVpnModeAllSitesChecked(mode == Settings::VpnAllSites || !isCustomRoutesSupported());
-    set_radioButtonVpnModeForwardSitesChecked(mode == Settings::VpnOnlyForwardSites && isCustomRoutesSupported());
-    set_radioButtonVpnModeExceptSitesChecked(mode == Settings::VpnAllExceptSites && isCustomRoutesSupported());
-
-    const QJsonObject &server = uiLogic()->m_settings->defaultServer();
-    QString serverString = QString("%2 (%3)")
-            .arg(server.value(config_key::description).toString())
-            .arg(server.value(config_key::hostName).toString());
-    set_labelCurrentServer(serverString);
-
-    QString selectedContainerName = ContainerProps::containerHumanNames().value(selectedContainer);
-    set_labelCurrentService(selectedContainerName);
-
-    auto dns = m_configurator->getDnsForConfig(m_settings->defaultServerIndex());
-    set_amneziaDnsEnabled(dns.first == protocols::dns::amneziaDnsIp);
-    if (dns.first == protocols::dns::amneziaDnsIp) {
-        set_labelCurrentDns("On your server");
-    }
-    else {
-        set_labelCurrentDns(dns.first + ", " + dns.second);
-    }
-
-    set_isContainerSupportedByCurrentPlatform(ContainerProps::isSupportedByCurrentPlatform(selectedContainer));
-    if (!isContainerSupportedByCurrentPlatform()) {
-        set_labelErrorText(tr("AmneziaVPN not supporting selected protocol on this device. Select another protocol."));
-    }
-    else {
-        set_labelErrorText("");
-    }
-    QString ver = QString("v. %2").arg(QString(APP_MAJOR_VERSION));
-    set_labelVersionText(ver);
-
-    set_labelLogEnabledVisible(m_settings->isSaveLogs());
-}
-
-
-void VpnLogic::onRadioButtonVpnModeAllSitesClicked()
-{
-    m_settings->setRouteMode(Settings::VpnAllSites);
-    onUpdatePage();
-}
-
-void VpnLogic::onRadioButtonVpnModeForwardSitesClicked()
-{
-    m_settings->setRouteMode(Settings::VpnOnlyForwardSites);
-    onUpdatePage();
-}
-
-void VpnLogic::onRadioButtonVpnModeExceptSitesClicked()
-{
-    m_settings->setRouteMode(Settings::VpnAllExceptSites);
-    onUpdatePage();
-}
-
-void VpnLogic::onBytesChanged(quint64 receivedData, quint64 sentData)
-{
-    set_labelSpeedReceivedText(VpnConnection::bytesPerSecToText(receivedData));
-    set_labelSpeedSentText(VpnConnection::bytesPerSecToText(sentData));
-}
-
-void VpnLogic::onConnectionStateChanged(Vpn::ConnectionState state)
-{
-    qDebug() << "VpnLogic::onConnectionStateChanged" << VpnProtocol::textConnectionState(state);
-    if (uiLogic()->m_vpnConnection == NULL) {
-        qDebug() << "VpnLogic::onConnectionStateChanged" << VpnProtocol::textConnectionState(state) << "невозможно, соединение отсутствует (уничтожено ранее)";
-        return;
-    }
-    bool pbConnectEnabled = false;
-    bool pbConnectChecked = false;
-
-    bool rbModeEnabled = false;
-    bool pbConnectVisible = false;
-    set_labelStateText(VpnProtocol::textConnectionState(state));
-
-    switch (state) {
-    case Vpn::ConnectionState::Disconnected:
-        onBytesChanged(0,0);
-        pbConnectChecked = false;
-        pbConnectEnabled = true;
-        pbConnectVisible = true;
-        rbModeEnabled = true;
-        break;
-    case Vpn::ConnectionState::Preparing:
-        pbConnectChecked = true;
-        pbConnectEnabled = false;
-        pbConnectVisible = false;
-        rbModeEnabled = false;
-        break;
-    case Vpn::ConnectionState::Connecting:
-        pbConnectChecked = true;
-        pbConnectEnabled = true;
-        pbConnectVisible = false;
-        rbModeEnabled = false;
-        break;
-    case Vpn::ConnectionState::Connected:
-        pbConnectChecked = true;
-        pbConnectEnabled = true;
-        pbConnectVisible = true;
-        rbModeEnabled = false;
-        break;
-    case Vpn::ConnectionState::Disconnecting:
-        pbConnectChecked = false;
-        pbConnectEnabled = false;
-        pbConnectVisible = false;
-        rbModeEnabled = false;
-        break;
-    case Vpn::ConnectionState::Reconnecting:
-        pbConnectChecked = true;
-        pbConnectEnabled = true;
-        pbConnectVisible = false;
-        rbModeEnabled = false;
-        break;
-    case Vpn::ConnectionState::Error:
-        pbConnectChecked = false;
-        pbConnectEnabled = true;
-        pbConnectVisible = true;
-        rbModeEnabled = true;
-        break;
-    case Vpn::ConnectionState::Unknown:
-        pbConnectChecked = false;
-        pbConnectEnabled = true;
-        pbConnectVisible = true;
-        rbModeEnabled = true;
-    }
-
-    set_pushButtonConnectEnabled(pbConnectEnabled);
-    set_pushButtonConnectChecked(pbConnectChecked);
-
-    set_pushButtonConnectVisible(pbConnectVisible);
-    set_widgetVpnModeEnabled(rbModeEnabled);
-}
-
-void VpnLogic::onVpnProtocolError(ErrorCode errorCode)
-{
-    set_labelErrorText(errorString(errorCode));
-}
-
-void VpnLogic::onPushButtonConnectClicked()
-{
-    if (! pushButtonConnectChecked()) {
-        onConnect();
-    } else {
-        onDisconnect();
-    }
-}
-
-void VpnLogic::onConnect()
-{
-    int serverIndex = m_settings->defaultServerIndex();
-    ServerCredentials credentials = m_settings->serverCredentials(serverIndex);
-    DockerContainer container = m_settings->defaultContainer(serverIndex);
-
-    if (m_settings->containers(serverIndex).isEmpty()) {
-        set_labelErrorText(tr("VPN Protocols is not installed.\n Please install VPN container at first"));
-        set_pushButtonConnectChecked(false);
-        return;
-    }
-
-    if (container == DockerContainer::None) {
-        set_labelErrorText(tr("VPN Protocol not chosen"));
-        set_pushButtonConnectChecked(false);
-        return;
-    }
-
-
-    const QJsonObject &containerConfig = m_settings->containerConfig(serverIndex, container);
-    onConnectWorker(serverIndex, credentials, container, containerConfig);
-}
-
-void VpnLogic::onConnectWorker(int serverIndex, const ServerCredentials &credentials, DockerContainer container, const QJsonObject &containerConfig)
-{
-    set_labelErrorText("");
-    set_pushButtonConnectChecked(true);
-    set_pushButtonConnectEnabled(false);
-
-    qApp->processEvents();
-
-    emit connectToVpn(serverIndex, credentials, container, containerConfig);
-}
-
-void VpnLogic::onDisconnect()
-{
-    onConnectionStateChanged(Vpn::ConnectionState::Disconnected);
-    emit disconnectFromVpn();
-}
diff --git a/client/ui/pages_logic/VpnLogic.h b/client/ui/pages_logic/VpnLogic.h
deleted file mode 100644
index a0f7763b..00000000
--- a/client/ui/pages_logic/VpnLogic.h
+++ /dev/null
@@ -1,70 +0,0 @@
-#ifndef VPN_LOGIC_H
-#define VPN_LOGIC_H
-
-#include "PageLogicBase.h"
-#include "protocols/vpnprotocol.h"
-
-class UiLogic;
-
-class VpnLogic : public PageLogicBase
-{
-    Q_OBJECT
-
-    AUTO_PROPERTY(bool, pushButtonConnectChecked)
-    AUTO_PROPERTY(QString, labelSpeedReceivedText)
-    AUTO_PROPERTY(QString, labelSpeedSentText)
-    AUTO_PROPERTY(QString, labelStateText)
-    AUTO_PROPERTY(QString, labelCurrentServer)
-    AUTO_PROPERTY(QString, labelCurrentService)
-    AUTO_PROPERTY(QString, labelCurrentDns)
-    AUTO_PROPERTY(bool, amneziaDnsEnabled)
-
-    AUTO_PROPERTY(bool, pushButtonConnectEnabled)
-    AUTO_PROPERTY(bool, pushButtonConnectVisible)
-    AUTO_PROPERTY(bool, widgetVpnModeEnabled)
-    AUTO_PROPERTY(bool, isContainerSupportedByCurrentPlatform)
-    AUTO_PROPERTY(bool, isContainerHaveAuthData)
-
-    AUTO_PROPERTY(QString, labelErrorText)
-    AUTO_PROPERTY(QString, labelVersionText)
-
-    AUTO_PROPERTY(bool, isCustomRoutesSupported)
-
-    AUTO_PROPERTY(bool, radioButtonVpnModeAllSitesChecked)
-    AUTO_PROPERTY(bool, radioButtonVpnModeForwardSitesChecked)
-    AUTO_PROPERTY(bool, radioButtonVpnModeExceptSitesChecked)
-
-    AUTO_PROPERTY(bool, labelLogEnabledVisible)
-
-public:
-    Q_INVOKABLE void onUpdatePage() override;
-
-    Q_INVOKABLE void onRadioButtonVpnModeAllSitesClicked();
-    Q_INVOKABLE void onRadioButtonVpnModeForwardSitesClicked();
-    Q_INVOKABLE void onRadioButtonVpnModeExceptSitesClicked();
-
-    Q_INVOKABLE void onPushButtonConnectClicked();
-
-public:
-    explicit VpnLogic(UiLogic *uiLogic, QObject *parent = nullptr);
-    ~VpnLogic() = default;
-
-    bool getPushButtonConnectChecked() const;
-    void setPushButtonConnectChecked(bool pushButtonConnectChecked);
-
-public slots:
-    void onConnect();
-    void onConnectWorker(int serverIndex, const ServerCredentials &credentials, DockerContainer container, const QJsonObject &containerConfig);
-    void onDisconnect();
-
-    void onBytesChanged(quint64 receivedBytes, quint64 sentBytes);
-    void onConnectionStateChanged(Vpn::ConnectionState state);
-    void onVpnProtocolError(amnezia::ErrorCode errorCode);
-
-signals:
-    void connectToVpn(int serverIndex,
-        const ServerCredentials &credentials, DockerContainer container, const QJsonObject &containerConfig);
-
-    void disconnectFromVpn();
-};
-#endif // VPN_LOGIC_H
diff --git a/client/ui/pages_logic/WizardLogic.cpp b/client/ui/pages_logic/WizardLogic.cpp
deleted file mode 100644
index 23a20aed..00000000
--- a/client/ui/pages_logic/WizardLogic.cpp
+++ /dev/null
@@ -1,70 +0,0 @@
-#include "WizardLogic.h"
-#include "../uilogic.h"
-
-WizardLogic::WizardLogic(UiLogic *logic, QObject *parent):
-    PageLogicBase(logic, parent),
-    m_radioButtonHighChecked{false},
-    m_radioButtonMediumChecked{true},
-    m_radioButtonLowChecked{false},
-    m_lineEditHighWebsiteMaskingText{},
-    m_checkBoxVpnModeChecked{false}
-{
-
-}
-
-void WizardLogic::onUpdatePage()
-{
-    set_lineEditHighWebsiteMaskingText(protocols::cloak::defaultRedirSite);
-    set_radioButtonMediumChecked(true);
-}
-
-QPair<DockerContainer, QJsonObject> WizardLogic::getInstallConfigsFromWizardPage() const
-{
-    QJsonObject cloakConfig {
-        { config_key::container, ContainerProps::containerToString(DockerContainer::Cloak) },
-        { ProtocolProps::protoToString(Proto::Cloak), QJsonObject {
-                { config_key::site, lineEditHighWebsiteMaskingText() }}
-        }
-    };
-    QJsonObject ssConfig {
-        { config_key::container, ContainerProps::containerToString(DockerContainer::ShadowSocks) }
-    };
-    QJsonObject openVpnConfig {
-        { config_key::container, ContainerProps::containerToString(DockerContainer::OpenVpn) }
-    };
-
-    QPair<DockerContainer, QJsonObject> container;
-
-    DockerContainer dockerContainer;
-
-    if (radioButtonHighChecked()) {
-        container = {DockerContainer::Cloak, cloakConfig};
-    }
-
-    if (radioButtonMediumChecked()) {
-        container = {DockerContainer::ShadowSocks, ssConfig};
-    }
-
-    if (radioButtonLowChecked()) {
-        container = {DockerContainer::OpenVpn, openVpnConfig};
-    }
-
-    return container;
-}
-
-void WizardLogic::onPushButtonVpnModeFinishClicked()
-{
-    auto container = getInstallConfigsFromWizardPage();
-    uiLogic()->installServer(container);
-    if (checkBoxVpnModeChecked()) {
-        m_settings->setRouteMode(Settings::VpnOnlyForwardSites);
-    } else {
-        m_settings->setRouteMode(Settings::VpnAllSites);
-    }
-}
-
-void WizardLogic::onPushButtonLowFinishClicked()
-{
-    auto container = getInstallConfigsFromWizardPage();
-    uiLogic()->installServer(container);
-}
diff --git a/client/ui/pages_logic/WizardLogic.h b/client/ui/pages_logic/WizardLogic.h
deleted file mode 100644
index a2e45af7..00000000
--- a/client/ui/pages_logic/WizardLogic.h
+++ /dev/null
@@ -1,31 +0,0 @@
-#ifndef WIZARD_LOGIC_H
-#define WIZARD_LOGIC_H
-
-#include "PageLogicBase.h"
-#include "containers/containers_defs.h"
-
-class UiLogic;
-
-class WizardLogic : public PageLogicBase
-{
-    Q_OBJECT
-
-    AUTO_PROPERTY(bool, radioButtonHighChecked)
-    AUTO_PROPERTY(bool, radioButtonMediumChecked)
-    AUTO_PROPERTY(bool, radioButtonLowChecked)
-    AUTO_PROPERTY(bool, checkBoxVpnModeChecked)
-    AUTO_PROPERTY(QString, lineEditHighWebsiteMaskingText)
-
-public:
-    Q_INVOKABLE void onUpdatePage() override;
-    Q_INVOKABLE void onPushButtonVpnModeFinishClicked();
-    Q_INVOKABLE void onPushButtonLowFinishClicked();
-
-public:
-    explicit WizardLogic(UiLogic *uiLogic, QObject *parent = nullptr);
-    ~WizardLogic() = default;
-
-    QPair<DockerContainer, QJsonObject> getInstallConfigsFromWizardPage() const;
-
-};
-#endif // WIZARD_LOGIC_H
diff --git a/client/ui/pages_logic/protocols/CloakLogic.cpp b/client/ui/pages_logic/protocols/CloakLogic.cpp
deleted file mode 100644
index 0062d12d..00000000
--- a/client/ui/pages_logic/protocols/CloakLogic.cpp
+++ /dev/null
@@ -1,137 +0,0 @@
-#include "CloakLogic.h"
-
-#include <functional>
-
-#include "core/servercontroller.h"
-#include "ui/uilogic.h"
-#include "ui/pages_logic/ServerConfiguringProgressLogic.h"
-
-using namespace amnezia;
-using namespace PageEnumNS;
-
-CloakLogic::CloakLogic(UiLogic *logic, QObject *parent):
-    PageProtocolLogicBase(logic, parent),
-    m_comboBoxCipherText{"chacha20-poly1305"},
-    m_lineEditSiteText{"tile.openstreetmap.org"},
-    m_lineEditPortText{},
-    m_pushButtonSaveVisible{false},
-    m_progressBarResetVisible{false},
-    m_lineEditPortEnabled{false},
-    m_pageEnabled{true},
-    m_labelInfoVisible{true},
-    m_labelInfoText{},
-    m_progressBarResetValue{0},
-    m_progressBarResetMaximum{100}
-{
-
-}
-
-void CloakLogic::updateProtocolPage(const QJsonObject &ckConfig, DockerContainer container, bool haveAuthData)
-{
-    set_pageEnabled(haveAuthData);
-    set_pushButtonSaveVisible(haveAuthData);
-    set_progressBarResetVisible(haveAuthData);
-
-    set_comboBoxCipherText(ckConfig.value(config_key::cipher).
-                                    toString(protocols::cloak::defaultCipher));
-
-    set_lineEditSiteText(ckConfig.value(config_key::site).
-                                  toString(protocols::cloak::defaultRedirSite));
-
-    set_lineEditPortText(ckConfig.value(config_key::port).
-                                  toString(protocols::cloak::defaultPort));
-
-    set_lineEditPortEnabled(container == DockerContainer::Cloak);
-}
-
-QJsonObject CloakLogic::getProtocolConfigFromPage(QJsonObject oldConfig)
-{
-    oldConfig.insert(config_key::cipher, comboBoxCipherText());
-    oldConfig.insert(config_key::site, lineEditSiteText());
-    oldConfig.insert(config_key::port, lineEditPortText());
-
-    return oldConfig;
-}
-
-void CloakLogic::onPushButtonSaveClicked()
-{
-    QJsonObject protocolConfig = m_settings->protocolConfig(uiLogic()->m_selectedServerIndex, uiLogic()->m_selectedDockerContainer, Proto::Cloak);
-    protocolConfig = getProtocolConfigFromPage(protocolConfig);
-
-    QJsonObject containerConfig = m_settings->containerConfig(uiLogic()->m_selectedServerIndex, uiLogic()->m_selectedDockerContainer);
-    QJsonObject newContainerConfig = containerConfig;
-    newContainerConfig.insert(ProtocolProps::protoToString(Proto::Cloak), protocolConfig);
-
-    ServerConfiguringProgressLogic::PageFunc pageFunc;
-    pageFunc.setEnabledFunc = [this] (bool enabled) -> void {
-        set_pageEnabled(enabled);
-    };
-    ServerConfiguringProgressLogic::ButtonFunc saveButtonFunc;
-    saveButtonFunc.setVisibleFunc = [this] (bool visible) -> void {
-        set_pushButtonSaveVisible(visible);
-    };
-    ServerConfiguringProgressLogic::LabelFunc waitInfoFunc;
-    waitInfoFunc.setVisibleFunc = [this] (bool visible) -> void {
-        set_labelInfoVisible(visible);
-    };
-    waitInfoFunc.setTextFunc = [this] (const QString& text) -> void {
-        set_labelInfoText(text);
-    };
-    ServerConfiguringProgressLogic::ProgressFunc progressBarFunc;
-    progressBarFunc.setVisibleFunc = [this] (bool visible) -> void {
-        set_progressBarResetVisible(visible);
-    };
-    progressBarFunc.setValueFunc = [this] (int value) -> void {
-        set_progressBarResetValue(value);
-    };
-    progressBarFunc.getValueFunc = [this] (void) -> int {
-        return progressBarResetValue();
-    };
-    progressBarFunc.getMaximumFunc = [this] (void) -> int {
-        return progressBarResetMaximum();
-    };
-    progressBarFunc.setTextVisibleFunc = [this] (bool visible) -> void {
-        set_progressBarTextVisible(visible);
-    };
-    progressBarFunc.setTextFunc = [this] (const QString& text) -> void {
-        set_progressBarText(text);
-    };
-
-    ServerConfiguringProgressLogic::LabelFunc busyInfoFuncy;
-    busyInfoFuncy.setTextFunc = [this] (const QString& text) -> void {
-        set_labelServerBusyText(text);
-    };
-    busyInfoFuncy.setVisibleFunc = [this] (bool visible) -> void {
-        set_labelServerBusyVisible(visible);
-    };
-
-    ServerConfiguringProgressLogic::ButtonFunc cancelButtonFunc;
-    cancelButtonFunc.setVisibleFunc = [this] (bool visible) -> void {
-        set_pushButtonCancelVisible(visible);
-    };
-
-    progressBarFunc.setTextVisibleFunc(true);
-    progressBarFunc.setTextFunc(QString("Configuring..."));
-
-    auto installAction = [this, containerConfig, &newContainerConfig]() {
-        ServerController serverController(m_settings);
-        return serverController.updateContainer(m_settings->serverCredentials(uiLogic()->m_selectedServerIndex),
-                                                   uiLogic()->m_selectedDockerContainer, containerConfig, newContainerConfig);
-    };
-
-    ErrorCode e = uiLogic()->pageLogic<ServerConfiguringProgressLogic>()->doInstallAction(installAction, pageFunc, progressBarFunc,
-                                                                                          saveButtonFunc, waitInfoFunc,
-                                                                                          busyInfoFuncy, cancelButtonFunc);
-
-    if (!e) {
-        m_settings->setContainerConfig(uiLogic()->m_selectedServerIndex, uiLogic()->m_selectedDockerContainer, newContainerConfig);
-        m_settings->clearLastConnectionConfig(uiLogic()->m_selectedServerIndex, uiLogic()->m_selectedDockerContainer);
-    }
-
-    qDebug() << "Protocol saved with code:" << e << "for" << uiLogic()->m_selectedServerIndex << uiLogic()->m_selectedDockerContainer;
-}
-
-void CloakLogic::onPushButtonCancelClicked()
-{
-    emit uiLogic()->pageLogic<ServerConfiguringProgressLogic>()->cancelDoInstallAction(true);
-}
diff --git a/client/ui/pages_logic/protocols/CloakLogic.h b/client/ui/pages_logic/protocols/CloakLogic.h
deleted file mode 100644
index c135a621..00000000
--- a/client/ui/pages_logic/protocols/CloakLogic.h
+++ /dev/null
@@ -1,46 +0,0 @@
-#ifndef CLOAK_LOGIC_H
-#define CLOAK_LOGIC_H
-
-#include "PageProtocolLogicBase.h"
-
-class UiLogic;
-
-class CloakLogic : public PageProtocolLogicBase
-{
-    Q_OBJECT
-
-    AUTO_PROPERTY(QString, comboBoxCipherText)
-    AUTO_PROPERTY(QString, lineEditSiteText)
-    AUTO_PROPERTY(QString, lineEditPortText)
-    AUTO_PROPERTY(bool, pushButtonSaveVisible)
-    AUTO_PROPERTY(bool, progressBarResetVisible)
-    AUTO_PROPERTY(bool, lineEditPortEnabled)
-    AUTO_PROPERTY(bool, pageEnabled)
-    AUTO_PROPERTY(bool, labelInfoVisible)
-    AUTO_PROPERTY(QString, labelInfoText)
-    AUTO_PROPERTY(int, progressBarResetValue)
-    AUTO_PROPERTY(int, progressBarResetMaximum)
-    AUTO_PROPERTY(bool, progressBarTextVisible)
-    AUTO_PROPERTY(QString, progressBarText)
-
-    AUTO_PROPERTY(bool, labelServerBusyVisible)
-    AUTO_PROPERTY(QString, labelServerBusyText)
-
-    AUTO_PROPERTY(bool, pushButtonCancelVisible)
-
-public:
-    Q_INVOKABLE void onPushButtonSaveClicked();
-    Q_INVOKABLE void onPushButtonCancelClicked();
-
-public:
-    explicit CloakLogic(UiLogic *uiLogic, QObject *parent = nullptr);
-    ~CloakLogic() = default;
-
-    void updateProtocolPage(const QJsonObject &ckConfig, DockerContainer container, bool haveAuthData) override;
-    QJsonObject getProtocolConfigFromPage(QJsonObject oldConfig) override;
-
-private:
-    UiLogic *m_uiLogic;
-
-};
-#endif // CLOAK_LOGIC_H
diff --git a/client/ui/pages_logic/protocols/OpenVpnLogic.cpp b/client/ui/pages_logic/protocols/OpenVpnLogic.cpp
deleted file mode 100644
index 2eb68ed9..00000000
--- a/client/ui/pages_logic/protocols/OpenVpnLogic.cpp
+++ /dev/null
@@ -1,203 +0,0 @@
-#include "OpenVpnLogic.h"
-
-#include <functional>
-
-#include "core/servercontroller.h"
-#include "ui/uilogic.h"
-#include "ui/pages_logic/ServerConfiguringProgressLogic.h"
-
-using namespace amnezia;
-using namespace PageEnumNS;
-
-OpenVpnLogic::OpenVpnLogic(UiLogic *logic, QObject *parent):
-    PageProtocolLogicBase(logic, parent),
-    m_lineEditSubnetText{""},
-
-    m_radioButtonTcpEnabled{true},
-    m_radioButtonTcpChecked{false},
-    m_radioButtonUdpEnabled{true},
-    m_radioButtonUdpChecked{false},
-
-    m_checkBoxAutoEncryptionChecked{},
-    m_comboBoxVpnCipherText{"AES-256-GCM"},
-    m_comboBoxVpnHashText{"SHA512"},
-    m_checkBoxBlockDnsChecked{false},
-    m_lineEditPortText{},
-    m_checkBoxTlsAuthChecked{false},
-    m_textAreaAdditionalClientConfig{""},
-    m_textAreaAdditionalServerConfig{""},
-    m_pushButtonSaveVisible{false},
-    m_progressBarResetVisible{false},
-
-    m_lineEditPortEnabled{false},
-    m_labelProtoOpenVpnInfoVisible{true},
-    m_labelProtoOpenVpnInfoText{},
-    m_progressBarResetValue{0},
-    m_progressBarResetMaximum{100}
-{
-
-}
-
-void OpenVpnLogic::updateProtocolPage(const QJsonObject &openvpnConfig, DockerContainer container, bool haveAuthData)
-{
-    qDebug() << "OpenVpnLogic::updateProtocolPage";
-    set_pageEnabled(haveAuthData);
-    set_pushButtonSaveVisible(haveAuthData);
-    set_progressBarResetVisible(haveAuthData);
-
-    set_radioButtonUdpEnabled(true);
-    set_radioButtonTcpEnabled(true);
-
-    set_lineEditSubnetText(openvpnConfig.value(config_key::subnet_address).
-                                      toString(protocols::openvpn::defaultSubnetAddress));
-
-    QString transport;
-    if (container == DockerContainer::ShadowSocks || container == DockerContainer::Cloak) {
-        transport = "tcp";
-        set_radioButtonUdpEnabled(false);
-        set_radioButtonTcpEnabled(false);
-    } else {
-        transport = openvpnConfig.value(config_key::transport_proto).
-                toString(protocols::openvpn::defaultTransportProto);
-    }
-    set_radioButtonUdpChecked(transport == protocols::openvpn::defaultTransportProto);
-    set_radioButtonTcpChecked(transport != protocols::openvpn::defaultTransportProto);
-
-    set_comboBoxVpnCipherText(openvpnConfig.value(config_key::cipher).
-                                      toString(protocols::openvpn::defaultCipher));
-
-    set_comboBoxVpnHashText(openvpnConfig.value(config_key::hash).
-                                    toString(protocols::openvpn::defaultHash));
-
-    bool blockOutsideDns = openvpnConfig.value(config_key::block_outside_dns).toBool(protocols::openvpn::defaultBlockOutsideDns);
-    set_checkBoxBlockDnsChecked(blockOutsideDns);
-
-    bool isNcpDisabled = openvpnConfig.value(config_key::ncp_disable).toBool(protocols::openvpn::defaultNcpDisable);
-    set_checkBoxAutoEncryptionChecked(!isNcpDisabled);
-
-    bool isTlsAuth = openvpnConfig.value(config_key::tls_auth).toBool(protocols::openvpn::defaultTlsAuth);
-    set_checkBoxTlsAuthChecked(isTlsAuth);
-
-    QString additionalClientConfig = openvpnConfig.value(config_key::additional_client_config).
-            toString(protocols::openvpn::defaultAdditionalClientConfig);
-    set_textAreaAdditionalClientConfig(additionalClientConfig);
-
-    QString additionalServerConfig = openvpnConfig.value(config_key::additional_server_config).
-            toString(protocols::openvpn::defaultAdditionalServerConfig);
-    set_textAreaAdditionalServerConfig(additionalServerConfig);
-
-    set_lineEditPortText(openvpnConfig.value(config_key::port).
-                                    toString(protocols::openvpn::defaultPort));
-
-    set_lineEditPortEnabled(container == DockerContainer::OpenVpn);
-
-    auto lastConfig = openvpnConfig.value(config_key::last_config).toString();
-    auto lastConfigJson = QJsonDocument::fromJson(lastConfig.toUtf8()).object();
-    QStringList lines = lastConfigJson.value(config_key::config).toString().replace("\r", "").split("\n");
-    QString openVpnLastConfigText;
-    for (const QString &l: lines) {
-            openVpnLastConfigText.append(l + "\n");
-    }
-
-    set_openVpnLastConfigText(openVpnLastConfigText);
-    set_isThirdPartyConfig(openvpnConfig.value(config_key::isThirdPartyConfig).isBool());
-}
-
-void OpenVpnLogic::onPushButtonSaveClicked()
-{
-    QJsonObject protocolConfig = m_settings->protocolConfig(uiLogic()->m_selectedServerIndex, uiLogic()->m_selectedDockerContainer, Proto::OpenVpn);
-    protocolConfig = getProtocolConfigFromPage(protocolConfig);
-
-    QJsonObject containerConfig = m_settings->containerConfig(uiLogic()->m_selectedServerIndex, uiLogic()->m_selectedDockerContainer);
-    QJsonObject newContainerConfig = containerConfig;
-    newContainerConfig.insert(ProtocolProps::protoToString(Proto::OpenVpn), protocolConfig);
-
-    ServerConfiguringProgressLogic::PageFunc pageFunc;
-    pageFunc.setEnabledFunc = [this] (bool enabled) -> void {
-        set_pageEnabled(enabled);
-    };
-    ServerConfiguringProgressLogic::ButtonFunc saveButtonFunc;
-    saveButtonFunc.setVisibleFunc = [this] (bool visible) -> void {
-        set_pushButtonSaveVisible(visible);
-    };
-    ServerConfiguringProgressLogic::LabelFunc waitInfoFunc;
-    waitInfoFunc.setVisibleFunc = [this] (bool visible) -> void {
-        set_labelProtoOpenVpnInfoVisible(visible);
-    };
-    waitInfoFunc.setTextFunc = [this] (const QString& text) -> void {
-        set_labelProtoOpenVpnInfoText(text);
-    };
-    ServerConfiguringProgressLogic::ProgressFunc progressBarFunc;
-    progressBarFunc.setVisibleFunc = [this] (bool visible) -> void {
-        set_progressBarResetVisible(visible);
-    };
-    progressBarFunc.setValueFunc = [this] (int value) -> void {
-        set_progressBarResetValue(value);
-    };
-    progressBarFunc.getValueFunc = [this] (void) -> int {
-        return progressBarResetValue();
-    };
-    progressBarFunc.getMaximumFunc = [this] (void) -> int {
-        return progressBarResetMaximum();
-    };
-    progressBarFunc.setTextVisibleFunc = [this] (bool visible) -> void {
-        set_progressBarTextVisible(visible);
-    };
-    progressBarFunc.setTextFunc = [this] (const QString& text) -> void {
-        set_progressBarText(text);
-    };
-
-    ServerConfiguringProgressLogic::LabelFunc busyInfoFuncy;
-    busyInfoFuncy.setTextFunc = [this] (const QString& text) -> void {
-        set_labelServerBusyText(text);
-    };
-    busyInfoFuncy.setVisibleFunc = [this] (bool visible) -> void {
-        set_labelServerBusyVisible(visible);
-    };
-
-    ServerConfiguringProgressLogic::ButtonFunc cancelButtonFunc;
-    cancelButtonFunc.setVisibleFunc = [this] (bool visible) -> void {
-        set_pushButtonCancelVisible(visible);
-    };
-
-    progressBarFunc.setTextVisibleFunc(true);
-    progressBarFunc.setTextFunc(QString("Configuring..."));
-
-    auto installAction = [this, containerConfig, &newContainerConfig]() {
-        ServerController serverController(m_settings);
-        return serverController.updateContainer(m_settings->serverCredentials(uiLogic()->m_selectedServerIndex),
-                                                   uiLogic()->m_selectedDockerContainer, containerConfig, newContainerConfig);
-    };
-
-    ErrorCode e = uiLogic()->pageLogic<ServerConfiguringProgressLogic>()->doInstallAction(installAction, pageFunc, progressBarFunc,
-                                                                                          saveButtonFunc, waitInfoFunc,
-                                                                                          busyInfoFuncy, cancelButtonFunc);
-
-    if (!e) {
-        m_settings->setContainerConfig(uiLogic()->m_selectedServerIndex, uiLogic()->m_selectedDockerContainer, newContainerConfig);
-        m_settings->clearLastConnectionConfig(uiLogic()->m_selectedServerIndex, uiLogic()->m_selectedDockerContainer);
-    }
-    qDebug() << "Protocol saved with code:" << e << "for" << uiLogic()->m_selectedServerIndex << uiLogic()->m_selectedDockerContainer;
-}
-
-QJsonObject OpenVpnLogic::getProtocolConfigFromPage(QJsonObject oldConfig)
-{
-    oldConfig.insert(config_key::subnet_address, lineEditSubnetText());
-    oldConfig.insert(config_key::transport_proto,
-        ProtocolProps::transportProtoToString(radioButtonUdpChecked() ? ProtocolEnumNS::Udp : ProtocolEnumNS::Tcp));
-
-    oldConfig.insert(config_key::ncp_disable, ! checkBoxAutoEncryptionChecked());
-    oldConfig.insert(config_key::cipher, comboBoxVpnCipherText());
-    oldConfig.insert(config_key::hash, comboBoxVpnHashText());
-    oldConfig.insert(config_key::block_outside_dns, checkBoxBlockDnsChecked());
-    oldConfig.insert(config_key::port, lineEditPortText());
-    oldConfig.insert(config_key::tls_auth, checkBoxTlsAuthChecked());
-    oldConfig.insert(config_key::additional_client_config, textAreaAdditionalClientConfig());
-    oldConfig.insert(config_key::additional_server_config, textAreaAdditionalServerConfig());
-    return oldConfig;
-}
-
-void OpenVpnLogic::onPushButtonCancelClicked()
-{
-    emit uiLogic()->pageLogic<ServerConfiguringProgressLogic>()->cancelDoInstallAction(true);
-}
diff --git a/client/ui/pages_logic/protocols/OpenVpnLogic.h b/client/ui/pages_logic/protocols/OpenVpnLogic.h
deleted file mode 100644
index db7d3baf..00000000
--- a/client/ui/pages_logic/protocols/OpenVpnLogic.h
+++ /dev/null
@@ -1,63 +0,0 @@
-#ifndef OPENVPN_LOGIC_H
-#define OPENVPN_LOGIC_H
-
-#include "PageProtocolLogicBase.h"
-
-class UiLogic;
-
-class OpenVpnLogic : public PageProtocolLogicBase
-{
-    Q_OBJECT
-
-    AUTO_PROPERTY(QString, lineEditSubnetText)
-
-    AUTO_PROPERTY(bool, radioButtonTcpEnabled)
-    AUTO_PROPERTY(bool, radioButtonUdpEnabled)
-    AUTO_PROPERTY(bool, radioButtonTcpChecked)
-    AUTO_PROPERTY(bool, radioButtonUdpChecked)
-
-    AUTO_PROPERTY(bool, checkBoxAutoEncryptionChecked)
-    AUTO_PROPERTY(QString, comboBoxVpnCipherText)
-    AUTO_PROPERTY(QString, comboBoxVpnHashText)
-    AUTO_PROPERTY(bool, checkBoxBlockDnsChecked)
-    AUTO_PROPERTY(QString, lineEditPortText)
-    AUTO_PROPERTY(bool, checkBoxTlsAuthChecked)
-    AUTO_PROPERTY(QString, textAreaAdditionalClientConfig)
-    AUTO_PROPERTY(QString, textAreaAdditionalServerConfig)
-
-    AUTO_PROPERTY(bool, pushButtonSaveVisible)
-    AUTO_PROPERTY(bool, progressBarResetVisible)
-
-    AUTO_PROPERTY(bool, lineEditPortEnabled)
-
-    AUTO_PROPERTY(bool, labelProtoOpenVpnInfoVisible)
-    AUTO_PROPERTY(QString, labelProtoOpenVpnInfoText)
-    AUTO_PROPERTY(int, progressBarResetValue)
-    AUTO_PROPERTY(int, progressBarResetMaximum)
-    AUTO_PROPERTY(bool, progressBarTextVisible)
-    AUTO_PROPERTY(QString, progressBarText)
-
-    AUTO_PROPERTY(bool, labelServerBusyVisible)
-    AUTO_PROPERTY(QString, labelServerBusyText)
-
-    AUTO_PROPERTY(bool, pushButtonCancelVisible)
-
-    AUTO_PROPERTY(QString, openVpnLastConfigText)
-    AUTO_PROPERTY(bool, isThirdPartyConfig)
-
-public:
-    Q_INVOKABLE void onPushButtonSaveClicked();
-    Q_INVOKABLE void onPushButtonCancelClicked();
-
-public:
-    explicit OpenVpnLogic(UiLogic *uiLogic, QObject *parent = nullptr);
-    ~OpenVpnLogic() = default;
-
-    void updateProtocolPage(const QJsonObject &openvpnConfig, DockerContainer container, bool haveAuthData) override;
-    QJsonObject getProtocolConfigFromPage(QJsonObject oldConfig) override;
-
-private:
-    UiLogic *m_uiLogic;
-
-};
-#endif // OPENVPN_LOGIC_H
diff --git a/client/ui/pages_logic/protocols/OtherProtocolsLogic.cpp b/client/ui/pages_logic/protocols/OtherProtocolsLogic.cpp
deleted file mode 100644
index 965a3baf..00000000
--- a/client/ui/pages_logic/protocols/OtherProtocolsLogic.cpp
+++ /dev/null
@@ -1,169 +0,0 @@
-#include <QDesktopServices>
-#include <QTimer>
-#include <QProcess>
-#include <QStorageInfo>
-#include <QStandardPaths>
-
-#include "OtherProtocolsLogic.h"
-#include <functional>
-#include "../../uilogic.h"
-#include "utilities.h"
-
-#ifdef Q_OS_WINDOWS
-#include <Windows.h>
-#endif
-
-using namespace amnezia;
-using namespace PageEnumNS;
-
-OtherProtocolsLogic::OtherProtocolsLogic(UiLogic *logic, QObject *parent):
-    PageProtocolLogicBase(logic, parent),
-    m_checkBoxSftpRestoreChecked{false}
-
-{
-
-}
-
-OtherProtocolsLogic::~OtherProtocolsLogic()
-{
-#ifdef Q_OS_WINDOWS
-    for (QProcess *p: m_sftpMountProcesses) {
-        if (p) Utils::signalCtrl(p->processId(), CTRL_C_EVENT);
-        if (p) p->kill();
-        if (p) p->waitForFinished();
-        if (p) delete p;
-    }
-#endif
-}
-
-void OtherProtocolsLogic::updateProtocolPage(const QJsonObject &config, DockerContainer container, bool haveAuthData)
-{
-    set_labelTftpUserNameText(config.value(config_key::userName).toString());
-    set_labelTftpPasswordText(config.value(config_key::password).toString(protocols::sftp::defaultUserName));
-    set_labelTftpPortText(config.value(config_key::port).toString());
-
-    set_labelTorWebSiteAddressText(config.value(config_key::site).toString());
-    set_pushButtonSftpMountEnabled(true);
-}
-
-#ifdef Q_OS_WINDOWS
-QString OtherProtocolsLogic::getNextDriverLetter() const
-{
-    QProcess drivesProc;
-    drivesProc.start("wmic logicaldisk get caption");
-    drivesProc.waitForFinished();
-    QString drives = drivesProc.readAll();
-    qDebug() << drives;
-
-
-    QString letters = "CFGHIJKLMNOPQRSTUVWXYZ";
-    QString letter;
-    for (int i = letters.size() - 1; i > 0; i--) {
-        letter = letters.at(i);
-        if (!drives.contains(letter + ":")) break;
-    }
-    if (letter == "C:") {
-        // set err info
-        qDebug() << "Can't find free drive letter";
-        return "";
-    }
-    return letter;
-}
-#endif
-
-//QJsonObject OtherProtocolsLogic::getProtocolConfigFromPage(QJsonObject oldConfig)
-//{
-
-//}
-
-
-void OtherProtocolsLogic::onPushButtonSftpMountDriveClicked()
-{
-    QString mountPath;
-    QString cmd;
-    QString host = m_settings->serverCredentials(uiLogic()->m_selectedServerIndex).hostName;
-
-
-#ifdef Q_OS_WINDOWS
-    mountPath = getNextDriverLetter() + ":";
-    //    QString cmd = QString("net use \\\\sshfs\\%1@x.x.x.x!%2 /USER:%1 %3")
-    //            .arg(labelTftpUserNameText())
-    //            .arg(labelTftpPortText())
-    //            .arg(labelTftpPasswordText());
-
-    cmd = "C:\\Program Files\\SSHFS-Win\\bin\\sshfs.exe";
-#elif defined AMNEZIA_DESKTOP
-    mountPath = QString("%1/sftp:%2:%3")
-            .arg(QStandardPaths::writableLocation(QStandardPaths::HomeLocation))
-            .arg(host)
-            .arg(labelTftpPortText());
-    QDir dir(mountPath);
-    if (!dir.exists()){
-      dir.mkpath(mountPath);
-    }
-
-    cmd = "/usr/local/bin/sshfs";
-#endif
-
-#ifdef AMNEZIA_DESKTOP
-    set_pushButtonSftpMountEnabled(false);
-    QProcess *p = new QProcess;
-    m_sftpMountProcesses.append(p);
-    p->setProcessChannelMode(QProcess::MergedChannels);
-
-    connect(p, &QProcess::readyRead, this, [this, p, mountPath](){
-        QString s = p->readAll();
-        if (s.contains("The service sshfs has been started")) {
-            QDesktopServices::openUrl(QUrl("file:///" + mountPath));
-            set_pushButtonSftpMountEnabled(true);
-        }
-        qDebug() << s;
-    });
-
-
-
-    p->setProgram(cmd);
-
-    QString args = QString(
-                        "%1@%2:/ %3 "
-                        "-o port=%4 "
-                        "-f "
-                        "-o reconnect "
-                        "-o rellinks "
-                        "-o fstypename=SSHFS "
-                        "-o ssh_command=/usr/bin/ssh.exe "
-                        "-o UserKnownHostsFile=/dev/null "
-                        "-o StrictHostKeyChecking=no "
-                        "-o password_stdin")
-            .arg(labelTftpUserNameText())
-            .arg(host)
-            .arg(mountPath)
-            .arg(labelTftpPortText());
-
-
-//    args.replace("\n", " ");
-//    args.replace("\r", " ");
-//#ifndef Q_OS_WIN
-//    args.replace("reconnect-orellinks", "");
-//#endif
-    p->setArguments(args.split(" ", Qt::SkipEmptyParts));
-    p->start();
-    p->waitForStarted(50);
-    if (p->state() != QProcess::Running) {
-        qDebug() << "onPushButtonSftpMountDriveClicked process not started";
-        qDebug() << args;
-    }
-    else {
-        p->write((labelTftpPasswordText() + "\n").toUtf8());
-    }
-
-    //qDebug().noquote() << "onPushButtonSftpMountDriveClicked" << args;
-
-    set_pushButtonSftpMountEnabled(true);
-#endif
-}
-
-void OtherProtocolsLogic::checkBoxSftpRestoreClicked()
-{
-
-}
diff --git a/client/ui/pages_logic/protocols/OtherProtocolsLogic.h b/client/ui/pages_logic/protocols/OtherProtocolsLogic.h
deleted file mode 100644
index 508c2914..00000000
--- a/client/ui/pages_logic/protocols/OtherProtocolsLogic.h
+++ /dev/null
@@ -1,45 +0,0 @@
-#ifndef OTHER_PROTOCOLS_LOGIC_H
-#define OTHER_PROTOCOLS_LOGIC_H
-
-#include "PageProtocolLogicBase.h"
-
-#include <QProcess>
-
-class UiLogic;
-
-class OtherProtocolsLogic : public PageProtocolLogicBase
-{
-    Q_OBJECT
-
-    AUTO_PROPERTY(QString, labelTftpUserNameText)
-    AUTO_PROPERTY(QString, labelTftpPasswordText)
-    AUTO_PROPERTY(QString, labelTftpPortText)
-    AUTO_PROPERTY(bool, pushButtonSftpMountEnabled)
-    AUTO_PROPERTY(bool, checkBoxSftpRestoreChecked)
-
-    AUTO_PROPERTY(QString, labelTorWebSiteAddressText)
-
-
-public:
-    Q_INVOKABLE void onPushButtonSftpMountDriveClicked();
-    Q_INVOKABLE void checkBoxSftpRestoreClicked();
-public:
-    explicit OtherProtocolsLogic(UiLogic *uiLogic, QObject *parent = nullptr);
-    ~OtherProtocolsLogic();
-
-    void updateProtocolPage(const QJsonObject &config, DockerContainer container, bool haveAuthData) override;
-    //QJsonObject getProtocolConfigFromPage(QJsonObject oldConfig) override;
-
-private:
-    UiLogic *m_uiLogic;
-
-#ifdef AMNEZIA_DESKTOP
-    QList <QProcess *> m_sftpMountProcesses;
-#endif
-
-#ifdef Q_OS_WINDOWS
-    QString getNextDriverLetter() const;
-#endif
-
-};
-#endif // OTHER_PROTOCOLS_LOGIC_H
diff --git a/client/ui/pages_logic/protocols/PageProtocolLogicBase.cpp b/client/ui/pages_logic/protocols/PageProtocolLogicBase.cpp
deleted file mode 100644
index 62c5aa89..00000000
--- a/client/ui/pages_logic/protocols/PageProtocolLogicBase.cpp
+++ /dev/null
@@ -1,8 +0,0 @@
-#include "PageProtocolLogicBase.h"
-
-
-PageProtocolLogicBase::PageProtocolLogicBase(UiLogic *logic, QObject *parent):
-    PageLogicBase(logic, parent)
-{
-
-}
diff --git a/client/ui/pages_logic/protocols/PageProtocolLogicBase.h b/client/ui/pages_logic/protocols/PageProtocolLogicBase.h
deleted file mode 100644
index ab66f8a9..00000000
--- a/client/ui/pages_logic/protocols/PageProtocolLogicBase.h
+++ /dev/null
@@ -1,24 +0,0 @@
-#ifndef PAGE_PROTOCOL_LOGIC_BASE_H
-#define PAGE_PROTOCOL_LOGIC_BASE_H
-
-#include "settings.h"
-#include "../PageLogicBase.h"
-
-using namespace amnezia;
-using namespace PageEnumNS;
-
-class UiLogic;
-
-class PageProtocolLogicBase : public PageLogicBase
-{
-    Q_OBJECT
-
-public:
-    explicit PageProtocolLogicBase(UiLogic *uiLogic, QObject *parent = nullptr);
-    ~PageProtocolLogicBase() = default;
-
-    virtual void updateProtocolPage(const QJsonObject &config, DockerContainer container, bool haveAuthData) {}
-    virtual QJsonObject getProtocolConfigFromPage(QJsonObject oldConfig) { return QJsonObject(); }
-
-};
-#endif // PAGE_PROTOCOL_LOGIC_BASE_H
diff --git a/client/ui/pages_logic/protocols/ShadowSocksLogic.cpp b/client/ui/pages_logic/protocols/ShadowSocksLogic.cpp
deleted file mode 100644
index f9220a92..00000000
--- a/client/ui/pages_logic/protocols/ShadowSocksLogic.cpp
+++ /dev/null
@@ -1,127 +0,0 @@
-#include "ShadowSocksLogic.h"
-
-#include <functional>
-
-#include "core/servercontroller.h"
-#include "ui/pages_logic/ServerConfiguringProgressLogic.h"
-#include "ui/uilogic.h"
-
-using namespace amnezia;
-using namespace PageEnumNS;
-
-ShadowSocksLogic::ShadowSocksLogic(UiLogic *logic, QObject *parent):
-    PageProtocolLogicBase(logic, parent),
-    m_comboBoxCipherText{"chacha20-poly1305"},
-    m_lineEditPortText{},
-    m_pushButtonSaveVisible{false},
-    m_progressBarResetVisible{false},
-    m_lineEditPortEnabled{false},
-    m_labelInfoVisible{true},
-    m_labelInfoText{},
-    m_progressBarResetValue{0},
-    m_progressBarResetMaximum{100}
-{
-
-}
-
-void ShadowSocksLogic::updateProtocolPage(const QJsonObject &ssConfig, DockerContainer container, bool haveAuthData)
-{
-    set_pageEnabled(haveAuthData);
-    set_pushButtonSaveVisible(haveAuthData);
-    set_progressBarResetVisible(haveAuthData);
-
-    set_comboBoxCipherText(ssConfig.value(config_key::cipher).
-                                          toString(protocols::shadowsocks::defaultCipher));
-
-    set_lineEditPortText(ssConfig.value(config_key::port).
-                                        toString(protocols::shadowsocks::defaultPort));
-
-    set_lineEditPortEnabled(container == DockerContainer::ShadowSocks);
-}
-
-QJsonObject ShadowSocksLogic::getProtocolConfigFromPage(QJsonObject oldConfig)
-{
-    oldConfig.insert(config_key::cipher, comboBoxCipherText());
-    oldConfig.insert(config_key::port, lineEditPortText());
-
-    return oldConfig;
-}
-
-void ShadowSocksLogic::onPushButtonSaveClicked()
-{
-    QJsonObject protocolConfig = m_settings->protocolConfig(uiLogic()->m_selectedServerIndex, uiLogic()->m_selectedDockerContainer, Proto::ShadowSocks);
-
-    QJsonObject containerConfig = m_settings->containerConfig(uiLogic()->m_selectedServerIndex, uiLogic()->m_selectedDockerContainer);
-    QJsonObject newContainerConfig = containerConfig;
-    newContainerConfig.insert(ProtocolProps::protoToString(Proto::ShadowSocks), protocolConfig);
-    ServerConfiguringProgressLogic::PageFunc pageFunc;
-    pageFunc.setEnabledFunc = [this] (bool enabled) -> void {
-        set_pageEnabled(enabled);
-    };
-    ServerConfiguringProgressLogic::ButtonFunc saveButtonFunc;
-    saveButtonFunc.setVisibleFunc = [this] (bool visible) -> void {
-        set_pushButtonSaveVisible(visible);
-    };
-    ServerConfiguringProgressLogic::LabelFunc waitInfoFunc;
-    waitInfoFunc.setVisibleFunc = [this] (bool visible) -> void {
-        set_labelInfoVisible(visible);
-    };
-    waitInfoFunc.setTextFunc = [this] (const QString& text) -> void {
-        set_labelInfoText(text);
-    };
-    ServerConfiguringProgressLogic::ProgressFunc progressBarFunc;
-    progressBarFunc.setVisibleFunc = [this] (bool visible) -> void {
-        set_progressBarResetVisible(visible);
-    };
-    progressBarFunc.setValueFunc = [this] (int value) -> void {
-        set_progressBarResetValue(value);
-    };
-    progressBarFunc.getValueFunc = [this] (void) -> int {
-        return progressBarResetValue();
-    };
-    progressBarFunc.getMaximumFunc = [this] (void) -> int {
-        return progressBarResetMaximum();
-    };
-    progressBarFunc.setTextVisibleFunc = [this] (bool visible) -> void {
-        set_progressBarTextVisible(visible);
-    };
-    progressBarFunc.setTextFunc = [this] (const QString& text) -> void {
-        set_progressBarText(text);
-    };
-
-    ServerConfiguringProgressLogic::LabelFunc busyInfoFuncy;
-    busyInfoFuncy.setTextFunc = [this] (const QString& text) -> void {
-        set_labelServerBusyText(text);
-    };
-    busyInfoFuncy.setVisibleFunc = [this] (bool visible) -> void {
-        set_labelServerBusyVisible(visible);
-    };
-
-    ServerConfiguringProgressLogic::ButtonFunc cancelButtonFunc;
-    cancelButtonFunc.setVisibleFunc = [this] (bool visible) -> void {
-        set_pushButtonCancelVisible(visible);
-    };
-
-    progressBarFunc.setTextVisibleFunc(true);
-    progressBarFunc.setTextFunc(QString("Configuring..."));
-
-    auto installAction = [this, containerConfig, &newContainerConfig]() {
-        ServerController serverController(m_settings);
-        return serverController.updateContainer(m_settings->serverCredentials(uiLogic()->m_selectedServerIndex),
-                                                   uiLogic()->m_selectedDockerContainer, containerConfig, newContainerConfig);
-    };
-    ErrorCode e = uiLogic()->pageLogic<ServerConfiguringProgressLogic>()->doInstallAction(installAction, pageFunc, progressBarFunc,
-                                                                                          saveButtonFunc, waitInfoFunc,
-                                                                                          busyInfoFuncy, cancelButtonFunc);
-
-    if (!e) {
-        m_settings->setContainerConfig(uiLogic()->m_selectedServerIndex, uiLogic()->m_selectedDockerContainer, newContainerConfig);
-        m_settings->clearLastConnectionConfig(uiLogic()->m_selectedServerIndex, uiLogic()->m_selectedDockerContainer);
-    }
-    qDebug() << "Protocol saved with code:" << e << "for" << uiLogic()->m_selectedServerIndex << uiLogic()->m_selectedDockerContainer;
-}
-
-void ShadowSocksLogic::onPushButtonCancelClicked()
-{
-    emit uiLogic()->pageLogic<ServerConfiguringProgressLogic>()->cancelDoInstallAction(true);
-}
diff --git a/client/ui/pages_logic/protocols/ShadowSocksLogic.h b/client/ui/pages_logic/protocols/ShadowSocksLogic.h
deleted file mode 100644
index bf926928..00000000
--- a/client/ui/pages_logic/protocols/ShadowSocksLogic.h
+++ /dev/null
@@ -1,44 +0,0 @@
-#ifndef SHADOWSOCKS_LOGIC_H
-#define SHADOWSOCKS_LOGIC_H
-
-#include "PageProtocolLogicBase.h"
-
-class UiLogic;
-
-class ShadowSocksLogic : public PageProtocolLogicBase
-{
-    Q_OBJECT
-
-    AUTO_PROPERTY(QString, comboBoxCipherText)
-    AUTO_PROPERTY(QString, lineEditPortText)
-    AUTO_PROPERTY(bool, pushButtonSaveVisible)
-    AUTO_PROPERTY(bool, progressBarResetVisible)
-    AUTO_PROPERTY(bool, lineEditPortEnabled)
-    AUTO_PROPERTY(bool, labelInfoVisible)
-    AUTO_PROPERTY(QString, labelInfoText)
-    AUTO_PROPERTY(int, progressBarResetValue)
-    AUTO_PROPERTY(int, progressBarResetMaximum)
-    AUTO_PROPERTY(bool, progressBarTextVisible)
-    AUTO_PROPERTY(QString, progressBarText)
-
-    AUTO_PROPERTY(bool, labelServerBusyVisible)
-    AUTO_PROPERTY(QString, labelServerBusyText)
-
-    AUTO_PROPERTY(bool, pushButtonCancelVisible)
-
-public:
-    Q_INVOKABLE void onPushButtonSaveClicked();
-    Q_INVOKABLE void onPushButtonCancelClicked();
-
-public:
-    explicit ShadowSocksLogic(UiLogic *uiLogic, QObject *parent = nullptr);
-    ~ShadowSocksLogic() = default;
-
-    void updateProtocolPage(const QJsonObject &ssConfig, DockerContainer container, bool haveAuthData) override;
-    QJsonObject getProtocolConfigFromPage(QJsonObject oldConfig) override;
-
-private:
-    UiLogic *m_uiLogic;
-
-};
-#endif // SHADOWSOCKS_LOGIC_H
diff --git a/client/ui/pages_logic/protocols/WireGuardLogic.cpp b/client/ui/pages_logic/protocols/WireGuardLogic.cpp
deleted file mode 100644
index a6c661f5..00000000
--- a/client/ui/pages_logic/protocols/WireGuardLogic.cpp
+++ /dev/null
@@ -1,30 +0,0 @@
-#include "WireGuardLogic.h"
-#include "core/servercontroller.h"
-#include <functional>
-#include "../../uilogic.h"
-
-using namespace amnezia;
-using namespace PageEnumNS;
-
-WireGuardLogic::WireGuardLogic(UiLogic *logic, QObject *parent):
-    PageProtocolLogicBase(logic, parent)
-{
-
-}
-
-void WireGuardLogic::updateProtocolPage(const QJsonObject &wireGuardConfig, DockerContainer container, bool haveAuthData)
-{
-    qDebug() << "WireGuardLogic::updateProtocolPage";
-
-    auto lastConfigJsonDoc = QJsonDocument::fromJson(wireGuardConfig.value(config_key::last_config).toString().toUtf8());
-    auto lastConfigJson = lastConfigJsonDoc.object();
-
-    QString wireGuardLastConfigText;
-    QStringList lines = lastConfigJson.value(config_key::config).toString().replace("\r", "").split("\n");
-    for (const QString &l: lines) {
-            wireGuardLastConfigText.append(l + "\n");
-    }
-
-    set_wireGuardLastConfigText(wireGuardLastConfigText);
-    set_isThirdPartyConfig(wireGuardConfig.value(config_key::isThirdPartyConfig).toBool());
-}
diff --git a/client/ui/pages_logic/protocols/WireGuardLogic.h b/client/ui/pages_logic/protocols/WireGuardLogic.h
deleted file mode 100644
index 0b3bfc7b..00000000
--- a/client/ui/pages_logic/protocols/WireGuardLogic.h
+++ /dev/null
@@ -1,26 +0,0 @@
-#ifndef WIREGUARDLOGIC_H
-#define WIREGUARDLOGIC_H
-
-#include "PageProtocolLogicBase.h"
-
-class UiLogic;
-
-class WireGuardLogic : public PageProtocolLogicBase
-{
-    Q_OBJECT
-
-    AUTO_PROPERTY(QString, wireGuardLastConfigText)
-    AUTO_PROPERTY(bool, isThirdPartyConfig)
-
-public:
-    explicit WireGuardLogic(UiLogic *uiLogic, QObject *parent = nullptr);
-    ~WireGuardLogic() = default;
-
-    void updateProtocolPage(const QJsonObject &wireGuardConfig, DockerContainer container, bool haveAuthData) override;
-
-private:
-    UiLogic *m_uiLogic;
-
-};
-
-#endif // WIREGUARDLOGIC_H
diff --git a/client/ui/qml/Controls/BackButton.qml b/client/ui/qml/Controls/BackButton.qml
deleted file mode 100644
index 47f0970c..00000000
--- a/client/ui/qml/Controls/BackButton.qml
+++ /dev/null
@@ -1,33 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-
-Button {
-    id: root
-    x: 10
-    y: 5
-    width: 41
-    height: 35
-
-    hoverEnabled: true
-    property bool containsMouse: hovered
-
-    background: Item {}
-
-    MouseArea {
-        id: mouseArea
-        anchors.fill: parent
-        enabled: false
-        cursorShape: Qt.PointingHandCursor
-    }
-
-    onClicked: {
-        UiLogic.closePage()
-    }
-
-    contentItem: Image {
-        id: img
-        source: "qrc:/images/arrow_left.png"
-        anchors.fill: root
-        anchors.margins: root.containsMouse ? 9 : 10
-    }
-}
diff --git a/client/ui/qml/Controls/BasicButtonType.qml b/client/ui/qml/Controls/BasicButtonType.qml
deleted file mode 100644
index e115df29..00000000
--- a/client/ui/qml/Controls/BasicButtonType.qml
+++ /dev/null
@@ -1,17 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-
-Button {
-    id: root
-    property bool containsMouse: hovered
-    hoverEnabled: true
-    flat: true
-    highlighted: false
-
-    MouseArea {
-        id: mouseArea
-        anchors.fill: parent
-        enabled: false
-        cursorShape: Qt.PointingHandCursor
-    }
-}
diff --git a/client/ui/qml/Controls/BlueButtonType.qml b/client/ui/qml/Controls/BlueButtonType.qml
deleted file mode 100644
index a3602c4a..00000000
--- a/client/ui/qml/Controls/BlueButtonType.qml
+++ /dev/null
@@ -1,28 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-
-import "../Config"
-
-BasicButtonType {
-    id: root
-    width: parent.width - 2 * GC.defaultMargin
-    implicitHeight: 40
-
-    background: Rectangle {
-        anchors.fill: parent
-        radius: 4
-        color: root.enabled ? (root.containsMouse ? "#211966" : "#100A44") : "#888888"
-    }
-    font.pixelSize: 16
-    contentItem: Text {
-        anchors.fill: parent
-        font.family: "Lato"
-        font.styleName: "normal"
-        font.pixelSize: root.font.pixelSize
-        color: "#D4D4D4"
-        text: root.text
-        horizontalAlignment: Text.AlignHCenter
-        verticalAlignment: Text.AlignVCenter
-    }
-    antialiasing: true
-}
diff --git a/client/ui/qml/Controls/Caption.qml b/client/ui/qml/Controls/Caption.qml
deleted file mode 100644
index 50fc9aca..00000000
--- a/client/ui/qml/Controls/Caption.qml
+++ /dev/null
@@ -1,17 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-
-Text {
-    font.family: "Lato"
-    font.styleName: "normal"
-    font.pixelSize: 24
-    color: "#100A44"
-    horizontalAlignment: Text.AlignHCenter
-    verticalAlignment: Text.AlignVCenter
-    x: 10
-    y: 35
-    width: parent.width - 40
-    anchors.horizontalCenter: parent.horizontalCenter
-    wrapMode: Text.Wrap
-    //height: 31
-}
diff --git a/client/ui/qml/Controls/CheckBoxType.qml b/client/ui/qml/Controls/CheckBoxType.qml
deleted file mode 100644
index 0331706c..00000000
--- a/client/ui/qml/Controls/CheckBoxType.qml
+++ /dev/null
@@ -1,27 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-
-CheckBox {
-    id: root
-    property int imageWidth : 20
-    property int imageHeight : 20
-    indicator: Image {
-        id: indicator
-        anchors.verticalCenter: root.verticalCenter
-        height: imageHeight
-        width: imageWidth
-        source: root.checked ? "qrc:/images/controls/check_on.png"
-                             : "qrc:/images/controls/check_off.png"
-    }
-
-    contentItem: Text {
-        text: root.text
-        font.family: "Lato"
-        font.styleName: "normal"
-        font.pixelSize: 16
-        color: "#181922"
-        verticalAlignment: Text.AlignVCenter
-        leftPadding: root.indicator.width + root.spacing
-        wrapMode: Text.Wrap
-    }
-}
diff --git a/client/ui/qml/Controls/ComboBoxType.qml b/client/ui/qml/Controls/ComboBoxType.qml
deleted file mode 100644
index 090ca9de..00000000
--- a/client/ui/qml/Controls/ComboBoxType.qml
+++ /dev/null
@@ -1,11 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-
-ComboBox {
-    id: root
-    font.family: "Lato"
-    font.styleName: "normal"
-    font.pixelSize: 16
-
-    popup.font.pixelSize: 16
-}
diff --git a/client/ui/qml/Controls/ContextMenu.qml b/client/ui/qml/Controls/ContextMenu.qml
deleted file mode 100644
index 867fcb10..00000000
--- a/client/ui/qml/Controls/ContextMenu.qml
+++ /dev/null
@@ -1,33 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-import Qt.labs.platform
-
-Menu {
-    property var textObj
-
-    MenuItem {
-        text: qsTr("C&ut")
-        shortcut: StandardKey.Cut
-        enabled: textObj.selectedText
-        onTriggered: textObj.cut()
-    }
-    MenuItem {
-        text: qsTr("&Copy")
-        shortcut: StandardKey.Copy
-        enabled: textObj.selectedText
-        onTriggered: textObj.copy()
-    }
-    MenuItem {
-        text: qsTr("&Paste")
-        shortcut: StandardKey.Paste
-        enabled: textObj.canPaste
-        onTriggered: textObj.paste()
-    }
-
-    MenuItem {
-        text: qsTr("&SelectAll")
-        shortcut: StandardKey.SelectAll
-        enabled: textObj.length > 0
-        onTriggered: textObj.selectAll()
-    }
-}
diff --git a/client/ui/qml/Controls/FadeBehavior.qml b/client/ui/qml/Controls/FadeBehavior.qml
deleted file mode 100644
index e523061f..00000000
--- a/client/ui/qml/Controls/FadeBehavior.qml
+++ /dev/null
@@ -1,35 +0,0 @@
-import QtQuick
-import QtQml
-
-Behavior {
-    id: root
-
-    property QtObject fadeTarget: targetProperty.object
-    property string fadeProperty: "scale"
-    property int fadeDuration: 150
-    property string easingType: "Quad"
-
-    property alias outAnimation: outAnimation
-    property alias inAnimation: inAnimation
-
-    SequentialAnimation {
-        NumberAnimation {
-            id: outAnimation
-            target: root.fadeTarget
-            property: root.fadeProperty
-            duration: root.fadeDuration
-            to: 0
-            easing.type: Easing["In"+root.easingType]
-        }
-        PropertyAction { }
-        NumberAnimation {
-            id: inAnimation
-            target: root.fadeTarget
-            property: root.fadeProperty
-            duration: root.fadeDuration
-            to: target[property]
-            easing.type: Easing["Out"+root.easingType]
-        }
-    }
-
-}
diff --git a/client/ui/qml/Controls/FlickableType.qml b/client/ui/qml/Controls/FlickableType.qml
deleted file mode 100644
index 79bfabfd..00000000
--- a/client/ui/qml/Controls/FlickableType.qml
+++ /dev/null
@@ -1,26 +0,0 @@
-import QtQuick 2.12
-import QtQuick.Controls 2.12
-import "../Config"
-
-Flickable {
-    id: fl
-
-    clip: true
-    width: parent.width
-
-    anchors.topMargin: GC.defaultMargin
-    anchors.bottom: parent.bottom
-    anchors.bottomMargin: GC.defaultMargin
-    anchors.left: root.left
-    anchors.leftMargin: GC.defaultMargin
-    anchors.right: root.right
-    anchors.rightMargin: 1
-
-    Keys.onUpPressed: scrollBar.decrease()
-    Keys.onDownPressed: scrollBar.increase()
-
-    ScrollBar.vertical: ScrollBar {
-        id: scrollBar
-        policy: fl.height >= fl.contentHeight ? ScrollBar.AlwaysOff : ScrollBar.AlwaysOn
-    }
-}
diff --git a/client/ui/qml/Controls/ImageButtonType.qml b/client/ui/qml/Controls/ImageButtonType.qml
deleted file mode 100644
index 74b90c6e..00000000
--- a/client/ui/qml/Controls/ImageButtonType.qml
+++ /dev/null
@@ -1,17 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-
-BasicButtonType {
-    id: root
-    property alias iconMargin: img.anchors.margins
-    property alias img: img
-    property int imgMargin: 4
-    property int imgMarginHover: 3
-    background: Item {}
-    contentItem: Image {
-        id: img
-        source: root.icon.source
-        anchors.fill: root
-        anchors.margins: root.containsMouse ? imgMarginHover : imgMargin
-    }
-}
diff --git a/client/ui/qml/Controls/LabelType.qml b/client/ui/qml/Controls/LabelType.qml
deleted file mode 100644
index 9cce61b1..00000000
--- a/client/ui/qml/Controls/LabelType.qml
+++ /dev/null
@@ -1,17 +0,0 @@
-import QtQuick
-import "../Config"
-
-Text {
-    id: root
-    width: parent.width - 2 * GC.defaultMargin
-    anchors.topMargin: 10
-
-    font.family: "Lato"
-    font.styleName: "normal"
-    font.pixelSize: 16
-    color: "#181922"
-    horizontalAlignment: Text.AlignLeft
-    verticalAlignment: Text.AlignVCenter
-    wrapMode: Text.Wrap
-}
-
diff --git a/client/ui/qml/Controls/Logo.qml b/client/ui/qml/Controls/Logo.qml
deleted file mode 100644
index 74d82872..00000000
--- a/client/ui/qml/Controls/Logo.qml
+++ /dev/null
@@ -1,8 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-
-Image {
-    anchors.horizontalCenter: parent.horizontalCenter
-    anchors.bottomMargin: 30
-    source: "qrc:/images/AmneziaVPN.png"
-}
diff --git a/client/ui/qml/Controls/PopupWarning.qml b/client/ui/qml/Controls/PopupWarning.qml
deleted file mode 100644
index 57c332eb..00000000
--- a/client/ui/qml/Controls/PopupWarning.qml
+++ /dev/null
@@ -1,34 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-import QtQuick.Layouts
-
-Popup {
-    id: root
-
-    property string popupWarningText
-
-    anchors.centerIn: Overlay.overlay
-    modal: true
-    closePolicy: Popup.NoAutoClose
-    width: parent.width - 20
-
-    ColumnLayout {
-        width: parent.width
-        Text {
-            horizontalAlignment: Text.AlignHCenter
-            Layout.fillWidth: true
-            wrapMode: Text.WordWrap
-            font.pixelSize: 16
-            text: root.popupWarningText
-        }
-
-        BlueButtonType {
-            Layout.preferredWidth: parent.width / 2
-            Layout.fillWidth: true
-            text: "Continue"
-            onClicked: {
-                root.close()
-            }
-        }
-    }
-}
diff --git a/client/ui/qml/Controls/PopupWithQuestion.qml b/client/ui/qml/Controls/PopupWithQuestion.qml
deleted file mode 100644
index b55edf90..00000000
--- a/client/ui/qml/Controls/PopupWithQuestion.qml
+++ /dev/null
@@ -1,62 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-import QtQuick.Layouts
-
-Popup {
-    id: root
-
-    property string questionText
-    property string yesText: "yes"
-    property string noText: "no"
-    property var yesFunc
-    property var noFunc
-
-    anchors.centerIn: Overlay.overlay
-    modal: true
-    closePolicy: Popup.CloseOnEscape
-
-    width: parent.width - 20
-    focus: true
-
-    onAboutToHide: {
-        parent.forceActiveFocus(true)
-    }
-
-    ColumnLayout {
-        width: parent.width
-
-        Text {
-            horizontalAlignment: Text.AlignHCenter
-            Layout.fillWidth: true
-            wrapMode: Text.WordWrap
-            font.pixelSize: 16
-            text: questionText
-        }
-
-        RowLayout {
-            Layout.fillWidth: true
-            BlueButtonType {
-                id: yesButton
-                Layout.fillWidth: true
-                text: yesText
-                onClicked: {
-                    root.enabled = false
-                    if (yesFunc && typeof yesFunc === "function") {
-                        yesFunc()
-                    }
-                    root.enabled = true
-                }
-            }
-            BlueButtonType {
-                id: noButton
-                Layout.fillWidth: true
-                text: noText
-                onClicked: {
-                    if (noFunc && typeof noFunc === "function") {
-                        noFunc()
-                    }
-                }
-            }
-        }
-    }
-}
diff --git a/client/ui/qml/Controls/PopupWithTextField.qml b/client/ui/qml/Controls/PopupWithTextField.qml
deleted file mode 100644
index acdf1247..00000000
--- a/client/ui/qml/Controls/PopupWithTextField.qml
+++ /dev/null
@@ -1,62 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-import QtQuick.Layouts
-
-Popup {
-    id: root
-
-    property alias text: textField.text
-    property alias placeholderText: textField.placeholderText
-    property string yesText: "yes"
-    property string noText: "no"
-    property var yesFunc
-    property var noFunc
-
-    signal editingFinished()
-
-    anchors.centerIn: Overlay.overlay
-    modal: true
-    closePolicy: Popup.NoAutoClose
-
-    width: parent.width - 20
-
-    ColumnLayout {
-        width: parent.width
-
-        TextField {
-            id: textField
-            horizontalAlignment: Text.AlignHCenter
-            Layout.fillWidth: true
-            font.pixelSize: 16
-            echoMode: TextInput.Password
-        }
-
-        RowLayout {
-            Layout.fillWidth: true
-            BlueButtonType {
-                id: yesButton
-                Layout.preferredWidth: parent.width / 2
-                Layout.fillWidth: true
-                text: yesText
-                onClicked: {
-                    root.enabled = false
-                    if (yesFunc && typeof yesFunc === "function") {
-                        yesFunc()
-                    }
-                    root.enabled = true
-                }
-            }
-            BlueButtonType {
-                id: noButton
-                Layout.preferredWidth: parent.width / 2
-                Layout.fillWidth: true
-                text: noText
-                onClicked: {
-                    if (noFunc && typeof noFunc === "function") {
-                        noFunc()
-                    }
-                }
-            }
-        }
-    }
-}
diff --git a/client/ui/qml/Controls/RadioButtonType.qml b/client/ui/qml/Controls/RadioButtonType.qml
deleted file mode 100644
index cda28ea5..00000000
--- a/client/ui/qml/Controls/RadioButtonType.qml
+++ /dev/null
@@ -1,36 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-
-RadioButton {
-    id: root
-
-    indicator: Rectangle {
-        implicitWidth: 13
-        implicitHeight: 13
-        x: root.leftPadding
-        y: parent.height / 2 - height / 2
-        radius: 13
-        border.color: root.down ? "#777777" : "#777777"
-
-        Rectangle {
-            width: 7
-            height: 7
-            x: 3
-            y: 3
-            radius: 4
-            color: root.down ? "#15CDCB" : "#15CDCB"
-            visible: root.checked
-        }
-    }
-
-    contentItem: Text {
-        text: root.text
-        font.family: "Lato"
-        font.styleName: "normal"
-        font.pixelSize: 16
-        color: enabled ? "#181922" : "#686972"
-        verticalAlignment: Text.AlignVCenter
-        leftPadding: root.indicator.width + root.spacing
-    }
-    height: 10
-}
diff --git a/client/ui/qml/Controls/RichLabelType.qml b/client/ui/qml/Controls/RichLabelType.qml
deleted file mode 100644
index f354f974..00000000
--- a/client/ui/qml/Controls/RichLabelType.qml
+++ /dev/null
@@ -1,17 +0,0 @@
-import QtQuick
-
-LabelType {
-    id: label_connection_code
-    width: parent.width - 60
-    x: 30
-    font.pixelSize: 14
-    textFormat: Text.RichText
-    onLinkActivated: Qt.openUrlExternally(link)
-
-    MouseArea {
-        anchors.fill: parent
-        cursorShape: parent.hoveredLink ? Qt.PointingHandCursor : Qt.ArrowCursor
-        acceptedButtons: Qt.NoButton
-    }
-}
-
diff --git a/client/ui/qml/Controls/SettingButtonType.qml b/client/ui/qml/Controls/SettingButtonType.qml
deleted file mode 100644
index 6166793d..00000000
--- a/client/ui/qml/Controls/SettingButtonType.qml
+++ /dev/null
@@ -1,33 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-
-BasicButtonType {
-    id: root
-    property alias textItem: textItem
-    height: 30
-
-    background: Item {}
-    contentItem: Item {
-        SvgImageType {
-            anchors.left: parent.left
-            anchors.verticalCenter: parent.verticalCenter
-            svg.source: root.icon.source
-            enabled: root.enabled
-            color: "#100A44"
-            width: 25
-            height: 25
-        }
-        Text {
-            id: textItem
-            anchors.fill: parent
-            leftPadding: 30
-            text: root.text
-            color: root.enabled ? "#100A44": "#AAAAAA"
-            font.family: "Lato"
-            font.styleName: "normal"
-            font.pixelSize: 20
-            horizontalAlignment: Text.AlignLeft
-            verticalAlignment: Text.AlignVCenter
-        }
-    }
-}
diff --git a/client/ui/qml/Controls/ShareConnectionButtonCopyType.qml b/client/ui/qml/Controls/ShareConnectionButtonCopyType.qml
deleted file mode 100644
index 31b3591e..00000000
--- a/client/ui/qml/Controls/ShareConnectionButtonCopyType.qml
+++ /dev/null
@@ -1,26 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-
-ShareConnectionButtonType {
-    property string start_text: qsTr("Copy")
-    property string end_text: qsTr("Copied")
-
-    property string copyText
-
-    enabled: copyText.length > 0
-    visible: copyText.length > 0
-
-    Timer {
-        id: timer
-        interval: 1000; running: false; repeat: false
-        onTriggered: text = start_text
-    }
-
-    text: start_text
-
-    onClicked: {
-        text = end_text
-        timer.running = true
-        UiLogic.copyToClipboard(copyText)
-    }
-}
diff --git a/client/ui/qml/Controls/ShareConnectionButtonType.qml b/client/ui/qml/Controls/ShareConnectionButtonType.qml
deleted file mode 100644
index 77ebbac0..00000000
--- a/client/ui/qml/Controls/ShareConnectionButtonType.qml
+++ /dev/null
@@ -1,27 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-
-
-BasicButtonType {
-    id: root
-    height: 40
-    background: Rectangle {
-        anchors.fill: parent
-        radius: 4
-        color: root.enabled
-               ? (root.containsMouse ? "#282932" : "#181922")
-               : "#484952"
-    }
-    font.pixelSize: 16
-    contentItem: Text {
-        anchors.fill: parent
-        font.family: "Lato"
-        font.styleName: "normal"
-        font.pixelSize: root.font.pixelSize
-        color: "#D4D4D4"
-        text: root.text
-        horizontalAlignment: Text.AlignHCenter
-        verticalAlignment: Text.AlignVCenter
-    }
-    antialiasing: true
-}
diff --git a/client/ui/qml/Controls/ShareConnectionContent.qml b/client/ui/qml/Controls/ShareConnectionContent.qml
deleted file mode 100644
index 99427aef..00000000
--- a/client/ui/qml/Controls/ShareConnectionContent.qml
+++ /dev/null
@@ -1,65 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-import QtQuick.Shapes 1.4
-
-Item {
-    id: root
-    property bool active: false
-    property string text: ""
-    height: active ? contentLoader.item.height + 40 + 5 * 2 : 40
-    signal clicked()
-
-    Rectangle {
-        x: 0
-        y: 0
-        width: parent.width
-        height: 40
-        color: "transparent"
-        clip: true
-        radius: 2
-        gradient: LinearGradient {
-            x1: 0 ; y1: 0
-            x2: 0 ; y2: height
-            stops: [
-                GradientStop { position: 0.0; color: "#E1E1E1" },
-                GradientStop { position: 0.4; color: "#DDDDDD" },
-                GradientStop { position: 0.5; color: "#D8D8D8" },
-                GradientStop { position: 1.0; color: "#D3D3D3" }
-            ]
-        }
-        Image {
-            anchors.verticalCenter: parent.verticalCenter
-            anchors.left: parent.left
-            anchors.leftMargin: 10
-            source: "qrc:/images/share.png"
-        }
-        Rectangle {
-            anchors.left: parent.left
-            anchors.right: parent.right
-            anchors.bottom: parent.bottom
-            height: 2
-            color: "#148CD2"
-            visible: ms.containsMouse ? true : false
-        }
-        Text {
-            x: 40
-            anchors.verticalCenter: parent.verticalCenter
-            font.family: "Lato"
-            font.styleName: "normal"
-            font.pixelSize: 18
-            color: "#100A44"
-            font.bold: true
-            text: root.text
-            horizontalAlignment: Text.AlignLeft
-            verticalAlignment: Text.AlignVCenter
-            wrapMode: Text.Wrap
-        }
-        MouseArea {
-            id: ms
-            anchors.fill: parent
-            hoverEnabled: true
-            onClicked: root.clicked()
-        }
-    }
-}
-
diff --git a/client/ui/qml/Controls/SvgButtonType.qml b/client/ui/qml/Controls/SvgButtonType.qml
deleted file mode 100644
index e6f78c87..00000000
--- a/client/ui/qml/Controls/SvgButtonType.qml
+++ /dev/null
@@ -1,16 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-import "."
-
-BasicButtonType {
-    id: root
-    icon.color: "#181922"
-
-    background: Item {}
-    contentItem: SvgImageType {
-        svg.source: icon.source
-        color: icon.color
-        anchors.fill: parent
-        anchors.margins: parent.containsMouse ? 0 : 1
-    }
-}
diff --git a/client/ui/qml/Controls/SvgImageType.qml b/client/ui/qml/Controls/SvgImageType.qml
deleted file mode 100644
index aee928ba..00000000
--- a/client/ui/qml/Controls/SvgImageType.qml
+++ /dev/null
@@ -1,23 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-import Qt5Compat.GraphicalEffects
-
-Item {
-    id: root
-    property color color: "#181922"
-    property alias svg: image
-    Image {
-        anchors.fill: parent
-        id: image
-        sourceSize: Qt.size(root.width, root.height)
-
-        antialiasing: true
-        visible: false
-    }
-
-    ColorOverlay {
-        anchors.fill: image
-        source: image
-        color: root.enabled ? root.color : "grey"
-    }
-}
diff --git a/client/ui/qml/Controls/TextAreaType.qml b/client/ui/qml/Controls/TextAreaType.qml
deleted file mode 100644
index 2f6e0843..00000000
--- a/client/ui/qml/Controls/TextAreaType.qml
+++ /dev/null
@@ -1,63 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-import Qt.labs.platform
-
-import "../Config"
-
-Flickable
-{
-    property alias textArea: root
-    id: flickable
-    flickableDirection: Flickable.VerticalFlick
-    clip: true
-    TextArea.flickable:
-
-        TextArea {
-        id: root
-        property bool error: false
-
-        height: 40
-        anchors.topMargin: 5
-        selectByMouse: false
-
-        selectionColor: "darkgray"
-        font.pixelSize: 16
-        color: "#333333"
-        background: Rectangle {
-            implicitWidth: 200
-            implicitHeight: 40
-            border.width: 1
-            color: {
-                if (root.error) {
-                    return Qt.rgba(213, 40, 60, 255)
-                }
-                return root.enabled ? "#F4F4F4" : Qt.rgba(127, 127, 127, 255)
-            }
-            border.color: {
-                if (!root.enabled) {
-                    return Qt.rgba(127, 127, 127, 255)
-                }
-                if (root.error) {
-                    return Qt.rgba(213, 40, 60, 255)
-                }
-                if (root.focus) {
-                    return "#A7A7A7"
-                }
-                return "#A7A7A7"
-            }
-        }
-
-//        MouseArea {
-//            anchors.fill: root
-//            enabled: GC.isDesktop()
-//            acceptedButtons: Qt.RightButton
-//            onClicked: contextMenu.open()
-//        }
-
-//        ContextMenu {
-//            id: contextMenu
-//            textObj: root
-//        }
-    }
-
-}
diff --git a/client/ui/qml/Controls/TextFieldType.qml b/client/ui/qml/Controls/TextFieldType.qml
deleted file mode 100644
index 5d7b2a65..00000000
--- a/client/ui/qml/Controls/TextFieldType.qml
+++ /dev/null
@@ -1,52 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-import Qt.labs.platform
-import "../Config"
-
-TextField {
-    id: root
-    property bool error: false
-
-    width: parent.width - 2 * GC.defaultMargin
-    height: 40
-    anchors.topMargin: 5
-    selectByMouse: true
-    selectionColor: "darkgray"
-    font.pixelSize: 16
-    color: "#333333"
-
-    background: Rectangle {
-        implicitWidth: 200
-        implicitHeight: 40
-        border.width: 1
-        color: {
-            if (root.error) {
-                return Qt.rgba(213, 40, 60, 255)
-            }
-            return root.enabled ? "#F4F4F4" : Qt.rgba(127, 127, 127, 255)
-        }
-        border.color: {
-            if (!root.enabled) {
-                return Qt.rgba(127, 127, 127, 255)
-            }
-            if (root.error) {
-                return Qt.rgba(213, 40, 60, 255)
-            }
-            if (root.focus) {
-                return "#A7A7A7"
-            }
-            return "#A7A7A7"
-        }
-    }
-
-    MouseArea {
-        anchors.fill: parent
-        acceptedButtons: Qt.RightButton
-        onClicked: contextMenu.open()
-    }
-
-    ContextMenu {
-        id: contextMenu
-        textObj: root
-    }
-}
diff --git a/client/ui/qml/Controls/UrlButtonType.qml b/client/ui/qml/Controls/UrlButtonType.qml
deleted file mode 100644
index d77763dc..00000000
--- a/client/ui/qml/Controls/UrlButtonType.qml
+++ /dev/null
@@ -1,25 +0,0 @@
-import QtQuick 2.12
-import QtQuick.Controls 2.12
-
-BasicButtonType {
-    property alias label: lbl
-    id: root
-    antialiasing: true
-    height: 21
-    background: Item {}
-
-    contentItem: Text {
-        id: lbl
-        anchors.fill: parent
-        font.family: "Lato"
-        font.styleName: "normal"
-        font.pixelSize: 18
-        font.underline: true
-
-        text: root.text
-        color: "#3045ee"
-
-        horizontalAlignment: Text.AlignHCenter
-        verticalAlignment: Text.AlignVCenter
-    }
-}
diff --git a/client/ui/qml/Controls/VisibleBehavior.qml b/client/ui/qml/Controls/VisibleBehavior.qml
deleted file mode 100644
index 9aeb4e85..00000000
--- a/client/ui/qml/Controls/VisibleBehavior.qml
+++ /dev/null
@@ -1,6 +0,0 @@
-FadeBehavior {
-    fadeProperty: "opacity"
-    fadeDuration: 200
-    outAnimation.duration: targetValue ? 0 : fadeDuration
-    inAnimation.duration: targetValue ? fadeDuration : 0
-}
diff --git a/client/ui/qml/Pages/ClientInfo/PageClientInfoBase.qml b/client/ui/qml/Pages/ClientInfo/PageClientInfoBase.qml
deleted file mode 100644
index 7fde5bab..00000000
--- a/client/ui/qml/Pages/ClientInfo/PageClientInfoBase.qml
+++ /dev/null
@@ -1,15 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-import QtQuick.Layouts
-import PageEnum 1.0
-import ProtocolEnum 1.0
-import "../"
-import "../../Controls"
-import "../../Config"
-
-PageBase {
-    id: root
-    property var protocol: ProtocolEnum.Any
-    page: PageEnum.ClientInfo
-    logic: ClientInfoLogic
-}
diff --git a/client/ui/qml/Pages/ClientInfo/PageClientInfoOpenVPN.qml b/client/ui/qml/Pages/ClientInfo/PageClientInfoOpenVPN.qml
deleted file mode 100644
index da5ba53c..00000000
--- a/client/ui/qml/Pages/ClientInfo/PageClientInfoOpenVPN.qml
+++ /dev/null
@@ -1,115 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-import QtQuick.Layouts
-import ProtocolEnum 1.0
-import "../"
-import "../../Controls"
-import "../../Config"
-
-PageClientInfoBase {
-    id: root
-    protocol: ProtocolEnum.OpenVpn
-
-    BackButton {
-        id: back
-        enabled: !ClientInfoLogic.busyIndicatorIsRunning
-    }
-
-    Caption {
-        id: caption
-        text: qsTr("Client Info")
-    }
-
-    BusyIndicator {
-        z: 99
-        anchors.horizontalCenter: parent.horizontalCenter
-        anchors.verticalCenter: parent.verticalCenter
-        visible: ClientInfoLogic.busyIndicatorIsRunning
-        running: ClientInfoLogic.busyIndicatorIsRunning
-    }
-
-    FlickableType {
-        id: fl
-        anchors.top: caption.bottom
-        contentHeight: content.height
-        visible: ClientInfoLogic.pageContentVisible
-
-        ColumnLayout {
-            id: content
-            anchors.top: parent.top
-            anchors.left: parent.left
-            anchors.right: parent.right
-            anchors.rightMargin: GC.defaultMargin
-
-            LabelType {
-                enabled: !ClientInfoLogic.busyIndicatorIsRunning
-                Layout.fillWidth: true
-                font.pixelSize: 20
-                horizontalAlignment: Text.AlignHCenter
-                text: ClientInfoLogic.labelCurrentVpnProtocolText
-            }
-
-            LabelType {
-                enabled: !ClientInfoLogic.busyIndicatorIsRunning
-                height: 21
-                text: qsTr("Client name")
-            }
-
-            TextFieldType {
-                enabled: !ClientInfoLogic.busyIndicatorIsRunning
-                Layout.fillWidth: true
-                Layout.preferredHeight: 31
-                text: ClientInfoLogic.lineEditNameAliasText
-                onEditingFinished: {
-                    if (text !== ClientInfoLogic.lineEditNameAliasText) {
-                        ClientInfoLogic.lineEditNameAliasText = text
-                        ClientInfoLogic.onLineEditNameAliasEditingFinished()
-                    }
-                }
-            }
-
-            LabelType {
-                enabled: !ClientInfoLogic.busyIndicatorIsRunning
-                Layout.topMargin: 20
-                height: 21
-                text: qsTr("Certificate id")
-            }
-
-            LabelType {
-                enabled: !ClientInfoLogic.busyIndicatorIsRunning
-                Layout.fillWidth: true
-                horizontalAlignment: Text.AlignHCenter
-                text: ClientInfoLogic.labelOpenVpnCertId
-            }
-
-            LabelType {
-                enabled: !ClientInfoLogic.busyIndicatorIsRunning
-                Layout.topMargin: 20
-                height: 21
-                text: qsTr("Certificate")
-            }
-
-            TextAreaType {
-                enabled: !ClientInfoLogic.busyIndicatorIsRunning
-                Layout.preferredHeight: 200
-                Layout.fillWidth: true
-
-                textArea.readOnly: true
-                textArea.wrapMode: TextEdit.WrapAnywhere
-                textArea.verticalAlignment: Text.AlignTop
-                textArea.text: ClientInfoLogic.textAreaOpenVpnCertData
-            }
-
-            BlueButtonType {
-                enabled: !ClientInfoLogic.busyIndicatorIsRunning
-                Layout.fillWidth: true
-                Layout.preferredHeight: 41
-                text: qsTr("Revoke Certificate")
-                onClicked: {
-                    ClientInfoLogic.onRevokeOpenVpnCertificateClicked()
-                    UiLogic.closePage()
-                }
-            }
-        }
-    }
-}
diff --git a/client/ui/qml/Pages/ClientInfo/PageClientInfoWireGuard.qml b/client/ui/qml/Pages/ClientInfo/PageClientInfoWireGuard.qml
deleted file mode 100644
index befaf7f8..00000000
--- a/client/ui/qml/Pages/ClientInfo/PageClientInfoWireGuard.qml
+++ /dev/null
@@ -1,100 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-import QtQuick.Layouts
-import ProtocolEnum 1.0
-import "../"
-import "../../Controls"
-import "../../Config"
-
-PageClientInfoBase {
-    id: root
-    protocol: ProtocolEnum.WireGuard
-
-    BackButton {
-        id: back
-        enabled: !ClientInfoLogic.busyIndicatorIsRunning
-    }
-
-    Caption {
-        id: caption
-        text: qsTr("Client Info")
-    }
-
-    BusyIndicator {
-        z: 99
-        anchors.horizontalCenter: parent.horizontalCenter
-        anchors.verticalCenter: parent.verticalCenter
-        visible: ClientInfoLogic.busyIndicatorIsRunning
-        running: ClientInfoLogic.busyIndicatorIsRunning
-    }
-
-    FlickableType {
-        id: fl
-        anchors.top: caption.bottom
-        contentHeight: content.height
-
-        ColumnLayout {
-            id: content
-            anchors.top: parent.top
-            anchors.left: parent.left
-            anchors.right: parent.right
-            anchors.rightMargin: GC.defaultMargin
-
-            LabelType {
-                enabled: !ClientInfoLogic.busyIndicatorIsRunning
-                Layout.fillWidth: true
-                font.pixelSize: 20
-                horizontalAlignment: Text.AlignHCenter
-                text: ClientInfoLogic.labelCurrentVpnProtocolText
-            }
-
-            LabelType {
-                enabled: !ClientInfoLogic.busyIndicatorIsRunning
-                height: 21
-                text: qsTr("Client name")
-            }
-
-            TextFieldType {
-                enabled: !ClientInfoLogic.busyIndicatorIsRunning
-                Layout.fillWidth: true
-                Layout.preferredHeight: 31
-                text: ClientInfoLogic.lineEditNameAliasText
-                onEditingFinished: {
-                    if (text !== ClientInfoLogic.lineEditNameAliasText) {
-                        ClientInfoLogic.lineEditNameAliasText = text
-                        ClientInfoLogic.onLineEditNameAliasEditingFinished()
-                    }
-                }
-            }
-
-            LabelType {
-                enabled: !ClientInfoLogic.busyIndicatorIsRunning
-                Layout.topMargin: 20
-                height: 21
-                text: qsTr("Public Key")
-            }
-
-            TextAreaType {
-                enabled: !ClientInfoLogic.busyIndicatorIsRunning
-                Layout.preferredHeight: 200
-                Layout.fillWidth: true
-
-                textArea.readOnly: true
-                textArea.wrapMode: TextEdit.WrapAnywhere
-                textArea.verticalAlignment: Text.AlignTop
-                textArea.text: ClientInfoLogic.textAreaWireGuardKeyData
-            }
-
-            BlueButtonType {
-                enabled: !ClientInfoLogic.busyIndicatorIsRunning
-                Layout.fillWidth: true
-                Layout.preferredHeight: 41
-                text: qsTr("Revoke Key")
-                onClicked: {
-                    ClientInfoLogic.onRevokeWireGuardKeyClicked()
-                    UiLogic.closePage()
-                }
-            }
-        }
-    }
-}
diff --git a/client/ui/qml/Pages/InstallSettings/InstallSettingsBase.qml b/client/ui/qml/Pages/InstallSettings/InstallSettingsBase.qml
deleted file mode 100644
index 8e04c605..00000000
--- a/client/ui/qml/Pages/InstallSettings/InstallSettingsBase.qml
+++ /dev/null
@@ -1,75 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-import "./"
-import "../../Controls"
-import "../../Config"
-
-Rectangle {
-    signal containerChecked(bool checked)
-    property bool initiallyChecked: false
-    property string containerDescription
-    default property alias itemSettings: container.data
-
-    x: 5
-    y: 5
-    width: parent.width - 20
-    anchors.horizontalCenter: parent.horizontalCenter
-
-    height: frame_settings.visible ? 140 : 72
-    border.width: 1
-    border.color: "lightgray"
-    radius: 2
-    Rectangle {
-        id: frame_settings
-        height: 77
-        width: parent.width
-        border.width: 1
-        border.color: "lightgray"
-        anchors.bottom: parent.bottom
-        anchors.bottomMargin: 5
-        anchors.horizontalCenter: parent.horizontalCenter
-        visible: false
-        radius: 2
-        Grid {
-            id: container
-            anchors.fill: parent
-            columns: 2
-            horizontalItemAlignment: Grid.AlignHCenter
-            verticalItemAlignment: Grid.AlignVCenter
-            topPadding: 5
-            leftPadding: 10
-            spacing: 5
-        }
-    }
-    Row {
-        anchors.top: parent.top
-        anchors.topMargin: 5
-        leftPadding: 15
-        rightPadding: 5
-        height: 55
-        width: parent.width
-        CheckBoxType {
-            text: containerDescription
-            height: parent.height
-            width: parent.width - 50
-            checked: initiallyChecked
-            onCheckedChanged: containerChecked(checked)
-        }
-        ImageButtonType {
-            width: 35
-            height: 35
-            anchors.verticalCenter: parent.verticalCenter
-            icon.source: "qrc:/images/settings.png"
-            checkable: true
-            checked: initiallyChecked
-            onCheckedChanged: {
-                //NewServerProtocolsLogic.pushButtonSettingsCloakChecked = checked
-                if (checked) {
-                    frame_settings.visible = true
-                } else {
-                    frame_settings.visible = false
-                }
-            }
-        }
-    }
-}
diff --git a/client/ui/qml/Pages/InstallSettings/SelectContainer.qml b/client/ui/qml/Pages/InstallSettings/SelectContainer.qml
deleted file mode 100644
index 59e8f464..00000000
--- a/client/ui/qml/Pages/InstallSettings/SelectContainer.qml
+++ /dev/null
@@ -1,200 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-import SortFilterProxyModel 0.2
-import ProtocolEnum 1.0
-import "./"
-import "../../Controls"
-import "../../Config"
-
-Drawer {
-    id: root
-    signal containerSelected(int c_index)
-    property int selectedIndex: -1
-
-    y: 0
-    x: 0
-    edge: Qt.RightEdge
-    width: parent.width * 0.85
-    height: parent.height
-
-    modal: true
-    interactive: activeFocus
-
-    SortFilterProxyModel {
-        id: proxyModel
-        sourceModel: UiLogic.containersModel
-        filters: [
-            ValueFilter {
-                roleName: "is_installed_role"
-                value: false },
-            ValueFilter {
-                roleName: "service_type_role"
-                value: ProtocolEnum.Vpn }
-        ]
-
-    }
-
-    SortFilterProxyModel {
-        id: proxyModel_other
-        sourceModel: UiLogic.containersModel
-        filters: [
-            ValueFilter {
-                roleName: "is_installed_role"
-                value: false },
-            ValueFilter {
-                roleName: "service_type_role"
-                value: ProtocolEnum.Other }
-        ]
-
-    }
-
-    FlickableType {
-        anchors.fill: parent
-        contentHeight: col.height
-
-        Column {
-            id: col
-            anchors {
-                left: parent.left;
-                right: parent.right;
-            }
-            topPadding: 20
-            spacing: 10
-
-            Caption {
-                id: cap1
-                text: qsTr("VPN containers")
-                font.pixelSize: 20
-
-            }
-
-            ListView {
-                id: tb
-                x: 10
-                currentIndex: -1
-                width: parent.width - 20
-                height: contentItem.height
-
-                spacing: 0
-                clip: true
-                interactive: false
-                model: proxyModel
-
-                delegate: Item {
-                    implicitWidth: 170 * 2
-                    implicitHeight: 30
-                    Item {
-                        width: parent.width
-                        height: 30
-                        anchors.left: parent.left
-                        id: c1
-                        Rectangle {
-                            anchors.top: parent.top
-                            width: parent.width
-                            height: 1
-                            color: "lightgray"
-                            visible: index !== tb.currentIndex
-                        }
-                        Rectangle {
-                            anchors.fill: parent
-                            color: "#63B4FB"
-                            visible: index === tb.currentIndex
-
-                        }
-                        Text {
-                            id: text_name
-                            text: name_role
-                            font.pixelSize: 16
-                            anchors.fill: parent
-                            leftPadding: 10
-                            verticalAlignment: Text.AlignVCenter
-                            wrapMode: Text.WordWrap
-                        }
-                    }
-
-                    MouseArea {
-                        anchors.fill: parent
-                        cursorShape: Qt.PointingHandCursor
-                        onClicked: {
-                            tb.currentIndex = index
-                            tb_other.currentIndex = -1
-                            containerSelected(proxyModel.mapToSource(index))
-                            selectedIndex = proxyModel.mapToSource(index)
-                            root.close()
-                        }
-                    }
-                }
-            }
-
-
-            Caption {
-                id: cap2
-                font.pixelSize: 20
-                text: qsTr("Other containers")
-            }
-
-            ListView {
-                id: tb_other
-                x: 10
-                currentIndex: -1
-                width: parent.width - 20
-                height: contentItem.height
-
-                spacing: 0
-                clip: true
-                interactive: false
-                model: proxyModel_other
-
-                delegate: Item {
-                    implicitWidth: 170 * 2
-                    implicitHeight: 30
-                    Item {
-                        width: parent.width
-                        height: 30
-                        anchors.left: parent.left
-                        id: c1_other
-                        Rectangle {
-                            anchors.top: parent.top
-                            width: parent.width
-                            height: 1
-                            color: "lightgray"
-                            visible: index !== tb_other.currentIndex
-                        }
-                        Rectangle {
-                            anchors.fill: parent
-                            color: "#63B4FB"
-                            visible: index === tb_other.currentIndex
-
-                        }
-                        Text {
-                            id: text_name_other
-                            text: name_role
-                            font.pixelSize: 16
-                            anchors.fill: parent
-                            leftPadding: 10
-                            verticalAlignment: Text.AlignVCenter
-                            wrapMode: Text.WordWrap
-                        }
-                    }
-
-                    MouseArea {
-                        anchors.fill: parent
-                        cursorShape: Qt.PointingHandCursor
-                        onClicked: {
-                            tb_other.currentIndex = index
-                            tb.currentIndex = -1
-                            containerSelected(proxyModel_other.mapToSource(index))
-                            selectedIndex = proxyModel_other.mapToSource(index)
-                            root.close()
-                        }
-                    }
-                }
-            }
-
-
-        }
-
-
-    }
-
-}
diff --git a/client/ui/qml/Pages/PageAbout.qml b/client/ui/qml/Pages/PageAbout.qml
deleted file mode 100644
index ab25c23e..00000000
--- a/client/ui/qml/Pages/PageAbout.qml
+++ /dev/null
@@ -1,90 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-import PageEnum 1.0
-import "./"
-import "../Controls"
-import "../Config"
-
-PageBase {
-    id: root
-    page: PageEnum.About
-
-    BackButton {
-        id: back_from_start
-    }
-
-    Caption {
-        id: caption
-        font.pixelSize: 22
-        text: qsTr("About Amnezia")
-    }
-
-    RichLabelType {
-        id: label_about
-        anchors.top: caption.bottom
-
-        text: qsTr("AmneziaVPN is opensource software, it's free forever. Our goal is to make the best VPN client in the world.
-<ul>
-<li>Sources on <a href=\"https://github.com/amnezia-vpn/desktop-client\">GitHub</a></li>
-<li><a href=\"https://amnezia.org/\">Web Site</a></li>
-<li><a href=\"https://t.me/amnezia_vpn_en\">Telegram group</a></li>
-<li><a href=\"https://signal.group/#CjQKIB2gUf8QH_IXnOJMGQWMDjYz9cNfmRQipGWLFiIgc4MwEhAKBONrSiWHvoUFbbD0xwdh\">Signal group</a></li>
-</ul>
-")
-    }
-
-    Caption {
-        id: caption2
-        anchors.topMargin: 20
-        font.pixelSize: 22
-        text: qsTr("Support")
-        anchors.top: label_about.bottom
-    }
-
-    RichLabelType {
-        id: label_support
-        anchors.top: caption2.bottom
-
-        text: qsTr("Have questions? You can get support by:
-<ul>
-<li><a href=\"https://t.me/amnezia_vpn_en\">Telegram group</a> (preferred way)</li>
-<li>Create issue on <a href=\"https://github.com/amnezia-vpn/desktop-client/issues\">GitHub</a></li>
-<li>Email to: <a href=\"support@amnezia.org\">support@amnezia.org</a></li>
-</ul>")
-    }
-
-    Caption {
-        id: caption3
-        anchors.topMargin: 20
-        font.pixelSize: 22
-        text: qsTr("Donate")
-        width: undefined
-        anchors.top: label_support.bottom
-    }
-
-    LabelType {
-        anchors.bottom: caption3.bottom
-        anchors.left: caption3.right
-        anchors.leftMargin: 5
-        font.pixelSize: 24
-        text: "♥"
-        color: "red"
-    }
-
-    RichLabelType {
-        id: label_donate
-        anchors.top: caption3.bottom
-
-        text: qsTr("Please support Amnezia project by donation, we really need it now more than ever.
-<ul>
-<li>By credit card on <a href=\"https://www.patreon.com/amneziavpn\">Patreon</a> (starting from $1)</li>
-<li>Send some coins to addresses listed <a href=\"https://github.com/amnezia-vpn/desktop-client/blob/master/README.md\">on GitHub page</a></li>
-</ul>
-")
-    }
-
-    Logo {
-        id: logo
-        anchors.bottom: parent.bottom
-    }
-}
diff --git a/client/ui/qml/Pages/PageAdvancedServerSettings.qml b/client/ui/qml/Pages/PageAdvancedServerSettings.qml
deleted file mode 100644
index 9f71b2ba..00000000
--- a/client/ui/qml/Pages/PageAdvancedServerSettings.qml
+++ /dev/null
@@ -1,118 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-import QtQuick.Layouts
-import PageEnum 1.0
-import "./"
-import "../Controls"
-import "../Config"
-
-PageBase {
-    id: root
-    page: PageEnum.AdvancedServerSettings
-    logic: AdvancedServerSettingsLogic
-
-    enabled: AdvancedServerSettingsLogic.pageEnabled
-
-    BackButton {
-        id: back
-    }
-
-    Caption {
-        id: caption
-        text: qsTr("Advanced server settings")
-        anchors.horizontalCenter: parent.horizontalCenter
-    }
-
-    BusyIndicator {
-        z: 99
-        anchors.horizontalCenter: parent.horizontalCenter
-        anchors.verticalCenter: parent.verticalCenter
-        visible: !AdvancedServerSettingsLogic.pageEnabled
-        running: !AdvancedServerSettingsLogic.pageEnabled
-    }
-
-    FlickableType {
-        id: fl
-        anchors.top: caption.bottom
-        anchors.bottom: logo.top
-        contentHeight: content.height
-
-        ColumnLayout {
-            id: content
-            enabled: logic.pageEnabled
-            anchors.top: parent.top
-            anchors.left: parent.left
-            anchors.right: parent.right
-            anchors.rightMargin: 15
-
-            LabelType {
-                Layout.fillWidth: true
-                font.pixelSize: 20
-                horizontalAlignment: Text.AlignHCenter
-                text: AdvancedServerSettingsLogic.labelCurrentVpnProtocolText
-            }
-
-            TextFieldType {
-                Layout.fillWidth: true
-                font.pixelSize: 20
-                horizontalAlignment: Text.AlignHCenter
-                text: AdvancedServerSettingsLogic.labelServerText
-                readOnly: true
-                background: Item {}
-            }
-
-            LabelType {
-                Layout.fillWidth: true
-                horizontalAlignment: Text.AlignHCenter
-                text: AdvancedServerSettingsLogic.labelWaitInfoText
-                visible: AdvancedServerSettingsLogic.labelWaitInfoVisible
-            }
-
-            BlueButtonType {
-                Layout.fillWidth: true
-                Layout.topMargin: 10
-                text: "Scan the server for installed containers"
-                visible: AdvancedServerSettingsLogic.pushButtonClearVisible
-                onClicked: {
-                    AdvancedServerSettingsLogic.onPushButtonScanServerClicked()
-                }
-            }
-
-            BlueButtonType {
-                Layout.fillWidth: true
-                Layout.topMargin: 10
-                text: AdvancedServerSettingsLogic.pushButtonClearText
-                visible: AdvancedServerSettingsLogic.pushButtonClearVisible
-                onClicked: {
-                    popupClearServer.open()
-                }
-            }
-
-            BlueButtonType {
-                Layout.topMargin: 10
-                Layout.fillWidth: true
-                text: qsTr("Clients Management")
-                onClicked: {
-                    UiLogic.goToPage(PageEnum.ClientManagement)
-                }
-            }
-
-            PopupWithQuestion {
-                id: popupClearServer
-                questionText: "Attention! All containers will be deleted on the server. This means that configuration files, keys and certificates will be deleted. Continue?"
-                yesFunc: function() {
-                    close()
-                    AdvancedServerSettingsLogic.onPushButtonClearServerClicked()
-                }
-                noFunc: function() {
-                    close()
-                }
-            }
-        }
-    }
-
-    Logo {
-        id : logo
-        anchors.bottom: parent.bottom
-    }
-}
diff --git a/client/ui/qml/Pages/PageAppSetting.qml b/client/ui/qml/Pages/PageAppSetting.qml
deleted file mode 100644
index 2bf0e306..00000000
--- a/client/ui/qml/Pages/PageAppSetting.qml
+++ /dev/null
@@ -1,152 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-import QtQuick.Layouts
-import PageEnum 1.0
-import "./"
-import "../Controls"
-import "../Config"
-
-PageBase {
-    id: root
-    page: PageEnum.AppSettings
-    logic: AppSettingsLogic
-
-    BackButton {
-        id: back
-    }
-    Caption {
-        id: caption
-        text: qsTr("Application Settings")
-    }
-
-    FlickableType {
-        id: fl
-        anchors.top: caption.bottom
-        contentHeight: content.height
-
-        ColumnLayout {
-            id: content
-            enabled: logic.pageEnabled
-            anchors.top: parent.top
-            anchors.left: parent.left
-            anchors.right: parent.right
-            anchors.rightMargin: 15
-
-            CheckBoxType {
-                visible: !GC.isMobile()
-                Layout.fillWidth: true
-                text: qsTr("Auto connect")
-                checked: AppSettingsLogic.checkBoxAutoConnectChecked
-                onCheckedChanged: {
-                    AppSettingsLogic.checkBoxAutoConnectChecked = checked
-                    AppSettingsLogic.onCheckBoxAutoconnectToggled(checked)
-                }
-            }
-            CheckBoxType {
-                visible: !GC.isMobile()
-                Layout.fillWidth: true
-                text: qsTr("Auto start")
-                checked: AppSettingsLogic.checkBoxAutostartChecked
-                onCheckedChanged: {
-                    AppSettingsLogic.checkBoxAutostartChecked = checked
-                    AppSettingsLogic.onCheckBoxAutostartToggled(checked)
-                }
-            }
-            CheckBoxType {
-                visible: !GC.isMobile()
-                Layout.fillWidth: true
-                text: qsTr("Start minimized")
-                checked: AppSettingsLogic.checkBoxStartMinimizedChecked
-                onCheckedChanged: {
-                    AppSettingsLogic.checkBoxStartMinimizedChecked = checked
-                    AppSettingsLogic.onCheckBoxStartMinimizedToggled(checked)
-                }
-            }
-            LabelType {
-                Layout.fillWidth: true
-                Layout.topMargin: 15
-                text: AppSettingsLogic.labelVersionText
-            }
-            BlueButtonType {
-                visible: !GC.isMobile()
-                Layout.fillWidth: true
-                text: qsTr("Check for updates")
-                onClicked: {
-                    Qt.openUrlExternally("https://github.com/amnezia-vpn/desktop-client/releases/latest")
-                }
-            }
-
-            CheckBoxType {
-                Layout.fillWidth: true
-                Layout.topMargin: 15
-                text: qsTr("Keep logs")
-                checked: AppSettingsLogic.checkBoxSaveLogsChecked
-                onCheckedChanged: {
-                    AppSettingsLogic.checkBoxSaveLogsChecked = checked
-                    AppSettingsLogic.onCheckBoxSaveLogsCheckedToggled(checked)
-                }
-            }
-            BlueButtonType {
-                Layout.fillWidth: true
-                text: qsTr("Open logs folder")
-                onClicked: {
-                    AppSettingsLogic.onPushButtonOpenLogsClicked()
-                }
-            }
-
-            BlueButtonType {
-                Layout.fillWidth: true
-                Layout.topMargin: 10
-                text: qsTr("Export logs")
-                onClicked: {
-                    AppSettingsLogic.onPushButtonExportLogsClicked()
-                }
-            }
-
-            BlueButtonType {
-                Layout.fillWidth: true
-                Layout.topMargin: 10
-
-                property string start_text: qsTr("Clear logs")
-                property string end_text: qsTr("Cleared")
-                text: start_text
-
-                Timer {
-                    id: timer
-                    interval: 1000; running: false; repeat: false
-                    onTriggered: parent.text = parent.start_text
-                }
-                onClicked: {
-                    text = end_text
-                    timer.running = true
-                    AppSettingsLogic.onPushButtonClearLogsClicked()
-                }
-            }
-
-            LabelType {
-                Layout.fillWidth: true
-                Layout.topMargin: 30
-                text: qsTr("Backup and restore configuration")
-            }
-
-            BlueButtonType {
-                Layout.fillWidth: true
-                Layout.topMargin: 10
-                Layout.preferredHeight: 41
-                text: qsTr("Backup app config")
-                onClicked: {
-                    AppSettingsLogic.onPushButtonBackupAppConfigClicked()
-                }
-            }
-            BlueButtonType {
-                Layout.fillWidth: true
-                Layout.topMargin: 10
-                Layout.preferredHeight: 41
-                text: qsTr("Restore app config")
-                onClicked: {
-                    AppSettingsLogic.onPushButtonRestoreAppConfigClicked()
-                }
-            }
-        }
-    }
-}
diff --git a/client/ui/qml/Pages/PageBase.qml b/client/ui/qml/Pages/PageBase.qml
deleted file mode 100644
index c398515b..00000000
--- a/client/ui/qml/Pages/PageBase.qml
+++ /dev/null
@@ -1,20 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-import PageEnum 1.0
-import "./"
-import "../Controls"
-import "../Config"
-
-Item {
-    id: root
-    property var page: PageEnum.Start
-    property var logic: UiLogic
-
-    property bool pageActive: false
-
-    signal activated(bool reset)
-    signal deactivated()
-
-    onActivated: pageActive = true
-    onDeactivated: pageActive = false
-}
diff --git a/client/ui/qml/Pages/PageClientManagement.qml b/client/ui/qml/Pages/PageClientManagement.qml
deleted file mode 100644
index 39defe4c..00000000
--- a/client/ui/qml/Pages/PageClientManagement.qml
+++ /dev/null
@@ -1,119 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-import QtQuick.Layouts
-import QtQuick.Shapes 1.4
-import SortFilterProxyModel 0.2
-import PageEnum 1.0
-import "./"
-import "../Controls"
-import "../Config"
-
-PageBase {
-    id: root
-    page: PageEnum.ClientManagement
-    logic: ClientManagementLogic
-    enabled: !ClientManagementLogic.busyIndicatorIsRunning
-
-    BackButton {
-        id: back
-    }
-
-    Caption {
-        id: caption
-        text: qsTr("Clients Management")
-    }
-
-    BusyIndicator {
-        z: 99
-        anchors.horizontalCenter: parent.horizontalCenter
-        anchors.verticalCenter: parent.verticalCenter
-        visible: ClientManagementLogic.busyIndicatorIsRunning
-        running: ClientManagementLogic.busyIndicatorIsRunning
-    }
-
-    FlickableType {
-        id: fl
-        anchors.top: caption.bottom
-        contentHeight: content.height
-
-        Column {
-            id: content
-            anchors.top: parent.top
-            anchors.left: parent.left
-            anchors.right: parent.right
-
-            LabelType {
-                font.pixelSize: 20
-                leftPadding: -20
-                anchors.horizontalCenter: parent.horizontalCenter
-                horizontalAlignment: Text.AlignHCenter
-                text: ClientManagementLogic.labelCurrentVpnProtocolText
-            }
-
-            SortFilterProxyModel {
-                id: proxyClientManagementModel
-                sourceModel: UiLogic.clientManagementModel
-                sorters: RoleSorter { roleName: "clientName" }
-            }
-
-            ListView {
-                id: lv_clients
-                width: parent.width
-                implicitHeight: contentHeight + 20
-                anchors.left: parent.left
-                anchors.right: parent.right
-                anchors.rightMargin: 20
-                topMargin: 10
-                spacing: 10
-                clip: true
-                model: proxyClientManagementModel
-                highlightRangeMode: ListView.ApplyRange
-                highlightMoveVelocity: -1
-                delegate: Item {
-                    implicitWidth: lv_clients.width
-                    implicitHeight: 60
-
-                    MouseArea {
-                        id: ms
-                        anchors.fill: parent
-                        hoverEnabled: true
-                        cursorShape: Qt.PointingHandCursor
-                        onClicked: {
-                            ClientManagementLogic.onClientItemClicked(proxyClientManagementModel.mapToSource(index))
-                        }
-                    }
-
-                    Rectangle {
-                        anchors.fill: parent
-                        gradient: ms.containsMouse ? gradient_containsMouse : gradient_notContainsMouse
-                        LinearGradient {
-                            id: gradient_notContainsMouse
-                            x1: 0 ; y1:0
-                            x2: 0 ; y2: height
-                            stops: [
-                                GradientStop { position: 0.0; color: "#FAFBFE" },
-                                GradientStop { position: 1.0; color: "#ECEEFF" }
-                            ]
-                        }
-                        LinearGradient {
-                            id: gradient_containsMouse
-                            x1: 0 ; y1:0
-                            x2: 0 ; y2: height
-                            stops: [
-                                GradientStop { position: 0.0; color: "#FAFBFE" },
-                                GradientStop { position: 1.0; color: "#DCDEDF" }
-                            ]
-                        }
-                    }
-
-                    LabelType {
-                        x: 20
-                        y: 20
-                        font.pixelSize: 20
-                        text: clientName
-                    }
-                }
-            }
-        }
-    }
-}
diff --git a/client/ui/qml/Pages/PageGeneralSettings.qml b/client/ui/qml/Pages/PageGeneralSettings.qml
deleted file mode 100644
index c85aa8a7..00000000
--- a/client/ui/qml/Pages/PageGeneralSettings.qml
+++ /dev/null
@@ -1,166 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-import QtQuick.Layouts
-import PageEnum 1.0
-import "./"
-import "../Controls"
-import "../Config"
-
-PageBase {
-    id: root
-    page: PageEnum.GeneralSettings
-    logic: GeneralSettingsLogic
-
-    BackButton {
-        id: back
-        z: -1
-    }
-
-    FlickableType {
-        id: fl
-        anchors.top: back.bottom
-        anchors.topMargin: 0
-        anchors.bottomMargin: 10
-        contentHeight: content.height
-
-        ColumnLayout {
-            id: content
-            enabled: logic.pageEnabled
-            anchors.top: parent.top
-            anchors.topMargin: 10
-            anchors.left: parent.left
-            anchors.right: parent.right
-            anchors.rightMargin: GC.defaultMargin
-
-            spacing: 15
-
-
-            // ---------- App settings ------------
-            Rectangle {
-                Layout.fillWidth: true
-                Layout.preferredHeight: 1
-                color: "#DDDDDD"
-            }
-            SettingButtonType {
-                Layout.fillWidth: true
-                Layout.preferredHeight: 30
-                icon.source: "qrc:/images/svg/settings_black_24dp.svg"
-                text: qsTr("App settings")
-                onClicked: {
-                    UiLogic.goToPage(PageEnum.AppSettings)
-                }
-            }
-
-            // ---------- Network settings ------------
-            Rectangle {
-                Layout.fillWidth: true
-                Layout.preferredHeight: 1
-                color: "#DDDDDD"
-            }
-            SettingButtonType {
-                Layout.fillWidth: true
-                Layout.preferredHeight: 30
-                icon.source: "qrc:/images/svg/settings_suggest_black_24dp.svg"
-                text: qsTr("Network settings")
-                onClicked: {
-                    UiLogic.goToPage(PageEnum.NetworkSettings)
-                }
-            }
-
-            // ---------- Server settings ------------
-            Rectangle {
-                Layout.fillWidth: true
-                Layout.preferredHeight: 1
-                color: "#DDDDDD"
-            }
-            SettingButtonType {
-                Layout.fillWidth: true
-                Layout.preferredHeight: 30
-                icon.source: "qrc:/images/svg/vpn_key_black_24dp.svg"
-                text: qsTr("Server Settings")
-                enabled: GeneralSettingsLogic.existsAnyServer
-                onClicked: {
-                    GeneralSettingsLogic.onPushButtonGeneralSettingsServerSettingsClicked()
-                }
-            }
-
-            // ---------- Share connection ------------
-            Rectangle {
-                Layout.fillWidth: true
-                Layout.preferredHeight: 1
-                color: "#DDDDDD"
-            }
-            SettingButtonType {
-                Layout.fillWidth: true
-                Layout.preferredHeight: 30
-                icon.source: "qrc:/images/svg/share_black_24dp.svg"
-                text: qsTr("Share connection")
-                enabled: GeneralSettingsLogic.pushButtonGeneralSettingsShareConnectionEnable &&
-                         GeneralSettingsLogic.existsAnyServer
-                onClicked: {
-                    GeneralSettingsLogic.onPushButtonGeneralSettingsShareConnectionClicked()
-                }
-            }
-
-            // ---------- Servers ------------
-            Rectangle {
-                Layout.fillWidth: true
-                Layout.preferredHeight: 1
-                color: "#DDDDDD"
-            }
-            SettingButtonType {
-                Layout.fillWidth: true
-                Layout.preferredHeight: 30
-                icon.source: "qrc:/images/svg/format_list_bulleted_black_24dp.svg"
-                text: qsTr("Servers")
-                enabled: GeneralSettingsLogic.existsAnyServer
-                onClicked: {
-                    UiLogic.goToPage(PageEnum.ServersList)
-                }
-            }
-
-            // ---------- Add server ------------
-            Rectangle {
-                Layout.fillWidth: true
-                Layout.preferredHeight: 1
-                color: "#DDDDDD"
-            }
-            SettingButtonType {
-                Layout.fillWidth: true
-                Layout.preferredHeight: 30
-                icon.source: "qrc:/images/svg/control_point_black_24dp.svg"
-                text: qsTr("Add server")
-                onClicked: {
-                    if(GeneralSettingsLogic.existsAnyServer)
-                        // If there is any server set we will go to Start Page
-                        UiLogic.goToPage(PageEnum.Start)
-                    else
-                        // Else just come back to start page
-                        UiLogic.closePage()
-                }
-            }
-
-            Rectangle {
-                Layout.fillWidth: true
-                Layout.preferredHeight: 1
-                color: "#DDDDDD"
-            }
-
-            Rectangle {
-                Layout.fillWidth: true
-                Layout.preferredHeight: fl.height > (75+1) * 6 ? fl.height - (75+1) * 6 : 0
-            }
-
-            SettingButtonType {
-                Layout.fillWidth: true
-                Layout.preferredHeight: 30
-                Layout.bottomMargin: 20
-                icon.source: "qrc:/images/svg/logout_black_24dp.svg"
-                text: qsTr("Exit")
-                onClicked: {
-                    Qt.quit()
-                }
-            }
-        }
-    }
-}
diff --git a/client/ui/qml/Pages/PageNetworkSetting.qml b/client/ui/qml/Pages/PageNetworkSetting.qml
deleted file mode 100644
index e14c04a6..00000000
--- a/client/ui/qml/Pages/PageNetworkSetting.qml
+++ /dev/null
@@ -1,113 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-import QtQuick.Layouts
-import PageEnum 1.0
-import "./"
-import "../Controls"
-import "../Config"
-
-PageBase {
-    id: root
-    page: PageEnum.NetworkSettings
-    logic: NetworkSettingsLogic
-
-    BackButton {
-        id: back
-    }
-    Caption {
-        id: caption
-        text: qsTr("DNS Servers")
-    }
-
-    FlickableType {
-        id: fl
-        anchors.top: caption.bottom
-        contentHeight: content.height
-
-        ColumnLayout {
-            id: content
-            enabled: logic.pageEnabled
-            anchors.top: parent.top
-            anchors.left: parent.left
-            anchors.right: parent.right
-            anchors.rightMargin: 15
-
-            CheckBoxType {
-                Layout.preferredWidth: parent.width
-                text: qsTr("Use AmneziaDNS service (recommended)")
-                checked: NetworkSettingsLogic.checkBoxUseAmneziaDnsChecked
-                onCheckedChanged: {
-                    NetworkSettingsLogic.checkBoxUseAmneziaDnsChecked = checked
-                    NetworkSettingsLogic.onCheckBoxUseAmneziaDnsToggled(checked)
-                    UiLogic.onUpdateAllPages()
-                }
-            }
-
-            LabelType {
-                Layout.preferredWidth: parent.width
-                text: qsTr("Use AmneziaDNS container on your server, when it installed.\n
-Your AmneziaDNS server available only when it installed and VPN connected, it has internal IP address 172.29.172.254\n
-If AmneziaDNS service is not installed on the same server, or this option is unchecked, the following DNS servers will be used:")
-            }
-
-            LabelType {
-                Layout.topMargin: 15
-                text: qsTr("Primary DNS server")
-            }
-            TextFieldType {
-                height: 40
-                implicitWidth: parent.width
-                text: NetworkSettingsLogic.lineEditDns1Text
-                onEditingFinished: {
-                    NetworkSettingsLogic.lineEditDns1Text = text
-                    NetworkSettingsLogic.onLineEditDns1EditFinished(text)
-                    UiLogic.onUpdateAllPages()
-                }
-                validator: RegularExpressionValidator {
-                    regularExpression: NetworkSettingsLogic.ipAddressRegex
-                }
-            }
-
-            UrlButtonType {
-                text: qsTr("Reset to default")
-                label.horizontalAlignment: Text.AlignLeft
-                label.verticalAlignment: Text.AlignTop
-                label.font.pixelSize: 14
-                icon.source: "qrc:/images/svg/refresh_black_24dp.svg"
-                onClicked: {
-                    NetworkSettingsLogic.onPushButtonResetDns1Clicked()
-                    UiLogic.onUpdateAllPages()
-                }
-            }
-
-            LabelType {
-                text: qsTr("Secondary DNS server")
-            }
-            TextFieldType {
-                height: 40
-                implicitWidth: parent.width
-                text: NetworkSettingsLogic.lineEditDns2Text
-                onEditingFinished: {
-                    NetworkSettingsLogic.lineEditDns2Text = text
-                    NetworkSettingsLogic.onLineEditDns2EditFinished(text)
-                    UiLogic.onUpdateAllPages()
-                }
-                validator: RegularExpressionValidator {
-                    regularExpression: NetworkSettingsLogic.ipAddressRegex
-                }
-            }
-
-            UrlButtonType {
-                text: qsTr("Reset to default")
-                label.horizontalAlignment: Text.AlignLeft
-                label.verticalAlignment: Text.AlignTop
-                label.font.pixelSize: 14
-                icon.source: "qrc:/images/svg/refresh_black_24dp.svg"
-                onClicked: {
-                    NetworkSettingsLogic.onPushButtonResetDns2Clicked()
-                    UiLogic.onUpdateAllPages()
-                }
-            }
-        }
-    }
-}
diff --git a/client/ui/qml/Pages/PageNewServer.qml b/client/ui/qml/Pages/PageNewServer.qml
deleted file mode 100644
index 00cb51bc..00000000
--- a/client/ui/qml/Pages/PageNewServer.qml
+++ /dev/null
@@ -1,61 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-import PageEnum 1.0
-import "./"
-import "../Controls"
-import "../Config"
-
-PageBase {
-    id: root
-    page: PageEnum.NewServer
-
-    BackButton {
-        id: back_from_new_server
-    }
-    Caption {
-        id: caption
-        text: qsTr("Setup your server to use VPN")
-    }
-    LabelType {
-        id: labelWizard
-        horizontalAlignment: Text.AlignHCenter
-        verticalAlignment: Text.AlignVCenter
-        text: qsTr("If you want easily configure your server just run Wizard")
-        anchors.horizontalCenter: parent.horizontalCenter
-        anchors.top: caption.bottom
-        anchors.topMargin: 30
-    }
-    BlueButtonType {
-        id: pushButtonWizard
-        text: qsTr("Run Setup Wizard")
-        anchors.horizontalCenter: parent.horizontalCenter
-        anchors.top: labelWizard.bottom
-        anchors.topMargin: 10
-        onClicked: {
-            UiLogic.goToPage(PageEnum.Wizard);
-        }
-    }
-    LabelType {
-        id: labelManual
-        horizontalAlignment: Text.AlignHCenter
-        verticalAlignment: Text.AlignVCenter
-        text: qsTr("Press configure manually to choose VPN protocols you want to install")
-        anchors.horizontalCenter: parent.horizontalCenter
-        anchors.top: pushButtonWizard.bottom
-        anchors.topMargin: 40
-    }
-
-    BlueButtonType {
-        text: qsTr("Configure")
-        anchors.horizontalCenter: parent.horizontalCenter
-        anchors.top: labelManual.bottom
-        anchors.topMargin: 10
-        onClicked: {
-            UiLogic.goToPage(PageEnum.NewServerProtocols);
-        }
-    }
-
-    Logo {
-        anchors.bottom: parent.bottom
-    }
-}
diff --git a/client/ui/qml/Pages/PageNewServerProtocols.qml b/client/ui/qml/Pages/PageNewServerProtocols.qml
deleted file mode 100644
index 0ce2090f..00000000
--- a/client/ui/qml/Pages/PageNewServerProtocols.qml
+++ /dev/null
@@ -1,154 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-import QtQuick.Layouts
-import ContainerProps 1.0
-import ProtocolProps 1.0
-import PageEnum 1.0
-import "./"
-import "../Controls"
-import "../Config"
-import "InstallSettings"
-
-PageBase {
-    id: root
-    page: PageEnum.NewServerProtocols
-    logic: NewServerProtocolsLogic
-
-    onActivated: {
-        container_selector.selectedIndex = -1
-        UiLogic.containersModel.setSelectedServerIndex(-1)
-    }
-
-    BackButton {
-        id: back
-    }
-    Caption {
-        id: caption
-        text: qsTr("Select VPN protocols")
-    }
-
-    BlueButtonType {
-        id: pushButtonConfigure
-        enabled: container_selector.selectedIndex > 0
-        anchors.horizontalCenter: parent.horizontalCenter
-        y: parent.height - 60
-        width: parent.width - 40
-        height: 40
-        text: qsTr("Setup server")
-        onClicked: {
-            let cont = container_selector.selectedIndex
-            let tp = ProtocolProps.transportProtoFromString(cb_port_proto.currentText)
-            let port = tf_port_num.text
-            NewServerProtocolsLogic.onPushButtonConfigureClicked(cont, port, tp)
-        }
-    }
-
-    BlueButtonType {
-        id: pb_add_container
-        anchors.horizontalCenter: parent.horizontalCenter
-        anchors.top: caption.bottom
-        anchors.topMargin: 10
-
-        width: parent.width - 40
-        height: 40
-        text: qsTr("Select protocol container")
-        font.pixelSize: 16
-        onClicked: container_selector.visible ? container_selector.close() : container_selector.open()
-
-    }
-
-    SelectContainer {
-        id: container_selector
-        onAboutToHide: {
-            pageLoader.focus = true
-        }
-
-        onContainerSelected: function(c_index){
-            var containerProto =  ContainerProps.defaultProtocol(c_index)
-
-            tf_port_num.text = ProtocolProps.defaultPort(containerProto)
-            cb_port_proto.currentIndex = ProtocolProps.defaultTransportProto(containerProto)
-
-            tf_port_num.enabled = ProtocolProps.defaultPortChangeable(containerProto)
-            cb_port_proto.enabled = ProtocolProps.defaultTransportProtoChangeable(containerProto)
-        }
-    }
-
-    Column {
-        id: c1
-        visible: container_selector.selectedIndex > 0
-        width: parent.width
-        anchors.top: pb_add_container.bottom
-        anchors.topMargin: 10
-
-        Caption {
-            font.pixelSize: 22
-            text: UiLogic.containerName(container_selector.selectedIndex)
-        }
-
-        Text {
-            width: parent.width
-            anchors.topMargin: 10
-            padding: 10
-
-            font.family: "Lato"
-            font.styleName: "normal"
-            font.pixelSize: 16
-            color: "#181922"
-            horizontalAlignment: Text.AlignHCenter
-            verticalAlignment: Text.AlignVCenter
-            wrapMode: Text.Wrap
-
-            text: UiLogic.containerDesc(container_selector.selectedIndex)
-        }
-    }
-
-
-
-    Rectangle {
-        id: frame_settings
-        visible: container_selector.selectedIndex > 0
-        width: parent.width
-        anchors.top: c1.bottom
-        anchors.topMargin: 10
-
-        border.width: 1
-        border.color: "lightgray"
-        anchors.bottomMargin: 5
-        anchors.horizontalCenter: parent.horizontalCenter
-        radius: 2
-        Grid {
-            id: grid
-            visible: container_selector.selectedIndex > 0
-            anchors.fill: parent
-            columns: 2
-            horizontalItemAlignment: Grid.AlignHCenter
-            verticalItemAlignment: Grid.AlignVCenter
-            topPadding: 5
-            leftPadding: 10
-            spacing: 5
-
-
-            LabelType {
-                width: 130
-                text: qsTr("Port")
-            }
-            TextFieldType {
-                id: tf_port_num
-                width: parent.width - 130 - parent.spacing - parent.leftPadding * 2
-            }
-            LabelType {
-                width: 130
-                text: qsTr("Network Protocol")
-            }
-            ComboBoxType {
-                id: cb_port_proto
-                width: parent.width - 130 - parent.spacing - parent.leftPadding * 2
-                model: [
-                    qsTr("udp"),
-                    qsTr("tcp"),
-                ]
-            }
-        }
-    }
-}
diff --git a/client/ui/qml/Pages/PageQrDecoderIos.qml b/client/ui/qml/Pages/PageQrDecoderIos.qml
deleted file mode 100644
index 21bdbfe7..00000000
--- a/client/ui/qml/Pages/PageQrDecoderIos.qml
+++ /dev/null
@@ -1,94 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-import PageEnum 1.0
-import QRCodeReader 1.0
-
-import "./"
-import "../Controls"
-import "../Config"
-
-PageBase {
-    id: root
-    page: PageEnum.QrDecoderIos
-    logic: QrDecoderLogic
-
-    onDeactivated: {
-        console.debug("Stopping QR decoder")
-        loader.sourceComponent = undefined
-    }
-
-    BackButton {
-    }
-    Caption {
-        id: caption
-        text: qsTr("Import configuration")
-    }
-
-    Connections {
-        target: Qt.platform.os == "ios" ? QrDecoderLogic : null
-        function onStartDecode() {
-            console.debug("Starting QR decoder")
-            loader.sourceComponent = component
-        }
-        function onStopDecode() {
-            console.debug("Stopping QR decoder")
-            loader.sourceComponent = undefined
-        }
-    }
-
-    Loader {
-        id: loader
-
-        anchors.top: caption.bottom
-        anchors.bottom: progressColumn.top
-        anchors.left: parent.left
-        anchors.right: parent.right
-    }
-
-    Column{
-    height: 40
-    id: progressColumn
-    anchors.bottom: parent.bottom
-    anchors.left: parent.left
-    anchors.right: parent.right
-        ProgressBar {
-            id: progress
-            anchors.left: parent.left
-            anchors.right: parent.right
-            value: QrDecoderLogic.totalChunksCount === 0? 0 : (QrDecoderLogic.receivedChunksCount/QrDecoderLogic.totalChunksCount)
-        }
-        Text {
-            id: chunksCount
-            text: "Progress: " + QrDecoderLogic.receivedChunksCount +"/"+QrDecoderLogic.totalChunksCount
-        }
-    }
-
-    Component {
-        id: component
-
-        Item {
-            anchors.fill: parent
-
-            QRCodeReader {
-                id: qrCodeReader
-
-                onCodeReaded: {
-                    QrDecoderLogic.onDetectedQrCode(code)
-                }
-
-                Component.onCompleted: {
-                    qrCodeReader.setCameraSize(Qt.rect(loader.x,
-                                                       loader.y,
-                                                       loader.width,
-                                                       loader.height))
-                    qrCodeReader.startReading()
-                }
-                Component.onDestruction: qrCodeReader.stopReading()
-            }
-
-        }
-
-    }
-
-
-}
diff --git a/client/ui/qml/Pages/PageServerConfiguringProgress.qml b/client/ui/qml/Pages/PageServerConfiguringProgress.qml
deleted file mode 100644
index 04f1b6f5..00000000
--- a/client/ui/qml/Pages/PageServerConfiguringProgress.qml
+++ /dev/null
@@ -1,121 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-import PageEnum 1.0
-import "./"
-import "../Controls"
-import "../Config"
-
-PageBase {
-    id: root
-    page: PageEnum.ServerConfiguringProgress
-    logic: ServerConfiguringProgressLogic
-
-    Caption {
-        id: caption
-        text: qsTr("Configuring...")
-    }
-    LabelType {
-        id: label
-        x: 0
-        anchors.top: caption.bottom
-        anchors.topMargin: 10
-
-        width: parent.width
-        height: 31
-        text: qsTr("Please wait.")
-        horizontalAlignment: Text.AlignHCenter
-    }
-
-    LabelType {
-        id: labelServerBusy
-        x: 0
-        anchors.top: label.bottom
-        anchors.topMargin: 30
-
-        anchors.horizontalCenter: parent.horizontalCenter
-        horizontalAlignment: Text.AlignHCenter
-
-        width: parent.width - 40
-        height: 41
-
-        text: ServerConfiguringProgressLogic.labelServerBusyText
-        visible: ServerConfiguringProgressLogic.labelServerBusyVisible
-    }
-
-    LabelType {
-        anchors.bottom: pr.top
-        anchors.bottomMargin: 20
-
-        anchors.horizontalCenter: parent.horizontalCenter
-        horizontalAlignment: Text.AlignHCenter
-
-        width: parent.width - 40
-        height: 41
-        text: ServerConfiguringProgressLogic.labelWaitInfoText
-        visible: ServerConfiguringProgressLogic.labelWaitInfoVisible
-    }
-
-
-    BlueButtonType {
-        id: pb_cancel
-        z: 1
-        anchors.horizontalCenter: parent.horizontalCenter
-        anchors.bottom: logo.bottom
-        anchors.bottomMargin: 40
-        width: root.width - 60
-        height: 40
-        text: qsTr("Cancel")
-        visible: ServerConfiguringProgressLogic.pushButtonCancelVisible
-        enabled: ServerConfiguringProgressLogic.pushButtonCancelVisible
-        onClicked: {
-            ServerConfiguringProgressLogic.onPushButtonCancelClicked()
-        }
-    }
-
-    ProgressBar {
-        id: pr
-        enabled: ServerConfiguringProgressLogic.pageEnabled
-        anchors.fill: pb_cancel
-        from: 0
-        to: ServerConfiguringProgressLogic.progressBarMaximum
-        value: ServerConfiguringProgressLogic.progressBarValue
-        visible: ServerConfiguringProgressLogic.progressBarVisible
-        background: Rectangle {
-            implicitWidth: parent.width
-            implicitHeight: parent.height
-            color: "#100A44"
-            radius: 4
-        }
-
-        contentItem: Item {
-            implicitWidth: parent.width
-            implicitHeight: parent.height
-            Rectangle {
-                width: pr.visualPosition * parent.width
-                height: parent.height
-                radius: 4
-                color: Qt.rgba(255, 255, 255, 0.15);
-            }
-        }
-
-        LabelType {
-            anchors.left: parent.left
-            anchors.right: parent.right
-            anchors.verticalCenter: parent.verticalCenter
-            text: ServerConfiguringProgressLogic.progressBarText
-            horizontalAlignment: Text.AlignHCenter
-            verticalAlignment: Text.AlignVCenter
-            font.family: "Lato"
-            font.styleName: "normal"
-            font.pixelSize: 16
-            color: "#D4D4D4"
-            visible: ServerConfiguringProgressLogic.progressBarTextVisible
-        }
-    }
-
-    Logo {
-        id : logo
-        anchors.horizontalCenter: parent.horizontalCenter
-        anchors.bottom: parent.bottom
-    }
-}
diff --git a/client/ui/qml/Pages/PageServerContainers.qml b/client/ui/qml/Pages/PageServerContainers.qml
deleted file mode 100644
index ddd607b0..00000000
--- a/client/ui/qml/Pages/PageServerContainers.qml
+++ /dev/null
@@ -1,434 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-import Qt.labs.platform
-import QtQuick.Layouts
-import SortFilterProxyModel 0.2
-import ContainerProps 1.0
-import ProtocolProps 1.0
-import PageEnum 1.0
-import ProtocolEnum 1.0
-import "./"
-import "../Controls"
-import "../Config"
-import "InstallSettings"
-
-PageBase {
-    id: root
-    page: PageEnum.ServerContainers
-    logic: ServerContainersLogic
-
-    enabled: ServerContainersLogic.pageEnabled
-
-    function resetPage() {
-        container_selector.selectedIndex = -1
-    }
-
-    Connections {
-        target: logic
-        function onUpdatePage() {
-            root.resetPage()
-        }
-    }
-
-    BackButton {
-        id: back
-        onClicked: tb_c.currentIndex = -1
-    }
-    Caption {
-        id: caption
-        text: container_selector.selectedIndex > 0 ? qsTr("Install new service") : qsTr("Installed services")
-    }
-
-    SelectContainer {
-        id: container_selector
-
-        onAboutToHide: {
-            pageLoader.focus = true
-        }
-
-        onContainerSelected: function(c_index) {
-            var containerProto =  ContainerProps.defaultProtocol(c_index)
-
-
-            if (ProtocolProps.defaultPort(containerProto) < 0) {
-                tf_port_num.enabled = false
-                tf_port_num.text = qsTr("Default")
-            }
-            else tf_port_num.text = ProtocolProps.defaultPort(containerProto)
-            cb_port_proto.currentIndex = ProtocolProps.defaultTransportProto(containerProto)
-
-            tf_port_num.enabled = ProtocolProps.defaultPortChangeable(containerProto)
-            cb_port_proto.enabled = ProtocolProps.defaultTransportProtoChangeable(containerProto)
-        }
-    }
-
-    Column {
-        id: c1
-        visible: container_selector.selectedIndex > 0
-        width: parent.width
-        anchors.top: caption.bottom
-        anchors.topMargin: 10
-
-        Caption {
-            font.pixelSize: 22
-            text: UiLogic.containerName(container_selector.selectedIndex)
-        }
-
-        Text {
-            width: parent.width
-            anchors.topMargin: 10
-            padding: 10
-
-            font.family: "Lato"
-            font.styleName: "normal"
-            font.pixelSize: 16
-            color: "#181922"
-            horizontalAlignment: Text.AlignHCenter
-            verticalAlignment: Text.AlignVCenter
-            wrapMode: Text.Wrap
-
-            text: UiLogic.containerDesc(container_selector.selectedIndex)
-        }
-    }
-
-    Rectangle {
-        id: frame_settings
-        visible: container_selector.selectedIndex > 0
-        width: parent.width
-        anchors.top: c1.bottom
-        anchors.topMargin: 10
-
-        border.width: 1
-        border.color: "lightgray"
-        anchors.bottomMargin: 5
-        anchors.horizontalCenter: parent.horizontalCenter
-        radius: 2
-        Grid {
-            id: grid
-            visible: container_selector.selectedIndex > 0
-            anchors.fill: parent
-            columns: 2
-            horizontalItemAlignment: Grid.AlignHCenter
-            verticalItemAlignment: Grid.AlignVCenter
-            topPadding: 5
-            leftPadding: 10
-            spacing: 5
-
-
-            LabelType {
-                width: 130
-                text: qsTr("Port")
-            }
-            TextFieldType {
-                id: tf_port_num
-                width: parent.width - 130 - parent.spacing - parent.leftPadding * 2
-            }
-            LabelType {
-                width: 130
-                text: qsTr("Network Protocol")
-            }
-            ComboBoxType {
-                id: cb_port_proto
-                width: parent.width - 130 - parent.spacing - parent.leftPadding * 2
-                model: [
-                    qsTr("udp"),
-                    qsTr("tcp"),
-                ]
-            }
-        }
-    }
-
-    BlueButtonType {
-        id: pb_cancel_add
-        visible: container_selector.selectedIndex > 0
-
-        anchors.horizontalCenter: parent.horizontalCenter
-        anchors.bottom: pb_continue_add.top
-        anchors.bottomMargin: 20
-
-        width: parent.width - 40
-        height: 40
-        text: qsTr("Cancel")
-        font.pixelSize: 16
-        onClicked: container_selector.selectedIndex = -1
-
-    }
-
-    BlueButtonType {
-        id: pb_continue_add
-        visible: container_selector.selectedIndex > 0
-
-        anchors.horizontalCenter: parent.horizontalCenter
-        anchors.bottom: parent.bottom
-        anchors.bottomMargin: 20
-
-        width: parent.width - 40
-        height: 40
-        text: qsTr("Continue")
-        font.pixelSize: 16
-        onClicked: {
-            let cont = container_selector.selectedIndex
-            let tp = ProtocolProps.transportProtoFromString(cb_port_proto.currentText)
-            let port = tf_port_num.text
-            ServerContainersLogic.onPushButtonContinueClicked(cont, port, tp)
-        }
-    }
-
-    FlickableType {
-        visible: container_selector.selectedIndex <= 0
-        clip: true
-        width: parent.width
-        anchors.top: caption.bottom
-        anchors.bottom: pb_add_container.top
-        contentHeight: col.height
-
-        Column {
-            visible: container_selector.selectedIndex <= 0
-            id: col
-            anchors {
-                left: parent.left;
-                right: parent.right;
-            }
-            spacing: 10
-
-            Caption {
-                id: cap1
-                text: qsTr("Installed Protocols and Services")
-                leftPadding: -20
-                font.pixelSize: 20
-
-            }
-
-            SortFilterProxyModel {
-                id: proxyContainersModel
-                sourceModel: UiLogic.containersModel
-                filters: ValueFilter {
-                    roleName: "is_installed_role"
-                    value: true
-                }
-            }
-
-            SortFilterProxyModel {
-                id: proxyProtocolsModel
-                sourceModel: UiLogic.protocolsModel
-                filters: ValueFilter {
-                    roleName: "is_installed_role"
-                    value: true
-                }
-            }
-
-
-            ListView {
-                id: tb_c
-                width: parent.width - 10
-                height: tb_c.contentItem.height
-                currentIndex: -1
-                spacing: 5
-                clip: true
-                interactive: false
-                model: proxyContainersModel
-
-                delegate: Item {
-                    implicitWidth: tb_c.width - 10
-                    implicitHeight: c_item.height
-                    Item {
-                        id: c_item
-                        width: parent.width
-                        height: row_container.height + tb_p.height
-                        anchors.left: parent.left
-                        Rectangle {
-                            anchors.top: parent.top
-                            width: parent.width
-                            height: 1
-                            color: "lightgray"
-                            visible: index !== tb_c.currentIndex
-                        }
-                        Rectangle {
-                            anchors.top: row_container.top
-                            anchors.bottom: row_container.bottom
-                            anchors.left: parent.left
-                            anchors.right: parent.right
-
-                            color: "#63B4FB"
-                            visible: index === tb_c.currentIndex
-                        }
-
-                        RowLayout {
-                            id: row_container
-                            anchors.left: parent.left
-                            anchors.right: parent.right
-
-                            Text {
-                                id: lb_container_name
-                                text: name_role
-                                font.pixelSize: 17
-                                color: "#100A44"
-                                topPadding: 16
-                                bottomPadding: 12
-                                leftPadding: 10
-                                verticalAlignment: Text.AlignVCenter
-                                wrapMode: Text.WordWrap
-                                Layout.fillWidth: true
-
-                                MouseArea {
-                                    enabled: col.visible
-                                    anchors.top: lb_container_name.top
-                                    anchors.bottom: lb_container_name.bottom
-                                    anchors.left: parent.left
-                                    anchors.right: parent.right
-                                    propagateComposedEvents: true
-                                    onClicked: {
-                                        if (tb_c.currentIndex === index) tb_c.currentIndex = -1
-                                        else tb_c.currentIndex = index
-
-                                        UiLogic.protocolsModel.setSelectedDockerContainer(proxyContainersModel.mapToSource(index))
-                                    }
-                                }
-                            }
-
-                            ImageButtonType {
-                                id: button_remove
-                                visible: (index === tb_c.currentIndex) && ServerContainersLogic.isManagedServer
-                                Layout.alignment: Qt.AlignRight
-                                checkable: true
-                                icon.source: "qrc:/images/delete.png"
-                                implicitWidth: 30
-                                implicitHeight: 30
-
-                                checked: default_role
-                                onClicked: popupRemove.open()
-
-                                VisibleBehavior on visible { }
-                            }
-
-                            PopupWithQuestion {
-                                id: popupRemove
-                                questionText: qsTr("Remove container") + " " + name_role + "?" + "\n" + qsTr("This action will erase all data of this container on the server.")
-                                yesFunc: function() {
-                                    tb_c.currentIndex = -1
-                                    ServerContainersLogic.onPushButtonRemoveClicked(proxyContainersModel.mapToSource(index))
-                                    close()
-                                }
-                                noFunc: function() {
-                                    close()
-                                }
-                            }
-
-                            ImageButtonType {
-                                id: button_share
-                                visible: (index === tb_c.currentIndex) && ServerContainersLogic.isManagedServer
-                                Layout.alignment: Qt.AlignRight
-                                icon.source: "qrc:/images/share.png"
-                                implicitWidth: 30
-                                implicitHeight: 30
-                                onClicked: {
-                                    ServerContainersLogic.onPushButtonShareClicked(proxyContainersModel.mapToSource(index))
-                                }
-
-                                VisibleBehavior on visible { }
-                            }
-
-                            ImageButtonType {
-                                id: button_default
-                                visible: service_type_role == ProtocolEnum.Vpn
-
-                                Layout.alignment: Qt.AlignRight
-                                checkable: true
-                                img.source: checked ? "qrc:/images/check.png" : "qrc:/images/uncheck.png"
-                                implicitWidth: 30
-                                implicitHeight: 30
-
-                                checked: default_role
-                                onClicked: {
-                                    ServerContainersLogic.onPushButtonDefaultClicked(proxyContainersModel.mapToSource(index))
-                                }
-                            }
-                        }
-
-
-                        ListView {
-                            id: tb_p
-                            currentIndex: -1
-                            x: 10
-                            anchors.top: row_container.bottom
-
-                            width: parent.width - 40
-                            height: index === tb_c.currentIndex ? tb_p.contentItem.height : 0
-                            implicitHeight: height
-
-                            spacing: 0
-                            clip: true
-                            interactive: false
-                            model: proxyProtocolsModel
-
-
-                            Behavior on height {
-                                NumberAnimation {
-                                    duration: 200
-                                }
-                            }
-
-                            delegate: Item {
-                                id: dp_item
-
-                                implicitWidth: tb_p.width - 10
-                                implicitHeight: p_item.height
-                                Item {
-                                    id: p_item
-                                    width: parent.width
-                                    height: lb_protocol_name.height
-                                    anchors.left: parent.left
-                                    Rectangle {
-                                        anchors.top: parent.top
-                                        width: parent.width
-                                        height: 1
-                                        color: "lightgray"
-                                        visible: index > 0
-                                    }
-
-                                    SettingButtonType {
-                                        id: lb_protocol_name
-                                        topPadding: 10
-                                        bottomPadding: 10
-
-                                        anchors.left: parent.left
-                                        anchors.leftMargin: 10
-
-                                        width: parent.width
-                                        height: 45
-                                        text: qsTr(name_role + " settings")
-                                        textItem.font.pixelSize: 16
-                                        icon.source: "qrc:/images/settings.png"
-                                        onClicked: {
-                                            tb_p.currentIndex = index
-                                            ServerContainersLogic.onPushButtonProtoSettingsClicked(
-                                                        proxyContainersModel.mapToSource(tb_c.currentIndex),
-                                                        proxyProtocolsModel.mapToSource(tb_p.currentIndex))
-                                        }
-                                    }
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-
-    BlueButtonType {
-        id: pb_add_container
-        visible: container_selector.selectedIndex < 0 && ServerContainersLogic.isManagedServer
-
-        anchors.horizontalCenter: parent.horizontalCenter
-        anchors.bottom: parent.bottom
-        anchors.topMargin: 10
-        anchors.bottomMargin: 20
-
-        width: parent.width - 40
-        height: 40
-        text: qsTr("Install new service")
-        font.pixelSize: 16
-        onClicked: container_selector.visible ? container_selector.close() : container_selector.open()
-    }
-}
diff --git a/client/ui/qml/Pages/PageServerList.qml b/client/ui/qml/Pages/PageServerList.qml
deleted file mode 100644
index 80ac9a1b..00000000
--- a/client/ui/qml/Pages/PageServerList.qml
+++ /dev/null
@@ -1,185 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-import QtQuick.Shapes 1.4
-import PageEnum 1.0
-import "../Controls"
-import "./"
-import "../Config"
-
-PageBase {
-    id: root
-    page: PageEnum.ServersList
-    logic: ServerListLogic
-
-    BackButton {
-        id: back
-    }
-    Caption {
-        id: caption
-        text: qsTr("Servers")
-        width: undefined
-    }
-
-    SvgButtonType {
-        anchors.verticalCenter: caption.verticalCenter
-        anchors.leftMargin: 10
-        anchors.left: caption.right
-        width: 27
-        height: 27
-
-        icon.source: "qrc:/images/svg/control_point_black_24dp.svg"
-        onClicked: {
-            UiLogic.goToPage(PageEnum.Start);
-        }
-    }
-
-    ListView {
-        id: listWidget_servers
-        x: GC.defaultMargin
-        anchors.top: caption.bottom
-        anchors.topMargin: 15
-        width: parent.width - GC.defaultMargin - 1
-        anchors.bottom: parent.bottom
-        anchors.bottomMargin: 20
-        model: ServerListLogic.serverListModel
-        highlightRangeMode: ListView.ApplyRange
-        highlightMoveVelocity: -1
-        currentIndex: ServerListLogic.currServerIdx
-        spacing: 5
-        clip: true
-        delegate: Item {
-            height: 60
-            width: listWidget_servers.width - 15
-            MouseArea {
-                id: ms
-                anchors.fill: parent
-                hoverEnabled: true
-                onClicked: {
-                    if (GC.isMobile()) {
-                        ServerListLogic.onServerListPushbuttonSettingsClicked(index)
-                    }
-                    mouse.accepted = false
-                }
-                onEntered: {
-                    mouseExitAni.stop()
-                    mouseEnterAni.start()
-                }
-                onExited: {
-                    mouseEnterAni.stop()
-                    mouseExitAni.start()
-                }
-            }
-            Rectangle {
-                anchors.fill: parent
-                gradient: ms.containsMouse ? gradient_containsMouse : gradient_notContainsMouse
-                LinearGradient {
-                    id: gradient_notContainsMouse
-                    x1: 0 ; y1:0
-                    x2: 0 ; y2: height
-                    stops: [
-                        GradientStop { position: 0.0; color: "#FAFBFE" },
-                        GradientStop { position: 1.0; color: "#ECEEFF" }
-                    ]
-                }
-                LinearGradient {
-                    id: gradient_containsMouse
-                    x1: 0 ; y1:0
-                    x2: 0 ; y2: height
-                    stops: [
-                        GradientStop { position: 0.0; color: "#FAFBFE" },
-                        GradientStop { position: 1.0; color: "#DCDEDF" }
-                    ]
-                }
-            }
-
-            LabelType {
-                id: label_address
-                x: 20
-                y: 40
-                width: listWidget_servers.width - 100
-                height: 16
-                text: address
-            }
-            Text {
-                x: 10
-                y: 10
-                width: listWidget_servers.width - 100
-                height: 21
-                font.family: "Lato"
-                font.styleName: "normal"
-                font.pixelSize: 16
-                font.bold: true
-                color: "#181922"
-                horizontalAlignment: Text.AlignLeft
-                verticalAlignment: Text.AlignVCenter
-                wrapMode: Text.Wrap
-                text: desc
-            }
-            ImageButtonType {
-                x: parent.width - 30
-                y: 15
-                width: 30
-                height: 30
-                checkable: true
-                icon.source: checked ? "qrc:/images/check.png"
-                                     : "qrc:/images/uncheck.png"
-                onClicked: {
-                    ServerListLogic.onServerListPushbuttonDefaultClicked(index)
-                }
-                checked: is_default
-                enabled: !is_default
-            }
-            SvgButtonType {
-                id: pushButtonSetting
-                x: parent.width - 70
-                y: 15
-                width: 30
-                height: 30
-                icon.source: "qrc:/images/svg/settings_black_24dp.svg"
-                opacity: 0
-
-                OpacityAnimator {
-                    id: mouseEnterAni
-                    target: pushButtonSetting;
-                    from: 0;
-                    to: 1;
-                    duration: 150
-                    running: false
-                    easing.type: Easing.InOutQuad
-                }
-                OpacityAnimator {
-                    id: mouseExitAni
-                    target: pushButtonSetting;
-                    from: 1;
-                    to: 0;
-                    duration: 150
-                    running: false
-                    easing.type: Easing.InOutQuad
-                }
-                MouseArea {
-                    cursorShape: Qt.PointingHandCursor
-                    anchors.fill: parent
-                    hoverEnabled: true
-                    propagateComposedEvents: true
-
-                    onEntered: {
-                        mouseExitAni.stop()
-                        mouseEnterAni.start()
-                    }
-                    onExited: {
-                        mouseEnterAni.stop()
-                        mouseExitAni.start()
-                    }
-
-                    onClicked: {
-                        ServerListLogic.onServerListPushbuttonSettingsClicked(index)
-                    }
-                }
-            }
-        }
-
-        ScrollBar.vertical: ScrollBar {
-            policy: ScrollBar.AsNeeded
-        }
-    }
-}
diff --git a/client/ui/qml/Pages/PageServerSettings.qml b/client/ui/qml/Pages/PageServerSettings.qml
deleted file mode 100644
index 4ef22ce4..00000000
--- a/client/ui/qml/Pages/PageServerSettings.qml
+++ /dev/null
@@ -1,140 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-import QtQuick.Layouts
-import PageEnum 1.0
-import "./"
-import "../Controls"
-import "../Config"
-
-PageBase {
-    id: root
-    page: PageEnum.ServerSettings
-    logic: ServerSettingsLogic
-
-    enabled: ServerSettingsLogic.pageEnabled
-
-    BackButton {
-        id: back
-    }
-
-    Caption {
-        id: caption
-        text: qsTr("Server settings")
-        anchors.horizontalCenter: parent.horizontalCenter
-    }
-
-    FlickableType {
-        id: fl
-        anchors.top: caption.bottom
-        anchors.bottom: logo.top
-        contentHeight: content.height
-
-        ColumnLayout {
-            id: content
-            enabled: logic.pageEnabled
-            anchors.top: parent.top
-            anchors.left: parent.left
-            anchors.right: parent.right
-            anchors.rightMargin: 15
-
-            LabelType {
-                Layout.fillWidth: true
-                font.pixelSize: 20
-                horizontalAlignment: Text.AlignHCenter
-                text: ServerSettingsLogic.labelCurrentVpnProtocolText
-            }
-
-            TextFieldType {
-                Layout.fillWidth: true
-                font.pixelSize: 20
-                horizontalAlignment: Text.AlignHCenter
-                text: ServerSettingsLogic.labelServerText
-                readOnly: true
-                background: Item {}
-            }
-
-            LabelType {
-                Layout.fillWidth: true
-                text: ServerSettingsLogic.labelWaitInfoText
-                visible: ServerSettingsLogic.labelWaitInfoVisible
-            }
-            TextFieldType {
-                Layout.fillWidth: true
-                text: ServerSettingsLogic.lineEditDescriptionText
-                onEditingFinished: {
-                    ServerSettingsLogic.lineEditDescriptionText = text
-                    ServerSettingsLogic.onLineEditDescriptionEditingFinished()
-                }
-            }
-
-            BlueButtonType {
-                text: qsTr("Protocols and Services")
-                Layout.topMargin: 20
-                Layout.fillWidth: true
-                onClicked: {
-                    UiLogic.goToPage(PageEnum.ServerContainers)
-                }
-            }
-
-            BlueButtonType {
-                Layout.fillWidth: true
-                Layout.topMargin: 10
-                text: qsTr("Share Server (FULL ACCESS)")
-                visible: ServerSettingsLogic.pushButtonShareFullVisible
-                onClicked: {
-                    ServerSettingsLogic.onPushButtonShareFullClicked()
-                }
-            }
-
-            BlueButtonType {
-                Layout.fillWidth: true
-                Layout.topMargin: 10
-                text: qsTr("Advanced server settings")
-                onClicked: {
-                    UiLogic.goToPage(PageEnum.AdvancedServerSettings)
-                }
-            }
-
-            BlueButtonType {
-                Layout.fillWidth: true
-                Layout.topMargin: 60
-                text: ServerSettingsLogic.pushButtonClearClientCacheText
-                visible: ServerSettingsLogic.pushButtonClearClientCacheVisible
-                onClicked: {
-                    ServerSettingsLogic.onPushButtonClearClientCacheClicked()
-                }
-            }
-
-            BlueButtonType {
-                Layout.fillWidth: true
-                Layout.topMargin: 10
-                text: qsTr("Forget this server")
-                onClicked: {
-                    if (ServerSettingsLogic.isCurrentServerHasCredentials()) {
-                        popupForgetServer.questionText = "Attention! This action will not remove any data from the server, it will just remove server from the list. Continue?"
-                    }
-                    else {
-                        popupForgetServer.questionText = "Remove server from the list?"
-                    }
-                    popupForgetServer.open()
-                }
-            }
-
-            PopupWithQuestion {
-                id: popupForgetServer
-                yesFunc: function() {
-                    ServerSettingsLogic.onPushButtonForgetServer()
-                    close()
-                }
-                noFunc: function() {
-                    close()
-                }
-            }
-        }
-    }
-
-    Logo {
-        id : logo
-        anchors.bottom: parent.bottom
-    }
-}
diff --git a/client/ui/qml/Pages/PageSetupWizard.qml b/client/ui/qml/Pages/PageSetupWizard.qml
deleted file mode 100644
index a7e93a3a..00000000
--- a/client/ui/qml/Pages/PageSetupWizard.qml
+++ /dev/null
@@ -1,108 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-import QtQuick.Layouts
-import PageEnum 1.0
-import "./"
-import "../Controls"
-import "../Config"
-
-PageBase {
-    id: root
-    page: PageEnum.Wizard
-    logic: WizardLogic
-
-    BackButton {
-        id: back_from_setup_wizard
-    }
-    Caption {
-        id: caption
-        text: qsTr("Setup your server to use VPN")
-    }
-
-    FlickableType {
-        id: fl
-        anchors.top: caption.bottom
-        anchors.bottom: next_button.top
-        contentHeight: content.height
-
-        ColumnLayout {
-            id: content
-            enabled: logic.pageEnabled
-            anchors.top: parent.top
-            anchors.left: parent.left
-            anchors.right: parent.right
-            anchors.rightMargin: 15
-
-            RadioButtonType {
-                id: radioButton_setup_wizard_high
-                Layout.fillWidth: true
-                text: qsTr("High censorship level")
-                checked: WizardLogic.radioButtonHighChecked
-                onCheckedChanged: {
-                    WizardLogic.radioButtonHighChecked = checked
-                }
-            }
-            LabelType {
-                Layout.fillWidth: true
-                Layout.leftMargin: 25
-                verticalAlignment: Text.AlignTop
-                text: qsTr("I'm living in a country with a high censorship level. Many of the foreign websites and VPNs are blocked by my government. I want to setup a reliable VPN, which can not be detected by my internet provider and my government.
-OpenVPN and ShadowSocks over Cloak (VPN obfuscation) profiles will be installed.\n")
-            }
-
-
-            RadioButtonType {
-                id: radioButton_setup_wizard_medium
-                Layout.fillWidth: true
-                text: qsTr("Medium censorship level")
-                checked: WizardLogic.radioButtonMediumChecked
-                onCheckedChanged: {
-                    WizardLogic.radioButtonMediumChecked = checked
-                }
-            }
-            LabelType {
-                Layout.fillWidth: true
-                Layout.leftMargin: 25
-                verticalAlignment: Text.AlignTop
-                text: qsTr("I'm living in a country with a medium censorship level. Some websites are blocked by my government, but VPNs are not blocked at all. I want to setup a flexible solution.
-OpenVPN over ShadowSocks profile will be installed.\n")
-            }
-
-
-            RadioButtonType {
-                id: radioButton_setup_wizard_low
-                Layout.fillWidth: true
-                text: qsTr("Low censorship level")
-                checked: WizardLogic.radioButtonLowChecked
-                onCheckedChanged: {
-                    WizardLogic.radioButtonLowChecked = checked
-                }
-            }
-            LabelType {
-                Layout.fillWidth: true
-                Layout.leftMargin: 25
-                verticalAlignment: Text.AlignTop
-                text: qsTr("I want to improve my privacy on the internet.
-OpenVPN profile will be installed.\n")
-            }
-        }
-    }
-
-    BlueButtonType {
-        id: next_button
-        anchors.bottom: parent.bottom
-        anchors.bottomMargin: GC.defaultMargin
-        x: GC.defaultMargin
-        width: parent.width - 2 * GC.defaultMargin
-        text: qsTr("Next")
-        onClicked: {
-            if (radioButton_setup_wizard_high.checked) {
-                UiLogic.goToPage(PageEnum.WizardHigh, false);
-            } else if (radioButton_setup_wizard_medium.checked) {
-                UiLogic.goToPage(PageEnum.WizardMedium, false);
-            } else if (radioButton_setup_wizard_low.checked) {
-                UiLogic.goToPage(PageEnum.WizardLow, false);
-            }
-        }
-    }
-}
diff --git a/client/ui/qml/Pages/PageSetupWizardHighLevel.qml b/client/ui/qml/Pages/PageSetupWizardHighLevel.qml
deleted file mode 100644
index e0f194ff..00000000
--- a/client/ui/qml/Pages/PageSetupWizardHighLevel.qml
+++ /dev/null
@@ -1,96 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-import QtQuick.Layouts
-import PageEnum 1.0
-import "./"
-import "../Controls"
-import "../Config"
-
-PageBase {
-    id: root
-    page: PageEnum.WizardHigh
-    logic: WizardLogic
-
-    BackButton {
-        id: back_from_setup_wizard
-    }
-    Caption {
-        id: caption
-        text: qsTr("Setup Wizard")
-    }
-
-    FlickableType {
-        id: fl
-        anchors.top: caption.bottom
-        anchors.bottom: next_button.top
-        contentHeight: content.height
-
-        ColumnLayout {
-            id: content
-            enabled: logic.pageEnabled
-            anchors.top: parent.top
-            anchors.left: parent.left
-            anchors.right: parent.right
-            anchors.rightMargin: 15
-
-            LabelType {
-                Layout.fillWidth: true
-                verticalAlignment: Text.AlignTop
-                text: qsTr("AmneziaVPN will install a VPN protocol which is not visible to your internet provider and government firewall. Your VPN connection will be seen by your internet provider as regular web traffic to a particular website.
-
-You SHOULD set this website address to some foreign website which is not blocked by your internet provider. In other words, you need to type some foreign website address which is accessible to you without a VPN.")
-            }
-
-            LabelType {
-                Layout.fillWidth: true
-                Layout.topMargin: 15
-                verticalAlignment: Text.AlignTop
-                text: qsTr("Type another web site address for masking or keep it by default. Your internet provider will think you working on this web site when you connected to VPN.")
-            }
-
-            TextFieldType {
-                id: website_masking
-                Layout.fillWidth: true
-                text: WizardLogic.lineEditHighWebsiteMaskingText
-                onEditingFinished: {
-                    let _text = website_masking.text
-                    _text = _text.replace("http://", "");
-                    _text = _text.replace("https://", "");
-                    if (!_text) {
-                        return
-                    }
-                    _text = _text.split("/")[0];
-                    WizardLogic.lineEditHighWebsiteMaskingText = _text
-                }
-                onAccepted: {
-                    next_button.clicked()
-                }
-            }
-
-            LabelType {
-                Layout.fillWidth: true
-                Layout.topMargin: 15
-                verticalAlignment: Text.AlignTop
-                text: qsTr("OpenVPN and ShadowSocks over Cloak (VPN obfuscation) profiles will be installed.
-
-This protocol support exporting connection profiles to mobile devices by exporting ShadowSocks and Cloak configs (you should launch the 3rd party open source VPN client - ShadowSocks VPN and install Cloak plugin).")
-            }
-        }
-    }
-
-    BlueButtonType {
-        id: next_button
-        anchors.bottom: parent.bottom
-        anchors.bottomMargin: GC.defaultMargin
-        x: GC.defaultMargin
-        width: parent.width - 2 * GC.defaultMargin
-        text: qsTr("Next")
-        onClicked: {
-            let domain = website_masking.text;
-            if (!domain || !domain.includes(".")) {
-                return
-            }
-            UiLogic.goToPage(PageEnum.WizardVpnMode, false)
-        }
-    }
-}
diff --git a/client/ui/qml/Pages/PageSetupWizardLowLevel.qml b/client/ui/qml/Pages/PageSetupWizardLowLevel.qml
deleted file mode 100644
index d4e590c1..00000000
--- a/client/ui/qml/Pages/PageSetupWizardLowLevel.qml
+++ /dev/null
@@ -1,65 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-import QtQuick.Layouts
-import PageEnum 1.0
-import "./"
-import "../Controls"
-import "../Config"
-
-PageBase {
-    id: root
-    page: PageEnum.WizardLow
-    logic: WizardLogic
-
-    BackButton {
-        id: back_from_setup_wizard
-    }
-    Caption {
-        id: caption
-        text: qsTr("Setup Wizard")
-    }
-
-    FlickableType {
-        id: fl
-        anchors.top: caption.bottom
-        anchors.bottom: next_button.top
-        contentHeight: content.height
-
-        ColumnLayout {
-            id: content
-            enabled: logic.pageEnabled
-            anchors.top: parent.top
-            anchors.left: parent.left
-            anchors.right: parent.right
-            anchors.rightMargin: 15
-
-            LabelType {
-                Layout.fillWidth: true
-                verticalAlignment: Text.AlignTop
-                text: qsTr('AmneziaVPN will install the OpenVPN protocol with public/private key pairs generated on both server and client sides.
-
-You can also configure the connection on your mobile device by copying the exported ".ovpn" file to your device, and setting up the official OpenVPN client.
-
-We recommend not to use messaging applications for sending the connection profile - it contains VPN private keys.')
-            }
-            LabelType {
-                Layout.fillWidth: true
-                Layout.topMargin: 15
-                text: qsTr('OpenVPN profile will be installed')
-                verticalAlignment: Text.AlignBottom
-            }
-        }
-    }
-
-    BlueButtonType {
-        id: next_button
-        anchors.bottom: parent.bottom
-        anchors.bottomMargin: GC.defaultMargin
-        x: GC.defaultMargin
-        width: parent.width - 2 * GC.defaultMargin
-        text: qsTr("Start configuring")
-        onClicked: {
-            WizardLogic.onPushButtonLowFinishClicked()
-        }
-    }
-}
diff --git a/client/ui/qml/Pages/PageSetupWizardMediumLevel.qml b/client/ui/qml/Pages/PageSetupWizardMediumLevel.qml
deleted file mode 100644
index 6e1a45c1..00000000
--- a/client/ui/qml/Pages/PageSetupWizardMediumLevel.qml
+++ /dev/null
@@ -1,60 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-import QtQuick.Layouts
-import PageEnum 1.0
-import "./"
-import "../Controls"
-import "../Config"
-
-PageBase {
-    id: root
-    page: PageEnum.WizardMedium
-    logic: WizardLogic
-
-    BackButton {
-        id: back_from_setup_wizard
-    }
-    Caption {
-        id: caption
-        text: qsTr("Setup Wizard")
-    }
-
-    FlickableType {
-        id: fl
-        anchors.top: caption.bottom
-        anchors.bottom: next_button.top
-        contentHeight: content.height
-
-        ColumnLayout {
-            id: content
-            enabled: logic.pageEnabled
-            anchors.top: parent.top
-            anchors.left: parent.left
-            anchors.right: parent.right
-            anchors.rightMargin: 15
-
-            LabelType {
-                Layout.fillWidth: true
-                verticalAlignment: Text.AlignTop
-                text: qsTr('AmneziaVPN will install a VPN protocol which is difficult to detect by your internet provider and government firewall (but possible). In most cases, this is the most suitable protocol. This protocol is faster compared to the VPN protocols with "VPN masking".\n\nThis protocol supports exporting connection profiles to mobile devices by using QR codes (you should launch the 3rd party open source VPN client - ShadowSocks VPN).')
-            }
-            LabelType {
-                Layout.fillWidth: true
-                Layout.topMargin: 15
-                text: qsTr('OpenVPN over ShadowSocks profile will be installed')
-            }
-        }
-    }
-
-    BlueButtonType {
-        id: next_button
-        anchors.bottom: parent.bottom
-        anchors.bottomMargin: GC.defaultMargin
-        x: GC.defaultMargin
-        width: parent.width - 2 * GC.defaultMargin
-        text: qsTr("Next")
-        onClicked: {
-            UiLogic.goToPage(PageEnum.WizardVpnMode, false)
-        }
-    }
-}
diff --git a/client/ui/qml/Pages/PageSetupWizardVPNMode.qml b/client/ui/qml/Pages/PageSetupWizardVPNMode.qml
deleted file mode 100644
index 497ccad8..00000000
--- a/client/ui/qml/Pages/PageSetupWizardVPNMode.qml
+++ /dev/null
@@ -1,65 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-import QtQuick.Layouts
-import PageEnum 1.0
-import "./"
-import "../Controls"
-import "../Config"
-
-PageBase {
-    id: root
-    page: PageEnum.WizardVpnMode
-    logic: WizardLogic
-
-    BackButton {
-        id: back_from_setup_wizard
-    }
-    Caption {
-        id: caption
-        text: qsTr("Setup Wizard")
-    }
-
-    FlickableType {
-        id: fl
-        anchors.top: caption.bottom
-        anchors.bottom: vpn_mode_finish.top
-        contentHeight: content.height
-
-        ColumnLayout {
-            id: content
-            enabled: logic.pageEnabled
-            anchors.top: parent.top
-            anchors.left: parent.left
-            anchors.right: parent.right
-            anchors.rightMargin: 15
-
-            LabelType {
-                Layout.fillWidth: true
-                verticalAlignment: Text.AlignTop
-                text: qsTr('Optional.\n
-You can enable VPN mode "For selected sites" and add blocked sites you need to visit manually. If you will choose this option, you will need add every blocked site you want to visit to the access list. You may switch between modes later.\n\nPlease note, you should add addresses to the list after VPN connection established. You may add any domain, URL or IP address, it will be resolved to IP address.')
-            }
-
-            CheckBoxType {
-                Layout.fillWidth: true
-                text: qsTr('Turn on mode "VPN for selected sites"')
-                checked: WizardLogic.checkBoxVpnModeChecked
-                onCheckedChanged: {
-                    WizardLogic.checkBoxVpnModeChecked = checked
-                }
-            }
-        }
-    }
-
-    BlueButtonType {
-        id: vpn_mode_finish
-        anchors.bottom: parent.bottom
-        anchors.bottomMargin: GC.defaultMargin
-        x: GC.defaultMargin
-        width: parent.width - 2 * GC.defaultMargin
-        text: qsTr("Start configuring")
-        onClicked: {
-            WizardLogic.onPushButtonVpnModeFinishClicked()
-        }
-    }
-}
diff --git a/client/ui/qml/Pages/PageShareConnection.qml b/client/ui/qml/Pages/PageShareConnection.qml
deleted file mode 100644
index b5439b47..00000000
--- a/client/ui/qml/Pages/PageShareConnection.qml
+++ /dev/null
@@ -1,87 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-import QtQuick.Dialogs
-import QtQuick.Layouts
-import SortFilterProxyModel 0.2
-import ContainerProps 1.0
-import ProtocolProps 1.0
-import PageEnum 1.0
-import ProtocolEnum 1.0
-import "./"
-import "../Controls"
-import "../Config"
-
-PageBase {
-    id: root
-    page: PageEnum.ShareConnection
-    logic: ShareConnectionLogic
-
-    BackButton {
-        id: back
-    }
-
-    Caption {
-        id: caption
-        text: qsTr("Share protocol config")
-        width: undefined
-    }
-
-
-    FlickableType {
-        clip: true
-        anchors.top: caption.bottom
-        contentHeight: col.height
-        boundsBehavior: Flickable.StopAtBounds
-
-        Column {
-            id: col
-            anchors {
-                left: parent.left;
-                right: parent.right;
-            }
-            topPadding: 20
-            spacing: 10
-
-            SortFilterProxyModel {
-                id: proxyProtocolsModel
-                sourceModel: UiLogic.protocolsModel
-                filters: ValueFilter {
-                    roleName: "is_installed_role"
-                    value: true
-                }
-            }
-
-
-            ShareConnectionContent {
-                text: qsTr("Share for Amnezia")
-                height: 40
-                width: tb_c.width - 10
-                onClicked: UiLogic.goToShareProtocolPage(ProtocolEnum.Any)
-            }
-
-            ListView {
-                id: tb_c
-                width: parent.width - 10
-                height: tb_c.contentItem.height
-                currentIndex: -1
-                spacing: 10
-                clip: true
-                interactive: false
-                model: proxyProtocolsModel
-
-                delegate: Item {
-                    implicitWidth: tb_c.width - 10
-                    implicitHeight: c_item.height
-
-                    ShareConnectionContent {
-                        id: c_item
-                        text: qsTr("Share for ") + name_role
-                        height: 40
-                        width: tb_c.width - 10
-                        onClicked: UiLogic.goToShareProtocolPage(proxyProtocolsModel.mapToSource(index))
-                    }
-                }
-            }
-        }
-    }
-}
diff --git a/client/ui/qml/Pages/PageSites.qml b/client/ui/qml/Pages/PageSites.qml
deleted file mode 100644
index 673e7e7a..00000000
--- a/client/ui/qml/Pages/PageSites.qml
+++ /dev/null
@@ -1,315 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-import QtQml.Models
-import Qt.labs.platform
-import QtQuick.Dialogs
-import PageEnum 1.0
-import "./"
-import "../Controls"
-import "../Config"
-
-PageBase {
-    id: root
-    page: PageEnum.Sites
-    logic: SitesLogic
-
-    property int lastIndex: 0
-
-    BackButton {
-        id: back
-    }
-
-    Caption {
-        id: caption
-        text: SitesLogic.labelSitesAddCustomText
-    }
-
-    LabelType {
-        id: lb_addr
-        color: "#333333"
-        text: qsTr("Web site/Hostname/IP address/Subnet")
-        x: 20
-        anchors.top: caption.bottom
-        anchors.topMargin: 10
-        width: parent.width
-        height: 21
-    }
-
-    TextFieldType {
-        anchors.top: lb_addr.bottom
-        anchors.topMargin: 10
-        anchors.left: parent.left
-        anchors.leftMargin: 20
-        anchors.right: sites_add.left
-        anchors.rightMargin: 10
-        height: 31
-        placeholderText: qsTr("yousite.com or IP address")
-        text: SitesLogic.lineEditSitesAddCustomText
-        onEditingFinished: {
-            SitesLogic.lineEditSitesAddCustomText = text
-        }
-        onAccepted: {
-            SitesLogic.onPushButtonAddCustomSitesClicked()
-        }
-    }
-
-    BlueButtonType {
-        id: sites_add
-        anchors.right: sites_import.left
-        anchors.rightMargin: 10
-        anchors.top: lb_addr.bottom
-        anchors.topMargin: 10
-        width: 51
-        height: 31
-        font.pixelSize: 24
-        text: "+"
-        onClicked: {
-            SitesLogic.onPushButtonAddCustomSitesClicked()
-        }
-    }
-
-    BasicButtonType {
-        id: sites_import
-        anchors.right: parent.right
-        anchors.rightMargin: 20
-        anchors.top: lb_addr.bottom
-        anchors.topMargin: 10
-        width: 51
-        height: 31
-        background: Rectangle {
-            anchors.fill: parent
-            radius: 4
-            color: parent.containsMouse ? "#211966" : "#100A44"
-        }
-        font.pixelSize: 16
-        contentItem: Item {
-            anchors.fill: parent
-            Image {
-                anchors.centerIn: parent
-                width: 20
-                height: 20
-                source: "qrc:/images/folder.png"
-                fillMode: Image.Stretch
-            }
-        }
-        antialiasing: true
-        onClicked: {
-            fileDialog.open()
-        }
-    }
-    FileDialog {
-        id: fileDialog
-        title: qsTr("Import IP addresses")
-        visible: false
-        currentFolder: StandardPaths.writableLocation(StandardPaths.DocumentsLocation)
-        onAccepted: {
-            SitesLogic.onPushButtonSitesImportClicked(fileUrl)
-        }
-    }
-
-    DelegateModel {
-        id: visualModel
-        model: SitesLogic.tableViewSitesModel
-        groups: [
-            DelegateModelGroup {
-                id : delegateModelGroup
-                name: "multiSelect"
-                function removeAll(){
-                    var count = delegateModelGroup.count;
-                    if (count !== 0){
-                        delegateModelGroup.remove(0,count);
-                    }
-                }
-                function selectAll(){
-                    for(var i = 0; i < visualModel.count; i++){
-                        visualModel.items.get(i).inMultiSelect = true
-                    }
-                }
-            }
-        ]
-        delegate: Rectangle {
-            id: item
-            focus: true
-            height: 25
-            width: root.width
-            color: item.DelegateModel.inMultiSelect ? '#63b4fb' : 'transparent'
-            implicitWidth: 170 * 2
-            implicitHeight: 30
-            Item {
-                width: 170
-                height: 30
-                anchors.left: parent.left
-                id: c1
-                Rectangle {
-                    anchors.top: parent.top
-                    width: parent.width
-                    height: 1
-                    color: "lightgray"
-                    visible: index !== tb.currentRow
-                }
-                Rectangle {
-                    anchors.fill: parent
-                    color: "#63B4FB"
-                    visible: index === tb.currentRow
-
-                }
-                Text {
-                    text: url_path
-                    anchors.fill: parent
-                    leftPadding: 10
-                    verticalAlignment: Text.AlignVCenter
-                }
-            }
-            Item {
-                anchors.left: c1.right
-                width: 170
-                height: 30
-                Rectangle {
-                    anchors.top: parent.top
-                    width: parent.width
-                    height: 1
-                    color: "lightgray"
-                    visible: index !== tb.currentRow
-                }
-                Rectangle {
-                    anchors.fill: parent
-                    color: "#63B4FB"
-                    visible: index === tb.currentRow
-
-                }
-                Text {
-                    text: ip
-                    anchors.fill: parent
-                    leftPadding: 10
-                    verticalAlignment: Text.AlignVCenter
-                }
-            }
-            MouseArea {
-                anchors.fill: parent
-                acceptedButtons: Qt.LeftButton | Qt.RightButton
-                onClicked:{
-                    tb.focus = true
-                    if(mouse.button === Qt.RightButton){
-                        //copyPasteMenu.popup()
-                        console.log("RightButton")
-                    }
-                    if(mouse.button === Qt.LeftButton){
-                        switch(mouse.modifiers){
-                        case Qt.ControlModifier :
-                            item.DelegateModel.inMultiSelect = !item.DelegateModel.inMultiSelect
-                            break;
-                        case Qt.ShiftModifier :
-                            delegateModelGroup.removeAll();
-                            var start = lastIndex <= index? lastIndex: index;
-                            var end = lastIndex >= index? lastIndex: index;
-                            for(var i = start;i <= end;i++){
-                                visualModel.items.get(i).inMultiSelect = true
-                            }
-                            break;
-                        default:
-                            delegateModelGroup.removeAll();
-                            item.DelegateModel.inMultiSelect = true
-                            lastIndex = index
-                            break;
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    ListView {
-        id: tb
-        x: 20
-        anchors.top: sites_add.bottom
-        anchors.topMargin: 10
-        width: parent.width - 40
-        anchors.bottom: sites_delete.top
-        anchors.bottomMargin: 10
-        spacing: 1
-        clip: true
-        focus: true
-        activeFocusOnTab: true
-        keyNavigationEnabled: true
-        property int currentRow: -1
-        model: visualModel
-
-        Keys.onPressed: {
-            if (event.key === Qt.Key_PageUp) {
-                let idx = tb.indexAt(1, tb.contentY)
-                tb.positionViewAtIndex(idx-20, ListView.Beginning)
-                event.accepted = true
-            }
-            else if (event.key === Qt.Key_PageDown) {
-                let idx = tb.indexAt(1, tb.contentY)
-                tb.positionViewAtIndex(idx+20, ListView.Beginning)
-                event.accepted = true
-            }
-            else if (event.key === Qt.Key_Home) {
-                tb.positionViewAtBeginning()
-                event.accepted = true
-            }
-            else if (event.key === Qt.Key_End) {
-                tb.positionViewAtEnd()
-                event.accepted = true
-            }
-            else if (event.key === Qt.Key_Delete) {
-                let items = []
-                for(let i = 0; i < visualModel.count; i++){
-                    if (visualModel.items.get(i).inMultiSelect) items.push(i)
-                }
-                SitesLogic.onPushButtonSitesDeleteClicked(items)
-                event.accepted = true
-            }
-            else if (event.key === Qt.Key_A) {
-                delegateModelGroup.selectAll()
-                event.accepted = true
-            }
-        }
-
-    }
-
-    BlueButtonType {
-        id: sites_delete
-        anchors.bottom: select_all.top
-        anchors.bottomMargin: 10
-        anchors.horizontalCenter: parent.horizontalCenter
-        height: 31
-        font.pixelSize: 16
-        text: qsTr("Delete selected")
-        onClicked: {
-            let items = []
-            for(let i = 0; i < visualModel.count; i++){
-                if (visualModel.items.get(i).inMultiSelect) items.push(i)
-            }
-
-            SitesLogic.onPushButtonSitesDeleteClicked(items)
-        }
-    }
-
-    BlueButtonType {
-        id: select_all
-        anchors.bottom: sites_export.top
-        anchors.bottomMargin: 10
-        anchors.horizontalCenter: parent.horizontalCenter
-        height: 31
-        font.pixelSize: 16
-        text: qsTr("Select all")
-        onClicked: {
-            delegateModelGroup.selectAll()
-        }
-    }
-
-    BlueButtonType {
-        id: sites_export
-        anchors.bottom: parent.bottom
-        anchors.bottomMargin: 20
-        anchors.horizontalCenter: parent.horizontalCenter
-        height: 31
-        font.pixelSize: 16
-        text: qsTr("Export all")
-        onClicked: {
-            SitesLogic.onPushButtonSitesExportClicked()
-        }
-    }
-}
diff --git a/client/ui/qml/Pages/PageStart.qml b/client/ui/qml/Pages/PageStart.qml
deleted file mode 100644
index a752817f..00000000
--- a/client/ui/qml/Pages/PageStart.qml
+++ /dev/null
@@ -1,356 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-import PageEnum 1.0
-import "./"
-import "../Controls"
-import "../Config"
-
-PageBase {
-    id: root
-    page: PageEnum.Start
-    logic: StartPageLogic
-
-    Connections {
-        target: StartPageLogic
-
-        function onShowPassphraseRequestMessage() {
-            popupWithTextField.open()
-        }
-    }
-
-    BackButton {
-        id: back_from_start
-        visible: pageLoader.depth > 1
-    }
-
-    ImageButtonType {
-        anchors {
-            right: parent.right
-            top: parent.top
-        }
-
-        width: 41
-        height: 41
-        imgMarginHover: 8
-        imgMargin: 9
-        icon.source: "qrc:/images/settings_grey.png"
-        visible: !GeneralSettingsLogic.existsAnyServer
-        onClicked: {
-            UiLogic.goToPage(PageEnum.GeneralSettings)
-        }
-    }
-
-    Caption {
-        id: caption
-        text: start_switch_page.checked ?
-                  qsTr("Setup your server to use VPN") :
-                  qsTr("Connect to the already created VPN server")
-    }
-
-    Logo {
-        id: logo
-        anchors.bottom: parent.bottom
-    }
-
-    BasicButtonType {
-        id: start_switch_page
-        width: parent.width - 2 * GC.defaultMargin
-        implicitHeight: 40
-
-        anchors.horizontalCenter: parent.horizontalCenter
-        anchors.bottom: logo.top
-        anchors.bottomMargin: 10
-        anchors.topMargin: 20
-
-        text: qsTr("Set up your own server")
-        checked: false
-        checkable: true
-        onCheckedChanged: {
-            if (checked) {
-                page_start_new_server.visible = true
-                page_start_import.visible = false
-                text = qsTr("Import connection");
-            }
-            else {
-                page_start_new_server.visible = false
-                page_start_import.visible = true
-                text = qsTr("Set up your own server");
-            }
-        }
-
-        background: Rectangle {
-            anchors.fill: parent
-            border.width: 1
-            border.color: "#211C4A"
-            radius: 4
-        }
-
-        contentItem: Text {
-            anchors.fill: parent
-            font.family: "Lato"
-            font.styleName: "normal"
-            font.pixelSize: 16
-            color: "#100A44"
-            text: start_switch_page.text
-            horizontalAlignment: Text.AlignHCenter
-            verticalAlignment: Text.AlignVCenter
-        }
-        antialiasing: true
-    }
-
-    Item {
-        id: page_start_import
-        width: parent.width
-        anchors.top: caption.bottom
-        anchors.bottom: start_switch_page.top
-        anchors.bottomMargin: 10
-
-        visible: true
-
-        LabelType {
-            id: label_connection_code
-            anchors.top: parent.top
-            anchors.topMargin: 20
-            anchors.horizontalCenter: parent.horizontalCenter
-            text: qsTr("Connection code")
-        }
-        TextFieldType {
-            id: lineEdit_start_existing_code
-            anchors.top: label_connection_code.bottom
-            anchors.horizontalCenter: parent.horizontalCenter
-            placeholderText: "vpn://..."
-            text: StartPageLogic.lineEditStartExistingCodeText
-            onEditingFinished: {
-                StartPageLogic.lineEditStartExistingCodeText = text
-            }
-        }
-        BlueButtonType {
-            id: new_sever_import
-            anchors.horizontalCenter: parent.horizontalCenter
-            y: 210
-            anchors.top: lineEdit_start_existing_code.bottom
-            anchors.topMargin: 10
-            text: qsTr("Connect")
-            onClicked: {
-                StartPageLogic.onPushButtonImport()
-            }
-        }
-
-
-        BlueButtonType {
-            id: qr_code_import_open
-            anchors.horizontalCenter: parent.horizontalCenter
-            anchors.top: new_sever_import.bottom
-            anchors.topMargin: 40
-
-            text: qsTr("Open file")
-            onClicked: {
-                StartPageLogic.onPushButtonImportOpenFile()
-            }
-            enabled: StartPageLogic.pushButtonConnectEnabled
-        }
-
-        BlueButtonType {
-            id: qr_code_import
-            visible: GC.isMobile()
-            anchors.horizontalCenter: parent.horizontalCenter
-            anchors.top: qr_code_import_open.bottom
-            anchors.topMargin: 10
-
-            text: qsTr("Scan QR code")
-            onClicked: {
-                if (Qt.platform.os === "ios") {
-                    UiLogic.goToPage(PageEnum.QrDecoderIos)
-                } else {
-                    StartPageLogic.startQrDecoder()
-                }
-            }
-            enabled: StartPageLogic.pushButtonConnectEnabled
-        }
-
-        BlueButtonType {
-            id: btn_restore_cfg
-            anchors.horizontalCenter: parent.horizontalCenter
-            anchors.top: qr_code_import.bottom
-            anchors.topMargin: 30
-            visible: UiLogic.pagesStackDepth === 1
-            enabled: StartPageLogic.pushButtonConnectEnabled
-
-            text: qsTr("Restore app config")
-            onClicked: {
-                AppSettingsLogic.onPushButtonRestoreAppConfigClicked()
-            }
-        }
-    }
-
-
-    Item {
-        id: page_start_new_server
-        width: parent.width
-        anchors.top: caption.bottom
-        anchors.bottom: start_switch_page.top
-        anchors.bottomMargin: 10
-
-        visible: false
-
-        BasicButtonType {
-            id: new_sever_get_info
-            width: parent.width - 80
-            anchors.horizontalCenter: parent.horizontalCenter
-            anchors.top: parent.top
-            anchors.topMargin: 5
-
-            text: qsTr("How to get own server? →")
-            background: Item {
-                anchors.fill: parent
-            }
-
-            contentItem: Text {
-                anchors.fill: parent
-                font.family: "Lato"
-                font.styleName: "normal"
-                font.pixelSize: 16
-                color: "#15CDCB";
-                text: new_sever_get_info.text
-                horizontalAlignment: Text.AlignHCenter
-                verticalAlignment: Text.AlignVCenter
-            }
-            antialiasing: true
-            checkable: true
-            checked: true
-            onClicked: {
-                Qt.openUrlExternally("https://amnezia.org/instruction.html")
-            }
-        }
-        LabelType {
-            id: label_server_ip
-            x: 40
-            anchors.top: new_sever_get_info.bottom
-            text: qsTr("Server IP address [:port]")
-        }
-        TextFieldType {
-            id: new_server_ip
-            anchors.top: label_server_ip.bottom
-            anchors.horizontalCenter: parent.horizontalCenter
-            text: StartPageLogic.lineEditIpText
-            onEditingFinished: { StartPageLogic.lineEditIpText = text }
-            onTextEdited: { StartPageLogic.lineEditIpText = text }
-
-            validator: RegularExpressionValidator {
-                regularExpression: StartPageLogic.ipAddressPortRegex
-            }
-        }
-
-        LabelType {
-            id:label_login
-            x: 40
-            anchors.top: new_server_ip.bottom
-            text: qsTr("Login to connect via SSH")
-        }
-        TextFieldType {
-            id: new_server_login
-            anchors.top: label_login.bottom
-            anchors.horizontalCenter: parent.horizontalCenter
-            text: StartPageLogic.lineEditLoginText
-            onEditingFinished: { StartPageLogic.lineEditLoginText = text }
-            onTextEdited: { StartPageLogic.lineEditLoginText = text }
-        }
-
-        LabelType {
-            id: label_new_server_password
-            x: 40
-            anchors.top: new_server_login.bottom
-            text: qsTr("Password")
-        }
-        TextFieldType {
-            id: new_server_password
-            anchors.top: label_new_server_password.bottom
-            anchors.horizontalCenter: parent.horizontalCenter
-
-            inputMethodHints: Qt.ImhSensitiveData
-            echoMode: TextInput.Password
-            text: StartPageLogic.lineEditPasswordText
-            onEditingFinished: { StartPageLogic.lineEditPasswordText = text }
-            onTextEdited: { StartPageLogic.lineEditPasswordText = text }
-            onAccepted: { StartPageLogic.onPushButtonConnect() }
-        }
-        TextFieldType {
-            id: new_server_ssh_key
-            anchors.top: label_new_server_password.bottom
-            anchors.horizontalCenter: parent.horizontalCenter
-
-            visible: false
-            height: 71
-            font.pixelSize: 10
-            verticalAlignment: Text.AlignTop
-            inputMethodHints: Qt.ImhSensitiveData
-
-            text: StartPageLogic.textEditSshKeyText
-            onEditingFinished: { StartPageLogic.textEditSshKeyText = text }
-            onTextEdited: { StartPageLogic.textEditSshKeyText = text }
-            onAccepted: { StartPageLogic.onPushButtonConnect() }
-        }
-
-        LabelType {
-            x: 40
-            y: 390
-            width: 301
-            height: 41
-            text: StartPageLogic.labelWaitInfoText
-            visible: StartPageLogic.labelWaitInfoVisible
-            wrapMode: Text.Wrap
-        }
-
-        BlueButtonType {
-            id: new_sever_connect
-            anchors.horizontalCenter: parent.horizontalCenter
-            anchors.top: new_server_ssh_key.bottom
-            anchors.topMargin: 10
-
-            text: StartPageLogic.pushButtonConnectText
-            onClicked: {
-                StartPageLogic.onPushButtonConnect()
-            }
-            enabled: StartPageLogic.pushButtonConnectEnabled
-        }
-
-        UrlButtonType {
-            id: new_sever_connect_key
-            anchors.horizontalCenter: parent.horizontalCenter
-            anchors.top: new_sever_connect.bottom
-
-            width: 281
-            height: 21
-            text: qsTr("Connect using SSH key")
-
-            label.font.pixelSize: 16
-            checkable: true
-            checked: StartPageLogic.pushButtonConnectKeyChecked
-            onCheckedChanged: {
-                StartPageLogic.pushButtonConnectKeyChecked = checked
-                label_new_server_password.text = checked ? qsTr("Private key") : qsTr("Password")
-                new_sever_connect_key.text = checked ? qsTr("Connect using SSH password") : qsTr("Connect using SSH key")
-                new_server_password.visible = !checked
-                new_server_ssh_key.visible = checked
-            }
-        }
-    }
-
-    PopupWithTextField {
-        id: popupWithTextField
-        placeholderText: "Enter private key passphrase"
-        yesFunc: function() {
-            editingFinished()
-            close()
-            StartPageLogic.passphraseDialogClosed()
-            text = ""
-        }
-        noFunc: function() {
-            close()
-            StartPageLogic.passphraseDialogClosed()
-        }
-        onEditingFinished: {
-            StartPageLogic.privateKeyPassphrase = text
-        }
-    }
-}
diff --git a/client/ui/qml/Pages/PageVPN.qml b/client/ui/qml/Pages/PageVPN.qml
deleted file mode 100644
index 0e6f5078..00000000
--- a/client/ui/qml/Pages/PageVPN.qml
+++ /dev/null
@@ -1,387 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-import QtQuick.Layouts
-import PageEnum 1.0
-import "./"
-import "../Controls"
-import "../Config"
-
-PageBase {
-    id: root
-    page: PageEnum.Vpn
-    logic: VpnLogic
-
-    Image {
-        id: bg_top
-        anchors.horizontalCenter: parent.horizontalCenter
-        y: 0
-        width: parent.width
-        height: parent.height * 0.28
-        source: "qrc:/images/background_connected.png"
-    }
-
-    LabelType {
-        x: 10
-        y: 10
-        width: 100
-        height: 21
-        text: VpnLogic.labelVersionText
-        color: "#dddddd"
-        font.pixelSize: 12
-    }
-
-    UrlButtonType {
-        id: button_donate
-        y: 10
-        anchors.horizontalCenter: parent.horizontalCenter
-        height: 21
-        label.color: "#D4D4D4"
-        label.text: qsTr("Donate")
-
-        onClicked: {
-            UiLogic.goToPage(PageEnum.Test)
-        }
-    }
-
-    ImageButtonType {
-        x: parent.width - 40
-        y: 0
-        width: 41
-        height: 41
-        imgMarginHover: 8
-        imgMargin: 9
-        icon.source: "qrc:/images/settings_grey.png"
-        onClicked: {
-            UiLogic.goToPage(PageEnum.GeneralSettings)
-        }
-    }
-
-    LabelType {
-        id: lb_log_enabled
-        anchors.top: button_donate.bottom
-        anchors.horizontalCenter: parent.horizontalCenter
-        width: parent.width
-        height: 21
-        horizontalAlignment: Text.AlignHCenter
-        verticalAlignment: Text.AlignVCenter
-
-        text: "Logging enabled!"
-        color: "#D4D4D4"
-
-        visible: VpnLogic.labelLogEnabledVisible
-    }
-
-    AnimatedImage {
-        id: connect_anim
-        source: "qrc:/images/animation.gif"
-        anchors.top: bg_top.bottom
-        anchors.topMargin: 10
-        anchors.horizontalCenter: root.horizontalCenter
-        width: Math.min(parent.width, parent.height) / 4
-        height: width
-
-        visible: !VpnLogic.pushButtonConnectVisible
-        paused: VpnLogic.pushButtonConnectVisible && !root.pageActive
-        //VisibleBehavior on visible { }
-    }
-
-    BasicButtonType {
-        id: button_connect
-        anchors.horizontalCenter: connect_anim.horizontalCenter
-        anchors.verticalCenter: connect_anim.verticalCenter
-        width: connect_anim.width
-        height: width
-        checkable: true
-        checked: VpnLogic.pushButtonConnectChecked
-        onClicked: VpnLogic.onPushButtonConnectClicked()
-        background: Image {
-            anchors.fill: parent
-            source: button_connect.checked ? "qrc:/images/connected.png"
-                                           : "qrc:/images/disconnected.png"
-        }
-        contentItem: Item {}
-        antialiasing: true
-        enabled: VpnLogic.pushButtonConnectEnabled && VpnLogic.isContainerSupportedByCurrentPlatform
-        opacity: VpnLogic.pushButtonConnectVisible ? 1 : 0
-
-//        transitions: Transition {
-//            NumberAnimation { properties: "opacity"; easing.type: Easing.InOutQuad; duration: 500 }
-//        }
-    }
-
-
-    LabelType {
-        id: lb_state
-        anchors.horizontalCenter: parent.horizontalCenter
-        anchors.top: button_connect.bottom
-        width: parent.width
-        height: 21
-        horizontalAlignment: Text.AlignHCenter
-        text: VpnLogic.labelStateText
-    }
-
-    RowLayout {
-        id: layout1
-        anchors.top: lb_state.bottom
-        //anchors.topMargin: 5
-        anchors.horizontalCenter: parent.horizontalCenter
-        height: 21
-
-
-        LabelType {
-            Layout.alignment: Qt.AlignRight
-            height: 21
-            text: ( VpnLogic.isContainerHaveAuthData ? qsTr("Server") : qsTr("Profile")) + ": "
-        }
-
-        BasicButtonType {
-            Layout.alignment: Qt.AlignLeft
-            height: 21
-            background: Item {}
-            text: VpnLogic.labelCurrentServer + (VpnLogic.isContainerHaveAuthData ? " →" : "")
-            font.family: "Lato"
-            font.styleName: "normal"
-            font.pixelSize: 16
-            onClicked: {
-                UiLogic.goToPage(PageEnum.ServersList)
-            }
-        }
-    }
-
-    RowLayout {
-        id: layout2
-        anchors.top: layout1.bottom
-        anchors.topMargin: 5
-        anchors.horizontalCenter: parent.horizontalCenter
-        height: 21
-
-
-        LabelType {
-            Layout.alignment: Qt.AlignRight
-            height: 21
-            text: qsTr("Proto") + ": "
-        }
-
-        BasicButtonType {
-            Layout.alignment: Qt.AlignLeft
-            height: 21
-            background: Item {}
-            text: VpnLogic.labelCurrentService + (VpnLogic.isContainerHaveAuthData ? " →" : "")
-            font.family: "Lato"
-            font.styleName: "normal"
-            font.pixelSize: 16
-            onClicked: {
-                if (VpnLogic.isContainerHaveAuthData)  UiLogic.onGotoCurrentProtocolsPage()
-            }
-        }
-    }
-
-    RowLayout {
-        id: layout3
-        anchors.top: layout2.bottom
-        anchors.topMargin: 5
-        anchors.horizontalCenter: parent.horizontalCenter
-        height: 21
-
-
-        LabelType {
-            Layout.alignment: Qt.AlignRight
-            height: 21
-            text: qsTr("DNS") + ": "
-        }
-
-        BasicButtonType {
-            Layout.alignment: Qt.AlignLeft
-            height: 21
-            implicitWidth: implicitContentWidth > root.width * 0.6 ?  root.width * 0.6 : implicitContentWidth + leftPadding + rightPadding
-            background: Item {}
-            text: VpnLogic.labelCurrentDns + (VpnLogic.isContainerHaveAuthData ? " →" : "")
-            font.family: "Lato"
-            font.styleName: "normal"
-            font.pixelSize: 16
-            onClicked: {
-                if (VpnLogic.isContainerHaveAuthData) UiLogic.goToPage(PageEnum.NetworkSettings)
-            }
-        }
-
-        SvgImageType {
-            svg.source: VpnLogic.amneziaDnsEnabled ? "qrc:/images/svg/gpp_good_black_24dp.svg" : "qrc:/images/svg/gpp_maybe_black_24dp.svg"
-            color: VpnLogic.amneziaDnsEnabled ?  "#22aa33" : "orange"
-            width: 25
-            height: 25
-        }
-    }
-
-
-    LabelType {
-        id: error_text
-        anchors.top: layout3.bottom
-        anchors.horizontalCenter: parent.horizontalCenter
-        anchors.topMargin: 20
-        width: parent.width - 20
-
-        height: 21
-        horizontalAlignment: Text.AlignHCenter
-        wrapMode: Text.Wrap
-        text: VpnLogic.labelErrorText
-        color: "red"
-    }
-
-    Item {
-        x: 0
-        anchors.bottom: line.top
-        anchors.bottomMargin: GC.isMobile() ? 0 :10
-        width: parent.width
-        height: 51
-        Image {
-            anchors.horizontalCenter: upload_label.horizontalCenter
-            y: 10
-            width: 15
-            height: 15
-            source: "qrc:/images/upload.png"
-        }
-        Image {
-            anchors.horizontalCenter: download_label.horizontalCenter
-            y: 10
-            width: 15
-            height: 15
-            source: "qrc:/images/download.png"
-        }
-        Text {
-            id: download_label
-            x: 0
-            y: 20
-            width: 130
-            height: 30
-            font.family: "Lato"
-            font.styleName: "normal"
-            font.pixelSize: 16
-            color: "#4171D6"
-            horizontalAlignment: Text.AlignHCenter
-            verticalAlignment: Text.AlignVCenter
-            wrapMode: Text.Wrap
-            text: VpnLogic.labelSpeedReceivedText
-        }
-        Text {
-            id: upload_label
-            x: parent.width - width
-            y: 20
-            width: 130
-            height: 30
-            font.family: "Lato"
-            font.styleName: "normal"
-            font.pixelSize: 16
-            color: "#42D185"
-            horizontalAlignment: Text.AlignHCenter
-            verticalAlignment: Text.AlignVCenter
-            wrapMode: Text.Wrap
-            text: VpnLogic.labelSpeedSentText
-        }
-    }
-
-    Rectangle {
-        id: line
-        x: 20
-        width: parent.width - 40
-        height: 1
-        anchors.bottom: GC.isMobile() ? root.bottom : conn_type_label.top
-        anchors.bottomMargin: 10
-        color: "#DDDDDD"
-    }
-
-    Text {
-        id: conn_type_label
-        visible: !GC.isMobile()
-        x: 20
-        anchors.bottom: conn_type_group.top
-        anchors.bottomMargin: GC.isMobile() ? 0 :10
-        width: 281
-        height: GC.isMobile() ? 0: 21
-        font.family: "Lato"
-        font.styleName: "normal"
-        font.pixelSize: 15
-        color: "#181922"
-        horizontalAlignment: Text.AlignLeft
-        verticalAlignment: Text.AlignVCenter
-        wrapMode: Text.Wrap
-        text: qsTr("How to use VPN")
-    }
-
-    Item {
-        id: conn_type_group
-        x: 20
-        visible: !GC.isMobile()
-        anchors.bottom: button_add_site.top
-        width: 351
-        height: GC.isMobile() ? 0: 91
-        enabled: VpnLogic.widgetVpnModeEnabled
-        RadioButtonType {
-            x: 0
-            y: 0
-            width: 341
-            height: 19
-            checked: VpnLogic.radioButtonVpnModeAllSitesChecked
-            text: qsTr("For all connections")
-            onClicked: VpnLogic.onRadioButtonVpnModeAllSitesClicked(true)
-        }
-        RadioButtonType {
-            enabled: VpnLogic.isCustomRoutesSupported
-            x: 0
-            y: 60
-            width: 341
-            height: 19
-            text: qsTr("Except selected sites")
-            checked: VpnLogic.radioButtonVpnModeExceptSitesChecked
-            onClicked: VpnLogic.onRadioButtonVpnModeExceptSitesClicked(true)
-        }
-        RadioButtonType {
-            enabled: VpnLogic.isCustomRoutesSupported
-            x: 0
-            y: 30
-            width: 341
-            height: 19
-            text: qsTr("For selected sites")
-            checked: VpnLogic.radioButtonVpnModeForwardSitesChecked
-            onClicked: VpnLogic.onRadioButtonVpnModeForwardSitesClicked(true)
-        }
-    }
-
-    BasicButtonType {
-        id: button_add_site
-        visible: !GC.isMobile()
-        anchors.horizontalCenter: parent.horizontalCenter
-        y: parent.height - 60
-        width: parent.width - 40
-        height: GC.isMobile() ? 0: 40
-        text: qsTr("+ Add site")
-        enabled: ! VpnLogic.radioButtonVpnModeAllSitesChecked
-        background: Rectangle {
-            anchors.fill: parent
-            radius: 4
-            color: {
-                if (!button_add_site.enabled) {
-                    return "#484952"
-                }
-                if (button_add_site.containsMouse) {
-                    return "#282932"
-                }
-                return "#181922"
-            }
-        }
-
-        contentItem: Text {
-            anchors.fill: parent
-            font.family: "Lato"
-            font.styleName: "normal"
-            font.pixelSize: 16
-            color: "#D4D4D4"
-            text: button_add_site.text
-            horizontalAlignment: Text.AlignHCenter
-            verticalAlignment: Text.AlignVCenter
-        }
-        antialiasing: true
-        onClicked: {
-            UiLogic.goToPage(PageEnum.Sites)
-        }
-    }
-}
diff --git a/client/ui/qml/Pages/PageViewConfig.qml b/client/ui/qml/Pages/PageViewConfig.qml
deleted file mode 100644
index 24ccda45..00000000
--- a/client/ui/qml/Pages/PageViewConfig.qml
+++ /dev/null
@@ -1,138 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-import QtQuick.Layouts
-import PageEnum 1.0
-import "./"
-import "../Controls"
-import "../Config"
-
-PageBase {
-    id: root
-    page: PageEnum.ViewConfig
-    logic: ViewConfigLogic
-
-    readonly property double rowHeight: ta_last_config.contentHeight / ta_last_config.textArea.lineCount
-
-    BackButton {}
-
-    Caption {
-        id: caption
-        text: qsTr("Check config")
-    }
-
-    FlickableType {
-        id: fl
-        anchors.top: caption.bottom
-        contentHeight: content.height
-
-        ColumnLayout {
-            id: content
-            enabled: logic.pageEnabled
-            anchors.top: parent.top
-            anchors.left: parent.left
-            anchors.right: parent.right
-            anchors.rightMargin: 15
-
-            TextAreaType {
-                id: ta_config
-
-                Layout.topMargin: 5
-                Layout.bottomMargin: 20
-                Layout.fillWidth: true
-                Layout.leftMargin: 1
-                Layout.rightMargin: 1
-                Layout.preferredHeight: ViewConfigLogic.warningActive ? 250 : fl.height - 70
-                flickableDirection: Flickable.AutoFlickIfNeeded
-
-                textArea.readOnly: true
-                textArea.text: logic.configText
-            }
-
-            LabelType {
-                id: lb_att
-                visible: ViewConfigLogic.warningActive
-                text: qsTr("Attention!
-The config above contains cached OpenVPN connection profile.
-AmneziaVPN detected this profile may contain malicious scripts. Please, carefully review the config and import this config only if you completely trust it.")
-                Layout.fillWidth: true
-            }
-
-            LabelType {
-                visible: ViewConfigLogic.warningActive
-                text: qsTr("Suspicious string:")
-                Layout.fillWidth: true
-            }
-
-            TextAreaType {
-                id: ta_mal
-                visible: ViewConfigLogic.warningActive
-
-                Layout.topMargin: 5
-                Layout.bottomMargin: 20
-                Layout.fillWidth: true
-                Layout.leftMargin: 1
-                Layout.rightMargin: 1
-                Layout.preferredHeight: 60
-                flickableDirection: Flickable.AutoFlickIfNeeded
-
-                textArea.readOnly: true
-                textArea.text: logic.openVpnMalStrings
-                textArea.textFormat: TextEdit.RichText
-            }
-
-            LabelType {
-                visible: ViewConfigLogic.warningActive
-                text: qsTr("Cached connection profile:")
-                Layout.fillWidth: true
-            }
-
-            TextAreaType {
-                id: ta_last_config
-                visible: ViewConfigLogic.warningActive
-
-                Layout.topMargin: 5
-                Layout.bottomMargin: 20
-                Layout.fillWidth: true
-                Layout.leftMargin: 1
-                Layout.rightMargin: 1
-                Layout.preferredHeight: 350
-                flickableDirection: Flickable.AutoFlickIfNeeded
-
-                textArea.readOnly: true
-                textArea.text: logic.openVpnLastConfigs
-                textArea.textFormat: TextEdit.RichText
-
-                Connections {
-                    target: logic
-                    function onWarningStringNumberChanged(n) {
-                        ta_last_config.contentY = rowHeight * n - ta_last_config.height / 2
-                    }
-                }
-            }
-
-            RowLayout {
-                id: btns_row
-
-                BasicButtonType {
-                    Layout.preferredWidth: (content.width - parent.spacing) /2
-                    Layout.preferredHeight: 40
-                    font.pixelSize: btn_import.font.pixelSize
-                    text: qsTr("Cancel")
-                    onClicked: {
-                        UiLogic.closePage()
-                    }
-                }
-
-                BlueButtonType {
-                    id: btn_import
-                    Layout.preferredWidth: (content.width - parent.spacing) /2
-                    text: qsTr("Import config")
-                    onClicked: {
-                        logic.importConfig()
-                    }
-                }
-            }
-        }
-    }
-
- }
diff --git a/client/ui/qml/Pages/Protocols/PageProtoCloak.qml b/client/ui/qml/Pages/Protocols/PageProtoCloak.qml
deleted file mode 100644
index 2b5b12ca..00000000
--- a/client/ui/qml/Pages/Protocols/PageProtoCloak.qml
+++ /dev/null
@@ -1,194 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-import QtQuick.Layouts
-import ProtocolEnum 1.0
-import "../"
-import "../../Controls"
-import "../../Config"
-
-PageProtocolBase {
-    id: root
-    protocol: ProtocolEnum.Cloak
-    logic: UiLogic.protocolLogic(protocol)
-
-    BackButton {
-        id: back
-        enabled: !logic.pushButtonCancelVisible
-    }
-
-    Caption {
-        id: caption
-        text: qsTr("Cloak Settings")
-    }
-
-    ColumnLayout {
-        id: content
-        enabled: logic.pageEnabled
-        anchors.top: caption.bottom
-        anchors.left: root.left
-        anchors.right: root.right
-        anchors.bottom: pb_save.top
-        anchors.margins: 20
-        anchors.topMargin: 10
-
-
-        RowLayout {
-            Layout.fillWidth: true
-
-            LabelType {
-                height: 31
-                text: qsTr("Cipher")
-                Layout.preferredWidth: 0.3 * root.width - 10
-            }
-
-            ComboBoxType {
-                Layout.fillWidth: true
-                height: 31
-                model: [
-                    qsTr("chacha20-poly1305"),
-                    qsTr("aes-256-gcm"),
-                    qsTr("aes-192-gcm"),
-                    qsTr("aes-128-gcm")
-                ]
-                currentIndex: {
-                    for (let i = 0; i < model.length; ++i) {
-                        if (logic.comboBoxCipherText === model[i]) {
-                            return i
-                        }
-                    }
-                    return -1
-                }
-                onCurrentTextChanged: {
-                    logic.comboBoxCipherText = currentText
-                }
-            }
-        }
-
-        RowLayout {
-            Layout.fillWidth: true
-
-            LabelType {
-                Layout.preferredWidth: 0.3 * root.width - 10
-                height: 31
-                text: qsTr("Fake Web Site")
-            }
-
-            TextFieldType {
-                id: lineEdit_proto_cloak_site
-                Layout.fillWidth: true
-                height: 31
-                text: logic.lineEditSiteText
-                onEditingFinished: {
-                    logic.lineEditSiteText = text
-                }
-            }
-        }
-
-        RowLayout {
-            Layout.fillWidth: true
-
-            LabelType {
-                Layout.preferredWidth: 0.3 * root.width - 10
-                height: 31
-                text: qsTr("Port")
-            }
-
-            TextFieldType {
-                id: lineEdit_proto_cloak_port
-                Layout.fillWidth: true
-                height: 31
-                text: logic.lineEditPortText
-                onEditingFinished: {
-                    logic.lineEditPortText = text
-                }
-                enabled: logic.lineEditPortEnabled
-            }
-        }
-
-        Item {
-            Layout.fillHeight: true
-        }
-    }
-
-    LabelType {
-        id: label_server_busy
-        horizontalAlignment: Text.AlignHCenter
-        Layout.maximumWidth: parent.width
-        Layout.fillWidth: true
-        visible: logic.labelServerBusyVisible
-        text: logic.labelServerBusyText
-    }
-
-    LabelType {
-        id: label_proto_cloak_info
-        horizontalAlignment: Text.AlignHCenter
-        Layout.maximumWidth: parent.width
-        Layout.fillWidth: true
-        visible: logic.labelInfoVisible
-        text: logic.labelInfoText
-    }
-
-    ProgressBar {
-        id: progressBar_proto_cloak_reset
-        anchors.horizontalCenter: parent.horizontalCenter
-        anchors.fill: pb_save
-        from: 0
-        to: logic.progressBarResetMaximum
-        value: logic.progressBarResetValue
-        background: Rectangle {
-            implicitWidth: parent.width
-            implicitHeight: parent.height
-            color: "#100A44"
-            radius: 4
-        }
-
-        contentItem: Item {
-            implicitWidth: parent.width
-            implicitHeight: parent.height
-            Rectangle {
-                width: progressBar_proto_cloak_reset.visualPosition * parent.width
-                height: parent.height
-                radius: 4
-                color: Qt.rgba(255, 255, 255, 0.15);
-            }
-        }
-        visible: logic.progressBarResetVisible
-        LabelType {
-            anchors.left: parent.left
-            anchors.right: parent.right
-            anchors.verticalCenter: parent.verticalCenter
-            text: logic.progressBarText
-            horizontalAlignment: Text.AlignHCenter
-            verticalAlignment: Text.AlignVCenter
-            font.family: "Lato"
-            font.styleName: "normal"
-            font.pixelSize: 16
-            color: "#D4D4D4"
-            visible: logic.progressBarTextVisible
-        }
-    }
-    BlueButtonType {
-        id: pb_save
-        anchors.horizontalCenter: parent.horizontalCenter
-        enabled: logic.pageEnabled
-        anchors.bottom: root.bottom
-        anchors.bottomMargin: 20
-        width: root.width - 60
-        height: 40
-        text: qsTr("Save and restart VPN")
-        visible: logic.pushButtonSaveVisible
-        onClicked: {
-            logic.onPushButtonSaveClicked()
-        }
-    }
-
-    BlueButtonType {
-        anchors.fill: pb_save
-        text: qsTr("Cancel")
-        visible: logic.pushButtonCancelVisible
-        enabled: logic.pushButtonCancelVisible
-        onClicked: {
-            logic.onPushButtonCancelClicked()
-        }
-    }
-}
diff --git a/client/ui/qml/Pages/Protocols/PageProtoOpenVPN.qml b/client/ui/qml/Pages/Protocols/PageProtoOpenVPN.qml
deleted file mode 100644
index 507f5f09..00000000
--- a/client/ui/qml/Pages/Protocols/PageProtoOpenVPN.qml
+++ /dev/null
@@ -1,454 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-import QtQuick.Layouts
-import ProtocolEnum 1.0
-import "../"
-import "../../Controls"
-import "../../Config"
-
-PageProtocolBase {
-    id: root
-    protocol: ProtocolEnum.OpenVpn
-    logic: UiLogic.protocolLogic(protocol)
-
-    BackButton {
-        id: back
-        enabled: !logic.pushButtonCancelVisible
-    }
-
-    Caption {
-        id: caption
-        text: qsTr("OpenVPN Settings")
-    }
-
-    FlickableType {
-        id: fl
-        anchors.top: caption.bottom
-        contentHeight: content.height
-
-        ColumnLayout {
-            id: content
-            anchors.top: parent.top
-            anchors.left: parent.left
-            anchors.right: parent.right
-            anchors.rightMargin: GC.defaultMargin - 1
-
-            ColumnLayout {
-                visible: !logic.isThirdPartyConfig
-
-                LabelType {
-                    id: lb_subnet
-                    enabled: logic.pageEnabled
-                    height: 21
-                    text: qsTr("VPN Addresses Subnet")
-                }
-
-                TextFieldType {
-                    id: tf_subnet
-                    enabled: logic.pageEnabled
-                    implicitWidth: parent.width
-                    height: 31
-                    text: logic.lineEditSubnetText
-                    onEditingFinished: {
-                        logic.lineEditSubnetText = text
-                    }
-                }
-
-                LabelType {
-                    id: lb_proto
-                    enabled: logic.pageEnabled
-                    Layout.topMargin: 20
-                    height: 21
-                    text: qsTr("Network protocol")
-                }
-
-                Rectangle {
-                    id: rect_proto
-                    enabled: logic.pageEnabled
-                    implicitWidth: parent.width
-                    height: 71
-                    border.width: 1
-                    border.color: "lightgray"
-                    radius: 2
-                    RadioButtonType {
-                        x: 10
-                        y: 40
-                        width: 171
-                        height: 19
-                        text: qsTr("TCP")
-                        enabled: logic.radioButtonTcpEnabled
-                        checked: logic.radioButtonTcpChecked
-                        onCheckedChanged: {
-                            logic.radioButtonTcpChecked = checked
-                        }
-                    }
-                    RadioButtonType {
-                        x: 10
-                        y: 10
-                        width: 171
-                        height: 19
-                        text: qsTr("UDP")
-                        checked: logic.radioButtonUdpChecked
-                        onCheckedChanged: {
-                            logic.radioButtonUdpChecked = checked
-                        }
-                        enabled: logic.radioButtonUdpEnabled
-                    }
-                }
-
-                RowLayout {
-                    enabled: logic.pageEnabled
-                    Layout.topMargin: 10
-                    Layout.fillWidth: true
-                    LabelType {
-                        id: lb_port
-                        height: 31
-                        text: qsTr("Port")
-                        Layout.preferredWidth: root.width / 2 - 10
-                    }
-                    TextFieldType {
-                        id: tf_port
-                        Layout.fillWidth: true
-
-                        height: 31
-                        text: logic.lineEditPortText
-                        onEditingFinished: {
-                            logic.lineEditPortText = text
-                        }
-                        enabled: logic.lineEditPortEnabled
-                    }
-                }
-
-                CheckBoxType {
-                    id: check_auto_enc
-                    enabled: logic.pageEnabled
-                    implicitWidth: parent.width
-                    height: 21
-                    text: qsTr("Auto-negotiate encryption")
-                    checked: logic.checkBoxAutoEncryptionChecked
-                    onCheckedChanged: {
-                        logic.checkBoxAutoEncryptionChecked = checked
-                    }
-                    onClicked: {
-                        logic.checkBoxAutoEncryptionClicked()
-                    }
-                }
-
-                LabelType {
-                    id: lb_cipher
-                    enabled: logic.pageEnabled
-                    height: 21
-                    text: qsTr("Cipher")
-                }
-
-                ComboBoxType {
-                    id: cb_cipher
-                    enabled: logic.pageEnabled && !check_auto_enc.checked
-                    implicitWidth: parent.width
-
-                    height: 31
-                    model: [
-                        qsTr("AES-256-GCM"),
-                        qsTr("AES-192-GCM"),
-                        qsTr("AES-128-GCM"),
-                        qsTr("AES-256-CBC"),
-                        qsTr("AES-192-CBC"),
-                        qsTr("AES-128-CBC"),
-                        qsTr("ChaCha20-Poly1305"),
-                        qsTr("ARIA-256-CBC"),
-                        qsTr("CAMELLIA-256-CBC"),
-                        qsTr("none")
-                    ]
-                    currentIndex: {
-                        for (let i = 0; i < model.length; ++i) {
-                            if (logic.comboBoxVpnCipherText === model[i]) {
-                                return i
-                            }
-                        }
-                        return -1
-                    }
-                    onCurrentTextChanged: {
-                        logic.comboBoxVpnCipherText = currentText
-                    }
-                }
-
-                LabelType {
-                    id: lb_hash
-                    enabled: logic.pageEnabled
-                    height: 21
-                    Layout.topMargin: 20
-                    text: qsTr("Hash")
-                }
-
-                ComboBoxType {
-                    id: cb_hash
-                    enabled: logic.pageEnabled && !check_auto_enc.checked
-                    height: 31
-                    implicitWidth: parent.width
-                    model: [
-                        qsTr("SHA512"),
-                        qsTr("SHA384"),
-                        qsTr("SHA256"),
-                        qsTr("SHA3-512"),
-                        qsTr("SHA3-384"),
-                        qsTr("SHA3-256"),
-                        qsTr("whirlpool"),
-                        qsTr("BLAKE2b512"),
-                        qsTr("BLAKE2s256"),
-                        qsTr("SHA1")
-                    ]
-                    currentIndex: {
-                        for (let i = 0; i < model.length; ++i) {
-                            if (logic.comboBoxVpnHashText === model[i]) {
-                                return i
-                            }
-                        }
-                        return -1
-                    }
-                    onCurrentTextChanged: {
-                        logic.comboBoxVpnHashText = currentText
-                    }
-                }
-
-                CheckBoxType {
-                    id: check_tls
-                    enabled: logic.pageEnabled
-                    implicitWidth: parent.width
-                    Layout.topMargin: 20
-                    height: 21
-                    text: qsTr("Enable TLS auth")
-                    checked: logic.checkBoxTlsAuthChecked
-                    onCheckedChanged: {
-                        logic.checkBoxTlsAuthChecked = checked
-                    }
-
-                }
-
-                CheckBoxType {
-                    id: check_block_dns
-                    enabled: logic.pageEnabled
-                    implicitWidth: parent.width
-                    height: 21
-                    text: qsTr("Block DNS requests outside of VPN")
-                    checked: logic.checkBoxBlockDnsChecked
-                    onCheckedChanged: {
-                        logic.checkBoxBlockDnsChecked = checked
-                    }
-                }
-
-                BasicButtonType {
-                    id: pb_client_config
-                    enabled: logic.pageEnabled
-                    implicitWidth: parent.width
-                    height: 21
-                    text: qsTr("Additional client config commands →")
-                    background: Item {
-                        anchors.fill: parent
-                    }
-
-                    contentItem: Text {
-                        anchors.fill: parent
-                        font.family: "Lato"
-                        font.styleName: "normal"
-                        font.pixelSize: 16
-                        color: "#15CDCB";
-                        text: pb_client_config.text
-                        horizontalAlignment: Text.AlignLeft
-                        verticalAlignment: Text.AlignVCenter
-                    }
-                    antialiasing: true
-                    checkable: true
-                    checked: StartPageLogic.pushButtonConnectKeyChecked
-                }
-
-                Rectangle {
-                    id: rect_client_conf
-                    enabled: logic.pageEnabled
-                    implicitWidth: root.width - 60
-                    height: 101
-                    border.width: 1
-                    border.color: "lightgray"
-                    radius: 2
-                    visible: pb_client_config.checked
-
-                    ScrollView {
-                        anchors.fill: parent
-                        TextArea {
-                            id: te_client_config
-                            font.family: "Lato"
-                            font.styleName: "normal"
-                            font.pixelSize: 16
-                            color: "#181922"
-                            text: logic.textAreaAdditionalClientConfig
-                            onEditingFinished: {
-                                logic.textAreaAdditionalClientConfig = text
-                            }
-                        }
-                    }
-                }
-
-                BasicButtonType {
-                    id: pb_server_config
-                    enabled: logic.pageEnabled
-                    implicitWidth: parent.width
-                    height: 21
-                    text: qsTr("Additional server config commands →")
-                    background: Item {
-                        anchors.fill: parent
-                    }
-
-                    contentItem: Text {
-                        anchors.fill: parent
-                        font.family: "Lato"
-                        font.styleName: "normal"
-                        font.pixelSize: 16
-                        color: "#15CDCB";
-                        text: pb_server_config.text
-                        horizontalAlignment: Text.AlignLeft
-                        verticalAlignment: Text.AlignVCenter
-                    }
-                    antialiasing: true
-                    checkable: true
-                    checked: StartPageLogic.pushButtonConnectKeyChecked
-                }
-
-                Rectangle {
-                    id: rect_server_conf
-                    enabled: logic.pageEnabled
-                    implicitWidth: root.width - 60
-                    height: 101
-                    border.width: 1
-                    border.color: "lightgray"
-                    radius: 2
-                    visible: pb_server_config.checked
-
-                    ScrollView {
-                        anchors.fill: parent
-                        TextArea {
-                            id: te_server_config
-                            font.family: "Lato"
-                            font.styleName: "normal"
-                            font.pixelSize: 16
-                            color: "#181922"
-                            text: logic.textAreaAdditionalServerConfig
-                            onEditingFinished: {
-                                logic.textAreaAdditionalServerConfig = text
-                            }
-                        }
-                    }
-                }
-
-                LabelType {
-                    id: label_server_busy
-                    enabled: logic.pageEnabled
-                    horizontalAlignment: Text.AlignHCenter
-                    Layout.maximumWidth: parent.width
-                    Layout.fillWidth: true
-                    visible: logic.labelServerBusyVisible
-                    text: logic.labelServerBusyText
-                }
-
-                LabelType {
-                    id: label_proto_openvpn_info
-                    enabled: logic.pageEnabled
-                    horizontalAlignment: Text.AlignHCenter
-                    Layout.maximumWidth: parent.width
-                    Layout.fillWidth: true
-                    height: 41
-                    visible: logic.labelProtoOpenVpnInfoVisible
-                    text: logic.labelProtoOpenVpnInfoText
-                }
-
-                Rectangle {
-                    id: it_save
-                    implicitWidth: parent.width
-                    Layout.topMargin: 20
-                    height: 40
-
-                    BlueButtonType {
-                        id: pb_save
-                        enabled: logic.pageEnabled
-                        z: 1
-                        height: 40
-                        text: qsTr("Save and restart VPN")
-                        width: parent.width
-                        visible: logic.pushButtonSaveVisible
-                        onClicked: {
-                            logic.onPushButtonSaveClicked()
-                        }
-                    }
-
-                    BlueButtonType {
-                        z: 1
-                        anchors.fill: pb_save
-                        text: qsTr("Cancel")
-                        visible: logic.pushButtonCancelVisible
-                        enabled: logic.pushButtonCancelVisible
-                        onClicked: {
-                            logic.onPushButtonCancelClicked()
-                        }
-                    }
-
-                    ProgressBar {
-                        id: progress_save
-                        anchors.fill: pb_save
-                        from: 0
-                        to: logic.progressBarResetMaximum
-                        value: logic.progressBarResetValue
-                        visible: logic.progressBarResetVisible
-                        background: Rectangle {
-                            implicitWidth: parent.width
-                            implicitHeight: parent.height
-                            color: "#100A44"
-                            radius: 4
-                        }
-
-                        contentItem: Item {
-                            implicitWidth: parent.width
-                            implicitHeight: parent.height
-                            Rectangle {
-                                width: progress_save.visualPosition * parent.width
-                                height: parent.height
-                                radius: 4
-                                color: Qt.rgba(255, 255, 255, 0.15);
-                            }
-                        }
-                    }
-
-                    LabelType {
-                        anchors.left: parent.left
-                        anchors.right: parent.right
-                        anchors.verticalCenter: parent.verticalCenter
-                        text: logic.progressBarText
-                        horizontalAlignment: Text.AlignHCenter
-                        verticalAlignment: Text.AlignVCenter
-                        font.family: "Lato"
-                        font.styleName: "normal"
-                        font.pixelSize: 16
-                        color: "#D4D4D4"
-                        visible: logic.progressBarTextVisible
-                    }
-                }
-
-            }
-
-            ColumnLayout {
-                visible: logic.isThirdPartyConfig
-                TextAreaType {
-                    id: ta_config
-
-                    Layout.topMargin: 5
-                    Layout.bottomMargin: 20
-                    Layout.fillWidth: true
-                    Layout.leftMargin: 1
-                    Layout.rightMargin: 1
-                    Layout.preferredHeight: fl.height - 70
-                    flickableDirection: Flickable.AutoFlickIfNeeded
-
-                    textArea.readOnly: true
-                    textArea.text: logic.openVpnLastConfigText
-                }
-            }
-        }
-    }
-}
diff --git a/client/ui/qml/Pages/Protocols/PageProtoSftp.qml b/client/ui/qml/Pages/Protocols/PageProtoSftp.qml
deleted file mode 100644
index c6a0602f..00000000
--- a/client/ui/qml/Pages/Protocols/PageProtoSftp.qml
+++ /dev/null
@@ -1,140 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-import ProtocolEnum 1.0
-import "../"
-import "../../Controls"
-import "../../Config"
-
-PageProtocolBase {
-    id: root
-    protocol: ProtocolEnum.Sftp
-    logic: UiLogic.protocolLogic(protocol)
-
-    BackButton {
-        id: back
-    }
-
-    Caption {
-        id: caption
-        text: qsTr("SFTP settings")
-    }
-
-    Rectangle {
-        id: frame_settings
-        width: parent.width
-        anchors.top: caption.bottom
-        anchors.topMargin: 10
-
-        border.width: 1
-        border.color: "lightgray"
-        anchors.bottomMargin: 5
-        anchors.horizontalCenter: parent.horizontalCenter
-        radius: 2
-        Grid {
-            id: grid
-            anchors.fill: parent
-            columns: 2
-            horizontalItemAlignment: Grid.AlignHCenter
-            verticalItemAlignment: Grid.AlignVCenter
-            topPadding: 5
-            leftPadding: 30
-            rightPadding: 30
-            spacing: 5
-
-
-            LabelType {
-                width: 130
-                text: qsTr("Port")
-            }
-            TextFieldType {
-                id: tf_port_num
-                width: parent.width - 130 - parent.spacing - parent.leftPadding * 2
-                text: logic.labelTftpPortText
-                readOnly: true
-            }
-
-            LabelType {
-                width: 130
-                text: qsTr("User Name")
-            }
-            TextFieldType {
-                id: tf_user_name
-                width: parent.width - 130 - parent.spacing - parent.leftPadding * 2
-                text: logic.labelTftpUserNameText
-                readOnly: true
-            }
-
-            LabelType {
-                width: 130
-                text: qsTr("Password")
-            }
-            TextFieldType {
-                id: tf_password
-                width: parent.width - 130 - parent.spacing - parent.leftPadding * 2
-                text: logic.labelTftpPasswordText
-                readOnly: true
-            }
-        }
-    }
-
-    RichLabelType {
-        anchors.bottom: check_persist.top
-        anchors.bottomMargin: 10
-        width: parent.width - 60
-        x: 30
-        font.pixelSize: 14
-
-        readonly property string windows_text: "In order to mount remote SFTP folder as local drive, perform following steps:
-<ul>
-<li>Install the latest version of <a href=\"https://github.com/billziss-gh/winfsp/releases/latest\">WinFsp</a>.</li>
-<li>Install the latest version of <a href=\"https://github.com/billziss-gh/sshfs-win/releases\">SSHFS-Win</a>. Choose the x64 or x86 installer according to your computer's architecture.</li>
-</ul>"
-
-        readonly property string macos_text: "In order to mount remote SFTP folder as local folder, perform following steps:
-<ul>
-<li>Install the latest version of <a href=\"https://osxfuse.github.io/\">macFUSE</a>.</li>
-<li>Install the latest version of <a href=\"https://osxfuse.github.io/\">SSHFS</a>.</li>
-</ul>"
-
-        text: {
-            if (Qt.platform.os == "windows") return windows_text
-            else if (Qt.platform.os == "osx") return macos_text
-            else if (Qt.platform.os == "linux") return ""
-            else return ""
-        }
-    }
-
-    CheckBoxType {
-        id: check_persist
-        visible: false
-        anchors.bottom: pb_mount.top
-        anchors.bottomMargin: 10
-        x: 30
-        width: parent.width
-        height: 21
-        text: qsTr("Restore drive when client starts")
-        checked: logic.checkBoxSftpRestoreChecked
-        onCheckedChanged: {
-            logic.checkBoxSftpRestoreChecked = checked
-        }
-        onClicked: {
-            logic.checkBoxSftpRestoreClicked()
-        }
-    }
-
-    BlueButtonType {
-        id: pb_mount
-        visible: GC.isDesktop()
-        enabled: logic.pushButtonSftpMountEnabled
-        anchors.horizontalCenter: parent.horizontalCenter
-        anchors.bottom: parent.bottom
-        anchors.bottomMargin: 20
-        x: 30
-        width: parent.width - 60
-        height: 40
-        text: qsTr("Mount drive")
-        onClicked: {
-            logic.onPushButtonSftpMountDriveClicked()
-        }
-    }
-}
diff --git a/client/ui/qml/Pages/Protocols/PageProtoShadowSocks.qml b/client/ui/qml/Pages/Protocols/PageProtoShadowSocks.qml
deleted file mode 100644
index f3b1f83d..00000000
--- a/client/ui/qml/Pages/Protocols/PageProtoShadowSocks.qml
+++ /dev/null
@@ -1,175 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-import QtQuick.Layouts
-import ProtocolEnum 1.0
-import "../"
-import "../../Controls"
-import "../../Config"
-
-PageProtocolBase {
-    id: root
-    protocol: ProtocolEnum.ShadowSocks
-    logic: UiLogic.protocolLogic(protocol)
-
-    BackButton {
-        id: back
-        enabled: !logic.pushButtonCancelVisible
-    }
-
-    Caption {
-        id: caption
-        text: qsTr("ShadowSocks Settings")
-    }
-
-
-    ColumnLayout {
-        id: content
-        enabled: logic.pageEnabled
-        anchors.top: caption.bottom
-        anchors.left: root.left
-        anchors.right: root.right
-        anchors.bottom: pb_save.top
-        anchors.margins: 20
-        anchors.topMargin: 10
-
-
-
-        RowLayout {
-            Layout.fillWidth: true
-
-            LabelType {
-                height: 31
-                text: qsTr("Cipher")
-                Layout.preferredWidth: 0.3 * root.width - 10
-            }
-
-            ComboBoxType {
-                height: 31
-                Layout.fillWidth: true
-
-                model: [
-                    qsTr("chacha20-ietf-poly1305"),
-                    qsTr("xchacha20-ietf-poly1305"),
-                    qsTr("aes-256-gcm"),
-                    qsTr("aes-192-gcm"),
-                    qsTr("aes-128-gcm")
-                ]
-                currentIndex: {
-                    for (let i = 0; i < model.length; ++i) {
-                        if (logic.comboBoxCipherText === model[i]) {
-                            return i
-                        }
-                    }
-                    return -1
-                }
-            }
-        }
-
-        RowLayout {
-            Layout.fillWidth: true
-
-            LabelType {
-                Layout.preferredWidth: 0.3 * root.width - 10
-                height: 31
-                text: qsTr("Port")
-            }
-
-            TextFieldType {
-                id: lineEdit_proto_shadowsocks_port
-                Layout.fillWidth: true
-                height: 31
-                text: logic.lineEditPortText
-                onEditingFinished: {
-                    logic.lineEditPortText = text
-                }
-                enabled: logic.lineEditPortEnabled
-            }
-        }
-
-        Item {
-            Layout.fillHeight: true
-        }
-
-        LabelType {
-            id: label_server_busy
-            horizontalAlignment: Text.AlignHCenter
-            Layout.maximumWidth: parent.width
-            Layout.fillWidth: true
-            visible: logic.labelServerBusyVisible
-            text: logic.labelServerBusyText
-        }
-
-        LabelType {
-            id: label_proto_shadowsocks_info
-            horizontalAlignment: Text.AlignHCenter
-            Layout.maximumWidth: parent.width
-            Layout.fillWidth: true
-            visible: logic.labelInfoVisible
-            text: logic.labelInfoText
-        }
-    }
-
-    ProgressBar {
-        id: progressBar_reset
-        anchors.fill: pb_save
-        from: 0
-        to: logic.progressBarResetMaximum
-        value: logic.progressBarResetValue
-        visible: logic.progressBarResetVisible
-        background: Rectangle {
-            implicitWidth: parent.width
-            implicitHeight: parent.height
-            color: "#100A44"
-            radius: 4
-        }
-
-        contentItem: Item {
-            implicitWidth: parent.width
-            implicitHeight: parent.height
-            Rectangle {
-                width: progressBar_reset.visualPosition * parent.width
-                height: parent.height
-                radius: 4
-                color: Qt.rgba(255, 255, 255, 0.15);
-            }
-        }
-        LabelType {
-            anchors.left: parent.left
-            anchors.right: parent.right
-            anchors.verticalCenter: parent.verticalCenter
-            text: logic.progressBarText
-            horizontalAlignment: Text.AlignHCenter
-            verticalAlignment: Text.AlignVCenter
-            font.family: "Lato"
-            font.styleName: "normal"
-            font.pixelSize: 16
-            color: "#D4D4D4"
-            visible: logic.progressBarTextVisible
-        }
-    }
-
-    BlueButtonType {
-        id: pb_save
-        enabled: logic.pageEnabled
-        anchors.horizontalCenter: parent.horizontalCenter
-        anchors.bottom: root.bottom
-        anchors.bottomMargin: 20
-        width: root.width - 60
-        height: 40
-        text: qsTr("Save and restart VPN")
-        visible: logic.pushButtonSaveVisible
-        onClicked: {
-            logic.onPushButtonSaveClicked()
-        }
-    }
-
-    BlueButtonType {
-        anchors.fill: pb_save
-        text: qsTr("Cancel")
-        visible: logic.pushButtonCancelVisible
-        enabled: logic.pushButtonCancelVisible
-        onClicked: {
-            logic.onPushButtonCancelClicked()
-        }
-    }
-}
diff --git a/client/ui/qml/Pages/Protocols/PageProtoTorWebSite.qml b/client/ui/qml/Pages/Protocols/PageProtoTorWebSite.qml
deleted file mode 100644
index aa4d35d4..00000000
--- a/client/ui/qml/Pages/Protocols/PageProtoTorWebSite.qml
+++ /dev/null
@@ -1,69 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-import QtQuick.Layouts
-import ProtocolEnum 1.0
-import "../"
-import "../../Controls"
-import "../../Config"
-
-PageProtocolBase {
-    id: root
-    protocol: ProtocolEnum.TorWebSite
-    logic: UiLogic.protocolLogic(protocol)
-
-    BackButton {
-        id: back
-    }
-
-    Caption {
-        id: caption
-        text: qsTr("Tor Web Site settings")
-    }
-
-
-    ColumnLayout {
-        id: content
-        enabled: logic.pageEnabled
-        anchors.top: caption.bottom
-        anchors.left: root.left
-        anchors.right: root.right
-        anchors.margins: 20
-        anchors.topMargin: 10
-
-
-
-        RowLayout {
-            Layout.fillWidth: true
-
-            LabelType {
-                id: lbl_onion
-                Layout.preferredWidth: 0.3 * root.width - 10
-                text: qsTr("Web site onion address")
-            }
-            TextFieldType {
-                id: tf_site_address
-                Layout.fillWidth: true
-                text: logic.labelTorWebSiteAddressText
-                readOnly: true
-            }
-        }
-
-        ShareConnectionButtonCopyType {
-            Layout.fillWidth: true
-            Layout.topMargin: 5
-            copyText: tf_site_address.text
-        }
-
-        RichLabelType {
-            Layout.fillWidth: true
-            Layout.topMargin: 15
-            text: qsTr("Notes:<ul>
-<li>Use <a href=\"https://www.torproject.org/download/\">Tor Browser</a> to open this url.</li>
-<li>After installation it takes several minutes while your onion site will become available in the Tor Network.</li>
-<li>When configuring WordPress set the domain as this onion address.</li>
-</ul>
-")
-        }
-    }
-
-}
diff --git a/client/ui/qml/Pages/Protocols/PageProtoWireGuard.qml b/client/ui/qml/Pages/Protocols/PageProtoWireGuard.qml
deleted file mode 100644
index e4dde50e..00000000
--- a/client/ui/qml/Pages/Protocols/PageProtoWireGuard.qml
+++ /dev/null
@@ -1,60 +0,0 @@
-import QtQuick 2.12
-import QtQuick.Controls 2.12
-import QtQuick.Layouts 1.15
-import ProtocolEnum 1.0
-import "../"
-import "../../Controls"
-import "../../Config"
-
-PageProtocolBase {
-    id: root
-    protocol: ProtocolEnum.WireGuard
-    logic: UiLogic.protocolLogic(protocol)
-
-    BackButton {
-        id: back
-    }
-    Caption {
-        id: caption
-        text: qsTr("WireGuard Settings")
-    }
-
-    Flickable {
-        id: fl
-        width: root.width
-        anchors.top: caption.bottom
-        anchors.topMargin: 20
-        anchors.bottom: parent.bottom
-        anchors.bottomMargin: 20
-        anchors.left: root.left
-        anchors.leftMargin: 30
-        anchors.right: root.right
-        anchors.rightMargin: 30
-
-        contentHeight: content.height
-        clip: true
-
-        ColumnLayout {
-            id: content
-            anchors.top: parent.top
-            anchors.left: parent.left
-            anchors.right: parent.right
-
-            TextAreaType {
-                id: ta_config
-
-                Layout.topMargin: 5
-                Layout.bottomMargin: 20
-                Layout.fillWidth: true
-                Layout.leftMargin: 1
-                Layout.rightMargin: 1
-                Layout.preferredHeight: fl.height - 70
-                flickableDirection: Flickable.AutoFlickIfNeeded
-
-                textArea.readOnly: true
-                textArea.text: logic.wireGuardLastConfigText
-            }
-        }
-    }
-
-}
diff --git a/client/ui/qml/Pages/Protocols/PageProtocolBase.qml b/client/ui/qml/Pages/Protocols/PageProtocolBase.qml
deleted file mode 100644
index 97a0f1eb..00000000
--- a/client/ui/qml/Pages/Protocols/PageProtocolBase.qml
+++ /dev/null
@@ -1,13 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-import PageEnum 1.0
-import ProtocolEnum 1.0
-import "./.."
-import "../../Controls"
-import "../../Config"
-
-PageBase {
-    id: root
-    property var protocol: ProtocolEnum.Any
-    page: PageEnum.ProtocolSettings
-}
diff --git a/client/ui/qml/Pages/Share/PageShareProtoAmnezia.qml b/client/ui/qml/Pages/Share/PageShareProtoAmnezia.qml
deleted file mode 100644
index 4e52e501..00000000
--- a/client/ui/qml/Pages/Share/PageShareProtoAmnezia.qml
+++ /dev/null
@@ -1,145 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-import QtQuick.Layouts
-import ProtocolEnum 1.0
-import "../"
-import "../../Controls"
-import "../../Config"
-
-PageShareProtocolBase {
-    id: root
-    protocol: ProtocolEnum.Any
-
-    BackButton {
-        id: back
-    }
-    Caption {
-        id: caption
-        text: qsTr("Share for Amnezia")
-    }
-
-    FlickableType {
-        id: fl
-        anchors.top: caption.bottom
-        contentHeight: content.height + 20
-
-        Behavior on contentY{
-            NumberAnimation {
-                duration: 300
-                easing.type: Easing.InOutCubic
-            }
-        }
-
-        ColumnLayout {
-            id: content
-            enabled: logic.pageEnabled
-            anchors.top: parent.top
-            anchors.left: parent.left
-            anchors.right: parent.right
-            anchors.rightMargin: 15
-
-            Text {
-                id: lb_desc
-                Layout.fillWidth: true
-                font.family: "Lato"
-                font.styleName: "normal"
-                font.pixelSize: 16
-                color: "#181922"
-                horizontalAlignment: Text.AlignHCenter
-                verticalAlignment: Text.AlignVCenter
-                wrapMode: Text.Wrap
-                text: ShareConnectionLogic.shareFullAccess
-                      ? qsTr("Anyone who logs in with this code will have the same permissions to use VPN and YOUR SERVER as you. \n
-This code includes your server credentials!\n
-Provide this code only to TRUSTED users.")
-                      : qsTr("Anyone who logs in with this code will be able to connect to this VPN server. \n
-This code does not include server credentials.\n
-New encryption keys pair will be generated.")
-            }
-
-            ShareConnectionButtonType {
-                Layout.topMargin: 20
-                Layout.fillWidth: true
-                Layout.preferredHeight: 40
-
-                text: ShareConnectionLogic.shareFullAccess
-                      ? showConfigText
-                      : (genConfigProcess ? generatingConfigText : generateConfigText)
-                onClicked: {
-                    enabled = false
-                    genConfigProcess = true
-                    ShareConnectionLogic.onPushButtonShareAmneziaGenerateClicked()
-                    enabled = true
-                    genConfigProcess = false
-                    fl.contentY = tfShareCode.mapToItem(fl.contentItem, 0, 0).y
-                }
-            }
-
-            TextAreaType {
-                id: tfShareCode
-
-                Layout.topMargin: 20
-                Layout.bottomMargin: 20
-                Layout.preferredHeight: 200
-
-                Layout.fillWidth: true
-
-                textArea.readOnly: true
-                textArea.wrapMode: TextEdit.WrapAnywhere
-                textArea.verticalAlignment: Text.AlignTop
-                textArea.text: ShareConnectionLogic.textEditShareAmneziaCodeText
-
-                visible: tfShareCode.textArea.length > 0
-            }
-
-
-            ShareConnectionButtonCopyType {
-                Layout.bottomMargin: 10
-                Layout.fillWidth: true
-                Layout.preferredHeight: 40
-                copyText: tfShareCode.textArea.text
-            }
-            ShareConnectionButtonType {
-                Layout.bottomMargin: 10
-                Layout.fillWidth: true
-                Layout.preferredHeight: 40
-                text: Qt.platform.os === "android" ? qsTr("Share") : qsTr("Save to file")
-                enabled: tfShareCode.textArea.length > 0
-                visible: tfShareCode.textArea.length > 0
-
-                onClicked: {
-                    UiLogic.saveTextFile(qsTr("Save AmneziaVPN config"), "amnezia_config.vpn", "*.vpn", tfShareCode.textArea.text)
-                }
-            }
-
-            Image {
-                id: image_share_code
-                Layout.topMargin: 20
-                Layout.fillWidth: true
-                Layout.preferredHeight: width
-                smooth: false
-
-                Timer {
-                    property int idx: 0
-                    interval: 1000
-                    running: root.pageActive && ShareConnectionLogic.shareAmneziaQrCodeTextSeriesLength > 0
-                    repeat: true
-                    onTriggered: {
-                        idx++
-                        if (idx >= ShareConnectionLogic.shareAmneziaQrCodeTextSeriesLength) {
-                            idx = 0
-                        }
-                        image_share_code.source = ShareConnectionLogic.shareAmneziaQrCodeTextSeries[idx]
-                    }
-                }
-
-                visible: ShareConnectionLogic.shareAmneziaQrCodeTextSeriesLength > 0
-            }
-
-            LabelType {
-                Layout.fillWidth: true
-                text: qsTr("Scan QR code using AmneziaVPN mobile")
-            }
-        }
-    }
-}
diff --git a/client/ui/qml/Pages/Share/PageShareProtoCloak.qml b/client/ui/qml/Pages/Share/PageShareProtoCloak.qml
deleted file mode 100644
index 92bcb832..00000000
--- a/client/ui/qml/Pages/Share/PageShareProtoCloak.qml
+++ /dev/null
@@ -1,99 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-import QtQuick.Layouts
-import ProtocolEnum 1.0
-import "../"
-import "../../Controls"
-import "../../Config"
-
-PageShareProtocolBase {
-    id: root
-    protocol: ProtocolEnum.Cloak
-
-    BackButton {
-        id: back
-    }
-    Caption {
-        id: caption
-        text: qsTr("Share Cloak Settings")
-    }
-
-    FlickableType {
-        id: fl
-        anchors.top: caption.bottom
-        contentHeight: content.height
-
-        ColumnLayout {
-            id: content
-            enabled: logic.pageEnabled
-            anchors.top: parent.top
-            anchors.left: parent.left
-            anchors.right: parent.right
-            anchors.rightMargin: 15
-
-            LabelType {
-                id: lb_desc
-                Layout.fillWidth: true
-                Layout.topMargin: 10
-
-                horizontalAlignment: Text.AlignHCenter
-
-                wrapMode: Text.Wrap
-                text: qsTr("Note: Cloak protocol using same password for all connections")
-            }
-
-            ShareConnectionButtonType {
-                Layout.topMargin: 10
-                Layout.fillWidth: true
-                Layout.preferredHeight: 40
-
-                text: genConfigProcess ? generatingConfigText : generateConfigText
-                onClicked: {
-                    enabled = false
-                    genConfigProcess = true
-                    ShareConnectionLogic.onPushButtonShareCloakGenerateClicked()
-                    enabled = true
-                    genConfigProcess = false
-                }
-            }
-
-            TextAreaType {
-                id: tfShareCode
-
-                Layout.topMargin: 20
-                Layout.bottomMargin: 20
-                Layout.fillWidth: true
-                Layout.preferredHeight: 200
-
-                textArea.readOnly: true
-                textArea.text: ShareConnectionLogic.textEditShareCloakText
-
-                visible: tfShareCode.textArea.length > 0
-            }
-
-            ShareConnectionButtonCopyType {
-                Layout.bottomMargin: 10
-                Layout.fillWidth: true
-                Layout.preferredHeight: 40
-
-                copyText: tfShareCode.textArea.text
-            }
-
-            ShareConnectionButtonType {
-                Layout.bottomMargin: 10
-                Layout.fillWidth: true
-                Layout.preferredHeight: 40
-
-                text: Qt.platform.os === "android" ? qsTr("Share") : qsTr("Save to file")
-                enabled: tfShareCode.textArea.length > 0
-                visible: tfShareCode.textArea.length > 0
-
-                onClicked: {
-                    UiLogic.saveTextFile(qsTr("Save AmneziaVPN config"), "amnezia_config_cloak.json", "*.json", tfShareCode.textArea.text)
-                }
-            }
-
-        }
-    }
-
-}
diff --git a/client/ui/qml/Pages/Share/PageShareProtoIkev2.qml b/client/ui/qml/Pages/Share/PageShareProtoIkev2.qml
deleted file mode 100644
index 7e41650a..00000000
--- a/client/ui/qml/Pages/Share/PageShareProtoIkev2.qml
+++ /dev/null
@@ -1,131 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-import QtQuick.Layouts
-import ProtocolEnum 1.0
-import "../"
-import "../../Controls"
-import "../../Config"
-
-PageShareProtocolBase {
-    id: root
-    protocol: ProtocolEnum.Ikev2
-
-    BackButton {
-        id: back
-    }
-    Caption {
-        id: caption
-        text: qsTr("Share IKEv2 Settings")
-    }
-
-    TextAreaType {
-        id: tfCert
-        textArea.readOnly: true
-        textArea.text: ShareConnectionLogic.textEditShareIkev2CertText
-
-        visible: false
-    }
-
-    TextAreaType {
-        id: tfMobileConfig
-        textArea.readOnly: true
-        textArea.text: ShareConnectionLogic.textEditShareIkev2MobileConfigText
-
-        visible: false
-    }
-
-    TextAreaType {
-        id: tfStrongSwanConfig
-        textArea.readOnly: true
-        textArea.text: ShareConnectionLogic.textEditShareIkev2StrongSwanConfigText
-
-        visible: false
-    }
-
-    FlickableType {
-        id: fl
-        anchors.top: caption.bottom
-        contentHeight: content.height
-
-        ColumnLayout {
-            id: content
-            enabled: logic.pageEnabled
-            anchors.top: parent.top
-            anchors.left: parent.left
-            anchors.right: parent.right
-            anchors.rightMargin: 15
-
-//            LabelType {
-//                id: lb_desc
-//                Layout.fillWidth: true
-//                Layout.topMargin: 10
-
-//                horizontalAlignment: Text.AlignHCenter
-
-//                wrapMode: Text.Wrap
-//                text: qsTr("Note: ShadowSocks protocol using same password for all connections")
-//            }
-
-            ShareConnectionButtonType {
-                Layout.topMargin: 10
-                Layout.fillWidth: true
-                Layout.preferredHeight: 40
-
-                text: genConfigProcess ? generatingConfigText : generateConfigText
-                onClicked: {
-                    enabled = false
-                    genConfigProcess = true
-                    ShareConnectionLogic.onPushButtonShareIkev2GenerateClicked()
-                    enabled = true
-                    genConfigProcess = false
-                }
-            }
-
-            ShareConnectionButtonType {
-                Layout.topMargin: 30
-                Layout.bottomMargin: 10
-                Layout.fillWidth: true
-                Layout.preferredHeight: 40
-                width: parent.width - 60
-
-                text: qsTr("Export p12 certificate")
-                enabled: tfCert.textArea.length > 0
-                visible: tfCert.textArea.length > 0
-
-                onClicked: {
-                    UiLogic.saveTextFile(qsTr("Export p12 certificate"), "amnezia_ikev2_cert_for_windows.p12", "*.p12", tfCert.textArea.text)
-                }
-            }
-
-            ShareConnectionButtonType {
-                Layout.bottomMargin: 10
-                Layout.fillWidth: true
-                Layout.preferredHeight: 40
-                width: parent.width - 60
-
-                text: qsTr("Export config for Apple")
-                enabled: tfMobileConfig.textArea.length > 0
-                visible: tfMobileConfig.textArea.length > 0
-
-                onClicked: {
-                    UiLogic.saveTextFile(qsTr("Export config for Apple"), "amnezia_for_apple.plist", "*.plist", tfMobileConfig.textArea.text)
-                }
-            }
-
-            ShareConnectionButtonType {
-                Layout.bottomMargin: 10
-                Layout.fillWidth: true
-                Layout.preferredHeight: 40
-                width: parent.width - 60
-
-                text: qsTr("Export config for StrongSwan")
-                enabled: tfStrongSwanConfig.textArea.length > 0
-                visible: tfStrongSwanConfig.textArea.length > 0
-
-                onClicked: {
-                    UiLogic.saveTextFile(qsTr("Export config for StrongSwan"), "amnezia_for_StrongSwan.profile", "*.profile", tfStrongSwanConfig.textArea.text)
-                }
-            }
-        }
-    }
-}
diff --git a/client/ui/qml/Pages/Share/PageShareProtoOpenVPN.qml b/client/ui/qml/Pages/Share/PageShareProtoOpenVPN.qml
deleted file mode 100644
index 4246be21..00000000
--- a/client/ui/qml/Pages/Share/PageShareProtoOpenVPN.qml
+++ /dev/null
@@ -1,96 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-import QtQuick.Layouts
-import ProtocolEnum 1.0
-import "../"
-import "../../Controls"
-import "../../Config"
-
-PageShareProtocolBase {
-    id: root
-    protocol: ProtocolEnum.OpenVpn
-
-    BackButton {
-        id: back
-    }
-    Caption {
-        id: caption
-        text: qsTr("Share OpenVPN Settings")
-    }
-
-    FlickableType {
-        id: fl
-        anchors.top: caption.bottom
-        contentHeight: content.height
-
-        ColumnLayout {
-            id: content
-            enabled: logic.pageEnabled
-            anchors.top: parent.top
-            anchors.left: parent.left
-            anchors.right: parent.right
-            anchors.rightMargin: 15
-
-            LabelType {
-                id: lb_desc
-                Layout.fillWidth: true
-                Layout.topMargin: 10
-
-                horizontalAlignment: Text.AlignHCenter
-
-                wrapMode: Text.Wrap
-                text: qsTr("New encryption keys pair will be generated.")
-            }
-
-            ShareConnectionButtonType {
-                Layout.topMargin: 20
-                Layout.fillWidth: true
-                Layout.preferredHeight: 40
-
-                text: genConfigProcess ? generatingConfigText : generateConfigText
-                onClicked: {
-                    enabled = false
-                    genConfigProcess = true
-                    ShareConnectionLogic.onPushButtonShareOpenVpnGenerateClicked()
-                    genConfigProcess = false
-                    enabled = true
-                }
-            }
-
-            TextAreaType {
-                id: tfShareCode
-                Layout.topMargin: 20
-                Layout.preferredHeight: 200
-                Layout.fillWidth: true
-
-                textArea.readOnly: true
-
-                textArea.verticalAlignment: Text.AlignTop
-                textArea.text: ShareConnectionLogic.textEditShareOpenVpnCodeText
-
-                visible: tfShareCode.textArea.length > 0
-            }
-
-            ShareConnectionButtonCopyType {
-                Layout.preferredHeight: 40
-                Layout.fillWidth: true
-
-                copyText: tfShareCode.textArea.text
-            }
-            ShareConnectionButtonType {
-                Layout.bottomMargin: 10
-                Layout.fillWidth: true
-                Layout.preferredHeight: 40
-                width: parent.width - 60
-
-                text: Qt.platform.os === "android" ? qsTr("Share") : qsTr("Save to file")
-                enabled: tfShareCode.textArea.length > 0
-                visible: tfShareCode.textArea.length > 0
-
-                onClicked: {
-                    UiLogic.saveTextFile(qsTr("Save OpenVPN config"), "amnezia_for_openvpn.ovpn", "*.ovpn", tfShareCode.textArea.text)
-                }
-            }
-        }
-    }
-}
diff --git a/client/ui/qml/Pages/Share/PageShareProtoSftp.qml b/client/ui/qml/Pages/Share/PageShareProtoSftp.qml
deleted file mode 100644
index 8f990ac1..00000000
--- a/client/ui/qml/Pages/Share/PageShareProtoSftp.qml
+++ /dev/null
@@ -1,21 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-import ProtocolEnum 1.0
-import "../"
-import "../../Controls"
-import "../../Config"
-
-PageShareProtocolBase {
-    id: root
-    protocol: ProtocolEnum.Sftp
-
-    BackButton {
-        id: back
-    }
-
-    Caption {
-        id: caption
-        text: qsTr("Share SFTP settings")
-    }
-
- }
diff --git a/client/ui/qml/Pages/Share/PageShareProtoShadowSocks.qml b/client/ui/qml/Pages/Share/PageShareProtoShadowSocks.qml
deleted file mode 100644
index 91f5e8d2..00000000
--- a/client/ui/qml/Pages/Share/PageShareProtoShadowSocks.qml
+++ /dev/null
@@ -1,115 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-import QtQuick.Layouts
-import ProtocolEnum 1.0
-import "../"
-import "../../Controls"
-import "../../Config"
-
-PageShareProtocolBase {
-    id: root
-    protocol: ProtocolEnum.ShadowSocks
-
-    BackButton {
-        id: back
-    }
-    Caption {
-        id: caption
-        text: qsTr("Share ShadowSocks Settings")
-    }
-
-    FlickableType {
-        id: fl
-        anchors.top: caption.bottom
-        contentHeight: content.height
-
-        ColumnLayout {
-            id: content
-            enabled: logic.pageEnabled
-            anchors.top: parent.top
-            anchors.left: parent.left
-            anchors.right: parent.right
-            anchors.rightMargin: 15
-
-            LabelType {
-                id: lb_desc
-                Layout.fillWidth: true
-                Layout.topMargin: 10
-
-                horizontalAlignment: Text.AlignHCenter
-
-                wrapMode: Text.Wrap
-                text: qsTr("Note: ShadowSocks protocol using same password for all connections")
-            }
-
-            ShareConnectionButtonType {
-                Layout.topMargin: 10
-                Layout.fillWidth: true
-                Layout.preferredHeight: 40
-
-                text: genConfigProcess ? generatingConfigText : generateConfigText
-                onClicked: {
-                    enabled = false
-                    genConfigProcess = true
-                    ShareConnectionLogic.onPushButtonShareShadowSocksGenerateClicked()
-                    enabled = true
-                    genConfigProcess = false
-                }
-            }
-
-            TextAreaType {
-                id: tfShareCode
-
-                Layout.topMargin: 20
-                Layout.preferredHeight: 200
-                Layout.fillWidth: true
-
-                textArea.readOnly: true
-                textArea.wrapMode: TextEdit.WrapAnywhere
-                textArea.verticalAlignment: Text.AlignTop
-                textArea.text: ShareConnectionLogic.textEditShareShadowSocksText
-
-                visible: tfShareCode.textArea.length > 0
-            }
-            ShareConnectionButtonCopyType {
-                Layout.preferredHeight: 40
-                Layout.fillWidth: true
-                Layout.bottomMargin: 20
-
-                start_text: qsTr("Copy config")
-                copyText: tfShareCode.textArea.text
-            }
-
-            LabelType {
-                height: 20
-                visible: tfConnString.length > 0
-                text: qsTr("Connection string")
-            }
-            TextFieldType {
-                id: tfConnString
-                height: 100
-                horizontalAlignment: Text.AlignHCenter
-                Layout.fillWidth: true
-                text: ShareConnectionLogic.lineEditShareShadowSocksStringText
-                visible: tfConnString.length > 0
-
-                readOnly: true
-            }
-            ShareConnectionButtonCopyType {
-                Layout.preferredHeight: 40
-                Layout.fillWidth: true
-                start_text: qsTr("Copy string")
-                copyText: tfConnString.text
-            }
-
-            Image {
-                id: label_share_ss_qr_code
-                Layout.topMargin: 20
-                Layout.fillWidth: true
-                Layout.preferredHeight: width
-                smooth: false
-                source: ShareConnectionLogic.shareShadowSocksQrCodeText
-            }
-        }
-    }
-}
diff --git a/client/ui/qml/Pages/Share/PageShareProtoTorWebSite.qml b/client/ui/qml/Pages/Share/PageShareProtoTorWebSite.qml
deleted file mode 100644
index 1c68f6cb..00000000
--- a/client/ui/qml/Pages/Share/PageShareProtoTorWebSite.qml
+++ /dev/null
@@ -1,20 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-import ProtocolEnum 1.0
-import "../"
-import "../../Controls"
-import "../../Config"
-
-PageShareProtocolBase {
-    id: root
-    protocol: ProtocolEnum.TorWebSite
-
-    BackButton {
-        id: back
-    }
-
-    Caption {
-        id: caption
-        text: qsTr("Share Tor Web site")
-    }
-}
diff --git a/client/ui/qml/Pages/Share/PageShareProtoWireGuard.qml b/client/ui/qml/Pages/Share/PageShareProtoWireGuard.qml
deleted file mode 100644
index 7265de81..00000000
--- a/client/ui/qml/Pages/Share/PageShareProtoWireGuard.qml
+++ /dev/null
@@ -1,103 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-import QtQuick.Layouts
-import ProtocolEnum 1.0
-import "../"
-import "../../Controls"
-import "../../Config"
-
-PageShareProtocolBase {
-    id: root
-    protocol: ProtocolEnum.WireGuard
-
-    BackButton {
-        id: back
-    }
-    Caption {
-        id: caption
-        text: qsTr("Share WireGuard Settings")
-    }
-
-    FlickableType {
-        id: fl
-        anchors.top: caption.bottom
-        contentHeight: content.height
-
-        ColumnLayout {
-            id: content
-            enabled: logic.pageEnabled
-            anchors.top: parent.top
-            anchors.left: parent.left
-            anchors.right: parent.right
-            anchors.rightMargin: 15
-
-            LabelType {
-                id: lb_desc
-                Layout.fillWidth: true
-                Layout.topMargin: 10
-
-                horizontalAlignment: Text.AlignHCenter
-
-                wrapMode: Text.Wrap
-                text: qsTr("New encryption keys pair will be generated.")
-            }
-
-            ShareConnectionButtonType {
-                Layout.topMargin: 10
-                Layout.fillWidth: true
-                Layout.preferredHeight: 40
-
-                text: genConfigProcess ? generatingConfigText : generateConfigText
-                onClicked: {
-                    enabled = false
-                    genConfigProcess = true
-                    ShareConnectionLogic.onPushButtonShareWireGuardGenerateClicked()
-                    enabled = true
-                    genConfigProcess = false
-                }
-            }
-
-            TextAreaType {
-                id: tfShareCode
-
-                Layout.topMargin: 20
-                Layout.preferredHeight: 200
-                Layout.fillWidth: true
-
-                textArea.readOnly: true
-                textArea.wrapMode: TextEdit.WrapAnywhere
-                textArea.verticalAlignment: Text.AlignTop
-                textArea.text: ShareConnectionLogic.textEditShareWireGuardCodeText
-
-                visible: tfShareCode.textArea.length > 0
-            }
-            ShareConnectionButtonCopyType {
-                Layout.preferredHeight: 40
-                Layout.fillWidth: true
-
-                copyText: tfShareCode.textArea.text
-            }
-
-            ShareConnectionButtonType {
-                Layout.preferredHeight: 40
-                Layout.fillWidth: true
-
-                text: Qt.platform.os === "android" ? qsTr("Share") : qsTr("Save to file")
-                enabled: tfShareCode.textArea.length > 0
-                visible: tfShareCode.textArea.length > 0
-
-                onClicked: {
-                    UiLogic.saveTextFile(qsTr("Save OpenVPN config"), "amnezia_for_wireguard.conf", "*.conf", tfShareCode.textArea.text)
-                }
-            }
-
-            Image {
-                Layout.topMargin: 20
-                Layout.fillWidth: true
-                Layout.preferredHeight: width
-                smooth: false
-                source: ShareConnectionLogic.shareWireGuardQrCodeText
-            }
-        }
-    }
-}
diff --git a/client/ui/qml/Pages/Share/PageShareProtocolBase.qml b/client/ui/qml/Pages/Share/PageShareProtocolBase.qml
deleted file mode 100644
index 603abdfa..00000000
--- a/client/ui/qml/Pages/Share/PageShareProtocolBase.qml
+++ /dev/null
@@ -1,19 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-import PageEnum 1.0
-import ProtocolEnum 1.0
-import "./.."
-import "../../Controls"
-import "../../Config"
-
-PageBase {
-    id: root
-    property var protocol: ProtocolEnum.Any
-    page: PageEnum.ProtocolShare
-    logic: ShareConnectionLogic
-
-    readonly property string generateConfigText: qsTr("Generate config")
-    readonly property string generatingConfigText: qsTr("Generating config...")
-    readonly property string showConfigText: qsTr("Show config")
-    property bool genConfigProcess: false
-}
diff --git a/client/ui/qml/main.qml b/client/ui/qml/main.qml
deleted file mode 100644
index 615197f0..00000000
--- a/client/ui/qml/main.qml
+++ /dev/null
@@ -1,387 +0,0 @@
-import QtCore
-import QtQuick
-import QtQuick.Controls
-import QtQuick.Controls.Basic
-import QtQuick.Dialogs
-import QtQuick.Layouts
-import QtQuick.Window
-
-import Qt.labs.platform as LabsPlatform
-import Qt.labs.folderlistmodel as LabsFolderlistmodel
-
-import PageEnum 1.0
-import PageType 1.0
-
-import "Controls"
-import "Pages"
-import "Pages/Protocols"
-import "Pages/Share"
-import "Pages/ClientInfo"
-import "Config"
-
-Window  {
-    property var pages: ({})
-    property var protocolPages: ({})
-    property var sharePages: ({})
-    property var clientInfoPages: ({})
-
-    id: root
-    visible: true
-    width: GC.screenWidth
-    height: GC.screenHeight
-    minimumWidth: GC.isDesktop() ? 360 : 0
-    minimumHeight: GC.isDesktop() ? 640 : 0
-    onClosing: function() {
-        console.debug("QML onClosing signal")
-        UiLogic.onCloseWindow()
-    }
-
-    title: "AmneziaVPN"
-
-    function gotoPage(type, page, reset, slide) {
-
-        let p_obj;
-        if (type === PageType.Basic) p_obj = pages[page]
-        else if (type === PageType.Proto) p_obj = protocolPages[page]
-        else if (type === PageType.ShareProto) p_obj = sharePages[page]
-        else if (type === PageType.ClientInfo) p_obj = clientInfoPages[page]
-        else return
-
-        //console.debug("QML gotoPage " + type + " " + page + " " + p_obj)
-
-        if (pageLoader.depth > 0) {
-            pageLoader.currentItem.deactivated()
-        }
-
-        if (slide) {
-            pageLoader.push(p_obj, {}, StackView.PushTransition)
-        } else {
-            pageLoader.push(p_obj, {}, StackView.Immediate)
-        }
-
-        if (reset) {
-            p_obj.logic.onUpdatePage();
-        }
-
-        p_obj.activated(reset)
-    }
-
-    function close_page() {
-        if (pageLoader.depth <= 1) {
-            if (GC.isMobile()) {
-                root.close()
-            }
-            return
-        }
-
-        pageLoader.currentItem.deactivated()
-        pageLoader.pop()
-    }
-
-    function set_start_page(page, slide) {
-        if (pageLoader.depth > 0) {
-            pageLoader.currentItem.deactivated()
-        }
-
-        pageLoader.clear()
-        if (slide) {
-            pageLoader.push(pages[page], {}, StackView.PushTransition)
-        } else {
-            pageLoader.push(pages[page], {}, StackView.Immediate)
-        }
-        if (page === PageEnum.Start) {
-            UiLogic.pushButtonBackFromStartVisible = !pageLoader.empty
-            UiLogic.onUpdatePage();
-        }
-    }
-
-    Rectangle {
-        anchors.fill: parent
-        color: "white"
-    }
-
-    StackView {
-        id: pageLoader
-        y: 0
-        anchors.fill: parent
-        focus: true
-
-        onCurrentItemChanged: function() {
-            UiLogic.currentPageValue = currentItem.page
-        }
-
-        onDepthChanged: function() {
-            UiLogic.pagesStackDepth = depth
-        }
-
-        Keys.onPressed: function(event) {
-            UiLogic.keyPressEvent(event.key)
-            event.accepted = true
-        }
-    }
-
-    LabsFolderlistmodel.FolderListModel {
-        id: folderModelPages
-        folder: "qrc:/ui/qml/Pages/"
-        nameFilters: ["*.qml"]
-        showDirs: false
-
-        onStatusChanged: if (status == LabsFolderlistmodel.FolderListModel.Ready) {
-                             for (var i=0; i<folderModelPages.count; i++) {
-                                 createPagesObjects(folderModelPages.get(i, "filePath"), PageType.Basic);
-                             }
-                             UiLogic.initializeUiLogic()
-                         }
-    }
-
-    LabsFolderlistmodel.FolderListModel {
-        id: folderModelProtocols
-        folder: "qrc:/ui/qml/Pages/Protocols/"
-        nameFilters: ["*.qml"]
-        showDirs: false
-
-        onStatusChanged: if (status == LabsFolderlistmodel.FolderListModel.Ready) {
-                             for (var i=0; i<folderModelProtocols.count; i++) {
-                                 createPagesObjects(folderModelProtocols.get(i, "filePath"), PageType.Proto);
-                             }
-        }
-    }
-
-    LabsFolderlistmodel.FolderListModel {
-        id: folderModelShareProtocols
-        folder: "qrc:/ui/qml/Pages/Share/"
-        nameFilters: ["*.qml"]
-        showDirs: false
-
-        onStatusChanged: if (status == LabsFolderlistmodel.FolderListModel.Ready) {
-                             for (var i=0; i<folderModelShareProtocols.count; i++) {
-                                 createPagesObjects(folderModelShareProtocols.get(i, "filePath"), PageType.ShareProto);
-                             }
-        }
-    }
-
-    LabsFolderlistmodel.FolderListModel {
-        id: folderModelClientInfo
-        folder: "qrc:/ui/qml/Pages/ClientInfo/"
-        nameFilters: ["*.qml"]
-        showDirs: false
-
-        onStatusChanged: if (status == LabsFolderlistmodel.FolderListModel.Ready) {
-                             for (var i=0; i<folderModelClientInfo.count; i++) {
-                                 createPagesObjects(folderModelClientInfo.get(i, "filePath"), PageType.ClientInfo);
-                             }
-        }
-    }
-
-    function createPagesObjects(file, type) {
-        if (file.indexOf("Base") !== -1) return; // skip Base Pages
-        //console.debug("Creating component " + file + " for " + type);
-
-        var c = Qt.createComponent("qrc" + file);
-
-        var finishCreation = function (component){
-            if (component.status === Component.Ready) {
-                var obj = component.createObject(root);
-                if (obj === null) {
-                    console.debug("Error creating object " + component.url);
-                }
-                else {
-                    obj.visible = false
-                    if (type === PageType.Basic) {
-                        pages[obj.page] = obj
-                    }
-                    else if (type === PageType.Proto) {
-                        protocolPages[obj.protocol] = obj
-                    }
-                    else if (type === PageType.ShareProto) {
-                        sharePages[obj.protocol] = obj
-                    }
-                    else if (type === PageType.ClientInfo) {
-                        clientInfoPages[obj.protocol] = obj
-                    }
-
-//                    console.debug("Created component " + component.url + " for " + type);
-                }
-            } else if (component.status === Component.Error) {
-                console.debug("Error loading component:", component.errorString());
-            }
-        }
-
-        if (c.status === Component.Ready)
-            finishCreation(c);
-        else {
-            console.debug("Warning: " + file + " page components are not ready " + c.errorString());
-        }
-    }
-
-    Connections {
-        target: UiLogic
-        function onGoToPage(page, reset, slide) {
-            //console.debug("Qml Connections onGoToPage " + page);
-            root.gotoPage(PageType.Basic, page, reset, slide)
-        }
-        function onGoToProtocolPage(protocol, reset, slide) {
-            //console.debug("Qml Connections onGoToProtocolPage " + protocol);
-            root.gotoPage(PageType.Proto, protocol, reset, slide)
-        }
-        function onGoToShareProtocolPage(protocol, reset, slide) {
-            //console.debug("Qml Connections onGoToShareProtocolPage " + protocol);
-            root.gotoPage(PageType.ShareProto, protocol, reset, slide)
-        }
-        function onGoToClientInfoPage(protocol, reset, slide) {
-            //console.debug("Qml Connections onGoToClientInfoPage " + protocol);
-            root.gotoPage(PageType.ClientInfo, protocol, reset, slide)
-        }
-
-        function onClosePage() {
-            root.close_page()
-        }
-        function onSetStartPage(page, slide) {
-            root.set_start_page(page, slide)
-        }
-        function onShowPublicKeyWarning() {
-            publicKeyWarning.visible = true
-        }
-        function onShowConnectErrorDialog() {
-            connectErrorDialog.visible = true
-        }
-        function onShow() {
-            root.show()
-        }
-        function onHide() {
-            root.hide()
-        }
-        function onRaise() {
-            root.show()
-            root.raise()
-            root.requestActivate()
-        }
-        function onToggleLogPanel() {
-            drawer_log.visible = !drawer_log.visible
-        }
-        function onShowWarningMessage(message) {
-            popupWarning.popupWarningText = message
-            popupWarning.open()
-        }
-    }
-
-    MessageDialog {
-        id: publicKeyWarning
-        title: "AmneziaVPN"
-        text: qsTr("It's public key. Private key required")
-        visible: false
-    }
-
-    Drawer {
-        id: drawer_log
-
-        y: 0
-        x: 0
-        edge: Qt.BottomEdge
-        width: parent.width
-        height: parent.height * 0.85
-
-        modal: true
-        //interactive: activeFocus
-
-        onAboutToHide: {
-            pageLoader.focus = true
-        }
-        onAboutToShow: {
-            tfSshLog.focus = true
-        }
-
-        Item {
-            id: itemLog
-            anchors.fill: parent
-
-            Keys.onPressed: {
-                UiLogic.keyPressEvent(event.key)
-                event.accepted = true
-            }
-
-            RadioButtonType {
-                id: rbSshLog
-                focus: false
-                anchors.left: parent.left
-                anchors.leftMargin: 10
-                anchors.bottom: parent.bottom
-                anchors.bottomMargin: 2
-
-                height: 25
-                text: qsTr("Ssh log")
-            }
-            RadioButtonType {
-                id: rbAllLog
-                focus: false
-                checked: true
-                anchors.left: rbSshLog.right
-                anchors.bottom: rbSshLog.bottom
-                anchors.top: rbSshLog.top
-                height: rbSshLog.height
-                text: qsTr("App log")
-            }
-            CheckBoxType {
-                id: cbLogWrap
-                text: qsTr("Wrap words")
-                checked: true
-                anchors.right: parent.right
-                anchors.bottom: rbAllLog.bottom
-                anchors.top: rbAllLog.top
-                height: 15
-                imageHeight: 15
-                imageWidth: 15
-
-                onCheckedChanged: {
-                    tfSshLog
-                }
-            }
-
-            TextAreaType {
-                id: tfSshLog
-                anchors.top: parent.top
-                anchors.left: parent.left
-                anchors.right: parent.right
-                anchors.bottom: rbSshLog.top
-
-                flickableDirection: Flickable.AutoFlickIfNeeded
-
-                textArea.readOnly: true
-                textArea.selectByMouse: true
-
-                textArea.verticalAlignment: Text.AlignTop
-                textArea.text: {
-                    if (!drawer_log.visible) return ""
-                    else if (rbSshLog.checked ) return Debug.sshLog
-                    else return Debug.allLog
-                }
-                textArea.wrapMode: cbLogWrap.checked ? TextEdit.WordWrap: TextEdit.NoWrap
-
-                Keys.onPressed: function(event) {
-                    UiLogic.keyPressEvent(event.key)
-                    event.accepted = true
-                }
-
-                textArea.onTextChanged: {
-                    textArea.cursorPosition = textArea.length-1
-                }
-
-                MouseArea {
-                    anchors.fill: parent
-                    enabled: GC.isDesktop()
-                    acceptedButtons: Qt.RightButton
-                    onClicked: contextMenu.open()
-                }
-
-                ContextMenu {
-                    id: contextMenu
-                    textObj: tfSshLog.textArea
-                }
-            }
-        }
-    }
-
-    PopupWarning {
-        id: popupWarning
-    }
-}
diff --git a/client/ui/uilogic.cpp b/client/ui/uilogic.cpp
deleted file mode 100644
index e7d90f85..00000000
--- a/client/ui/uilogic.cpp
+++ /dev/null
@@ -1,609 +0,0 @@
-#include <QClipboard>
-#include <QDebug>
-#include <QDesktopServices>
-#include <QFile>
-#include <QHostInfo>
-#include <QItemSelectionModel>
-#include <QJsonDocument>
-#include <QJsonObject>
-#include <QKeyEvent>
-#include <QMenu>
-#include <QMetaEnum>
-#include <QMetaObject>
-#include <QQmlFile>
-#include <QStandardPaths>
-#include <QSysInfo>
-#include <QThread>
-#include <QTimer>
-
-#include "amnezia_application.h"
-
-#include "configurators/cloak_configurator.h"
-#include "configurators/openvpn_configurator.h"
-#include "configurators/shadowsocks_configurator.h"
-#include "configurators/ssh_configurator.h"
-#include "configurators/vpn_configurator.h"
-
-#include "core/errorstrings.h"
-#include "core/server_defs.h"
-#include "core/servercontroller.h"
-
-#include "containers/containers_defs.h"
-
-#include "ui/qautostart.h"
-
-#include "logger.h"
-#include "uilogic.h"
-#include "utilities.h"
-#include "version.h"
-#include "vpnconnection.h"
-#include <functional>
-
-#if defined Q_OS_MAC || defined Q_OS_LINUX
-    #include "ui/macos_util.h"
-#endif
-
-#ifdef Q_OS_ANDROID
-    #include "platforms/android/android_controller.h"
-#endif
-
-#include "platforms/ios/MobileUtils.h"
-
-#include "pages_logic/AdvancedServerSettingsLogic.h"
-#include "pages_logic/AppSettingsLogic.h"
-#include "pages_logic/ClientInfoLogic.h"
-#include "pages_logic/ClientManagementLogic.h"
-#include "pages_logic/GeneralSettingsLogic.h"
-#include "pages_logic/NetworkSettingsLogic.h"
-#include "pages_logic/NewServerProtocolsLogic.h"
-#include "pages_logic/QrDecoderLogic.h"
-#include "pages_logic/ServerConfiguringProgressLogic.h"
-#include "pages_logic/ServerContainersLogic.h"
-#include "pages_logic/ServerListLogic.h"
-#include "pages_logic/ServerSettingsLogic.h"
-#include "pages_logic/ShareConnectionLogic.h"
-#include "pages_logic/SitesLogic.h"
-#include "pages_logic/StartPageLogic.h"
-#include "pages_logic/ViewConfigLogic.h"
-#include "pages_logic/VpnLogic.h"
-#include "pages_logic/WizardLogic.h"
-
-#include "pages_logic/protocols/CloakLogic.h"
-#include "pages_logic/protocols/OpenVpnLogic.h"
-#include "pages_logic/protocols/OtherProtocolsLogic.h"
-#include "pages_logic/protocols/ShadowSocksLogic.h"
-#include "pages_logic/protocols/WireGuardLogic.h"
-
-using namespace amnezia;
-using namespace PageEnumNS;
-
-UiLogic::UiLogic(std::shared_ptr<Settings> settings, std::shared_ptr<VpnConfigurator> configurator, QObject *parent)
-    : QObject(parent), m_settings(settings), m_configurator(configurator)
-{
-    m_protocolsModel = new ProtocolsModel(settings, this);
-    m_clientManagementModel = new ClientManagementModel(this);
-    m_vpnConnection = new VpnConnection(settings, configurator);
-    m_vpnConnection->moveToThread(&m_vpnConnectionThread);
-    m_vpnConnectionThread.start();
-
-    m_protocolLogicMap.insert(Proto::OpenVpn, new OpenVpnLogic(this));
-    m_protocolLogicMap.insert(Proto::ShadowSocks, new ShadowSocksLogic(this));
-    m_protocolLogicMap.insert(Proto::Cloak, new CloakLogic(this));
-    m_protocolLogicMap.insert(Proto::WireGuard, new WireGuardLogic(this));
-
-    m_protocolLogicMap.insert(Proto::Dns, new OtherProtocolsLogic(this));
-    m_protocolLogicMap.insert(Proto::Sftp, new OtherProtocolsLogic(this));
-    m_protocolLogicMap.insert(Proto::TorWebSite, new OtherProtocolsLogic(this));
-}
-
-UiLogic::~UiLogic()
-{
-    emit hide();
-
-#ifdef AMNEZIA_DESKTOP
-    if (m_vpnConnection->connectionState() != Vpn::ConnectionState::Disconnected) {
-        m_vpnConnection->disconnectFromVpn();
-        for (int i = 0; i < 50; i++) {
-            qApp->processEvents(QEventLoop::ExcludeUserInputEvents);
-            QThread::msleep(100);
-            if (m_vpnConnection->isDisconnected()) {
-                break;
-            }
-        }
-    }
-#endif
-
-    m_vpnConnection->deleteLater();
-    m_vpnConnectionThread.quit();
-    m_vpnConnectionThread.wait(3000);
-
-    qDebug() << "Application closed";
-}
-
-void UiLogic::initializeUiLogic()
-{
-#ifdef Q_OS_ANDROID
-    connect(AndroidController::instance(), &AndroidController::initialized,
-            [this](bool status, bool connected, const QDateTime &connectionDate) {
-                if (connected) {
-                    pageLogic<VpnLogic>()->onConnectionStateChanged(Vpn::ConnectionState::Connected);
-                    if (m_vpnConnection)
-                        m_vpnConnection->restoreConnection();
-                }
-            });
-//    if (!AndroidController::instance()->initialize(pageLogic<StartPageLogic>())) {
-//        qCritical() << QString("Init failed");
-//        if (m_vpnConnection) m_vpnConnection->connectionStateChanged(Vpn::ConnectionState::Error);
-//        return;
-//    }
-#endif
-
-    m_notificationHandler = NotificationHandler::create(qmlRoot());
-
-    connect(m_vpnConnection, &VpnConnection::connectionStateChanged, m_notificationHandler,
-            &NotificationHandler::setConnectionState);
-    connect(m_notificationHandler, &NotificationHandler::raiseRequested, this, &UiLogic::raise);
-    connect(m_notificationHandler, &NotificationHandler::connectRequested, pageLogic<VpnLogic>(), &VpnLogic::onConnect);
-    connect(m_notificationHandler, &NotificationHandler::disconnectRequested, pageLogic<VpnLogic>(),
-            &VpnLogic::onDisconnect);
-
-    //    if (m_settings->serversCount() > 0) {
-    //        if (m_settings->defaultServerIndex() < 0) m_settings->setDefaultServer(0);
-    //        emit goToPage(Page::PageStart, true, false);
-    //    }
-    //    else {
-    //        emit goToPage(Page::PageSetupWizardStart, true, false);
-    //    }
-
-    m_selectedServerIndex = m_settings->defaultServerIndex();
-}
-
-void UiLogic::showOnStartup()
-{
-    if (!m_settings->isStartMinimized()) {
-        emit show();
-    } else {
-#ifdef Q_OS_WIN
-        emit hide();
-#elif defined Q_OS_MACX
-        // TODO: fix: setDockIconVisible(false);
-#endif
-    }
-}
-
-void UiLogic::onUpdateAllPages()
-{
-    for (auto logic : m_logicMap) {
-        if (dynamic_cast<ClientInfoLogic *>(logic) || dynamic_cast<ClientManagementLogic *>(logic)
-            || dynamic_cast<QrDecoderLogic *>(logic)) {
-            continue;
-        }
-        logic->onUpdatePage();
-    }
-}
-
-void UiLogic::keyPressEvent(Qt::Key key)
-{
-    switch (key) {
-    case Qt::Key_AsciiTilde:
-    case Qt::Key_QuoteLeft: emit toggleLogPanel(); break;
-    case Qt::Key_L: Logger::openLogsFolder(); break;
-    case Qt::Key_K: Logger::openServiceLogsFolder(); break;
-#ifdef QT_DEBUG
-    case Qt::Key_Q: qApp->quit(); break;
-    case Qt::Key_H:
-        m_selectedServerIndex = m_settings->defaultServerIndex();
-        m_selectedDockerContainer = m_settings->defaultContainer(m_selectedServerIndex);
-
-        // updateSharingPage(selectedServerIndex, m_settings->serverCredentials(selectedServerIndex), selectedDockerContainer);
-        emit goToPage(Page::ShareConnection);
-        break;
-#endif
-    case Qt::Key_C:
-        qDebug().noquote() << "Def server" << m_settings->defaultServerIndex()
-                           << m_settings->defaultContainerName(m_settings->defaultServerIndex());
-        qDebug().noquote() << QJsonDocument(m_settings->defaultServer()).toJson();
-        break;
-    case Qt::Key_A: emit goToPage(Page::Start); break;
-    case Qt::Key_S:
-        m_selectedServerIndex = m_settings->defaultServerIndex();
-        emit goToPage(Page::ServerSettings);
-        break;
-    case Qt::Key_P: onGotoCurrentProtocolsPage(); break;
-    case Qt::Key_T:
-        m_configurator->sshConfigurator->openSshTerminal(m_settings->serverCredentials(m_settings->defaultServerIndex()));
-        break;
-    case Qt::Key_Escape:
-        if (currentPage() == Page::Vpn)
-            break;
-        if (currentPage() == Page::ServerConfiguringProgress)
-            break;
-    case Qt::Key_Back:
-
-        //        if (currentPage() == Page::Start && pagesStack.size() < 2) break;
-        //        if (currentPage() == Page::Sites &&
-        //                ui->tableView_sites->selectionModel()->selection().indexes().size() > 0) {
-        //            ui->tableView_sites->clearSelection();
-        //            break;
-        //        }
-
-        emit closePage();
-        //}
-    default:;
-    }
-}
-
-void UiLogic::onCloseWindow()
-{
-#ifdef Q_OS_ANDROID
-    qApp->quit();
-#else
-    if (m_settings->serversCount() == 0) {
-        qApp->quit();
-    } else {
-        emit hide();
-    }
-#endif
-}
-
-QString UiLogic::containerName(int container)
-{
-    return ContainerProps::containerHumanNames().value(static_cast<DockerContainer>(container));
-}
-
-QString UiLogic::containerDesc(int container)
-{
-    return ContainerProps::containerDescriptions().value(static_cast<DockerContainer>(container));
-}
-
-void UiLogic::onGotoCurrentProtocolsPage()
-{
-    m_selectedServerIndex = m_settings->defaultServerIndex();
-    m_selectedDockerContainer = m_settings->defaultContainer(m_selectedServerIndex);
-    emit goToPage(Page::ServerContainers);
-}
-
-void UiLogic::installServer(QPair<DockerContainer, QJsonObject> &container)
-{
-    emit goToPage(Page::ServerConfiguringProgress);
-    QEventLoop loop;
-    QTimer::singleShot(500, &loop, SLOT(quit()));
-    loop.exec();
-    qApp->processEvents();
-
-    ServerConfiguringProgressLogic::PageFunc pageFunc;
-    pageFunc.setEnabledFunc = [this](bool enabled) -> void {
-        pageLogic<ServerConfiguringProgressLogic>()->set_pageEnabled(enabled);
-    };
-
-    ServerConfiguringProgressLogic::ButtonFunc noButton;
-
-    ServerConfiguringProgressLogic::LabelFunc waitInfoFunc;
-    waitInfoFunc.setTextFunc = [this](const QString &text) -> void {
-        pageLogic<ServerConfiguringProgressLogic>()->set_labelWaitInfoText(text);
-    };
-    waitInfoFunc.setVisibleFunc = [this](bool visible) -> void {
-        pageLogic<ServerConfiguringProgressLogic>()->set_labelWaitInfoVisible(visible);
-    };
-
-    ServerConfiguringProgressLogic::ProgressFunc progressBarFunc;
-    progressBarFunc.setVisibleFunc = [this](bool visible) -> void {
-        pageLogic<ServerConfiguringProgressLogic>()->set_progressBarVisible(visible);
-    };
-    progressBarFunc.setValueFunc = [this](int value) -> void {
-        pageLogic<ServerConfiguringProgressLogic>()->set_progressBarValue(value);
-    };
-    progressBarFunc.getValueFunc = [this](void) -> int {
-        return pageLogic<ServerConfiguringProgressLogic>()->progressBarValue();
-    };
-    progressBarFunc.getMaximumFunc = [this](void) -> int {
-        return pageLogic<ServerConfiguringProgressLogic>()->progressBarMaximum();
-    };
-    progressBarFunc.setTextVisibleFunc = [this](bool visible) -> void {
-        pageLogic<ServerConfiguringProgressLogic>()->set_progressBarTextVisible(visible);
-    };
-    progressBarFunc.setTextFunc = [this](const QString &text) -> void {
-        pageLogic<ServerConfiguringProgressLogic>()->set_progressBarText(text);
-    };
-
-    ServerConfiguringProgressLogic::LabelFunc busyInfoFunc;
-    busyInfoFunc.setTextFunc = [this](const QString &text) -> void {
-        pageLogic<ServerConfiguringProgressLogic>()->set_labelServerBusyText(text);
-    };
-    busyInfoFunc.setVisibleFunc = [this](bool visible) -> void {
-        pageLogic<ServerConfiguringProgressLogic>()->set_labelServerBusyVisible(visible);
-    };
-
-    ServerConfiguringProgressLogic::ButtonFunc cancelButtonFunc;
-    cancelButtonFunc.setVisibleFunc = [this](bool visible) -> void {
-        pageLogic<ServerConfiguringProgressLogic>()->set_pushButtonCancelVisible(visible);
-    };
-
-    bool isServerCreated = false;
-    ErrorCode errorCode = addAlreadyInstalledContainersGui(isServerCreated);
-    if (errorCode == ErrorCode::NoError) {
-        if (!isContainerAlreadyAddedToGui(container.first)) {
-            progressBarFunc.setTextFunc(QString("Installing %1").arg(ContainerProps::containerToString(container.first)));
-            auto installAction = [&]() {
-                ServerController serverController(m_settings);
-                return serverController.setupContainer(m_installCredentials, container.first, container.second);
-            };
-            errorCode = pageLogic<ServerConfiguringProgressLogic>()->doInstallAction(
-                    installAction, pageFunc, progressBarFunc, noButton, waitInfoFunc, busyInfoFunc, cancelButtonFunc);
-            if (errorCode == ErrorCode::NoError) {
-                if (!isServerCreated) {
-                    QJsonObject server;
-                    server.insert(config_key::hostName, m_installCredentials.hostName);
-                    server.insert(config_key::userName, m_installCredentials.userName);
-                    server.insert(config_key::password, m_installCredentials.secretData);
-                    server.insert(config_key::port, m_installCredentials.port);
-                    server.insert(config_key::description, m_settings->nextAvailableServerName());
-
-                    server.insert(config_key::containers, QJsonArray { container.second });
-                    server.insert(config_key::defaultContainer, ContainerProps::containerToString(container.first));
-
-                    m_settings->addServer(server);
-                    m_settings->setDefaultServer(m_settings->serversCount() - 1);
-                } else {
-                    m_settings->setContainerConfig(m_settings->serversCount() - 1, container.first, container.second);
-                    m_settings->setDefaultContainer(m_settings->serversCount() - 1, container.first);
-                }
-                onUpdateAllPages();
-
-                emit setStartPage(Page::Vpn);
-                qApp->processEvents();
-                return;
-            }
-        } else {
-            onUpdateAllPages();
-            emit showWarningMessage(
-                    "Attention! The container you are trying to install is already installed on the server. "
-                    "All installed containers have been added to the application ");
-            emit setStartPage(Page::Vpn);
-            return;
-        }
-    }
-    emit showWarningMessage(tr("Error occurred while configuring server.") + "\n" + tr("Error message: ")
-                            + errorString(errorCode) + "\n" + tr("See logs for details."));
-    emit closePage();
-}
-
-PageProtocolLogicBase *UiLogic::protocolLogic(Proto p)
-{
-    PageProtocolLogicBase *logic = m_protocolLogicMap.value(p);
-    if (logic)
-        return logic;
-    else {
-        qCritical() << "UiLogic::protocolLogic Warning: logic missing for" << p;
-        return new PageProtocolLogicBase(this);
-    }
-}
-
-QObject *UiLogic::qmlRoot() const
-{
-    return m_qmlRoot;
-}
-
-void UiLogic::setQmlRoot(QObject *newQmlRoot)
-{
-    m_qmlRoot = newQmlRoot;
-}
-
-NotificationHandler *UiLogic::notificationHandler() const
-{
-    return m_notificationHandler;
-}
-
-void UiLogic::setQmlContextProperty(PageLogicBase *logic)
-{
-    amnApp->qmlEngine()->rootContext()->setContextProperty(logic->metaObject()->className(), logic);
-}
-
-PageEnumNS::Page UiLogic::currentPage()
-{
-    return static_cast<PageEnumNS::Page>(currentPageValue());
-}
-
-void UiLogic::saveTextFile(const QString &desc, const QString &suggestedName, QString ext, const QString &data)
-{
-#ifdef Q_OS_IOS
-    shareTempFile(suggestedName, ext, data);
-    return;
-#endif
-
-    ext.replace("*", "");
-    QString docDir = QStandardPaths::writableLocation(QStandardPaths::DocumentsLocation);
-    QUrl fileName;
-#ifdef AMNEZIA_DESKTOP
-    fileName = QFileDialog::getSaveFileUrl(nullptr, desc, QUrl::fromLocalFile(docDir + "/" + suggestedName), "*" + ext);
-    if (fileName.isEmpty())
-        return;
-    if (!fileName.toString().endsWith(ext))
-        fileName = QUrl(fileName.toString() + ext);
-#elif defined Q_OS_ANDROID
-    qDebug() << "UiLogic::shareConfig" << data;
-    AndroidController::instance()->shareConfig(data, suggestedName);
-    return;
-#endif
-
-    if (fileName.isEmpty())
-        return;
-
-#ifdef AMNEZIA_DESKTOP
-    QFile save(fileName.toLocalFile());
-#else
-    QFile save(QQmlFile::urlToLocalFileOrQrc(fileName));
-#endif
-
-    save.open(QIODevice::WriteOnly);
-    save.write(data.toUtf8());
-    save.close();
-
-    QFileInfo fi(fileName.toLocalFile());
-    QDesktopServices::openUrl(fi.absoluteDir().absolutePath());
-}
-
-void UiLogic::saveBinaryFile(const QString &desc, QString ext, const QString &data)
-{
-    ext.replace("*", "");
-    QString fileName = QFileDialog::getSaveFileName(
-            nullptr, desc, QStandardPaths::writableLocation(QStandardPaths::DocumentsLocation), "*" + ext);
-
-    if (fileName.isEmpty())
-        return;
-    if (!fileName.endsWith(ext))
-        fileName.append(ext);
-
-    QFile save(fileName);
-    save.open(QIODevice::WriteOnly);
-    save.write(QByteArray::fromBase64(data.toUtf8()));
-    save.close();
-
-    QFileInfo fi(fileName);
-    QDesktopServices::openUrl(fi.absoluteDir().absolutePath());
-}
-
-void UiLogic::copyToClipboard(const QString &text)
-{
-    qApp->clipboard()->setText(text);
-}
-
-void UiLogic::shareTempFile(const QString &suggestedName, QString ext, const QString &data)
-{
-    ext.replace("*", "");
-    QString fileName = QDir::tempPath() + "/" + suggestedName;
-
-    if (fileName.isEmpty())
-        return;
-    if (!fileName.endsWith(ext))
-        fileName.append(ext);
-
-    QFile::remove(fileName);
-
-    QFile save(fileName);
-    save.open(QIODevice::WriteOnly);
-    save.write(data.toUtf8());
-    save.close();
-
-    QStringList filesToSend;
-    filesToSend.append(fileName);
-    MobileUtils::shareText(filesToSend);
-}
-
-QString UiLogic::getOpenFileName(QWidget *parent, const QString &caption, const QString &dir, const QString &filter,
-                                 QString *selectedFilter, QFileDialog::Options options)
-{
-    QString fileName = QFileDialog::getOpenFileName(parent, caption, dir, filter, selectedFilter, options);
-
-#ifdef Q_OS_ANDROID
-    // patch for files containing spaces etc
-    const QString sep { "raw%3A%2F" };
-    if (fileName.startsWith("content://") && fileName.contains(sep)) {
-        QString contentUrl = fileName.split(sep).at(0);
-        QString rawUrl = fileName.split(sep).at(1);
-        rawUrl.replace(" ", "%20");
-        fileName = contentUrl + sep + rawUrl;
-    }
-#endif
-    return fileName;
-}
-
-void UiLogic::registerPagesLogic()
-{
-    amnApp->qmlEngine()->rootContext()->setContextProperty("UiLogic", this);
-
-    registerPageLogic<AppSettingsLogic>();
-    registerPageLogic<GeneralSettingsLogic>();
-    registerPageLogic<NetworkSettingsLogic>();
-    registerPageLogic<NewServerProtocolsLogic>();
-    registerPageLogic<QrDecoderLogic>();
-    registerPageLogic<ServerConfiguringProgressLogic>();
-    registerPageLogic<ServerListLogic>();
-    registerPageLogic<ServerSettingsLogic>();
-    registerPageLogic<ServerContainersLogic>();
-    registerPageLogic<ShareConnectionLogic>();
-    registerPageLogic<SitesLogic>();
-    registerPageLogic<StartPageLogic>();
-    registerPageLogic<ViewConfigLogic>();
-    registerPageLogic<VpnLogic>();
-    registerPageLogic<WizardLogic>();
-    registerPageLogic<ClientManagementLogic>();
-    registerPageLogic<ClientInfoLogic>();
-    registerPageLogic<AdvancedServerSettingsLogic>();
-}
-
-ErrorCode UiLogic::addAlreadyInstalledContainersGui(bool &isServerCreated)
-{
-    isServerCreated = false;
-    ServerCredentials installCredentials = m_installCredentials;
-    bool createNewServer = true;
-    int serverIndex;
-
-    for (int i = 0; i < m_settings->serversCount(); i++) {
-        const ServerCredentials credentials = m_settings->serverCredentials(i);
-        if (m_installCredentials.hostName == credentials.hostName && m_installCredentials.port == credentials.port) {
-            createNewServer = false;
-            isServerCreated = true;
-            installCredentials = credentials;
-            serverIndex = i;
-            break;
-        }
-    }
-
-    QMap<DockerContainer, QJsonObject> installedContainers;
-    ServerController serverController(m_settings);
-    ErrorCode errorCode = serverController.getAlreadyInstalledContainers(installCredentials, installedContainers);
-    if (errorCode != ErrorCode::NoError) {
-        return errorCode;
-    }
-
-    if (!installedContainers.empty()) {
-        QJsonObject server;
-        QJsonArray containerConfigs;
-        if (createNewServer) {
-            server.insert(config_key::hostName, installCredentials.hostName);
-            server.insert(config_key::userName, installCredentials.userName);
-            server.insert(config_key::password, installCredentials.secretData);
-            server.insert(config_key::port, installCredentials.port);
-            server.insert(config_key::description, m_settings->nextAvailableServerName());
-        }
-
-        for (auto container = installedContainers.begin(); container != installedContainers.end(); container++) {
-            if (isContainerAlreadyAddedToGui(container.key())) {
-                continue;
-            }
-
-            if (createNewServer) {
-                containerConfigs.append(container.value());
-                server.insert(config_key::containers, containerConfigs);
-            } else {
-                m_settings->setContainerConfig(serverIndex, container.key(), container.value());
-                m_settings->setDefaultContainer(serverIndex, installedContainers.firstKey());
-            }
-        }
-
-        if (createNewServer) {
-            server.insert(config_key::defaultContainer,
-                          ContainerProps::containerToString(installedContainers.firstKey()));
-            m_settings->addServer(server);
-            m_settings->setDefaultServer(m_settings->serversCount() - 1);
-            isServerCreated = true;
-        }
-    }
-
-    return ErrorCode::NoError;
-}
-
-bool UiLogic::isContainerAlreadyAddedToGui(DockerContainer container)
-{
-    for (int i = 0; i < m_settings->serversCount(); i++) {
-        const ServerCredentials credentials = m_settings->serverCredentials(i);
-        if (m_installCredentials.hostName == credentials.hostName && m_installCredentials.port == credentials.port) {
-            const QJsonObject containerConfig = m_settings->containerConfig(i, container);
-            if (!containerConfig.isEmpty()) {
-                return true;
-            }
-        }
-    }
-    return false;
-}
diff --git a/client/ui/uilogic.h b/client/ui/uilogic.h
deleted file mode 100644
index 081b8e5a..00000000
--- a/client/ui/uilogic.h
+++ /dev/null
@@ -1,201 +0,0 @@
-#ifndef UILOGIC_H
-#define UILOGIC_H
-
-#include <QFileDialog>
-#include <QKeyEvent>
-#include <QRegularExpressionValidator>
-#include <QThread>
-#include <QQmlEngine>
-
-#include <functional>
-#include <typeindex>
-#include <typeinfo>
-#include <unordered_map>
-
-#include "property_helper.h"
-#include "pages.h"
-#include "protocols/vpnprotocol.h"
-#include "containers/containers_defs.h"
-
-#include "models/containers_model.h"
-#include "models/protocols_model.h"
-#include "models/clientManagementModel.h"
-
-#include "notificationhandler.h"
-
-class Settings;
-class VpnConfigurator;
-class ServerController;
-
-class PageLogicBase;
-
-class AppSettingsLogic;
-class GeneralSettingsLogic;
-class NetworkSettingsLogic;
-class NewServerProtocolsLogic;
-class QrDecoderLogic;
-class ServerConfiguringProgressLogic;
-class ServerListLogic;
-class ServerSettingsLogic;
-class ServerContainersLogic;
-class ShareConnectionLogic;
-class SitesLogic;
-class StartPageLogic;
-class ViewConfigLogic;
-class VpnLogic;
-class WizardLogic;
-class ClientManagementLogic;
-class ClientInfoLogic;
-class AdvancedServerSettingsLogic;
-
-class PageProtocolLogicBase;
-class OpenVpnLogic;
-class ShadowSocksLogic;
-class CloakLogic;
-
-class OtherProtocolsLogic;
-
-class VpnConnection;
-
-class CreateServerTest;
-
-class UiLogic : public QObject
-{
-    Q_OBJECT
-
-    AUTO_PROPERTY(bool, pageEnabled)
-    AUTO_PROPERTY(int, pagesStackDepth)
-    AUTO_PROPERTY(int, currentPageValue)
-
-    READONLY_PROPERTY(QObject *, protocolsModel)
-    READONLY_PROPERTY(QObject *, clientManagementModel)
-
-public:
-    explicit UiLogic(std::shared_ptr<Settings> settings, std::shared_ptr<VpnConfigurator> configurator, QObject *parent = nullptr);
-    ~UiLogic();
-    void showOnStartup();
-
-    friend class PageLogicBase;
-
-    friend class AppSettingsLogic;
-    friend class GeneralSettingsLogic;
-    friend class NetworkSettingsLogic;
-    friend class ServerConfiguringProgressLogic;
-    friend class NewServerProtocolsLogic;
-    friend class ServerListLogic;
-    friend class ServerSettingsLogic;
-    friend class ServerContainersLogic;
-    friend class ShareConnectionLogic;
-    friend class SitesLogic;
-    friend class StartPageLogic;
-    friend class ViewConfigLogic;
-    friend class VpnLogic;
-    friend class WizardLogic;
-    friend class ClientManagementLogic;
-    friend class ClientInfoLogic;
-    friend class AdvancedServerSettingsLogic;
-
-    friend class PageProtocolLogicBase;
-    friend class OpenVpnLogic;
-    friend class ShadowSocksLogic;
-    friend class CloakLogic;
-
-    friend class OtherProtocolsLogic;
-
-    friend class CreateServerTest;
-
-    Q_INVOKABLE virtual void onUpdatePage() {} // UiLogic is set as logic class for some qml pages
-    Q_INVOKABLE void onUpdateAllPages();
-
-    Q_INVOKABLE void initializeUiLogic();
-    Q_INVOKABLE void onCloseWindow();
-
-    Q_INVOKABLE QString containerName(int container);
-    Q_INVOKABLE QString containerDesc(int container);
-
-    Q_INVOKABLE void onGotoCurrentProtocolsPage();
-
-    Q_INVOKABLE void keyPressEvent(Qt::Key key);
-
-    Q_INVOKABLE void saveTextFile(const QString& desc, const QString &suggestedName, QString ext, const QString& data);
-    Q_INVOKABLE void saveBinaryFile(const QString& desc, QString ext, const QString& data);
-    Q_INVOKABLE void copyToClipboard(const QString& text);
-
-    Q_INVOKABLE amnezia::ErrorCode addAlreadyInstalledContainersGui(bool &isServerCreated);
-
-    void shareTempFile(const QString &suggestedName, QString ext, const QString& data);
-    static QString getOpenFileName(QWidget *parent = nullptr,
-                                   const QString &caption = QString(),
-                                   const QString &dir = QString(),
-                                   const QString &filter = QString(),
-                                   QString *selectedFilter = nullptr,
-                                   QFileDialog::Options options = QFileDialog::Options());
-signals:
-    void goToPage(PageEnumNS::Page page, bool reset = true, bool slide = true);
-    void goToProtocolPage(Proto protocol, bool reset = true, bool slide = true);
-    void goToShareProtocolPage(Proto protocol, bool reset = true, bool slide = true);
-    void goToClientInfoPage(Proto protocol, bool reset = true, bool slide = true);
-
-    void closePage();
-    void setStartPage(PageEnumNS::Page page, bool slide = true);
-    void showPublicKeyWarning();
-    void showConnectErrorDialog();
-    void show();
-    void hide();
-    void raise();
-    void toggleLogPanel();
-    void showWarningMessage(QString message);
-
-private slots:
-    // containers - INOUT arg
-    void installServer(QPair<amnezia::DockerContainer, QJsonObject> &container);
-
-private:
-    PageEnumNS::Page currentPage();
-    bool isContainerAlreadyAddedToGui(DockerContainer container);
-
-public:
-    Q_INVOKABLE PageProtocolLogicBase *protocolLogic(Proto p);
-
-    QObject *qmlRoot() const;
-    void setQmlRoot(QObject *newQmlRoot);
-
-    NotificationHandler *notificationHandler() const;
-
-    void setQmlContextProperty(PageLogicBase *logic);
-    void registerPagesLogic();
-
-    template<typename T>
-    void registerPageLogic()
-    {
-        T* logic = new T(this);
-        m_logicMap[std::type_index(typeid(T))] = logic;
-        setQmlContextProperty(logic);
-    }
-
-    template<typename T>
-    T* pageLogic()
-    {
-        return static_cast<T *>(m_logicMap.value(std::type_index(typeid(T))));
-    }
-
-private:
-    QObject *m_qmlRoot{nullptr};
-
-    QMap<std::type_index, PageLogicBase*> m_logicMap;
-
-    QMap<Proto, PageProtocolLogicBase *> m_protocolLogicMap;
-
-    VpnConnection* m_vpnConnection;
-    QThread m_vpnConnectionThread;
-
-    std::shared_ptr<Settings> m_settings;
-    std::shared_ptr<VpnConfigurator> m_configurator;
-
-    NotificationHandler* m_notificationHandler;
-
-    int m_selectedServerIndex = -1; // server index to use when proto settings page opened
-    DockerContainer m_selectedDockerContainer; // same
-    ServerCredentials m_installCredentials; // used to save cred between pages new_server and new_server_protocols and wizard
-};
-#endif // UILOGIC_H

From cbcf18781415963b689da1e54746798ea1544c2c Mon Sep 17 00:00:00 2001
From: "vladimir.kuznetsov" <nethiuswork@gmail.com>
Date: Thu, 31 Aug 2023 21:49:36 +0500
Subject: [PATCH 083/278] added missing include files

---
 client/configurators/openvpn_configurator.cpp    | 5 +++++
 client/fileUtilites.cpp                          | 1 +
 client/ui/controllers/installController.cpp      | 1 +
 client/ui/qml/Pages2/PageServiceSftpSettings.qml | 2 +-
 4 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/client/configurators/openvpn_configurator.cpp b/client/configurators/openvpn_configurator.cpp
index bfde4a91..a62bdd9c 100644
--- a/client/configurators/openvpn_configurator.cpp
+++ b/client/configurators/openvpn_configurator.cpp
@@ -7,6 +7,11 @@
 #include <QString>
 #include <QTemporaryDir>
 #include <QTemporaryFile>
+#if defined(Q_OS_ANDROID) || defined(Q_OS_IOS)
+    #include <QGuiApplication>
+#else
+    #include <QApplication>
+#endif
 
 #include "containers/containers_defs.h"
 #include "core/scripts_registry.h"
diff --git a/client/fileUtilites.cpp b/client/fileUtilites.cpp
index b3c65216..4eedfc9a 100644
--- a/client/fileUtilites.cpp
+++ b/client/fileUtilites.cpp
@@ -5,6 +5,7 @@
 #include <QFile>
 #include <QFileInfo>
 #include <QStandardPaths>
+#include <QUrl>
 
 #ifdef Q_OS_ANDROID
     #include "platforms/android/android_controller.h"
diff --git a/client/ui/controllers/installController.cpp b/client/ui/controllers/installController.cpp
index 7d6ba590..0a3da475 100644
--- a/client/ui/controllers/installController.cpp
+++ b/client/ui/controllers/installController.cpp
@@ -1,6 +1,7 @@
 #include "installController.h"
 
 #include <QDesktopServices>
+#include <QDir>
 #include <QEventLoop>
 #include <QJsonObject>
 #include <QStandardPaths>
diff --git a/client/ui/qml/Pages2/PageServiceSftpSettings.qml b/client/ui/qml/Pages2/PageServiceSftpSettings.qml
index 32c0c170..5eb288f8 100644
--- a/client/ui/qml/Pages2/PageServiceSftpSettings.qml
+++ b/client/ui/qml/Pages2/PageServiceSftpSettings.qml
@@ -253,7 +253,7 @@ PageType {
                             text: qsTr("Remove SFTP and all data stored there")
 
                             onClicked: {
-                                questionDrawer.headerText = qsTr("Some description")
+                                questionDrawer.headerText = qsTr("Remove SFTP and all data stored there?")
                                 questionDrawer.yesButtonText = qsTr("Continue")
                                 questionDrawer.noButtonText = qsTr("Cancel")
 

From b58295d1d68d9756a61e48bf217a6a70c4d3c2e6 Mon Sep 17 00:00:00 2001
From: "vladimir.kuznetsov" <nethiuswork@gmail.com>
Date: Fri, 1 Sep 2023 00:48:58 +0500
Subject: [PATCH 084/278] added the ability to restore settings from backup on
 the initial screen - fixed the display of services in the settings for mobile
 devices

---
 client/fileUtilites.cpp                       |  2 +-
 .../qml/Components/HomeContainersListView.qml |  6 ++++++
 .../ui/qml/Filters/ContainersModelFilters.qml |  8 ++++----
 .../ui/qml/Pages2/PageSettingsServerData.qml  |  2 +-
 .../qml/Pages2/PageSettingsSplitTunneling.qml |  6 ++++++
 .../Pages2/PageSetupWizardConfigSource.qml    | 14 ++++++++++----
 client/ui/qml/Pages2/PageSetupWizardStart.qml | 19 +++++++++++++++++++
 client/ui/qml/main2.qml                       |  4 +---
 8 files changed, 48 insertions(+), 13 deletions(-)

diff --git a/client/fileUtilites.cpp b/client/fileUtilites.cpp
index 4eedfc9a..96f1c741 100644
--- a/client/fileUtilites.cpp
+++ b/client/fileUtilites.cpp
@@ -81,5 +81,5 @@ QString FileUtilites::getFileName(QString fileName)
     return fileName;
 #endif
 
-    return QUrl(FileUtilites::getFileName(fileName)).toLocalFile();
+    return QUrl(fileName).toLocalFile();
 }
diff --git a/client/ui/qml/Components/HomeContainersListView.qml b/client/ui/qml/Components/HomeContainersListView.qml
index 0c2408be..fc4dd8b3 100644
--- a/client/ui/qml/Components/HomeContainersListView.qml
+++ b/client/ui/qml/Components/HomeContainersListView.qml
@@ -53,6 +53,12 @@ ListView {
                 checkable: isInstalled
                 checked: isDefault
 
+                onPressed: function(mouse) {
+                    if (!isSupported) {
+                        PageController.showErrorMessage(qsTr("The selected protocol is not supported on the current platform"))
+                    }
+                }
+
                 onClicked: {
                     if (checked) {
                         isDefault = true
diff --git a/client/ui/qml/Filters/ContainersModelFilters.qml b/client/ui/qml/Filters/ContainersModelFilters.qml
index fa8bd83b..dd6d9525 100644
--- a/client/ui/qml/Filters/ContainersModelFilters.qml
+++ b/client/ui/qml/Filters/ContainersModelFilters.qml
@@ -32,16 +32,16 @@ Item {
     }
 
     function getWriteAccessProtocolsListFilters() {
-        return [vpnTypeFilter, supportedFilter]
+        return [vpnTypeFilter]
     }
     function getReadAccessProtocolsListFilters() {
-        return [vpnTypeFilter, supportedFilter, installedFilter]
+        return [vpnTypeFilter, installedFilter]
     }
 
     function getWriteAccessServicesListFilters() {
-        return [serviceTypeFilter, supportedFilter]
+        return [serviceTypeFilter
     }
     function getReadAccessServicesListFilters() {
-        return [serviceTypeFilter, supportedFilter, installedFilter]
+        return [serviceTypeFilter, installedFilter]
     }
 }
diff --git a/client/ui/qml/Pages2/PageSettingsServerData.qml b/client/ui/qml/Pages2/PageSettingsServerData.qml
index 15c5e531..8ae90351 100644
--- a/client/ui/qml/Pages2/PageSettingsServerData.qml
+++ b/client/ui/qml/Pages2/PageSettingsServerData.qml
@@ -22,7 +22,7 @@ PageType {
             if (isInstalledContainerFound) {
                 message = qsTr("All installed containers have been added to the application")
             } else {
-                message = qsTr("No installed containers found")
+                message = qsTr("No new installed containers found")
             }
 
             PageController.showErrorMessage(message)
diff --git a/client/ui/qml/Pages2/PageSettingsSplitTunneling.qml b/client/ui/qml/Pages2/PageSettingsSplitTunneling.qml
index 535ab18c..e074b4ce 100644
--- a/client/ui/qml/Pages2/PageSettingsSplitTunneling.qml
+++ b/client/ui/qml/Pages2/PageSettingsSplitTunneling.qml
@@ -241,8 +241,10 @@ PageType {
             buttonImageSource: "qrc:/images/controls/plus.svg"
 
             clickedFunc: function() {
+                PageController.showBusyIndicator(true)
                 SitesController.addSite(textFieldText)
                 textFieldText = ""
+                PageController.showBusyIndicator(false)
             }
         }
 
@@ -312,8 +314,10 @@ PageType {
                         currentFile: StandardPaths.standardLocations(StandardPaths.DocumentsLocation) + "/sites"
                         defaultSuffix: ".json"
                         onAccepted: {
+                            PageController.showBusyIndicator(true)
                             SitesController.exportSites(saveFileDialog.currentFile.toString())
                             moreActionsDrawer.close()
+                            PageController.showBusyIndicator(false)
                         }
                     }
                 }
@@ -394,9 +398,11 @@ PageType {
                     acceptLabel: qsTr("Open sites file")
                     nameFilters: [ "Sites files (*.json)" ]
                     onAccepted: {
+                        PageController.showBusyIndicator(true)
                         SitesController.importSites(openFileDialog.selectedFile.toString(), replaceExistingSites)
                         importSitesDrawer.close()
                         moreActionsDrawer.close()
+                        PageController.showBusyIndicator(false)
                     }
                 }
             }
diff --git a/client/ui/qml/Pages2/PageSetupWizardConfigSource.qml b/client/ui/qml/Pages2/PageSetupWizardConfigSource.qml
index de8b8c87..6362ca6d 100644
--- a/client/ui/qml/Pages2/PageSetupWizardConfigSource.qml
+++ b/client/ui/qml/Pages2/PageSetupWizardConfigSource.qml
@@ -65,7 +65,7 @@ It's okay as long as it's from someone you trust.")
                 Layout.fillWidth: true
                 Layout.topMargin: 16
 
-                text: qsTr("File with connection settings")
+                text: qsTr("File with connection settings or backup")
                 rightImageSource: "qrc:/images/controls/chevron-right.svg"
                 leftImageSource: "qrc:/images/controls/folder-open.svg"
 
@@ -76,10 +76,16 @@ It's okay as long as it's from someone you trust.")
                 FileDialog {
                     id: fileDialog
                     acceptLabel: qsTr("Open config file")
-                    nameFilters: [ "Config files (*.vpn *.ovpn *.conf)" ]
+                    nameFilters: [ "Config or backup files (*.vpn *.ovpn *.conf *.backup)" ]
                     onAccepted: {
-                        ImportController.extractConfigFromFile(fileDialog.selectedFile.toString())
-                        goToPage(PageEnum.PageSetupWizardViewConfig)
+                        if (fileDialog.selectedFile.toString().indexOf(".backup") != -1) {
+                            PageController.showBusyIndicator(true)
+                            SettingsController.restoreAppConfig(fileDialog.selectedFile.toString())
+                            PageController.showBusyIndicator(false)
+                        } else {
+                            ImportController.extractConfigFromFile(fileDialog.selectedFile.toString())
+                            goToPage(PageEnum.PageSetupWizardViewConfig)
+                        }
                     }
                 }
             }
diff --git a/client/ui/qml/Pages2/PageSetupWizardStart.qml b/client/ui/qml/Pages2/PageSetupWizardStart.qml
index 11d7ba29..3bc57495 100644
--- a/client/ui/qml/Pages2/PageSetupWizardStart.qml
+++ b/client/ui/qml/Pages2/PageSetupWizardStart.qml
@@ -19,6 +19,19 @@ PageType {
         function onGoToPageViewConfig() {
             goToPage(PageEnum.PageSetupWizardViewConfig)
         }
+
+        function onShowBusyIndicator(visible) {
+            busyIndicator.visible = visible
+        }
+    }
+
+    Connections {
+        target: SettingsController
+
+        function onRestoreBackupFinished() {
+            PageController.showNotificationMessage(qsTr("Settings restored from backup file"))
+            PageController.replaceStartPage()
+        }
     }
 
     FlickableType {
@@ -93,4 +106,10 @@ PageType {
             id: connectionTypeSelection
         }
     }
+
+    BusyIndicatorType {
+        id: busyIndicator
+        anchors.centerIn: parent
+        z: 1
+    }
 }
diff --git a/client/ui/qml/main2.qml b/client/ui/qml/main2.qml
index 6ae434d7..d3c3aa1b 100644
--- a/client/ui/qml/main2.qml
+++ b/client/ui/qml/main2.qml
@@ -47,9 +47,7 @@ Window  {
 
         function onReplaceStartPage() {
             var pagePath = PageController.getInitialPage()
-            while (rootStackView.depth > 1) {
-                rootStackView.pop()
-            }
+            rootStackView.clear()
             PageController.updateNavigationBarColor(PageController.getInitialPageNavigationBarColor())
             rootStackView.replace(pagePath, { "objectName" : pagePath })
         }

From 4e9f68acff8b95cb890b61ef3d3000cccab4d8c0 Mon Sep 17 00:00:00 2001
From: "vladimir.kuznetsov" <nethiuswork@gmail.com>
Date: Fri, 1 Sep 2023 02:07:52 +0500
Subject: [PATCH 085/278] returned the lost comma

---
 client/ui/qml/Filters/ContainersModelFilters.qml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/ui/qml/Filters/ContainersModelFilters.qml b/client/ui/qml/Filters/ContainersModelFilters.qml
index dd6d9525..8c51c7ee 100644
--- a/client/ui/qml/Filters/ContainersModelFilters.qml
+++ b/client/ui/qml/Filters/ContainersModelFilters.qml
@@ -39,7 +39,7 @@ Item {
     }
 
     function getWriteAccessServicesListFilters() {
-        return [serviceTypeFilter
+        return [serviceTypeFilter]
     }
     function getReadAccessServicesListFilters() {
         return [serviceTypeFilter, installedFilter]

From cacf74af3c537afe6db507d3f6468e7c613e3038 Mon Sep 17 00:00:00 2001
From: Mykola Baibuz <mykola.baibuz@gmail.com>
Date: Fri, 1 Sep 2023 01:08:44 +0300
Subject: [PATCH 086/278] Fix iOS build

---
 client/amnezia_application.cpp                   |  1 +
 client/fileUtilites.cpp                          | 11 ++---------
 client/platforms/ios/QtAppDelegate-C-Interface.h |  4 ++--
 client/platforms/ios/QtAppDelegate.h             |  4 ++--
 client/platforms/ios/QtAppDelegate.mm            |  6 +++---
 client/ui/controllers/importController.cpp       |  2 +-
 client/ui/controllers/importController.h         |  2 +-
 client/ui/macos_util.h                           |  3 +++
 8 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/client/amnezia_application.cpp b/client/amnezia_application.cpp
index d14917f0..d42d4cf9 100644
--- a/client/amnezia_application.cpp
+++ b/client/amnezia_application.cpp
@@ -112,6 +112,7 @@ void AmneziaApplication::init()
 
 #ifdef Q_OS_IOS
     IosController::Instance()->initialize();
+    setImportController(m_importController.get());
 #endif
 
     m_notificationHandler.reset(NotificationHandler::create(nullptr));
diff --git a/client/fileUtilites.cpp b/client/fileUtilites.cpp
index 96f1c741..9cbc5a10 100644
--- a/client/fileUtilites.cpp
+++ b/client/fileUtilites.cpp
@@ -40,17 +40,10 @@ void FileUtilites::saveFile(QString fileName, const QString &data)
     filesToSend.append(fileName);
     MobileUtils::shareText(filesToSend);
     return;
-#endif
-
-#ifdef Q_OS_IOS
-    QStringList filesToSend;
-    filesToSend.append(fileUrl.toString());
-    MobileUtils::shareText(filesToSend);
-    return;
-#endif
-
+#else
     QFileInfo fi(fileUrl.toLocalFile());
     QDesktopServices::openUrl(fi.absoluteDir().absolutePath());
+#endif
 }
 
 QString FileUtilites::getFileName(QString fileName)
diff --git a/client/platforms/ios/QtAppDelegate-C-Interface.h b/client/platforms/ios/QtAppDelegate-C-Interface.h
index afd31e7d..dd37dd2a 100644
--- a/client/platforms/ios/QtAppDelegate-C-Interface.h
+++ b/client/platforms/ios/QtAppDelegate-C-Interface.h
@@ -1,9 +1,9 @@
 #ifndef QTAPPDELEGATECINTERFACE_H
 #define QTAPPDELEGATECINTERFACE_H
 
-#include "ui/pages_logic/StartPageLogic.h"
+#include "ui/controllers/importController.h"
 
 void QtAppDelegateInitialize();
-void setStartPageLogic(StartPageLogic*);
+void setImportController(ImportController*);
 
 #endif // QTAPPDELEGATECINTERFACE_H
diff --git a/client/platforms/ios/QtAppDelegate.h b/client/platforms/ios/QtAppDelegate.h
index 1e0dc412..a32f1b64 100644
--- a/client/platforms/ios/QtAppDelegate.h
+++ b/client/platforms/ios/QtAppDelegate.h
@@ -1,9 +1,9 @@
 #import <UIKit/UIKit.h>
 #import "QtAppDelegate-C-Interface.h"
 
-#include "ui/pages_logic/StartPageLogic.h"
+#include "ui/controllers/importController.h"
 
 @interface QtAppDelegate : UIResponder <UIApplicationDelegate>
 +(QtAppDelegate *)sharedQtAppDelegate;
-@property (nonatomic) StartPageLogic* startPageLogic;
+@property (nonatomic) ImportController* ImportController;
 @end
diff --git a/client/platforms/ios/QtAppDelegate.mm b/client/platforms/ios/QtAppDelegate.mm
index f65856d9..432fc172 100644
--- a/client/platforms/ios/QtAppDelegate.mm
+++ b/client/platforms/ios/QtAppDelegate.mm
@@ -79,7 +79,7 @@
         bool isOpenFile = file.open(QIODevice::ReadOnly);
         QByteArray data = file.readAll();
         
-        [QtAppDelegate sharedQtAppDelegate].startPageLogic->importAnyFile(QString(data));
+        [QtAppDelegate sharedQtAppDelegate].ImportController->extractConfigFromData(QString(data));
         return YES;
     }
     return NO;
@@ -92,8 +92,8 @@ void QtAppDelegateInitialize()
     NSLog(@"Created a new AppDelegate");
 }
 
-void setStartPageLogic(StartPageLogic* startPage) {
-    [QtAppDelegate sharedQtAppDelegate].startPageLogic = startPage;
+void setImportController(ImportController* controller) {
+    [QtAppDelegate sharedQtAppDelegate].ImportController = controller;
 }
 
 @end
diff --git a/client/ui/controllers/importController.cpp b/client/ui/controllers/importController.cpp
index 9a374aa1..b76302c5 100644
--- a/client/ui/controllers/importController.cpp
+++ b/client/ui/controllers/importController.cpp
@@ -97,7 +97,7 @@ void ImportController::extractConfigFromFile(const QString &fileName)
     }
 }
 
-void ImportController::extractConfigFromData(QString &data)
+void ImportController::extractConfigFromData(QString data)
 {
     auto configFormat = checkConfigFormat(data);
     if (configFormat == ConfigTypes::OpenVpn) {
diff --git a/client/ui/controllers/importController.h b/client/ui/controllers/importController.h
index 7def7733..1f8f8bbb 100644
--- a/client/ui/controllers/importController.h
+++ b/client/ui/controllers/importController.h
@@ -22,7 +22,7 @@ public:
 public slots:
     void importConfig();
     void extractConfigFromFile(const QString &fileName);
-    void extractConfigFromData(QString &data);
+    void extractConfigFromData(QString data);
     void extractConfigFromCode(QString code);
     bool extractConfigFromQr(const QByteArray &data);
     QString getConfig();
diff --git a/client/ui/macos_util.h b/client/ui/macos_util.h
index f5add902..15677e42 100644
--- a/client/ui/macos_util.h
+++ b/client/ui/macos_util.h
@@ -1,9 +1,12 @@
 #ifndef OSXUTIL_H
 #define OSXUTIL_H
+
+#ifndef Q_OS_IOS
 #include <QDialog>
 #include <QWidget>
 
 void setDockIconVisible(bool visible);
 void fixWidget(QWidget *widget);
+#endif
 
 #endif

From 1b3a32f83f2cc7f64ff487c7e19d017871dd07f9 Mon Sep 17 00:00:00 2001
From: Mykola Baibuz <mykola.baibuz@gmail.com>
Date: Fri, 1 Sep 2023 14:49:10 +0300
Subject: [PATCH 087/278] Import config from filesystem on iOS

---
 client/amnezia_application.cpp                   | 6 ++++--
 client/platforms/ios/QtAppDelegate-C-Interface.h | 1 -
 client/platforms/ios/QtAppDelegate.h             | 3 ---
 client/platforms/ios/QtAppDelegate.mm            | 7 ++-----
 client/platforms/ios/ios_controller.h            | 1 +
 5 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/client/amnezia_application.cpp b/client/amnezia_application.cpp
index d42d4cf9..64adb1d1 100644
--- a/client/amnezia_application.cpp
+++ b/client/amnezia_application.cpp
@@ -21,7 +21,6 @@
 #include "protocols/qml_register_protocols.h"
 
 #if defined(Q_OS_IOS)
-    #include "platforms/ios/QtAppDelegate-C-Interface.h"
     #include "platforms/ios/ios_controller.h"
 #endif
 
@@ -112,7 +111,10 @@ void AmneziaApplication::init()
 
 #ifdef Q_OS_IOS
     IosController::Instance()->initialize();
-    setImportController(m_importController.get());
+    connect(IosController::Instance(), &IosController::importConfigFromOutside, m_importController.get(),
+            &ImportController::extractConfigFromData);
+    connect(IosController::Instance(), &IosController::importConfigFromOutside, m_pageController.get(),
+            &PageController::goToPageViewConfig);
 #endif
 
     m_notificationHandler.reset(NotificationHandler::create(nullptr));
diff --git a/client/platforms/ios/QtAppDelegate-C-Interface.h b/client/platforms/ios/QtAppDelegate-C-Interface.h
index dd37dd2a..39adbb92 100644
--- a/client/platforms/ios/QtAppDelegate-C-Interface.h
+++ b/client/platforms/ios/QtAppDelegate-C-Interface.h
@@ -4,6 +4,5 @@
 #include "ui/controllers/importController.h"
 
 void QtAppDelegateInitialize();
-void setImportController(ImportController*);
 
 #endif // QTAPPDELEGATECINTERFACE_H
diff --git a/client/platforms/ios/QtAppDelegate.h b/client/platforms/ios/QtAppDelegate.h
index a32f1b64..cd8bae27 100644
--- a/client/platforms/ios/QtAppDelegate.h
+++ b/client/platforms/ios/QtAppDelegate.h
@@ -1,9 +1,6 @@
 #import <UIKit/UIKit.h>
-#import "QtAppDelegate-C-Interface.h"
 
 #include "ui/controllers/importController.h"
 
 @interface QtAppDelegate : UIResponder <UIApplicationDelegate>
-+(QtAppDelegate *)sharedQtAppDelegate;
-@property (nonatomic) ImportController* ImportController;
 @end
diff --git a/client/platforms/ios/QtAppDelegate.mm b/client/platforms/ios/QtAppDelegate.mm
index 432fc172..7528f2ff 100644
--- a/client/platforms/ios/QtAppDelegate.mm
+++ b/client/platforms/ios/QtAppDelegate.mm
@@ -1,4 +1,5 @@
 #import "QtAppDelegate.h"
+#import "ios_controller.h"
 
 #include <QFile>
 
@@ -79,7 +80,7 @@
         bool isOpenFile = file.open(QIODevice::ReadOnly);
         QByteArray data = file.readAll();
         
-        [QtAppDelegate sharedQtAppDelegate].ImportController->extractConfigFromData(QString(data));
+        IosController::Instance()->importConfigFromOutside(QString(data));
         return YES;
     }
     return NO;
@@ -92,8 +93,4 @@ void QtAppDelegateInitialize()
     NSLog(@"Created a new AppDelegate");
 }
 
-void setImportController(ImportController* controller) {
-    [QtAppDelegate sharedQtAppDelegate].ImportController = controller;
-}
-
 @end
diff --git a/client/platforms/ios/ios_controller.h b/client/platforms/ios/ios_controller.h
index 4d1122b2..d6a12529 100644
--- a/client/platforms/ios/ios_controller.h
+++ b/client/platforms/ios/ios_controller.h
@@ -49,6 +49,7 @@ public:
 signals:
     void connectionStateChanged(Vpn::ConnectionState state);
     void bytesChanged(quint64 receivedBytes, quint64 sentBytes);
+    void importConfigFromOutside(const QString);
 
 protected slots:
 

From a96f485e3c8d683323dfc889f64e0f2a648eec06 Mon Sep 17 00:00:00 2001
From: "vladimir.kuznetsov" <nethiuswork@gmail.com>
Date: Fri, 1 Sep 2023 17:39:23 +0500
Subject: [PATCH 088/278] added display of all protocols in the settings after
 installing a new container - set the app's max height and width to 600/800 -
 expanded the description when removing containers

---
 CMakeLists.txt                                |  2 +-
 client/amnezia_application.cpp                |  2 +-
 client/ui/controllers/installController.cpp   | 31 +++++++++++--------
 .../Pages2/PageProtocolOpenVpnSettings.qml    |  1 +
 client/ui/qml/Pages2/PageProtocolRaw.qml      |  1 +
 .../qml/Pages2/PageSettingsServerProtocol.qml |  1 +
 client/ui/qml/main2.qml                       |  2 ++
 7 files changed, 25 insertions(+), 15 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index aec2a974..875d664d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.25.0 FATAL_ERROR)
 
 set(PROJECT AmneziaVPN)
 
-project(${PROJECT} VERSION 4.0.3.1
+project(${PROJECT} VERSION 4.0.4.1
         DESCRIPTION "AmneziaVPN"
         HOMEPAGE_URL "https://amnezia.org/"
 )
diff --git a/client/amnezia_application.cpp b/client/amnezia_application.cpp
index d14917f0..ebd763dd 100644
--- a/client/amnezia_application.cpp
+++ b/client/amnezia_application.cpp
@@ -206,8 +206,8 @@ void AmneziaApplication::loadFonts()
 void AmneziaApplication::loadTranslator()
 {
     auto locale = m_settings->getAppLanguage();
+    m_translator.reset(new QTranslator());
     if (locale != QLocale::English) {
-        m_translator.reset(new QTranslator());
         if (m_translator->load(locale, QString("amneziavpn"), QLatin1String("_"), QLatin1String(":/i18n"))) {
             if (QCoreApplication::installTranslator(m_translator.get())) {
                 m_settings->setAppLanguage(locale);
diff --git a/client/ui/controllers/installController.cpp b/client/ui/controllers/installController.cpp
index 0a3da475..3c0752cc 100644
--- a/client/ui/controllers/installController.cpp
+++ b/client/ui/controllers/installController.cpp
@@ -59,20 +59,25 @@ InstallController::~InstallController()
 
 void InstallController::install(DockerContainer container, int port, TransportProto transportProto)
 {
-    Proto mainProto = ContainerProps::defaultProtocol(container);
-    QJsonObject containerConfig;
-
-    containerConfig.insert(config_key::port, QString::number(port));
-    containerConfig.insert(config_key::transport_proto, ProtocolProps::transportProtoToString(transportProto, mainProto));
-
-    if (container == DockerContainer::Sftp) {
-        containerConfig.insert(config_key::userName, protocols::sftp::defaultUserName);
-        containerConfig.insert(config_key::password, Utils::getRandomString(10));
-    }
-
     QJsonObject config;
-    config.insert(config_key::container, ContainerProps::containerToString(container));
-    config.insert(ProtocolProps::protoToString(mainProto), containerConfig);
+    auto mainProto = ContainerProps::defaultProtocol(container);
+    for (auto protocol : ContainerProps::protocolsForContainer(container)) {
+        QJsonObject containerConfig;
+
+        if (protocol == mainProto) {
+            containerConfig.insert(config_key::port, QString::number(port));
+            containerConfig.insert(config_key::transport_proto,
+                                   ProtocolProps::transportProtoToString(transportProto, protocol));
+
+            if (container == DockerContainer::Sftp) {
+                containerConfig.insert(config_key::userName, protocols::sftp::defaultUserName);
+                containerConfig.insert(config_key::password, Utils::getRandomString(10));
+            }
+
+            config.insert(config_key::container, ContainerProps::containerToString(container));
+        }
+        config.insert(ProtocolProps::protoToString(protocol), containerConfig);
+    }
 
     if (m_shouldCreateServer) {
         if (isServerAlreadyExists()) {
diff --git a/client/ui/qml/Pages2/PageProtocolOpenVpnSettings.qml b/client/ui/qml/Pages2/PageProtocolOpenVpnSettings.qml
index 659193ca..607b6584 100644
--- a/client/ui/qml/Pages2/PageProtocolOpenVpnSettings.qml
+++ b/client/ui/qml/Pages2/PageProtocolOpenVpnSettings.qml
@@ -362,6 +362,7 @@ PageType {
 
                             onClicked: {
                                 questionDrawer.headerText = qsTr("Remove OpenVpn from server?")
+                                questionDrawer.descriptionText = qsTr("All users with whom you shared a connection will no longer be able to connect to it")
                                 questionDrawer.yesButtonText = qsTr("Continue")
                                 questionDrawer.noButtonText = qsTr("Cancel")
 
diff --git a/client/ui/qml/Pages2/PageProtocolRaw.qml b/client/ui/qml/Pages2/PageProtocolRaw.qml
index 5c70b1c0..4c155d61 100644
--- a/client/ui/qml/Pages2/PageProtocolRaw.qml
+++ b/client/ui/qml/Pages2/PageProtocolRaw.qml
@@ -174,6 +174,7 @@ PageType {
 
                 clickedFunction: function() {
                     questionDrawer.headerText = qsTr("Remove ") + ContainersModel.getCurrentlyProcessedContainerName() + qsTr(" from server?")
+                    questionDrawer.descriptionText = qsTr("All users with whom you shared a connection will no longer be able to connect to it")
                     questionDrawer.yesButtonText = qsTr("Continue")
                     questionDrawer.noButtonText = qsTr("Cancel")
 
diff --git a/client/ui/qml/Pages2/PageSettingsServerProtocol.qml b/client/ui/qml/Pages2/PageSettingsServerProtocol.qml
index f1f067c2..2163a71c 100644
--- a/client/ui/qml/Pages2/PageSettingsServerProtocol.qml
+++ b/client/ui/qml/Pages2/PageSettingsServerProtocol.qml
@@ -114,6 +114,7 @@ PageType {
 
                 clickedFunction: function() {
                     questionDrawer.headerText = qsTr("Remove ") + ContainersModel.getCurrentlyProcessedContainerName() + qsTr(" from server?")
+                    questionDrawer.descriptionText = qsTr("All users with whom you shared a connection will no longer be able to connect to it")
                     questionDrawer.yesButtonText = qsTr("Continue")
                     questionDrawer.noButtonText = qsTr("Cancel")
 
diff --git a/client/ui/qml/main2.qml b/client/ui/qml/main2.qml
index d3c3aa1b..e78f35a2 100644
--- a/client/ui/qml/main2.qml
+++ b/client/ui/qml/main2.qml
@@ -15,6 +15,8 @@ Window  {
     height: GC.screenHeight
     minimumWidth: GC.isDesktop() ? 360 : 0
     minimumHeight: GC.isDesktop() ? 640 : 0
+    maximumWidth: 600
+    maximumHeight: 800
 
     color: "#0E0E11"
 

From 195a3ab170eb23e749cf1edf7f257d6867371c97 Mon Sep 17 00:00:00 2001
From: Mykola Baibuz <mykola.baibuz@gmail.com>
Date: Fri, 1 Sep 2023 17:29:48 +0300
Subject: [PATCH 089/278] Save files for iOS

---
 client/fileUtilites.cpp                             | 5 +++--
 client/platforms/ios/QtAppDelegate-C-Interface.h    | 2 --
 client/platforms/ios/QtAppDelegate.h                | 2 --
 client/ui/qml/Components/ShareConnectionDrawer.qml  | 8 +++++++-
 client/ui/qml/Pages2/PageSettingsLogging.qml        | 8 +++++++-
 client/ui/qml/Pages2/PageSettingsSplitTunneling.qml | 6 +++++-
 6 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/client/fileUtilites.cpp b/client/fileUtilites.cpp
index 9cbc5a10..301344a7 100644
--- a/client/fileUtilites.cpp
+++ b/client/fileUtilites.cpp
@@ -24,7 +24,8 @@ void FileUtilites::saveFile(QString fileName, const QString &data)
 #endif
 
 #ifdef Q_OS_IOS
-    QFile file(fileName);
+    QUrl fileUrl = QDir::tempPath() + "/" + fileName;
+    QFile file(fileUrl.toString());
 #else
     QUrl fileUrl = QUrl(fileName);
     QFile file(fileUrl.toLocalFile());
@@ -37,7 +38,7 @@ void FileUtilites::saveFile(QString fileName, const QString &data)
 
 #ifdef Q_OS_IOS
     QStringList filesToSend;
-    filesToSend.append(fileName);
+    filesToSend.append(fileUrl.toString());
     MobileUtils::shareText(filesToSend);
     return;
 #else
diff --git a/client/platforms/ios/QtAppDelegate-C-Interface.h b/client/platforms/ios/QtAppDelegate-C-Interface.h
index 39adbb92..dd358097 100644
--- a/client/platforms/ios/QtAppDelegate-C-Interface.h
+++ b/client/platforms/ios/QtAppDelegate-C-Interface.h
@@ -1,8 +1,6 @@
 #ifndef QTAPPDELEGATECINTERFACE_H
 #define QTAPPDELEGATECINTERFACE_H
 
-#include "ui/controllers/importController.h"
-
 void QtAppDelegateInitialize();
 
 #endif // QTAPPDELEGATECINTERFACE_H
diff --git a/client/platforms/ios/QtAppDelegate.h b/client/platforms/ios/QtAppDelegate.h
index cd8bae27..5148c2ca 100644
--- a/client/platforms/ios/QtAppDelegate.h
+++ b/client/platforms/ios/QtAppDelegate.h
@@ -1,6 +1,4 @@
 #import <UIKit/UIKit.h>
 
-#include "ui/controllers/importController.h"
-
 @interface QtAppDelegate : UIResponder <UIApplicationDelegate>
 @end
diff --git a/client/ui/qml/Components/ShareConnectionDrawer.qml b/client/ui/qml/Components/ShareConnectionDrawer.qml
index 41dd2ab2..8f4498a9 100644
--- a/client/ui/qml/Components/ShareConnectionDrawer.qml
+++ b/client/ui/qml/Components/ShareConnectionDrawer.qml
@@ -69,7 +69,13 @@ DrawerType {
                     text: qsTr("Share")
                     imageSource: "qrc:/images/controls/share-2.svg"
 
-                    onClicked: fileDialog.open()
+                    onClicked: {
+                        if (Qt.platform.os === "ios") {
+                            ExportController.saveFile("amnezia_config.vpn")
+                        } else {
+                            fileDialog.open()
+                        }
+                    }
 
                     FileDialog {
                         id: fileDialog
diff --git a/client/ui/qml/Pages2/PageSettingsLogging.qml b/client/ui/qml/Pages2/PageSettingsLogging.qml
index cfe7d7c9..0e4e486e 100644
--- a/client/ui/qml/Pages2/PageSettingsLogging.qml
+++ b/client/ui/qml/Pages2/PageSettingsLogging.qml
@@ -100,7 +100,13 @@ PageType {
 
                         image: "qrc:/images/controls/save.svg"
 
-                        onClicked: fileDialog.open()
+                        onClicked: {
+                            if (Qt.platform.os === "ios") {
+                                SettingsController.exportLogsFile("AmneziaVPN.log")
+                            } else {
+                                fileDialog.open()
+                            }
+                        }
 
                         FileDialog {
                             id: fileDialog
diff --git a/client/ui/qml/Pages2/PageSettingsSplitTunneling.qml b/client/ui/qml/Pages2/PageSettingsSplitTunneling.qml
index e074b4ce..898ce17b 100644
--- a/client/ui/qml/Pages2/PageSettingsSplitTunneling.qml
+++ b/client/ui/qml/Pages2/PageSettingsSplitTunneling.qml
@@ -302,7 +302,11 @@ PageType {
                     text: qsTr("Save site list")
 
                     clickedFunction: function() {
-                        saveFileDialog.open()
+                        if (Qt.platform.os === "ios") {
+                            ExportController.saveFile("amezia_tunnel.json")
+                        } else {
+                            saveFileDialog.open()
+                        }
                     }
 
                     FileDialog {

From c4f94efe249146f675b2156745c74de3053e2d26 Mon Sep 17 00:00:00 2001
From: Mykola Baibuz <mykola.baibuz@gmail.com>
Date: Sat, 2 Sep 2023 17:04:35 -0400
Subject: [PATCH 090/278] Android fileSave fixes

---
 client/ui/qml/Components/ShareConnectionDrawer.qml  | 6 ++++--
 client/ui/qml/Pages2/PageSettingsLogging.qml        | 2 +-
 client/ui/qml/Pages2/PageSettingsSplitTunneling.qml | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/client/ui/qml/Components/ShareConnectionDrawer.qml b/client/ui/qml/Components/ShareConnectionDrawer.qml
index 8f4498a9..4971f93a 100644
--- a/client/ui/qml/Components/ShareConnectionDrawer.qml
+++ b/client/ui/qml/Components/ShareConnectionDrawer.qml
@@ -13,6 +13,8 @@ import ContainerProps 1.0
 import "./"
 import "../Controls2"
 import "../Controls2/TextTypes"
+import "../Config"
+import "../Components"
 
 DrawerType {
     id: root
@@ -70,8 +72,8 @@ DrawerType {
                     imageSource: "qrc:/images/controls/share-2.svg"
 
                     onClicked: {
-                        if (Qt.platform.os === "ios") {
-                            ExportController.saveFile("amnezia_config.vpn")
+                        if (GC.isMobile()) {
+                            ExportController.saveFile(configFileName)
                         } else {
                             fileDialog.open()
                         }
diff --git a/client/ui/qml/Pages2/PageSettingsLogging.qml b/client/ui/qml/Pages2/PageSettingsLogging.qml
index 0e4e486e..bab36c4c 100644
--- a/client/ui/qml/Pages2/PageSettingsLogging.qml
+++ b/client/ui/qml/Pages2/PageSettingsLogging.qml
@@ -101,7 +101,7 @@ PageType {
                         image: "qrc:/images/controls/save.svg"
 
                         onClicked: {
-                            if (Qt.platform.os === "ios") {
+                            if (GC.isMobile()) {
                                 SettingsController.exportLogsFile("AmneziaVPN.log")
                             } else {
                                 fileDialog.open()
diff --git a/client/ui/qml/Pages2/PageSettingsSplitTunneling.qml b/client/ui/qml/Pages2/PageSettingsSplitTunneling.qml
index 898ce17b..0c2ebdfa 100644
--- a/client/ui/qml/Pages2/PageSettingsSplitTunneling.qml
+++ b/client/ui/qml/Pages2/PageSettingsSplitTunneling.qml
@@ -302,7 +302,7 @@ PageType {
                     text: qsTr("Save site list")
 
                     clickedFunction: function() {
-                        if (Qt.platform.os === "ios") {
+                        if (GC.isMobile()) {
                             ExportController.saveFile("amezia_tunnel.json")
                         } else {
                             saveFileDialog.open()

From 7eaaef6e7509a09d9575ebc08b05ae4f3abc1a17 Mon Sep 17 00:00:00 2001
From: Mykola Baibuz <mykola.baibuz@gmail.com>
Date: Sun, 3 Sep 2023 23:18:08 +0300
Subject: [PATCH 091/278] Connection button status change for background start

---
 client/platforms/ios/ios_controller.mm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/client/platforms/ios/ios_controller.mm b/client/platforms/ios/ios_controller.mm
index 6f23ac81..af0d7100 100644
--- a/client/platforms/ios/ios_controller.mm
+++ b/client/platforms/ios/ios_controller.mm
@@ -98,6 +98,7 @@ bool IosController::initialize()
                 if (manager.connection.status == NEVPNStatusConnected) {
                     m_currentTunnel = manager;
                     qDebug() << "IosController::initialize : VPN already connected";
+                    emit connectionStateChanged(Vpn::ConnectionState::Connected);
                     break;
 
                     // TODO: show connected state

From 4ab006f065c63bf02a86c6caafd5c92ad7d6162c Mon Sep 17 00:00:00 2001
From: "vladimir.kuznetsov" <nethiuswork@gmail.com>
Date: Wed, 6 Sep 2023 13:37:37 +0500
Subject: [PATCH 092/278] added swipe up for menu on PageHome

---
 client/ui/controllers/pageController.h        |  2 ++
 .../ConnectionTypeSelectionDrawer.qml         |  4 +--
 .../qml/Components/HomeContainersListView.qml |  2 +-
 .../Components/SettingsContainersListView.qml | 16 +++++-----
 client/ui/qml/Controls2/BackButtonType.qml    |  2 +-
 client/ui/qml/Controls2/DrawerType.qml        |  1 +
 client/ui/qml/Controls2/PageType.qml          | 32 ++++---------------
 client/ui/qml/Pages2/PageHome.qml             | 11 +++++--
 .../Pages2/PageProtocolOpenVpnSettings.qml    |  2 +-
 client/ui/qml/Pages2/PageProtocolRaw.qml      |  2 +-
 .../ui/qml/Pages2/PageServiceSftpSettings.qml |  2 +-
 .../Pages2/PageServiceTorWebsiteSettings.qml  |  2 +-
 client/ui/qml/Pages2/PageSettings.qml         | 10 +++---
 .../ui/qml/Pages2/PageSettingsApplication.qml |  2 +-
 .../ui/qml/Pages2/PageSettingsConnection.qml  |  4 +--
 .../ui/qml/Pages2/PageSettingsServerData.qml  | 12 +++----
 .../qml/Pages2/PageSettingsServerProtocol.qml |  4 +--
 .../ui/qml/Pages2/PageSettingsServersList.qml |  2 +-
 .../Pages2/PageSetupWizardConfigSource.qml    | 10 +++---
 .../qml/Pages2/PageSetupWizardCredentials.qml |  2 +-
 client/ui/qml/Pages2/PageSetupWizardEasy.qml  |  6 ++--
 .../qml/Pages2/PageSetupWizardInstalling.qml  | 16 +++++-----
 .../PageSetupWizardProtocolSettings.qml       |  2 +-
 .../qml/Pages2/PageSetupWizardProtocols.qml   |  2 +-
 client/ui/qml/Pages2/PageSetupWizardStart.qml |  2 +-
 .../ui/qml/Pages2/PageSetupWizardTextKey.qml  |  2 +-
 .../qml/Pages2/PageSetupWizardViewConfig.qml  |  6 ++--
 client/ui/qml/Pages2/PageStart.qml            | 15 +++++++++
 28 files changed, 90 insertions(+), 85 deletions(-)

diff --git a/client/ui/controllers/pageController.h b/client/ui/controllers/pageController.h
index 1dd16090..8d3da507 100644
--- a/client/ui/controllers/pageController.h
+++ b/client/ui/controllers/pageController.h
@@ -79,6 +79,8 @@ public slots:
     void showOnStartup();
 
 signals:
+    void goToPage(PageLoader::PageEnum page, bool slide = true);
+    void goToStartPage();
     void goToPageHome();
     void goToPageSettings();
     void goToPageViewConfig();
diff --git a/client/ui/qml/Components/ConnectionTypeSelectionDrawer.qml b/client/ui/qml/Components/ConnectionTypeSelectionDrawer.qml
index 8b377600..ecde1554 100644
--- a/client/ui/qml/Components/ConnectionTypeSelectionDrawer.qml
+++ b/client/ui/qml/Components/ConnectionTypeSelectionDrawer.qml
@@ -41,7 +41,7 @@ DrawerType {
             rightImageSource: "qrc:/images/controls/chevron-right.svg"
 
             clickedFunction: function() {
-                goToPage(PageEnum.PageSetupWizardCredentials)
+                PageController.goToPage(PageEnum.PageSetupWizardCredentials)
                 root.visible = false
             }
         }
@@ -55,7 +55,7 @@ DrawerType {
             rightImageSource: "qrc:/images/controls/chevron-right.svg"
 
             clickedFunction: function() {
-                goToPage(PageEnum.PageSetupWizardConfigSource)
+                PageController.goToPage(PageEnum.PageSetupWizardConfigSource)
                 root.visible = false
             }
         }
diff --git a/client/ui/qml/Components/HomeContainersListView.qml b/client/ui/qml/Components/HomeContainersListView.qml
index fc4dd8b3..f5d27c00 100644
--- a/client/ui/qml/Components/HomeContainersListView.qml
+++ b/client/ui/qml/Components/HomeContainersListView.qml
@@ -67,7 +67,7 @@ ListView {
                     } else {
                         ContainersModel.setCurrentlyProcessedContainerIndex(proxyContainersModel.mapToSource(index))
                         InstallController.setShouldCreateServer(false)
-                        goToPage(PageEnum.PageSetupWizardProtocolSettings)
+                        PageController.goToPage(PageEnum.PageSetupWizardProtocolSettings)
                         containersDropDown.menuVisible = false
                         menu.visible = false
                     }
diff --git a/client/ui/qml/Components/SettingsContainersListView.qml b/client/ui/qml/Components/SettingsContainersListView.qml
index 2489323b..a0c74a04 100644
--- a/client/ui/qml/Components/SettingsContainersListView.qml
+++ b/client/ui/qml/Components/SettingsContainersListView.qml
@@ -45,44 +45,44 @@ ListView {
 
                         if (config[ContainerProps.containerTypeToString(containerIndex)]["isThirdPartyConfig"]) {
                             ProtocolsModel.updateModel(config)
-                            goToPage(PageEnum.PageProtocolRaw)
+                            PageController.goToPage(PageEnum.PageProtocolRaw)
                             return
                         }
 
                         switch (containerIndex) {
                         case ContainerEnum.OpenVpn: {
                             OpenVpnConfigModel.updateModel(config)
-                            goToPage(PageEnum.PageProtocolOpenVpnSettings)
+                            PageController.goToPage(PageEnum.PageProtocolOpenVpnSettings)
                             break
                         }
                         case ContainerEnum.WireGuard: {
                             ProtocolsModel.updateModel(config)
-                            goToPage(PageEnum.PageProtocolRaw)
+                            PageController.goToPage(PageEnum.PageProtocolRaw)
     //                        WireGuardConfigModel.updateModel(config)
     //                        goToPage(PageEnum.PageProtocolWireGuardSettings)
                             break
                         }
                         case ContainerEnum.Ipsec: {
                             ProtocolsModel.updateModel(config)
-                            goToPage(PageEnum.PageProtocolRaw)
+                            PageController.goToPage(PageEnum.PageProtocolRaw)
     //                        Ikev2ConfigModel.updateModel(config)
     //                        goToPage(PageEnum.PageProtocolIKev2Settings)
                             break
                         }
                         case ContainerEnum.Sftp: {
                             SftpConfigModel.updateModel(config)
-                            goToPage(PageEnum.PageServiceSftpSettings)
+                            PageController.goToPage(PageEnum.PageServiceSftpSettings)
                             break
                         }
                         case ContainerEnum.TorWebSite: {
-                            goToPage(PageEnum.PageServiceTorWebsiteSettings)
+                            PageController.goToPage(PageEnum.PageServiceTorWebsiteSettings)
                             break
                         }
 
                         default: {
                             if (serviceType !== ProtocolEnum.Other) { //todo disable settings for dns container
                                 ProtocolsModel.updateModel(config)
-                                goToPage(PageEnum.PageSettingsServerProtocol)
+                                PageController.goToPage(PageEnum.PageSettingsServerProtocol)
                             }
                         }
                         }
@@ -90,7 +90,7 @@ ListView {
                     } else {
                         ContainersModel.setCurrentlyProcessedContainerIndex(root.model.mapToSource(index))
                         InstallController.setShouldCreateServer(false)
-                        goToPage(PageEnum.PageSetupWizardProtocolSettings)
+                        PageController.goToPage(PageEnum.PageSetupWizardProtocolSettings)
                     }
                 }
 
diff --git a/client/ui/qml/Controls2/BackButtonType.qml b/client/ui/qml/Controls2/BackButtonType.qml
index 91f5f28f..67ffbd9c 100644
--- a/client/ui/qml/Controls2/BackButtonType.qml
+++ b/client/ui/qml/Controls2/BackButtonType.qml
@@ -27,7 +27,7 @@ Item {
                 if (backButtonFunction && typeof backButtonFunction === "function") {
                     backButtonFunction()
                 } else {
-                    closePage()
+                    PageController.closePage()
                 }
             }
         }
diff --git a/client/ui/qml/Controls2/DrawerType.qml b/client/ui/qml/Controls2/DrawerType.qml
index 97fbf034..35d03449 100644
--- a/client/ui/qml/Controls2/DrawerType.qml
+++ b/client/ui/qml/Controls2/DrawerType.qml
@@ -6,6 +6,7 @@ Drawer {
 
     clip: true
     modal: true
+    dragMargin: -10
 
     enter: Transition {
         SmoothedAnimation {
diff --git a/client/ui/qml/Controls2/PageType.qml b/client/ui/qml/Controls2/PageType.qml
index cb6fa142..193fbcf2 100644
--- a/client/ui/qml/Controls2/PageType.qml
+++ b/client/ui/qml/Controls2/PageType.qml
@@ -7,35 +7,15 @@ Item {
 
     property StackView stackView: StackView.view
 
-    function goToPage(page, slide = true) {
-        var pagePath = PageController.getPagePath(page)
-        if (slide) {
-            root.stackView.push(pagePath, { "objectName" : pagePath }, StackView.PushTransition)
-        } else {
-            root.stackView.push(pagePath, { "objectName" : pagePath }, StackView.Immediate)
-        }
-    }
-
-    function closePage() {
-        if (root.stackView.depth <= 1) {
-            return
-        }
-        root.stackView.pop()
-    }
-
-    function goToStartPage() {
-        while (root.stackView.depth > 1) {
-            root.stackView.pop()
-        }
-    }
-
     MouseArea {
-        z: -1
+        z: 99
         anchors.fill: parent
 
-        onClicked: {
-            console.log("base mouse area pressed")
-            focus = true
+        enabled: true
+
+        onPressed: function(mouse) {
+            forceActiveFocus()
+            mouse.accepted = false
         }
     }
 }
diff --git a/client/ui/qml/Pages2/PageHome.qml b/client/ui/qml/Pages2/PageHome.qml
index d40f8748..0c778215 100644
--- a/client/ui/qml/Pages2/PageHome.qml
+++ b/client/ui/qml/Pages2/PageHome.qml
@@ -26,11 +26,15 @@ PageType {
     property string defaultServerHostName: ServersModel.defaultServerHostName
     property string defaultContainerName: ContainersModel.defaultContainerName
 
-    ConnectButton {
+    Item {
         anchors.top: parent.top
         anchors.bottom: buttonBackground.top
         anchors.right: parent.right
         anchors.left: parent.left
+
+        ConnectButton {
+            anchors.centerIn: parent
+        }
     }
 
     Connections {
@@ -125,6 +129,9 @@ PageType {
     DrawerType {
         id: menu
 
+        interactive: true
+        dragMargin: buttonBackground.height + 56 // page start tabBar height
+
         width: parent.width
         height: parent.height * 0.9
 
@@ -320,7 +327,7 @@ PageType {
 
                                     onClicked: function() {
                                         ServersModel.currentlyProcessedIndex = index
-                                        goToPage(PageEnum.PageSettingsServerInfo)
+                                        PageController.goToPage(PageEnum.PageSettingsServerInfo)
                                         menu.visible = false
                                     }
                                 }
diff --git a/client/ui/qml/Pages2/PageProtocolOpenVpnSettings.qml b/client/ui/qml/Pages2/PageProtocolOpenVpnSettings.qml
index 607b6584..aed1dbc1 100644
--- a/client/ui/qml/Pages2/PageProtocolOpenVpnSettings.qml
+++ b/client/ui/qml/Pages2/PageProtocolOpenVpnSettings.qml
@@ -368,7 +368,7 @@ PageType {
 
                                 questionDrawer.yesButtonFunction = function() {
                                     questionDrawer.visible = false
-                                    goToPage(PageEnum.PageDeinstalling)
+                                    PageController.goToPage(PageEnum.PageDeinstalling)
                                     InstallController.removeCurrentlyProcessedContainer()
                                 }
                                 questionDrawer.noButtonFunction = function() {
diff --git a/client/ui/qml/Pages2/PageProtocolRaw.qml b/client/ui/qml/Pages2/PageProtocolRaw.qml
index 4c155d61..8bbfab14 100644
--- a/client/ui/qml/Pages2/PageProtocolRaw.qml
+++ b/client/ui/qml/Pages2/PageProtocolRaw.qml
@@ -180,7 +180,7 @@ PageType {
 
                     questionDrawer.yesButtonFunction = function() {
                         questionDrawer.visible = false
-                        goToPage(PageEnum.PageDeinstalling)
+                        PageController.goToPage(PageEnum.PageDeinstalling)
                         InstallController.removeCurrentlyProcessedContainer()
                     }
                     questionDrawer.noButtonFunction = function() {
diff --git a/client/ui/qml/Pages2/PageServiceSftpSettings.qml b/client/ui/qml/Pages2/PageServiceSftpSettings.qml
index 5eb288f8..fead034b 100644
--- a/client/ui/qml/Pages2/PageServiceSftpSettings.qml
+++ b/client/ui/qml/Pages2/PageServiceSftpSettings.qml
@@ -259,7 +259,7 @@ PageType {
 
                                 questionDrawer.yesButtonFunction = function() {
                                     questionDrawer.visible = false
-                                    goToPage(PageEnum.PageDeinstalling)
+                                    PageController.goToPage(PageEnum.PageDeinstalling)
                                     InstallController.removeCurrentlyProcessedContainer()
                                 }
                                 questionDrawer.noButtonFunction = function() {
diff --git a/client/ui/qml/Pages2/PageServiceTorWebsiteSettings.qml b/client/ui/qml/Pages2/PageServiceTorWebsiteSettings.qml
index 38490375..04d7076c 100644
--- a/client/ui/qml/Pages2/PageServiceTorWebsiteSettings.qml
+++ b/client/ui/qml/Pages2/PageServiceTorWebsiteSettings.qml
@@ -144,7 +144,7 @@ PageType {
 
                     questionDrawer.yesButtonFunction = function() {
                         questionDrawer.visible = false
-                        goToPage(PageEnum.PageDeinstalling)
+                        PageController.goToPage(PageEnum.PageDeinstalling)
                         InstallController.removeCurrentlyProcessedContainer()
                     }
                     questionDrawer.noButtonFunction = function() {
diff --git a/client/ui/qml/Pages2/PageSettings.qml b/client/ui/qml/Pages2/PageSettings.qml
index 6c088a70..e020dc2c 100644
--- a/client/ui/qml/Pages2/PageSettings.qml
+++ b/client/ui/qml/Pages2/PageSettings.qml
@@ -46,7 +46,7 @@ PageType {
                 leftImageSource: "qrc:/images/controls/server.svg"
 
                 clickedFunction: function() {
-                    goToPage(PageEnum.PageSettingsServersList)
+                    PageController.goToPage(PageEnum.PageSettingsServersList)
                 }
             }
 
@@ -60,7 +60,7 @@ PageType {
                 leftImageSource: "qrc:/images/controls/radio.svg"
 
                 clickedFunction: function() {
-                    goToPage(PageEnum.PageSettingsConnection)
+                    PageController.goToPage(PageEnum.PageSettingsConnection)
                 }
             }
 
@@ -74,7 +74,7 @@ PageType {
                 leftImageSource: "qrc:/images/controls/app.svg"
 
                 clickedFunction: function() {
-                    goToPage(PageEnum.PageSettingsApplication)
+                    PageController.goToPage(PageEnum.PageSettingsApplication)
                 }
             }
 
@@ -88,7 +88,7 @@ PageType {
                 leftImageSource: "qrc:/images/controls/save.svg"
 
                 clickedFunction: function() {
-                    goToPage(PageEnum.PageSettingsBackup)
+                    PageController.goToPage(PageEnum.PageSettingsBackup)
                 }
             }
 
@@ -102,7 +102,7 @@ PageType {
                 leftImageSource: "qrc:/images/controls/amnezia.svg"
 
                 clickedFunction: function() {
-                    goToPage(PageEnum.PageSettingsAbout)
+                    PageController.goToPage(PageEnum.PageSettingsAbout)
                 }
             }
 
diff --git a/client/ui/qml/Pages2/PageSettingsApplication.qml b/client/ui/qml/Pages2/PageSettingsApplication.qml
index 7b628037..6f5e48a2 100644
--- a/client/ui/qml/Pages2/PageSettingsApplication.qml
+++ b/client/ui/qml/Pages2/PageSettingsApplication.qml
@@ -112,7 +112,7 @@ PageType {
                 rightImageSource: "qrc:/images/controls/chevron-right.svg"
 
                 clickedFunction: function() {
-                    goToPage(PageEnum.PageSettingsLogging)
+                    PageController.goToPage(PageEnum.PageSettingsLogging)
                 }
             }
 
diff --git a/client/ui/qml/Pages2/PageSettingsConnection.qml b/client/ui/qml/Pages2/PageSettingsConnection.qml
index 0692abda..78d4a681 100644
--- a/client/ui/qml/Pages2/PageSettingsConnection.qml
+++ b/client/ui/qml/Pages2/PageSettingsConnection.qml
@@ -86,7 +86,7 @@ PageType {
                 rightImageSource: "qrc:/images/controls/chevron-right.svg"
 
                 clickedFunction: function() {
-                    goToPage(PageEnum.PageSettingsDns)
+                    PageController.goToPage(PageEnum.PageSettingsDns)
                 }
             }
 
@@ -100,7 +100,7 @@ PageType {
                 rightImageSource: "qrc:/images/controls/chevron-right.svg"
 
                 clickedFunction: function() {
-                    goToPage(PageEnum.PageSettingsSplitTunneling)
+                    PageController.goToPage(PageEnum.PageSettingsSplitTunneling)
                 }
             }
 
diff --git a/client/ui/qml/Pages2/PageSettingsServerData.qml b/client/ui/qml/Pages2/PageSettingsServerData.qml
index 8ae90351..3eb07ce9 100644
--- a/client/ui/qml/Pages2/PageSettingsServerData.qml
+++ b/client/ui/qml/Pages2/PageSettingsServerData.qml
@@ -32,20 +32,20 @@ PageType {
             if (!ServersModel.getServersCount()) {
                 PageController.replaceStartPage()
             } else {
-                goToStartPage()
-                goToPage(PageEnum.PageSettingsServersList)
+                PageController.goToStartPage()
+                PageController.goToPage(PageEnum.PageSettingsServersList)
             }
             PageController.showNotificationMessage(finishedMessage)
         }
 
         function onRemoveAllContainersFinished(finishedMessage) {
-            closePage() // close deInstalling page
+            PageController.closePage() // close deInstalling page
             PageController.showNotificationMessage(finishedMessage)
         }
 
         function onRemoveCurrentlyProcessedContainerFinished(finishedMessage) {
-            closePage() // close deInstalling page
-            closePage() // close page with remove button
+            PageController.closePage() // close deInstalling page
+            PageController.closePage() // close page with remove button
             PageController.showNotificationMessage(finishedMessage)
         }
     }
@@ -173,7 +173,7 @@ PageType {
 
                     questionDrawer.yesButtonFunction = function() {
                         questionDrawer.visible = false
-                        goToPage(PageEnum.PageDeinstalling)
+                        PageController.goToPage(PageEnum.PageDeinstalling)
                         if (ServersModel.isDefaultServerCurrentlyProcessed() && ConnectionController.isConnected) {
                             ConnectionController.closeConnection()
                         }
diff --git a/client/ui/qml/Pages2/PageSettingsServerProtocol.qml b/client/ui/qml/Pages2/PageSettingsServerProtocol.qml
index 2163a71c..14d34590 100644
--- a/client/ui/qml/Pages2/PageSettingsServerProtocol.qml
+++ b/client/ui/qml/Pages2/PageSettingsServerProtocol.qml
@@ -87,7 +87,7 @@ PageType {
                                 case ProtocolEnum.WireGuard: WireGuardConfigModel.updateModel(ProtocolsModel.getConfig()); break;
                                 case ProtocolEnum.Ipsec: Ikev2ConfigModel.updateModel(ProtocolsModel.getConfig()); break;
                                 }
-                                goToPage(protocolPage);
+                                PageController.goToPage(protocolPage);
                             }
 
                             MouseArea {
@@ -120,7 +120,7 @@ PageType {
 
                     questionDrawer.yesButtonFunction = function() {
                         questionDrawer.visible = false
-                        goToPage(PageEnum.PageDeinstalling)
+                        PageController.goToPage(PageEnum.PageDeinstalling)
                         InstallController.removeCurrentlyProcessedContainer()
                     }
                     questionDrawer.noButtonFunction = function() {
diff --git a/client/ui/qml/Pages2/PageSettingsServersList.qml b/client/ui/qml/Pages2/PageSettingsServersList.qml
index 40e51e9e..c0807f35 100644
--- a/client/ui/qml/Pages2/PageSettingsServersList.qml
+++ b/client/ui/qml/Pages2/PageSettingsServersList.qml
@@ -98,7 +98,7 @@ PageType {
 
                             clickedFunction: function() {
                                 ServersModel.currentlyProcessedIndex = index
-                                goToPage(PageEnum.PageSettingsServerInfo)
+                                PageController.goToPage(PageEnum.PageSettingsServerInfo)
                             }
                         }
 
diff --git a/client/ui/qml/Pages2/PageSetupWizardConfigSource.qml b/client/ui/qml/Pages2/PageSetupWizardConfigSource.qml
index 6362ca6d..c0ad6249 100644
--- a/client/ui/qml/Pages2/PageSetupWizardConfigSource.qml
+++ b/client/ui/qml/Pages2/PageSetupWizardConfigSource.qml
@@ -17,8 +17,8 @@ PageType {
         target: ImportController
 
         function onQrDecodingFinished() {
-            closePage()
-            goToPage(PageEnum.PageSetupWizardViewConfig)
+            PageController.closePage()
+            PageController.goToPage(PageEnum.PageSetupWizardViewConfig)
         }
     }
 
@@ -84,7 +84,7 @@ It's okay as long as it's from someone you trust.")
                             PageController.showBusyIndicator(false)
                         } else {
                             ImportController.extractConfigFromFile(fileDialog.selectedFile.toString())
-                            goToPage(PageEnum.PageSetupWizardViewConfig)
+                            PageController.goToPage(PageEnum.PageSetupWizardViewConfig)
                         }
                     }
                 }
@@ -103,7 +103,7 @@ It's okay as long as it's from someone you trust.")
                 clickedFunction: function() {
                     ImportController.startDecodingQr()
                     if (Qt.platform.os === "ios") {
-                        goToPage(PageEnum.PageSetupWizardQrReader)
+                        PageController.goToPage(PageEnum.PageSetupWizardQrReader)
                     }
                 }
             }
@@ -120,7 +120,7 @@ It's okay as long as it's from someone you trust.")
                 leftImageSource: "qrc:/images/controls/text-cursor.svg"
 
                 clickedFunction: function() {
-                    goToPage(PageEnum.PageSetupWizardTextKey)
+                    PageController.goToPage(PageEnum.PageSetupWizardTextKey)
                 }
             }
 
diff --git a/client/ui/qml/Pages2/PageSetupWizardCredentials.qml b/client/ui/qml/Pages2/PageSetupWizardCredentials.qml
index d089a70d..bc24c196 100644
--- a/client/ui/qml/Pages2/PageSetupWizardCredentials.qml
+++ b/client/ui/qml/Pages2/PageSetupWizardCredentials.qml
@@ -104,7 +104,7 @@ PageType {
                         return
                     }
 
-                    goToPage(PageEnum.PageSetupWizardEasy)
+                    PageController.goToPage(PageEnum.PageSetupWizardEasy)
                 }
             }
         }
diff --git a/client/ui/qml/Pages2/PageSetupWizardEasy.qml b/client/ui/qml/Pages2/PageSetupWizardEasy.qml
index 375a8332..6fdc4b3e 100644
--- a/client/ui/qml/Pages2/PageSetupWizardEasy.qml
+++ b/client/ui/qml/Pages2/PageSetupWizardEasy.qml
@@ -159,12 +159,12 @@ PageType {
                 onClicked: function() {
                     if (root.isEasySetup) {
                         ContainersModel.setCurrentlyProcessedContainerIndex(containers.dockerContainer)
-                        goToPage(PageEnum.PageSetupWizardInstalling)
+                        PageController.goToPage(PageEnum.PageSetupWizardInstalling)
                         InstallController.install(containers.dockerContainer,
                                                   containers.containerDefaultPort,
                                                   containers.containerDefaultTransportProto)
                     } else {
-                        goToPage(PageEnum.PageSetupWizardProtocols)
+                        PageController.goToPage(PageEnum.PageSetupWizardProtocols)
                     }
                 }
             }
@@ -186,7 +186,7 @@ PageType {
                 text: qsTr("Set up later")
 
                 onClicked: function() {
-                    goToPage(PageEnum.PageSetupWizardInstalling)
+                    PageController.goToPage(PageEnum.PageSetupWizardInstalling)
                     InstallController.addEmptyServer()
                 }
             }
diff --git a/client/ui/qml/Pages2/PageSetupWizardInstalling.qml b/client/ui/qml/Pages2/PageSetupWizardInstalling.qml
index 20c589ee..f2919398 100644
--- a/client/ui/qml/Pages2/PageSetupWizardInstalling.qml
+++ b/client/ui/qml/Pages2/PageSetupWizardInstalling.qml
@@ -24,28 +24,28 @@ PageType {
         target: InstallController
 
         function onInstallContainerFinished(finishedMessage, isServiceInstall) {
-            goToStartPage()
+            PageController.goToStartPage()
             if (stackView.currentItem.objectName === PageController.getPagePath(PageEnum.PageHome)) {
                 PageController.restorePageHomeState(true)
             } else if (stackView.currentItem.objectName === PageController.getPagePath(PageEnum.PageSettings)) {
-                goToPage(PageEnum.PageSettingsServersList, false)
-                goToPage(PageEnum.PageSettingsServerInfo, false)
+                PageController.goToPage(PageEnum.PageSettingsServersList, false)
+                PageController.goToPage(PageEnum.PageSettingsServerInfo, false)
                 if (isServiceInstall) {
                     PageController.goToPageSettingsServerServices()
                 }
             } else {
-                goToPage(PageEnum.PageHome)
+                PageController.goToPage(PageEnum.PageHome)
             }
 
             PageController.showNotificationMessage(finishedMessage)
         }
 
         function onInstallServerFinished(finishedMessage) {
-            goToStartPage()
+            PageController.goToStartPage()
             if (stackView.currentItem.objectName === PageController.getPagePath(PageEnum.PageHome)) {
                 PageController.restorePageHomeState()
             } else if (stackView.currentItem.objectName === PageController.getPagePath(PageEnum.PageSettings)) {
-                goToPage(PageEnum.PageSettingsServersList, false)
+                PageController.goToPage(PageEnum.PageSettingsServersList, false)
             } else {
                 PageController.replaceStartPage()
             }
@@ -54,9 +54,9 @@ PageType {
         }
 
         function onServerAlreadyExists(serverIndex) {
-            goToStartPage()
+            PageController.goToStartPage()
             ServersModel.currentlyProcessedIndex = serverIndex
-            goToPage(PageEnum.PageSettingsServerInfo, false)
+            PageController.goToPage(PageEnum.PageSettingsServerInfo, false)
 
             PageController.showErrorMessage(qsTr("The server has already been added to the application"))
         }
diff --git a/client/ui/qml/Pages2/PageSetupWizardProtocolSettings.qml b/client/ui/qml/Pages2/PageSetupWizardProtocolSettings.qml
index d64fa097..6552d873 100644
--- a/client/ui/qml/Pages2/PageSetupWizardProtocolSettings.qml
+++ b/client/ui/qml/Pages2/PageSetupWizardProtocolSettings.qml
@@ -229,7 +229,7 @@ PageType {
                             text: qsTr("Install")
 
                             onClicked: function() {
-                                goToPage(PageEnum.PageSetupWizardInstalling);
+                                PageController.goToPage(PageEnum.PageSetupWizardInstalling);
                                 InstallController.install(dockerContainer, port.textFieldText, transportProtoSelector.currentIndex)
                             }
                         }
diff --git a/client/ui/qml/Pages2/PageSetupWizardProtocols.qml b/client/ui/qml/Pages2/PageSetupWizardProtocols.qml
index 8c7f5de0..71b33eb0 100644
--- a/client/ui/qml/Pages2/PageSetupWizardProtocols.qml
+++ b/client/ui/qml/Pages2/PageSetupWizardProtocols.qml
@@ -105,7 +105,7 @@ PageType {
 
                             clickedFunction: function() {
                                 ContainersModel.setCurrentlyProcessedContainerIndex(proxyContainersModel.mapToSource(index))
-                                goToPage(PageEnum.PageSetupWizardProtocolSettings)
+                                PageController.goToPage(PageEnum.PageSetupWizardProtocolSettings)
                             }
                         }
 
diff --git a/client/ui/qml/Pages2/PageSetupWizardStart.qml b/client/ui/qml/Pages2/PageSetupWizardStart.qml
index 3bc57495..2ce93e53 100644
--- a/client/ui/qml/Pages2/PageSetupWizardStart.qml
+++ b/client/ui/qml/Pages2/PageSetupWizardStart.qml
@@ -17,7 +17,7 @@ PageType {
         target: PageController
 
         function onGoToPageViewConfig() {
-            goToPage(PageEnum.PageSetupWizardViewConfig)
+            PageController.goToPage(PageEnum.PageSetupWizardViewConfig)
         }
 
         function onShowBusyIndicator(visible) {
diff --git a/client/ui/qml/Pages2/PageSetupWizardTextKey.qml b/client/ui/qml/Pages2/PageSetupWizardTextKey.qml
index 504645d1..4cdfc444 100644
--- a/client/ui/qml/Pages2/PageSetupWizardTextKey.qml
+++ b/client/ui/qml/Pages2/PageSetupWizardTextKey.qml
@@ -72,7 +72,7 @@ PageType {
 
         onClicked: function() {
             ImportController.extractConfigFromCode(textKey.textFieldText)
-            goToPage(PageEnum.PageSetupWizardViewConfig)
+            PageController.goToPage(PageEnum.PageSetupWizardViewConfig)
         }
     }
 }
diff --git a/client/ui/qml/Pages2/PageSetupWizardViewConfig.qml b/client/ui/qml/Pages2/PageSetupWizardViewConfig.qml
index 222fbd11..2f1fc392 100644
--- a/client/ui/qml/Pages2/PageSetupWizardViewConfig.qml
+++ b/client/ui/qml/Pages2/PageSetupWizardViewConfig.qml
@@ -19,16 +19,16 @@ PageType {
         target: ImportController
 
         function onImportErrorOccurred(errorMessage) {
-            closePage()
+            PageController.closePage()
             PageController.showErrorMessage(errorMessage)
         }
 
         function onImportFinished() {
-            goToStartPage()
+            PageController.goToStartPage()
             if (stackView.currentItem.objectName === PageController.getPagePath(PageEnum.PageHome)) {
                 PageController.restorePageHomeState()
             } else if (stackView.currentItem.objectName === PageController.getPagePath(PageEnum.PageSettings)) {
-                goToPage(PageEnum.PageSettingsServersList, false)
+                PageController.goToPage(PageEnum.PageSettingsServersList, false)
             } else {
                 PageController.replaceStartPage()
             }
diff --git a/client/ui/qml/Pages2/PageStart.qml b/client/ui/qml/Pages2/PageStart.qml
index e4cc02ee..31474c12 100644
--- a/client/ui/qml/Pages2/PageStart.qml
+++ b/client/ui/qml/Pages2/PageStart.qml
@@ -47,6 +47,21 @@ PageType {
             }
             tabBarStackView.pop()
         }
+
+        function onGoToPage(page, slide) {
+            var pagePath = PageController.getPagePath(page)
+            if (slide) {
+                tabBarStackView.push(pagePath, { "objectName" : pagePath }, StackView.PushTransition)
+            } else {
+                tabBarStackView.push(pagePath, { "objectName" : pagePath }, StackView.Immediate)
+            }
+        }
+
+        function onGoToStartPage() {
+            while (tabBarStackView.depth > 1) {
+                tabBarStackView.pop()
+            }
+        }
     }
 
     Connections {

From c1663278355db5cb508d64b7f5b252653eddf5a8 Mon Sep 17 00:00:00 2001
From: "vladimir.kuznetsov" <nethiuswork@gmail.com>
Date: Wed, 6 Sep 2023 22:20:59 +0500
Subject: [PATCH 093/278] filedialog for qml moved to main.qml

---
 client/amnezia_application.cpp                |   6 +
 client/amnezia_application.h                  |   2 +
 client/ui/controllers/importController.cpp    |   7 +-
 client/ui/controllers/pageController.h        |   4 +
 client/ui/controllers/systemController.cpp    | 103 ++++++++++++++++++
 client/ui/controllers/systemController.h      |  30 +++++
 client/ui/qml/Pages2/PageSettingsBackup.qml   |  14 +--
 client/ui/qml/Pages2/PageSettingsLogging.qml  |   2 +-
 .../qml/Pages2/PageSettingsSplitTunneling.qml |  28 ++---
 .../Pages2/PageSetupWizardConfigSource.qml    |  21 +---
 client/ui/qml/main2.qml                       |  48 ++++++++
 11 files changed, 213 insertions(+), 52 deletions(-)
 create mode 100644 client/ui/controllers/systemController.cpp
 create mode 100644 client/ui/controllers/systemController.h

diff --git a/client/amnezia_application.cpp b/client/amnezia_application.cpp
index f248c34f..8db6f8de 100644
--- a/client/amnezia_application.cpp
+++ b/client/amnezia_application.cpp
@@ -10,6 +10,8 @@
 #include <QTimer>
 #include <QTranslator>
 
+#include <QQuickItem>
+
 #include "logger.h"
 #include "version.h"
 
@@ -130,6 +132,7 @@ void AmneziaApplication::init()
             &ConnectionController::closeConnection);
 
     m_engine->load(url);
+    m_systemController->setQmlRoot(m_engine->rootObjects().value(0));
 
     if (m_settings->isSaveLogs()) {
         if (!Logger::init()) {
@@ -345,4 +348,7 @@ void AmneziaApplication::initControllers()
 
     m_sitesController.reset(new SitesController(m_settings, m_vpnConnection, m_sitesModel));
     m_engine->rootContext()->setContextProperty("SitesController", m_sitesController.get());
+
+    m_systemController.reset(new SystemController(m_settings));
+    m_engine->rootContext()->setContextProperty("SystemController", m_systemController.get());
 }
diff --git a/client/amnezia_application.h b/client/amnezia_application.h
index 40ea81b4..1ace6d8b 100644
--- a/client/amnezia_application.h
+++ b/client/amnezia_application.h
@@ -23,6 +23,7 @@
 #include "ui/controllers/pageController.h"
 #include "ui/controllers/settingsController.h"
 #include "ui/controllers/sitesController.h"
+#include "ui/controllers/systemController.h"
 #include "ui/models/containers_model.h"
 #include "ui/models/languageModel.h"
 #include "ui/models/protocols/cloakConfigModel.h"
@@ -114,6 +115,7 @@ private:
     QScopedPointer<ExportController> m_exportController;
     QScopedPointer<SettingsController> m_settingsController;
     QScopedPointer<SitesController> m_sitesController;
+    QScopedPointer<SystemController> m_systemController;
 };
 
 #endif // AMNEZIA_APPLICATION_H
diff --git a/client/ui/controllers/importController.cpp b/client/ui/controllers/importController.cpp
index b76302c5..c0aaeeb9 100644
--- a/client/ui/controllers/importController.cpp
+++ b/client/ui/controllers/importController.cpp
@@ -2,6 +2,7 @@
 
 #include <QFile>
 #include <QFileInfo>
+#include <QQuickItem>
 #include <QStandardPaths>
 
 #include "core/errorstrings.h"
@@ -87,7 +88,11 @@ ImportController::ImportController(const QSharedPointer<ServersModel> &serversMo
 
 void ImportController::extractConfigFromFile(const QString &fileName)
 {
-    QFile file(FileUtilites::getFileName(fileName));
+    QQuickItem *obj = findChild<QQuickItem *>("saveFileDialog");
+
+    QUrl url(fileName);
+    QString path = url.toLocalFile();
+    QFile file(path);
 
     if (file.open(QIODevice::ReadOnly)) {
         QString data = file.readAll();
diff --git a/client/ui/controllers/pageController.h b/client/ui/controllers/pageController.h
index 8d3da507..952f716c 100644
--- a/client/ui/controllers/pageController.h
+++ b/client/ui/controllers/pageController.h
@@ -103,6 +103,10 @@ signals:
     void showPassphraseRequestDrawer();
     void passphraseRequestDrawerClosed(QString passphrase);
 
+    void setupFileDialogForConfig();
+    void setupFileDialogForSites(bool replaceExistingSites);
+    void setupFileDialogForBackup();
+
 private:
     QSharedPointer<ServersModel> m_serversModel;
 
diff --git a/client/ui/controllers/systemController.cpp b/client/ui/controllers/systemController.cpp
new file mode 100644
index 00000000..a843b660
--- /dev/null
+++ b/client/ui/controllers/systemController.cpp
@@ -0,0 +1,103 @@
+#include "systemController.h"
+
+#include <QDesktopServices>
+#include <QDir>
+#include <QEventLoop>
+#include <QFile>
+#include <QFileInfo>
+#include <QQuickItem>
+#include <QStandardPaths>
+#include <QUrl>
+
+#ifdef Q_OS_ANDROID
+    #include "platforms/android/android_controller.h"
+#endif
+
+#ifdef Q_OS_IOS
+    #include "platforms/ios/MobileUtils.h"
+    #include <CoreFoundation/CoreFoundation.h>
+#endif
+
+SystemController::SystemController(const std::shared_ptr<Settings> &settings, QObject *parent)
+    : QObject(parent), m_settings(settings)
+{
+}
+
+void SystemController::saveFile(QString fileName, const QString &data)
+{
+#if defined Q_OS_ANDROID
+    AndroidController::instance()->shareConfig(data, fileName);
+    return;
+#endif
+
+#ifdef Q_OS_IOS
+    QUrl fileUrl = QDir::tempPath() + "/" + fileName;
+    QFile file(fileUrl.toString());
+#else
+    QUrl fileUrl = QUrl(fileName);
+    QFile file(fileUrl.toLocalFile());
+#endif
+
+    // todo check if save successful
+    file.open(QIODevice::WriteOnly);
+    file.write(data.toUtf8());
+    file.close();
+
+#ifdef Q_OS_IOS
+    QStringList filesToSend;
+    filesToSend.append(fileUrl.toString());
+    MobileUtils::shareText(filesToSend);
+    return;
+#else
+    QFileInfo fi(fileUrl.toLocalFile());
+    QDesktopServices::openUrl(fi.absoluteDir().absolutePath());
+#endif
+}
+
+QString SystemController::getFileName()
+{
+    auto mainFileDialog = m_qmlRoot->findChild<QObject>("mainFileDialog").parent();
+    if (!mainFileDialog) {
+        return "";
+    }
+    QMetaObject::invokeMethod(mainFileDialog, "open", Qt::DirectConnection);
+
+    QEventLoop wait;
+    QObject::connect(this, &SystemController::fileDialogAccepted, &wait, &QEventLoop::quit);
+    wait.exec();
+
+    auto fileName = mainFileDialog->property("selectedFile").toString();
+
+#ifdef Q_OS_IOS
+    CFURLRef url = CFURLCreateWithFileSystemPath(
+            kCFAllocatorDefault,
+            CFStringCreateWithCharacters(0, reinterpret_cast<const UniChar *>(fileName.unicode()), fileName.length()),
+            kCFURLPOSIXPathStyle, 0);
+
+    if (!CFURLStartAccessingSecurityScopedResource(url)) {
+        qDebug() << "Could not access path " << QUrl::fromLocalFile(fileName).toString();
+    }
+
+    return fileName;
+#endif
+
+#ifdef Q_OS_ANDROID
+    // patch for files containing spaces etc
+    const QString sep { "raw%3A%2F" };
+    if (fileName.startsWith("content://") && fileName.contains(sep)) {
+        QString contentUrl = fileName.split(sep).at(0);
+        QString rawUrl = fileName.split(sep).at(1);
+        rawUrl.replace(" ", "%20");
+        fileName = contentUrl + sep + rawUrl;
+    }
+
+    return fileName;
+#endif
+
+    return QUrl(fileName).toLocalFile();
+}
+
+void SystemController::setQmlRoot(QObject *qmlRoot)
+{
+    m_qmlRoot = qmlRoot;
+}
diff --git a/client/ui/controllers/systemController.h b/client/ui/controllers/systemController.h
new file mode 100644
index 00000000..fbcc52f1
--- /dev/null
+++ b/client/ui/controllers/systemController.h
@@ -0,0 +1,30 @@
+#ifndef SYSTEMCONTROLLER_H
+#define SYSTEMCONTROLLER_H
+
+#include <QObject>
+
+#include "settings.h"
+
+class SystemController : public QObject
+{
+    Q_OBJECT
+public:
+    explicit SystemController(const std::shared_ptr<Settings> &setting, QObject *parent = nullptr);
+
+public slots:
+    void saveFile(QString fileName, const QString &data);
+    QString getFileName();
+
+    void setQmlRoot(QObject *qmlRoot);
+
+signals:
+    void fileDialogAccepted();
+    void fileDialogRejected();
+
+private:
+    std::shared_ptr<Settings> m_settings;
+
+    QObject *m_qmlRoot;
+};
+
+#endif // SYSTEMCONTROLLER_H
diff --git a/client/ui/qml/Pages2/PageSettingsBackup.qml b/client/ui/qml/Pages2/PageSettingsBackup.qml
index 363bc66f..edd527c1 100644
--- a/client/ui/qml/Pages2/PageSettingsBackup.qml
+++ b/client/ui/qml/Pages2/PageSettingsBackup.qml
@@ -125,18 +125,8 @@ PageType {
                 text: qsTr("Restore from backup")
 
                 onClicked: {
-                    openFileDialog.open()
-                }
-
-                FileDialog {
-                    id: openFileDialog
-                    acceptLabel: qsTr("Open backup file")
-                    nameFilters: [ "Backup files (*.backup)" ]
-                    onAccepted: {
-                        PageController.showBusyIndicator(true)
-                        SettingsController.restoreAppConfig(openFileDialog.selectedFile.toString())
-                        PageController.showBusyIndicator(false)
-                    }
+                    PageController.setupFileDialogForBackup()
+                    SystemController.getFileName()
                 }
             }
         }
diff --git a/client/ui/qml/Pages2/PageSettingsLogging.qml b/client/ui/qml/Pages2/PageSettingsLogging.qml
index 0e4e486e..c0a35c0f 100644
--- a/client/ui/qml/Pages2/PageSettingsLogging.qml
+++ b/client/ui/qml/Pages2/PageSettingsLogging.qml
@@ -117,7 +117,7 @@ PageType {
                             currentFile: StandardPaths.standardLocations(StandardPaths.DocumentsLocation) + "/AmneziaVPN"
                             defaultSuffix: ".log"
                             onAccepted: {
-                                ExportController.saveFile(fileDialog.currentFile.toString())
+                                SettingsController.exportLogsFile(fileDialog.currentFile.toString())
                             }
                         }
                     }
diff --git a/client/ui/qml/Pages2/PageSettingsSplitTunneling.qml b/client/ui/qml/Pages2/PageSettingsSplitTunneling.qml
index 898ce17b..155ecc3c 100644
--- a/client/ui/qml/Pages2/PageSettingsSplitTunneling.qml
+++ b/client/ui/qml/Pages2/PageSettingsSplitTunneling.qml
@@ -44,8 +44,6 @@ PageType {
         allExceptSites
     ]
 
-    property bool replaceExistingSites
-
     QtObject {
         id: onlyForwardSites
         property string name: qsTr("Only the addresses in the list must be opened via VPN")
@@ -303,7 +301,7 @@ PageType {
 
                     clickedFunction: function() {
                         if (Qt.platform.os === "ios") {
-                            ExportController.saveFile("amezia_tunnel.json")
+                            SitesController.exportSites("amezia_tunnel.json")
                         } else {
                             saveFileDialog.open()
                         }
@@ -311,6 +309,7 @@ PageType {
 
                     FileDialog {
                         id: saveFileDialog
+                        objectName: saveFileDialog
                         acceptLabel: qsTr("Save sites")
                         nameFilters: [ "Sites files (*.json)" ]
                         fileMode: FileDialog.SaveFile
@@ -378,8 +377,8 @@ PageType {
                     text: qsTr("Replace site list")
 
                     clickedFunction: function() {
-                        root.replaceExistingSites = true
-                        openFileDialog.open()
+                        PageController.setupFileDialogForSites(true)
+                        SystemController.getFileName()
                     }
                 }
 
@@ -390,25 +389,14 @@ PageType {
                     text: qsTr("Add imported sites to existing ones")
 
                     clickedFunction: function() {
-                        root.replaceExistingSites = false
-                        openFileDialog.open()
+                        PageController.setupFileDialogForSites(false)
+                        SystemController.getFileName()
+                        importSitesDrawer.close()
+                        moreActionsDrawer.close()
                     }
                 }
 
                 DividerType {}
-
-                FileDialog {
-                    id: openFileDialog
-                    acceptLabel: qsTr("Open sites file")
-                    nameFilters: [ "Sites files (*.json)" ]
-                    onAccepted: {
-                        PageController.showBusyIndicator(true)
-                        SitesController.importSites(openFileDialog.selectedFile.toString(), replaceExistingSites)
-                        importSitesDrawer.close()
-                        moreActionsDrawer.close()
-                        PageController.showBusyIndicator(false)
-                    }
-                }
             }
         }
     }
diff --git a/client/ui/qml/Pages2/PageSetupWizardConfigSource.qml b/client/ui/qml/Pages2/PageSetupWizardConfigSource.qml
index c0ad6249..3f460f65 100644
--- a/client/ui/qml/Pages2/PageSetupWizardConfigSource.qml
+++ b/client/ui/qml/Pages2/PageSetupWizardConfigSource.qml
@@ -65,28 +65,13 @@ It's okay as long as it's from someone you trust.")
                 Layout.fillWidth: true
                 Layout.topMargin: 16
 
-                text: qsTr("File with connection settings or backup")
+                text: !ServersModel.getServersCount() ? qsTr("File with connection settings or backup") : qsTr("File with connection settings")
                 rightImageSource: "qrc:/images/controls/chevron-right.svg"
                 leftImageSource: "qrc:/images/controls/folder-open.svg"
 
                 clickedFunction: function() {
-                    fileDialog.open()
-                }
-
-                FileDialog {
-                    id: fileDialog
-                    acceptLabel: qsTr("Open config file")
-                    nameFilters: [ "Config or backup files (*.vpn *.ovpn *.conf *.backup)" ]
-                    onAccepted: {
-                        if (fileDialog.selectedFile.toString().indexOf(".backup") != -1) {
-                            PageController.showBusyIndicator(true)
-                            SettingsController.restoreAppConfig(fileDialog.selectedFile.toString())
-                            PageController.showBusyIndicator(false)
-                        } else {
-                            ImportController.extractConfigFromFile(fileDialog.selectedFile.toString())
-                            PageController.goToPage(PageEnum.PageSetupWizardViewConfig)
-                        }
-                    }
+                    PageController.setupFileDialogForConfig()
+                    SystemController.getFileName()
                 }
             }
 
diff --git a/client/ui/qml/main2.qml b/client/ui/qml/main2.qml
index e78f35a2..e09882c0 100644
--- a/client/ui/qml/main2.qml
+++ b/client/ui/qml/main2.qml
@@ -2,6 +2,7 @@ import QtQuick
 import QtQuick.Window
 import QtQuick.Controls
 import QtQuick.Layouts
+import QtQuick.Dialogs
 
 import PageEnum 1.0
 
@@ -10,6 +11,7 @@ import "Controls2"
 
 Window  {
     id: root
+    objectName: "mainWindow"
     visible: true
     width: GC.screenWidth
     height: GC.screenHeight
@@ -79,6 +81,42 @@ Window  {
         function onShowPassphraseRequestDrawer() {
             privateKeyPassphraseDrawer.open()
         }
+
+        function onSetupFileDialogForConfig() {
+            mainFileDialog.acceptLabel = qsTr("Open config file")
+            mainFileDialog.nameFilters = !ServersModel.getServersCount() ? [ "Config or backup files (*.vpn *.ovpn *.conf *.backup)" ] :
+                                                                        [ "Config files (*.vpn *.ovpn *.conf)" ]
+            mainFileDialog.acceptFunction = function() {
+                if (mainFileDialog.selectedFile.toString().indexOf(".backup") !== -1 && !ServersModel.getServersCount()) {
+                    PageController.showBusyIndicator(true)
+                    SettingsController.restoreAppConfig(mainFileDialog.selectedFile.toString())
+                    PageController.showBusyIndicator(false)
+                } else {
+                    ImportController.extractConfigFromFile(mainFileDialog.selectedFile)
+                    PageController.goToPage(PageEnum.PageSetupWizardViewConfig)
+                }
+            }
+        }
+
+        function onSetupFileDialogForSites(replaceExistingSites) {
+            mainFileDialog.acceptLabel = qsTr("Open sites file")
+            mainFileDialog.nameFilters = [ "Sites files (*.json)" ]
+            mainFileDialog.acceptFunction = function() {
+                PageController.showBusyIndicator(true)
+                SitesController.importSites(mainFileDialog.selectedFile.toString(), replaceExistingSites)
+                PageController.showBusyIndicator(false)
+            }
+        }
+
+        function onSetupFileDialogForBackup() {
+            mainFileDialog.acceptLabel = qsTr("Open backup file")
+            mainFileDialog.nameFilters = [ "Backup files (*.backup)" ]
+            mainFileDialog.acceptFunction = function() {
+                PageController.showBusyIndicator(true)
+                SettingsController.restoreAppConfig(mainFileDialog.selectedFile.toString())
+                PageController.showBusyIndicator(false)
+            }
+        }
     }
 
     Connections {
@@ -192,4 +230,14 @@ Window  {
             }
         }
     }
+
+    FileDialog {
+        id: mainFileDialog
+
+        property var acceptFunction
+
+        objectName: "mainFileDialog"
+
+        onAccepted: acceptFunction()
+    }
 }

From e1fa24c2519a8c62528587f6c9ec7909278a2788 Mon Sep 17 00:00:00 2001
From: "vladimir.kuznetsov" <nethiuswork@gmail.com>
Date: Wed, 6 Sep 2023 22:26:37 +0500
Subject: [PATCH 094/278] moved the qml filedialog opening code below the ios
 section

---
 client/ui/controllers/systemController.cpp | 24 +++++++++++-----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/client/ui/controllers/systemController.cpp b/client/ui/controllers/systemController.cpp
index a843b660..87d04090 100644
--- a/client/ui/controllers/systemController.cpp
+++ b/client/ui/controllers/systemController.cpp
@@ -56,18 +56,6 @@ void SystemController::saveFile(QString fileName, const QString &data)
 
 QString SystemController::getFileName()
 {
-    auto mainFileDialog = m_qmlRoot->findChild<QObject>("mainFileDialog").parent();
-    if (!mainFileDialog) {
-        return "";
-    }
-    QMetaObject::invokeMethod(mainFileDialog, "open", Qt::DirectConnection);
-
-    QEventLoop wait;
-    QObject::connect(this, &SystemController::fileDialogAccepted, &wait, &QEventLoop::quit);
-    wait.exec();
-
-    auto fileName = mainFileDialog->property("selectedFile").toString();
-
 #ifdef Q_OS_IOS
     CFURLRef url = CFURLCreateWithFileSystemPath(
             kCFAllocatorDefault,
@@ -81,6 +69,18 @@ QString SystemController::getFileName()
     return fileName;
 #endif
 
+    auto mainFileDialog = m_qmlRoot->findChild<QObject>("mainFileDialog").parent();
+    if (!mainFileDialog) {
+        return "";
+    }
+    QMetaObject::invokeMethod(mainFileDialog, "open", Qt::DirectConnection);
+
+    QEventLoop wait;
+    QObject::connect(this, &SystemController::fileDialogAccepted, &wait, &QEventLoop::quit);
+    wait.exec();
+
+    auto fileName = mainFileDialog->property("selectedFile").toString();
+
 #ifdef Q_OS_ANDROID
     // patch for files containing spaces etc
     const QString sep { "raw%3A%2F" };

From b5dd48ad7b74e9bb8dc6d97f7b7eeaf803354ffd Mon Sep 17 00:00:00 2001
From: "vladimir.kuznetsov" <nethiuswork@gmail.com>
Date: Thu, 7 Sep 2023 22:45:01 +0500
Subject: [PATCH 095/278] reworking of getting the path to the file when
 saving/opening files

---
 client/fileUtilites.cpp                       | 79 -------------------
 client/fileUtilites.h                         | 16 ----
 client/platforms/ios/MobileUtils.h            |  7 +-
 client/platforms/ios/MobileUtils.mm           | 28 +++++++
 client/ui/controllers/exportController.cpp    |  6 +-
 client/ui/controllers/exportController.h      |  4 +-
 client/ui/controllers/importController.cpp    |  7 +-
 client/ui/controllers/installController.cpp   |  1 -
 client/ui/controllers/pageController.h        |  4 -
 client/ui/controllers/settingsController.cpp  |  8 +-
 client/ui/controllers/settingsController.h    |  2 +
 client/ui/controllers/sitesController.cpp     |  6 +-
 client/ui/controllers/sitesController.h       |  2 +
 client/ui/controllers/systemController.cpp    | 36 +++++++--
 client/ui/controllers/systemController.h      |  9 ++-
 .../qml/Components/ShareConnectionDrawer.qml  | 25 +++---
 client/ui/qml/Pages2/PageSettingsBackup.qml   | 40 +++++-----
 client/ui/qml/Pages2/PageSettingsLogging.qml  | 25 +++---
 .../qml/Pages2/PageSettingsSplitTunneling.qml | 48 ++++++-----
 .../Pages2/PageSetupWizardConfigSource.qml    | 15 +++-
 client/ui/qml/main2.qml                       | 42 +---------
 21 files changed, 167 insertions(+), 243 deletions(-)
 delete mode 100644 client/fileUtilites.cpp
 delete mode 100644 client/fileUtilites.h

diff --git a/client/fileUtilites.cpp b/client/fileUtilites.cpp
deleted file mode 100644
index 301344a7..00000000
--- a/client/fileUtilites.cpp
+++ /dev/null
@@ -1,79 +0,0 @@
-#include "fileUtilites.h"
-
-#include <QDesktopServices>
-#include <QDir>
-#include <QFile>
-#include <QFileInfo>
-#include <QStandardPaths>
-#include <QUrl>
-
-#ifdef Q_OS_ANDROID
-    #include "platforms/android/android_controller.h"
-#endif
-
-#ifdef Q_OS_IOS
-    #include "platforms/ios/MobileUtils.h"
-    #include <CoreFoundation/CoreFoundation.h>
-#endif
-
-void FileUtilites::saveFile(QString fileName, const QString &data)
-{
-#if defined Q_OS_ANDROID
-    AndroidController::instance()->shareConfig(data, fileName);
-    return;
-#endif
-
-#ifdef Q_OS_IOS
-    QUrl fileUrl = QDir::tempPath() + "/" + fileName;
-    QFile file(fileUrl.toString());
-#else
-    QUrl fileUrl = QUrl(fileName);
-    QFile file(fileUrl.toLocalFile());
-#endif
-
-    // todo check if save successful
-    file.open(QIODevice::WriteOnly);
-    file.write(data.toUtf8());
-    file.close();
-
-#ifdef Q_OS_IOS
-    QStringList filesToSend;
-    filesToSend.append(fileUrl.toString());
-    MobileUtils::shareText(filesToSend);
-    return;
-#else
-    QFileInfo fi(fileUrl.toLocalFile());
-    QDesktopServices::openUrl(fi.absoluteDir().absolutePath());
-#endif
-}
-
-QString FileUtilites::getFileName(QString fileName)
-{
-#ifdef Q_OS_IOS
-    CFURLRef url = CFURLCreateWithFileSystemPath(
-            kCFAllocatorDefault,
-            CFStringCreateWithCharacters(0, reinterpret_cast<const UniChar *>(fileName.unicode()), fileName.length()),
-            kCFURLPOSIXPathStyle, 0);
-
-    if (!CFURLStartAccessingSecurityScopedResource(url)) {
-        qDebug() << "Could not access path " << QUrl::fromLocalFile(fileName).toString();
-    }
-
-    return fileName;
-#endif
-
-#ifdef Q_OS_ANDROID
-    // patch for files containing spaces etc
-    const QString sep { "raw%3A%2F" };
-    if (fileName.startsWith("content://") && fileName.contains(sep)) {
-        QString contentUrl = fileName.split(sep).at(0);
-        QString rawUrl = fileName.split(sep).at(1);
-        rawUrl.replace(" ", "%20");
-        fileName = contentUrl + sep + rawUrl;
-    }
-
-    return fileName;
-#endif
-
-    return QUrl(fileName).toLocalFile();
-}
diff --git a/client/fileUtilites.h b/client/fileUtilites.h
deleted file mode 100644
index 21cb03a9..00000000
--- a/client/fileUtilites.h
+++ /dev/null
@@ -1,16 +0,0 @@
-#ifndef FILEUTILITES_H
-#define FILEUTILITES_H
-
-#include <QObject>
-#include <QString>
-
-class FileUtilites : public QObject
-{
-    Q_OBJECT
-
-public:
-    static void saveFile(QString fileName, const QString &data);
-    static QString getFileName(QString fileName);
-};
-
-#endif // FILEUTILITES_H
diff --git a/client/platforms/ios/MobileUtils.h b/client/platforms/ios/MobileUtils.h
index a7967fdf..cad9de9e 100644
--- a/client/platforms/ios/MobileUtils.h
+++ b/client/platforms/ios/MobileUtils.h
@@ -4,15 +4,16 @@
 #include <QObject>
 #include <QStringList>
 
-class MobileUtils : public QObject {
+class MobileUtils : public QObject
+{
     Q_OBJECT
 
 public:
     MobileUtils() = delete;
 
 public slots:
-    static void shareText(const QStringList& filesToSend);
-
+    static void shareText(const QStringList &filesToSend);
+    static void openFile();
 };
 
 #endif // MOBILEUTILS_H
diff --git a/client/platforms/ios/MobileUtils.mm b/client/platforms/ios/MobileUtils.mm
index a9ad52b5..63ee0364 100644
--- a/client/platforms/ios/MobileUtils.mm
+++ b/client/platforms/ios/MobileUtils.mm
@@ -35,3 +35,31 @@ void MobileUtils::shareText(const QStringList& filesToSend) {
     }
 }
 
+@interface MyFilePickerDelegate : NSObject <UIDocumentPickerDelegate>
+@end
+
+@implementation MyFilePickerDelegate
+
+- (void)documentPicker:(UIDocumentPickerViewController *)controller didPickDocumentsAtURLs:(NSArray<NSURL *> *)urls {
+    for (NSURL *url in urls) {
+        NSString *filePath = [url path];
+        
+        NSData *fileData = [NSData dataWithContentsOfFile:filePath];
+        NSString *fileContent = [[NSString alloc] initWithData:fileData encoding:NSUTF8StringEncoding];
+        NSLog(@"Содержимое файла: %@", fileContent);
+    }
+}
+
+@end
+
+void MobileUtils::openFile() {
+    UIDocumentPickerViewController *documentPicker = [[UIDocumentPickerViewController alloc] initWithDocumentTypes:@[@"public.item"] inMode:UIDocumentPickerModeOpen];
+
+    MyFilePickerDelegate *filePickerDelegate = [[MyFilePickerDelegate alloc] init];
+    documentPicker.delegate = filePickerDelegate;
+
+    UIViewController *qtController = getViewController();
+    if (!qtController) return;
+
+    [qtController presentViewController:documentPicker animated:YES completion:nil];
+}
diff --git a/client/ui/controllers/exportController.cpp b/client/ui/controllers/exportController.cpp
index ddc976cc..ef5cc4e3 100644
--- a/client/ui/controllers/exportController.cpp
+++ b/client/ui/controllers/exportController.cpp
@@ -11,7 +11,7 @@
 #include "configurators/openvpn_configurator.h"
 #include "configurators/wireguard_configurator.h"
 #include "core/errorstrings.h"
-#include "fileUtilites.h"
+#include "systemController.h"
 #ifdef Q_OS_ANDROID
     #include "platforms/android/androidutils.h"
 #endif
@@ -200,9 +200,9 @@ QList<QString> ExportController::getQrCodes()
     return m_qrCodes;
 }
 
-void ExportController::saveFile(const QString &fileName)
+void ExportController::exportConfig(const QString &fileName)
 {
-    FileUtilites::saveFile(fileName, m_config);
+    SystemController::saveFile(fileName, m_config);
 }
 
 QList<QString> ExportController::generateQrCodeImageSeries(const QByteArray &data)
diff --git a/client/ui/controllers/exportController.h b/client/ui/controllers/exportController.h
index b526521e..24eaa5c8 100644
--- a/client/ui/controllers/exportController.h
+++ b/client/ui/controllers/exportController.h
@@ -35,7 +35,7 @@ public slots:
     QString getConfig();
     QList<QString> getQrCodes();
 
-    void saveFile(const QString &fileName);
+    void exportConfig(const QString &fileName);
 
 signals:
     void generateConfig(int type);
@@ -43,6 +43,8 @@ signals:
 
     void exportConfigChanged();
 
+    void saveFile(const QString &fileName, const QString &data);
+
 private:
     QList<QString> generateQrCodeImageSeries(const QByteArray &data);
     QString svgToBase64(const QString &image);
diff --git a/client/ui/controllers/importController.cpp b/client/ui/controllers/importController.cpp
index c0aaeeb9..d9278ece 100644
--- a/client/ui/controllers/importController.cpp
+++ b/client/ui/controllers/importController.cpp
@@ -14,7 +14,6 @@
 #ifdef Q_OS_IOS
     #include <CoreFoundation/CoreFoundation.h>
 #endif
-#include "fileUtilites.h"
 
 namespace
 {
@@ -88,11 +87,7 @@ ImportController::ImportController(const QSharedPointer<ServersModel> &serversMo
 
 void ImportController::extractConfigFromFile(const QString &fileName)
 {
-    QQuickItem *obj = findChild<QQuickItem *>("saveFileDialog");
-
-    QUrl url(fileName);
-    QString path = url.toLocalFile();
-    QFile file(path);
+    QFile file(fileName);
 
     if (file.open(QIODevice::ReadOnly)) {
         QString data = file.readAll();
diff --git a/client/ui/controllers/installController.cpp b/client/ui/controllers/installController.cpp
index 3c0752cc..1db84b36 100644
--- a/client/ui/controllers/installController.cpp
+++ b/client/ui/controllers/installController.cpp
@@ -8,7 +8,6 @@
 
 #include "core/errorstrings.h"
 #include "core/servercontroller.h"
-#include "fileUtilites.h"
 #include "utilities.h"
 
 namespace
diff --git a/client/ui/controllers/pageController.h b/client/ui/controllers/pageController.h
index 952f716c..8d3da507 100644
--- a/client/ui/controllers/pageController.h
+++ b/client/ui/controllers/pageController.h
@@ -103,10 +103,6 @@ signals:
     void showPassphraseRequestDrawer();
     void passphraseRequestDrawerClosed(QString passphrase);
 
-    void setupFileDialogForConfig();
-    void setupFileDialogForSites(bool replaceExistingSites);
-    void setupFileDialogForBackup();
-
 private:
     QSharedPointer<ServersModel> m_serversModel;
 
diff --git a/client/ui/controllers/settingsController.cpp b/client/ui/controllers/settingsController.cpp
index 7c7402e0..46993f6a 100644
--- a/client/ui/controllers/settingsController.cpp
+++ b/client/ui/controllers/settingsController.cpp
@@ -2,8 +2,8 @@
 
 #include <QStandardPaths>
 
-#include "fileUtilites.h"
 #include "logger.h"
+#include "systemController.h"
 #include "ui/qautostart.h"
 #include "version.h"
 
@@ -70,7 +70,7 @@ void SettingsController::openLogsFolder()
 
 void SettingsController::exportLogsFile(const QString &fileName)
 {
-    FileUtilites::saveFile(fileName, Logger::getLogFile());
+    SystemController::saveFile(fileName, Logger::getLogFile());
 }
 
 void SettingsController::clearLogs()
@@ -81,12 +81,12 @@ void SettingsController::clearLogs()
 
 void SettingsController::backupAppConfig(const QString &fileName)
 {
-    FileUtilites::saveFile(fileName, m_settings->backupAppConfig());
+    SystemController::saveFile(fileName, m_settings->backupAppConfig());
 }
 
 void SettingsController::restoreAppConfig(const QString &fileName)
 {
-    QFile file(FileUtilites::getFileName(fileName));
+    QFile file(fileName);
 
     file.open(QIODevice::ReadOnly);
 
diff --git a/client/ui/controllers/settingsController.h b/client/ui/controllers/settingsController.h
index af816d46..3d96dc03 100644
--- a/client/ui/controllers/settingsController.h
+++ b/client/ui/controllers/settingsController.h
@@ -63,6 +63,8 @@ signals:
     void changeSettingsFinished(const QString &finishedMessage);
     void changeSettingsErrorOccurred(const QString &errorMessage);
 
+    void saveFile(const QString &fileName, const QString &data);
+
 private:
     QSharedPointer<ServersModel> m_serversModel;
     QSharedPointer<ContainersModel> m_containersModel;
diff --git a/client/ui/controllers/sitesController.cpp b/client/ui/controllers/sitesController.cpp
index 5821b371..a27e91d0 100644
--- a/client/ui/controllers/sitesController.cpp
+++ b/client/ui/controllers/sitesController.cpp
@@ -4,7 +4,7 @@
 #include <QHostInfo>
 #include <QStandardPaths>
 
-#include "fileUtilites.h"
+#include "systemController.h"
 #include "utilities.h"
 
 SitesController::SitesController(const std::shared_ptr<Settings> &settings,
@@ -82,7 +82,7 @@ void SitesController::removeSite(int index)
 
 void SitesController::importSites(const QString &fileName, bool replaceExisting)
 {
-    QFile file(FileUtilites::getFileName(fileName));
+    QFile file(fileName);
 
     if (!file.open(QIODevice::ReadOnly)) {
         emit errorOccurred(tr("Can't open file: ") + fileName);
@@ -145,7 +145,7 @@ void SitesController::exportSites(const QString &fileName)
     QJsonDocument jsonDocument(jsonArray);
     QByteArray jsonData = jsonDocument.toJson();
 
-    FileUtilites::saveFile(fileName, jsonData);
+    SystemController::saveFile(fileName, jsonData);
 
     emit finished(tr("Export completed"));
 }
diff --git a/client/ui/controllers/sitesController.h b/client/ui/controllers/sitesController.h
index 2171e7b4..e66478da 100644
--- a/client/ui/controllers/sitesController.h
+++ b/client/ui/controllers/sitesController.h
@@ -26,6 +26,8 @@ signals:
     void errorOccurred(const QString &errorMessage);
     void finished(const QString &message);
 
+    void saveFile(const QString &fileName, const QString &data);
+
 private:
     std::shared_ptr<Settings> m_settings;
 
diff --git a/client/ui/controllers/systemController.cpp b/client/ui/controllers/systemController.cpp
index 87d04090..a6210b69 100644
--- a/client/ui/controllers/systemController.cpp
+++ b/client/ui/controllers/systemController.cpp
@@ -34,8 +34,7 @@ void SystemController::saveFile(QString fileName, const QString &data)
     QUrl fileUrl = QDir::tempPath() + "/" + fileName;
     QFile file(fileUrl.toString());
 #else
-    QUrl fileUrl = QUrl(fileName);
-    QFile file(fileUrl.toLocalFile());
+    QFile file(fileName);
 #endif
 
     // todo check if save successful
@@ -49,14 +48,18 @@ void SystemController::saveFile(QString fileName, const QString &data)
     MobileUtils::shareText(filesToSend);
     return;
 #else
-    QFileInfo fi(fileUrl.toLocalFile());
+    QFileInfo fi(fileName);
     QDesktopServices::openUrl(fi.absoluteDir().absolutePath());
 #endif
 }
 
-QString SystemController::getFileName()
+QString SystemController::getFileName(const QString &acceptLabel, const QString &nameFilter,
+                                      const QString &selectedFile, const bool isSaveMode, const QString &defaultSuffix)
 {
+    QString fileName;
 #ifdef Q_OS_IOS
+    MobileUtils::openFile();
+
     CFURLRef url = CFURLCreateWithFileSystemPath(
             kCFAllocatorDefault,
             CFStringCreateWithCharacters(0, reinterpret_cast<const UniChar *>(fileName.unicode()), fileName.length()),
@@ -69,17 +72,34 @@ QString SystemController::getFileName()
     return fileName;
 #endif
 
-    auto mainFileDialog = m_qmlRoot->findChild<QObject>("mainFileDialog").parent();
+    QObject *mainFileDialog = m_qmlRoot->findChild<QObject>("mainFileDialog").parent();
     if (!mainFileDialog) {
         return "";
     }
-    QMetaObject::invokeMethod(mainFileDialog, "open", Qt::DirectConnection);
 
+    mainFileDialog->setProperty("acceptLabel", QVariant::fromValue(acceptLabel));
+    mainFileDialog->setProperty("nameFilters", QVariant::fromValue(QStringList(nameFilter)));
+    if (!selectedFile.isEmpty()) {
+        mainFileDialog->setProperty("selectedFile", QVariant::fromValue(selectedFile));
+    }
+    mainFileDialog->setProperty("isSaveMode", QVariant::fromValue(isSaveMode));
+    mainFileDialog->setProperty("defaultSuffix", QVariant::fromValue(defaultSuffix));
+    QMetaObject::invokeMethod(mainFileDialog, "open");
+
+    bool isFileDialogAccepted = false;
     QEventLoop wait;
-    QObject::connect(this, &SystemController::fileDialogAccepted, &wait, &QEventLoop::quit);
+    QObject::connect(this, &SystemController::fileDialogClosed, [&wait, &isFileDialogAccepted](const bool isAccepted) {
+        isFileDialogAccepted = isAccepted;
+        wait.quit();
+    });
     wait.exec();
+    QObject::disconnect(this, &SystemController::fileDialogClosed, nullptr, nullptr);
 
-    auto fileName = mainFileDialog->property("selectedFile").toString();
+    if (!isFileDialogAccepted) {
+        return "";
+    }
+
+    fileName = mainFileDialog->property("selectedFile").toString();
 
 #ifdef Q_OS_ANDROID
     // patch for files containing spaces etc
diff --git a/client/ui/controllers/systemController.h b/client/ui/controllers/systemController.h
index fbcc52f1..274df234 100644
--- a/client/ui/controllers/systemController.h
+++ b/client/ui/controllers/systemController.h
@@ -11,15 +11,16 @@ class SystemController : public QObject
 public:
     explicit SystemController(const std::shared_ptr<Settings> &setting, QObject *parent = nullptr);
 
+    static void saveFile(QString fileName, const QString &data);
+
 public slots:
-    void saveFile(QString fileName, const QString &data);
-    QString getFileName();
+    QString getFileName(const QString &acceptLabel, const QString &nameFilter, const QString &selectedFile = "",
+                        const bool isSaveMode = false, const QString &defaultSuffix = "");
 
     void setQmlRoot(QObject *qmlRoot);
 
 signals:
-    void fileDialogAccepted();
-    void fileDialogRejected();
+    void fileDialogClosed(const bool isAccepted);
 
 private:
     std::shared_ptr<Settings> m_settings;
diff --git a/client/ui/qml/Components/ShareConnectionDrawer.qml b/client/ui/qml/Components/ShareConnectionDrawer.qml
index 4971f93a..4d719d1a 100644
--- a/client/ui/qml/Components/ShareConnectionDrawer.qml
+++ b/client/ui/qml/Components/ShareConnectionDrawer.qml
@@ -72,23 +72,20 @@ DrawerType {
                     imageSource: "qrc:/images/controls/share-2.svg"
 
                     onClicked: {
+                        var fileName = ""
                         if (GC.isMobile()) {
-                            ExportController.saveFile(configFileName)
+                            fileName = configFileName
                         } else {
-                            fileDialog.open()
+                            fileName = SystemController.getFileName(configCaption,
+                                                                    qsTr("Config files (*" + configExtension + ")"),
+                                                                    StandardPaths.standardLocations(StandardPaths.DocumentsLocation) + "/" + configFileName,
+                                                                    true,
+                                                                    configExtension)
                         }
-                    }
-
-                    FileDialog {
-                        id: fileDialog
-                        acceptLabel: configCaption
-                        nameFilters: [ "Config files (*" + configExtension + ")" ]
-                        fileMode: FileDialog.SaveFile
-
-                        currentFile: StandardPaths.standardLocations(StandardPaths.DocumentsLocation) + "/" + configFileName
-                        defaultSuffix: configExtension
-                        onAccepted: {
-                            ExportController.saveFile(fileDialog.currentFile.toString())
+                        if (fileName !== "") {
+                            PageController.showBusyIndicator(true)
+                            ExportController.exportConfig(fileName)
+                            PageController.showBusyIndicator(false)
                         }
                     }
                 }
diff --git a/client/ui/qml/Pages2/PageSettingsBackup.qml b/client/ui/qml/Pages2/PageSettingsBackup.qml
index edd527c1..6a9ea58f 100644
--- a/client/ui/qml/Pages2/PageSettingsBackup.qml
+++ b/client/ui/qml/Pages2/PageSettingsBackup.qml
@@ -84,31 +84,22 @@ PageType {
                 text: qsTr("Make a backup")
 
                 onClicked: {
+                    var fileName = ""
                     if (GC.isMobile()) {
-                        backupAppConfig("AmneziaVPN.backup")
+                        fileName = "AmneziaVPN.backup"
                     } else {
-                        saveFileDialog.open()
+                        fileName = SystemController.getFileName(qsTr("Save backup file"),
+                                                                qsTr("Backup files (*.backup)"),
+                                                                StandardPaths.standardLocations(StandardPaths.DocumentsLocation) + "/AmneziaVPN",
+                                                                true,
+                                                                ".backup")
                     }
-                }
-
-                FileDialog {
-                    id: saveFileDialog
-                    acceptLabel: qsTr("Save backup file")
-                    nameFilters: [ "Backup files (*.backup)" ]
-                    fileMode: FileDialog.SaveFile
-
-                    currentFile: StandardPaths.standardLocations(StandardPaths.DocumentsLocation) + "/AmneziaVPN"
-                    defaultSuffix: ".backup"
-                    onAccepted: {
-                        makeBackupButton.backupAppConfig(saveFileDialog.currentFile.toString())
+                    if (fileName !== "") {
+                        PageController.showBusyIndicator(true)
+                        SettingsController.backupAppConfig(fileName)
+                        PageController.showBusyIndicator(false)
                     }
                 }
-
-                function backupAppConfig(fileName) {
-                    PageController.showBusyIndicator(true)
-                    SettingsController.backupAppConfig(fileName)
-                    PageController.showBusyIndicator(false)
-                }
             }
 
             BasicButtonType {
@@ -125,8 +116,13 @@ PageType {
                 text: qsTr("Restore from backup")
 
                 onClicked: {
-                    PageController.setupFileDialogForBackup()
-                    SystemController.getFileName()
+                    var fileName = SystemController.getFileName(qsTr("Open backup file"),
+                                                                qsTr("Backup files (*.backup)"))
+                    if (fileName !== "") {
+                        PageController.showBusyIndicator(true)
+                        SettingsController.restoreAppConfig(fileName)
+                        PageController.showBusyIndicator(false)
+                    }
                 }
             }
         }
diff --git a/client/ui/qml/Pages2/PageSettingsLogging.qml b/client/ui/qml/Pages2/PageSettingsLogging.qml
index d4f1a1d4..42f33901 100644
--- a/client/ui/qml/Pages2/PageSettingsLogging.qml
+++ b/client/ui/qml/Pages2/PageSettingsLogging.qml
@@ -101,23 +101,20 @@ PageType {
                         image: "qrc:/images/controls/save.svg"
 
                         onClicked: {
+                            var fileName = ""
                             if (GC.isMobile()) {
-                                SettingsController.exportLogsFile("AmneziaVPN.log")
+                                fileName = "AmneziaVPN.log"
                             } else {
-                                fileDialog.open()
+                                fileName = SystemController.getFileName(qsTr("Save logs"),
+                                                                        qsTr("Logs files (*.log)"),
+                                                                        StandardPaths.standardLocations(StandardPaths.DocumentsLocation) + "/AmneziaVPN",
+                                                                        true,
+                                                                        ".log")
                             }
-                        }
-
-                        FileDialog {
-                            id: fileDialog
-                            acceptLabel: qsTr("Save logs")
-                            nameFilters: [ "Logs files (*.log)" ]
-                            fileMode: FileDialog.SaveFile
-
-                            currentFile: StandardPaths.standardLocations(StandardPaths.DocumentsLocation) + "/AmneziaVPN"
-                            defaultSuffix: ".log"
-                            onAccepted: {
-                                SettingsController.exportLogsFile(fileDialog.currentFile.toString())
+                            if (fileName !== "") {
+                                PageController.showBusyIndicator(true)
+                                SettingsController.exportLogsFile(fileName)
+                                PageController.showBusyIndicator(false)
                             }
                         }
                     }
diff --git a/client/ui/qml/Pages2/PageSettingsSplitTunneling.qml b/client/ui/qml/Pages2/PageSettingsSplitTunneling.qml
index eb06a586..b79d5d22 100644
--- a/client/ui/qml/Pages2/PageSettingsSplitTunneling.qml
+++ b/client/ui/qml/Pages2/PageSettingsSplitTunneling.qml
@@ -300,25 +300,19 @@ PageType {
                     text: qsTr("Save site list")
 
                     clickedFunction: function() {
+                        var fileName = ""
                         if (GC.isMobile()) {
-                            SitesController.exportSites("amezia_tunnel.json")
+                            fileName = "amnezia_sites.json"
                         } else {
-                            saveFileDialog.open()
+                            fileName = SystemController.getFileName(qsTr("Save sites"),
+                                                                    qsTr("Sites files (*.json)"),
+                                                                    StandardPaths.standardLocations(StandardPaths.DocumentsLocation) + "/amnezia_sites",
+                                                                    true,
+                                                                    ".json")
                         }
-                    }
-
-                    FileDialog {
-                        id: saveFileDialog
-                        objectName: saveFileDialog
-                        acceptLabel: qsTr("Save sites")
-                        nameFilters: [ "Sites files (*.json)" ]
-                        fileMode: FileDialog.SaveFile
-
-                        currentFile: StandardPaths.standardLocations(StandardPaths.DocumentsLocation) + "/sites"
-                        defaultSuffix: ".json"
-                        onAccepted: {
+                        if (fileName !== "") {
                             PageController.showBusyIndicator(true)
-                            SitesController.exportSites(saveFileDialog.currentFile.toString())
+                            SitesController.exportSites(fileName)
                             moreActionsDrawer.close()
                             PageController.showBusyIndicator(false)
                         }
@@ -377,8 +371,11 @@ PageType {
                     text: qsTr("Replace site list")
 
                     clickedFunction: function() {
-                        PageController.setupFileDialogForSites(true)
-                        SystemController.getFileName()
+                        var fileName = SystemController.getFileName(qsTr("Open sites file"),
+                                                                    qsTr("Sites files (*.json)"))
+                        if (fileName !== "") {
+                            importSitesDrawerContent.importSites(fileName, true)
+                        }
                     }
                 }
 
@@ -389,13 +386,22 @@ PageType {
                     text: qsTr("Add imported sites to existing ones")
 
                     clickedFunction: function() {
-                        PageController.setupFileDialogForSites(false)
-                        SystemController.getFileName()
-                        importSitesDrawer.close()
-                        moreActionsDrawer.close()
+                        var fileName = SystemController.getFileName(qsTr("Open sites file"),
+                                                                    qsTr("Sites files (*.json)"))
+                        if (fileName !== "") {
+                            importSitesDrawerContent.importSites(fileName, false)
+                        }
                     }
                 }
 
+                function importSites(fileName, replaceExistingSites) {
+                    PageController.showBusyIndicator(true)
+                    SitesController.importSites(fileName, replaceExistingSites)
+                    PageController.showBusyIndicator(false)
+                    importSitesDrawer.close()
+                    moreActionsDrawer.close()
+                }
+
                 DividerType {}
             }
         }
diff --git a/client/ui/qml/Pages2/PageSetupWizardConfigSource.qml b/client/ui/qml/Pages2/PageSetupWizardConfigSource.qml
index 3f460f65..07189eb7 100644
--- a/client/ui/qml/Pages2/PageSetupWizardConfigSource.qml
+++ b/client/ui/qml/Pages2/PageSetupWizardConfigSource.qml
@@ -70,8 +70,19 @@ It's okay as long as it's from someone you trust.")
                 leftImageSource: "qrc:/images/controls/folder-open.svg"
 
                 clickedFunction: function() {
-                    PageController.setupFileDialogForConfig()
-                    SystemController.getFileName()
+                    var nameFilter = !ServersModel.getServersCount() ? "Config or backup files (*.vpn *.ovpn *.conf *.backup)" :
+                                                                       "Config files (*.vpn *.ovpn *.conf)"
+                    var fileName = SystemController.getFileName(qsTr("Open config file"), nameFilter)
+                    if (fileName !== "") {
+                        if (fileName.indexOf(".backup") !== -1 && !ServersModel.getServersCount()) {
+                            PageController.showBusyIndicator(true)
+                            SettingsController.restoreAppConfig(fileName)
+                            PageController.showBusyIndicator(false)
+                        } else {
+                            ImportController.extractConfigFromFile(fileName)
+                            PageController.goToPage(PageEnum.PageSetupWizardViewConfig)
+                        }
+                    }
                 }
             }
 
diff --git a/client/ui/qml/main2.qml b/client/ui/qml/main2.qml
index e09882c0..c9f38753 100644
--- a/client/ui/qml/main2.qml
+++ b/client/ui/qml/main2.qml
@@ -81,42 +81,6 @@ Window  {
         function onShowPassphraseRequestDrawer() {
             privateKeyPassphraseDrawer.open()
         }
-
-        function onSetupFileDialogForConfig() {
-            mainFileDialog.acceptLabel = qsTr("Open config file")
-            mainFileDialog.nameFilters = !ServersModel.getServersCount() ? [ "Config or backup files (*.vpn *.ovpn *.conf *.backup)" ] :
-                                                                        [ "Config files (*.vpn *.ovpn *.conf)" ]
-            mainFileDialog.acceptFunction = function() {
-                if (mainFileDialog.selectedFile.toString().indexOf(".backup") !== -1 && !ServersModel.getServersCount()) {
-                    PageController.showBusyIndicator(true)
-                    SettingsController.restoreAppConfig(mainFileDialog.selectedFile.toString())
-                    PageController.showBusyIndicator(false)
-                } else {
-                    ImportController.extractConfigFromFile(mainFileDialog.selectedFile)
-                    PageController.goToPage(PageEnum.PageSetupWizardViewConfig)
-                }
-            }
-        }
-
-        function onSetupFileDialogForSites(replaceExistingSites) {
-            mainFileDialog.acceptLabel = qsTr("Open sites file")
-            mainFileDialog.nameFilters = [ "Sites files (*.json)" ]
-            mainFileDialog.acceptFunction = function() {
-                PageController.showBusyIndicator(true)
-                SitesController.importSites(mainFileDialog.selectedFile.toString(), replaceExistingSites)
-                PageController.showBusyIndicator(false)
-            }
-        }
-
-        function onSetupFileDialogForBackup() {
-            mainFileDialog.acceptLabel = qsTr("Open backup file")
-            mainFileDialog.nameFilters = [ "Backup files (*.backup)" ]
-            mainFileDialog.acceptFunction = function() {
-                PageController.showBusyIndicator(true)
-                SettingsController.restoreAppConfig(mainFileDialog.selectedFile.toString())
-                PageController.showBusyIndicator(false)
-            }
-        }
     }
 
     Connections {
@@ -234,10 +198,12 @@ Window  {
     FileDialog {
         id: mainFileDialog
 
-        property var acceptFunction
+        property bool isSaveMode: false
 
         objectName: "mainFileDialog"
+        fileMode: isSaveMode ? FileDialog.SaveFile : FileDialog.OpenFile
 
-        onAccepted: acceptFunction()
+        onAccepted: SystemController.fileDialogClosed(true)
+        onRejected: SystemController.fileDialogClosed(false)
     }
 }

From fdff57da7c5896fa07bff7b49aeadc45b43da85e Mon Sep 17 00:00:00 2001
From: "vladimir.kuznetsov" <nethiuswork@gmail.com>
Date: Fri, 8 Sep 2023 18:05:08 +0500
Subject: [PATCH 096/278] fixed navigation during initial installation

---
 client/platforms/ios/MobileUtils.cpp          |  8 +++++--
 client/ui/qml/Pages2/PageSetupWizardStart.qml | 22 +++++++++++++++++++
 2 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/client/platforms/ios/MobileUtils.cpp b/client/platforms/ios/MobileUtils.cpp
index 3923d291..f94d56fc 100644
--- a/client/platforms/ios/MobileUtils.cpp
+++ b/client/platforms/ios/MobileUtils.cpp
@@ -1,5 +1,9 @@
 #include "MobileUtils.h"
 
-void MobileUtils::shareText(const QStringList&) {}
-
+void MobileUtils::shareText(const QStringList &)
+{
+}
 
+void MobileUtils::openFile()
+{
+}
diff --git a/client/ui/qml/Pages2/PageSetupWizardStart.qml b/client/ui/qml/Pages2/PageSetupWizardStart.qml
index 2ce93e53..36d90bd8 100644
--- a/client/ui/qml/Pages2/PageSetupWizardStart.qml
+++ b/client/ui/qml/Pages2/PageSetupWizardStart.qml
@@ -23,6 +23,28 @@ PageType {
         function onShowBusyIndicator(visible) {
             busyIndicator.visible = visible
         }
+
+        function onClosePage() {
+            if (stackView.depth <= 1) {
+                return
+            }
+            stackView.pop()
+        }
+
+        function onGoToPage(page, slide) {
+            var pagePath = PageController.getPagePath(page)
+            if (slide) {
+                stackView.push(pagePath, { "objectName" : pagePath }, StackView.PushTransition)
+            } else {
+                stackView.push(pagePath, { "objectName" : pagePath }, StackView.Immediate)
+            }
+        }
+
+        function onGoToStartPage() {
+            while (stackView.depth > 1) {
+                stackView.pop()
+            }
+        }
     }
 
     Connections {

From 85414eb65f5eb3fff953f46b9229c613d60d9ff9 Mon Sep 17 00:00:00 2001
From: ronoaer <ronoaer@gmail.com>
Date: Fri, 8 Sep 2023 21:31:47 +0800
Subject: [PATCH 097/278] fixed protocol reloads old value in settings page

---
 client/amnezia_application.cpp                     |  2 +-
 client/amnezia_application.h                       |  2 +-
 client/ui/controllers/installController.cpp        |  9 ++++++++-
 client/ui/controllers/installController.h          |  3 +++
 client/ui/qml/Pages2/PageProtocolCloakSettings.qml | 10 +++++++++-
 5 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/client/amnezia_application.cpp b/client/amnezia_application.cpp
index 8db6f8de..1725e1f8 100644
--- a/client/amnezia_application.cpp
+++ b/client/amnezia_application.cpp
@@ -330,7 +330,7 @@ void AmneziaApplication::initControllers()
     m_pageController.reset(new PageController(m_serversModel, m_settings));
     m_engine->rootContext()->setContextProperty("PageController", m_pageController.get());
 
-    m_installController.reset(new InstallController(m_serversModel, m_containersModel, m_settings));
+    m_installController.reset(new InstallController(m_serversModel, m_containersModel, m_protocolsModel, m_settings));
     m_engine->rootContext()->setContextProperty("InstallController", m_installController.get());
     connect(m_installController.get(), &InstallController::passphraseRequestStarted, m_pageController.get(),
             &PageController::showPassphraseRequestDrawer);
diff --git a/client/amnezia_application.h b/client/amnezia_application.h
index 1ace6d8b..2dd74fcb 100644
--- a/client/amnezia_application.h
+++ b/client/amnezia_application.h
@@ -91,7 +91,7 @@ private:
     QSharedPointer<ContainersModel> m_containersModel;
     QSharedPointer<ServersModel> m_serversModel;
     QSharedPointer<LanguageModel> m_languageModel;
-    QScopedPointer<ProtocolsModel> m_protocolsModel;
+    QSharedPointer<ProtocolsModel> m_protocolsModel;
     QSharedPointer<SitesModel> m_sitesModel;
 
     QScopedPointer<OpenVpnConfigModel> m_openVpnConfigModel;
diff --git a/client/ui/controllers/installController.cpp b/client/ui/controllers/installController.cpp
index 1db84b36..c0e9acbb 100644
--- a/client/ui/controllers/installController.cpp
+++ b/client/ui/controllers/installController.cpp
@@ -40,8 +40,13 @@ namespace
 
 InstallController::InstallController(const QSharedPointer<ServersModel> &serversModel,
                                      const QSharedPointer<ContainersModel> &containersModel,
+                                     const QSharedPointer<ProtocolsModel> &protocolsModel,
                                      const std::shared_ptr<Settings> &settings, QObject *parent)
-    : QObject(parent), m_serversModel(serversModel), m_containersModel(containersModel), m_settings(settings)
+    : QObject(parent),
+      m_serversModel(serversModel),
+      m_containersModel(containersModel),
+      m_protocolModel(protocolsModel),
+      m_settings(settings)
 {
 }
 
@@ -252,6 +257,8 @@ void InstallController::updateContainer(QJsonObject config)
     auto errorCode = serverController.updateContainer(serverCredentials, container, oldContainerConfig, config);
     if (errorCode == ErrorCode::NoError) {
         m_containersModel->setData(modelIndex, config, ContainersModel::Roles::ConfigRole);
+        m_protocolModel->updateModel(config);
+
         emit updateContainerFinished();
         return;
     }
diff --git a/client/ui/controllers/installController.h b/client/ui/controllers/installController.h
index 4060c97c..47fc5dab 100644
--- a/client/ui/controllers/installController.h
+++ b/client/ui/controllers/installController.h
@@ -8,6 +8,7 @@
 #include "core/defs.h"
 #include "ui/models/containers_model.h"
 #include "ui/models/servers_model.h"
+#include "ui/models/protocols_model.h"
 
 class InstallController : public QObject
 {
@@ -15,6 +16,7 @@ class InstallController : public QObject
 public:
     explicit InstallController(const QSharedPointer<ServersModel> &serversModel,
                                const QSharedPointer<ContainersModel> &containersModel,
+                               const QSharedPointer<ProtocolsModel> &protocolsModel,
                                const std::shared_ptr<Settings> &settings, QObject *parent = nullptr);
     ~InstallController();
 
@@ -71,6 +73,7 @@ private:
 
     QSharedPointer<ServersModel> m_serversModel;
     QSharedPointer<ContainersModel> m_containersModel;
+    QSharedPointer<ProtocolsModel> m_protocolModel;
     std::shared_ptr<Settings> m_settings;
 
     ServerCredentials m_currentlyInstalledServerCredentials;
diff --git a/client/ui/qml/Pages2/PageProtocolCloakSettings.qml b/client/ui/qml/Pages2/PageProtocolCloakSettings.qml
index b53fdfdf..e15c5ec7 100644
--- a/client/ui/qml/Pages2/PageProtocolCloakSettings.qml
+++ b/client/ui/qml/Pages2/PageProtocolCloakSettings.qml
@@ -91,7 +91,15 @@ PageType {
 
                             textField.onEditingFinished: {
                                 if (textFieldText !== site) {
-                                    site = textFieldText
+                                    var tmpText = textFieldText
+                                    tmpText = tmpText.toLocaleLowerCase()
+
+                                    var indexHttps = tmpText.indexOf("https://")
+                                    if (indexHttps === 0) {
+                                        tmpText = textFieldText.substring(8)
+                                    } else {
+                                        site = textFieldText
+                                    }
                                 }
                             }
                         }

From 3cfca046ba5ad8ed5d00c18cfd13e0c446697b00 Mon Sep 17 00:00:00 2001
From: ronoaer <ronoaer@gmail.com>
Date: Fri, 8 Sep 2023 21:40:55 +0800
Subject: [PATCH 098/278] adapted installer wizard to macos style

---
 deploy/installer/config/macos.xml.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/deploy/installer/config/macos.xml.in b/deploy/installer/config/macos.xml.in
index 74b682b7..3888d08d 100644
--- a/deploy/installer/config/macos.xml.in
+++ b/deploy/installer/config/macos.xml.in
@@ -8,7 +8,7 @@
     <TargetDir>/Applications/AmneziaVPN.app</TargetDir>
     <WizardDefaultWidth>600</WizardDefaultWidth>
     <WizardDefaultHeight>380</WizardDefaultHeight>
-    <WizardStyle>Modern</WizardStyle>
+    <WizardStyle>Mac</WizardStyle>
     <RemoveTargetDir>true</RemoveTargetDir>
     <AllowSpaceInPath>true</AllowSpaceInPath>
     <AllowNonAsciiCharacters>false</AllowNonAsciiCharacters>

From 1c7868312dad02d3e1f19248d5160b99974036bf Mon Sep 17 00:00:00 2001
From: "vladimir.kuznetsov" <nethiuswork@gmail.com>
Date: Sat, 9 Sep 2023 01:29:28 +0500
Subject: [PATCH 099/278] added getting the path to the file for iOS

---
 client/platforms/ios/MobileUtils.cpp       |  3 +-
 client/platforms/ios/MobileUtils.h         |  9 +++--
 client/platforms/ios/MobileUtils.mm        | 39 ++++++++++++++++++----
 client/ui/controllers/systemController.cpp |  5 ++-
 4 files changed, 45 insertions(+), 11 deletions(-)

diff --git a/client/platforms/ios/MobileUtils.cpp b/client/platforms/ios/MobileUtils.cpp
index f94d56fc..fd20fcda 100644
--- a/client/platforms/ios/MobileUtils.cpp
+++ b/client/platforms/ios/MobileUtils.cpp
@@ -4,6 +4,7 @@ void MobileUtils::shareText(const QStringList &)
 {
 }
 
-void MobileUtils::openFile()
+QString MobileUtils::openFile()
 {
+    return QString();
 }
diff --git a/client/platforms/ios/MobileUtils.h b/client/platforms/ios/MobileUtils.h
index cad9de9e..fe7549c5 100644
--- a/client/platforms/ios/MobileUtils.h
+++ b/client/platforms/ios/MobileUtils.h
@@ -8,12 +8,15 @@ class MobileUtils : public QObject
 {
     Q_OBJECT
 
-public:
-    MobileUtils() = delete;
+//public:
+//    MobileUtils() = delete;
 
 public slots:
     static void shareText(const QStringList &filesToSend);
-    static void openFile();
+    QString openFile();
+    
+signals:
+    void finished();
 };
 
 #endif // MOBILEUTILS_H
diff --git a/client/platforms/ios/MobileUtils.mm b/client/platforms/ios/MobileUtils.mm
index 63ee0364..7f5fc1e6 100644
--- a/client/platforms/ios/MobileUtils.mm
+++ b/client/platforms/ios/MobileUtils.mm
@@ -4,6 +4,7 @@
 #include <Security/Security.h>
 
 #include <QDebug>
+#include <QEventLoop>
 
 static UIViewController* getViewController() {
     NSArray *windows = [[UIApplication sharedApplication]windows];
@@ -35,24 +36,33 @@ void MobileUtils::shareText(const QStringList& filesToSend) {
     }
 }
 
+typedef void (^FileSelectionCallback)(NSString *fileContent);
+
 @interface MyFilePickerDelegate : NSObject <UIDocumentPickerDelegate>
+
+@property (nonatomic, copy) FileSelectionCallback fileSelectionCallback;
+
 @end
 
 @implementation MyFilePickerDelegate
 
 - (void)documentPicker:(UIDocumentPickerViewController *)controller didPickDocumentsAtURLs:(NSArray<NSURL *> *)urls {
     for (NSURL *url in urls) {
-        NSString *filePath = [url path];
-        
-        NSData *fileData = [NSData dataWithContentsOfFile:filePath];
-        NSString *fileContent = [[NSString alloc] initWithData:fileData encoding:NSUTF8StringEncoding];
-        NSLog(@"Содержимое файла: %@", fileContent);
+        if (self.fileSelectionCallback) {
+            self.fileSelectionCallback([url path]);
+        }
+    }
+}
+    
+- (void)documentPickerWasCancelled:(UIDocumentPickerViewController *)controller {
+    if (self.fileSelectionCallback) {
+        self.fileSelectionCallback(nil);
     }
 }
 
 @end
 
-void MobileUtils::openFile() {
+QString MobileUtils::openFile() {
     UIDocumentPickerViewController *documentPicker = [[UIDocumentPickerViewController alloc] initWithDocumentTypes:@[@"public.item"] inMode:UIDocumentPickerModeOpen];
 
     MyFilePickerDelegate *filePickerDelegate = [[MyFilePickerDelegate alloc] init];
@@ -62,4 +72,21 @@ void MobileUtils::openFile() {
     if (!qtController) return;
 
     [qtController presentViewController:documentPicker animated:YES completion:nil];
+    
+    __block QString path1;
+
+    filePickerDelegate.fileSelectionCallback = ^(NSString *filePath) {
+        if (filePath) {
+            path1 = QString::fromUtf8(filePath.UTF8String);
+        } else {
+            path1 = QString("");
+        }
+        emit finished();
+    };
+
+    QEventLoop wait1;
+    QObject::connect(this, &MobileUtils::finished, &wait1, &QEventLoop::quit);
+    wait1.exec();
+    
+    return path1;
 }
diff --git a/client/ui/controllers/systemController.cpp b/client/ui/controllers/systemController.cpp
index a6210b69..8e1fb6c8 100644
--- a/client/ui/controllers/systemController.cpp
+++ b/client/ui/controllers/systemController.cpp
@@ -8,6 +8,7 @@
 #include <QQuickItem>
 #include <QStandardPaths>
 #include <QUrl>
+#include <QtConcurrent>
 
 #ifdef Q_OS_ANDROID
     #include "platforms/android/android_controller.h"
@@ -58,8 +59,10 @@ QString SystemController::getFileName(const QString &acceptLabel, const QString
 {
     QString fileName;
 #ifdef Q_OS_IOS
-    MobileUtils::openFile();
 
+    MobileUtils mobileUtils;
+    fileName = mobileUtils.openFile();
+    
     CFURLRef url = CFURLCreateWithFileSystemPath(
             kCFAllocatorDefault,
             CFStringCreateWithCharacters(0, reinterpret_cast<const UniChar *>(fileName.unicode()), fileName.length()),

From 0a5657738e98544135abebf8d531f5906cecf349 Mon Sep 17 00:00:00 2001
From: "vladimir.kuznetsov" <nethiuswork@gmail.com>
Date: Sat, 9 Sep 2023 15:00:34 +0500
Subject: [PATCH 100/278] added a wait for the file dialog to close when
 sharing ios files

---
 client/platforms/ios/MobileUtils.h         |  8 +--
 client/platforms/ios/MobileUtils.mm        | 58 ++++++++++++++--------
 client/ui/controllers/systemController.cpp |  7 ++-
 3 files changed, 47 insertions(+), 26 deletions(-)

diff --git a/client/platforms/ios/MobileUtils.h b/client/platforms/ios/MobileUtils.h
index fe7549c5..04a12c51 100644
--- a/client/platforms/ios/MobileUtils.h
+++ b/client/platforms/ios/MobileUtils.h
@@ -7,12 +7,12 @@
 class MobileUtils : public QObject
 {
     Q_OBJECT
-
-//public:
-//    MobileUtils() = delete;
+    
+public:
+    explicit MobileUtils(QObject *parent = nullptr);
 
 public slots:
-    static void shareText(const QStringList &filesToSend);
+    bool shareText(const QStringList &filesToSend);
     QString openFile();
     
 signals:
diff --git a/client/platforms/ios/MobileUtils.mm b/client/platforms/ios/MobileUtils.mm
index 7f5fc1e6..fbf26ffd 100644
--- a/client/platforms/ios/MobileUtils.mm
+++ b/client/platforms/ios/MobileUtils.mm
@@ -3,7 +3,6 @@
 #include <UIKit/UIKit.h>
 #include <Security/Security.h>
 
-#include <QDebug>
 #include <QEventLoop>
 
 static UIViewController* getViewController() {
@@ -16,7 +15,11 @@ static UIViewController* getViewController() {
     return nil;
 }
 
-void MobileUtils::shareText(const QStringList& filesToSend) {
+MobileUtils::MobileUtils(QObject *parent) : QObject(parent) {
+    
+}
+
+bool MobileUtils::shareText(const QStringList& filesToSend) {
     NSMutableArray *sharingItems = [NSMutableArray new];
 
     for (int i = 0; i < filesToSend.size(); i++) {
@@ -28,35 +31,48 @@ void MobileUtils::shareText(const QStringList& filesToSend) {
     if (!qtController) return;
 
     UIActivityViewController *activityController = [[UIActivityViewController alloc] initWithActivityItems:sharingItems applicationActivities:nil];
+    
+    __block bool isAccepted = false;
+    
+    [activityController setCompletionWithItemsHandler:^(NSString *activityType, BOOL completed, NSArray *returnedItems, NSError *activityError) {
+        isAccepted = completed;
+        emit finished();
+    }];
 
     [qtController presentViewController:activityController animated:YES completion:nil];
     UIPopoverPresentationController *popController = activityController.popoverPresentationController;
     if (popController) {
         popController.sourceView = qtController.view;
     }
+    
+    QEventLoop wait;
+    QObject::connect(this, &MobileUtils::finished, &wait, &QEventLoop::quit);
+    wait.exec();
+    
+    return isAccepted;
 }
 
-typedef void (^FileSelectionCallback)(NSString *fileContent);
+typedef void (^DocumentPickerClosedCallback)(NSString *path);
 
-@interface MyFilePickerDelegate : NSObject <UIDocumentPickerDelegate>
+@interface DocumentPickerDelegate : NSObject <UIDocumentPickerDelegate>
 
-@property (nonatomic, copy) FileSelectionCallback fileSelectionCallback;
+@property (nonatomic, copy) DocumentPickerClosedCallback documentPickerClosedCallback;
 
 @end
 
-@implementation MyFilePickerDelegate
+@implementation DocumentPickerDelegate 
 
 - (void)documentPicker:(UIDocumentPickerViewController *)controller didPickDocumentsAtURLs:(NSArray<NSURL *> *)urls {
     for (NSURL *url in urls) {
-        if (self.fileSelectionCallback) {
-            self.fileSelectionCallback([url path]);
+        if (self.documentPickerClosedCallback) {
+            self.documentPickerClosedCallback([url path]);
         }
     }
 }
     
 - (void)documentPickerWasCancelled:(UIDocumentPickerViewController *)controller {
-    if (self.fileSelectionCallback) {
-        self.fileSelectionCallback(nil);
+    if (self.documentPickerClosedCallback) {
+        self.documentPickerClosedCallback(nil);
     }
 }
 
@@ -65,28 +81,28 @@ typedef void (^FileSelectionCallback)(NSString *fileContent);
 QString MobileUtils::openFile() {
     UIDocumentPickerViewController *documentPicker = [[UIDocumentPickerViewController alloc] initWithDocumentTypes:@[@"public.item"] inMode:UIDocumentPickerModeOpen];
 
-    MyFilePickerDelegate *filePickerDelegate = [[MyFilePickerDelegate alloc] init];
-    documentPicker.delegate = filePickerDelegate;
+    DocumentPickerDelegate *documentPickerDelegate = [[DocumentPickerDelegate alloc] init];
+    documentPicker.delegate = documentPickerDelegate;
 
     UIViewController *qtController = getViewController();
     if (!qtController) return;
 
     [qtController presentViewController:documentPicker animated:YES completion:nil];
     
-    __block QString path1;
+    __block QString filePath;
 
-    filePickerDelegate.fileSelectionCallback = ^(NSString *filePath) {
-        if (filePath) {
-            path1 = QString::fromUtf8(filePath.UTF8String);
+    documentPickerDelegate.documentPickerClosedCallback = ^(NSString *path) {
+        if (path) {
+            filePath = QString::fromUtf8(path.UTF8String);
         } else {
-            path1 = QString("");
+            filePath = QString();
         }
         emit finished();
     };
 
-    QEventLoop wait1;
-    QObject::connect(this, &MobileUtils::finished, &wait1, &QEventLoop::quit);
-    wait1.exec();
+    QEventLoop wait;
+    QObject::connect(this, &MobileUtils::finished, &wait, &QEventLoop::quit);
+    wait.exec();
     
-    return path1;
+    return filePath;
 }
diff --git a/client/ui/controllers/systemController.cpp b/client/ui/controllers/systemController.cpp
index 8e1fb6c8..7de071cc 100644
--- a/client/ui/controllers/systemController.cpp
+++ b/client/ui/controllers/systemController.cpp
@@ -46,7 +46,9 @@ void SystemController::saveFile(QString fileName, const QString &data)
 #ifdef Q_OS_IOS
     QStringList filesToSend;
     filesToSend.append(fileUrl.toString());
-    MobileUtils::shareText(filesToSend);
+    MobileUtils mobileUtils;
+    // todo check if save successful
+    mobileUtils.shareText(filesToSend);
     return;
 #else
     QFileInfo fi(fileName);
@@ -62,6 +64,9 @@ QString SystemController::getFileName(const QString &acceptLabel, const QString
 
     MobileUtils mobileUtils;
     fileName = mobileUtils.openFile();
+    if (fileName.isEmpty()) {
+        return fileName;
+    }
     
     CFURLRef url = CFURLCreateWithFileSystemPath(
             kCFAllocatorDefault,

From 4bf6cce4ba3792fb9d5a16310207467d197c0ba9 Mon Sep 17 00:00:00 2001
From: "vladimir.kuznetsov" <nethiuswork@gmail.com>
Date: Sat, 9 Sep 2023 18:25:44 +0500
Subject: [PATCH 101/278] fixed return type of sharedText function

---
 client/platforms/ios/MobileUtils.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/platforms/ios/MobileUtils.cpp b/client/platforms/ios/MobileUtils.cpp
index fd20fcda..18378113 100644
--- a/client/platforms/ios/MobileUtils.cpp
+++ b/client/platforms/ios/MobileUtils.cpp
@@ -1,6 +1,6 @@
 #include "MobileUtils.h"
 
-void MobileUtils::shareText(const QStringList &)
+bool MobileUtils::shareText(const QStringList &)
 {
 }
 

From 89096554e83471caabd9da8dcfcd0878e616c3a4 Mon Sep 17 00:00:00 2001
From: "vladimir.kuznetsov" <nethiuswork@gmail.com>
Date: Sat, 9 Sep 2023 18:31:04 +0500
Subject: [PATCH 102/278] added constructor for MobileUtils.cpp

---
 client/platforms/ios/MobileUtils.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/client/platforms/ios/MobileUtils.cpp b/client/platforms/ios/MobileUtils.cpp
index 18378113..14c0854a 100644
--- a/client/platforms/ios/MobileUtils.cpp
+++ b/client/platforms/ios/MobileUtils.cpp
@@ -1,7 +1,12 @@
 #include "MobileUtils.h"
 
+MobileUtils::MobileUtils(QObject *parent) : QObject(parent)
+{
+}
+
 bool MobileUtils::shareText(const QStringList &)
 {
+    return false;
 }
 
 QString MobileUtils::openFile()

From f751657903f13fda0dd59c45c1ab3a094d28b13d Mon Sep 17 00:00:00 2001
From: "vladimir.kuznetsov" <nethiuswork@gmail.com>
Date: Sat, 9 Sep 2023 22:41:36 +0500
Subject: [PATCH 103/278] fixed false triggering of swipes for the main menu
 drawer of PageHome

---
 client/ui/qml/Pages2/PageHome.qml | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/client/ui/qml/Pages2/PageHome.qml b/client/ui/qml/Pages2/PageHome.qml
index 0c778215..01ba3032 100644
--- a/client/ui/qml/Pages2/PageHome.qml
+++ b/client/ui/qml/Pages2/PageHome.qml
@@ -129,7 +129,13 @@ PageType {
     DrawerType {
         id: menu
 
-        interactive: true
+        interactive: {
+            if (stackView && stackView.currentItem) {
+                return (stackView.currentItem.objectName === PageController.getPagePath(PageEnum.PageHome)) ? true : false
+            } else {
+                return false
+            }
+        }
         dragMargin: buttonBackground.height + 56 // page start tabBar height
 
         width: parent.width

From 551f7616f00aac45b86e1c82c0efe5aac583aad4 Mon Sep 17 00:00:00 2001
From: "vladimir.kuznetsov" <nethiuswork@gmail.com>
Date: Mon, 11 Sep 2023 13:56:49 +0500
Subject: [PATCH 104/278] fixed the display of the protocol list in the
 settings when attempting to install a container that is already installed on
 the server

---
 client/core/servercontroller.cpp           | 25 ++++++++++++++++------
 client/ui/qml/Pages2/PageSettingsAbout.qml |  2 +-
 2 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/client/core/servercontroller.cpp b/client/core/servercontroller.cpp
index ef7a8024..b0f8146f 100644
--- a/client/core/servercontroller.cpp
+++ b/client/core/servercontroller.cpp
@@ -665,7 +665,8 @@ ErrorCode ServerController::isServerPortBusy(const ServerCredentials &credential
     QString transportProto = containerConfig.value(config_key::transport_proto).toString(defaultTransportProto);
 
     // TODO reimplement with netstat
-    QString script = QString("which lsof &>/dev/null || true && sudo lsof -i -P -n 2>/dev/null | grep -E ':%1 ").arg(port);
+    QString script =
+            QString("which lsof &>/dev/null || true && sudo lsof -i -P -n 2>/dev/null | grep -E ':%1 ").arg(port);
     for (auto &port : fixedPorts) {
         script = script.append("|:%1").arg(port);
     }
@@ -739,8 +740,10 @@ ErrorCode ServerController::isServerDpkgBusy(const ServerCredentials &credential
                                   genVarsForScript(credentials)),
                       cbReadStdOut, cbReadStdErr);
 
-            if (stdOut.contains("Packet manager not found")) return ErrorCode::ServerPacketManagerError;
-            if (stdOut.contains("fuser not installed")) return ErrorCode::NoError;
+            if (stdOut.contains("Packet manager not found"))
+                return ErrorCode::ServerPacketManagerError;
+            if (stdOut.contains("fuser not installed"))
+                return ErrorCode::NoError;
 
             if (stdOut.isEmpty()) {
                 return ErrorCode::NoError;
@@ -798,11 +801,19 @@ ErrorCode ServerController::getAlreadyInstalledContainers(const ServerCredential
             QString port = containerAndPortMatch.captured(2);
             QString transportProto = containerAndPortMatch.captured(3);
             DockerContainer container = ContainerProps::containerFromString(name);
+
+            QJsonObject config;
             Proto mainProto = ContainerProps::defaultProtocol(container);
-            QJsonObject config { { config_key::container, name },
-                                 { ProtocolProps::protoToString(mainProto),
-                                   QJsonObject { { config_key::port, port },
-                                                 { config_key::transport_proto, transportProto } } } };
+            for (auto protocol : ContainerProps::protocolsForContainer(container)) {
+                QJsonObject containerConfig;
+                if (protocol == mainProto) {
+                    containerConfig.insert(config_key::port, port);
+                    containerConfig.insert(config_key::transport_proto, transportProto);
+
+                    config.insert(config_key::container, ContainerProps::containerToString(container));
+                }
+                config.insert(ProtocolProps::protoToString(protocol), containerConfig);
+            }
             installedContainers.insert(container, config);
         }
     }
diff --git a/client/ui/qml/Pages2/PageSettingsAbout.qml b/client/ui/qml/Pages2/PageSettingsAbout.qml
index 1a6f7e80..e73ef88f 100644
--- a/client/ui/qml/Pages2/PageSettingsAbout.qml
+++ b/client/ui/qml/Pages2/PageSettingsAbout.qml
@@ -122,7 +122,7 @@ And if you don't like the app, all the more support it - the donation will be us
                 leftImageSource: "qrc:/images/controls/telegram.svg"
 
                 clickedFunction: function() {
-                    Qt.openUrlExternally(qsTr("https://t.me/amnezia_vpn_dev"))
+                    Qt.openUrlExternally(qsTr("https://t.me/amnezia_vpn_en"))
                 }
             }
 

From 844b552bf3ebfd86662fd83f29f9e420b28bb69d Mon Sep 17 00:00:00 2001
From: "vladimir.kuznetsov" <nethiuswork@gmail.com>
Date: Mon, 11 Sep 2023 14:45:10 +0500
Subject: [PATCH 105/278] removed duplicate function routeMode

---
 client/settings.cpp | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/client/settings.cpp b/client/settings.cpp
index 80a6be26..93871834 100644
--- a/client/settings.cpp
+++ b/client/settings.cpp
@@ -240,15 +240,6 @@ Settings::RouteMode Settings::routeMode() const
     return static_cast<RouteMode>(m_settings.value("Conf/routeMode", 0).toInt());
 }
 
-Settings::RouteMode Settings::routeMode() const
-{
-// TODO implement for mobiles
-#if defined(Q_OS_ANDROID) || defined(Q_OS_IOS)
-    return RouteMode::VpnAllSites;
-#endif
-    return static_cast<RouteMode>(m_settings.value("Conf/routeMode", 0).toInt());
-}
-
 bool Settings::addVpnSite(RouteMode mode, const QString &site, const QString &ip)
 {
     QVariantMap sites = vpnSites(mode);

From 97c0fe1ece0805784e860dee618aa879e53956aa Mon Sep 17 00:00:00 2001
From: "vladimir.kuznetsov" <nethiuswork@gmail.com>
Date: Mon, 11 Sep 2023 14:55:52 +0500
Subject: [PATCH 106/278] increased the application version to 4.0.5.1

---
 CMakeLists.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 875d664d..49b8fa16 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,11 +2,11 @@ cmake_minimum_required(VERSION 3.25.0 FATAL_ERROR)
 
 set(PROJECT AmneziaVPN)
 
-project(${PROJECT} VERSION 4.0.4.1
+project(${PROJECT} VERSION 4.0.5.1
         DESCRIPTION "AmneziaVPN"
         HOMEPAGE_URL "https://amnezia.org/"
 )
-set(RELEASE_DATE "2023-08-26")
+set(RELEASE_DATE "2023-09-11")
 set(APP_MAJOR_VERSION ${CMAKE_PROJECT_VERSION_MAJOR}.${CMAKE_PROJECT_VERSION_MINOR}.${CMAKE_PROJECT_VERSION_PATCH})
 
 if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")

From 72eb36f5b3f38daf8836fd6eecade21103d58e63 Mon Sep 17 00:00:00 2001
From: ronoaer <ronoaer@gmail.com>
Date: Mon, 11 Sep 2023 18:55:50 +0800
Subject: [PATCH 107/278] fixed the implicitWidth error in protocol
 installation page

---
 client/ui/qml/Pages2/PageSetupWizardProtocolSettings.qml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/client/ui/qml/Pages2/PageSetupWizardProtocolSettings.qml b/client/ui/qml/Pages2/PageSetupWizardProtocolSettings.qml
index 6552d873..07eef177 100644
--- a/client/ui/qml/Pages2/PageSetupWizardProtocolSettings.qml
+++ b/client/ui/qml/Pages2/PageSetupWizardProtocolSettings.qml
@@ -145,6 +145,7 @@ PageType {
                                     }
 
                                     TextField {
+                                        implicitWidth: parent.width
                                         Layout.fillWidth: true
                                         Layout.topMargin: 16
                                         Layout.bottomMargin: 16

From f8e5e9f675e01373bd82115f6a50777e7e2ed6fa Mon Sep 17 00:00:00 2001
From: "vladimir.kuznetsov" <nethiuswork@gmail.com>
Date: Mon, 11 Sep 2023 16:48:56 +0500
Subject: [PATCH 108/278] fixed display of cursorShape for all mouseArea

---
 client/ui/qml/Controls2/PageType.qml | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/client/ui/qml/Controls2/PageType.qml b/client/ui/qml/Controls2/PageType.qml
index 193fbcf2..2c176b40 100644
--- a/client/ui/qml/Controls2/PageType.qml
+++ b/client/ui/qml/Controls2/PageType.qml
@@ -7,15 +7,16 @@ Item {
 
     property StackView stackView: StackView.view
 
-    MouseArea {
-        z: 99
-        anchors.fill: parent
+//    MouseArea {
+//        id: globalMouseArea
+//        z: 99
+//        anchors.fill: parent
 
-        enabled: true
+//        enabled: true
 
-        onPressed: function(mouse) {
-            forceActiveFocus()
-            mouse.accepted = false
-        }
-    }
+//        onPressed: function(mouse) {
+//            forceActiveFocus()
+//            mouse.accepted = false
+//        }
+//    }
 }

From a964d955f41ee36ba12a1a5db615f71ced7f5c83 Mon Sep 17 00:00:00 2001
From: ronoaer <ronoaer@gmail.com>
Date: Mon, 11 Sep 2023 23:49:50 +0800
Subject: [PATCH 109/278] fixed scroll stuck on textarea in page
 OpenVpnSettings

---
 client/ui/qml/Controls2/TextAreaType.qml | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/client/ui/qml/Controls2/TextAreaType.qml b/client/ui/qml/Controls2/TextAreaType.qml
index a75ea55d..9b9921f8 100644
--- a/client/ui/qml/Controls2/TextAreaType.qml
+++ b/client/ui/qml/Controls2/TextAreaType.qml
@@ -15,6 +15,9 @@ Rectangle {
     radius: 16
 
     FlickableType {
+        id: fl
+        interactive: false
+
         anchors.top: parent.top
         anchors.bottom: parent.bottom
         contentHeight: textArea.implicitHeight
@@ -46,12 +49,23 @@ Rectangle {
                 }
             }
 
+            onCursorVisibleChanged:  {
+                if (textArea.cursorVisible) {
+                    fl.interactive = true
+                } else {
+                    fl.interactive = false
+                }
+            }
+
             wrapMode: Text.Wrap
 
             MouseArea {
                 anchors.fill: parent
                 acceptedButtons: Qt.RightButton
-                onClicked: contextMenu.open()
+                onClicked: {
+                    fl.interactive = true
+                    contextMenu.open()
+                }
             }
 
             ContextMenuType {

From f81ee1b267148295e40d7fc3453e1bd74f8938c0 Mon Sep 17 00:00:00 2001
From: ronoaer <ronoaer@gmail.com>
Date: Tue, 12 Sep 2023 21:38:36 +0800
Subject: [PATCH 110/278] reconnect to server when changed the protocol and
 status is connected or connnecting

---
 .../ui/qml/Components/HomeContainersListView.qml   | 14 ++++++++++++++
 client/ui/qml/Pages2/PageHome.qml                  |  2 +-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/client/ui/qml/Components/HomeContainersListView.qml b/client/ui/qml/Components/HomeContainersListView.qml
index f5d27c00..e265574b 100644
--- a/client/ui/qml/Components/HomeContainersListView.qml
+++ b/client/ui/qml/Components/HomeContainersListView.qml
@@ -62,8 +62,22 @@ ListView {
                 onClicked: {
                     if (checked) {
                         isDefault = true
+                        var needReconnected = false
+                        if (menuContent.currentIndex !== index) {
+                            needReconnected = true
+                        }
+
                         menuContent.currentIndex = index
                         containersDropDown.menuVisible = false
+
+
+                        if (needReconnected &&
+                                (ConnectionController.isConnected || ConnectionController.isConnectionInProgress)) {
+                            PageController.showNotificationMessage(qsTr("Reconnect via VPN Procotol: ") + name)
+                            PageController.goToPageHome()
+                            menu.visible = false
+                            ConnectionController.openConnection()
+                        }
                     } else {
                         ContainersModel.setCurrentlyProcessedContainerIndex(proxyContainersModel.mapToSource(index))
                         InstallController.setShouldCreateServer(false)
diff --git a/client/ui/qml/Pages2/PageHome.qml b/client/ui/qml/Pages2/PageHome.qml
index 01ba3032..b9bc2366 100644
--- a/client/ui/qml/Pages2/PageHome.qml
+++ b/client/ui/qml/Pages2/PageHome.qml
@@ -210,7 +210,7 @@ PageType {
                         }
 
                         Component.onCompleted: updateContainersModelFilters()
-                        currentIndex: ContainersModel.getDefaultContainer()
+                        currentIndex: ContainersModel.getDefaultContainer() - 1
                     }
                 }
             }

From 9c0f27edb49bbaa5605ca47fc83a54173b8a44a6 Mon Sep 17 00:00:00 2001
From: ronoaer <ronoaer@gmail.com>
Date: Wed, 13 Sep 2023 08:01:14 +0800
Subject: [PATCH 111/278] removed invalid codes

---
 client/ui/qml/Components/HomeContainersListView.qml | 5 +++--
 client/ui/qml/Pages2/PageHome.qml                   | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/client/ui/qml/Components/HomeContainersListView.qml b/client/ui/qml/Components/HomeContainersListView.qml
index e265574b..4708128f 100644
--- a/client/ui/qml/Components/HomeContainersListView.qml
+++ b/client/ui/qml/Components/HomeContainersListView.qml
@@ -61,12 +61,13 @@ ListView {
 
                 onClicked: {
                     if (checked) {
-                        isDefault = true
                         var needReconnected = false
-                        if (menuContent.currentIndex !== index) {
+                        if (!isDefault) {
                             needReconnected = true
                         }
 
+                        isDefault = true
+
                         menuContent.currentIndex = index
                         containersDropDown.menuVisible = false
 
diff --git a/client/ui/qml/Pages2/PageHome.qml b/client/ui/qml/Pages2/PageHome.qml
index b9bc2366..cedff2cb 100644
--- a/client/ui/qml/Pages2/PageHome.qml
+++ b/client/ui/qml/Pages2/PageHome.qml
@@ -210,7 +210,7 @@ PageType {
                         }
 
                         Component.onCompleted: updateContainersModelFilters()
-                        currentIndex: ContainersModel.getDefaultContainer() - 1
+                        // currentIndex: ContainersModel.getDefaultContainer() - 1
                     }
                 }
             }

From 3c9b42b9f73db40a652b3fac3e2b84706c5777f5 Mon Sep 17 00:00:00 2001
From: ronoaer <ronoaer@gmail.com>
Date: Wed, 13 Sep 2023 08:44:50 +0800
Subject: [PATCH 112/278] deleted unused code

---
 client/ui/qml/Pages2/PageHome.qml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/client/ui/qml/Pages2/PageHome.qml b/client/ui/qml/Pages2/PageHome.qml
index cedff2cb..c5ba89d0 100644
--- a/client/ui/qml/Pages2/PageHome.qml
+++ b/client/ui/qml/Pages2/PageHome.qml
@@ -210,7 +210,6 @@ PageType {
                         }
 
                         Component.onCompleted: updateContainersModelFilters()
-                        // currentIndex: ContainersModel.getDefaultContainer() - 1
                     }
                 }
             }

From 16cadfeae804885fdd5ce9561883410063d079d3 Mon Sep 17 00:00:00 2001
From: ronoaer <ronoaer@gmail.com>
Date: Wed, 13 Sep 2023 09:39:17 +0800
Subject: [PATCH 113/278] the cursor changes to Qt.PointingHandCursor when
 hovering over links

---
 client/ui/qml/Pages2/PageServiceSftpSettings.qml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/client/ui/qml/Pages2/PageServiceSftpSettings.qml b/client/ui/qml/Pages2/PageServiceSftpSettings.qml
index fead034b..9287bd20 100644
--- a/client/ui/qml/Pages2/PageServiceSftpSettings.qml
+++ b/client/ui/qml/Pages2/PageServiceSftpSettings.qml
@@ -218,6 +218,11 @@ PageType {
                             }
 
 
+                            MouseArea {
+                                anchors.fill: parent
+                                acceptedButtons: Qt.NoButton
+                                cursorShape: parent.hoveredLink ? Qt.PointingHandCursor : Qt.ArrowCursor
+                            }
                         }
 
                         BasicButtonType {

From e2aef1fc1d08c7a145de233e82791d6526d36ef5 Mon Sep 17 00:00:00 2001
From: "vladimir.kuznetsov" <nethiuswork@gmail.com>
Date: Wed, 13 Sep 2023 11:09:29 +0500
Subject: [PATCH 114/278] fixed display of installation errors on the initial
 installation screen

---
 client/ui/qml/Pages2/PageSetupWizardStart.qml | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/client/ui/qml/Pages2/PageSetupWizardStart.qml b/client/ui/qml/Pages2/PageSetupWizardStart.qml
index 36d90bd8..9f5e57a5 100644
--- a/client/ui/qml/Pages2/PageSetupWizardStart.qml
+++ b/client/ui/qml/Pages2/PageSetupWizardStart.qml
@@ -56,6 +56,20 @@ PageType {
         }
     }
 
+    Connections {
+        target: InstallController
+
+        function onInstallationErrorOccurred(errorMessage) {
+            PageController.showErrorMessage(errorMessage)
+
+            var currentPageName = tabBarStackView.currentItem.objectName
+
+            if (currentPageName === PageController.getPagePath(PageEnum.PageSetupWizardInstalling)) {
+                PageController.closePage()
+            }
+        }
+    }
+
     FlickableType {
         id: fl
         anchors.top: parent.top

From 4ae608ed936100fb7d7f8369cc5ecf11fcc45c37 Mon Sep 17 00:00:00 2001
From: "vladimir.kuznetsov" <nethiuswork@gmail.com>
Date: Wed, 13 Sep 2023 16:11:08 +0500
Subject: [PATCH 115/278] added import backup file from outside for ios

---
 client/amnezia_application.cpp                |   5 +
 client/containers/containers_defs.cpp         |   4 +-
 client/platforms/ios/QtAppDelegate.mm         |  14 +-
 client/platforms/ios/ios_controller.h         |  50 +++---
 client/protocols/protocols_defs.cpp           | 149 +++++++++---------
 client/ui/controllers/pageController.h        |   1 +
 client/ui/controllers/settingsController.h    |   2 +
 .../qml/Components/ShareConnectionDrawer.qml  |   4 +-
 client/ui/qml/Pages2/PageSettingsBackup.qml   |  35 +++-
 client/ui/qml/main2.qml                       |   4 +
 10 files changed, 157 insertions(+), 111 deletions(-)

diff --git a/client/amnezia_application.cpp b/client/amnezia_application.cpp
index 1725e1f8..de75db85 100644
--- a/client/amnezia_application.cpp
+++ b/client/amnezia_application.cpp
@@ -117,6 +117,11 @@ void AmneziaApplication::init()
             &ImportController::extractConfigFromData);
     connect(IosController::Instance(), &IosController::importConfigFromOutside, m_pageController.get(),
             &PageController::goToPageViewConfig);
+
+    connect(IosController::Instance(), &IosController::importBackupFromOutside, m_pageController.get(),
+            &PageController::goToPageSettingsBackup);
+    connect(IosController::Instance(), &IosController::importBackupFromOutside, m_settingsController.get(),
+            &SettingsController::importBackupFromOutside);
 #endif
 
     m_notificationHandler.reset(NotificationHandler::create(nullptr));
diff --git a/client/containers/containers_defs.cpp b/client/containers/containers_defs.cpp
index 98b2d0da..766d89da 100644
--- a/client/containers/containers_defs.cpp
+++ b/client/containers/containers_defs.cpp
@@ -86,7 +86,7 @@ QMap<DockerContainer, QString> ContainerProps::containerHumanNames()
              { DockerContainer::WireGuard, "WireGuard" },
              { DockerContainer::Ipsec, QObject::tr("IPsec") },
 
-             { DockerContainer::TorWebSite, QObject::tr("Web site in Tor network") },
+             { DockerContainer::TorWebSite, QObject::tr("Website in Tor network") },
              { DockerContainer::Dns, QObject::tr("Amnezia DNS") },
              //{DockerContainer::FileShare, QObject::tr("SMB file sharing service")},
              { DockerContainer::Sftp, QObject::tr("Sftp file sharing service") } };
@@ -129,7 +129,7 @@ QMap<DockerContainer, QString> ContainerProps::containerDetailedDescriptions()
              { DockerContainer::WireGuard, QObject::tr("WireGuard container") },
              { DockerContainer::Ipsec, QObject::tr("IPsec container") },
 
-             { DockerContainer::TorWebSite, QObject::tr("Web site in Tor network") },
+             { DockerContainer::TorWebSite, QObject::tr("Website in Tor network") },
              { DockerContainer::Dns, QObject::tr("DNS Service") },
              //{DockerContainer::FileShare, QObject::tr("SMB file sharing service - is Window file sharing protocol")},
              { DockerContainer::Sftp, QObject::tr("Sftp file sharing service - is secure FTP service") } };
diff --git a/client/platforms/ios/QtAppDelegate.mm b/client/platforms/ios/QtAppDelegate.mm
index 7528f2ff..48cef914 100644
--- a/client/platforms/ios/QtAppDelegate.mm
+++ b/client/platforms/ios/QtAppDelegate.mm
@@ -76,11 +76,15 @@
         QString filePath(url.path.UTF8String);
         if (filePath.isEmpty()) return NO;
 
-        QFile file(filePath);
-        bool isOpenFile = file.open(QIODevice::ReadOnly);
-        QByteArray data = file.readAll();
-        
-        IosController::Instance()->importConfigFromOutside(QString(data));
+        if (filePath.contains("backup")) {
+            IosController::Instance()->importBackupFromOutside(filePath);
+        } else {
+            QFile file(filePath);
+            bool isOpenFile = file.open(QIODevice::ReadOnly);
+            QByteArray data = file.readAll();
+            
+            IosController::Instance()->importConfigFromOutside(QString(data));
+        }
         return YES;
     }
     return NO;
diff --git a/client/platforms/ios/ios_controller.h b/client/platforms/ios/ios_controller.h
index a81498af..ea8adbc0 100644
--- a/client/platforms/ios/ios_controller.h
+++ b/client/platforms/ios/ios_controller.h
@@ -4,28 +4,30 @@
 #include "protocols/vpnprotocol.h"
 
 #ifdef __OBJC__
-#import <Foundation/Foundation.h>
+    #import <Foundation/Foundation.h>
 @class NETunnelProviderManager;
 #endif
 
 using namespace amnezia;
 
-struct Action {
-    static const char* start;
-    static const char* restart;
-    static const char* stop;
-    static const char* getTunnelId;
-    static const char* getStatus;
+struct Action
+{
+    static const char *start;
+    static const char *restart;
+    static const char *stop;
+    static const char *getTunnelId;
+    static const char *getStatus;
 };
 
-struct MessageKey {
-    static const char* action;
-    static const char* tunnelId;
-    static const char* config;
-    static const char* errorCode;
-    static const char* host;
-    static const char* port;
-    static const char* isOnDemand;
+struct MessageKey
+{
+    static const char *action;
+    static const char *tunnelId;
+    static const char *config;
+    static const char *errorCode;
+    static const char *host;
+    static const char *port;
+    static const char *isOnDemand;
 };
 
 class IosController : public QObject
@@ -33,27 +35,27 @@ class IosController : public QObject
     Q_OBJECT
 
 public:
-    static IosController* Instance();
+    static IosController *Instance();
 
     virtual ~IosController() override = default;
 
     bool initialize();
-    bool connectVpn(amnezia::Proto proto, const QJsonObject& configuration);
+    bool connectVpn(amnezia::Proto proto, const QJsonObject &configuration);
     void disconnectVpn();
 
     void vpnStatusDidChange(void *pNotification);
     void vpnConfigurationDidChange(void *pNotification);
 
-    void getBackendLogs(std::function<void (const QString &)> &&callback);
+    void getBackendLogs(std::function<void(const QString &)> &&callback);
     void checkStatus();
 signals:
     void connectionStateChanged(Vpn::ConnectionState state);
     void bytesChanged(quint64 receivedBytes, quint64 sentBytes);
     void importConfigFromOutside(const QString);
+    void importBackupFromOutside(const QString);
 
 protected slots:
 
-
 private:
     explicit IosController();
 
@@ -67,12 +69,12 @@ private:
     void startTunnel();
 
 private:
-    void *m_iosControllerWrapper{};
+    void *m_iosControllerWrapper {};
 #ifdef __OBJC__
-    NETunnelProviderManager *m_currentTunnel{};
-    NSString *m_serverAddress{};
-    bool isOurManager(NETunnelProviderManager* manager);
-    void sendVpnExtensionMessage(NSDictionary* message, std::function<void(NSDictionary*)> callback = nullptr);
+    NETunnelProviderManager *m_currentTunnel {};
+    NSString *m_serverAddress {};
+    bool isOurManager(NETunnelProviderManager *manager);
+    void sendVpnExtensionMessage(NSDictionary *message, std::function<void(NSDictionary *)> callback = nullptr);
 #endif
 
     amnezia::Proto m_proto;
diff --git a/client/protocols/protocols_defs.cpp b/client/protocols/protocols_defs.cpp
index 63351311..5f8600db 100644
--- a/client/protocols/protocols_defs.cpp
+++ b/client/protocols/protocols_defs.cpp
@@ -10,17 +10,21 @@ QDebug operator<<(QDebug debug, const amnezia::ProtocolEnumNS::Proto &p)
     return debug;
 }
 
-amnezia::Proto ProtocolProps::protoFromString(QString proto){
+amnezia::Proto ProtocolProps::protoFromString(QString proto)
+{
     QMetaEnum metaEnum = QMetaEnum::fromType<Proto>();
     for (int i = 0; i < metaEnum.keyCount(); ++i) {
         Proto p = static_cast<Proto>(i);
-        if (proto == protoToString(p)) return p;
+        if (proto == protoToString(p))
+            return p;
     }
     return Proto::Any;
 }
 
-QString ProtocolProps::protoToString(amnezia::Proto p){
-    if (p == Proto::Any) return "";
+QString ProtocolProps::protoToString(amnezia::Proto p)
+{
+    if (p == Proto::Any)
+        return "";
 
     QMetaEnum metaEnum = QMetaEnum::fromType<Proto>();
     QString protoKey = metaEnum.valueToKey(static_cast<int>(p));
@@ -43,7 +47,8 @@ TransportProto ProtocolProps::transportProtoFromString(QString p)
     QMetaEnum metaEnum = QMetaEnum::fromType<TransportProto>();
     for (int i = 0; i < metaEnum.keyCount(); ++i) {
         TransportProto tp = static_cast<TransportProto>(i);
-        if (p.toLower() == transportProtoToString(tp).toLower()) return tp;
+        if (p.toLower() == transportProtoToString(tp).toLower())
+            return tp;
     }
     return TransportProto::Udp;
 }
@@ -55,22 +60,19 @@ QString ProtocolProps::transportProtoToString(TransportProto proto, Proto p)
     return protoKey.toLower();
 }
 
-
 QMap<amnezia::Proto, QString> ProtocolProps::protocolHumanNames()
 {
-    return {
-        {Proto::OpenVpn, "OpenVPN"},
-        {Proto::ShadowSocks, "ShadowSocks"},
-        {Proto::Cloak, "Cloak"},
-        {Proto::WireGuard, "WireGuard"},
-        {Proto::Ikev2, "IKEv2"},
-        {Proto::L2tp, "L2TP"},
+    return { { Proto::OpenVpn, "OpenVPN" },
+             { Proto::ShadowSocks, "ShadowSocks" },
+             { Proto::Cloak, "Cloak" },
+             { Proto::WireGuard, "WireGuard" },
+             { Proto::Ikev2, "IKEv2" },
+             { Proto::L2tp, "L2TP" },
 
-        {Proto::TorWebSite, "Web site in Tor network"},
-        {Proto::Dns, "DNS Service"},
-        {Proto::FileShare, "File Sharing Service"},
-        {Proto::Sftp, QObject::tr("Sftp service")}
-    };
+             { Proto::TorWebSite, "Website in Tor network" },
+             { Proto::Dns, "DNS Service" },
+             { Proto::FileShare, "File Sharing Service" },
+             { Proto::Sftp, QObject::tr("Sftp service") } };
 }
 
 QMap<amnezia::Proto, QString> ProtocolProps::protocolDescriptions()
@@ -81,90 +83,89 @@ QMap<amnezia::Proto, QString> ProtocolProps::protocolDescriptions()
 amnezia::ServiceType ProtocolProps::protocolService(Proto p)
 {
     switch (p) {
-    case Proto::Any :          return ServiceType::None;
-    case Proto::OpenVpn :      return ServiceType::Vpn;
-    case Proto::Cloak :        return ServiceType::Vpn;
-    case Proto::ShadowSocks :  return ServiceType::Vpn;
-    case Proto::WireGuard :    return ServiceType::Vpn;
-    case Proto::TorWebSite :      return ServiceType::Other;
-    case Proto::Dns :          return ServiceType::Other;
-    case Proto::FileShare :    return ServiceType::Other;
-    default:                      return ServiceType::Other;
+    case Proto::Any: return ServiceType::None;
+    case Proto::OpenVpn: return ServiceType::Vpn;
+    case Proto::Cloak: return ServiceType::Vpn;
+    case Proto::ShadowSocks: return ServiceType::Vpn;
+    case Proto::WireGuard: return ServiceType::Vpn;
+    case Proto::TorWebSite: return ServiceType::Other;
+    case Proto::Dns: return ServiceType::Other;
+    case Proto::FileShare: return ServiceType::Other;
+    default: return ServiceType::Other;
     }
 }
 
 int ProtocolProps::defaultPort(Proto p)
 {
     switch (p) {
-    case Proto::Any :          return -1;
-    case Proto::OpenVpn :      return 1194;
-    case Proto::Cloak :        return 443;
-    case Proto::ShadowSocks :  return 6789;
-    case Proto::WireGuard :    return 51820;
-    case Proto::Ikev2 :        return -1;
-    case Proto::L2tp :         return -1;
+    case Proto::Any: return -1;
+    case Proto::OpenVpn: return 1194;
+    case Proto::Cloak: return 443;
+    case Proto::ShadowSocks: return 6789;
+    case Proto::WireGuard: return 51820;
+    case Proto::Ikev2: return -1;
+    case Proto::L2tp: return -1;
 
-    case Proto::TorWebSite :   return -1;
-    case Proto::Dns :          return 53;
-    case Proto::FileShare :    return 139;
-    case Proto::Sftp :         return 222;
-    default:                      return -1;
+    case Proto::TorWebSite: return -1;
+    case Proto::Dns: return 53;
+    case Proto::FileShare: return 139;
+    case Proto::Sftp: return 222;
+    default: return -1;
     }
 }
 
 bool ProtocolProps::defaultPortChangeable(Proto p)
 {
     switch (p) {
-    case Proto::Any :          return false;
-    case Proto::OpenVpn :      return true;
-    case Proto::Cloak :        return true;
-    case Proto::ShadowSocks :  return true;
-    case Proto::WireGuard :    return true;
-    case Proto::Ikev2 :        return false;
-    case Proto::L2tp :         return false;
+    case Proto::Any: return false;
+    case Proto::OpenVpn: return true;
+    case Proto::Cloak: return true;
+    case Proto::ShadowSocks: return true;
+    case Proto::WireGuard: return true;
+    case Proto::Ikev2: return false;
+    case Proto::L2tp: return false;
 
-
-    case Proto::TorWebSite :   return true;
-    case Proto::Dns :          return false;
-    case Proto::FileShare :    return false;
-    default:                      return -1;
+    case Proto::TorWebSite: return true;
+    case Proto::Dns: return false;
+    case Proto::FileShare: return false;
+    default: return -1;
     }
 }
 
 TransportProto ProtocolProps::defaultTransportProto(Proto p)
 {
     switch (p) {
-    case Proto::Any :          return TransportProto::Udp;
-    case Proto::OpenVpn :      return TransportProto::Udp;
-    case Proto::Cloak :        return TransportProto::Tcp;
-    case Proto::ShadowSocks :  return TransportProto::Tcp;
-    case Proto::WireGuard :    return TransportProto::Udp;
-    case Proto::Ikev2 :        return TransportProto::Udp;
-    case Proto::L2tp :         return TransportProto::Udp;
+    case Proto::Any: return TransportProto::Udp;
+    case Proto::OpenVpn: return TransportProto::Udp;
+    case Proto::Cloak: return TransportProto::Tcp;
+    case Proto::ShadowSocks: return TransportProto::Tcp;
+    case Proto::WireGuard: return TransportProto::Udp;
+    case Proto::Ikev2: return TransportProto::Udp;
+    case Proto::L2tp: return TransportProto::Udp;
     // non-vpn
-    case Proto::TorWebSite :   return TransportProto::Tcp;
-    case Proto::Dns :          return TransportProto::Udp;
-    case Proto::FileShare :    return TransportProto::Udp;
-    case Proto::Sftp :         return TransportProto::Tcp;
+    case Proto::TorWebSite: return TransportProto::Tcp;
+    case Proto::Dns: return TransportProto::Udp;
+    case Proto::FileShare: return TransportProto::Udp;
+    case Proto::Sftp: return TransportProto::Tcp;
     }
 }
 
 bool ProtocolProps::defaultTransportProtoChangeable(Proto p)
 {
     switch (p) {
-    case Proto::Any :          return false;
-    case Proto::OpenVpn :      return true;
-    case Proto::Cloak :        return false;
-    case Proto::ShadowSocks :  return false;
-    case Proto::WireGuard :    return false;
-    case Proto::Ikev2 :        return false;
-    case Proto::L2tp :         return false;
+    case Proto::Any: return false;
+    case Proto::OpenVpn: return true;
+    case Proto::Cloak: return false;
+    case Proto::ShadowSocks: return false;
+    case Proto::WireGuard: return false;
+    case Proto::Ikev2: return false;
+    case Proto::L2tp: return false;
     // non-vpn
-    case Proto::TorWebSite :   return false;
-    case Proto::Dns :          return false;
-    case Proto::FileShare :    return false;
-    case Proto::Sftp :         return false;
-    default:                      return false;
+    case Proto::TorWebSite: return false;
+    case Proto::Dns: return false;
+    case Proto::FileShare: return false;
+    case Proto::Sftp: return false;
+    default: return false;
     }
 }
 
diff --git a/client/ui/controllers/pageController.h b/client/ui/controllers/pageController.h
index 8d3da507..07e77283 100644
--- a/client/ui/controllers/pageController.h
+++ b/client/ui/controllers/pageController.h
@@ -85,6 +85,7 @@ signals:
     void goToPageSettings();
     void goToPageViewConfig();
     void goToPageSettingsServerServices();
+    void goToPageSettingsBackup();
 
     void closePage();
 
diff --git a/client/ui/controllers/settingsController.h b/client/ui/controllers/settingsController.h
index 3d96dc03..5a51a3b4 100644
--- a/client/ui/controllers/settingsController.h
+++ b/client/ui/controllers/settingsController.h
@@ -65,6 +65,8 @@ signals:
 
     void saveFile(const QString &fileName, const QString &data);
 
+    void importBackupFromOutside(QString filePath);
+
 private:
     QSharedPointer<ServersModel> m_serversModel;
     QSharedPointer<ContainersModel> m_containersModel;
diff --git a/client/ui/qml/Components/ShareConnectionDrawer.qml b/client/ui/qml/Components/ShareConnectionDrawer.qml
index 4d719d1a..6513ea7f 100644
--- a/client/ui/qml/Components/ShareConnectionDrawer.qml
+++ b/client/ui/qml/Components/ShareConnectionDrawer.qml
@@ -169,7 +169,7 @@ DrawerType {
                                 Layout.topMargin: 16
                             }
 
-                            TextArea {
+                            TextField {
                                 id: configText
 
                                 Layout.fillWidth: true
@@ -180,6 +180,8 @@ DrawerType {
                                 leftPadding: 0
                                 height: 24
 
+                                readOnly: true
+
                                 color: "#D7D8DB"
                                 selectionColor:  "#633303"
                                 selectedTextColor: "#D7D8DB"
diff --git a/client/ui/qml/Pages2/PageSettingsBackup.qml b/client/ui/qml/Pages2/PageSettingsBackup.qml
index 6a9ea58f..7a556dfb 100644
--- a/client/ui/qml/Pages2/PageSettingsBackup.qml
+++ b/client/ui/qml/Pages2/PageSettingsBackup.qml
@@ -10,6 +10,7 @@ import PageEnum 1.0
 import "./"
 import "../Controls2"
 import "../Config"
+import "../Components"
 import "../Controls2/TextTypes"
 
 PageType {
@@ -27,6 +28,10 @@ PageType {
             //goToStartPage()
             PageController.goToPageHome()
         }
+
+        function onImportBackupFromOutside(filePath) {
+            restoreBackup(filePath)
+        }
     }
 
     BackButtonType {
@@ -116,15 +121,35 @@ PageType {
                 text: qsTr("Restore from backup")
 
                 onClicked: {
-                    var fileName = SystemController.getFileName(qsTr("Open backup file"),
+                    var filePath = SystemController.getFileName(qsTr("Open backup file"),
                                                                 qsTr("Backup files (*.backup)"))
-                    if (fileName !== "") {
-                        PageController.showBusyIndicator(true)
-                        SettingsController.restoreAppConfig(fileName)
-                        PageController.showBusyIndicator(false)
+                    if (filePath !== "") {
+                        restoreBackup(filePath)
                     }
                 }
             }
         }
     }
+
+    function restoreBackup(filePath) {
+        questionDrawer.headerText = qsTr("Import settings from a backup file?")
+        questionDrawer.descriptionText = qsTr("All current settings will be reset");
+        questionDrawer.yesButtonText = qsTr("Continue")
+        questionDrawer.noButtonText = qsTr("Cancel")
+
+        questionDrawer.yesButtonFunction = function() {
+            questionDrawer.visible = false
+            PageController.showBusyIndicator(true)
+            SettingsController.restoreAppConfig(filePath)
+            PageController.showBusyIndicator(false)
+        }
+        questionDrawer.noButtonFunction = function() {
+            questionDrawer.visible = false
+        }
+        questionDrawer.visible = true
+    }
+
+    QuestionDrawer {
+        id: questionDrawer
+    }
 }
diff --git a/client/ui/qml/main2.qml b/client/ui/qml/main2.qml
index c9f38753..073fb4ad 100644
--- a/client/ui/qml/main2.qml
+++ b/client/ui/qml/main2.qml
@@ -81,6 +81,10 @@ Window  {
         function onShowPassphraseRequestDrawer() {
             privateKeyPassphraseDrawer.open()
         }
+
+        function onGoToPageSettingsBackup() {
+            PageController.goToPage(PageEnum.PageSettingsBackup)
+        }
     }
 
     Connections {

From d93b5a7b5c0e4657f6ae34a94604cee055676cf1 Mon Sep 17 00:00:00 2001
From: "vladimir.kuznetsov" <nethiuswork@gmail.com>
Date: Wed, 13 Sep 2023 16:34:03 +0500
Subject: [PATCH 116/278] fixed saving of configs for mobile platforms

---
 client/ui/qml/Components/ShareConnectionDrawer.qml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/ui/qml/Components/ShareConnectionDrawer.qml b/client/ui/qml/Components/ShareConnectionDrawer.qml
index 6513ea7f..3a8a4175 100644
--- a/client/ui/qml/Components/ShareConnectionDrawer.qml
+++ b/client/ui/qml/Components/ShareConnectionDrawer.qml
@@ -33,7 +33,7 @@ DrawerType {
     onClosed: {
         configExtension = ".vpn"
         configCaption = qsTr("Save AmneziaVPN config")
-        configFileName = "amnezia_config.vpn"
+        configFileName = "amnezia_config"
     }
 
     Item {
@@ -74,7 +74,7 @@ DrawerType {
                     onClicked: {
                         var fileName = ""
                         if (GC.isMobile()) {
-                            fileName = configFileName
+                            fileName = configFileName + configExtension
                         } else {
                             fileName = SystemController.getFileName(configCaption,
                                                                     qsTr("Config files (*" + configExtension + ")"),

From bfc8c10f3de9cb46170fbe059e378d655193999d Mon Sep 17 00:00:00 2001
From: ronoaer <ronoaer@gmail.com>
Date: Wed, 13 Sep 2023 20:49:44 +0800
Subject: [PATCH 117/278] auto reconection when current-server's defaul
 container hase been changed

---
 client/amnezia_application.cpp                 |  2 ++
 client/core/servercontroller.cpp               |  8 +++-----
 client/core/servercontroller.h                 | 12 ++++++++----
 client/ui/controllers/connectionController.cpp |  8 ++++++++
 client/ui/controllers/connectionController.h   |  3 +++
 client/ui/controllers/installController.cpp    | 18 ++++++++++++++++--
 client/ui/controllers/installController.h      |  4 +++-
 .../qml/Pages2/PageProtocolCloakSettings.qml   | 12 ++++++++++--
 .../qml/Pages2/PageProtocolOpenVpnSettings.qml | 12 ++++++++++--
 .../Pages2/PageProtocolShadowSocksSettings.qml | 13 +++++++++++--
 10 files changed, 74 insertions(+), 18 deletions(-)

diff --git a/client/amnezia_application.cpp b/client/amnezia_application.cpp
index 1725e1f8..cdcee5f4 100644
--- a/client/amnezia_application.cpp
+++ b/client/amnezia_application.cpp
@@ -336,6 +336,8 @@ void AmneziaApplication::initControllers()
             &PageController::showPassphraseRequestDrawer);
     connect(m_pageController.get(), &PageController::passphraseRequestDrawerClosed, m_installController.get(),
             &InstallController::setEncryptedPassphrase);
+    connect(m_installController.get(), &InstallController::currentContainerChanged, m_connectionController.get(),
+            &ConnectionController::onCurrentContainerChanged);
 
     m_importController.reset(new ImportController(m_serversModel, m_containersModel, m_settings));
     m_engine->rootContext()->setContextProperty("ImportController", m_importController.get());
diff --git a/client/core/servercontroller.cpp b/client/core/servercontroller.cpp
index b0f8146f..a82785eb 100644
--- a/client/core/servercontroller.cpp
+++ b/client/core/servercontroller.cpp
@@ -290,13 +290,11 @@ ErrorCode ServerController::setupContainer(const ServerCredentials &credentials,
     return startupContainerWorker(credentials, container, config);
 }
 
-ErrorCode ServerController::updateContainer(const ServerCredentials &credentials, DockerContainer container,
+ErrorCode ServerController::updateContainer(const bool reinstallRequired,
+                                            const ServerCredentials &credentials,
+                                            DockerContainer container,
                                             const QJsonObject &oldConfig, QJsonObject &newConfig)
 {
-    bool reinstallRequired = isReinstallContainerRequired(container, oldConfig, newConfig);
-    qDebug() << "ServerController::updateContainer for container" << container << "reinstall required is"
-             << reinstallRequired;
-
     if (reinstallRequired) {
         return setupContainer(credentials, container, newConfig, true);
     } else {
diff --git a/client/core/servercontroller.h b/client/core/servercontroller.h
index cb74d571..d3f242a3 100644
--- a/client/core/servercontroller.h
+++ b/client/core/servercontroller.h
@@ -26,8 +26,11 @@ public:
     ErrorCode removeContainer(const ServerCredentials &credentials, DockerContainer container);
     ErrorCode setupContainer(const ServerCredentials &credentials, DockerContainer container, QJsonObject &config,
                              bool isUpdate = false);
-    ErrorCode updateContainer(const ServerCredentials &credentials, DockerContainer container,
-                              const QJsonObject &oldConfig, QJsonObject &newConfig);
+    ErrorCode updateContainer(const bool reinstallRequired, const ServerCredentials &credentials,
+                              DockerContainer container,
+                              const QJsonObject &oldConfig,
+                              QJsonObject &newConfig);
+
     ErrorCode getAlreadyInstalledContainers(const ServerCredentials &credentials,
                                             QMap<DockerContainer, QJsonObject> &installedContainers);
 
@@ -60,6 +63,8 @@ public:
     ErrorCode getDecryptedPrivateKey(const ServerCredentials &credentials, QString &decryptedPrivateKey,
                                      const std::function<QString()> &callback);
 
+    bool isReinstallContainerRequired(DockerContainer container, const QJsonObject &oldConfig,
+                                      const QJsonObject &newConfig);
 private:
     ErrorCode installDockerWorker(const ServerCredentials &credentials, DockerContainer container);
     ErrorCode prepareHostWorker(const ServerCredentials &credentials, DockerContainer container,
@@ -72,8 +77,7 @@ private:
 
     ErrorCode isServerPortBusy(const ServerCredentials &credentials, DockerContainer container,
                                const QJsonObject &config);
-    bool isReinstallContainerRequired(DockerContainer container, const QJsonObject &oldConfig,
-                                      const QJsonObject &newConfig);
+
     ErrorCode isUserInSudo(const ServerCredentials &credentials, DockerContainer container);
     ErrorCode isServerDpkgBusy(const ServerCredentials &credentials, DockerContainer container);
 
diff --git a/client/ui/controllers/connectionController.cpp b/client/ui/controllers/connectionController.cpp
index 0754b024..180d96e7 100644
--- a/client/ui/controllers/connectionController.cpp
+++ b/client/ui/controllers/connectionController.cpp
@@ -118,6 +118,14 @@ void ConnectionController::onConnectionStateChanged(Vpn::ConnectionState state)
     emit connectionStateChanged();
 }
 
+void ConnectionController::onCurrentContainerChanged()
+{
+    if(m_isConnected || m_isConnectionInProgress) {
+        emit reconnectWithChangedContainer(tr("Settings updated successfully, Reconnnection..."));
+        openConnection();
+    }
+}
+
 QString ConnectionController::connectionStateText() const
 {
     return m_connectionStateText;
diff --git a/client/ui/controllers/connectionController.h b/client/ui/controllers/connectionController.h
index 5a35f9d8..5ee7a4ca 100644
--- a/client/ui/controllers/connectionController.h
+++ b/client/ui/controllers/connectionController.h
@@ -32,6 +32,8 @@ public slots:
     QString getLastConnectionError();
     void onConnectionStateChanged(Vpn::ConnectionState state);
 
+    void onCurrentContainerChanged();
+
 signals:
     void connectToVpn(int serverIndex, const ServerCredentials &credentials, DockerContainer container,
                       const QJsonObject &containerConfig);
@@ -39,6 +41,7 @@ signals:
     void connectionStateChanged();
 
     void connectionErrorOccurred(const QString &errorMessage);
+    void reconnectWithChangedContainer(const QString &message);
 
 private:
     QSharedPointer<ServersModel> m_serversModel;
diff --git a/client/ui/controllers/installController.cpp b/client/ui/controllers/installController.cpp
index c0e9acbb..2d82a4c2 100644
--- a/client/ui/controllers/installController.cpp
+++ b/client/ui/controllers/installController.cpp
@@ -254,12 +254,26 @@ void InstallController::updateContainer(QJsonObject config)
     ServerController serverController(m_settings);
     connect(&serverController, &ServerController::serverIsBusy, this, &InstallController::serverIsBusy);
 
-    auto errorCode = serverController.updateContainer(serverCredentials, container, oldContainerConfig, config);
+    bool reinstallRequired = serverController.isReinstallContainerRequired(container, oldContainerConfig, config);
+    auto errorCode = serverController.updateContainer(reinstallRequired, serverCredentials, container, oldContainerConfig, config);
     if (errorCode == ErrorCode::NoError) {
         m_containersModel->setData(modelIndex, config, ContainersModel::Roles::ConfigRole);
         m_protocolModel->updateModel(config);
 
-        emit updateContainerFinished();
+        bool isCurrentContainerChanged = false;
+        if (reinstallRequired &&
+            (serverIndex == m_serversModel->getDefaultServerIndex()) &&
+            (container == m_containersModel->getDefaultContainer()) ) {
+            isCurrentContainerChanged = true;
+        }
+
+
+        if (isCurrentContainerChanged) {
+            emit currentContainerChanged();
+        } else {
+            emit updateContainerFinished(tr("Settings updated successfully"));
+        }
+
         return;
     }
 
diff --git a/client/ui/controllers/installController.h b/client/ui/controllers/installController.h
index 47fc5dab..fc924d72 100644
--- a/client/ui/controllers/installController.h
+++ b/client/ui/controllers/installController.h
@@ -49,7 +49,7 @@ signals:
     void installContainerFinished(const QString &finishMessage, bool isServiceInstall);
     void installServerFinished(const QString &finishMessage);
 
-    void updateContainerFinished();
+    void updateContainerFinished(const QString& message);
 
     void scanServerFinished(bool isInstalledContainerFound);
 
@@ -66,6 +66,8 @@ signals:
 
     void serverIsBusy(const bool isBusy);
 
+    void currentContainerChanged();
+
 private:
     void installServer(DockerContainer container, QJsonObject &config);
     void installContainer(DockerContainer container, QJsonObject &config);
diff --git a/client/ui/qml/Pages2/PageProtocolCloakSettings.qml b/client/ui/qml/Pages2/PageProtocolCloakSettings.qml
index e15c5ec7..1dd9af71 100644
--- a/client/ui/qml/Pages2/PageProtocolCloakSettings.qml
+++ b/client/ui/qml/Pages2/PageProtocolCloakSettings.qml
@@ -13,11 +13,19 @@ import "../Components"
 PageType {
     id: root
 
+    Connections {
+        target: ConnectionController
+
+        function onReconnectWithChangedContainer(message) {
+            PageController.showNotificationMessage(message)
+        }
+    }
+
     Connections {
         target: InstallController
 
-        function onUpdateContainerFinished() {
-            PageController.showNotificationMessage(qsTr("Settings updated successfully"))
+        function onUpdateContainerFinished(message) {
+            PageController.showNotificationMessage(message)
         }
     }
 
diff --git a/client/ui/qml/Pages2/PageProtocolOpenVpnSettings.qml b/client/ui/qml/Pages2/PageProtocolOpenVpnSettings.qml
index aed1dbc1..741655ea 100644
--- a/client/ui/qml/Pages2/PageProtocolOpenVpnSettings.qml
+++ b/client/ui/qml/Pages2/PageProtocolOpenVpnSettings.qml
@@ -15,11 +15,19 @@ import "../Components"
 PageType {
     id: root
 
+    Connections {
+        target: ConnectionController
+
+        function onReconnectWithChangedContainer(message) {
+            PageController.showNotificationMessage(message)
+        }
+    }
+
     Connections {
         target: InstallController
 
-        function onUpdateContainerFinished() {
-            PageController.showNotificationMessage(qsTr("Settings updated successfully"))
+        function onUpdateContainerFinished(message) {
+            PageController.showNotificationMessage(message)
         }
     }
 
diff --git a/client/ui/qml/Pages2/PageProtocolShadowSocksSettings.qml b/client/ui/qml/Pages2/PageProtocolShadowSocksSettings.qml
index fe0ef8c3..f168efc1 100644
--- a/client/ui/qml/Pages2/PageProtocolShadowSocksSettings.qml
+++ b/client/ui/qml/Pages2/PageProtocolShadowSocksSettings.qml
@@ -13,11 +13,20 @@ import "../Components"
 PageType {
     id: root
 
+
+    Connections {
+        target: ConnectionController
+
+        function onReconnectWithChangedContainer(message) {
+            PageController.showNotificationMessage(message)
+        }
+    }
+
     Connections {
         target: InstallController
 
-        function onUpdateContainerFinished() {
-            PageController.showNotificationMessage(qsTr("Settings updated successfully"))
+        function onUpdateContainerFinished(message) {
+            PageController.showNotificationMessage(message)
         }
     }
 

From 2b3383a1639b7f1d0c5e04e6b02818c858fb038b Mon Sep 17 00:00:00 2001
From: "vladimir.kuznetsov" <nethiuswork@gmail.com>
Date: Thu, 14 Sep 2023 15:21:35 +0500
Subject: [PATCH 118/278] removed the transition animation between tabs in the
 main menu - fixed Drawer freezing when importing files from outside the
 application

---
 client/amnezia_application.cpp     | 27 +++++++++++++++------------
 client/ui/qml/Pages2/PageStart.qml |  4 ++--
 2 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/client/amnezia_application.cpp b/client/amnezia_application.cpp
index de75db85..efdb9221 100644
--- a/client/amnezia_application.cpp
+++ b/client/amnezia_application.cpp
@@ -105,23 +105,26 @@ void AmneziaApplication::init()
         return;
     }
 
-    connect(AndroidController::instance(), &AndroidController::importConfigFromOutside, m_importController.get(),
-            &ImportController::extractConfigFromData);
-    connect(AndroidController::instance(), &AndroidController::importConfigFromOutside, m_pageController.get(),
-            &PageController::goToPageViewConfig);
+    connect(AndroidController::instance(), &AndroidController::importConfigFromOutside, [this](QString data) {
+        m_pageController->replaceStartPage();
+        m_importController->extractConfigFromData(data);
+        m_pageController->goToPageViewConfig();
+    });
 #endif
 
 #ifdef Q_OS_IOS
     IosController::Instance()->initialize();
-    connect(IosController::Instance(), &IosController::importConfigFromOutside, m_importController.get(),
-            &ImportController::extractConfigFromData);
-    connect(IosController::Instance(), &IosController::importConfigFromOutside, m_pageController.get(),
-            &PageController::goToPageViewConfig);
+    connect(IosController::Instance(), &IosController::importConfigFromOutside, [this](QString data) {
+        m_pageController->replaceStartPage();
+        m_importController->extractConfigFromData(data);
+        m_pageController->goToPageViewConfig();
+    });
 
-    connect(IosController::Instance(), &IosController::importBackupFromOutside, m_pageController.get(),
-            &PageController::goToPageSettingsBackup);
-    connect(IosController::Instance(), &IosController::importBackupFromOutside, m_settingsController.get(),
-            &SettingsController::importBackupFromOutside);
+    connect(IosController::Instance(), &IosController::importBackupFromOutside, [this](QString filePath) {
+        m_pageController->replaceStartPage();
+        m_pageController->goToPageSettingsBackup();
+        m_settingsController->importBackupFromOutside(filePath);
+    });
 #endif
 
     m_notificationHandler.reset(NotificationHandler::create(nullptr));
diff --git a/client/ui/qml/Pages2/PageStart.qml b/client/ui/qml/Pages2/PageStart.qml
index 31474c12..7f9cb212 100644
--- a/client/ui/qml/Pages2/PageStart.qml
+++ b/client/ui/qml/Pages2/PageStart.qml
@@ -97,8 +97,8 @@ PageType {
 
         function goToTabBarPage(page) {
             var pagePath = PageController.getPagePath(page)
-            tabBarStackView.clear(StackView.PopTransition)
-            tabBarStackView.replace(pagePath, { "objectName" : pagePath })
+            tabBarStackView.clear(StackView.Immediate)
+            tabBarStackView.replace(pagePath, { "objectName" : pagePath }, StackView.Immediate)
         }
 
         Component.onCompleted: {

From 2fd25f53cca13e796183703d05c18c45e1f13445 Mon Sep 17 00:00:00 2001
From: "vladimir.kuznetsov" <nethiuswork@gmail.com>
Date: Thu, 14 Sep 2023 15:35:24 +0500
Subject: [PATCH 119/278] fixed auto-connection starting after starting the
 application

---
 client/amnezia_application.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/client/amnezia_application.cpp b/client/amnezia_application.cpp
index efdb9221..0d90cc5a 100644
--- a/client/amnezia_application.cpp
+++ b/client/amnezia_application.cpp
@@ -353,6 +353,9 @@ void AmneziaApplication::initControllers()
 
     m_settingsController.reset(new SettingsController(m_serversModel, m_containersModel, m_languageModel, m_settings));
     m_engine->rootContext()->setContextProperty("SettingsController", m_settingsController.get());
+    if (m_settingsController->isAutoStartEnabled() && m_serversModel->getDefaultServerIndex() >= 0) {
+        QTimer::singleShot(1000, this, [this]() { m_connectionController->openConnection(); });
+    }
 
     m_sitesController.reset(new SitesController(m_settings, m_vpnConnection, m_sitesModel));
     m_engine->rootContext()->setContextProperty("SitesController", m_sitesController.get());

From 8a3bdf136bb8e0d30f9d3e363b987ca98b0a313f Mon Sep 17 00:00:00 2001
From: ronoaer <ronoaer@gmail.com>
Date: Sat, 16 Sep 2023 08:05:43 +0800
Subject: [PATCH 120/278] added close button when drawer shown in the topright
 corner

---
 client/resources.qrc                          |  1 +
 client/ui/controllers/pageController.cpp      | 30 ++++++++++++++++
 client/ui/controllers/pageController.h        | 11 ++++++
 client/ui/qml/Controls2/DrawerType.qml        | 21 +++++++++++
 .../ui/qml/Controls2/TopCloseButtonType.qml   | 35 +++++++++++++++++++
 client/ui/qml/Pages2/PageShare.qml            |  6 ++++
 client/ui/qml/Pages2/PageStart.qml            | 20 +++++++++++
 7 files changed, 124 insertions(+)
 create mode 100644 client/ui/qml/Controls2/TopCloseButtonType.qml

diff --git a/client/resources.qrc b/client/resources.qrc
index d0ff176f..16372e07 100644
--- a/client/resources.qrc
+++ b/client/resources.qrc
@@ -213,5 +213,6 @@
         <file>images/controls/trash.svg</file>
         <file>images/controls/more-vertical.svg</file>
         <file>ui/qml/Controls2/ListViewWithLabelsType.qml</file>
+        <file>ui/qml/Controls2/TopCloseButtonType.qml</file>
     </qresource>
 </RCC>
diff --git a/client/ui/controllers/pageController.cpp b/client/ui/controllers/pageController.cpp
index 46a1b1fd..6501aea8 100644
--- a/client/ui/controllers/pageController.cpp
+++ b/client/ui/controllers/pageController.cpp
@@ -115,3 +115,33 @@ void PageController::showOnStartup()
 #endif
     }
 }
+
+void PageController::updateDrawerRootPage(PageLoader::PageEnum page)
+{
+    m_drwaerLayer = 0;
+    m_currentRootPage = page;
+}
+
+void PageController::goToDrawerRootPage()
+{
+
+    m_drwaerLayer = 0;
+
+    emit showTopCloseButton(false);
+    emit forceCloseDrawer();
+}
+
+void PageController::drawerOpen()
+{
+    m_drwaerLayer = m_drwaerLayer + 1;
+    emit showTopCloseButton(true);
+}
+
+void PageController::drawerClose()
+{
+    m_drwaerLayer = m_drwaerLayer -1;
+    if (m_drwaerLayer <= 0) {
+        emit showTopCloseButton(false);
+        m_drwaerLayer = 0;
+    }
+}
diff --git a/client/ui/controllers/pageController.h b/client/ui/controllers/pageController.h
index 07e77283..f4cac427 100644
--- a/client/ui/controllers/pageController.h
+++ b/client/ui/controllers/pageController.h
@@ -78,6 +78,11 @@ public slots:
 
     void showOnStartup();
 
+    void updateDrawerRootPage(PageLoader::PageEnum page);
+    void goToDrawerRootPage();
+    void drawerOpen();
+    void drawerClose();
+
 signals:
     void goToPage(PageLoader::PageEnum page, bool slide = true);
     void goToStartPage();
@@ -104,10 +109,16 @@ signals:
     void showPassphraseRequestDrawer();
     void passphraseRequestDrawerClosed(QString passphrase);
 
+    void showTopCloseButton(bool visible);
+    void forceCloseDrawer();
+
 private:
     QSharedPointer<ServersModel> m_serversModel;
 
     std::shared_ptr<Settings> m_settings;
+
+    PageLoader::PageEnum m_currentRootPage;
+    int m_drwaerLayer;
 };
 
 #endif // PAGECONTROLLER_H
diff --git a/client/ui/qml/Controls2/DrawerType.qml b/client/ui/qml/Controls2/DrawerType.qml
index 35d03449..2b70ef3c 100644
--- a/client/ui/qml/Controls2/DrawerType.qml
+++ b/client/ui/qml/Controls2/DrawerType.qml
@@ -2,6 +2,16 @@ import QtQuick
 import QtQuick.Controls
 
 Drawer {
+    property bool needCloseButton: true
+
+    Connections {
+        target: PageController
+
+        function onForceCloseDrawer() {
+            visible = false
+        }
+    }
+
     edge: Qt.BottomEdge
 
     clip: true
@@ -40,7 +50,18 @@ Drawer {
         }
     }
 
+    onOpened: {
+        if (needCloseButton) {
+            PageController.drawerOpen()
+        }
+    }
+
+
     onClosed: {
+        if (needCloseButton) {
+            PageController.drawerClose()
+        }
+
         var initialPageNavigationBarColor = PageController.getInitialPageNavigationBarColor()
         if (initialPageNavigationBarColor !== 0xFF1C1D21) {
             PageController.updateNavigationBarColor(initialPageNavigationBarColor)
diff --git a/client/ui/qml/Controls2/TopCloseButtonType.qml b/client/ui/qml/Controls2/TopCloseButtonType.qml
new file mode 100644
index 00000000..cd1406c4
--- /dev/null
+++ b/client/ui/qml/Controls2/TopCloseButtonType.qml
@@ -0,0 +1,35 @@
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Shapes
+
+Popup {
+    id: root
+
+    modal: false
+    closePolicy: Popup.NoAutoClose
+    width: 40
+    height: 40
+    padding: 4
+
+    visible: false
+
+    Overlay.modal: Rectangle {
+        color: Qt.rgba(14/255, 14/255, 17/255, 0.8)
+    }
+
+    background: Rectangle {
+        color: "transparent"
+    }
+
+    ImageButtonType {
+        image: "qrc:/images/svg/close_black_24dp.svg"
+        imageColor: "#D7D8DB"
+
+        implicitWidth: 32
+        implicitHeight: 32
+
+        onClicked: {
+            PageController.goToDrawerRootPage()
+        }
+    }
+}
diff --git a/client/ui/qml/Pages2/PageShare.qml b/client/ui/qml/Pages2/PageShare.qml
index 135c7fbc..623ceebf 100644
--- a/client/ui/qml/Pages2/PageShare.qml
+++ b/client/ui/qml/Pages2/PageShare.qml
@@ -27,6 +27,8 @@ PageType {
         target: ExportController
 
         function onGenerateConfig(type) {
+            shareConnectionDrawer.needCloseButton = false
+
             shareConnectionDrawer.open()
             shareConnectionDrawer.contentVisible = false
             PageController.showBusyIndicator(true)
@@ -58,6 +60,10 @@ PageType {
             }
 
             PageController.showBusyIndicator(false)
+
+            shareConnectionDrawer.needCloseButton = true
+            PageController.showTopCloseButton(true)
+
             shareConnectionDrawer.contentVisible = true
         }
 
diff --git a/client/ui/qml/Pages2/PageStart.qml b/client/ui/qml/Pages2/PageStart.qml
index 7f9cb212..e497c455 100644
--- a/client/ui/qml/Pages2/PageStart.qml
+++ b/client/ui/qml/Pages2/PageStart.qml
@@ -19,16 +19,22 @@ PageType {
         function onGoToPageHome() {
             tabBar.currentIndex = 0
             tabBarStackView.goToTabBarPage(PageEnum.PageHome)
+
+            PageController.updateDrawerRootPage(PageEnum.PageHome)
         }
 
         function onGoToPageSettings() {
             tabBar.currentIndex = 2
             tabBarStackView.goToTabBarPage(PageEnum.PageSettings)
+
+            PageController.updateDrawerRootPage(PageEnum.PageSettings)
         }
 
         function onGoToPageViewConfig() {
             var pagePath = PageController.getPagePath(PageEnum.PageSetupWizardViewConfig)
             tabBarStackView.push(pagePath, { "objectName" : pagePath }, StackView.PushTransition)
+
+            PageController.updateDrawerRootPage(PageEnum.PageSetupWizardViewConfig)
         }
 
         function onShowBusyIndicator(visible) {
@@ -37,6 +43,10 @@ PageType {
             tabBar.enabled = !visible
         }
 
+        function onShowTopCloseButton(visible) {
+            topCloseButton.visible = visible
+        }
+
         function onEnableTabBar(enabled) {
             tabBar.enabled = enabled
         }
@@ -55,6 +65,8 @@ PageType {
             } else {
                 tabBarStackView.push(pagePath, { "objectName" : pagePath }, StackView.Immediate)
             }
+
+            PageController.updateDrawerRootPage(page)
         }
 
         function onGoToStartPage() {
@@ -99,6 +111,8 @@ PageType {
             var pagePath = PageController.getPagePath(page)
             tabBarStackView.clear(StackView.Immediate)
             tabBarStackView.replace(pagePath, { "objectName" : pagePath }, StackView.Immediate)
+
+            PageController.updateDrawerRootPage(page)
         }
 
         Component.onCompleted: {
@@ -183,4 +197,10 @@ PageType {
         anchors.centerIn: parent
         z: 1
     }
+
+    TopCloseButtonType {
+        id: topCloseButton
+        x: tabBarStackView.width - topCloseButton.width
+        z: 1
+    }
 }

From 9eebee3ce38395c6b6e274fda2cfc828150194b2 Mon Sep 17 00:00:00 2001
From: ronoaer <ronoaer@gmail.com>
Date: Sat, 16 Sep 2023 16:20:19 +0800
Subject: [PATCH 121/278] fixed additional info can not be save in page OpenVpn
 settings

---
 client/ui/qml/Controls2/TextAreaType.qml      |  9 ++------
 .../Pages2/PageProtocolOpenVpnSettings.qml    | 22 ++++++++++++-------
 2 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/client/ui/qml/Controls2/TextAreaType.qml b/client/ui/qml/Controls2/TextAreaType.qml
index a75ea55d..a7e2fee7 100644
--- a/client/ui/qml/Controls2/TextAreaType.qml
+++ b/client/ui/qml/Controls2/TextAreaType.qml
@@ -6,7 +6,8 @@ Rectangle {
 
     property string placeholderText
     property string text
-    property var onEditingFinished
+    property alias textArea: textArea
+    property alias textAreaText: textArea.text
 
     height: 148
     color: "#1C1D21"
@@ -40,12 +41,6 @@ Rectangle {
             placeholderText: root.placeholderText
             text: root.text
 
-            onEditingFinished: {
-                if (root.onEditingFinished && typeof root.onEditingFinished === "function") {
-                    root.onEditingFinished()
-                }
-            }
-
             wrapMode: Text.Wrap
 
             MouseArea {
diff --git a/client/ui/qml/Pages2/PageProtocolOpenVpnSettings.qml b/client/ui/qml/Pages2/PageProtocolOpenVpnSettings.qml
index aed1dbc1..acb31327 100644
--- a/client/ui/qml/Pages2/PageProtocolOpenVpnSettings.qml
+++ b/client/ui/qml/Pages2/PageProtocolOpenVpnSettings.qml
@@ -312,12 +312,12 @@ PageType {
 
                             visible: additionalClientCommandsSwitcher.checked
 
-                            text: additionalClientCommands
+                            textAreaText: additionalClientCommands
                             placeholderText: qsTr("Commands:")
 
-                            onEditingFinished: {
-                                if (additionalClientCommands !== text) {
-                                    additionalClientCommands = text
+                            textArea.onEditingFinished: {
+                                if (additionalClientCommands !== textAreaText) {
+                                    additionalClientCommands = textAreaText
                                 }
                             }
                         }
@@ -330,6 +330,12 @@ PageType {
                             checked: additionalServerCommands !== ""
 
                             text: qsTr("Additional server configuration commands")
+
+                            onCheckedChanged: {
+                                if (!checked) {
+                                    additionalServerCommands = ""
+                                }
+                            }
                         }
 
                         TextAreaType {
@@ -338,12 +344,12 @@ PageType {
 
                             visible: additionalServerCommandsSwitcher.checked
 
-                            text: additionalServerCommands
+                            textAreaText: additionalServerCommands
                             placeholderText: qsTr("Commands:")
 
-                            onEditingFinished: {
-                                if (additionalServerCommands !== text) {
-                                    additionalServerCommands = text
+                            textArea.onEditingFinished: {
+                                if (additionalServerCommands !== textAreaText) {
+                                    additionalServerCommands = textAreaText
                                 }
                             }
                         }

From f40bf2d9ba1c015be9cd6ddead57cb32b49da3e4 Mon Sep 17 00:00:00 2001
From: "vladimir.kuznetsov" <nethiuswork@gmail.com>
Date: Sun, 17 Sep 2023 15:01:31 +0500
Subject: [PATCH 122/278] limited the length of the displayed server name -
 added auto-selection of the first available protocol when changing the server
 on the PageShare page

---
 CMakeLists.txt                                |   4 +-
 client/ui/qml/Controls2/DropDownType.qml      |   4 +
 client/ui/qml/Controls2/HeaderType.qml        |   5 +
 .../ui/qml/Controls2/LabelWithButtonType.qml  |   5 +
 .../Controls2/ListViewWithRadioButtonType.qml |  26 ++-
 .../ui/qml/Controls2/VerticalRadioButton.qml  |   4 +
 client/ui/qml/Pages2/PageHome.qml             |  15 +-
 .../ui/qml/Pages2/PageSettingsServerInfo.qml  |   2 +-
 client/ui/qml/Pages2/PageShare.qml            | 186 ++++++++----------
 9 files changed, 136 insertions(+), 115 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 49b8fa16..f7ada65a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,11 +2,11 @@ cmake_minimum_required(VERSION 3.25.0 FATAL_ERROR)
 
 set(PROJECT AmneziaVPN)
 
-project(${PROJECT} VERSION 4.0.5.1
+project(${PROJECT} VERSION 4.0.6.1
         DESCRIPTION "AmneziaVPN"
         HOMEPAGE_URL "https://amnezia.org/"
 )
-set(RELEASE_DATE "2023-09-11")
+set(RELEASE_DATE "2023-09-17")
 set(APP_MAJOR_VERSION ${CMAKE_PROJECT_VERSION_MAJOR}.${CMAKE_PROJECT_VERSION_MINOR}.${CMAKE_PROJECT_VERSION_PATCH})
 
 if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
diff --git a/client/ui/qml/Controls2/DropDownType.qml b/client/ui/qml/Controls2/DropDownType.qml
index c21fa48f..2feb5e17 100644
--- a/client/ui/qml/Controls2/DropDownType.qml
+++ b/client/ui/qml/Controls2/DropDownType.qml
@@ -10,6 +10,8 @@ Item {
     property string text
     property string textColor: "#d7d8db"
     property string textDisabledColor: "#878B91"
+    property int textMaximumLineCount: 2
+    property int textElide: Qt.ElideRight
 
     property string descriptionText
     property string descriptionTextColor: "#878B91"
@@ -102,6 +104,8 @@ Item {
 
                 color: root.enabled ? root.textColor : root.textDisabledColor
                 text: root.text
+                maximumLineCount: root.textMaximumLineCount
+                elide: root.textElide
             }
         }
 
diff --git a/client/ui/qml/Controls2/HeaderType.qml b/client/ui/qml/Controls2/HeaderType.qml
index 19958205..b4af3784 100644
--- a/client/ui/qml/Controls2/HeaderType.qml
+++ b/client/ui/qml/Controls2/HeaderType.qml
@@ -10,6 +10,9 @@ Item {
     property var actionButtonFunction
 
     property string headerText
+    property int headerTextMaximumLineCount: 2
+    property int headerTextElide: Qt.ElideRight
+
     property string descriptionText
 
     implicitWidth: content.implicitWidth
@@ -26,6 +29,8 @@ Item {
                 Layout.fillWidth: true
 
                 text: root.headerText
+                maximumLineCount: root.headerTextMaximumLineCount
+                elide: root.headerTextElide
             }
 
             ImageButtonType {
diff --git a/client/ui/qml/Controls2/LabelWithButtonType.qml b/client/ui/qml/Controls2/LabelWithButtonType.qml
index 82aef55a..7a1489c0 100644
--- a/client/ui/qml/Controls2/LabelWithButtonType.qml
+++ b/client/ui/qml/Controls2/LabelWithButtonType.qml
@@ -8,6 +8,9 @@ Item {
     id: root
 
     property string text
+    property int textMaximumLineCount: 2
+    property int textElide: Qt.ElideRight
+
     property string descriptionText
 
     property var clickedFunction
@@ -68,6 +71,8 @@ Item {
             ListItemTitleType {
                 text: root.text
                 color: root.descriptionOnTop ? root.descriptionColor : root.textColor
+                maximumLineCount: root.textMaximumLineCount
+                elide: root.textElide
 
                 opacity: root.textOpacity
 
diff --git a/client/ui/qml/Controls2/ListViewWithRadioButtonType.qml b/client/ui/qml/Controls2/ListViewWithRadioButtonType.qml
index f7f99dec..4138c087 100644
--- a/client/ui/qml/Controls2/ListViewWithRadioButtonType.qml
+++ b/client/ui/qml/Controls2/ListViewWithRadioButtonType.qml
@@ -5,12 +5,15 @@ import QtQuick.Layouts
 import "TextTypes"
 
 ListView {
-    id: menuContent
+    id: root
 
     property var rootWidth
 
     property var selectedText
 
+    property int textMaximumLineCount: 2
+    property int textElide: Qt.ElideRight
+
     property string imageSource: "qrc:/images/controls/check.svg"
 
     property var clickedFunction
@@ -18,7 +21,7 @@ ListView {
     currentIndex: 0
 
     width: rootWidth
-    height: menuContent.contentItem.height
+    height: root.contentItem.height
 
     clip: true
     interactive: false
@@ -27,6 +30,12 @@ ListView {
         id: buttonGroup
     }
 
+    function triggerCurrentItem() {
+        var item = root.itemAtIndex(currentIndex)
+        var radioButton = item.children[0].children[0]
+        radioButton.clicked()
+    }
+
     delegate: Item {
         implicitWidth: rootWidth
         implicitHeight: content.implicitHeight
@@ -74,6 +83,9 @@ ListView {
                         Layout.bottomMargin: 20
 
                         text: name
+                        maximumLineCount: root.textMaximumLineCount
+                        elide: root.textElide
+
                     }
 
                     Image {
@@ -88,11 +100,11 @@ ListView {
                 }
 
                 ButtonGroup.group: buttonGroup
-                checked: menuContent.currentIndex === index
+                checked: root.currentIndex === index
 
                 onClicked: {
-                    menuContent.currentIndex = index
-                    menuContent.selectedText = name
+                    root.currentIndex = index
+                    root.selectedText = name
                     if (clickedFunction && typeof clickedFunction === "function") {
                         clickedFunction()
                     }
@@ -101,8 +113,8 @@ ListView {
         }
 
         Component.onCompleted: {
-            if (menuContent.currentIndex === index) {
-                menuContent.selectedText = name
+            if (root.currentIndex === index) {
+                root.selectedText = name
             }
         }
     }
diff --git a/client/ui/qml/Controls2/VerticalRadioButton.qml b/client/ui/qml/Controls2/VerticalRadioButton.qml
index 8229c959..dd9a5590 100644
--- a/client/ui/qml/Controls2/VerticalRadioButton.qml
+++ b/client/ui/qml/Controls2/VerticalRadioButton.qml
@@ -8,6 +8,8 @@ import "TextTypes"
 RadioButton {
     id: root
 
+    property int textMaximumLineCount: 2
+    property int textElide: Qt.ElideRight
     property string descriptionText
 
     property string hoveredColor: Qt.rgba(1, 1, 1, 0.05)
@@ -104,6 +106,8 @@ RadioButton {
 
             ListItemTitleType {
                 text: root.text
+                maximumLineCount: root.textMaximumLineCount
+                elide: root.textElide
 
                 color: {
                     if (root.checked) {
diff --git a/client/ui/qml/Pages2/PageHome.qml b/client/ui/qml/Pages2/PageHome.qml
index c5ba89d0..d8796524 100644
--- a/client/ui/qml/Pages2/PageHome.qml
+++ b/client/ui/qml/Pages2/PageHome.qml
@@ -75,12 +75,20 @@ PageType {
 
         RowLayout {
             Layout.topMargin: 24
+            Layout.leftMargin: 24
+            Layout.rightMargin: 24
             Layout.alignment: Qt.AlignHCenter | Qt.AlignVCenter
 
             spacing: 0
 
             Header1TextType {
+                Layout.maximumWidth: buttonContent.width - 48 - 18 - 12 // todo
+
+                maximumLineCount: 2
+                elide: Qt.ElideRight
+
                 text: root.defaultServerName
+                horizontalAlignment: Qt.AlignHCenter
             }
 
             Image {
@@ -148,10 +156,15 @@ PageType {
             anchors.left: parent.left
 
             Header1TextType {
+                Layout.fillWidth: true
                 Layout.topMargin: 24
-                Layout.alignment: Qt.AlignHCenter | Qt.AlignVCenter
+                Layout.leftMargin: 16
+                Layout.rightMargin: 16
 
                 text: root.defaultServerName
+                horizontalAlignment: Qt.AlignHCenter
+                maximumLineCount: 2
+                elide: Qt.ElideRight
             }
 
             LabelTextType {
diff --git a/client/ui/qml/Pages2/PageSettingsServerInfo.qml b/client/ui/qml/Pages2/PageSettingsServerInfo.qml
index 62a7a67b..e2e7868c 100644
--- a/client/ui/qml/Pages2/PageSettingsServerInfo.qml
+++ b/client/ui/qml/Pages2/PageSettingsServerInfo.qml
@@ -101,7 +101,7 @@ PageType {
                             Layout.fillWidth: true
                             headerText: qsTr("Server name")
                             textFieldText: name
-                            textField.maximumLength: 20
+                            textField.maximumLength: 30
                         }
 
                         BasicButtonType {
diff --git a/client/ui/qml/Pages2/PageShare.qml b/client/ui/qml/Pages2/PageShare.qml
index 135c7fbc..67083949 100644
--- a/client/ui/qml/Pages2/PageShare.qml
+++ b/client/ui/qml/Pages2/PageShare.qml
@@ -173,19 +173,22 @@ PageType {
             DropDownType {
                 id: serverSelector
 
+                signal severSelectorIndexChanged
+                property int currentIndex: 0
+
                 Layout.fillWidth: true
                 Layout.topMargin: 16
 
                 drawerHeight: 0.4375
 
-                descriptionText: accessTypeSelector.currentIndex === 0 ? qsTr("Server and service") : qsTr("Server")
+                descriptionText: qsTr("Servers")
                 headerText: qsTr("Server")
 
-                listView: ListViewWithLabelsType {
-                    rootWidth: root.width
-                    dividerVisible: true
+                listView: ListViewWithRadioButtonType {
+                    id: serverSelectorListView
 
-                    imageSource: "qrc:/images/controls/chevron-right.svg"
+                    rootWidth: root.width
+                    imageSource: "qrc:/images/controls/check.svg"
 
                     model: SortFilterProxyModel {
                         id: proxyServersModel
@@ -203,14 +206,16 @@ PageType {
                     clickedFunction: function() {
                         handler()
 
-                        if (accessTypeSelector.currentIndex === 0) {
-                            protocolSelector.visible = true
-                            root.shareButtonEnabled = false
-                        } else {
+                        if (serverSelector.currentIndex !== serverSelectorListView.currentIndex) {
+                            serverSelector.currentIndex = serverSelectorListView.currentIndex
+                            serverSelector.severSelectorIndexChanged()
+                        }
+
+                        if (accessTypeSelector.currentIndex !== 0) {
                             shareConnectionDrawer.headerText = qsTr("Accessing ") + serverSelector.text
                             shareConnectionDrawer.configContentHeaderText = qsTr("File with connection settings to ") + serverSelector.text
-                            serverSelector.menuVisible = false
                         }
+                        serverSelector.menuVisible = false
                     }
 
                     Component.onCompleted: {
@@ -224,117 +229,90 @@ PageType {
                         ServersModel.currentlyProcessedIndex = proxyServersModel.mapToSource(currentIndex)
                     }
                 }
+            }
 
-                DrawerType {
-                    id: protocolSelector
+            DropDownType {
+                id: protocolSelector
 
-                    width: parent.width
-                    height: parent.height * 0.5
+                Layout.fillWidth: true
+                Layout.topMargin: 16
 
-                    ColumnLayout {
-                        id: protocolSelectorHeader
+                drawerHeight: 0.5
 
-                        anchors.top: parent.top
-                        anchors.left: parent.left
-                        anchors.right: parent.right
-                        anchors.topMargin: 16
+                descriptionText: qsTr("Protocols")
+                headerText: qsTr("Protocol")
 
-                        BackButtonType {
-                            backButtonImage: "qrc:/images/controls/arrow-left.svg"
-                            backButtonFunction: function() {
-                                protocolSelector.visible = false
+                listView: ListViewWithRadioButtonType {
+                    id: protocolSelectorListView
+
+                    rootWidth: root.width
+                    imageSource: "qrc:/images/controls/check.svg"
+
+                    model: SortFilterProxyModel {
+                        id: proxyContainersModel
+                        sourceModel: ContainersModel
+                        filters: [
+                            ValueFilter {
+                                roleName: "isInstalled"
+                                value: true
+                            },
+                            ValueFilter {
+                                roleName: "isShareable"
+                                value: true
                             }
+                        ]
+                    }
+
+                    currentIndex: 0
+
+                    clickedFunction: function() {
+                        handler()
+
+                        protocolSelector.menuVisible = false
+                    }
+
+                    Component.onCompleted: {
+                        if (accessTypeSelector.currentIndex === 0) {
+                            handler()
                         }
                     }
 
-                    FlickableType {
-                        anchors.top: protocolSelectorHeader.bottom
-                        anchors.topMargin: 16
-                        contentHeight: protocolSelectorContent.implicitHeight
+                    Connections {
+                        target: serverSelector
 
-                        Column {
-                            id: protocolSelectorContent
-                            anchors.top: parent.top
-                            anchors.left: parent.left
-                            anchors.right: parent.right
+                        function onSeverSelectorIndexChanged() {
+                            protocolSelectorListView.currentIndex = 0
+                            protocolSelectorListView.triggerCurrentItem()
+                        }
+                    }
 
-                            spacing: 16
+                    function handler() {
+                        if (!proxyContainersModel.count) {
+                            root.shareButtonEnabled = false
+                            return
+                        } else {
+                            root.shareButtonEnabled = true
+                        }
 
-                            Header2TextType {
-                                anchors.left: parent.left
-                                anchors.right: parent.right
-                                anchors.leftMargin: 16
-                                anchors.rightMargin: 16
+                        protocolSelector.text = selectedText
+                        root.connectionServerSelectorText = serverSelector.text
 
-                                text: qsTr("Protocols and services")
-                                wrapMode: Text.WordWrap
-                            }
+                        shareConnectionDrawer.headerText = qsTr("Connection to ") + serverSelector.text
+                        shareConnectionDrawer.configContentHeaderText = qsTr("File with connection settings to ") + serverSelector.text
+                        ContainersModel.setCurrentlyProcessedContainerIndex(proxyContainersModel.mapToSource(currentIndex))
 
-                            ListViewWithRadioButtonType {
-                                rootWidth: root.width
+                        fillConnectionTypeModel()
+                    }
 
-                                imageSource: "qrc:/images/controls/check.svg"
+                    function fillConnectionTypeModel() {
+                        root.connectionTypesModel = [amneziaConnectionFormat]
 
-                                model: SortFilterProxyModel {
-                                    id: proxyContainersModel
-                                    sourceModel: ContainersModel
-                                    filters: [
-                                        ValueFilter {
-                                            roleName: "isInstalled"
-                                            value: true
-                                        },
-                                        ValueFilter {
-                                            roleName: "isShareable"
-                                            value: true
-                                        }
-                                    ]
-                                }
+                        var index = proxyContainersModel.mapToSource(currentIndex)
 
-                                currentIndex: 0
-
-                                clickedFunction: function() {
-                                    handler()
-
-                                    protocolSelector.visible = false
-                                    serverSelector.menuVisible = false
-                                }
-
-                                Component.onCompleted: {
-                                    if (accessTypeSelector.currentIndex === 0) {
-                                        handler()
-                                    }
-                                }
-
-                                function handler() {
-                                    if (!proxyContainersModel.count) {
-                                        root.shareButtonEnabled = false
-                                        return
-                                    } else {
-                                        root.shareButtonEnabled = true
-                                    }
-
-                                    serverSelector.text += ", " + selectedText
-                                    root.connectionServerSelectorText = serverSelector.text
-
-                                    shareConnectionDrawer.headerText = qsTr("Connection to ") + serverSelector.text
-                                    shareConnectionDrawer.configContentHeaderText = qsTr("File with connection settings to ") + serverSelector.text
-                                    ContainersModel.setCurrentlyProcessedContainerIndex(proxyContainersModel.mapToSource(currentIndex))
-
-                                    fillConnectionTypeModel()
-                                }
-
-                                function fillConnectionTypeModel() {
-                                    root.connectionTypesModel = [amneziaConnectionFormat]
-
-                                    var index = proxyContainersModel.mapToSource(currentIndex)
-
-                                    if (index === ContainerProps.containerFromString("amnezia-openvpn")) {
-                                        root.connectionTypesModel.push(openVpnConnectionFormat)
-                                    } else if (index === ContainerProps.containerFromString("amnezia-wireguard")) {
-                                        root.connectionTypesModel.push(wireGuardConnectionFormat)
-                                    }
-                                }
-                            }
+                        if (index === ContainerProps.containerFromString("amnezia-openvpn")) {
+                            root.connectionTypesModel.push(openVpnConnectionFormat)
+                        } else if (index === ContainerProps.containerFromString("amnezia-wireguard")) {
+                            root.connectionTypesModel.push(wireGuardConnectionFormat)
                         }
                     }
                 }

From c0cb5b96bfc91e5023e2bd06defb66af9deb4c1b Mon Sep 17 00:00:00 2001
From: "vladimir.kuznetsov" <nethiuswork@gmail.com>
Date: Sun, 17 Sep 2023 17:03:39 +0500
Subject: [PATCH 123/278] added reconnection to vpn after changing any protocol
 settings

---
 client/amnezia_application.cpp                  |  4 ++--
 client/core/servercontroller.cpp                |  8 +++++---
 client/core/servercontroller.h                  | 11 ++++-------
 client/ui/controllers/connectionController.cpp  |  6 +++---
 client/ui/controllers/connectionController.h    |  4 ++--
 client/ui/controllers/installController.cpp     | 16 ++++------------
 client/ui/controllers/installController.h       |  2 +-
 .../ui/qml/Pages2/PageProtocolCloakSettings.qml | 16 ----------------
 .../qml/Pages2/PageProtocolOpenVpnSettings.qml  | 16 ----------------
 .../Pages2/PageProtocolShadowSocksSettings.qml  | 17 -----------------
 client/ui/qml/Pages2/PageStart.qml              | 12 ++++++++++++
 11 files changed, 33 insertions(+), 79 deletions(-)

diff --git a/client/amnezia_application.cpp b/client/amnezia_application.cpp
index cdcee5f4..37f4d68b 100644
--- a/client/amnezia_application.cpp
+++ b/client/amnezia_application.cpp
@@ -336,8 +336,8 @@ void AmneziaApplication::initControllers()
             &PageController::showPassphraseRequestDrawer);
     connect(m_pageController.get(), &PageController::passphraseRequestDrawerClosed, m_installController.get(),
             &InstallController::setEncryptedPassphrase);
-    connect(m_installController.get(), &InstallController::currentContainerChanged, m_connectionController.get(),
-            &ConnectionController::onCurrentContainerChanged);
+    connect(m_installController.get(), &InstallController::currentContainerUpdated, m_connectionController.get(),
+            &ConnectionController::onCurrentContainerUpdated);
 
     m_importController.reset(new ImportController(m_serversModel, m_containersModel, m_settings));
     m_engine->rootContext()->setContextProperty("ImportController", m_importController.get());
diff --git a/client/core/servercontroller.cpp b/client/core/servercontroller.cpp
index a82785eb..b0f8146f 100644
--- a/client/core/servercontroller.cpp
+++ b/client/core/servercontroller.cpp
@@ -290,11 +290,13 @@ ErrorCode ServerController::setupContainer(const ServerCredentials &credentials,
     return startupContainerWorker(credentials, container, config);
 }
 
-ErrorCode ServerController::updateContainer(const bool reinstallRequired,
-                                            const ServerCredentials &credentials,
-                                            DockerContainer container,
+ErrorCode ServerController::updateContainer(const ServerCredentials &credentials, DockerContainer container,
                                             const QJsonObject &oldConfig, QJsonObject &newConfig)
 {
+    bool reinstallRequired = isReinstallContainerRequired(container, oldConfig, newConfig);
+    qDebug() << "ServerController::updateContainer for container" << container << "reinstall required is"
+             << reinstallRequired;
+
     if (reinstallRequired) {
         return setupContainer(credentials, container, newConfig, true);
     } else {
diff --git a/client/core/servercontroller.h b/client/core/servercontroller.h
index d3f242a3..3191386c 100644
--- a/client/core/servercontroller.h
+++ b/client/core/servercontroller.h
@@ -26,10 +26,8 @@ public:
     ErrorCode removeContainer(const ServerCredentials &credentials, DockerContainer container);
     ErrorCode setupContainer(const ServerCredentials &credentials, DockerContainer container, QJsonObject &config,
                              bool isUpdate = false);
-    ErrorCode updateContainer(const bool reinstallRequired, const ServerCredentials &credentials,
-                              DockerContainer container,
-                              const QJsonObject &oldConfig,
-                              QJsonObject &newConfig);
+    ErrorCode updateContainer(const ServerCredentials &credentials, DockerContainer container,
+                              const QJsonObject &oldConfig, QJsonObject &newConfig);
 
     ErrorCode getAlreadyInstalledContainers(const ServerCredentials &credentials,
                                             QMap<DockerContainer, QJsonObject> &installedContainers);
@@ -63,8 +61,6 @@ public:
     ErrorCode getDecryptedPrivateKey(const ServerCredentials &credentials, QString &decryptedPrivateKey,
                                      const std::function<QString()> &callback);
 
-    bool isReinstallContainerRequired(DockerContainer container, const QJsonObject &oldConfig,
-                                      const QJsonObject &newConfig);
 private:
     ErrorCode installDockerWorker(const ServerCredentials &credentials, DockerContainer container);
     ErrorCode prepareHostWorker(const ServerCredentials &credentials, DockerContainer container,
@@ -77,7 +73,8 @@ private:
 
     ErrorCode isServerPortBusy(const ServerCredentials &credentials, DockerContainer container,
                                const QJsonObject &config);
-
+    bool isReinstallContainerRequired(DockerContainer container, const QJsonObject &oldConfig,
+                                      const QJsonObject &newConfig);
     ErrorCode isUserInSudo(const ServerCredentials &credentials, DockerContainer container);
     ErrorCode isServerDpkgBusy(const ServerCredentials &credentials, DockerContainer container);
 
diff --git a/client/ui/controllers/connectionController.cpp b/client/ui/controllers/connectionController.cpp
index 180d96e7..77ca0f5f 100644
--- a/client/ui/controllers/connectionController.cpp
+++ b/client/ui/controllers/connectionController.cpp
@@ -118,10 +118,10 @@ void ConnectionController::onConnectionStateChanged(Vpn::ConnectionState state)
     emit connectionStateChanged();
 }
 
-void ConnectionController::onCurrentContainerChanged()
+void ConnectionController::onCurrentContainerUpdated()
 {
-    if(m_isConnected || m_isConnectionInProgress) {
-        emit reconnectWithChangedContainer(tr("Settings updated successfully, Reconnnection..."));
+    if (m_isConnected || m_isConnectionInProgress) {
+        emit reconnectWithUpdatedContainer(tr("Settings updated successfully, Reconnnection..."));
         openConnection();
     }
 }
diff --git a/client/ui/controllers/connectionController.h b/client/ui/controllers/connectionController.h
index 5ee7a4ca..7bfe0fac 100644
--- a/client/ui/controllers/connectionController.h
+++ b/client/ui/controllers/connectionController.h
@@ -32,7 +32,7 @@ public slots:
     QString getLastConnectionError();
     void onConnectionStateChanged(Vpn::ConnectionState state);
 
-    void onCurrentContainerChanged();
+    void onCurrentContainerUpdated();
 
 signals:
     void connectToVpn(int serverIndex, const ServerCredentials &credentials, DockerContainer container,
@@ -41,7 +41,7 @@ signals:
     void connectionStateChanged();
 
     void connectionErrorOccurred(const QString &errorMessage);
-    void reconnectWithChangedContainer(const QString &message);
+    void reconnectWithUpdatedContainer(const QString &message);
 
 private:
     QSharedPointer<ServersModel> m_serversModel;
diff --git a/client/ui/controllers/installController.cpp b/client/ui/controllers/installController.cpp
index 2d82a4c2..63510d1a 100644
--- a/client/ui/controllers/installController.cpp
+++ b/client/ui/controllers/installController.cpp
@@ -254,22 +254,14 @@ void InstallController::updateContainer(QJsonObject config)
     ServerController serverController(m_settings);
     connect(&serverController, &ServerController::serverIsBusy, this, &InstallController::serverIsBusy);
 
-    bool reinstallRequired = serverController.isReinstallContainerRequired(container, oldContainerConfig, config);
-    auto errorCode = serverController.updateContainer(reinstallRequired, serverCredentials, container, oldContainerConfig, config);
+    auto errorCode = serverController.updateContainer(serverCredentials, container, oldContainerConfig, config);
     if (errorCode == ErrorCode::NoError) {
         m_containersModel->setData(modelIndex, config, ContainersModel::Roles::ConfigRole);
         m_protocolModel->updateModel(config);
 
-        bool isCurrentContainerChanged = false;
-        if (reinstallRequired &&
-            (serverIndex == m_serversModel->getDefaultServerIndex()) &&
-            (container == m_containersModel->getDefaultContainer()) ) {
-            isCurrentContainerChanged = true;
-        }
-
-
-        if (isCurrentContainerChanged) {
-            emit currentContainerChanged();
+        if ((serverIndex == m_serversModel->getDefaultServerIndex())
+            && (container == m_containersModel->getDefaultContainer())) {
+            emit currentContainerUpdated();
         } else {
             emit updateContainerFinished(tr("Settings updated successfully"));
         }
diff --git a/client/ui/controllers/installController.h b/client/ui/controllers/installController.h
index fc924d72..a5fd2875 100644
--- a/client/ui/controllers/installController.h
+++ b/client/ui/controllers/installController.h
@@ -66,7 +66,7 @@ signals:
 
     void serverIsBusy(const bool isBusy);
 
-    void currentContainerChanged();
+    void currentContainerUpdated();
 
 private:
     void installServer(DockerContainer container, QJsonObject &config);
diff --git a/client/ui/qml/Pages2/PageProtocolCloakSettings.qml b/client/ui/qml/Pages2/PageProtocolCloakSettings.qml
index 1dd9af71..78e666a7 100644
--- a/client/ui/qml/Pages2/PageProtocolCloakSettings.qml
+++ b/client/ui/qml/Pages2/PageProtocolCloakSettings.qml
@@ -13,22 +13,6 @@ import "../Components"
 PageType {
     id: root
 
-    Connections {
-        target: ConnectionController
-
-        function onReconnectWithChangedContainer(message) {
-            PageController.showNotificationMessage(message)
-        }
-    }
-
-    Connections {
-        target: InstallController
-
-        function onUpdateContainerFinished(message) {
-            PageController.showNotificationMessage(message)
-        }
-    }
-
     ColumnLayout {
         id: backButton
 
diff --git a/client/ui/qml/Pages2/PageProtocolOpenVpnSettings.qml b/client/ui/qml/Pages2/PageProtocolOpenVpnSettings.qml
index 741655ea..f5313e16 100644
--- a/client/ui/qml/Pages2/PageProtocolOpenVpnSettings.qml
+++ b/client/ui/qml/Pages2/PageProtocolOpenVpnSettings.qml
@@ -15,22 +15,6 @@ import "../Components"
 PageType {
     id: root
 
-    Connections {
-        target: ConnectionController
-
-        function onReconnectWithChangedContainer(message) {
-            PageController.showNotificationMessage(message)
-        }
-    }
-
-    Connections {
-        target: InstallController
-
-        function onUpdateContainerFinished(message) {
-            PageController.showNotificationMessage(message)
-        }
-    }
-
     ColumnLayout {
         id: backButton
 
diff --git a/client/ui/qml/Pages2/PageProtocolShadowSocksSettings.qml b/client/ui/qml/Pages2/PageProtocolShadowSocksSettings.qml
index f168efc1..2453281f 100644
--- a/client/ui/qml/Pages2/PageProtocolShadowSocksSettings.qml
+++ b/client/ui/qml/Pages2/PageProtocolShadowSocksSettings.qml
@@ -13,23 +13,6 @@ import "../Components"
 PageType {
     id: root
 
-
-    Connections {
-        target: ConnectionController
-
-        function onReconnectWithChangedContainer(message) {
-            PageController.showNotificationMessage(message)
-        }
-    }
-
-    Connections {
-        target: InstallController
-
-        function onUpdateContainerFinished(message) {
-            PageController.showNotificationMessage(message)
-        }
-    }
-
     ColumnLayout {
         id: backButton
 
diff --git a/client/ui/qml/Pages2/PageStart.qml b/client/ui/qml/Pages2/PageStart.qml
index 31474c12..f7020a2d 100644
--- a/client/ui/qml/Pages2/PageStart.qml
+++ b/client/ui/qml/Pages2/PageStart.qml
@@ -82,6 +82,18 @@ PageType {
                 PageController.closePage()
             }
         }
+
+        function onUpdateContainerFinished(message) {
+            PageController.showNotificationMessage(message)
+        }
+    }
+
+    Connections {
+        target: ConnectionController
+
+        function onReconnectWithUpdatedContainer(message) {
+            PageController.showNotificationMessage(message)
+        }
     }
 
     StackViewType {

From 8965b1fbba6debeb53195c1791e83490d5c353bb Mon Sep 17 00:00:00 2001
From: "vladimir.kuznetsov" <nethiuswork@gmail.com>
Date: Sun, 17 Sep 2023 23:21:00 +0500
Subject: [PATCH 124/278]  fixed the size of the drawer close button

---
 client/ui/qml/Controls2/DrawerType.qml         | 7 +++----
 client/ui/qml/Controls2/TopCloseButtonType.qml | 5 -----
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/client/ui/qml/Controls2/DrawerType.qml b/client/ui/qml/Controls2/DrawerType.qml
index 2b70ef3c..34b141b4 100644
--- a/client/ui/qml/Controls2/DrawerType.qml
+++ b/client/ui/qml/Controls2/DrawerType.qml
@@ -48,20 +48,19 @@ Drawer {
         if (PageController.getInitialPageNavigationBarColor() !== 0xFF1C1D21) {
             PageController.updateNavigationBarColor(0xFF1C1D21)
         }
-    }
 
-    onOpened: {
         if (needCloseButton) {
             PageController.drawerOpen()
         }
     }
 
-
-    onClosed: {
+    onAboutToHide: {
         if (needCloseButton) {
             PageController.drawerClose()
         }
+    }
 
+    onClosed: {
         var initialPageNavigationBarColor = PageController.getInitialPageNavigationBarColor()
         if (initialPageNavigationBarColor !== 0xFF1C1D21) {
             PageController.updateNavigationBarColor(initialPageNavigationBarColor)
diff --git a/client/ui/qml/Controls2/TopCloseButtonType.qml b/client/ui/qml/Controls2/TopCloseButtonType.qml
index cd1406c4..ed89b5a6 100644
--- a/client/ui/qml/Controls2/TopCloseButtonType.qml
+++ b/client/ui/qml/Controls2/TopCloseButtonType.qml
@@ -7,8 +7,6 @@ Popup {
 
     modal: false
     closePolicy: Popup.NoAutoClose
-    width: 40
-    height: 40
     padding: 4
 
     visible: false
@@ -25,9 +23,6 @@ Popup {
         image: "qrc:/images/svg/close_black_24dp.svg"
         imageColor: "#D7D8DB"
 
-        implicitWidth: 32
-        implicitHeight: 32
-
         onClicked: {
             PageController.goToDrawerRootPage()
         }

From ad236baa8686b12f7330df52a8cea4ecb9ef620b Mon Sep 17 00:00:00 2001
From: "vladimir.kuznetsov" <nethiuswork@gmail.com>
Date: Sun, 17 Sep 2023 23:24:21 +0500
Subject: [PATCH 125/278] fixed a typo in the variable name

---
 client/ui/controllers/pageController.cpp | 12 ++++++------
 client/ui/controllers/pageController.h   |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/client/ui/controllers/pageController.cpp b/client/ui/controllers/pageController.cpp
index 6501aea8..7b8f74ab 100644
--- a/client/ui/controllers/pageController.cpp
+++ b/client/ui/controllers/pageController.cpp
@@ -118,14 +118,14 @@ void PageController::showOnStartup()
 
 void PageController::updateDrawerRootPage(PageLoader::PageEnum page)
 {
-    m_drwaerLayer = 0;
+    m_drawerLayer = 0;
     m_currentRootPage = page;
 }
 
 void PageController::goToDrawerRootPage()
 {
 
-    m_drwaerLayer = 0;
+    m_drawerLayer = 0;
 
     emit showTopCloseButton(false);
     emit forceCloseDrawer();
@@ -133,15 +133,15 @@ void PageController::goToDrawerRootPage()
 
 void PageController::drawerOpen()
 {
-    m_drwaerLayer = m_drwaerLayer + 1;
+    m_drawerLayer = m_drawerLayer + 1;
     emit showTopCloseButton(true);
 }
 
 void PageController::drawerClose()
 {
-    m_drwaerLayer = m_drwaerLayer -1;
-    if (m_drwaerLayer <= 0) {
+    m_drawerLayer = m_drawerLayer -1;
+    if (m_drawerLayer <= 0) {
         emit showTopCloseButton(false);
-        m_drwaerLayer = 0;
+        m_drawerLayer = 0;
     }
 }
diff --git a/client/ui/controllers/pageController.h b/client/ui/controllers/pageController.h
index f4cac427..e047e6d6 100644
--- a/client/ui/controllers/pageController.h
+++ b/client/ui/controllers/pageController.h
@@ -118,7 +118,7 @@ private:
     std::shared_ptr<Settings> m_settings;
 
     PageLoader::PageEnum m_currentRootPage;
-    int m_drwaerLayer;
+    int m_drawerLayer;
 };
 
 #endif // PAGECONTROLLER_H

From fd09321f8e71ff68217e5108c0003476146ffb00 Mon Sep 17 00:00:00 2001
From: "vladimir.kuznetsov" <nethiuswork@gmail.com>
Date: Mon, 18 Sep 2023 00:16:58 +0500
Subject: [PATCH 126/278] removed the 'mount sftp folder' button for mobile
 platforms

---
 client/ui/qml/Pages2/PageServiceSftpSettings.qml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/client/ui/qml/Pages2/PageServiceSftpSettings.qml b/client/ui/qml/Pages2/PageServiceSftpSettings.qml
index 9287bd20..61ba663d 100644
--- a/client/ui/qml/Pages2/PageServiceSftpSettings.qml
+++ b/client/ui/qml/Pages2/PageServiceSftpSettings.qml
@@ -165,6 +165,8 @@ PageType {
                         }
 
                         BasicButtonType {
+                            visible: !GC.isMobile()
+
                             Layout.fillWidth: true
                             Layout.topMargin: 24
                             Layout.bottomMargin: 24

From f7370a0280d44e9367c03b1c8d8d0d259ca298d2 Mon Sep 17 00:00:00 2001
From: ronoaer <ronoaer@gmail.com>
Date: Mon, 18 Sep 2023 14:35:22 +0800
Subject: [PATCH 127/278] fixed: topright-corner button not visible when drawer
 closed

---
 client/ui/qml/Controls2/DrawerType.qml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/client/ui/qml/Controls2/DrawerType.qml b/client/ui/qml/Controls2/DrawerType.qml
index 34b141b4..1c4c508f 100644
--- a/client/ui/qml/Controls2/DrawerType.qml
+++ b/client/ui/qml/Controls2/DrawerType.qml
@@ -48,19 +48,19 @@ Drawer {
         if (PageController.getInitialPageNavigationBarColor() !== 0xFF1C1D21) {
             PageController.updateNavigationBarColor(0xFF1C1D21)
         }
+    }
 
+    onOpened: {
         if (needCloseButton) {
             PageController.drawerOpen()
         }
     }
 
-    onAboutToHide: {
+    onClosed: {
         if (needCloseButton) {
             PageController.drawerClose()
         }
-    }
 
-    onClosed: {
         var initialPageNavigationBarColor = PageController.getInitialPageNavigationBarColor()
         if (initialPageNavigationBarColor !== 0xFF1C1D21) {
             PageController.updateNavigationBarColor(initialPageNavigationBarColor)

From 9e7cf3ccd93eff6dadadb3efa46c3a5a7e5b967a Mon Sep 17 00:00:00 2001
From: "vladimir.kuznetsov" <nethiuswork@gmail.com>
Date: Mon, 18 Sep 2023 16:39:26 +0500
Subject: [PATCH 128/278] added PageServiceDnsSettings

---
 client/resources.qrc                          |  1 +
 client/ui/controllers/pageController.h        |  1 +
 .../Components/SettingsContainersListView.qml | 23 +++--
 .../ui/qml/Pages2/PageServiceDnsSettings.qml  | 95 +++++++++++++++++++
 4 files changed, 110 insertions(+), 10 deletions(-)
 create mode 100644 client/ui/qml/Pages2/PageServiceDnsSettings.qml

diff --git a/client/resources.qrc b/client/resources.qrc
index d0ff176f..5b919cf4 100644
--- a/client/resources.qrc
+++ b/client/resources.qrc
@@ -213,5 +213,6 @@
         <file>images/controls/trash.svg</file>
         <file>images/controls/more-vertical.svg</file>
         <file>ui/qml/Controls2/ListViewWithLabelsType.qml</file>
+        <file>ui/qml/Pages2/PageServiceDnsSettings.qml</file>
     </qresource>
 </RCC>
diff --git a/client/ui/controllers/pageController.h b/client/ui/controllers/pageController.h
index 07e77283..508a9d58 100644
--- a/client/ui/controllers/pageController.h
+++ b/client/ui/controllers/pageController.h
@@ -32,6 +32,7 @@ namespace PageLoader
 
         PageServiceSftpSettings,
         PageServiceTorWebsiteSettings,
+        PageServiceDnsSettings,
 
         PageSetupWizardStart,
         PageSetupWizardCredentials,
diff --git a/client/ui/qml/Components/SettingsContainersListView.qml b/client/ui/qml/Components/SettingsContainersListView.qml
index a0c74a04..edd96bd7 100644
--- a/client/ui/qml/Components/SettingsContainersListView.qml
+++ b/client/ui/qml/Components/SettingsContainersListView.qml
@@ -43,10 +43,12 @@ ListView {
                         var containerIndex = root.model.mapToSource(index)
                         ContainersModel.setCurrentlyProcessedContainerIndex(containerIndex)
 
-                        if (config[ContainerProps.containerTypeToString(containerIndex)]["isThirdPartyConfig"]) {
-                            ProtocolsModel.updateModel(config)
-                            PageController.goToPage(PageEnum.PageProtocolRaw)
-                            return
+                        if (serviceType !== ProtocolEnum.Other) {
+                            if (config[ContainerProps.containerTypeToString(containerIndex)]["isThirdPartyConfig"]) {
+                                ProtocolsModel.updateModel(config)
+                                PageController.goToPage(PageEnum.PageProtocolRaw)
+                                return
+                            }
                         }
 
                         switch (containerIndex) {
@@ -78,12 +80,13 @@ ListView {
                             PageController.goToPage(PageEnum.PageServiceTorWebsiteSettings)
                             break
                         }
-
-                        default: {
-                            if (serviceType !== ProtocolEnum.Other) { //todo disable settings for dns container
-                                ProtocolsModel.updateModel(config)
-                                PageController.goToPage(PageEnum.PageSettingsServerProtocol)
-                            }
+                        case ContainerEnum.Dns: {
+                            PageController.goToPage(PageEnum.PageServiceDnsSettings)
+                            break
+                        }
+                        default: { // go to the settings page of the container with multiple protocols
+                            ProtocolsModel.updateModel(config)
+                            PageController.goToPage(PageEnum.PageSettingsServerProtocol)
                         }
                         }
 
diff --git a/client/ui/qml/Pages2/PageServiceDnsSettings.qml b/client/ui/qml/Pages2/PageServiceDnsSettings.qml
new file mode 100644
index 00000000..016a7c88
--- /dev/null
+++ b/client/ui/qml/Pages2/PageServiceDnsSettings.qml
@@ -0,0 +1,95 @@
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+
+import SortFilterProxyModel 0.2
+
+import PageEnum 1.0
+
+import "./"
+import "../Controls2"
+import "../Controls2/TextTypes"
+import "../Config"
+import "../Components"
+
+PageType {
+    id: root
+
+    ColumnLayout {
+        id: backButton
+
+        anchors.top: parent.top
+        anchors.left: parent.left
+        anchors.right: parent.right
+
+        anchors.topMargin: 20
+
+        BackButtonType {
+        }
+    }
+
+    FlickableType {
+        id: fl
+        anchors.top: backButton.bottom
+        anchors.bottom: parent.bottom
+        contentHeight: content.implicitHeight
+
+        ColumnLayout {
+            id: content
+
+            anchors.top: parent.top
+            anchors.left: parent.left
+            anchors.right: parent.right
+
+            HeaderType {
+                id: header
+
+                Layout.fillWidth: true
+                Layout.rightMargin: 16
+                Layout.leftMargin: 16
+
+                headerText: "Amnezia DNS"
+                descriptionText: qsTr("A DNS service is installed on your server, and it is only accessible via VPN.\n") +
+                                 qsTr("The DNS address is the same as the address of your server. You can configure DNS in the settings, under the connections tab.")
+            }
+
+            LabelWithButtonType {
+                id: removeButton
+
+                Layout.topMargin: 24
+                width: parent.width
+
+                text: qsTr("Remove ") + ContainersModel.getCurrentlyProcessedContainerName()
+                textColor: "#EB5757"
+
+                clickedFunction: function() {
+                    questionDrawer.headerText = qsTr("Remove ") + ContainersModel.getCurrentlyProcessedContainerName() + qsTr(" from server?")
+                    questionDrawer.yesButtonText = qsTr("Continue")
+                    questionDrawer.noButtonText = qsTr("Cancel")
+
+                    questionDrawer.yesButtonFunction = function() {
+                        questionDrawer.visible = false
+                        PageController.goToPage(PageEnum.PageDeinstalling)
+                        InstallController.removeCurrentlyProcessedContainer()
+                    }
+                    questionDrawer.noButtonFunction = function() {
+                        questionDrawer.visible = false
+                    }
+                    questionDrawer.visible = true
+                }
+
+                MouseArea {
+                    anchors.fill: removeButton
+                    cursorShape: Qt.PointingHandCursor
+                    enabled: false
+                }
+            }
+
+            DividerType {}
+
+            QuestionDrawer {
+                id: questionDrawer
+            }
+        }
+    }
+}

From 152d7bc3b3d0ed3fd63d201a57e3161543f3c3a5 Mon Sep 17 00:00:00 2001
From: "vladimir.kuznetsov" <nethiuswork@gmail.com>
Date: Mon, 18 Sep 2023 17:52:41 +0500
Subject: [PATCH 129/278] added restore default settings for dns settings page

---
 client/ui/qml/Pages2/PageSettingsDns.qml | 37 ++++++++++++++++++++++++
 1 file changed, 37 insertions(+)

diff --git a/client/ui/qml/Pages2/PageSettingsDns.qml b/client/ui/qml/Pages2/PageSettingsDns.qml
index 2851e9b1..0bc13eae 100644
--- a/client/ui/qml/Pages2/PageSettingsDns.qml
+++ b/client/ui/qml/Pages2/PageSettingsDns.qml
@@ -8,6 +8,7 @@ import "./"
 import "../Controls2"
 import "../Config"
 import "../Controls2/TextTypes"
+import "../Components"
 
 PageType {
     id: root
@@ -72,6 +73,38 @@ PageType {
                 }
             }
 
+            BasicButtonType {
+                Layout.fillWidth: true
+
+                defaultColor: "transparent"
+                hoveredColor: Qt.rgba(1, 1, 1, 0.08)
+                pressedColor: Qt.rgba(1, 1, 1, 0.12)
+                disabledColor: "#878B91"
+                textColor: "#D7D8DB"
+                borderWidth: 1
+
+                text: qsTr("Restore default")
+
+                onClicked: function() {
+                    questionDrawer.headerText = qsTr("Restore default DNS settings?")
+                    questionDrawer.yesButtonText = qsTr("Continue")
+                    questionDrawer.noButtonText = qsTr("Cancel")
+
+                    questionDrawer.yesButtonFunction = function() {
+                        questionDrawer.visible = false
+                        SettingsController.primaryDns = "1.1.1.1"
+                        primaryDns.textFieldText = SettingsController.primaryDns
+                        SettingsController.secondaryDns = "1.0.0.1"
+                        secondaryDns.textFieldText = SettingsController.secondaryDns
+                        PageController.showNotificationMessage(qsTr("Settings have been reset"))
+                    }
+                    questionDrawer.noButtonFunction = function() {
+                        questionDrawer.visible = false
+                    }
+                    questionDrawer.visible = true
+                }
+            }
+
             BasicButtonType {
                 Layout.fillWidth: true
 
@@ -84,8 +117,12 @@ PageType {
                     if (secondaryDns.textFieldText !== SettingsController.secondaryDns) {
                         SettingsController.secondaryDns = secondaryDns.textFieldText
                     }
+                    PageController.showNotificationMessage(qsTr("Settings saved"))
                 }
             }
         }
+        QuestionDrawer {
+            id: questionDrawer
+        }
     }
 }

From d4d6fbab882124770b8065865c995df1ed06801c Mon Sep 17 00:00:00 2001
From: "vladimir.kuznetsov" <nethiuswork@gmail.com>
Date: Mon, 18 Sep 2023 21:06:10 +0500
Subject: [PATCH 130/278] changed the protocols for easySetup setup

---
 client/containers/containers_defs.cpp        | 22 ++++++++++++++------
 client/containers/containers_defs.h          |  1 +
 client/ui/models/containers_model.cpp        |  7 ++-----
 client/ui/models/containers_model.h          |  1 +
 client/ui/qml/Pages2/PageSetupWizardEasy.qml |  2 +-
 5 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/client/containers/containers_defs.cpp b/client/containers/containers_defs.cpp
index 766d89da..20fc59f4 100644
--- a/client/containers/containers_defs.cpp
+++ b/client/containers/containers_defs.cpp
@@ -223,9 +223,9 @@ QStringList ContainerProps::fixedPortsForContainer(DockerContainer c)
 bool ContainerProps::isEasySetupContainer(DockerContainer container)
 {
     switch (container) {
-    case DockerContainer::OpenVpn: return true;
+    case DockerContainer::WireGuard: return true;
     case DockerContainer::Cloak: return true;
-    case DockerContainer::ShadowSocks: return true;
+    case DockerContainer::OpenVpn: return true;
     default: return false;
     }
 }
@@ -233,9 +233,9 @@ bool ContainerProps::isEasySetupContainer(DockerContainer container)
 QString ContainerProps::easySetupHeader(DockerContainer container)
 {
     switch (container) {
-    case DockerContainer::OpenVpn: return tr("Low");
+    case DockerContainer::WireGuard: return tr("Low");
     case DockerContainer::Cloak: return tr("High");
-    case DockerContainer::ShadowSocks: return tr("Medium");
+    case DockerContainer::OpenVpn: return tr("Medium");
     default: return "";
     }
 }
@@ -243,13 +243,23 @@ QString ContainerProps::easySetupHeader(DockerContainer container)
 QString ContainerProps::easySetupDescription(DockerContainer container)
 {
     switch (container) {
-    case DockerContainer::OpenVpn: return tr("I just want to increase the level of privacy");
+    case DockerContainer::WireGuard: return tr("I just want to increase the level of privacy");
     case DockerContainer::Cloak: return tr("Many foreign websites and VPN providers are blocked");
-    case DockerContainer::ShadowSocks: return tr("Some foreign sites are blocked, but VPN providers are not blocked");
+    case DockerContainer::OpenVpn: return tr("Some foreign sites are blocked, but VPN providers are not blocked");
     default: return "";
     }
 }
 
+int ContainerProps::easySetupOrder(DockerContainer container)
+{
+    switch (container) {
+    case DockerContainer::WireGuard: return 1;
+    case DockerContainer::Cloak: return 3;
+    case DockerContainer::OpenVpn: return 2;
+    default: return 0;
+    }
+}
+
 bool ContainerProps::isShareable(DockerContainer container)
 {
     switch (container) {
diff --git a/client/containers/containers_defs.h b/client/containers/containers_defs.h
index 24782407..9ca51a96 100644
--- a/client/containers/containers_defs.h
+++ b/client/containers/containers_defs.h
@@ -64,6 +64,7 @@ namespace amnezia
         static bool isEasySetupContainer(amnezia::DockerContainer container);
         static QString easySetupHeader(amnezia::DockerContainer container);
         static QString easySetupDescription(amnezia::DockerContainer container);
+        static int easySetupOrder(amnezia::DockerContainer container);
 
         static bool isShareable(amnezia::DockerContainer container);
     };
diff --git a/client/ui/models/containers_model.cpp b/client/ui/models/containers_model.cpp
index 67847727..afff44b6 100644
--- a/client/ui/models/containers_model.cpp
+++ b/client/ui/models/containers_model.cpp
@@ -75,6 +75,7 @@ QVariant ContainersModel::data(const QModelIndex &index, int role) const
     case IsEasySetupContainerRole: return ContainerProps::isEasySetupContainer(container);
     case EasySetupHeaderRole: return ContainerProps::easySetupHeader(container);
     case EasySetupDescriptionRole: return ContainerProps::easySetupDescription(container);
+    case EasySetupOrderRole: return ContainerProps::easySetupOrder(container);
     case IsInstalledRole: return m_containers.contains(container);
     case IsCurrentlyProcessedRole: return container == static_cast<DockerContainer>(m_currentlyProcessedContainerIndex);
     case IsDefaultRole: return container == m_defaultContainerIndex;
@@ -213,11 +214,6 @@ bool ContainersModel::isAmneziaDnsContainerInstalled(const int serverIndex)
     return containers.contains(DockerContainer::Dns);
 }
 
-// bool ContainersModel::isOnlyServicesInstalled(const int serverIndex)
-//{
-
-//}
-
 QHash<int, QByteArray> ContainersModel::roleNames() const
 {
     QHash<int, QByteArray> roles;
@@ -231,6 +227,7 @@ QHash<int, QByteArray> ContainersModel::roleNames() const
     roles[IsEasySetupContainerRole] = "isEasySetupContainer";
     roles[EasySetupHeaderRole] = "easySetupHeader";
     roles[EasySetupDescriptionRole] = "easySetupDescription";
+    roles[EasySetupOrderRole] = "easySetupOrder";
 
     roles[IsInstalledRole] = "isInstalled";
     roles[IsCurrentlyProcessedRole] = "isCurrentlyProcessed";
diff --git a/client/ui/models/containers_model.h b/client/ui/models/containers_model.h
index 547eea83..741a0620 100644
--- a/client/ui/models/containers_model.h
+++ b/client/ui/models/containers_model.h
@@ -26,6 +26,7 @@ public:
         IsEasySetupContainerRole,
         EasySetupHeaderRole,
         EasySetupDescriptionRole,
+        EasySetupOrderRole,
 
         IsInstalledRole,
         IsCurrentlyProcessedRole,
diff --git a/client/ui/qml/Pages2/PageSetupWizardEasy.qml b/client/ui/qml/Pages2/PageSetupWizardEasy.qml
index 6fdc4b3e..b228a7a3 100644
--- a/client/ui/qml/Pages2/PageSetupWizardEasy.qml
+++ b/client/ui/qml/Pages2/PageSetupWizardEasy.qml
@@ -27,7 +27,7 @@ PageType {
             }
         ]
         sorters: RoleSorter {
-            roleName: "dockerContainer"
+            roleName: "easySetupOrder"
             sortOrder: Qt.DescendingOrder
         }
     }

From 893ec2d61c40da40e821f1dd11a32851c19df8ed Mon Sep 17 00:00:00 2001
From: ronoaer <ronoaer@gmail.com>
Date: Wed, 20 Sep 2023 00:18:10 +0800
Subject: [PATCH 131/278] researching: tried to close drawer easily

---
 client/ui/qml/Controls2/DrawerType.qml | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/client/ui/qml/Controls2/DrawerType.qml b/client/ui/qml/Controls2/DrawerType.qml
index 34b141b4..60db1e48 100644
--- a/client/ui/qml/Controls2/DrawerType.qml
+++ b/client/ui/qml/Controls2/DrawerType.qml
@@ -2,6 +2,7 @@ import QtQuick
 import QtQuick.Controls
 
 Drawer {
+    id: drawer
     property bool needCloseButton: true
 
     Connections {
@@ -66,4 +67,16 @@ Drawer {
             PageController.updateNavigationBarColor(initialPageNavigationBarColor)
         }
     }
+
+    MouseArea {
+        id: mouseArea
+        anchors.fill: parent
+
+        onCanceled: {
+            Drag.cancel()
+            drawer.close()
+        }
+
+        preventStealing: false
+    }
 }

From dd039a612fef510cc8c598ab4f82098f24f86bad Mon Sep 17 00:00:00 2001
From: ronoaer <ronoaer@gmail.com>
Date: Wed, 20 Sep 2023 14:18:21 +0800
Subject: [PATCH 132/278] used position-changed to closes drawer

---
 client/ui/qml/Controls2/DrawerType.qml | 28 +++++++++++++++++++++-----
 1 file changed, 23 insertions(+), 5 deletions(-)

diff --git a/client/ui/qml/Controls2/DrawerType.qml b/client/ui/qml/Controls2/DrawerType.qml
index 60db1e48..c22d00c2 100644
--- a/client/ui/qml/Controls2/DrawerType.qml
+++ b/client/ui/qml/Controls2/DrawerType.qml
@@ -4,6 +4,7 @@ import QtQuick.Controls
 Drawer {
     id: drawer
     property bool needCloseButton: true
+    property bool isOpened: false
 
     Connections {
         target: PageController
@@ -61,22 +62,39 @@ Drawer {
         }
     }
 
+    onOpened: {
+        isOpened = true
+    }
+
     onClosed: {
+        isOpened = false
+
         var initialPageNavigationBarColor = PageController.getInitialPageNavigationBarColor()
         if (initialPageNavigationBarColor !== 0xFF1C1D21) {
             PageController.updateNavigationBarColor(initialPageNavigationBarColor)
         }
     }
 
+
+    onPositionChanged: {
+        if (isOpened && (position <= 0.99 && position >= 0.95)) {
+            mouseArea.canceled()
+            drawer.close()
+            mouseArea.exited()
+            dropArea.exited()
+        }
+    }
+
+    DropArea {
+        id: dropArea
+    }
+
     MouseArea {
         id: mouseArea
         anchors.fill: parent
 
-        onCanceled: {
-            Drag.cancel()
-            drawer.close()
+        onPressed: {
+            isOpened = true
         }
-
-        preventStealing: false
     }
 }

From de35a26285253aa7d5006d802d01d098efdd69e5 Mon Sep 17 00:00:00 2001
From: ronoaer <ronoaer@gmail.com>
Date: Thu, 21 Sep 2023 23:03:12 +0800
Subject: [PATCH 133/278] added  hover effect for default-server in pagehome

---
 client/resources.qrc                         |   1 +
 client/ui/qml/Controls2/DefaultSeverType.qml | 139 +++++++++++++++++++
 client/ui/qml/Controls2/ImageButtonType.qml  |   9 +-
 client/ui/qml/Pages2/PageHome.qml            |  69 ++-------
 4 files changed, 156 insertions(+), 62 deletions(-)
 create mode 100644 client/ui/qml/Controls2/DefaultSeverType.qml

diff --git a/client/resources.qrc b/client/resources.qrc
index 5b4d6ae7..75d7c220 100644
--- a/client/resources.qrc
+++ b/client/resources.qrc
@@ -215,5 +215,6 @@
         <file>ui/qml/Controls2/ListViewWithLabelsType.qml</file>
         <file>ui/qml/Pages2/PageServiceDnsSettings.qml</file>
         <file>ui/qml/Controls2/TopCloseButtonType.qml</file>
+        <file>ui/qml/Controls2/DefaultSeverType.qml</file>
     </qresource>
 </RCC>
diff --git a/client/ui/qml/Controls2/DefaultSeverType.qml b/client/ui/qml/Controls2/DefaultSeverType.qml
new file mode 100644
index 00000000..91d2eb52
--- /dev/null
+++ b/client/ui/qml/Controls2/DefaultSeverType.qml
@@ -0,0 +1,139 @@
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+
+import "TextTypes"
+
+Item {
+    id: root
+
+    property string text
+    property int textMaximumLineCount: 2
+    property int textElide: Qt.ElideRight
+
+    property string descriptionText
+
+    property var clickedFunction
+
+    property string rightImageSource
+
+    property string textColor: "#d7d8db"
+    property string descriptionColor: "#878B91"
+    property real textOpacity: 1.0
+
+    property string rightImageColor: "#d7d8db"
+
+    property bool descriptionOnTop: false
+
+    property string defaultServerHostName
+    property string defaultContainerName
+
+    implicitWidth: content.implicitWidth + content.anchors.topMargin + content.anchors.bottomMargin
+    implicitHeight: content.implicitHeight + content.anchors.leftMargin + content.anchors.rightMargin
+
+    ColumnLayout {
+        id: content
+
+        anchors.right: parent.right
+        anchors.left: parent.left
+        anchors.bottom: parent.bottom
+
+        RowLayout {
+            Layout.topMargin: 24
+            Layout.leftMargin: 24
+            Layout.rightMargin: 24
+            Layout.alignment: Qt.AlignHCenter | Qt.AlignVCenter
+
+            Header1TextType {
+                Layout.maximumWidth: root.width - 48 - 18 - 12 // todo
+
+                maximumLineCount: 2
+                elide: Qt.ElideRight
+
+                text: root.text
+                Layout.alignment: Qt.AlignLeft
+            }
+
+
+            ImageButtonType {
+                id: rightImage
+
+                hoverEnabled: false
+                image: rightImageSource
+                imageColor: rightImageColor
+                visible: rightImageSource ? true : false
+
+                implicitSize: 18
+                backGroudRadius: 5
+                horizontalPadding: 0
+                padding: 0
+                spacing: 0
+
+
+                Rectangle {
+                    id: rightImageBackground
+                    anchors.fill: parent
+                    radius: 16
+                    color: "transparent"
+
+                    Behavior on color {
+                        PropertyAnimation { duration: 200 }
+                    }
+                }
+            }
+        }
+
+        LabelTextType {
+            Layout.bottomMargin: 44
+            Layout.alignment: Qt.AlignHCenter | Qt.AlignVCenter
+
+            text: {
+                var description = ""
+                if (ServersModel.isDefaultServerHasWriteAccess()) {
+                    if (SettingsController.isAmneziaDnsEnabled()
+                            && ContainersModel.isAmneziaDnsContainerInstalled(ServersModel.getDefaultServerIndex())) {
+                        description += "Amnezia DNS | "
+                    }
+                } else {
+                    if (ServersModel.isDefaultServerConfigContainsAmneziaDns()) {
+                        description += "Amnezia DNS | "
+                    }
+                }
+
+                description += root.defaultContainerName + " | " + root.defaultServerHostName
+                return description
+            }
+        }
+    }
+
+
+    MouseArea {
+        anchors.fill: parent
+        cursorShape: Qt.PointingHandCursor
+        hoverEnabled: true
+
+        onEntered: {
+            rightImageBackground.color = rightImage.hoveredColor
+
+            root.textOpacity = 0.8
+        }
+
+        onExited: {
+            rightImageBackground.color = rightImage.defaultColor
+
+            root.textOpacity = 1
+        }
+
+        onPressedChanged: {
+            rightImageBackground.color = pressed ? rightImage.pressedColor : entered ? rightImage.hoveredColor : rightImage.defaultColor
+
+            root.textOpacity = 0.7
+        }
+
+        onClicked: {
+            if (clickedFunction && typeof clickedFunction === "function") {
+                clickedFunction()
+            }
+        }
+    }
+}
diff --git a/client/ui/qml/Controls2/ImageButtonType.qml b/client/ui/qml/Controls2/ImageButtonType.qml
index 843599a4..55e19f42 100644
--- a/client/ui/qml/Controls2/ImageButtonType.qml
+++ b/client/ui/qml/Controls2/ImageButtonType.qml
@@ -15,8 +15,11 @@ Button {
     property string imageColor: "#878B91"
     property string disableImageColor: "#2C2D30"
 
-    implicitWidth: 40
-    implicitHeight: 40
+    property int backGroudRadius: 12
+    property int implicitSize: 40
+
+    implicitWidth: implicitSize
+    implicitHeight: implicitSize
 
     hoverEnabled: true
 
@@ -31,7 +34,7 @@ Button {
         id: background
 
         anchors.fill: parent
-        radius: 12
+        radius: backGroudRadius
         color: {
             if (root.enabled) {
                 if(root.pressed) {
diff --git a/client/ui/qml/Pages2/PageHome.qml b/client/ui/qml/Pages2/PageHome.qml
index d8796524..125d3e6a 100644
--- a/client/ui/qml/Pages2/PageHome.qml
+++ b/client/ui/qml/Pages2/PageHome.qml
@@ -50,7 +50,7 @@ PageType {
 
     Rectangle {
         id: buttonBackground
-        anchors.fill: buttonContent
+        anchors.fill: defaultServerInfo
 
         radius: 16
         color: root.defaultColor
@@ -67,70 +67,21 @@ PageType {
         }
     }
 
-    ColumnLayout {
-        id: buttonContent
+    DefaultSeverType {
+        id: defaultServerInfo
+        height: 130
         anchors.right: parent.right
         anchors.left: parent.left
         anchors.bottom: parent.bottom
 
-        RowLayout {
-            Layout.topMargin: 24
-            Layout.leftMargin: 24
-            Layout.rightMargin: 24
-            Layout.alignment: Qt.AlignHCenter | Qt.AlignVCenter
+        text: root.defaultServerName
+        rightImageSource: "qrc:/images/controls/chevron-down.svg"
 
-            spacing: 0
+        defaultContainerName: root.defaultContainerName
+        defaultServerHostName: root.defaultServerHostName
 
-            Header1TextType {
-                Layout.maximumWidth: buttonContent.width - 48 - 18 - 12 // todo
-
-                maximumLineCount: 2
-                elide: Qt.ElideRight
-
-                text: root.defaultServerName
-                horizontalAlignment: Qt.AlignHCenter
-            }
-
-            Image {
-                Layout.preferredWidth: 18
-                Layout.preferredHeight: 18
-
-                Layout.leftMargin: 12
-
-                source: "qrc:/images/controls/chevron-down.svg"
-            }
-        }
-
-        LabelTextType {
-            Layout.bottomMargin: 44
-            Layout.alignment: Qt.AlignHCenter | Qt.AlignVCenter
-
-            text: {
-                var description = ""
-                if (ServersModel.isDefaultServerHasWriteAccess()) {
-                    if (SettingsController.isAmneziaDnsEnabled()
-                            && ContainersModel.isAmneziaDnsContainerInstalled(ServersModel.getDefaultServerIndex())) {
-                        description += "Amnezia DNS | "
-                    }
-                } else {
-                    if (ServersModel.isDefaultServerConfigContainsAmneziaDns()) {
-                        description += "Amnezia DNS | "
-                    }
-                }
-
-                description += root.defaultContainerName + " | " + root.defaultServerHostName
-                return description
-            }
-        }
-    }
-
-    MouseArea {
-        anchors.fill: buttonBackground
-        cursorShape: Qt.PointingHandCursor
-        hoverEnabled: true
-
-        onClicked: {
-            menu.visible = true
+        clickedFunction: function() {
+             menu.visible = true
         }
     }
 

From fd2678ce2f3e3059d93d1b4aa1e996445661f876 Mon Sep 17 00:00:00 2001
From: Mykola Baibuz <mykola.baibuz@gmail.com>
Date: Thu, 21 Sep 2023 14:45:46 -0400
Subject: [PATCH 134/278] Android round icons

Icons for some older Android phones that use round icons.
---
 client/android/AndroidManifest.xml              |   3 ++-
 client/android/res/drawable-hdpi/icon_round.png | Bin 0 -> 4225 bytes
 client/android/res/drawable-ldpi/icon_round.png | Bin 0 -> 1723 bytes
 client/android/res/drawable-mdpi/icon_round.png | Bin 0 -> 2624 bytes
 .../android/res/drawable-xhdpi/icon_round.png   | Bin 0 -> 5543 bytes
 .../android/res/drawable-xxhdpi/icon_round.png  | Bin 0 -> 8247 bytes
 .../android/res/drawable-xxxhdpi/icon_round.png | Bin 0 -> 11186 bytes
 7 files changed, 2 insertions(+), 1 deletion(-)
 create mode 100644 client/android/res/drawable-hdpi/icon_round.png
 create mode 100644 client/android/res/drawable-ldpi/icon_round.png
 create mode 100644 client/android/res/drawable-mdpi/icon_round.png
 create mode 100644 client/android/res/drawable-xhdpi/icon_round.png
 create mode 100644 client/android/res/drawable-xxhdpi/icon_round.png
 create mode 100644 client/android/res/drawable-xxxhdpi/icon_round.png

diff --git a/client/android/AndroidManifest.xml b/client/android/AndroidManifest.xml
index bf431ec6..4ec807e9 100644
--- a/client/android/AndroidManifest.xml
+++ b/client/android/AndroidManifest.xml
@@ -36,7 +36,8 @@
         android:requestLegacyExternalStorage="true"
         android:allowNativeHeapPointerTagging="false"
         android:theme="@style/Theme.AppCompat.NoActionBar"
-        android:icon="@drawable/icon">
+        android:icon="@drawable/icon"
+        android:roundIcon="@drawable/icon_round">
         
         <activity
             android:configChanges="orientation|uiMode|screenLayout|screenSize|smallestScreenSize|layoutDirection|locale|fontScale|keyboard|keyboardHidden|navigation|mcc|mnc|density"
diff --git a/client/android/res/drawable-hdpi/icon_round.png b/client/android/res/drawable-hdpi/icon_round.png
new file mode 100644
index 0000000000000000000000000000000000000000..418a71cc8e5d326bb84586cf5c3a264091c62148
GIT binary patch
literal 4225
zcmV-{5Pt88P)<h;3K|Lk000e1NJLTq002k;002k`1^@s6RqeA!00009a7bBm000XU
z000XU0RWnu7ytkO0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH5Ee;9K~#7F-CSvK
zQ|GyUw9A&f?<=wmvDt0FP9QYc4IypQOdy%2g{H&O+j|?PcL<$3?aciXa%VEPv~xrJ
zqfL9KZJ^VnNof*Dnx@SLZCFeo#W*px!Hc{JFBoK5wk26h-}h+2l8%gYB+*PC&+$3u
z`#vq_Iq&{`Ix^frWD;~bok5{cY@*W&kH@n}CX?0rx(y-2jkKAm-%R5!(Q%*K?Y=ZL
zG;|Vo5HchgOiFrs`cAsYtv)g`5hv(<PSX1wb~qe=9T^!hB8f-}K_R3xB8l*mH83!6
z1W7<b3GxxMj}D(g0wg6y7-?gvI+94KN(e!TAV!m-gMD@y34oC{mZ)ct04NYAN=r){
zwOZ{vbhwo^EhOTxr=CM*ei;TkKS7+}8`PMQk+F+zn$cphbRiDNArUM!<>lpv<Z}55
zgnOWvq0cTvb;AQlAPi)mj+K>_9pdi_iI7B4VPT<x?#@McRVpE172~aV@k%5TMAB3I
zUHLmh0%9hJRZ6W^GdTt%2x-{`f#c$;RY(F1{GCafw#N9n*a#w(+UHZLgnFp7?EJuS
z$z4eyh>=Os^afo+Oi~{;LG;E?)9!gB8C7fQkdaq_B;t_oTB1T!1hM4M?f{a6oZ>1d
z)H0}2<xptkSh49rBpC;ym89De<kQ=vN>15|yP(TeBPCM>xk85euRI1#svb$kA-1Qt
z8?;~?#Fk&FRC0_XIlfs4`HQM>&(<BNd*I=qcBNX4%Gw4@m<EJ%`^+@b)6!sfIFLw?
zP1>50lJct6YBfh36RE=&9VgUV&BykqpF{bw)lrRInXbWxoKy^5GhxSfzeD?LNFX?v
ztTPkDIwML@et!P{((X%0Ak?X;C|<HmP@$z8nxcN)tjmLy8CpS#c5nZt(01<caYx*K
zWKsyAC6fLk)+s7MY<JitA^~7h%Inu+QNvmktyqc@?P5s5!$oN*)+z(%EuUP#5B}%r
zgh><CnwrFFO`-&mh3`WGRBI6tbN>%+ISZ9XjZ9B2q~I>S8clh+pf*;y|M;)(qvPro
zBmknS7Uso#F@gbcLZ6q5yLUek)TV?AQgO}Z3~MVbD#qI{y@JQS`Y;jzPM^YDe~=Ag
zuSMlhcIk0P%1lnt@})s-dQUoipb}D$u9RaL8EY|Y+2pln39w7GWLkb<BlsJF2+GdR
z=72Efd?gf18oz+L#~%%APbGrnF=RLPX)8L;oPbuR$9<*w$kjxSO72;^E+9#*pM466
z&}uXq`{d;0Nq<A=x7~#}z-sm71OFYST7D?#@4}y6!|$H?epufJM}CTd%a=sje}<ob
z@0<ALbI;=Pm4!<?ta9w>;>5oB<&nTGA<wmo#A_Gg029OBN}&q3HP*4~`14N=qV@eh
zLZeFy3Jxd7NAPCzvl#2|4r=Fsal$l6?LC4ae);v+Fk~`e*<IBUi73%$2t*E#k3k|>
zibhF_TKFVD5LMs~5kUq>#PWw8#Hy|0#`5aPkMO~dpT`Z;kZ^v_Bi|6>p+Nun)3|!!
zG^Wir1$CO=$7;rXelSt5z5N#GB2c#?xOU`m%t2>!;L*nWVVR!BrK^!8E=?mtZmNvK
zX*gWLeZ+&72ofd%1cH1ih2(sTRjX<L_e3S<;?dV}?(j=+&CLbcHtqN~=rgke=O2<9
zO^%NW$ENNM)RGh_Rchh9p|Tu*`}3P{%u6#k<@np#Gq6leVbl5zLYv3wgllYq0veBS
zeqY^M$W+rf_o<hpQi{ZzDi!$FDmi|*QH?!ol$dh^ZKLimg5a%2HnXu72+GRJ;=oX{
zac0%ZU$R(~oQuB?jyE&%3emXZJKl?;i?LiE73_>3t~rN5PWf{0eBwi;*=RX;7Q-R|
zAsb`M^bIuKw+yap76@1DhundU>r=7k(T#X~l^*~3Pz@ETO{mUx<9L?~``&Tj^ngo@
z907hc^Bd`%kO-C@_FAD3BZsl1-h0RAW?YyapF@9JYuK0z@4OD%j1`7d71GGP@7eKn
zM8b<NAI0!!A5^6-C~`d{H6DQ+Ra&3-`?;+s$<n}0L=N4U!JcC_9Q??EDZ2*?fdu9e
z-phR_jgSa2ci#T?Uqs1aEM9vrY?DsRnw_8tKU_I~CTtAbo&4c0JXqi@d91&uij1;O
z^!-YU^Jyy}V#ufyLFy{nO01B{=inh}bWNCqapyi8z}H^2;ry^0(SW{NEqgP0G&PY(
z5R;ynkx?S&b<y!$d(O^T2FJ8lu6Z7;=i+J6vBzF}1)p5LjNYLkq>wS)zju33KNGh9
z$?bUO4<e>>c3dFGIn+tE$&QX8Gj<;Cy{*)QfcY^fsm5FjiC~vLA2}m8aQ3Iaf@5Yz
zbbL`+4O})m<QlI59=_6sNVwY9i!P&AO+M>ZW78Kl;{S-0_Rd}`uc^eAFWwz4Rc;qN
z(?rgU1y0jdft;a<8SMRe3#5P&*hY@~4UmYtH{6S?F*DS52U4sybX{&oM`uUG@r#O9
z!9HvW5Y%)2qljZuv?+mO>x=_uE)1e-(Gq-l^G4`&>RSUH)9~0P$*56w;Bt_ww*|;y
zbo5`x@Wc!x!k{EwTTM0yv7*9YK;<00Zv0mAd#2@V#PK>^7V>i!!A)d(+}_XYzw)u@
zSPo<#-MTHTy{G>s22B=hSXYL!LLEHT5m+cZc=vQWTH5;1(%OrLiZuLa=Q?4$$1#fn
zTMxcip+M(#H%wD8sTjkcByuDrrggPzg3fPJm7ve35@IMQ@P+}d88aDF4MxX$;jrJj
zvnrJqW#ubTx4I5>tI8t2k7JHp^Q;wTPn^ZCkDerQE(i59L4LT#x>22ONAp)Sg8kX>
z%UQ&T)vRKY2&yzx1f3ffAcs*}wmfj`nX^NuO2Os_o`hbX4K<OYQhQY@BaIFC!nNmD
zfBzPK@$#R<I~59g|5>;#qi~sr1I-`yxgZ6SY!ItJ=ydnBk;s)jHC=pJ*@~bxttyLh
zvP>v-!TGW~3NJiuos8Tmlf%*V*Py0hQmvnTJO>FdNGi_gb*1>M{nkW>jN<X`KJnyG
zrPN|+)n+(nN&h`;N8NBudnnHE_A6*EOy=XrK{lg*Vi@D2W2CY-1Mg8m(puq@*vfnv
zwADrUEyPh^=b4b;l;;H^M}qwkAc-IinJwFRu*g~`Z-k92FI<Zn!)ByvvtXYP7x7u^
z3<gXWFf`bX(a|1=;{?9FYmY#ZUMs_vdzT~qg+Ib#wILduAC{(G3`qo~Y9pJi+{{X0
zt18_nNY6s(89Ied<NKI%-u^;4e5hVrAxKcF+kvHJ893Jw{<`9{V2>=(dj-G*84;r$
zQYlly+Sb&34H^34+mgbVvE9VqJCEYJxfju5pr;*QB|D}Xo`low#J2h}B4{*hTuFK`
zK_*LdsYL`BB`=@~1xrn|<eX~#|Cq>OSgf;9&P-4Y<t^TCt}Q}ZYIu32Iyd-|OjC#l
zW;q3lt++#ARbq0Oq*!5@or7iOmM2P`>PLM+uyn9`rE3zmE|u44%jsW#EH7e%%hD1F
zOv1J6mqkhVwEHbd<oNMMOTQ2u&-HyQ1c6Vi4mP1RdEpA7*FZ9O0lVJ@MFl2jW9`2S
zdp~3<8C4R!$5*;fp`-UbfuuzxYq4(S;}A50ZtAS<1_nmro0fU+d=Iu45=m~aB-NKF
zXp;v@7@Sgs!eo(dpuslC<#L^jW@IQiO1&JZ#R{YrD4@w!z&vL}+m*Kh9;vu|F|@hV
zU+5ikW%vWci;s=d_@FyDU3jF%D@CkcO(Fyx?{q>cD4TDUt5hl@9h(;#Sd_aAP3!gv
z<j6@{w0T5ICI@)8^j)vZ4th;NK~>QC&`>)PfrF>W7R{^cFhN{^XK4zxKfi5r#^vI9
zu3l+08qGB2(;BI&$blYjY&))9Z^yKI1m-pq)v=4QcHJX^aXLL^>qN>J1$*45)88WO
z#zeOeB_{%W!N)sY_|`o8^M|i%k){qF7e{&_fPdn^d!_H>IPDrk2eHI3G4Hk<3^T4A
z^>U82a@CeV+onys&~o-wR91S+4XG(E<YhZyvr3+$5(TTxe1bxQLndd>8@5<0h(X}r
zfAC)T6sjs7CVe{;I*3VG$gsAxy-Qj83gqMzAt%#GGXV-Lsn`yio$@7(oe1(8&-r;(
zBGARrF&W?Dba9vd<5P~fREt5J2pO;77g^1Sv6GO1_uqQ~DP+cSNm9~uE`gNnOjm#$
zhE|*S6?~jRh=HZ+!(QpR7lYM{I5G0Ed|u;mNC4ZG-@Npz1<M^pg+)jtI9jgB6;A@<
zC5PcxFGj#G(&S+$b$k~R7Hm3cR`XMu#9Oj>3DWf8bLLr@SprFeLxY&NvLt4(w|Z*5
z8qeOZ7LLVmwA~r6dKm`>26p>T0tA`OW*g1Va~9eN3GkEDu&x0#jV-jvJWlwFJtc*C
z*!zu*cxZJN+%uD~Sge?ea?vW2@$EG#{A7z-aOVqwC8*CF7eUSQm%jwX>SUOnCu7ZP
zgd~+=Svn?$T50y75K7k+G|pknDY9WpYry6jCo<IzxGOVJ`=v~{>dk_eVOzrcg~;Lv
zIW5W@E7YUK2qQbJ`3*q?v9T^MFK?#9sF&)8LOa(Fo!yLyNjqLV(T7y>Y(IQl0sXif
z9MihERy<)8#`*(1DPS+g<gz`QU*f3Fi>p9!#BZGa2rHQRq=@J04Tu9rPxRtax3|i;
z_32~Sw!R#D>(wZ9nIIJ$LBB-NF;@uZPa*GZP~pjXZ$j80k#Klz&w<d!FoIZ$XgYeg
z?^iuBqcmSfQ#0-WIexrxc7Qer$z^p8-*vfg_p5UkE>SQkZ&Kv^VV^VNygEnBtXiCQ
z@Se9=4K+Ea{bKE+C0EWte5$q&F(4;hLn@`j#jc5nWB4LNFO*fShKOR~{I-VeQrCo=
z)W{Q6M9lGzKXK&{z%&(;yKf#G96To05wRvs5_Eu6jgu_{qC{!FcQwYjj@VKQCgA+A
zC+d|KV&K<ua{9z7Wz+`U2R6(HB6UVoSa$mq8yzRn+l44&qnT+NYSX9j%DEf(XMh((
zrPHj3ny%`CDJrtfM9z9LD<hEx+?Hxy9wXHrecnMge_JHg^5eE9-(s;CDS+gu%!K~1
z<#T}jM9$&c4T{Pq@>)G2iKVR({~CCPT>6iq85niYz~T45h$QWgmK;XRak=lOQZM4p
zKbs?7n8_<|i}mq3k`fmKfj%rDPh7Y|U{~H0nnpweNr?-85Pe`B9X8|hk7oX^QpjP%
zJq_toIWE^4@cDv~q<nY0Pppdj=`R!pbdmvY_IWu2{`t0vr?3u^)a)i>+=)1mxQT28
zY|}1ySMD2dXTij<Iz7(`Hxh(|5;PzD^D5fyO!gzXc(Q>XgG0m|NhC3TB#j_HSgL4x
zyAg>ai)Ub3lS#^aB%Pp8_;NdbqCkajjW*jX-V7l_jr@=LTWK7xK<V?%RT+~_%6$9-
XKj3T(VYX;)00000NkvXXu0mjfIv(|O

literal 0
HcmV?d00001

diff --git a/client/android/res/drawable-ldpi/icon_round.png b/client/android/res/drawable-ldpi/icon_round.png
new file mode 100644
index 0000000000000000000000000000000000000000..371994edb39c5496e2194b1e7e9401c9335cfcdc
GIT binary patch
literal 1723
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
RfExe+002ovPDHLkV1oDrEwKOq

literal 0
HcmV?d00001

diff --git a/client/android/res/drawable-mdpi/icon_round.png b/client/android/res/drawable-mdpi/icon_round.png
new file mode 100644
index 0000000000000000000000000000000000000000..0ed71d4cc68335cbf2a85260a233b5b2c9806ec1
GIT binary patch
literal 2624
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

literal 0
HcmV?d00001

diff --git a/client/android/res/drawable-xhdpi/icon_round.png b/client/android/res/drawable-xhdpi/icon_round.png
new file mode 100644
index 0000000000000000000000000000000000000000..a3e188230a960ff0eedcf6277477461d3dab7e22
GIT binary patch
literal 5543
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

literal 0
HcmV?d00001

diff --git a/client/android/res/drawable-xxhdpi/icon_round.png b/client/android/res/drawable-xxhdpi/icon_round.png
new file mode 100644
index 0000000000000000000000000000000000000000..ca2a6362e14f3c7ab58d647900ac549fa42d2c69
GIT binary patch
literal 8247
zcmV-7Ajsc|P)<h;3K|Lk000e1NJLTq0058x0058(1^@s6=SJeV00009a7bBm000XU
z000XU0RWnu7ytkO0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsHAIwQaK~#7F?VSm5
z6z7%4|1+9H_k}>WG~5!H!!}@!wGsF%8wZTzWPQcpY@FCh#b&EgTU$8{xwbZ&it%pZ
zWRr~zK9YESk{GYC!4{6OvB5?dbJ++6T_7PLX*9a#-1l13(#&X%?m4=9fL~S9t(hJ%
zn*PtbzW05t!$n3uk(HHY(d+f|bvm7e9;)_wz4^Z5eBWu7FfX_AKXk6Jr`PfRH1Bz{
z+wBcK1TG?UxPW1?<mBY6p$k5rF7Q0wV@xE;qKE#U2KxUF(pK+uIvdWOJ!{1U$^|7L
zpJ3|f0@l%ws}bIkC=Cm$f%e<_`ugfGBrBEj0%FnR=H}i<7if)7IGTsvXFa{&Ee?lc
zcdA>bloXI?Y3T6bR1r-$L@_lrHEl%-l2QUHDJij-Os4zj@DU_GmQfn3FJ{`5N>(W)
z1XNK`!Ew!_scvng!WN0Ptt~Ar_0Tw)7SP2eoM70!x!vwfS{9Nf1$40sCm0se@bK_@
zExI;M35a7HqtW;nePC;#66TC7luet1&eoIYJKq5<!LChfF;W^dLRD4OqiJbrTYSYn
z)mXf0J(k_}O-!D%1jqO7gxlqWR^ZQuKBGtS^77Ez+q)YYKo6B+cSYhkMTZ-qfy}C?
ze2TEoDJ;g!h1Wx)Y~;_3EjCm}H34xghdzYIXiVxIXs2Q<xG<5)a~4Cxa7p77TW+X`
zDgxqf4pom?IFCSMWEYl<9+yp<8z3l+qN+7gTtM{4K1|=719YfrtP_r4!LW!@0JcU4
z=(AP)3#q7p*k#dfGc;O7=C~)AvZ-^BBJgMWSY>79V^9!91jOc*#KTrcb1uuDoWe=t
z9-FyHvw?I-C{ufcKWn92TG9pN8^7XsN0Tlq8tl@lX3ay2F`qwkB}9}|0hO1R&-cYU
z7Nh_<1>;><no*C+)DsXR#6^4!kVKLuATp!(QPGPnPs)s%hl+s=>3USnPD$g*<nuM)
zYk?$@6ao3(@D`+4%SCVorccwsl%*G3Sl+~9q$qq1wj@hL2^Wx`cv2400#P6;Y;1jW
z`jO$n%a-4W6elSnN~nNRSv*X7W;V<@X~-@%BB#_O9E+r|8}ldOB1)Kme8Jjgq%hT2
z){tlnqgF@UGwjAvFdGZS=0pb82@w#di>Vec2a`9kM6f`SxU4Sa-54VT)`?2-;}(!#
zohPMxl$YJ{wW#OJp*Uz#^;BE{<R_|56t{rrjl6;ssq=(m*&X)@;*i4H@BLV?Ru=#k
z-?fX2xH=MjV_TXYo(P4RTvgTVd6;CGhUp8Iq1YndsvO$A17GahgWis_@D2^Y?Dti)
z+3m3P^&u7TdcB*Qo0~TvMq(BakE$aDgXT#jmOCH)Rn&M#4kik=*H;I6@Rl=ec>E9l
zjh9~g8&ZG`O-)TPUCWqST75zDU+6F$DaPW}cTzT$*p%GurBV9~O8pIEW+*o&2RAHV
zf$Nvo;oT437p#(oS)7rP@x0w`mp$b=CIJ-|7V`L3N(BP!w#ug0V)2?gk)D+}>ofZM
z$qH3w8pl08aY7NUuUkO^>ci2`KZiz1CxgH<VV)l%<h)R}fP5{Ks?C~^gDEo;H8-rp
zwRb&;y1T!D%dfvRDdJ%~WQAtsnnOM(TBF?T92_`&2o8q>8l;4R>U5jUwnNT~WW_+f
zl>HPmOv$Vol+Lb232nS*CU{CH-AsP#(>jWS%=*Y5DaS^4ed`;vKLah|@px9qnaC(h
zK)%@%7H9~zGNM?fuee(H*&iJVr^us>w_T8*jw=f?B%S+{U;PqK{pC;4AXW;fCrdq9
zvJ2Cq>ngNV;pR=>7u?jO8Pkwv93O)iy+(@kGob{X4!7XO47%vw%jHX!YSpFX=jG+;
zdV728rJO9u0%_58Wlt;;#KZeYWO{RuMVnGAEzH22Jn6})MqOGDiTZLWGhihJ21cWC
zBQ(b4Us)SfJdDX}f|9fixn!MRQCfyS{q7I6FNKE4=PBk=PK+ubwmy{JC9R_^7C2Cz
zUUzlW^Em!7!VD#`yF8E!i|Dmy|AN}-GoTfCeFB~}9PPZQ0wN_o1r5PL@-^T2rlfO?
zUS-9@WE*13_Bhr5Gg+eBSKSJ&K((Q$vtA<x(X2qdUcV6<V!_>CLB)J&ll@F&eM|}$
z%jf51pvWBCniXcVS*REBI9kJJhoAv0IXOAIsWxN{cS6L!l%nyceCsD`0(M=?9=Kof
z`5E3U7+{1_@KDBziSbW`<_wK3(X1IW(Aw69bLYFD7Gyvyl#zv9zcFkU=CeNUKqE-a
zy8J2h6w@~(c`Mi)s^5YA|M!y6-oc~#>u$Op3rZ&-(Ok3o7FDyfNX5mlpDtOSjcTve
z!(zGm+Yi9)bYjJZ@5mAl2hiExT;X_Vz>W`J{WCt>{U$1B&x64jJ~Qh*cNVYw@<+&<
zR1&rCC!e0*we<;{Z)?UE`}bhS_E*tpwUXtSDa161f(wpn4#q~ZLLn`XR_Z=19x2&Y
zDA@93+OzQS_Ls2l^_MX`FmeID_3P&%3gh)Bej)VwaQ`#6eMIBWoBkP1M-GmA{PtUJ
z#lzqDCMwFx5HC{}T>-VBy3piMb)k?JsGy)=vlgt+6;$gnWyMxSK705W{`&JD3zos{
z9I5p34AX@--yZRG+etute($+<Vc@lF`mBiOv&Cu-A)upQd@fjy7K&jKVUa%k<YTA_
zWn{gfs?#BJP7=>@s7&>uD`mMXe?Hvu9JX)#sc>=qnXzzL#Mg0$p=ha?_g;KjaDS1Q
z6Q$AqrR{&iHEUK0&1JFj-SuC`J5T%(<r61CMIPow!Ga$gC!os8%5_kAz?6l<m1eov
zJ38^|_r8zA+usQJ{PZXSV%O!*aK9b<$puDYVsR;^PMeNsuz;>vy-Ki1a&fnJ3gUTo
z)4!qCG6gEZcLx|}SVCDKRjbZowiP_89*whyj|$>BZ*2<sJoi6GihWotY=MH=Lslr*
zlKErFG-B0?m5>6Dd#$?nPFbVyo}NCy<ra=vM9*yeITp>1Z_T2z932*x=|{I5v$UoR
z3Z}>PzX!xX96TEg2G#nUV@cJS!`pYDe)DgHY%LtMOY1OY{-UtYAASEFAzlgv$3wMC
zSA=}-#^P+DCz@TA6ozT!U1)KoVj<UiBH^*wNkF!M$IK=Z)~>u7{jOFVINFS8uvk`3
zNyC~NBQ`8C;)iu6+&j;R)wKq!pvSugflu2#aJV4_9@cu?ziZLp|11q#)Imk04v_kD
z;DwiQ;D4jfPKh?RJ)C%i=g2Z~rWHIhwJhBr6b~0)xj+~Ul~b!>EA-*V`-OqjPyx2r
z<$|ZXH{@&6GCJ_1hgPAYxBySSvIi|^yGNg^n2?EU=ayk+{t)UWbcM7ot$kkn_9G{@
z9g{ck%jD+fuIuUP88tG7pyyR{Uo0HCDZ5nhu<I%&7Z!=8!v`ZizvqRms0vE!XJn6!
zwcWnzOR@vyBb2FeE5|qyxt$dEgsDF39Y`~c^uFJJ`!am_#w&58u?^j)8?mrD3%S0&
zY-iH}vS5MYiAOjhWP$iTY@-4ije#r{OTL=77MQ*2CRyi86%P|?fhf1r3okb^V|?}%
z3bsK0^&WOxGjqlYl2=`EC1Qa^#NCO|(M8n{L1*lR-qZnoR_Kdt%n2;d<z}bjs#z7d
zwl;rMJS;$ut$p+y+b{`dpA$DdJs6jG7_Zk`=bw#@3drqt*Fh!N`cyBJegWi&hY3!#
zSv&)sP7L>rv|fY?o<p(!^|6f1Up$QH#$tivr+tUsLYny;^adMrCJ&6IUYMqOpwAl-
zxlZpzT2>3~$H#ddTW7$}Zrj)`8uqn%aL4mQc;chPt+?->jrnI`s<o?fKeN=>N3M9-
zefh^OqIl?=1V_J%Hh0KMawu46B^bui!c1WchTT}Kys&N8xW{y4P(&daCU%dyE`PjK
z^mLzZ4S3Am(<)e<U%cnQ{jUz8t<Q@@LY`_gqtN?3sM^{kQfoe6)c;+Uco={8<*>U)
z#Upa6;XuSRJs9iGZJ3i6y3c6+U3VZ>X4izT@34?`2tDV|)qXPIXRl+Bg6b|3&M=-i
z7@xa}z-sY85Rh+`233YGIB=F?eYi;Y;Zx5-F6_Qs!yfdLaE5HI0P&=m^k_WzHslbg
zhQpD;msd-x3Hh^l!DW$O=cb_;$H4f9yV~F#44i}C)c6JNe`N^AJLPvq%D^JVL4trN
zeOGPVORDvGedEvQGaP^%c+JCtf?5o8QC8y^|AFfCknFxhxPG&j((jN^hP2_KJ1L`*
z))Q1wHVMD{>38w`Q$LIN8gKu(agVWhf?Zcj*8tW%*OqXX6$-wcI`0Jmsg-?6wLTp8
z*w1xBE|$xd1X!G4&NiNq<-SDz{^4Hqlb9Vrg-Z@_Srqr*6S*ywEe;E3&yGLfj@8#j
zJXf$jgMsy+aN@c5v3JqhCGSfXE8<|gPzRz9d7e%ut(=`mrqx{&^&ECxa^oHmzUNmY
zj(@Zhu~5JF1C(1v=H6vxWMER^1k9Z|g^G4&649_=g=~HOc=Fk?>NE@MhLu<0#+8e)
zc;RKz{v$^}ygh-{X7{-!3X<E$o%-_^4=N@eMvR#az8@5KVLU0YbaqX|a|$|o@bdRJ
zAy%RZsI@V+zT-1z$12YKgM&EL+JbZ49hf_-7*neYgvTHKmwy@+61%6UZp}%f1Fj)>
zsfGg&Z9_DK;T?0kUXL5DmSgY^j~B_yADqU{24y=I$>@w&ATA(!JRZfDr<;9C<icTk
z{}3AA-VG|7BNi$xb1~F>7N$vs(3{71AoiVaM^|ejVj&}a{Pbn}fCKOEZ^p3`ov2$}
zjjSwFbm5RFyo2XSg<Sz+35Bcei;&`B-a06Mgg*gr9G!1)xm@#Ulod+CO=8u4U3Pl6
z2c{th%(P|p4Zu9;fZpT5pLWIOVwj53S~xn+3!AZUB8iCHOB(&1X*yx`)y9wBMXc1;
zgtwgMdj|3H8^;7|G_N+o;^gd}Y;8i-I2v3i49>RvY3t~P8jyZ01~q0~)YjCZyn7I)
zGrdS7@fe)r>lLT0r((7~Ohx5boZ;&4r~fDLOLFS7y@-X$77JF^MNic~J<^Vo*6ske
zCgL3+tJ4=ccyDR%#@>dLG`@94I6iXX41V*#Le!RpUY5qyaRMHy{ip$rUd&fTK$lIQ
ziJYFuV^0Sf4j@*Fi>Jb58gnyj`rVX`>5b`p{{r;)cjIj9QOF@ZJ)MNJ0!tS!mHZmf
zt=an>m`6eqTo$L~EFeGj9z2OR_Z-2CJ3fZ3fBgDRHaiPsynsCY=iw#+{pT&|G-NT-
zkHJG1Z=Z6bZ#em>JZp!8XbTjCF9chlNN~H!Cvga9%9I7;9^(qF+xJavJGl>1DJ>}x
z-Y*M>-+L^yci7;q)(6BoHv15se0dL^eCfTAqLG5DWh4pUo}bk<BaIcSYaob;E71y2
zZJ=nnTFDfCvL*V`Ge?ifvkt+q1&Tyt<NmPEWn~qhps*aplcu1!WEvLEFQh_ioZn{3
zuBebD9CGi@=BIb!#Wz1eJh1EXIzzjznj*zw+5!U<CYtqOIR1$h7Ee}oVZ?K4YOW5j
zQta-s={4CT9-}ER!}54yvkv~4e4jE~oXuNz#%ys!yn{Bub%ldnm_k%59s^C0V1Z7?
zA)rw1E0~J%*@7q08=_lYhf4>uIX(+ioTn3l;vYZp8e+lSWrb&G#C>{g?QnOV4tp*)
zjU}>mBMSM7S|A>O3o$b!fNsjX;>o@uxi4-YbJ@Lc_Ibb~9J(}$$tI>n6q4H=zk4sp
z(h0rCvEs3Hz<EO2{CMs-RAMYlMA0BRC#M1@tf2!@r)%UwwYSG!6e}nw8|S`QG;S{P
z_IuzC%1pdu>7BhEm?wmvKkxCxCm`;6Web#%R)AQ^F-wbSxZ5z^jzgJPl(j%~fkmN&
zqq{qH0nMzs4#Vet{@*)Nqw~5Ve;Zj;?9Oyyu8})Tf!N<la&{IjL#rtt`NiCNT2Y)&
zwH^7^HCN&yYYMuqQ4|#rTZm}b?dKtv%=7|WQF8~1@~6NxAkTcWcw9qX7&FHUTc{Vc
zeU8C_7Qwah7#NorLaoJJT2hL;|M9K>7tO(QMd8@*<p%i8Pw#?UvL&pO#q}R0U6+WW
z0y2B^;jjgMrG@xIH)a9)`=krVXh_G@ihmF`K8_WSgFbi?kb~+(&CQ>oqvIr+n-0P0
zl%6fIxPJY+-{3pn`u3=ZjN}=!)5ip~cpi5h$`??sgo%F&yRK0b6;PJG1WsGzLBpZ`
z=+S1Pgd@_?-iVG9N2oruPnKwcVav3u{%zd8W~52Z6!ht`faJO{sk27KO0?1_CLpO7
z+UW`}Aa+ruMYB*<vLGSC85ruuC&ykuXU|C_3Lb*F<))j3n5c5X_`vG=tES<pzwVd(
z`?$&+4Yk}C!veBGflQ3!6e&1effj&8!&_C!m6Csll>g(H^({2ENSn?hmw}E3eC;dC
z$O4UAeD3A(+Pj5L!j)4qAZOK5DFL)v)`zevXn~~N0-&^LHVGvkdD&&cmIzDZPp`cV
zAAa_XV11Is>84f~Tm$g**(tv2C-L->h(=<Rt7c3@PNork1JW|4nG%L2lH5Qa5f)JF
zRl6iGXWA+xi^i7saOgyA)nGZaG_}Chd?f7iYZq5z>)R(Fg|gh}0_t<9<GyGV!>Xsj
zR4Xn5j#+mqA|A#z7}>g9H&6Nu)|#T|F;J^b9RV?VQjt3CYzo5S;Y}%QQQVX0#-uQ_
zNZD>tIk55JcW1=~47)8Q#l!IIh)5#hR*ZXQBPyK2=bGaiN=Y)O6?0*c((`1&fwEF=
zE107#VWuLJc(@hg-g(jUmxblpwLXksfjk~h0~DYrU;eGN<AGE4_Zof=wb*$uaGDLb
zpE^%{G}_0*)+L%i7L-X_B)vRW9V;aW$Y?ZLkz}}r6Hj)<g+6vgT=e5DxK<PjK0leM
zdNf}7;I!bzc%GN*%rQYcEFym%To^eHk`h3xiQR5*Fj%eDo~o)Uwzo-{8^+?{fzDW9
z;c)yCTq(}WE)|9`!ok8(I_?REGqD%n+=qK=onc!~7nY|9mF7@YWMLu9a%mRGHl#`x
z*24%kluS`l+*mx~VF9oU3N_5Y1;%Kv)dEky-yT*xB4RUqFjB?C9f-%flot?X?}BE;
z#TDc&Q6YgE%XN~(qo-KFkgbEcFimLe;ts(x_D{l!fcuxrr%o5nGtdaS&N#C1v5|^y
z!@3?comF>LcM-NM&wd(tl$?X<Py?p-%#)Vp?^kIUgN%-#nWR`Cj(1o<;owOie6cer
zNX#H1nDa-(V93xRjXul)NBH76x2%fivFI|3M>ak-(eLaT*4ACgxyj2GVU8Ay=bpKN
zR)}jqQsW;rn#dT^jBqC>K|pC~X|Eyy@L=bP1>cPrpBU10$S57T*t#(HSm&uV;i#yH
zTtGQ`^zYCTJi+g|gYvA9loX#~>!#KyJZWak0&yUXI17p#m;A&02g1fD+`w)w(8FAm
z7FIYSm6hR_KZ(>d&)tkY-Ks1!5Rqr-LPxVgt7neHJpPjeBcbr@i(nc^GgdzEf2Z4M
zdl)e=lBVApa^##-?!MtOu)EK|d2R^V*#(#~WnskM$8pXi5(+nZ`4g&X-k)v_iiZ)c
z(1VM@$2AYpb2StB)&tRlXBHzbW2eOQ<uHtfJfi|4pH@%7v}^%!tm7Z=a0<<tlemSd
z#e913O<Z^VgTiFKa4cQ&RlNTCV?vv$NVFNJ?d`EG*P;Y$h3+QT6mDojutGJ`T-Pt&
zbE@XL7}CmU$TRwm$*0v*RT^^OV40h}xM<gFKZ7%!hb0yHxLJMg2hR&43I|&netzd$
zza143&nOK?W`-NKUTs<+Mv4`Z!V~+Ps`WpM^!4@a7LP~mCDnw6a&vR*<jhp<wlxV|
zeI4gN7X;+-NdLoFL~KzaS)q)K99XL7!%pW;pRojGW#iZ7Vd0b&J2A1)g?;<?aCH<~
zh2xfc=fy4{Ze9K1E(g?v^ikj5-adLy2Yt|!+aLoe)+Q3~?%oo08V_5d<;&NNvpy`G
z>hfXQ9CSQlIlJSS(W(UOcG_a>-C^<lV3#5*ZbXFK*B1Yu0|cbk>$gBb*fp_;96<{t
z>GfXZ<+xB(=oGfXe3u{?#%S=OxX2kG9Fb7-wY0{r7#BX^pjpkhM}#!8+yCc)sEyP4
z%F4=mC71o>%!%V1j(4)M(osU<$j(x&Nj&Ks@8rKtUMo7sJz5YCyDu?)7YWr*@HiAk
z6w#!@p18ylZQ+JgW!q78gJzLn_r;785NBghq0yd2^vrWl#^r`)NmzSGZKS5^B5Kb0
z3c}jd)U-AD!EpleRizcTLJUt2{^OR|MYJT2W$2O(*Lj{?W0pM1E~4g?ognH%Js7ej
zPU&FUpLj%6KrZa->+aW-D`Vks<JgXS(`Ac?u?=g&`miQKuJ|7EFXBcaxiz6g!nK?)
zPMpBp%jUpfkZ1C9vU5;dGYffH85kPu5f-yl3wBrkaf4a7>8;ryZFD^tc47P5RJTG~
zPM<!#HPjPfzY-*%(<GpEP>Fa%borD_Jn*GyxPR?3;l{L{;Q^dHqg+_GpiGaSUORGk
zWT}fIgyVRp7kir2%}Qy6VuQ_Qvxa&utbq6hYFZ(NMU<VLjmnBj$*-APrN`x#G0!|}
zS{ZJhGXY;)Rt8JD4cWSpLCC%&6m&)5JhaG!atSj^rO-Lx!5b&k6A-8F&CSi5!aX1H
zt4(R!CN*!w%S4KW^qxU@^kZ}GSv<V?BP?t%*eBeO_Dj=&TPsIaD_{{FqX3n^;T&hQ
z^?72h5_1C>yQx@WoM_ZcO#JVZgWK)i6zTbh0%~b#saLwN7!94*1(T~CnT`|Cdk5i6
zD}*g$(WrRDl`!ZphsQNc$35`Up6_Dp<vZZ`7@1bX7af|0`-Awss?oZ^)`v9^>71y+
zh1yog>}*9r|5){$MZ<jF+>5T>VPu%Quy*YNOfMLKtF0ZL{t!2&rJ)j@T9c~qZ8DCl
zFbqc5eSNfZq6&x=SY2KHDhWxIyE?OAMA3-6_I@+Azuz?W^Lzh}wM(jT+u|xzObEQa
z63@lrTLMIz9ibHLF5jW?uw&;u!m1iMCY{hgA8B$RTgu~IidUnz1P@z;LQ;A|O5DIV
zoJW%8j>&<oj=y*qo{RopuN@U`ye0~%Jl_O&N29Pvx7x61{(8)fw@<l*v^*H@ZRU=|
za1#w@PE>x1bGW)sFp?rPt_$Vm<#DuH2ZfnGZ2~5j<&6IP;yb6%a;`t*xqX99eDryz
zFs-<!^(0F4J*q8Ez@mBKup68AI`EU-P9YVKG$g^oI^N~Mva0blBmNtnJ*cP!+C+69
zNfRw(eY#auRXk_L0tMOd)ypuWGH>+fAN+nlx@^({0uDY`PUa~xX+oyNKPPj#FpGw>
zy5H_|P=@D?De!%WtWc<~#ijo<s8k@$V_uV`o-C_EM+K$zWZK?=f>cZzi)n`YU6RGa
z@CUw)T*o#9)=_4Xh`3I}4eTr|{y82?CETOyqzl`Q$A6!$aJ|zDsm7$lO;qUmu8?!S
zECF#qO;(5pT4S2MA(sicW@MU2-eS5T4SSEbBN4Eb;J%!<PmWy>(K^kXpclj?S}gXS
z{uh&LMK;GsUk?Yud{GlQS}uw{cy5@K)mjt4CMkilKe89uB!zAyOSGI0lYXb?ib;NV
z>2o_Nwn<*oJYTqdt=^D9uF^bv&`INHX#v7jAdqI)wGlFr{jRv(gG6*26zCc9Uq9!x
z^^BtTMOPEHXu-2trQR<iMtbDBE|HjI?K5+d(!6+>lW9Y(<0PgyT5#Y{3oa(OjrEvc
zFHn+)G-SIjk(liwnY+zMa^o2{Q%!L9!rRlK<X!kQ!^5u+kFLO)lROLbxbIrVL|n4&
z?d^So>O)+iE<qC5*EUkE<<V#jb>=AscMNc5SCpxPr9h7-KS_8ksDZ?D8{#1D(B48&
zP|c~m1(!%AtQ_~m>bgV{k{kL&#P{jGFsDUacyQ2sdA#Cb5|SJ88}UW)+MXJE38p6z
zmPaIEp*;<koz2b7ZKr`(RYvVEAq^T7e~{vyH;^C_nj6||wgz7>^(7H$5E9S&=H})t
zNFWI>E?g3kHc5tfn50yv{6thoKWcNP-^D`@yRBr1he_%P9VKV;eJTE>>`WcRfH`Tm
zvq<_7@1;7CYFHDQZG|KGL%d@tz9Khuxr9K265?SL?f0yzs^T#hMS6)YVt8!p5h#SB
zv(|iLXMBgm#kdq)CmJr|{%b5fJ@KGQ$N8nWDB-Znx=jg}6^ttLW_gweS)<3v8nJ-u
zaEW+$oW!%9v~w0Jpw65ZKQ39Ln6dIChiFrela1;E5}^QlBkdl=C88m$Ag6S!6ApEk
ze(-}_T75x5!B(o8@~wK3-mssFP-XvBj&-C?`cneUSRjAct-0Oqr?j*xh??+yOn8wC
zwcS-HG$|mFii!$e;OfzfRY+PEj)<lOB*H=>)4h%k@54nvDhNj;B?Khm%h)#3Ax~_y
z;KD)(j(LS#HR?IBl2QWlr?Rqg9qsN*b@#^BhIWth0`I;xx>Jgj6_AK8;I2aoiOF|!
zKhCJOrlM&4NqGVJLt4sbG5NY7=RrH=04r_VSU9O_X~J<q2`Ct!b(+tXi7wte+OwdN
z-Q30<fDQD29ppXV5&J?COfVO;fI`7m%H?vgs4TuUu&e1p^B#U{Vq3zz-0Iu+(79H6
p9Sh?$?X4sf?su|Y$YKe_{{xmqE;>j*#ytQ4002ovPDHLkV1f(%1Y`gJ

literal 0
HcmV?d00001

diff --git a/client/android/res/drawable-xxxhdpi/icon_round.png b/client/android/res/drawable-xxxhdpi/icon_round.png
new file mode 100644
index 0000000000000000000000000000000000000000..b2b33777fd79fe1bfb8c1473101afdd347649c2e
GIT binary patch
literal 11186
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
Qg8%>k07*qoM6N<$f@`vY1^@s6

literal 0
HcmV?d00001


From 6afdd8375d83fb10604267a65ed969077655da2f Mon Sep 17 00:00:00 2001
From: "vladimir.kuznetsov" <nethiuswork@gmail.com>
Date: Fri, 22 Sep 2023 00:37:55 +0500
Subject: [PATCH 135/278] added models, classes and ui files for amnezia
 wireguard

---
 client/CMakeLists.txt                         |   2 +
 client/amnezia_application.cpp                |   7 +-
 client/amnezia_application.h                  |   4 +-
 .../amneziaWireGuardConfigurator.cpp          |  15 +
 .../amneziaWireGuardConfigurator.h            |  18 ++
 client/configurators/vpn_configurator.cpp     |  48 ++--
 .../configurators/wireguard_configurator.cpp  |   5 +-
 client/configurators/wireguard_configurator.h |  22 +-
 client/containers/containers_defs.cpp         |   7 +
 client/containers/containers_defs.h           |   1 +
 client/core/scripts_registry.cpp              |   9 +-
 client/core/servercontroller.cpp              |   2 +
 client/protocols/amneziaWireGuardProtocol.cpp |  10 +
 client/protocols/amneziaWireGuardProtocol.h   |  17 ++
 client/protocols/protocols_defs.cpp           |   6 +
 client/protocols/protocols_defs.h             |   3 +-
 client/protocols/vpnprotocol.cpp              |  23 +-
 client/protocols/wireguardprotocol.cpp        |   2 +-
 client/resources.qrc                          |   1 +
 client/ui/controllers/pageController.h        |   1 +
 .../protocols/amneziaWireGuardConfigModel.cpp |  70 +++++
 .../protocols/amneziaWireGuardConfigModel.h   |  39 +++
 .../qml/Components/HomeContainersListView.qml |   3 +-
 .../Components/SettingsContainersListView.qml |   5 +
 .../PageProtocolAmneziaWireGuardSettings.qml  | 272 ++++++++++++++++++
 client/ui/qml/Pages2/PageSetupWizardStart.qml |   2 +-
 26 files changed, 534 insertions(+), 60 deletions(-)
 create mode 100644 client/configurators/amneziaWireGuardConfigurator.cpp
 create mode 100644 client/configurators/amneziaWireGuardConfigurator.h
 create mode 100644 client/protocols/amneziaWireGuardProtocol.cpp
 create mode 100644 client/protocols/amneziaWireGuardProtocol.h
 create mode 100644 client/ui/models/protocols/amneziaWireGuardConfigModel.cpp
 create mode 100644 client/ui/models/protocols/amneziaWireGuardConfigModel.h
 create mode 100644 client/ui/qml/Pages2/PageProtocolAmneziaWireGuardSettings.qml

diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt
index ca5161cf..f31a82ce 100644
--- a/client/CMakeLists.txt
+++ b/client/CMakeLists.txt
@@ -263,6 +263,7 @@ if(WIN32 OR (APPLE AND NOT IOS) OR (LINUX AND NOT ANDROID))
         ${CMAKE_CURRENT_LIST_DIR}/protocols/openvpnovercloakprotocol.h
         ${CMAKE_CURRENT_LIST_DIR}/protocols/shadowsocksvpnprotocol.h
         ${CMAKE_CURRENT_LIST_DIR}/protocols/wireguardprotocol.h
+        ${CMAKE_CURRENT_LIST_DIR}/protocols/amneziawireguardprotocol.h
     )
 
     set(SOURCES ${SOURCES}
@@ -273,6 +274,7 @@ if(WIN32 OR (APPLE AND NOT IOS) OR (LINUX AND NOT ANDROID))
         ${CMAKE_CURRENT_LIST_DIR}/protocols/openvpnovercloakprotocol.cpp
         ${CMAKE_CURRENT_LIST_DIR}/protocols/shadowsocksvpnprotocol.cpp
         ${CMAKE_CURRENT_LIST_DIR}/protocols/wireguardprotocol.cpp
+        ${CMAKE_CURRENT_LIST_DIR}/protocols/amneziawireguardprotocol.cpp
     )
 endif()
 
diff --git a/client/amnezia_application.cpp b/client/amnezia_application.cpp
index 23157468..cef722b1 100644
--- a/client/amnezia_application.cpp
+++ b/client/amnezia_application.cpp
@@ -318,8 +318,11 @@ void AmneziaApplication::initModels()
     m_cloakConfigModel.reset(new CloakConfigModel(this));
     m_engine->rootContext()->setContextProperty("CloakConfigModel", m_cloakConfigModel.get());
 
-    m_wireguardConfigModel.reset(new WireGuardConfigModel(this));
-    m_engine->rootContext()->setContextProperty("WireGuardConfigModel", m_wireguardConfigModel.get());
+    m_wireGuardConfigModel.reset(new WireGuardConfigModel(this));
+    m_engine->rootContext()->setContextProperty("WireGuardConfigModel", m_wireGuardConfigModel.get());
+
+    m_amneziaWireGuardConfigModel.reset(new AmneziaWireGuardConfigModel(this));
+    m_engine->rootContext()->setContextProperty("AmneziaWireGuardConfigModel", m_amneziaWireGuardConfigModel.get());
 
 #ifdef Q_OS_WINDOWS
     m_ikev2ConfigModel.reset(new Ikev2ConfigModel(this));
diff --git a/client/amnezia_application.h b/client/amnezia_application.h
index 2dd74fcb..77e50c92 100644
--- a/client/amnezia_application.h
+++ b/client/amnezia_application.h
@@ -31,6 +31,7 @@
 #ifdef Q_OS_WINDOWS
     #include "ui/models/protocols/ikev2ConfigModel.h"
 #endif
+#include "ui/models/protocols/amneziaWireGuardConfigModel.h"
 #include "ui/models/protocols/openvpnConfigModel.h"
 #include "ui/models/protocols/shadowsocksConfigModel.h"
 #include "ui/models/protocols/wireguardConfigModel.h"
@@ -97,7 +98,8 @@ private:
     QScopedPointer<OpenVpnConfigModel> m_openVpnConfigModel;
     QScopedPointer<ShadowSocksConfigModel> m_shadowSocksConfigModel;
     QScopedPointer<CloakConfigModel> m_cloakConfigModel;
-    QScopedPointer<WireGuardConfigModel> m_wireguardConfigModel;
+    QScopedPointer<WireGuardConfigModel> m_wireGuardConfigModel;
+    QScopedPointer<AmneziaWireGuardConfigModel> m_amneziaWireGuardConfigModel;
 #ifdef Q_OS_WINDOWS
     QScopedPointer<Ikev2ConfigModel> m_ikev2ConfigModel;
 #endif
diff --git a/client/configurators/amneziaWireGuardConfigurator.cpp b/client/configurators/amneziaWireGuardConfigurator.cpp
new file mode 100644
index 00000000..56f0c68e
--- /dev/null
+++ b/client/configurators/amneziaWireGuardConfigurator.cpp
@@ -0,0 +1,15 @@
+#include "amneziaWireGuardConfigurator.h"
+
+AmneziaWireGuardConfigurator::AmneziaWireGuardConfigurator(std::shared_ptr<Settings> settings, QObject *parent)
+    : WireguardConfigurator(settings, parent)
+{
+}
+
+QString AmneziaWireGuardConfigurator::genAmneziaWireGuardConfig(const ServerCredentials &credentials,
+                                                                DockerContainer container,
+                                                                const QJsonObject &containerConfig, ErrorCode *errorCode)
+{
+    auto config = WireguardConfigurator::genWireguardConfig(credentials, container, containerConfig, errorCode);
+
+    return config;
+}
diff --git a/client/configurators/amneziaWireGuardConfigurator.h b/client/configurators/amneziaWireGuardConfigurator.h
new file mode 100644
index 00000000..02961cf1
--- /dev/null
+++ b/client/configurators/amneziaWireGuardConfigurator.h
@@ -0,0 +1,18 @@
+#ifndef AMNEZIAWIREGUARDCONFIGURATOR_H
+#define AMNEZIAWIREGUARDCONFIGURATOR_H
+
+#include <QObject>
+
+#include "wireguard_configurator.h"
+
+class AmneziaWireGuardConfigurator : public WireguardConfigurator
+{
+    Q_OBJECT
+public:
+    AmneziaWireGuardConfigurator(std::shared_ptr<Settings> settings, QObject *parent = nullptr);
+
+    QString genAmneziaWireGuardConfig(const ServerCredentials &credentials, DockerContainer container,
+                                      const QJsonObject &containerConfig, ErrorCode *errorCode = nullptr);
+};
+
+#endif // AMNEZIAWIREGUARDCONFIGURATOR_H
diff --git a/client/configurators/vpn_configurator.cpp b/client/configurators/vpn_configurator.cpp
index ceb6a5a4..7f0e95df 100644
--- a/client/configurators/vpn_configurator.cpp
+++ b/client/configurators/vpn_configurator.cpp
@@ -1,21 +1,21 @@
 #include "vpn_configurator.h"
-#include "openvpn_configurator.h"
 #include "cloak_configurator.h"
-#include "shadowsocks_configurator.h"
-#include "wireguard_configurator.h"
 #include "ikev2_configurator.h"
+#include "openvpn_configurator.h"
+#include "shadowsocks_configurator.h"
 #include "ssh_configurator.h"
+#include "wireguard_configurator.h"
 
 #include <QFile>
-#include <QJsonObject>
 #include <QJsonDocument>
+#include <QJsonObject>
 
 #include "containers/containers_defs.h"
-#include "utilities.h"
 #include "settings.h"
+#include "utilities.h"
 
-VpnConfigurator::VpnConfigurator(std::shared_ptr<Settings> settings, QObject *parent):
-    ConfiguratorBase(settings, parent)
+VpnConfigurator::VpnConfigurator(std::shared_ptr<Settings> settings, QObject *parent)
+    : ConfiguratorBase(settings, parent)
 {
     openVpnConfigurator = std::shared_ptr<OpenVpnConfigurator>(new OpenVpnConfigurator(settings, this));
     shadowSocksConfigurator = std::shared_ptr<ShadowSocksConfigurator>(new ShadowSocksConfigurator(settings, this));
@@ -25,8 +25,8 @@ VpnConfigurator::VpnConfigurator(std::shared_ptr<Settings> settings, QObject *pa
     sshConfigurator = std::shared_ptr<SshConfigurator>(new SshConfigurator(settings, this));
 }
 
-QString VpnConfigurator::genVpnProtocolConfig(const ServerCredentials &credentials,
-    DockerContainer container, const QJsonObject &containerConfig, Proto proto, ErrorCode *errorCode)
+QString VpnConfigurator::genVpnProtocolConfig(const ServerCredentials &credentials, DockerContainer container,
+                                              const QJsonObject &containerConfig, Proto proto, ErrorCode *errorCode)
 {
     switch (proto) {
     case Proto::OpenVpn:
@@ -35,17 +35,17 @@ QString VpnConfigurator::genVpnProtocolConfig(const ServerCredentials &credentia
     case Proto::ShadowSocks:
         return shadowSocksConfigurator->genShadowSocksConfig(credentials, container, containerConfig, errorCode);
 
-    case Proto::Cloak:
-        return cloakConfigurator->genCloakConfig(credentials, container, containerConfig, errorCode);
+    case Proto::Cloak: return cloakConfigurator->genCloakConfig(credentials, container, containerConfig, errorCode);
 
     case Proto::WireGuard:
         return wireguardConfigurator->genWireguardConfig(credentials, container, containerConfig, errorCode);
 
-    case Proto::Ikev2:
-        return ikev2Configurator->genIkev2Config(credentials, container, containerConfig, errorCode);
+    case Proto::AmneziaWireGuard:
+        return wireguardConfigurator->genWireguardConfig(credentials, container, containerConfig, errorCode);
 
-    default:
-        return "";
+    case Proto::Ikev2: return ikev2Configurator->genIkev2Config(credentials, container, containerConfig, errorCode);
+
+    default: return "";
     }
 }
 
@@ -62,8 +62,8 @@ QPair<QString, QString> VpnConfigurator::getDnsForConfig(int serverIndex)
     if (dns.first.isEmpty() || !Utils::checkIPv4Format(dns.first)) {
         if (useAmneziaDns && m_settings->containers(serverIndex).contains(DockerContainer::Dns)) {
             dns.first = protocols::dns::amneziaDnsIp;
-        }
-        else dns.first = m_settings->primaryDns();
+        } else
+            dns.first = m_settings->primaryDns();
     }
     if (dns.second.isEmpty() || !Utils::checkIPv4Format(dns.second)) {
         dns.second = m_settings->secondaryDns();
@@ -73,8 +73,8 @@ QPair<QString, QString> VpnConfigurator::getDnsForConfig(int serverIndex)
     return dns;
 }
 
-QString &VpnConfigurator::processConfigWithDnsSettings(int serverIndex, DockerContainer container,
-    Proto proto, QString &config)
+QString &VpnConfigurator::processConfigWithDnsSettings(int serverIndex, DockerContainer container, Proto proto,
+                                                       QString &config)
 {
     auto dns = getDnsForConfig(serverIndex);
 
@@ -84,8 +84,8 @@ QString &VpnConfigurator::processConfigWithDnsSettings(int serverIndex, DockerCo
     return config;
 }
 
-QString &VpnConfigurator::processConfigWithLocalSettings(int serverIndex, DockerContainer container,
-    Proto proto, QString &config)
+QString &VpnConfigurator::processConfigWithLocalSettings(int serverIndex, DockerContainer container, Proto proto,
+                                                         QString &config)
 {
     processConfigWithDnsSettings(serverIndex, container, proto, config);
 
@@ -95,8 +95,8 @@ QString &VpnConfigurator::processConfigWithLocalSettings(int serverIndex, Docker
     return config;
 }
 
-QString &VpnConfigurator::processConfigWithExportSettings(int serverIndex, DockerContainer container,
-    Proto proto, QString &config)
+QString &VpnConfigurator::processConfigWithExportSettings(int serverIndex, DockerContainer container, Proto proto,
+                                                          QString &config)
 {
     processConfigWithDnsSettings(serverIndex, container, proto, config);
 
@@ -107,7 +107,7 @@ QString &VpnConfigurator::processConfigWithExportSettings(int serverIndex, Docke
 }
 
 void VpnConfigurator::updateContainerConfigAfterInstallation(DockerContainer container, QJsonObject &containerConfig,
-    const QString &stdOut)
+                                                             const QString &stdOut)
 {
     Proto mainProto = ContainerProps::defaultProtocol(container);
 
diff --git a/client/configurators/wireguard_configurator.cpp b/client/configurators/wireguard_configurator.cpp
index 14059977..02716b72 100644
--- a/client/configurators/wireguard_configurator.cpp
+++ b/client/configurators/wireguard_configurator.cpp
@@ -62,7 +62,10 @@ WireguardConfigurator::ConnectionData WireguardConfigurator::prepareWireguardCon
 {
     WireguardConfigurator::ConnectionData connData = WireguardConfigurator::genClientKeys();
     connData.host = credentials.hostName;
-    connData.port = containerConfig.value(config_key::port).toString(protocols::wireguard::defaultPort);
+    connData.port = containerConfig.value(config_key::wireguard)
+                            .toObject()
+                            .value(config_key::port)
+                            .toString(protocols::wireguard::defaultPort);
 
     if (connData.clientPrivKey.isEmpty() || connData.clientPubKey.isEmpty()) {
         if (errorCode)
diff --git a/client/configurators/wireguard_configurator.h b/client/configurators/wireguard_configurator.h
index 7674eb06..140acc47 100644
--- a/client/configurators/wireguard_configurator.h
+++ b/client/configurators/wireguard_configurator.h
@@ -7,32 +7,32 @@
 #include "configurator_base.h"
 #include "core/defs.h"
 
-class WireguardConfigurator : ConfiguratorBase
+class WireguardConfigurator : public ConfiguratorBase
 {
     Q_OBJECT
 public:
     WireguardConfigurator(std::shared_ptr<Settings> settings, QObject *parent = nullptr);
 
-    struct ConnectionData {
+    struct ConnectionData
+    {
         QString clientPrivKey; // client private key
-        QString clientPubKey; // client public key
-        QString clientIP; // internal client IP address
-        QString serverPubKey; // tls-auth key
-        QString pskKey; // preshared key
-        QString host; // host ip
+        QString clientPubKey;  // client public key
+        QString clientIP;      // internal client IP address
+        QString serverPubKey;  // tls-auth key
+        QString pskKey;        // preshared key
+        QString host;          // host ip
         QString port;
     };
 
     QString genWireguardConfig(const ServerCredentials &credentials, DockerContainer container,
-        const QJsonObject &containerConfig, ErrorCode *errorCode = nullptr);
+                               const QJsonObject &containerConfig, ErrorCode *errorCode = nullptr);
 
     QString processConfigWithLocalSettings(QString config);
     QString processConfigWithExportSettings(QString config);
 
-
 private:
-    ConnectionData prepareWireguardConfig(const ServerCredentials &credentials,
-        DockerContainer container, const QJsonObject &containerConfig, ErrorCode *errorCode = nullptr);
+    ConnectionData prepareWireguardConfig(const ServerCredentials &credentials, DockerContainer container,
+                                          const QJsonObject &containerConfig, ErrorCode *errorCode = nullptr);
 
     ConnectionData genClientKeys();
 };
diff --git a/client/containers/containers_defs.cpp b/client/containers/containers_defs.cpp
index 20fc59f4..21f7b044 100644
--- a/client/containers/containers_defs.cpp
+++ b/client/containers/containers_defs.cpp
@@ -84,6 +84,7 @@ QMap<DockerContainer, QString> ContainerProps::containerHumanNames()
              { DockerContainer::ShadowSocks, "ShadowSocks" },
              { DockerContainer::Cloak, "OpenVPN over Cloak" },
              { DockerContainer::WireGuard, "WireGuard" },
+             { DockerContainer::AmneziaWireGuard, "Amnezia WireGuard" },
              { DockerContainer::Ipsec, QObject::tr("IPsec") },
 
              { DockerContainer::TorWebSite, QObject::tr("Website in Tor network") },
@@ -107,6 +108,9 @@ QMap<DockerContainer, QString> ContainerProps::containerDescriptions()
              { DockerContainer::WireGuard,
                QObject::tr("WireGuard - New popular VPN protocol with high performance, high speed and low power "
                            "consumption. Recommended for regions with low levels of censorship.") },
+             { DockerContainer::AmneziaWireGuard,
+               QObject::tr("WireGuard - New popular VPN protocol with high performance, high speed and low power "
+                           "consumption. Recommended for regions with low levels of censorship.") },
              { DockerContainer::Ipsec,
                QObject::tr("IKEv2 -  Modern stable protocol, a bit faster than others, restores connection after "
                            "signal loss. It has native support on the latest versions of Android and iOS.") },
@@ -127,6 +131,7 @@ QMap<DockerContainer, QString> ContainerProps::containerDetailedDescriptions()
                QObject::tr("Container with OpenVpn and ShadowSocks protocols "
                            "configured with traffic masking by Cloak plugin") },
              { DockerContainer::WireGuard, QObject::tr("WireGuard container") },
+             { DockerContainer::WireGuard, QObject::tr("Amnezia WireGuard container") },
              { DockerContainer::Ipsec, QObject::tr("IPsec container") },
 
              { DockerContainer::TorWebSite, QObject::tr("Website in Tor network") },
@@ -143,6 +148,7 @@ amnezia::ServiceType ContainerProps::containerService(DockerContainer c)
     case DockerContainer::Cloak: return ServiceType::Vpn;
     case DockerContainer::ShadowSocks: return ServiceType::Vpn;
     case DockerContainer::WireGuard: return ServiceType::Vpn;
+    case DockerContainer::AmneziaWireGuard: return ServiceType::Vpn;
     case DockerContainer::Ipsec: return ServiceType::Vpn;
     case DockerContainer::TorWebSite: return ServiceType::Other;
     case DockerContainer::Dns: return ServiceType::Other;
@@ -160,6 +166,7 @@ Proto ContainerProps::defaultProtocol(DockerContainer c)
     case DockerContainer::Cloak: return Proto::Cloak;
     case DockerContainer::ShadowSocks: return Proto::ShadowSocks;
     case DockerContainer::WireGuard: return Proto::WireGuard;
+    case DockerContainer::AmneziaWireGuard: return Proto::AmneziaWireGuard;
     case DockerContainer::Ipsec: return Proto::Ikev2;
 
     case DockerContainer::TorWebSite: return Proto::TorWebSite;
diff --git a/client/containers/containers_defs.h b/client/containers/containers_defs.h
index 9ca51a96..774611c8 100644
--- a/client/containers/containers_defs.h
+++ b/client/containers/containers_defs.h
@@ -20,6 +20,7 @@ namespace amnezia
             ShadowSocks,
             Cloak,
             WireGuard,
+            AmneziaWireGuard,
             Ipsec,
 
             // non-vpn
diff --git a/client/core/scripts_registry.cpp b/client/core/scripts_registry.cpp
index 1b379ea1..31508152 100644
--- a/client/core/scripts_registry.cpp
+++ b/client/core/scripts_registry.cpp
@@ -1,8 +1,8 @@
 #include "scripts_registry.h"
 
-#include <QObject>
 #include <QDebug>
 #include <QFile>
+#include <QObject>
 
 QString amnezia::scriptFolder(amnezia::DockerContainer container)
 {
@@ -11,11 +11,12 @@ QString amnezia::scriptFolder(amnezia::DockerContainer container)
     case DockerContainer::Cloak: return QLatin1String("openvpn_cloak");
     case DockerContainer::ShadowSocks: return QLatin1String("openvpn_shadowsocks");
     case DockerContainer::WireGuard: return QLatin1String("wireguard");
+    case DockerContainer::AmneziaWireGuard: return QLatin1String("wireguard");
     case DockerContainer::Ipsec: return QLatin1String("ipsec");
 
     case DockerContainer::TorWebSite: return QLatin1String("website_tor");
     case DockerContainer::Dns: return QLatin1String("dns");
-    //case DockerContainer::FileShare: return QLatin1String("file_share");
+    // case DockerContainer::FileShare: return QLatin1String("file_share");
     case DockerContainer::Sftp: return QLatin1String("sftp");
     default: return "";
     }
@@ -52,7 +53,7 @@ QString amnezia::scriptData(amnezia::SharedScriptType type)
 {
     QString fileName = QString(":/server_scripts/%1").arg(amnezia::scriptName(type));
     QFile file(fileName);
-    if (! file.open(QIODevice::ReadOnly)) {
+    if (!file.open(QIODevice::ReadOnly)) {
         qDebug() << "Warning: script missing" << fileName;
         return "";
     }
@@ -67,7 +68,7 @@ QString amnezia::scriptData(amnezia::ProtocolScriptType type, DockerContainer co
 {
     QString fileName = QString(":/server_scripts/%1/%2").arg(amnezia::scriptFolder(container), amnezia::scriptName(type));
     QFile file(fileName);
-    if (! file.open(QIODevice::ReadOnly)) {
+    if (!file.open(QIODevice::ReadOnly)) {
         qDebug() << "Warning: script missing" << fileName;
         return "";
     }
diff --git a/client/core/servercontroller.cpp b/client/core/servercontroller.cpp
index b0f8146f..27213dc3 100644
--- a/client/core/servercontroller.cpp
+++ b/client/core/servercontroller.cpp
@@ -486,6 +486,8 @@ ServerController::Vars ServerController::genVarsForScript(const ServerCredential
     const QJsonObject &cloakConfig = config.value(ProtocolProps::protoToString(Proto::Cloak)).toObject();
     const QJsonObject &ssConfig = config.value(ProtocolProps::protoToString(Proto::ShadowSocks)).toObject();
     const QJsonObject &wireguarConfig = config.value(ProtocolProps::protoToString(Proto::WireGuard)).toObject();
+    const QJsonObject &amneziaWireguarConfig =
+            config.value(ProtocolProps::protoToString(Proto::AmneziaWireGuard)).toObject();
     const QJsonObject &sftpConfig = config.value(ProtocolProps::protoToString(Proto::Sftp)).toObject();
 
     Vars vars;
diff --git a/client/protocols/amneziaWireGuardProtocol.cpp b/client/protocols/amneziaWireGuardProtocol.cpp
new file mode 100644
index 00000000..b4c5b430
--- /dev/null
+++ b/client/protocols/amneziaWireGuardProtocol.cpp
@@ -0,0 +1,10 @@
+#include "amneziaWireGuardProtocol.h"
+
+AmneziaWireGuardProtocol::AmneziaWireGuardProtocol(const QJsonObject &configuration, QObject *parent)
+    : WireguardProtocol(configuration, parent)
+{
+}
+
+AmneziaWireGuardProtocol::~AmneziaWireGuardProtocol()
+{
+}
diff --git a/client/protocols/amneziaWireGuardProtocol.h b/client/protocols/amneziaWireGuardProtocol.h
new file mode 100644
index 00000000..329a585e
--- /dev/null
+++ b/client/protocols/amneziaWireGuardProtocol.h
@@ -0,0 +1,17 @@
+#ifndef AMNEZIAWIREGUARDPROTOCOL_H
+#define AMNEZIAWIREGUARDPROTOCOL_H
+
+#include <QObject>
+
+#include "wireguardprotocol.h"
+
+class AmneziaWireGuardProtocol : public WireguardProtocol
+{
+    Q_OBJECT
+
+public:
+    explicit AmneziaWireGuardProtocol(const QJsonObject &configuration, QObject *parent = nullptr);
+    virtual ~AmneziaWireGuardProtocol() override;
+};
+
+#endif // AMNEZIAWIREGUARDPROTOCOL_H
diff --git a/client/protocols/protocols_defs.cpp b/client/protocols/protocols_defs.cpp
index 5f8600db..64cdd003 100644
--- a/client/protocols/protocols_defs.cpp
+++ b/client/protocols/protocols_defs.cpp
@@ -66,6 +66,7 @@ QMap<amnezia::Proto, QString> ProtocolProps::protocolHumanNames()
              { Proto::ShadowSocks, "ShadowSocks" },
              { Proto::Cloak, "Cloak" },
              { Proto::WireGuard, "WireGuard" },
+             { Proto::WireGuard, "Amnezia WireGuard" },
              { Proto::Ikev2, "IKEv2" },
              { Proto::L2tp, "L2TP" },
 
@@ -88,6 +89,7 @@ amnezia::ServiceType ProtocolProps::protocolService(Proto p)
     case Proto::Cloak: return ServiceType::Vpn;
     case Proto::ShadowSocks: return ServiceType::Vpn;
     case Proto::WireGuard: return ServiceType::Vpn;
+    case Proto::AmneziaWireGuard: return ServiceType::Vpn;
     case Proto::TorWebSite: return ServiceType::Other;
     case Proto::Dns: return ServiceType::Other;
     case Proto::FileShare: return ServiceType::Other;
@@ -103,6 +105,7 @@ int ProtocolProps::defaultPort(Proto p)
     case Proto::Cloak: return 443;
     case Proto::ShadowSocks: return 6789;
     case Proto::WireGuard: return 51820;
+    case Proto::AmneziaWireGuard: return 55424;
     case Proto::Ikev2: return -1;
     case Proto::L2tp: return -1;
 
@@ -122,6 +125,7 @@ bool ProtocolProps::defaultPortChangeable(Proto p)
     case Proto::Cloak: return true;
     case Proto::ShadowSocks: return true;
     case Proto::WireGuard: return true;
+    case Proto::AmneziaWireGuard: return true;
     case Proto::Ikev2: return false;
     case Proto::L2tp: return false;
 
@@ -140,6 +144,7 @@ TransportProto ProtocolProps::defaultTransportProto(Proto p)
     case Proto::Cloak: return TransportProto::Tcp;
     case Proto::ShadowSocks: return TransportProto::Tcp;
     case Proto::WireGuard: return TransportProto::Udp;
+    case Proto::AmneziaWireGuard: return TransportProto::Udp;
     case Proto::Ikev2: return TransportProto::Udp;
     case Proto::L2tp: return TransportProto::Udp;
     // non-vpn
@@ -158,6 +163,7 @@ bool ProtocolProps::defaultTransportProtoChangeable(Proto p)
     case Proto::Cloak: return false;
     case Proto::ShadowSocks: return false;
     case Proto::WireGuard: return false;
+    case Proto::AmneziaWireGuard: return false;
     case Proto::Ikev2: return false;
     case Proto::L2tp: return false;
     // non-vpn
diff --git a/client/protocols/protocols_defs.h b/client/protocols/protocols_defs.h
index 9472164b..4e72e318 100644
--- a/client/protocols/protocols_defs.h
+++ b/client/protocols/protocols_defs.h
@@ -2,8 +2,8 @@
 #define PROTOCOLS_DEFS_H
 
 #include <QDebug>
-#include <QObject>
 #include <QMetaEnum>
+#include <QObject>
 
 namespace amnezia
 {
@@ -158,6 +158,7 @@ namespace amnezia
             ShadowSocks,
             Cloak,
             WireGuard,
+            AmneziaWireGuard,
             Ikev2,
             L2tp,
 
diff --git a/client/protocols/vpnprotocol.cpp b/client/protocols/vpnprotocol.cpp
index 841d307c..527ede47 100644
--- a/client/protocols/vpnprotocol.cpp
+++ b/client/protocols/vpnprotocol.cpp
@@ -1,22 +1,21 @@
 #include <QDebug>
 #include <QTimer>
 
-#include "vpnprotocol.h"
 #include "core/errorstrings.h"
+#include "vpnprotocol.h"
 
 #if defined(Q_OS_WINDOWS) || defined(Q_OS_MACX) || (defined(Q_OS_LINUX) && !defined(Q_OS_ANDROID))
-#include "openvpnprotocol.h"
-#include "shadowsocksvpnprotocol.h"
-#include "openvpnovercloakprotocol.h"
-#include "wireguardprotocol.h"
+    #include "openvpnovercloakprotocol.h"
+    #include "openvpnprotocol.h"
+    #include "shadowsocksvpnprotocol.h"
+    #include "wireguardprotocol.h"
 #endif
 
 #ifdef Q_OS_WINDOWS
-#include "ikev2_vpn_protocol_windows.h"
+    #include "ikev2_vpn_protocol_windows.h"
 #endif
 
-
-VpnProtocol::VpnProtocol(const QJsonObject &configuration, QObject* parent)
+VpnProtocol::VpnProtocol(const QJsonObject &configuration, QObject *parent)
     : QObject(parent),
       m_connectionState(Vpn::ConnectionState::Unknown),
       m_rawConfig(configuration),
@@ -31,7 +30,7 @@ VpnProtocol::VpnProtocol(const QJsonObject &configuration, QObject* parent)
 void VpnProtocol::setLastError(ErrorCode lastError)
 {
     m_lastError = lastError;
-    if (lastError){
+    if (lastError) {
         setConnectionState(Vpn::ConnectionState::Error);
     }
     qCritical().noquote() << "VpnProtocol error, code" << m_lastError << errorString(m_lastError);
@@ -103,7 +102,7 @@ QString VpnProtocol::vpnGateway() const
     return m_vpnGateway;
 }
 
-VpnProtocol *VpnProtocol::factory(DockerContainer container, const QJsonObject& configuration)
+VpnProtocol *VpnProtocol::factory(DockerContainer container, const QJsonObject &configuration)
 {
     switch (container) {
 #if defined(Q_OS_WINDOWS)
@@ -114,6 +113,7 @@ VpnProtocol *VpnProtocol::factory(DockerContainer container, const QJsonObject&
     case DockerContainer::Cloak: return new OpenVpnOverCloakProtocol(configuration);
     case DockerContainer::ShadowSocks: return new ShadowSocksVpnProtocol(configuration);
     case DockerContainer::WireGuard: return new WireguardProtocol(configuration);
+    case DockerContainer::AmneziaWireGuard: return new WireguardProtocol(configuration);
 #endif
     default: return nullptr;
     }
@@ -135,8 +135,7 @@ QString VpnProtocol::textConnectionState(Vpn::ConnectionState connectionState)
     case Vpn::ConnectionState::Disconnecting: return tr("Disconnecting...");
     case Vpn::ConnectionState::Reconnecting: return tr("Reconnecting...");
     case Vpn::ConnectionState::Error: return tr("Error");
-    default:
-        ;
+    default:;
     }
 
     return QString();
diff --git a/client/protocols/wireguardprotocol.cpp b/client/protocols/wireguardprotocol.cpp
index 7466d1af..eb37f67a 100644
--- a/client/protocols/wireguardprotocol.cpp
+++ b/client/protocols/wireguardprotocol.cpp
@@ -18,7 +18,7 @@ WireguardProtocol::WireguardProtocol(const QJsonObject &configuration, QObject *
 
     // MZ
 #if defined(MZ_LINUX)
-    //m_impl.reset(new LinuxController());
+    // m_impl.reset(new LinuxController());
 #elif defined(Q_OS_MAC) || defined(Q_OS_WIN)
     m_impl.reset(new LocalSocketController());
     connect(m_impl.get(), &ControllerImpl::connected, this,
diff --git a/client/resources.qrc b/client/resources.qrc
index 5b4d6ae7..44c61172 100644
--- a/client/resources.qrc
+++ b/client/resources.qrc
@@ -215,5 +215,6 @@
         <file>ui/qml/Controls2/ListViewWithLabelsType.qml</file>
         <file>ui/qml/Pages2/PageServiceDnsSettings.qml</file>
         <file>ui/qml/Controls2/TopCloseButtonType.qml</file>
+        <file>ui/qml/Pages2/PageProtocolAmneziaWireGuardSettings.qml</file>
     </qresource>
 </RCC>
diff --git a/client/ui/controllers/pageController.h b/client/ui/controllers/pageController.h
index a8f883fe..cf248900 100644
--- a/client/ui/controllers/pageController.h
+++ b/client/ui/controllers/pageController.h
@@ -49,6 +49,7 @@ namespace PageLoader
         PageProtocolShadowSocksSettings,
         PageProtocolCloakSettings,
         PageProtocolWireGuardSettings,
+        PageProtocolAmneziaWireGuardSettings,
         PageProtocolIKev2Settings,
         PageProtocolRaw
     };
diff --git a/client/ui/models/protocols/amneziaWireGuardConfigModel.cpp b/client/ui/models/protocols/amneziaWireGuardConfigModel.cpp
new file mode 100644
index 00000000..9cf4ed14
--- /dev/null
+++ b/client/ui/models/protocols/amneziaWireGuardConfigModel.cpp
@@ -0,0 +1,70 @@
+#include "amneziaWireGuardConfigModel.h"
+
+#include "protocols/protocols_defs.h"
+
+AmneziaWireGuardConfigModel::AmneziaWireGuardConfigModel(QObject *parent) : QAbstractListModel(parent)
+{
+}
+
+int AmneziaWireGuardConfigModel::rowCount(const QModelIndex &parent) const
+{
+    Q_UNUSED(parent);
+    return 1;
+}
+
+bool AmneziaWireGuardConfigModel::setData(const QModelIndex &index, const QVariant &value, int role)
+{
+    if (!index.isValid() || index.row() < 0 || index.row() >= ContainerProps::allContainers().size()) {
+        return false;
+    }
+
+    switch (role) {
+    case Roles::PortRole: m_protocolConfig.insert(config_key::port, value.toString()); break;
+    case Roles::CipherRole: m_protocolConfig.insert(config_key::cipher, value.toString()); break;
+    }
+
+    emit dataChanged(index, index, QList { role });
+    return true;
+}
+
+QVariant AmneziaWireGuardConfigModel::data(const QModelIndex &index, int role) const
+{
+    if (!index.isValid() || index.row() < 0 || index.row() >= rowCount()) {
+        return false;
+    }
+
+    switch (role) {
+    case Roles::PortRole: return m_protocolConfig.value(config_key::port).toString(protocols::shadowsocks::defaultPort);
+    case Roles::CipherRole:
+        return m_protocolConfig.value(config_key::cipher).toString(protocols::shadowsocks::defaultCipher);
+    }
+
+    return QVariant();
+}
+
+void AmneziaWireGuardConfigModel::updateModel(const QJsonObject &config)
+{
+    beginResetModel();
+    m_container = ContainerProps::containerFromString(config.value(config_key::container).toString());
+
+    m_fullConfig = config;
+    QJsonObject protocolConfig = config.value(config_key::wireguard).toObject();
+
+    endResetModel();
+}
+
+QJsonObject AmneziaWireGuardConfigModel::getConfig()
+{
+    m_fullConfig.insert(config_key::wireguard, m_protocolConfig);
+    return m_fullConfig;
+}
+
+QHash<int, QByteArray> AmneziaWireGuardConfigModel::roleNames() const
+{
+    QHash<int, QByteArray> roles;
+
+    roles[PortRole] = "port";
+    roles[CipherRole] = "cipher";
+
+    return roles;
+}
diff --git a/client/ui/models/protocols/amneziaWireGuardConfigModel.h b/client/ui/models/protocols/amneziaWireGuardConfigModel.h
new file mode 100644
index 00000000..b798c289
--- /dev/null
+++ b/client/ui/models/protocols/amneziaWireGuardConfigModel.h
@@ -0,0 +1,39 @@
+#ifndef AMNEZIAWIREGUARDCONFIGMODEL_H
+#define AMNEZIAWIREGUARDCONFIGMODEL_H
+
+#include <QAbstractListModel>
+#include <QJsonObject>
+
+#include "containers/containers_defs.h"
+
+class AmneziaWireGuardConfigModel : public QAbstractListModel
+{
+    Q_OBJECT
+
+public:
+    enum Roles {
+        PortRole = Qt::UserRole + 1,
+        CipherRole
+    };
+
+    explicit AmneziaWireGuardConfigModel(QObject *parent = nullptr);
+
+    int rowCount(const QModelIndex &parent = QModelIndex()) const override;
+
+    bool setData(const QModelIndex &index, const QVariant &value, int role) override;
+    QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
+
+public slots:
+    void updateModel(const QJsonObject &config);
+    QJsonObject getConfig();
+
+protected:
+    QHash<int, QByteArray> roleNames() const override;
+
+private:
+    DockerContainer m_container;
+    QJsonObject m_protocolConfig;
+    QJsonObject m_fullConfig;
+};
+
+#endif // AMNEZIAWIREGUARDCONFIGMODEL_H
diff --git a/client/ui/qml/Components/HomeContainersListView.qml b/client/ui/qml/Components/HomeContainersListView.qml
index 4708128f..037a666d 100644
--- a/client/ui/qml/Components/HomeContainersListView.qml
+++ b/client/ui/qml/Components/HomeContainersListView.qml
@@ -72,8 +72,7 @@ ListView {
                         containersDropDown.menuVisible = false
 
 
-                        if (needReconnected &&
-                                (ConnectionController.isConnected || ConnectionController.isConnectionInProgress)) {
+                        if (needReconnected && (ConnectionController.isConnected || ConnectionController.isConnectionInProgress)) {
                             PageController.showNotificationMessage(qsTr("Reconnect via VPN Procotol: ") + name)
                             PageController.goToPageHome()
                             menu.visible = false
diff --git a/client/ui/qml/Components/SettingsContainersListView.qml b/client/ui/qml/Components/SettingsContainersListView.qml
index edd96bd7..250ba1eb 100644
--- a/client/ui/qml/Components/SettingsContainersListView.qml
+++ b/client/ui/qml/Components/SettingsContainersListView.qml
@@ -64,6 +64,11 @@ ListView {
     //                        goToPage(PageEnum.PageProtocolWireGuardSettings)
                             break
                         }
+                        case ContainerEnum.AmneziaWireGuard: {
+                            WireGuardConfigModel.updateModel(config)
+                            PageController.goToPage(PageEnum.PageProtocolAmneziaWireGuardSettings)
+                            break
+                        }
                         case ContainerEnum.Ipsec: {
                             ProtocolsModel.updateModel(config)
                             PageController.goToPage(PageEnum.PageProtocolRaw)
diff --git a/client/ui/qml/Pages2/PageProtocolAmneziaWireGuardSettings.qml b/client/ui/qml/Pages2/PageProtocolAmneziaWireGuardSettings.qml
new file mode 100644
index 00000000..a905f47a
--- /dev/null
+++ b/client/ui/qml/Pages2/PageProtocolAmneziaWireGuardSettings.qml
@@ -0,0 +1,272 @@
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+
+import SortFilterProxyModel 0.2
+
+import "./"
+import "../Controls2"
+import "../Controls2/TextTypes"
+import "../Config"
+import "../Components"
+
+PageType {
+    id: root
+
+    ColumnLayout {
+        id: backButton
+
+        anchors.top: parent.top
+        anchors.left: parent.left
+        anchors.right: parent.right
+
+        anchors.topMargin: 20
+
+        BackButtonType {
+        }
+    }
+
+    FlickableType {
+        id: fl
+        anchors.top: backButton.bottom
+        anchors.bottom: parent.bottom
+        contentHeight: content.implicitHeight
+
+        Column {
+            id: content
+
+            anchors.top: parent.top
+            anchors.left: parent.left
+            anchors.right: parent.right
+
+            enabled: ServersModel.isCurrentlyProcessedServerHasWriteAccess()
+
+            ListView {
+                id: listview
+
+                width: parent.width
+                height: listview.contentItem.height
+
+                clip: true
+                interactive: false
+
+                model: AmneziaWireGuardConfigModel
+
+                delegate: Item {
+                    implicitWidth: listview.width
+                    implicitHeight: col.implicitHeight
+
+                    ColumnLayout {
+                        id: col
+
+                        anchors.top: parent.top
+                        anchors.left: parent.left
+                        anchors.right: parent.right
+
+                        anchors.leftMargin: 16
+                        anchors.rightMargin: 16
+
+                        spacing: 0
+
+                        HeaderType {
+                            Layout.fillWidth: true
+
+                            headerText: qsTr("Amnezia WireGuard settings")
+                        }
+
+                        TextFieldWithHeaderType {
+                            Layout.fillWidth: true
+                            Layout.topMargin: 40
+
+                            headerText: qsTr("Port")
+                            textFieldText: port
+                            textField.maximumLength: 5
+                            textField.validator: IntValidator { bottom: 1; top: 65535 }
+
+                            textField.onEditingFinished: {
+                                if (textFieldText !== port) {
+                                    port = textFieldText
+                                }
+                            }
+                        }
+
+                        TextFieldWithHeaderType {
+                            Layout.fillWidth: true
+                            Layout.topMargin: 16
+
+                            headerText: qsTr("Junk packet count")
+                            textFieldText: port
+
+                            textField.onEditingFinished: {
+                                if (textFieldText !== port) {
+                                    port = textFieldText
+                                }
+                            }
+                        }
+
+                        TextFieldWithHeaderType {
+                            Layout.fillWidth: true
+                            Layout.topMargin: 16
+
+                            headerText: qsTr("Junk packet minimum size")
+                            textFieldText: port
+
+                            textField.onEditingFinished: {
+                                if (textFieldText !== port) {
+                                    port = textFieldText
+                                }
+                            }
+                        }
+
+                        TextFieldWithHeaderType {
+                            Layout.fillWidth: true
+                            Layout.topMargin: 16
+
+                            headerText: qsTr("Junk packet maximum size")
+                            textFieldText: port
+
+                            textField.onEditingFinished: {
+                                if (textFieldText !== port) {
+                                    port = textFieldText
+                                }
+                            }
+                        }
+
+                        TextFieldWithHeaderType {
+                            Layout.fillWidth: true
+                            Layout.topMargin: 16
+
+                            headerText: qsTr("Init packet junk size")
+                            textFieldText: port
+
+                            textField.onEditingFinished: {
+                                if (textFieldText !== port) {
+                                    port = textFieldText
+                                }
+                            }
+                        }
+
+                        TextFieldWithHeaderType {
+                            Layout.fillWidth: true
+                            Layout.topMargin: 16
+
+                            headerText: qsTr("Response packet junk size")
+                            textFieldText: port
+
+                            textField.onEditingFinished: {
+                                if (textFieldText !== port) {
+                                    port = textFieldText
+                                }
+                            }
+                        }
+
+                        TextFieldWithHeaderType {
+                            Layout.fillWidth: true
+                            Layout.topMargin: 16
+
+                            headerText: qsTr("Init packet magic header")
+                            textFieldText: port
+
+                            textField.onEditingFinished: {
+                                if (textFieldText !== port) {
+                                    port = textFieldText
+                                }
+                            }
+                        }
+
+                        TextFieldWithHeaderType {
+                            Layout.fillWidth: true
+                            Layout.topMargin: 16
+
+                            headerText: qsTr("Response packet magic header")
+                            textFieldText: port
+
+                            textField.onEditingFinished: {
+                                if (textFieldText !== port) {
+                                    port = textFieldText
+                                }
+                            }
+                        }
+
+                        TextFieldWithHeaderType {
+                            Layout.fillWidth: true
+                            Layout.topMargin: 16
+
+                            headerText: qsTr("Transport packet magic header")
+                            textFieldText: port
+
+                            textField.onEditingFinished: {
+                                if (textFieldText !== port) {
+                                    port = textFieldText
+                                }
+                            }
+                        }
+
+                        TextFieldWithHeaderType {
+                            Layout.fillWidth: true
+                            Layout.topMargin: 16
+
+                            headerText: qsTr("Underload packet magic header")
+                            textFieldText: port
+
+                            textField.onEditingFinished: {
+                                if (textFieldText !== port) {
+                                    port = textFieldText
+                                }
+                            }
+                        }
+
+                        BasicButtonType {
+                            Layout.topMargin: 24
+                            Layout.leftMargin: -8
+                            implicitHeight: 32
+
+                            defaultColor: "transparent"
+                            hoveredColor: Qt.rgba(1, 1, 1, 0.08)
+                            pressedColor: Qt.rgba(1, 1, 1, 0.12)
+                            textColor: "#EB5757"
+
+                            text: qsTr("Remove Amnezia WireGuard")
+
+                            onClicked: {
+                                questionDrawer.headerText = qsTr("Remove Amnezia WireGuard from server?")
+                                questionDrawer.descriptionText = qsTr("All users with whom you shared a connection will no longer be able to connect to it")
+                                questionDrawer.yesButtonText = qsTr("Continue")
+                                questionDrawer.noButtonText = qsTr("Cancel")
+
+                                questionDrawer.yesButtonFunction = function() {
+                                    questionDrawer.visible = false
+                                    PageController.goToPage(PageEnum.PageDeinstalling)
+                                    InstallController.removeCurrentlyProcessedContainer()
+                                }
+                                questionDrawer.noButtonFunction = function() {
+                                    questionDrawer.visible = false
+                                }
+                                questionDrawer.visible = true
+                            }
+                        }
+
+                        BasicButtonType {
+                            Layout.fillWidth: true
+                            Layout.topMargin: 24
+                            Layout.bottomMargin: 24
+
+                            text: qsTr("Save and Restart Amnezia")
+
+                            onClicked: {
+                                forceActiveFocus()
+//                                PageController.showBusyIndicator(true)
+//                                InstallController.updateContainer(ShadowSocksConfigModel.getConfig())
+//                                PageController.showBusyIndicator(false)
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        QuestionDrawer {
+            id: questionDrawer
+        }
+    }
+}
diff --git a/client/ui/qml/Pages2/PageSetupWizardStart.qml b/client/ui/qml/Pages2/PageSetupWizardStart.qml
index 9f5e57a5..ba78c985 100644
--- a/client/ui/qml/Pages2/PageSetupWizardStart.qml
+++ b/client/ui/qml/Pages2/PageSetupWizardStart.qml
@@ -62,7 +62,7 @@ PageType {
         function onInstallationErrorOccurred(errorMessage) {
             PageController.showErrorMessage(errorMessage)
 
-            var currentPageName = tabBarStackView.currentItem.objectName
+            var currentPageName = stackView.currentItem.objectName
 
             if (currentPageName === PageController.getPagePath(PageEnum.PageSetupWizardInstalling)) {
                 PageController.closePage()

From 49923c421439ae181debffe2b23283a7cd10bd2d Mon Sep 17 00:00:00 2001
From: ronoaer <ronoaer@gmail.com>
Date: Sun, 24 Sep 2023 08:21:27 +0800
Subject: [PATCH 136/278] renamed deaultservertype, and moved to components

---
 client/resources.qrc                                           | 2 +-
 .../DefaultSeverType.qml => Components/HomeRootMenuButton.qml} | 3 ++-
 client/ui/qml/Pages2/PageHome.qml                              | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)
 rename client/ui/qml/{Controls2/DefaultSeverType.qml => Components/HomeRootMenuButton.qml} (98%)

diff --git a/client/resources.qrc b/client/resources.qrc
index 75d7c220..ff101a5d 100644
--- a/client/resources.qrc
+++ b/client/resources.qrc
@@ -215,6 +215,6 @@
         <file>ui/qml/Controls2/ListViewWithLabelsType.qml</file>
         <file>ui/qml/Pages2/PageServiceDnsSettings.qml</file>
         <file>ui/qml/Controls2/TopCloseButtonType.qml</file>
-        <file>ui/qml/Controls2/DefaultSeverType.qml</file>
+        <file>ui/qml/Components/HomeRootMenuButton.qml</file>
     </qresource>
 </RCC>
diff --git a/client/ui/qml/Controls2/DefaultSeverType.qml b/client/ui/qml/Components/HomeRootMenuButton.qml
similarity index 98%
rename from client/ui/qml/Controls2/DefaultSeverType.qml
rename to client/ui/qml/Components/HomeRootMenuButton.qml
index 91d2eb52..aa6d8f9b 100644
--- a/client/ui/qml/Controls2/DefaultSeverType.qml
+++ b/client/ui/qml/Components/HomeRootMenuButton.qml
@@ -2,7 +2,8 @@ import QtQuick
 import QtQuick.Controls
 import QtQuick.Layouts
 
-import "TextTypes"
+import "../Controls2/TextTypes"
+import "../Controls2"
 
 Item {
     id: root
diff --git a/client/ui/qml/Pages2/PageHome.qml b/client/ui/qml/Pages2/PageHome.qml
index 125d3e6a..77c60684 100644
--- a/client/ui/qml/Pages2/PageHome.qml
+++ b/client/ui/qml/Pages2/PageHome.qml
@@ -67,7 +67,7 @@ PageType {
         }
     }
 
-    DefaultSeverType {
+    HomeRootMenuButton {
         id: defaultServerInfo
         height: 130
         anchors.right: parent.right

From 52400252ddf3c02b43e4d46ec6f1e1c776b9a640 Mon Sep 17 00:00:00 2001
From: Mykola Baibuz <mykola.baibuz@gmail.com>
Date: Sun, 24 Sep 2023 07:06:52 -0400
Subject: [PATCH 137/278] Fix disconnect button for desktop WG (#345)

* Fix disconnect button for desktop WG
---
 client/daemon/daemonlocalserverconnection.cpp | 2 +-
 client/mozilla/localsocketcontroller.cpp      | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/client/daemon/daemonlocalserverconnection.cpp b/client/daemon/daemonlocalserverconnection.cpp
index 43c67f16..1a49b7e5 100644
--- a/client/daemon/daemonlocalserverconnection.cpp
+++ b/client/daemon/daemonlocalserverconnection.cpp
@@ -108,7 +108,7 @@ void DaemonLocalServerConnection::parseCommand(const QByteArray& data) {
   }
 
   if (type == "deactivate") {
-    Daemon::instance()->deactivate();
+    Daemon::instance()->deactivate(true);
     return;
   }
 
diff --git a/client/mozilla/localsocketcontroller.cpp b/client/mozilla/localsocketcontroller.cpp
index 40bc0bba..00811500 100644
--- a/client/mozilla/localsocketcontroller.cpp
+++ b/client/mozilla/localsocketcontroller.cpp
@@ -175,6 +175,7 @@ void LocalSocketController::deactivate() {
   QJsonObject json;
   json.insert("type", "deactivate");
   write(json);
+  emit disconnected();
 }
 
 void LocalSocketController::checkStatus() {

From b4df5c076eda5df5832e89f29208d72bcb3456b6 Mon Sep 17 00:00:00 2001
From: Mykola Baibuz <mykola.baibuz@gmail.com>
Date: Sun, 24 Sep 2023 11:57:59 -0400
Subject: [PATCH 138/278] Fix Linux App startup icon (#344)

* Fix Linux App startup icon
* Use project version from cmake
* Set Release date automatically
---
 CMakeLists.txt                                  |   5 ++++-
 deploy/data/linux/AmneziaVPN.png                | Bin 0 -> 28646 bytes
 .../share/applications/AmneziaVPN.desktop       |  10 ----------
 .../client/share/icons/AmneziaVPN_Logo.png      | Bin 56043 -> 0 bytes
 deploy/data/linux/post_install.sh               |   1 +
 deploy/data/linux/post_uninstall.sh             |   5 +++++
 deploy/installer/config.cmake                   |   5 +++++
 .../config/AmneziaVPN.desktop.in}               |   6 +++---
 deploy/installer/config/linux.xml.in            |   2 +-
 9 files changed, 19 insertions(+), 15 deletions(-)
 create mode 100644 deploy/data/linux/AmneziaVPN.png
 delete mode 100755 deploy/data/linux/client/share/applications/AmneziaVPN.desktop
 delete mode 100755 deploy/data/linux/client/share/icons/AmneziaVPN_Logo.png
 rename deploy/{data/linux/AmneziaVPN.desktop => installer/config/AmneziaVPN.desktop.in} (64%)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 50bd621c..716d6a7f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -6,7 +6,10 @@ project(${PROJECT} VERSION 4.0.7.1
         DESCRIPTION "AmneziaVPN"
         HOMEPAGE_URL "https://amnezia.org/"
 )
-set(RELEASE_DATE "2023-09-21")
+
+string(TIMESTAMP CURRENT_DATE "%Y-%m-%d")
+set(RELEASE_DATE "${CURRENT_DATE}")
+
 set(APP_MAJOR_VERSION ${CMAKE_PROJECT_VERSION_MAJOR}.${CMAKE_PROJECT_VERSION_MINOR}.${CMAKE_PROJECT_VERSION_PATCH})
 
 if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
diff --git a/deploy/data/linux/AmneziaVPN.png b/deploy/data/linux/AmneziaVPN.png
new file mode 100644
index 0000000000000000000000000000000000000000..0f104da2a56e789757d4fc5f8267106827a49a6c
GIT binary patch
literal 28646
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
S1R^Z}z(CjdTBWvQ)c*j9;LBG4

literal 0
HcmV?d00001

diff --git a/deploy/data/linux/client/share/applications/AmneziaVPN.desktop b/deploy/data/linux/client/share/applications/AmneziaVPN.desktop
deleted file mode 100755
index d89252c0..00000000
--- a/deploy/data/linux/client/share/applications/AmneziaVPN.desktop
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/usr/bin/env xdg-open
-[Desktop Entry]
-Type=Application
-Name=AmneziaVPN client
-Version=2.0.10
-Comment=Client of your self-hosted VPN
-Exec=AmneziaVPN
-Icon=/usr/share/pixmaps/AmneziaVPN_Logo.png
-Categories=Network;Qt;Security;
-Terminal=false
diff --git a/deploy/data/linux/client/share/icons/AmneziaVPN_Logo.png b/deploy/data/linux/client/share/icons/AmneziaVPN_Logo.png
deleted file mode 100755
index 0e281afb9b3daa1307c9756ebc38478d67efd262..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 56043
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

diff --git a/deploy/data/linux/post_install.sh b/deploy/data/linux/post_install.sh
index f69de3d5..b3345bac 100755
--- a/deploy/data/linux/post_install.sh
+++ b/deploy/data/linux/post_install.sh
@@ -37,6 +37,7 @@ sudo ln -s $APP_PATH/client/$APP_NAME.sh /usr/local/bin/$APP_NAME >> $LOG_FILE
 
 echo "user desktop creation loop started" >> $LOG_FILE
 sudo cp $APP_PATH/$APP_NAME.desktop /usr/share/applications/ >> $LOG_FILE
+sudo cp $APP_PATH/$APP_NAME.png /usr/share/pixmaps/ >> $LOG_FILE
 sudo chmod 555 /usr/share/applications/$APP_NAME.desktop >> $LOG_FILE
 
 echo "user desktop creation loop ended" >> $LOG_FILE
diff --git a/deploy/data/linux/post_uninstall.sh b/deploy/data/linux/post_uninstall.sh
index 029bb7cf..5849a90e 100755
--- a/deploy/data/linux/post_uninstall.sh
+++ b/deploy/data/linux/post_uninstall.sh
@@ -54,6 +54,11 @@ if test -f /usr/share/applications/$APP_NAME.desktop; then
 
 fi
 
+if test -f /usr/share/pixmaps/$APP_NAME.png; then
+	sudo rm -f /usr/share/pixmaps/$APP_NAME.png >> $LOG_FILE
+
+fi
+
 date >> $LOG_FILE
 echo "Service after uninstall status:" >> $LOG_FILE
 sudo systemctl status $APP_NAME >> $LOG_FILE
diff --git a/deploy/installer/config.cmake b/deploy/installer/config.cmake
index 7cc75153..13f09986 100644
--- a/deploy/installer/config.cmake
+++ b/deploy/installer/config.cmake
@@ -15,6 +15,11 @@ elseif(LINUX)
         ${CMAKE_CURRENT_LIST_DIR}/config/linux.xml.in
         ${CMAKE_BINARY_DIR}/installer/config/linux.xml
     )
+    
+    configure_file(
+        ${CMAKE_CURRENT_LIST_DIR}/config/AmneziaVPN.desktop.in
+        ${CMAKE_BINARY_DIR}/../AppDir/AmneziaVPN.desktop
+    )
 endif()
 
 configure_file(
diff --git a/deploy/data/linux/AmneziaVPN.desktop b/deploy/installer/config/AmneziaVPN.desktop.in
similarity index 64%
rename from deploy/data/linux/AmneziaVPN.desktop
rename to deploy/installer/config/AmneziaVPN.desktop.in
index d89252c0..2a53074e 100755
--- a/deploy/data/linux/AmneziaVPN.desktop
+++ b/deploy/installer/config/AmneziaVPN.desktop.in
@@ -1,10 +1,10 @@
 #!/usr/bin/env xdg-open
 [Desktop Entry]
 Type=Application
-Name=AmneziaVPN client
-Version=2.0.10
+Name=AmneziaVPN
+Version=@CMAKE_PROJECT_VERSION@
 Comment=Client of your self-hosted VPN
 Exec=AmneziaVPN
-Icon=/usr/share/pixmaps/AmneziaVPN_Logo.png
+Icon=/usr/share/pixmaps/AmneziaVPN.png
 Categories=Network;Qt;Security;
 Terminal=false
diff --git a/deploy/installer/config/linux.xml.in b/deploy/installer/config/linux.xml.in
index 150c9cc5..a39edbe4 100644
--- a/deploy/installer/config/linux.xml.in
+++ b/deploy/installer/config/linux.xml.in
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Installer>
     <Name>AmneziaVPN</Name>
-    <Version>1.6.0.0</Version>
+    <Version>@CMAKE_PROJECT_VERSION@</Version>
     <Title>AmneziaVPN</Title>
     <Publisher>AmneziaVPN</Publisher>
     <StartMenuDir>AmneziaVPN</StartMenuDir>

From 7ede1a8d839f7985ad1e8b6ce9869a08aa84b98a Mon Sep 17 00:00:00 2001
From: Mykola Baibuz <mykola.baibuz@gmail.com>
Date: Sun, 24 Sep 2023 22:09:30 +0300
Subject: [PATCH 139/278] Remove unused binary from build files

---
 client/CMakeLists.txt    | 11 -----------
 deploy/build_windows.bat |  1 -
 2 files changed, 12 deletions(-)

diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt
index ca5161cf..63810ed3 100644
--- a/client/CMakeLists.txt
+++ b/client/CMakeLists.txt
@@ -322,16 +322,5 @@ if(NOT IOS AND NOT ANDROID)
 
 endif()
 
-if(WIN32)
-    add_custom_command(
-        TARGET ${PROJECT} POST_BUILD
-        COMMAND ${CMAKE_COMMAND} -E $<IF:$<CONFIG:Debug>,copy,true>
-        $<TARGET_FILE_DIR:${PROJECT}>/../service/wireguard-service/wireguard-service.exe
-        $<TARGET_FILE_DIR:${PROJECT}>/wireguard/wireguard-service.exe
-        COMMAND_EXPAND_LISTS
-    )
-endif()
-
-
 target_sources(${PROJECT} PRIVATE ${SOURCES} ${HEADERS} ${RESOURCES} ${QRC})
 qt_finalize_target(${PROJECT})
diff --git a/deploy/build_windows.bat b/deploy/build_windows.bat
index 7ae3e9f6..c4b7b8cf 100644
--- a/deploy/build_windows.bat
+++ b/deploy/build_windows.bat
@@ -68,7 +68,6 @@ signtool sign /v /n "Privacy Technologies OU" /fd sha256 /tr http://timestamp.co
 echo "Copying deploy data..."
 xcopy %DEPLOY_DATA_DIR%    %OUT_APP_DIR%  /s /e /y /i /f
 xcopy %PREBILT_DEPLOY_DATA_DIR%    %OUT_APP_DIR%  /s /e /y /i /f
-copy "%WORK_DIR:"=%\service\wireguard-service\release\wireguard-service.exe"	%OUT_APP_DIR%\wireguard\
 
 cd %SCRIPT_DIR%
 xcopy %SCRIPT_DIR:"=%\installer  %WORK_DIR:"=%\installer /s /e /y /i /f

From 51497d87e01c5a7296a3b805e890a3e9e7b46dfd Mon Sep 17 00:00:00 2001
From: ronoaer <ronoaer@gmail.com>
Date: Mon, 25 Sep 2023 07:22:11 +0800
Subject: [PATCH 140/278] redirected to pagesetupwizardeasy when none
 containers installed

---
 client/ui/models/containers_model.cpp        | 14 ++++++++++++++
 client/ui/models/containers_model.h          |  2 +-
 client/ui/qml/Components/ConnectButton.qml   |  8 ++++++++
 client/ui/qml/Pages2/PageSetupWizardEasy.qml |  2 ++
 4 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/client/ui/models/containers_model.cpp b/client/ui/models/containers_model.cpp
index afff44b6..6cf855a6 100644
--- a/client/ui/models/containers_model.cpp
+++ b/client/ui/models/containers_model.cpp
@@ -214,6 +214,20 @@ bool ContainersModel::isAmneziaDnsContainerInstalled(const int serverIndex)
     return containers.contains(DockerContainer::Dns);
 }
 
+bool ContainersModel::isAnyContainerInstalled()
+{
+    for (int row=0; row < rowCount(); row++) {
+        QModelIndex idx = this->index(row, 0);
+
+        if (this->data(idx, IsInstalledRole).toBool() &&
+            this->data(idx, ServiceTypeRole).toInt() == ServiceType::Vpn) {
+            return true;
+        }
+    }
+
+    return false;
+}
+
 QHash<int, QByteArray> ContainersModel::roleNames() const
 {
     QHash<int, QByteArray> roles;
diff --git a/client/ui/models/containers_model.h b/client/ui/models/containers_model.h
index 741a0620..2cc41cbf 100644
--- a/client/ui/models/containers_model.h
+++ b/client/ui/models/containers_model.h
@@ -63,7 +63,7 @@ public slots:
     bool isAmneziaDnsContainerInstalled();
     bool isAmneziaDnsContainerInstalled(const int serverIndex);
 
-    //    bool isOnlyServicesInstalled(const int serverIndex);
+    bool isAnyContainerInstalled();
 
 protected:
     QHash<int, QByteArray> roleNames() const override;
diff --git a/client/ui/qml/Components/ConnectButton.qml b/client/ui/qml/Components/ConnectButton.qml
index ab28d0d0..b7484c73 100644
--- a/client/ui/qml/Components/ConnectButton.qml
+++ b/client/ui/qml/Components/ConnectButton.qml
@@ -5,6 +5,7 @@ import QtQuick.Shapes
 import Qt5Compat.GraphicalEffects
 
 import ConnectionState 1.0
+import PageEnum 1.0
 
 Button {
     id: root
@@ -137,6 +138,13 @@ Button {
     }
 
     onClicked: {
+        if (!ContainersModel.isAnyContainerInstalled()) {
+            ServersModel.currentlyProcessedIndex = ServersModel.getDefaultServerIndex()
+            PageController.goToPage(PageEnum.PageSetupWizardEasy)
+
+            return
+        }
+
         if (ConnectionController.isConnectionInProgress) {
             ConnectionController.closeConnection()
         } else if (ConnectionController.isConnected) {
diff --git a/client/ui/qml/Pages2/PageSetupWizardEasy.qml b/client/ui/qml/Pages2/PageSetupWizardEasy.qml
index b228a7a3..4f94e985 100644
--- a/client/ui/qml/Pages2/PageSetupWizardEasy.qml
+++ b/client/ui/qml/Pages2/PageSetupWizardEasy.qml
@@ -183,6 +183,8 @@ PageType {
                 textColor: "#D7D8DB"
                 borderWidth: 1
 
+                visible: ContainersModel.isAnyContainerInstalled()
+
                 text: qsTr("Set up later")
 
                 onClicked: function() {

From 8b08a5bee0c6c13801ac331a93115738fb21cc97 Mon Sep 17 00:00:00 2001
From: ronoaer <ronoaer@gmail.com>
Date: Mon, 25 Sep 2023 22:16:59 +0800
Subject: [PATCH 141/278] added border hover effect for textarea

---
 .../qml/Controls2/TextFieldWithHeaderType.qml | 27 +++++++++++++++++--
 1 file changed, 25 insertions(+), 2 deletions(-)

diff --git a/client/ui/qml/Controls2/TextFieldWithHeaderType.qml b/client/ui/qml/Controls2/TextFieldWithHeaderType.qml
index 3f80428e..3a3f5a1a 100644
--- a/client/ui/qml/Controls2/TextFieldWithHeaderType.qml
+++ b/client/ui/qml/Controls2/TextFieldWithHeaderType.qml
@@ -30,6 +30,7 @@ Item {
 
     property string backgroundColor: "#1c1d21"
     property string backgroundDisabledColor: "transparent"
+    property string bgBorderHoveredColor: "#494B50"
 
     implicitWidth: content.implicitWidth
     implicitHeight: content.implicitHeight
@@ -44,7 +45,7 @@ Item {
             Layout.preferredHeight: input.implicitHeight
             color: root.enabled ? root.backgroundColor : root.backgroundDisabledColor
             radius: 16
-            border.color: textField.focus ? root.borderFocusedColor : root.borderColor
+            border.color: getBackgroundBorderColor(root.borderColor)
             border.width: 1
 
             Behavior on border.color {
@@ -102,12 +103,17 @@ Item {
                             anchors.fill: parent
                             acceptedButtons: Qt.RightButton
                             onClicked: contextMenu.open()
+                            enabled: true
                         }
 
                         ContextMenuType {
                             id: contextMenu
                             textObj: textField
                         }
+
+                        onFocusChanged: {
+                            backgroud.border.color = getBackgroundBorderColor(root.borderColor)
+                        }
                     }
                 }
 
@@ -149,11 +155,28 @@ Item {
 
     MouseArea {
         anchors.fill: root
-        cursorShape: Qt.PointingHandCursor
+        cursorShape: Qt.IBeamCursor
+
+        hoverEnabled: true
 
         onPressed: function(mouse) {
             textField.forceActiveFocus()
             mouse.accepted = false
+
+            backgroud.border.color = getBackgroundBorderColor(root.borderColor)
+        }
+
+        onEntered: {
+            backgroud.border.color =  getBackgroundBorderColor(bgBorderHoveredColor)
+        }
+
+
+        onExited: {
+            backgroud.border.color = getBackgroundBorderColor(root.borderColor)
         }
     }
+
+    function getBackgroundBorderColor(noneFocusedColor) {
+        return textField.focus ? root.borderFocusedColor : noneFocusedColor
+    }
 }

From ee99565b63c8ba4a96f6bf6bfc6b47d407afa64a Mon Sep 17 00:00:00 2001
From: ronoaer <ronoaer@gmail.com>
Date: Tue, 26 Sep 2023 16:38:08 +0800
Subject: [PATCH 142/278] 1. added border-hover-interaction 2. updated
 textarea-focus-interaction

---
 client/ui/qml/Controls2/TextAreaType.qml | 122 ++++++++++++++---------
 1 file changed, 75 insertions(+), 47 deletions(-)

diff --git a/client/ui/qml/Controls2/TextAreaType.qml b/client/ui/qml/Controls2/TextAreaType.qml
index 4b70c274..f4f75417 100644
--- a/client/ui/qml/Controls2/TextAreaType.qml
+++ b/client/ui/qml/Controls2/TextAreaType.qml
@@ -9,71 +9,99 @@ Rectangle {
     property alias textArea: textArea
     property alias textAreaText: textArea.text
 
+    property string borderHoveredColor: "#494B50"
+    property string borderNormalColor: "#2C2D30"
+    property string borderFocusedColor: "#d7d8db"
+
     height: 148
     color: "#1C1D21"
     border.width: 1
-    border.color: "#2C2D30"
+    border.color: getBorderColor(borderNormalColor)
     radius: 16
 
-    FlickableType {
-        id: fl
-        interactive: false
+    MouseArea {
+        id: parentMouse
+        anchors.fill: parent
+        cursorShape: Qt.IBeamCursor
+        onClicked: textArea.forceActiveFocus()
+        hoverEnabled: true
 
-        anchors.top: parent.top
-        anchors.bottom: parent.bottom
-        contentHeight: textArea.implicitHeight
-        TextArea {
-            id: textArea
+        FlickableType {
+            id: fl
+            interactive: false
 
-            width: parent.width
+            anchors.top: parent.top
+            anchors.bottom: parent.bottom
+            contentHeight: textArea.implicitHeight
+            TextArea {
+                id: textArea
 
-            topPadding: 16
-            leftPadding: 16
-            anchors.topMargin: 16
-            anchors.bottomMargin: 16
+                width: parent.width
 
-            color: "#D7D8DB"
-            selectionColor:  "#633303"
-            selectedTextColor: "#D7D8DB"
-            placeholderTextColor: "#878B91"
+                topPadding: 16
+                leftPadding: 16
+                anchors.topMargin: 16
+                anchors.bottomMargin: 16
 
-            font.pixelSize: 16
-            font.weight: Font.Medium
-            font.family: "PT Root UI VF"
+                color: "#D7D8DB"
+                selectionColor:  "#633303"
+                selectedTextColor: "#D7D8DB"
+                placeholderTextColor: "#878B91"
 
-            placeholderText: root.placeholderText
-            text: root.text
+                font.pixelSize: 16
+                font.weight: Font.Medium
+                font.family: "PT Root UI VF"
 
-            onCursorVisibleChanged:  {
-                if (textArea.cursorVisible) {
-                    fl.interactive = true
-                } else {
-                    fl.interactive = false
+                placeholderText: root.placeholderText
+                text: root.text
+
+                onCursorVisibleChanged:  {
+                    if (textArea.cursorVisible) {
+                        fl.interactive = true
+                    } else {
+                        fl.interactive = false
+                    }
+                }
+
+                wrapMode: Text.Wrap
+
+                MouseArea {
+                    id: textAreaMouse
+                    anchors.fill: parent
+                    acceptedButtons: Qt.RightButton
+                    hoverEnabled: true
+                    onClicked: {
+                        fl.interactive = true
+                        contextMenu.open()
+                    }
+                }
+
+                onFocusChanged: {
+                    root.border.color = getBorderColor(borderNormalColor)
+                }
+
+                ContextMenuType {
+                    id: contextMenu
+                    textObj: textArea
                 }
             }
+        }
 
-            wrapMode: Text.Wrap
+        onPressed: {
+            root.border.color = getBorderColor(borderFocusedColor)
+        }
 
-            MouseArea {
-                anchors.fill: parent
-                acceptedButtons: Qt.RightButton
-                onClicked: {
-                    fl.interactive = true
-                    contextMenu.open()
-                }
-            }
+        onExited: {
+            root.border.color = getBorderColor(borderNormalColor)
+        }
 
-            ContextMenuType {
-                id: contextMenu
-                textObj: textArea
-            }
+        onEntered: {
+            root.border.color = getBorderColor(borderHoveredColor)
         }
     }
 
-    //todo make whole background clickable, with code below we lose ability to select text by mouse
-//    MouseArea {
-//        anchors.fill: parent
-//        cursorShape: Qt.IBeamCursor
-//        onClicked: textArea.forceActiveFocus()
-//    }
+
+    function getBorderColor(noneFocusedColor) {
+        return textArea.focus ? root.borderFocusedColor : noneFocusedColor
+    }
 }

From 37024eb91da6c3984c59f90a8cec3a3344693e22 Mon Sep 17 00:00:00 2001
From: ronoaer <ronoaer@gmail.com>
Date: Tue, 26 Sep 2023 17:23:35 +0800
Subject: [PATCH 143/278] updated cursorshape of cardtype to
 Qt.PointingHandCursor

---
 client/ui/qml/Controls2/CardType.qml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/client/ui/qml/Controls2/CardType.qml b/client/ui/qml/Controls2/CardType.qml
index 4b94cb1a..8429acb8 100644
--- a/client/ui/qml/Controls2/CardType.qml
+++ b/client/ui/qml/Controls2/CardType.qml
@@ -123,4 +123,11 @@ RadioButton {
             Layout.bottomMargin: 16
         }
     }
+
+    MouseArea {
+        anchors.fill: parent
+
+        cursorShape: Qt.PointingHandCursor
+        enabled: false
+    }
 }

From af53c456ea91a187defc72844e4a23de26d92987 Mon Sep 17 00:00:00 2001
From: "vladimir.kuznetsov" <nethiuswork@gmail.com>
Date: Wed, 27 Sep 2023 00:40:01 +0500
Subject: [PATCH 144/278] added passing new wireguard config parameters over
 uapi and configuring the amneziawireguard container

---
 .../amneziaWireGuardConfigurator.cpp          | 51 +++++++++++++++++--
 client/configurators/vpn_configurator.cpp     |  6 ++-
 client/configurators/vpn_configurator.h       |  4 +-
 .../configurators/wireguard_configurator.cpp  | 43 ++++++++--------
 client/configurators/wireguard_configurator.h |  9 +++-
 client/core/scripts_registry.cpp              |  3 +-
 client/core/scripts_registry.h                |  3 +-
 client/core/servercontroller.cpp              | 31 +++++++++++
 client/daemon/daemon.cpp                      | 11 ++++
 client/daemon/interfaceconfig.h               | 10 ++++
 client/mozilla/localsocketcontroller.cpp      | 17 ++++++-
 .../macos/daemon/wireguardutilsmacos.cpp      | 11 ++++
 client/protocols/protocols_defs.h             | 30 +++++++++++
 client/resources.qrc                          |  5 ++
 .../amnezia_wireguard/Dockerfile              | 46 +++++++++++++++++
 .../amnezia_wireguard/configure_container.sh  | 26 ++++++++++
 .../amnezia_wireguard/run_container.sh        | 18 +++++++
 .../server_scripts/amnezia_wireguard/start.sh | 28 ++++++++++
 .../amnezia_wireguard/template.conf           | 20 ++++++++
 19 files changed, 342 insertions(+), 30 deletions(-)
 create mode 100644 client/server_scripts/amnezia_wireguard/Dockerfile
 create mode 100644 client/server_scripts/amnezia_wireguard/configure_container.sh
 create mode 100644 client/server_scripts/amnezia_wireguard/run_container.sh
 create mode 100644 client/server_scripts/amnezia_wireguard/start.sh
 create mode 100644 client/server_scripts/amnezia_wireguard/template.conf

diff --git a/client/configurators/amneziaWireGuardConfigurator.cpp b/client/configurators/amneziaWireGuardConfigurator.cpp
index 56f0c68e..3ed27208 100644
--- a/client/configurators/amneziaWireGuardConfigurator.cpp
+++ b/client/configurators/amneziaWireGuardConfigurator.cpp
@@ -1,7 +1,10 @@
 #include "amneziaWireGuardConfigurator.h"
 
+#include <QJsonDocument>
+#include <QJsonObject>
+
 AmneziaWireGuardConfigurator::AmneziaWireGuardConfigurator(std::shared_ptr<Settings> settings, QObject *parent)
-    : WireguardConfigurator(settings, parent)
+    : WireguardConfigurator(settings, true, parent)
 {
 }
 
@@ -9,7 +12,49 @@ QString AmneziaWireGuardConfigurator::genAmneziaWireGuardConfig(const ServerCred
                                                                 DockerContainer container,
                                                                 const QJsonObject &containerConfig, ErrorCode *errorCode)
 {
-    auto config = WireguardConfigurator::genWireguardConfig(credentials, container, containerConfig, errorCode);
+    QString config = WireguardConfigurator::genWireguardConfig(credentials, container, containerConfig, errorCode);
 
-    return config;
+    QJsonObject jsonConfig = QJsonDocument::fromJson(config.toUtf8()).object();
+    QJsonObject awgConfig = containerConfig.value(config_key::amneziaWireguard).toObject();
+
+    auto junkPacketCount =
+            awgConfig.value(config_key::junkPacketCount).toString(protocols::amneziawireguard::defaultJunkPacketCount);
+    auto junkPacketMinSize =
+            awgConfig.value(config_key::junkPacketMinSize).toString(protocols::amneziawireguard::defaultJunkPacketMinSize);
+    auto junkPacketMaxSize =
+            awgConfig.value(config_key::junkPacketMaxSize).toString(protocols::amneziawireguard::defaultJunkPacketMaxSize);
+    auto initPacketJunkSize =
+            awgConfig.value(config_key::initPacketJunkSize).toString(protocols::amneziawireguard::defaultInitPacketJunkSize);
+    auto responsePacketJunkSize =
+            awgConfig.value(config_key::responsePacketJunkSize).toString(protocols::amneziawireguard::defaultResponsePacketJunkSize);
+    auto initPacketMagicHeader =
+            awgConfig.value(config_key::initPacketMagicHeader).toString(protocols::amneziawireguard::defaultInitPacketMagicHeader);
+    auto responsePacketMagicHeader =
+            awgConfig.value(config_key::responsePacketMagicHeader).toString(protocols::amneziawireguard::defaultResponsePacketMagicHeader);
+    auto underloadPacketMagicHeader =
+            awgConfig.value(config_key::underloadPacketMagicHeader).toString(protocols::amneziawireguard::defaultUnderloadPacketMagicHeader);
+    auto transportPacketMagicHeader =
+            awgConfig.value(config_key::transportPacketMagicHeader).toString(protocols::amneziawireguard::defaultTransportPacketMagicHeader);
+
+    config.replace("$JUNK_PACKET_COUNT", junkPacketCount);
+    config.replace("$JUNK_PACKET_MIN_SIZE", junkPacketMinSize);
+    config.replace("$JUNK_PACKET_MAX_SIZE", junkPacketMaxSize);
+    config.replace("$INIT_PACKET_JUNK_SIZE", initPacketJunkSize);
+    config.replace("$RESPONSE_PACKET_JUNK_SIZE", responsePacketJunkSize);
+    config.replace("$INIT_PACKET_MAGIC_HEADER", initPacketMagicHeader);
+    config.replace("$RESPONSE_PACKET_MAGIC_HEADER", responsePacketMagicHeader);
+    config.replace("$UNDERLOAD_PACKET_MAGIC_HEADER", underloadPacketMagicHeader);
+    config.replace("$TRANSPORT_PACKET_MAGIC_HEADER", transportPacketMagicHeader);
+
+    jsonConfig[config_key::junkPacketCount] = junkPacketCount;
+    jsonConfig[config_key::junkPacketMinSize] = junkPacketMinSize;
+    jsonConfig[config_key::junkPacketMaxSize] = junkPacketMaxSize;
+    jsonConfig[config_key::initPacketJunkSize] = initPacketJunkSize;
+    jsonConfig[config_key::responsePacketJunkSize] = responsePacketJunkSize;
+    jsonConfig[config_key::initPacketMagicHeader] = initPacketMagicHeader;
+    jsonConfig[config_key::responsePacketMagicHeader] = responsePacketMagicHeader;
+    jsonConfig[config_key::underloadPacketMagicHeader] = underloadPacketMagicHeader;
+    jsonConfig[config_key::transportPacketMagicHeader] = transportPacketMagicHeader;
+
+    return QJsonDocument(jsonConfig).toJson();
 }
diff --git a/client/configurators/vpn_configurator.cpp b/client/configurators/vpn_configurator.cpp
index 7f0e95df..6706deed 100644
--- a/client/configurators/vpn_configurator.cpp
+++ b/client/configurators/vpn_configurator.cpp
@@ -5,6 +5,7 @@
 #include "shadowsocks_configurator.h"
 #include "ssh_configurator.h"
 #include "wireguard_configurator.h"
+#include "amneziaWireGuardConfigurator.h"
 
 #include <QFile>
 #include <QJsonDocument>
@@ -20,9 +21,10 @@ VpnConfigurator::VpnConfigurator(std::shared_ptr<Settings> settings, QObject *pa
     openVpnConfigurator = std::shared_ptr<OpenVpnConfigurator>(new OpenVpnConfigurator(settings, this));
     shadowSocksConfigurator = std::shared_ptr<ShadowSocksConfigurator>(new ShadowSocksConfigurator(settings, this));
     cloakConfigurator = std::shared_ptr<CloakConfigurator>(new CloakConfigurator(settings, this));
-    wireguardConfigurator = std::shared_ptr<WireguardConfigurator>(new WireguardConfigurator(settings, this));
+    wireguardConfigurator = std::shared_ptr<WireguardConfigurator>(new WireguardConfigurator(settings, false, this));
     ikev2Configurator = std::shared_ptr<Ikev2Configurator>(new Ikev2Configurator(settings, this));
     sshConfigurator = std::shared_ptr<SshConfigurator>(new SshConfigurator(settings, this));
+    amneziaWireGuardConfigurator = std::shared_ptr<AmneziaWireGuardConfigurator>(new AmneziaWireGuardConfigurator(settings, this));
 }
 
 QString VpnConfigurator::genVpnProtocolConfig(const ServerCredentials &credentials, DockerContainer container,
@@ -41,7 +43,7 @@ QString VpnConfigurator::genVpnProtocolConfig(const ServerCredentials &credentia
         return wireguardConfigurator->genWireguardConfig(credentials, container, containerConfig, errorCode);
 
     case Proto::AmneziaWireGuard:
-        return wireguardConfigurator->genWireguardConfig(credentials, container, containerConfig, errorCode);
+        return amneziaWireGuardConfigurator->genAmneziaWireGuardConfig(credentials, container, containerConfig, errorCode);
 
     case Proto::Ikev2: return ikev2Configurator->genIkev2Config(credentials, container, containerConfig, errorCode);
 
diff --git a/client/configurators/vpn_configurator.h b/client/configurators/vpn_configurator.h
index 3b9c761b..d304e4c3 100644
--- a/client/configurators/vpn_configurator.h
+++ b/client/configurators/vpn_configurator.h
@@ -13,13 +13,14 @@ class CloakConfigurator;
 class WireguardConfigurator;
 class Ikev2Configurator;
 class SshConfigurator;
+class AmneziaWireGuardConfigurator;
 
 // Retrieve connection settings from server
 class VpnConfigurator : ConfiguratorBase
 {
     Q_OBJECT
 public:
-    VpnConfigurator(std::shared_ptr<Settings> settings, QObject *parent = nullptr);
+    explicit VpnConfigurator(std::shared_ptr<Settings> settings, QObject *parent = nullptr);
 
     QString genVpnProtocolConfig(const ServerCredentials &credentials, DockerContainer container,
         const QJsonObject &containerConfig, Proto proto, ErrorCode *errorCode = nullptr);
@@ -40,6 +41,7 @@ public:
     std::shared_ptr<WireguardConfigurator> wireguardConfigurator;
     std::shared_ptr<Ikev2Configurator> ikev2Configurator;
     std::shared_ptr<SshConfigurator> sshConfigurator;
+    std::shared_ptr<AmneziaWireGuardConfigurator> amneziaWireGuardConfigurator;
 };
 
 #endif // VPN_CONFIGURATOR_H
diff --git a/client/configurators/wireguard_configurator.cpp b/client/configurators/wireguard_configurator.cpp
index 02716b72..dd836a18 100644
--- a/client/configurators/wireguard_configurator.cpp
+++ b/client/configurators/wireguard_configurator.cpp
@@ -19,9 +19,17 @@
 #include "settings.h"
 #include "utilities.h"
 
-WireguardConfigurator::WireguardConfigurator(std::shared_ptr<Settings> settings, QObject *parent)
-    : ConfiguratorBase(settings, parent)
+WireguardConfigurator::WireguardConfigurator(std::shared_ptr<Settings> settings, bool isAmneziaWireGuard, QObject *parent)
+    : ConfiguratorBase(settings, parent), m_isAmneziaWireGuard(isAmneziaWireGuard)
 {
+    m_serverConfigPath = m_isAmneziaWireGuard ? amnezia::protocols::amneziawireguard::serverConfigPath
+                                              : amnezia::protocols::wireguard::serverConfigPath;
+    m_serverPublicKeyPath = m_isAmneziaWireGuard ? amnezia::protocols::amneziawireguard::serverPublicKeyPath
+                                                 : amnezia::protocols::wireguard::serverPublicKeyPath;
+    m_serverPskKeyPath = m_isAmneziaWireGuard ? amnezia::protocols::amneziawireguard::serverPskKeyPath
+                                              : amnezia::protocols::wireguard::serverPskKeyPath;
+    m_configTemplate = m_isAmneziaWireGuard ? ProtocolScriptType::amnezia_wireguard_template
+                                            : ProtocolScriptType::wireguard_template;
 }
 
 WireguardConfigurator::ConnectionData WireguardConfigurator::genClientKeys()
@@ -62,7 +70,7 @@ WireguardConfigurator::ConnectionData WireguardConfigurator::prepareWireguardCon
 {
     WireguardConfigurator::ConnectionData connData = WireguardConfigurator::genClientKeys();
     connData.host = credentials.hostName;
-    connData.port = containerConfig.value(config_key::wireguard)
+    connData.port = containerConfig.value(m_isAmneziaWireGuard ? config_key::amneziaWireguard : config_key::wireguard)
                             .toObject()
                             .value(config_key::port)
                             .toString(protocols::wireguard::defaultPort);
@@ -79,7 +87,7 @@ WireguardConfigurator::ConnectionData WireguardConfigurator::prepareWireguardCon
     // Get list of already created clients (only IP addresses)
     QString nextIpNumber;
     {
-        QString script = QString("cat %1 | grep AllowedIPs").arg(amnezia::protocols::wireguard::serverConfigPath);
+        QString script = QString("cat %1 | grep AllowedIPs").arg(m_serverConfigPath);
         QString stdOut;
         auto cbReadStdOut = [&](const QString &data, libssh::Client &) {
             stdOut += data + "\n";
@@ -126,8 +134,7 @@ WireguardConfigurator::ConnectionData WireguardConfigurator::prepareWireguardCon
     }
 
     // Get keys
-    connData.serverPubKey = serverController.getTextFileFromContainer(
-            container, credentials, amnezia::protocols::wireguard::serverPublicKeyPath, &e);
+    connData.serverPubKey = serverController.getTextFileFromContainer(container, credentials, m_serverPublicKeyPath, &e);
     connData.serverPubKey.replace("\n", "");
     if (e) {
         if (errorCode)
@@ -135,8 +142,7 @@ WireguardConfigurator::ConnectionData WireguardConfigurator::prepareWireguardCon
         return connData;
     }
 
-    connData.pskKey = serverController.getTextFileFromContainer(container, credentials,
-                                                                amnezia::protocols::wireguard::serverPskKeyPath, &e);
+    connData.pskKey = serverController.getTextFileFromContainer(container, credentials, m_serverPskKeyPath, &e);
     connData.pskKey.replace("\n", "");
 
     if (e) {
@@ -150,12 +156,9 @@ WireguardConfigurator::ConnectionData WireguardConfigurator::prepareWireguardCon
                                  "PublicKey = %1\n"
                                  "PresharedKey = %2\n"
                                  "AllowedIPs = %3/32\n\n")
-                                 .arg(connData.clientPubKey)
-                                 .arg(connData.pskKey)
-                                 .arg(connData.clientIP);
+                                 .arg(connData.clientPubKey, connData.pskKey, connData.clientIP);
 
-    e = serverController.uploadTextFileToContainer(container, credentials, configPart,
-                                                   protocols::wireguard::serverConfigPath,
+    e = serverController.uploadTextFileToContainer(container, credentials, configPart, m_serverConfigPath,
                                                    libssh::SftpOverwriteMode::SftpAppendToExisting);
 
     if (e) {
@@ -164,11 +167,11 @@ WireguardConfigurator::ConnectionData WireguardConfigurator::prepareWireguardCon
         return connData;
     }
 
+    QString script = QString("sudo docker exec -i $CONTAINER_NAME bash -c 'wg syncconf wg0 <(wg-quick strip %1)'")
+                             .arg(m_serverConfigPath);
+
     e = serverController.runScript(
-            credentials,
-            serverController.replaceVars("sudo docker exec -i $CONTAINER_NAME bash -c 'wg syncconf wg0 <(wg-quick "
-                                         "strip /opt/amnezia/wireguard/wg0.conf)'",
-                                         serverController.genVarsForScript(credentials, container)));
+            credentials, serverController.replaceVars(script, serverController.genVarsForScript(credentials, container)));
 
     return connData;
 }
@@ -177,9 +180,9 @@ QString WireguardConfigurator::genWireguardConfig(const ServerCredentials &crede
                                                   const QJsonObject &containerConfig, ErrorCode *errorCode)
 {
     ServerController serverController(m_settings);
-    QString config =
-            serverController.replaceVars(amnezia::scriptData(ProtocolScriptType::wireguard_template, container),
-                                         serverController.genVarsForScript(credentials, container, containerConfig));
+    QString scriptData = amnezia::scriptData(m_configTemplate, container);
+    QString config = serverController.replaceVars(
+            scriptData, serverController.genVarsForScript(credentials, container, containerConfig));
 
     ConnectionData connData = prepareWireguardConfig(credentials, container, containerConfig, errorCode);
     if (errorCode && *errorCode) {
diff --git a/client/configurators/wireguard_configurator.h b/client/configurators/wireguard_configurator.h
index 140acc47..70ed729b 100644
--- a/client/configurators/wireguard_configurator.h
+++ b/client/configurators/wireguard_configurator.h
@@ -6,12 +6,13 @@
 
 #include "configurator_base.h"
 #include "core/defs.h"
+#include "core/scripts_registry.h"
 
 class WireguardConfigurator : public ConfiguratorBase
 {
     Q_OBJECT
 public:
-    WireguardConfigurator(std::shared_ptr<Settings> settings, QObject *parent = nullptr);
+    WireguardConfigurator(std::shared_ptr<Settings> settings, bool isAmneziaWireGuard, QObject *parent = nullptr);
 
     struct ConnectionData
     {
@@ -35,6 +36,12 @@ private:
                                           const QJsonObject &containerConfig, ErrorCode *errorCode = nullptr);
 
     ConnectionData genClientKeys();
+
+    bool m_isAmneziaWireGuard;
+    QString m_serverConfigPath;
+    QString m_serverPublicKeyPath;
+    QString m_serverPskKeyPath;
+    amnezia::ProtocolScriptType m_configTemplate;
 };
 
 #endif // WIREGUARD_CONFIGURATOR_H
diff --git a/client/core/scripts_registry.cpp b/client/core/scripts_registry.cpp
index 31508152..24deb41a 100644
--- a/client/core/scripts_registry.cpp
+++ b/client/core/scripts_registry.cpp
@@ -11,7 +11,7 @@ QString amnezia::scriptFolder(amnezia::DockerContainer container)
     case DockerContainer::Cloak: return QLatin1String("openvpn_cloak");
     case DockerContainer::ShadowSocks: return QLatin1String("openvpn_shadowsocks");
     case DockerContainer::WireGuard: return QLatin1String("wireguard");
-    case DockerContainer::AmneziaWireGuard: return QLatin1String("wireguard");
+    case DockerContainer::AmneziaWireGuard: return QLatin1String("amnezia_wireguard");
     case DockerContainer::Ipsec: return QLatin1String("ipsec");
 
     case DockerContainer::TorWebSite: return QLatin1String("website_tor");
@@ -46,6 +46,7 @@ QString amnezia::scriptName(ProtocolScriptType type)
     case ProtocolScriptType::container_startup: return QLatin1String("start.sh");
     case ProtocolScriptType::openvpn_template: return QLatin1String("template.ovpn");
     case ProtocolScriptType::wireguard_template: return QLatin1String("template.conf");
+    case ProtocolScriptType::amnezia_wireguard_template: return QLatin1String("template.conf");
     }
 }
 
diff --git a/client/core/scripts_registry.h b/client/core/scripts_registry.h
index b30be2ff..5c7a1b6a 100644
--- a/client/core/scripts_registry.h
+++ b/client/core/scripts_registry.h
@@ -26,7 +26,8 @@ enum ProtocolScriptType {
     configure_container,
     container_startup,
     openvpn_template,
-    wireguard_template
+    wireguard_template,
+    amnezia_wireguard_template
 };
 
 
diff --git a/client/core/servercontroller.cpp b/client/core/servercontroller.cpp
index 27213dc3..3b30451f 100644
--- a/client/core/servercontroller.cpp
+++ b/client/core/servercontroller.cpp
@@ -584,6 +584,37 @@ ServerController::Vars ServerController::genVarsForScript(const ServerCredential
     vars.append({ { "$SFTP_USER", sftpConfig.value(config_key::userName).toString() } });
     vars.append({ { "$SFTP_PASSWORD", sftpConfig.value(config_key::password).toString() } });
 
+    // Amnezia wireguard vars
+    vars.append({ { "$AMNEZIAWIREGUARD_SERVER_PORT",
+                    amneziaWireguarConfig.value(config_key::port).toString(protocols::amneziawireguard::defaultPort) } });
+    vars.append({ { "$JUNK_PACKET_COUNT",
+                    amneziaWireguarConfig.value(config_key::junkPacketCount)
+                            .toString(protocols::amneziawireguard::defaultJunkPacketCount) } });
+    vars.append({ { "$JUNK_PACKET_MIN_SIZE",
+                    amneziaWireguarConfig.value(config_key::junkPacketMinSize)
+                            .toString(protocols::amneziawireguard::defaultJunkPacketMinSize) } });
+    vars.append({ { "$JUNK_PACKET_MAX_SIZE",
+                    amneziaWireguarConfig.value(config_key::junkPacketMaxSize)
+                            .toString(protocols::amneziawireguard::defaultJunkPacketMaxSize) } });
+    vars.append({ { "$INIT_PACKET_JUNK_SIZE",
+                    amneziaWireguarConfig.value(config_key::initPacketJunkSize)
+                            .toString(protocols::amneziawireguard::defaultInitPacketJunkSize) } });
+    vars.append({ { "$RESPONSE_PACKET_JUNK_SIZE",
+                    amneziaWireguarConfig.value(config_key::responsePacketJunkSize)
+                            .toString(protocols::amneziawireguard::defaultResponsePacketJunkSize) } });
+    vars.append({ { "$INIT_PACKET_MAGIC_HEADER",
+                    amneziaWireguarConfig.value(config_key::initPacketMagicHeader)
+                            .toString(protocols::amneziawireguard::defaultInitPacketMagicHeader) } });
+    vars.append({ { "$RESPONSE_PACKET_MAGIC_HEADER",
+                    amneziaWireguarConfig.value(config_key::responsePacketMagicHeader)
+                            .toString(protocols::amneziawireguard::defaultResponsePacketMagicHeader) } });
+    vars.append({ { "$UNDERLOAD_PACKET_MAGIC_HEADER",
+                    amneziaWireguarConfig.value(config_key::underloadPacketMagicHeader)
+                            .toString(protocols::amneziawireguard::defaultUnderloadPacketMagicHeader) } });
+    vars.append({ { "$TRANSPORT_PACKET_MAGIC_HEADER",
+                    amneziaWireguarConfig.value(config_key::transportPacketMagicHeader)
+                            .toString(protocols::amneziawireguard::defaultTransportPacketMagicHeader) } });
+
     QString serverIp = Utils::getIPAddress(credentials.hostName);
     if (!serverIp.isEmpty()) {
         vars.append({ { "$SERVER_IP_ADDRESS", serverIp } });
diff --git a/client/daemon/daemon.cpp b/client/daemon/daemon.cpp
index 3a0dc4d9..13310951 100644
--- a/client/daemon/daemon.cpp
+++ b/client/daemon/daemon.cpp
@@ -359,6 +359,17 @@ bool Daemon::parseConfig(const QJsonObject& obj, InterfaceConfig& config) {
   if (!parseStringList(obj, "vpnDisabledApps", config.m_vpnDisabledApps)) {
     return false;
   }
+
+  config.m_junkPacketCount = obj.value("Jc").toString();
+  config.m_junkPacketMinSize = obj.value("Jmin").toString();
+  config.m_junkPacketMaxSize = obj.value("Jmax").toString();
+  config.m_initPacketJunkSize = obj.value("S1").toString();
+  config.m_responsePacketJunkSize = obj.value("S2").toString();
+  config.m_initPacketMagicHeader = obj.value("H1").toString();
+  config.m_responsePacketMagicHeader = obj.value("H2").toString();
+  config.m_underloadPacketMagicHeader = obj.value("H3").toString();
+  config.m_transportPacketMagicHeader = obj.value("H4").toString();
+
   return true;
 }
 
diff --git a/client/daemon/interfaceconfig.h b/client/daemon/interfaceconfig.h
index 61ffdd83..29aef085 100644
--- a/client/daemon/interfaceconfig.h
+++ b/client/daemon/interfaceconfig.h
@@ -40,6 +40,16 @@ class InterfaceConfig {
   QString m_installationId;
 #endif
 
+  QString m_junkPacketCount;
+  QString m_junkPacketMinSize;
+  QString m_junkPacketMaxSize;
+  QString m_initPacketJunkSize;
+  QString m_responsePacketJunkSize;
+  QString m_initPacketMagicHeader;
+  QString m_responsePacketMagicHeader;
+  QString m_underloadPacketMagicHeader;
+  QString m_transportPacketMagicHeader;
+
   QJsonObject toJson() const;
   QString toWgConf(
       const QMap<QString, QString>& extra = QMap<QString, QString>()) const;
diff --git a/client/mozilla/localsocketcontroller.cpp b/client/mozilla/localsocketcontroller.cpp
index 40bc0bba..c9fa6a42 100644
--- a/client/mozilla/localsocketcontroller.cpp
+++ b/client/mozilla/localsocketcontroller.cpp
@@ -115,7 +115,9 @@ void LocalSocketController::daemonConnected() {
 }
 
 void LocalSocketController::activate(const QJsonObject &rawConfig) {
-  QJsonObject wgConfig = rawConfig.value("wireguard_config_data").toObject();
+  QString protocolName = rawConfig.value("protocol").toString();
+
+  QJsonObject wgConfig = rawConfig.value(protocolName + "_config_data").toObject();
 
   QJsonObject json;
   json.insert("type", "activate");
@@ -160,6 +162,19 @@ void LocalSocketController::activate(const QJsonObject &rawConfig) {
   //    splitTunnelApps.append(QJsonValue(uri));
   //  }
   //  json.insert("vpnDisabledApps", splitTunnelApps);
+
+  if (protocolName == amnezia::config_key::amneziaWireguard) {
+    json.insert(amnezia::config_key::junkPacketCount, wgConfig.value(amnezia::config_key::junkPacketCount));
+    json.insert(amnezia::config_key::junkPacketMinSize, wgConfig.value(amnezia::config_key::junkPacketMinSize));
+    json.insert(amnezia::config_key::junkPacketMaxSize, wgConfig.value(amnezia::config_key::junkPacketMaxSize));
+    json.insert(amnezia::config_key::initPacketJunkSize, wgConfig.value(amnezia::config_key::initPacketJunkSize));
+    json.insert(amnezia::config_key::responsePacketJunkSize, wgConfig.value(amnezia::config_key::responsePacketJunkSize));
+    json.insert(amnezia::config_key::initPacketMagicHeader, wgConfig.value(amnezia::config_key::initPacketMagicHeader));
+    json.insert(amnezia::config_key::responsePacketMagicHeader, wgConfig.value(amnezia::config_key::responsePacketMagicHeader));
+    json.insert(amnezia::config_key::underloadPacketMagicHeader, wgConfig.value(amnezia::config_key::underloadPacketMagicHeader));
+    json.insert(amnezia::config_key::transportPacketMagicHeader, wgConfig.value(amnezia::config_key::transportPacketMagicHeader));
+  }
+
   write(json);
 }
 
diff --git a/client/platforms/macos/daemon/wireguardutilsmacos.cpp b/client/platforms/macos/daemon/wireguardutilsmacos.cpp
index 1f422462..ead53e23 100644
--- a/client/platforms/macos/daemon/wireguardutilsmacos.cpp
+++ b/client/platforms/macos/daemon/wireguardutilsmacos.cpp
@@ -163,6 +163,17 @@ bool WireguardUtilsMacos::updatePeer(const InterfaceConfig& config) {
     out << "allowed_ip=" << ip.toString() << "\n";
   }
 
+
+  out << "Jc=" << config.m_junkPacketCount << "\n";
+  out << "jmin=" << config.m_junkPacketMinSize << "\n";
+  out << "jmax=" << config.m_junkPacketMaxSize << "\n";
+  out << "s1=" << config.m_initPacketJunkSize << "\n";
+  out << "s2=" << config.m_responsePacketJunkSize << "\n";
+  out << "h1=" << config.m_initPacketMagicHeader << "\n";
+  out << "h2=" << config.m_responsePacketMagicHeader << "\n";
+  out << "h3=" << config.m_underloadPacketMagicHeader << "\n";
+  out << "h4=" << config.m_transportPacketMagicHeader << "\n";
+
   // Exclude the server address, except for multihop exit servers.
   if ((config.m_hopType != InterfaceConfig::MultiHopExit) &&
       (m_rtmonitor != nullptr)) {
diff --git a/client/protocols/protocols_defs.h b/client/protocols/protocols_defs.h
index 4e72e318..e26e60a4 100644
--- a/client/protocols/protocols_defs.h
+++ b/client/protocols/protocols_defs.h
@@ -61,11 +61,22 @@ namespace amnezia
 
         constexpr char isThirdPartyConfig[] = "isThirdPartyConfig";
 
+        constexpr char junkPacketCount[] = "Jc";
+        constexpr char junkPacketMinSize[] = "Jmin";
+        constexpr char junkPacketMaxSize[] = "Jmax";
+        constexpr char initPacketJunkSize[] = "S1";
+        constexpr char responsePacketJunkSize[] = "S2";
+        constexpr char initPacketMagicHeader[] = "H1";
+        constexpr char responsePacketMagicHeader[] = "H2";
+        constexpr char underloadPacketMagicHeader[] = "H3";
+        constexpr char transportPacketMagicHeader[] = "H4";
+
         constexpr char openvpn[] = "openvpn";
         constexpr char wireguard[] = "wireguard";
         constexpr char shadowsocks[] = "shadowsocks";
         constexpr char cloak[] = "cloak";
         constexpr char sftp[] = "sftp";
+        constexpr char amneziaWireguard[] = "amneziawireguard";
 
     }
 
@@ -140,6 +151,25 @@ namespace amnezia
 
         } // namespace sftp
 
+        namespace amneziawireguard
+        {
+            constexpr char defaultPort[] = "55424";
+
+            constexpr char serverConfigPath[] = "/opt/amnezia/amneziawireguard/wg0.conf";
+            constexpr char serverPublicKeyPath[] = "/opt/amnezia/amneziawireguard/wireguard_server_public_key.key";
+            constexpr char serverPskKeyPath[] = "/opt/amnezia/amneziawireguard/wireguard_psk.key";
+
+            constexpr char defaultJunkPacketCount[] = "3";
+            constexpr char defaultJunkPacketMinSize[] = "10";
+            constexpr char defaultJunkPacketMaxSize[] = "30";
+            constexpr char defaultInitPacketJunkSize[] = "15";
+            constexpr char defaultResponsePacketJunkSize[] = "18";
+            constexpr char defaultInitPacketMagicHeader[] = "1020325451";
+            constexpr char defaultResponsePacketMagicHeader[] = "3288052141";
+            constexpr char defaultTransportPacketMagicHeader[] = "2528465083";
+            constexpr char defaultUnderloadPacketMagicHeader[] = "1766607858";
+        }
+
     } // namespace protocols
 
     namespace ProtocolEnumNS
diff --git a/client/resources.qrc b/client/resources.qrc
index 44c61172..b79ed3d2 100644
--- a/client/resources.qrc
+++ b/client/resources.qrc
@@ -216,5 +216,10 @@
         <file>ui/qml/Pages2/PageServiceDnsSettings.qml</file>
         <file>ui/qml/Controls2/TopCloseButtonType.qml</file>
         <file>ui/qml/Pages2/PageProtocolAmneziaWireGuardSettings.qml</file>
+        <file>server_scripts/amnezia_wireguard/template.conf</file>
+        <file>server_scripts/amnezia_wireguard/start.sh</file>
+        <file>server_scripts/amnezia_wireguard/configure_container.sh</file>
+        <file>server_scripts/amnezia_wireguard/run_container.sh</file>
+        <file>server_scripts/amnezia_wireguard/Dockerfile</file>
     </qresource>
 </RCC>
diff --git a/client/server_scripts/amnezia_wireguard/Dockerfile b/client/server_scripts/amnezia_wireguard/Dockerfile
new file mode 100644
index 00000000..ed974dc6
--- /dev/null
+++ b/client/server_scripts/amnezia_wireguard/Dockerfile
@@ -0,0 +1,46 @@
+FROM amneziavpn/amnezia-wg:latest
+
+LABEL maintainer="AmneziaVPN"
+
+#Install required packages
+RUN apk add --no-cache curl wireguard-tools dumb-init
+RUN apk --update upgrade --no-cache
+
+RUN mkdir -p /opt/amnezia
+RUN echo -e "#!/bin/bash\ntail -f /dev/null" > /opt/amnezia/start.sh
+RUN chmod a+x /opt/amnezia/start.sh
+
+# Tune network  
+RUN echo -e " \n\
+  fs.file-max = 51200 \n\
+  \n\
+  net.core.rmem_max = 67108864 \n\
+  net.core.wmem_max = 67108864 \n\
+  net.core.netdev_max_backlog = 250000 \n\
+  net.core.somaxconn = 4096 \n\
+  \n\
+  net.ipv4.tcp_syncookies = 1 \n\
+  net.ipv4.tcp_tw_reuse = 1 \n\
+  net.ipv4.tcp_tw_recycle = 0 \n\
+  net.ipv4.tcp_fin_timeout = 30 \n\
+  net.ipv4.tcp_keepalive_time = 1200 \n\
+  net.ipv4.ip_local_port_range = 10000 65000 \n\
+  net.ipv4.tcp_max_syn_backlog = 8192 \n\
+  net.ipv4.tcp_max_tw_buckets = 5000 \n\
+  net.ipv4.tcp_fastopen = 3 \n\
+  net.ipv4.tcp_mem = 25600 51200 102400 \n\
+  net.ipv4.tcp_rmem = 4096 87380 67108864 \n\
+  net.ipv4.tcp_wmem = 4096 65536 67108864 \n\
+  net.ipv4.tcp_mtu_probing = 1 \n\
+  net.ipv4.tcp_congestion_control = hybla \n\
+  # for low-latency network, use cubic instead \n\
+  # net.ipv4.tcp_congestion_control = cubic \n\
+  " | sed -e 's/^\s\+//g' | tee -a /etc/sysctl.conf && \
+  mkdir -p /etc/security && \
+  echo -e " \n\
+  * soft nofile 51200 \n\
+  * hard nofile 51200 \n\
+  " | sed -e 's/^\s\+//g' | tee -a /etc/security/limits.conf  
+
+ENTRYPOINT [ "dumb-init", "/opt/amnezia/start.sh" ]
+CMD [ "" ]
diff --git a/client/server_scripts/amnezia_wireguard/configure_container.sh b/client/server_scripts/amnezia_wireguard/configure_container.sh
new file mode 100644
index 00000000..8653a932
--- /dev/null
+++ b/client/server_scripts/amnezia_wireguard/configure_container.sh
@@ -0,0 +1,26 @@
+mkdir -p /opt/amnezia/amneziawireguard
+cd /opt/amnezia/amneziawireguard
+WIREGUARD_SERVER_PRIVATE_KEY=$(wg genkey)
+echo $WIREGUARD_SERVER_PRIVATE_KEY > /opt/amnezia/amneziawireguard/wireguard_server_private_key.key
+
+WIREGUARD_SERVER_PUBLIC_KEY=$(echo $WIREGUARD_SERVER_PRIVATE_KEY | wg pubkey)
+echo $WIREGUARD_SERVER_PUBLIC_KEY > /opt/amnezia/amneziawireguard/wireguard_server_public_key.key
+
+WIREGUARD_PSK=$(wg genpsk)
+echo $WIREGUARD_PSK > /opt/amnezia/amneziawireguard/wireguard_psk.key
+
+cat > /opt/amnezia/amneziawireguard/wg0.conf <<EOF
+[Interface]
+PrivateKey = $WIREGUARD_SERVER_PRIVATE_KEY
+Address = $WIREGUARD_SUBNET_IP/$WIREGUARD_SUBNET_CIDR
+ListenPort = $AMNEZIAWIREGUARD_SERVER_PORT
+Jc = $JUNK_PACKET_COUNT
+Jmin = $JUNK_PACKET_MIN_SIZE
+Jmax = $JUNK_PACKET_MAX_SIZE
+S1 = $INIT_PACKET_JUNK_SIZE
+S2 = $RESPONSE_PACKET_JUNK_SIZE
+H1 = $INIT_PACKET_MAGIC_HEADER
+H2 = $RESPONSE_PACKET_MAGIC_HEADER
+H3 = $UNDERLOAD_PACKET_MAGIC_HEADER
+H4 = $TRANSPORT_PACKET_MAGIC_HEADER
+EOF
diff --git a/client/server_scripts/amnezia_wireguard/run_container.sh b/client/server_scripts/amnezia_wireguard/run_container.sh
new file mode 100644
index 00000000..2dafb67f
--- /dev/null
+++ b/client/server_scripts/amnezia_wireguard/run_container.sh
@@ -0,0 +1,18 @@
+# Run container
+sudo docker run -d \
+--log-driver none \
+--restart always \
+--privileged \
+--cap-add=NET_ADMIN \
+--cap-add=SYS_MODULE \
+-p $AMNEZIAWIREGUARD_SERVER_PORT:$AMNEZIAWIREGUARD_SERVER_PORT/udp \
+-v /lib/modules:/lib/modules \
+--sysctl="net.ipv4.conf.all.src_valid_mark=1" \
+--name $CONTAINER_NAME \
+$CONTAINER_NAME
+
+sudo docker network connect amnezia-dns-net $CONTAINER_NAME
+
+# Prevent to route packets outside of the container in case if server behind of the NAT
+#sudo docker exec -i $CONTAINER_NAME sh -c "ifconfig eth0:0 $SERVER_IP_ADDRESS netmask 255.255.255.255 up"
+
diff --git a/client/server_scripts/amnezia_wireguard/start.sh b/client/server_scripts/amnezia_wireguard/start.sh
new file mode 100644
index 00000000..b371d5b5
--- /dev/null
+++ b/client/server_scripts/amnezia_wireguard/start.sh
@@ -0,0 +1,28 @@
+#!/bin/bash
+
+# This scripts copied from Amnezia client to Docker container to /opt/amnezia and launched every time container starts
+
+echo "Container startup"
+#ifconfig eth0:0 $SERVER_IP_ADDRESS netmask 255.255.255.255 up
+
+# kill daemons in case of restart
+wg-quick down /opt/amnezia/amneziawireguard/wg0.conf
+
+# start daemons if configured
+if [ -f /opt/amnezia/amneziawireguard/wg0.conf ]; then (wg-quick up /opt/amnezia/amneziawireguard/wg0.conf); fi
+
+# Allow traffic on the TUN interface.
+iptables -A INPUT -i wg0 -j ACCEPT
+iptables -A FORWARD -i wg0 -j ACCEPT
+iptables -A OUTPUT -o wg0 -j ACCEPT
+
+# Allow forwarding traffic only from the VPN.
+iptables -A FORWARD -i wg0 -o eth0 -s $WIREGUARD_SUBNET_IP/$WIREGUARD_SUBNET_CIDR -j ACCEPT
+iptables -A FORWARD -i wg0 -o eth1 -s $WIREGUARD_SUBNET_IP/$WIREGUARD_SUBNET_CIDR -j ACCEPT
+
+iptables -A FORWARD -m state --state ESTABLISHED,RELATED -j ACCEPT
+
+iptables -t nat -A POSTROUTING -s $WIREGUARD_SUBNET_IP/$WIREGUARD_SUBNET_CIDR -o eth0 -j MASQUERADE
+iptables -t nat -A POSTROUTING -s $WIREGUARD_SUBNET_IP/$WIREGUARD_SUBNET_CIDR -o eth1 -j MASQUERADE
+
+tail -f /dev/null
diff --git a/client/server_scripts/amnezia_wireguard/template.conf b/client/server_scripts/amnezia_wireguard/template.conf
new file mode 100644
index 00000000..a872bb9a
--- /dev/null
+++ b/client/server_scripts/amnezia_wireguard/template.conf
@@ -0,0 +1,20 @@
+[Interface]
+Address = $WIREGUARD_CLIENT_IP/32
+DNS = $PRIMARY_DNS, $SECONDARY_DNS
+PrivateKey = $WIREGUARD_CLIENT_PRIVATE_KEY
+Jc = $JUNK_PACKET_COUNT
+Jmin = $JUNK_PACKET_MIN_SIZE
+Jmax = $JUNK_PACKET_MAX_SIZE
+S1 = $INIT_PACKET_JUNK_SIZE
+S2 = $RESPONSE_PACKET_JUNK_SIZE
+H1 = $INIT_PACKET_MAGIC_HEADER
+H2 = $RESPONSE_PACKET_MAGIC_HEADER
+H3 = $UNDERLOAD_PACKET_MAGIC_HEADER
+H4 = $TRANSPORT_PACKET_MAGIC_HEADER
+
+[Peer]
+PublicKey = $WIREGUARD_SERVER_PUBLIC_KEY
+PresharedKey = $WIREGUARD_PSK
+AllowedIPs = 0.0.0.0/0, ::/0
+Endpoint = $SERVER_IP_ADDRESS:$AMNEZIAWIREGUARD_SERVER_PORT
+PersistentKeepalive = 25

From b55313527ea24055758317f507b4be6b9db13ace Mon Sep 17 00:00:00 2001
From: "vladimir.kuznetsov" <nethiuswork@gmail.com>
Date: Wed, 27 Sep 2023 00:45:42 +0500
Subject: [PATCH 145/278] added passing new amneziawireguard config parameters
 over uapi for all platforms

---
 client/platforms/linux/daemon/wireguardutilslinux.cpp  | 10 ++++++++++
 client/platforms/macos/daemon/wireguardutilsmacos.cpp  |  2 +-
 .../platforms/windows/daemon/wireguardutilswindows.cpp | 10 ++++++++++
 3 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/client/platforms/linux/daemon/wireguardutilslinux.cpp b/client/platforms/linux/daemon/wireguardutilslinux.cpp
index a8b7b04a..dbb92f61 100644
--- a/client/platforms/linux/daemon/wireguardutilslinux.cpp
+++ b/client/platforms/linux/daemon/wireguardutilslinux.cpp
@@ -161,6 +161,16 @@ bool WireguardUtilsLinux::updatePeer(const InterfaceConfig& config) {
         out << "allowed_ip=" << ip.toString() << "\n";
     }
 
+    out << "jc=" << config.m_junkPacketCount << "\n";
+    out << "jmin=" << config.m_junkPacketMinSize << "\n";
+    out << "jmax=" << config.m_junkPacketMaxSize << "\n";
+    out << "s1=" << config.m_initPacketJunkSize << "\n";
+    out << "s2=" << config.m_responsePacketJunkSize << "\n";
+    out << "h1=" << config.m_initPacketMagicHeader << "\n";
+    out << "h2=" << config.m_responsePacketMagicHeader << "\n";
+    out << "h3=" << config.m_underloadPacketMagicHeader << "\n";
+    out << "h4=" << config.m_transportPacketMagicHeader << "\n";
+
     // Exclude the server address, except for multihop exit servers.
     if ((config.m_hopType != InterfaceConfig::MultiHopExit) &&
         (m_rtmonitor != nullptr)) {
diff --git a/client/platforms/macos/daemon/wireguardutilsmacos.cpp b/client/platforms/macos/daemon/wireguardutilsmacos.cpp
index ead53e23..2170d69e 100644
--- a/client/platforms/macos/daemon/wireguardutilsmacos.cpp
+++ b/client/platforms/macos/daemon/wireguardutilsmacos.cpp
@@ -164,7 +164,7 @@ bool WireguardUtilsMacos::updatePeer(const InterfaceConfig& config) {
   }
 
 
-  out << "Jc=" << config.m_junkPacketCount << "\n";
+  out << "jc=" << config.m_junkPacketCount << "\n";
   out << "jmin=" << config.m_junkPacketMinSize << "\n";
   out << "jmax=" << config.m_junkPacketMaxSize << "\n";
   out << "s1=" << config.m_initPacketJunkSize << "\n";
diff --git a/client/platforms/windows/daemon/wireguardutilswindows.cpp b/client/platforms/windows/daemon/wireguardutilswindows.cpp
index 1e0a4752..21df2611 100644
--- a/client/platforms/windows/daemon/wireguardutilswindows.cpp
+++ b/client/platforms/windows/daemon/wireguardutilswindows.cpp
@@ -165,6 +165,16 @@ bool WireguardUtilsWindows::updatePeer(const InterfaceConfig& config) {
     out << "allowed_ip=" << ip.toString() << "\n";
   }
 
+  out << "jc=" << config.m_junkPacketCount << "\n";
+  out << "jmin=" << config.m_junkPacketMinSize << "\n";
+  out << "jmax=" << config.m_junkPacketMaxSize << "\n";
+  out << "s1=" << config.m_initPacketJunkSize << "\n";
+  out << "s2=" << config.m_responsePacketJunkSize << "\n";
+  out << "h1=" << config.m_initPacketMagicHeader << "\n";
+  out << "h2=" << config.m_responsePacketMagicHeader << "\n";
+  out << "h3=" << config.m_underloadPacketMagicHeader << "\n";
+  out << "h4=" << config.m_transportPacketMagicHeader << "\n";
+
   // Exclude the server address, except for multihop exit servers.
   if (config.m_hopType != InterfaceConfig::MultiHopExit) {
     m_routeMonitor.addExclusionRoute(IPAddress(config.m_serverIpv4AddrIn));

From 423305c35a49e6949a4f62664dc5a9cf2d474a19 Mon Sep 17 00:00:00 2001
From: "vladimir.kuznetsov" <nethiuswork@gmail.com>
Date: Thu, 28 Sep 2023 02:14:07 +0500
Subject: [PATCH 146/278] moved the configuration of new parameters for awg to
 addInterface()

---
 client/daemon/daemon.cpp                      | 20 +++++++++-------
 .../linux/daemon/wireguardutilslinux.cpp      | 23 ++++++++++--------
 .../macos/daemon/wireguardutilsmacos.cpp      | 24 ++++++++++---------
 .../windows/daemon/wireguardutilswindows.cpp  | 10 --------
 4 files changed, 37 insertions(+), 40 deletions(-)

diff --git a/client/daemon/daemon.cpp b/client/daemon/daemon.cpp
index 13310951..63a5c7f6 100644
--- a/client/daemon/daemon.cpp
+++ b/client/daemon/daemon.cpp
@@ -360,15 +360,17 @@ bool Daemon::parseConfig(const QJsonObject& obj, InterfaceConfig& config) {
     return false;
   }
 
-  config.m_junkPacketCount = obj.value("Jc").toString();
-  config.m_junkPacketMinSize = obj.value("Jmin").toString();
-  config.m_junkPacketMaxSize = obj.value("Jmax").toString();
-  config.m_initPacketJunkSize = obj.value("S1").toString();
-  config.m_responsePacketJunkSize = obj.value("S2").toString();
-  config.m_initPacketMagicHeader = obj.value("H1").toString();
-  config.m_responsePacketMagicHeader = obj.value("H2").toString();
-  config.m_underloadPacketMagicHeader = obj.value("H3").toString();
-  config.m_transportPacketMagicHeader = obj.value("H4").toString();
+  if (!obj.value("Jc").isNull()) {
+    config.m_junkPacketCount = obj.value("Jc").toString();
+    config.m_junkPacketMinSize = obj.value("Jmin").toString();
+    config.m_junkPacketMaxSize = obj.value("Jmax").toString();
+    config.m_initPacketJunkSize = obj.value("S1").toString();
+    config.m_responsePacketJunkSize = obj.value("S2").toString();
+    config.m_initPacketMagicHeader = obj.value("H1").toString();
+    config.m_responsePacketMagicHeader = obj.value("H2").toString();
+    config.m_underloadPacketMagicHeader = obj.value("H3").toString();
+    config.m_transportPacketMagicHeader = obj.value("H4").toString();
+  }
 
   return true;
 }
diff --git a/client/platforms/linux/daemon/wireguardutilslinux.cpp b/client/platforms/linux/daemon/wireguardutilslinux.cpp
index dbb92f61..792120a7 100644
--- a/client/platforms/linux/daemon/wireguardutilslinux.cpp
+++ b/client/platforms/linux/daemon/wireguardutilslinux.cpp
@@ -100,6 +100,19 @@ bool WireguardUtilsLinux::addInterface(const InterfaceConfig& config) {
     QTextStream out(&message);
     out << "private_key=" << QString(privateKey.toHex()) << "\n";
     out << "replace_peers=true\n";
+
+    if (config.m_junkPacketCount != "") {
+        out << "jc=" << config.m_junkPacketCount << "\n";
+        out << "jmin=" << config.m_junkPacketMinSize << "\n";
+        out << "jmax=" << config.m_junkPacketMaxSize << "\n";
+        out << "s1=" << config.m_initPacketJunkSize << "\n";
+        out << "s2=" << config.m_responsePacketJunkSize << "\n";
+        out << "h1=" << config.m_initPacketMagicHeader << "\n";
+        out << "h2=" << config.m_responsePacketMagicHeader << "\n";
+        out << "h3=" << config.m_underloadPacketMagicHeader << "\n";
+        out << "h4=" << config.m_transportPacketMagicHeader << "\n";
+    }
+
     int err = uapiErrno(uapiCommand(message));
     if (err != 0) {
         logger.error() << "Interface configuration failed:" << strerror(err);
@@ -161,16 +174,6 @@ bool WireguardUtilsLinux::updatePeer(const InterfaceConfig& config) {
         out << "allowed_ip=" << ip.toString() << "\n";
     }
 
-    out << "jc=" << config.m_junkPacketCount << "\n";
-    out << "jmin=" << config.m_junkPacketMinSize << "\n";
-    out << "jmax=" << config.m_junkPacketMaxSize << "\n";
-    out << "s1=" << config.m_initPacketJunkSize << "\n";
-    out << "s2=" << config.m_responsePacketJunkSize << "\n";
-    out << "h1=" << config.m_initPacketMagicHeader << "\n";
-    out << "h2=" << config.m_responsePacketMagicHeader << "\n";
-    out << "h3=" << config.m_underloadPacketMagicHeader << "\n";
-    out << "h4=" << config.m_transportPacketMagicHeader << "\n";
-
     // Exclude the server address, except for multihop exit servers.
     if ((config.m_hopType != InterfaceConfig::MultiHopExit) &&
         (m_rtmonitor != nullptr)) {
diff --git a/client/platforms/macos/daemon/wireguardutilsmacos.cpp b/client/platforms/macos/daemon/wireguardutilsmacos.cpp
index 2170d69e..ef13f4c7 100644
--- a/client/platforms/macos/daemon/wireguardutilsmacos.cpp
+++ b/client/platforms/macos/daemon/wireguardutilsmacos.cpp
@@ -100,6 +100,19 @@ bool WireguardUtilsMacos::addInterface(const InterfaceConfig& config) {
   QTextStream out(&message);
   out << "private_key=" << QString(privateKey.toHex()) << "\n";
   out << "replace_peers=true\n";
+
+  if (config.m_junkPacketCount != "") {
+    out << "jc=" << config.m_junkPacketCount << "\n";
+    out << "jmin=" << config.m_junkPacketMinSize << "\n";
+    out << "jmax=" << config.m_junkPacketMaxSize << "\n";
+    out << "s1=" << config.m_initPacketJunkSize << "\n";
+    out << "s2=" << config.m_responsePacketJunkSize << "\n";
+    out << "h1=" << config.m_initPacketMagicHeader << "\n";
+    out << "h2=" << config.m_responsePacketMagicHeader << "\n";
+    out << "h3=" << config.m_underloadPacketMagicHeader << "\n";
+    out << "h4=" << config.m_transportPacketMagicHeader << "\n";
+  }
+
   int err = uapiErrno(uapiCommand(message));
   if (err != 0) {
     logger.error() << "Interface configuration failed:" << strerror(err);
@@ -163,17 +176,6 @@ bool WireguardUtilsMacos::updatePeer(const InterfaceConfig& config) {
     out << "allowed_ip=" << ip.toString() << "\n";
   }
 
-
-  out << "jc=" << config.m_junkPacketCount << "\n";
-  out << "jmin=" << config.m_junkPacketMinSize << "\n";
-  out << "jmax=" << config.m_junkPacketMaxSize << "\n";
-  out << "s1=" << config.m_initPacketJunkSize << "\n";
-  out << "s2=" << config.m_responsePacketJunkSize << "\n";
-  out << "h1=" << config.m_initPacketMagicHeader << "\n";
-  out << "h2=" << config.m_responsePacketMagicHeader << "\n";
-  out << "h3=" << config.m_underloadPacketMagicHeader << "\n";
-  out << "h4=" << config.m_transportPacketMagicHeader << "\n";
-
   // Exclude the server address, except for multihop exit servers.
   if ((config.m_hopType != InterfaceConfig::MultiHopExit) &&
       (m_rtmonitor != nullptr)) {
diff --git a/client/platforms/windows/daemon/wireguardutilswindows.cpp b/client/platforms/windows/daemon/wireguardutilswindows.cpp
index 21df2611..1e0a4752 100644
--- a/client/platforms/windows/daemon/wireguardutilswindows.cpp
+++ b/client/platforms/windows/daemon/wireguardutilswindows.cpp
@@ -165,16 +165,6 @@ bool WireguardUtilsWindows::updatePeer(const InterfaceConfig& config) {
     out << "allowed_ip=" << ip.toString() << "\n";
   }
 
-  out << "jc=" << config.m_junkPacketCount << "\n";
-  out << "jmin=" << config.m_junkPacketMinSize << "\n";
-  out << "jmax=" << config.m_junkPacketMaxSize << "\n";
-  out << "s1=" << config.m_initPacketJunkSize << "\n";
-  out << "s2=" << config.m_responsePacketJunkSize << "\n";
-  out << "h1=" << config.m_initPacketMagicHeader << "\n";
-  out << "h2=" << config.m_responsePacketMagicHeader << "\n";
-  out << "h3=" << config.m_underloadPacketMagicHeader << "\n";
-  out << "h4=" << config.m_transportPacketMagicHeader << "\n";
-
   // Exclude the server address, except for multihop exit servers.
   if (config.m_hopType != InterfaceConfig::MultiHopExit) {
     m_routeMonitor.addExclusionRoute(IPAddress(config.m_serverIpv4AddrIn));

From 058f8b544e5c16dd6128bc54d3d9c57d645e4785 Mon Sep 17 00:00:00 2001
From: Matthew Schwiebert <Matthewschwiebert@gmail.com>
Date: Thu, 28 Sep 2023 10:14:01 -0400
Subject: [PATCH 147/278] Limit Drawer positioning by dragHeight and total page
 height

---
 client/ui/qml/Controls2/DrawerType.qml | 5 ++++-
 client/ui/qml/Pages2/PageHome.qml      | 1 +
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/client/ui/qml/Controls2/DrawerType.qml b/client/ui/qml/Controls2/DrawerType.qml
index c22d00c2..bb2ee4aa 100644
--- a/client/ui/qml/Controls2/DrawerType.qml
+++ b/client/ui/qml/Controls2/DrawerType.qml
@@ -5,6 +5,7 @@ Drawer {
     id: drawer
     property bool needCloseButton: true
     property bool isOpened: false
+    property int pageHeight
 
     Connections {
         target: PageController
@@ -54,6 +55,7 @@ Drawer {
         if (needCloseButton) {
             PageController.drawerOpen()
         }
+        position = (dragMargin / pageHeight)
     }
 
     onAboutToHide: {
@@ -77,9 +79,10 @@ Drawer {
 
 
     onPositionChanged: {
-        if (isOpened && (position <= 0.99 && position >= 0.95)) {
+        if (position < (dragMargin / root.height)) {
             mouseArea.canceled()
             drawer.close()
+            position = 0
             mouseArea.exited()
             dropArea.exited()
         }
diff --git a/client/ui/qml/Pages2/PageHome.qml b/client/ui/qml/Pages2/PageHome.qml
index d8796524..bfebbb21 100644
--- a/client/ui/qml/Pages2/PageHome.qml
+++ b/client/ui/qml/Pages2/PageHome.qml
@@ -148,6 +148,7 @@ PageType {
 
         width: parent.width
         height: parent.height * 0.9
+        pageHeight: root.height
 
         ColumnLayout {
             id: serversMenuHeader

From 68095700a2eb6b79cce6677df7a9d07085e3c02b Mon Sep 17 00:00:00 2001
From: ronoaer <ronoaer@gmail.com>
Date: Thu, 28 Sep 2023 23:21:13 +0800
Subject: [PATCH 148/278] added i18n for v4

---
 client/CMakeLists.txt                   |   22 +-
 client/amnezia_application.cpp          |   20 +-
 client/main.cpp                         |    2 +-
 client/translations/amneziavpn_ru.ts    | 2969 ++++++++---------------
 client/translations/amneziavpn_zh_CN.ts | 2666 ++++++++++++++++++++
 client/ui/models/languageModel.cpp      |   19 +-
 client/ui/models/languageModel.h        |    5 +-
 7 files changed, 3729 insertions(+), 1974 deletions(-)
 create mode 100644 client/translations/amneziavpn_zh_CN.ts

diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt
index 63810ed3..f149e204 100644
--- a/client/CMakeLists.txt
+++ b/client/CMakeLists.txt
@@ -50,10 +50,30 @@ endif()
 
 qt6_add_resources(QRC ${QRC} ${CMAKE_CURRENT_LIST_DIR}/resources.qrc)
 
-qt6_add_translations(${PROJECT} TS_FILES
+set(AMNEZIAVPN_TR_FILES
     ${CMAKE_CURRENT_LIST_DIR}/translations/amneziavpn_ru.ts
+    ${CMAKE_CURRENT_LIST_DIR}/translations/amneziavpn_zh_CN.ts
 )
 
+file(GLOB_RECURSE AMNEZIAVPN_TR_SOURCES *.qrc *.cpp *.h *.ui)
+if ( BUILD_TRANSLATIONS )
+    qt_create_translation(AMNEZIAVPN_MESSAGES ${AMNEZIAVPN_TR_SOURCES} ${AMNEZIAVPN_TR_FILES})
+    qt_add_translation(AMNEZIAVPN_QM_FILES ${AMNEZIAVPN_TR_FILES})
+    add_custom_target(amnezia_messages DEPENDS ${AMNEZIAVPN_MESSAGES})
+    add_custom_target(amnezia_translations DEPENDS ${AMNEZIAVPN_QM_FILES} amnezia_messages)
+    add_dependencies(${PROJECT} amnezia_translations)
+
+    if (BUILD_TRANSLATIONS_AS_RESOURCES)
+        set(QM_FILE_LIST "")
+        foreach(FILE ${AMNEZIAVPN_QM_FILES})
+            list(APPEND QM_FILE_LIST "<file>${FILE}</file>")
+        endforeach()
+        string(REPLACE ";" "" QM_FILE_LIST ${QM_FILE_LIST})
+        configure_file(${CMAKE_CURRENT_LIST_DIR}/translations/translations.qrc ${CMAKE_CURRENT_LIST_DIR}/translations.qrc)
+        target_sources(${PROJECT} PRIVATE ${CMAKE_CURRENT_LIST_DIR}/translations.qrc)
+    endif()
+endif( BUILD_TRANSLATIONS )
+
 if(IOS)
     #execute_process(COMMAND bash ${CMAKE_CURRENT_LIST_DIR}/scripts/run-build-cloak.sh)
     execute_process(COMMAND bash ${CMAKE_CURRENT_LIST_DIR}/ios/scripts/openvpn.sh args
diff --git a/client/amnezia_application.cpp b/client/amnezia_application.cpp
index 23157468..d87f326e 100644
--- a/client/amnezia_application.cpp
+++ b/client/amnezia_application.cpp
@@ -221,27 +221,21 @@ void AmneziaApplication::loadTranslator()
 {
     auto locale = m_settings->getAppLanguage();
     m_translator.reset(new QTranslator());
-    if (locale != QLocale::English) {
-        if (m_translator->load(locale, QString("amneziavpn"), QLatin1String("_"), QLatin1String(":/i18n"))) {
-            if (QCoreApplication::installTranslator(m_translator.get())) {
-                m_settings->setAppLanguage(locale);
-            }
-        }
-    }
+    updateTranslator(locale);
 }
 
+
 void AmneziaApplication::updateTranslator(const QLocale &locale)
 {
     QResource::registerResource(":/translations.qrc");
-    if (!m_translator->isEmpty())
+    if (!m_translator->isEmpty()) {
         QCoreApplication::removeTranslator(m_translator.get());
-
-    if (locale == QLocale::English) {
-        m_settings->setAppLanguage(locale);
-        m_engine->retranslate();
     }
 
-    if (m_translator->load(locale, QString("amneziavpn"), QLatin1String("_"), QLatin1String(":/i18n"))) {
+    m_settings->setAppLanguage(locale);
+
+    QString strFileName = QString("amneziavpn")+QLatin1String("_")+locale.name()+".qm";
+    if (m_translator->load(strFileName, "../../../")) {
         if (QCoreApplication::installTranslator(m_translator.get())) {
             m_settings->setAppLanguage(locale);
         }
diff --git a/client/main.cpp b/client/main.cpp
index e78a74ff..53c3238f 100644
--- a/client/main.cpp
+++ b/client/main.cpp
@@ -53,13 +53,13 @@ int main(int argc, char *argv[])
     app.setOrganizationName(ORGANIZATION_NAME);
     app.setApplicationDisplayName(APPLICATION_NAME);
 
-    app.loadTranslator();
     app.loadFonts();
 
     bool doExec = app.parseCommands();
 
     if (doExec) {
         app.init();
+        app.loadTranslator();
 
         qInfo().noquote() << QString("Started %1 version %2").arg(APPLICATION_NAME, APP_VERSION);
         qInfo().noquote() << QString("%1 (%2)").arg(QSysInfo::prettyProductName(), QSysInfo::currentCpuArchitecture());
diff --git a/client/translations/amneziavpn_ru.ts b/client/translations/amneziavpn_ru.ts
index f338216b..e6c60a33 100644
--- a/client/translations/amneziavpn_ru.ts
+++ b/client/translations/amneziavpn_ru.ts
@@ -2,138 +2,65 @@
 <!DOCTYPE TS>
 <TS version="2.1" language="ru_RU">
 <context>
-    <name>AdvancedServerSettingsLogic</name>
+    <name>AmneziaApplication</name>
     <message>
-        <location filename="../ui/pages_logic/AdvancedServerSettingsLogic.cpp" line="11"/>
-        <location filename="../ui/pages_logic/AdvancedServerSettingsLogic.cpp" line="62"/>
-        <source>Clear server from Amnezia software</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/pages_logic/AdvancedServerSettingsLogic.cpp" line="35"/>
-        <source>Service: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/pages_logic/AdvancedServerSettingsLogic.cpp" line="41"/>
-        <source>Uninstalling Amnezia software...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/pages_logic/AdvancedServerSettingsLogic.cpp" line="50"/>
-        <source>Error occurred while cleaning the server.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/pages_logic/AdvancedServerSettingsLogic.cpp" line="51"/>
-        <location filename="../ui/pages_logic/AdvancedServerSettingsLogic.cpp" line="75"/>
-        <source>Error message: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/pages_logic/AdvancedServerSettingsLogic.cpp" line="52"/>
-        <location filename="../ui/pages_logic/AdvancedServerSettingsLogic.cpp" line="76"/>
-        <source>See logs for details.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/pages_logic/AdvancedServerSettingsLogic.cpp" line="55"/>
-        <source>Amnezia server successfully uninstalled</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/pages_logic/AdvancedServerSettingsLogic.cpp" line="74"/>
-        <source>Error occurred while scanning the server.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/pages_logic/AdvancedServerSettingsLogic.cpp" line="80"/>
-        <source>All containers installed on the server are added to the GUI</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/pages_logic/AdvancedServerSettingsLogic.cpp" line="82"/>
-        <source>No installed containers found on the server</source>
+        <location filename="../amnezia_application.cpp" line="299"/>
+        <source>Split tunneling for WireGuard is not implemented, the option was disabled</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>AppSettingsLogic</name>
+    <name>AndroidController</name>
     <message>
-        <location filename="../ui/pages_logic/AppSettingsLogic.cpp" line="34"/>
-        <source>Software version</source>
+        <location filename="../platforms/android/android_controller.cpp" line="236"/>
+        <source>AmneziaVPN</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/pages_logic/AppSettingsLogic.cpp" line="70"/>
-        <source>Save log</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/pages_logic/AppSettingsLogic.cpp" line="86"/>
-        <source>Open backup</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/pages_logic/AppSettingsLogic.cpp" line="100"/>
-        <source>Can&apos;t import config, file is corrupted.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>ClientInfoLogic</name>
-    <message>
-        <location filename="../ui/pages_logic/ClientInfoLogic.cpp" line="41"/>
-        <source>Service: </source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>ClientManagementLogic</name>
-    <message>
-        <location filename="../ui/pages_logic/ClientManagementLogic.cpp" line="25"/>
-        <source>Service: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/pages_logic/ClientManagementLogic.cpp" line="38"/>
-        <source>An error occurred while getting the list of clients.</source>
+        <location filename="../platforms/android/android_controller.cpp" line="239"/>
+        <source>VPN Connected</source>
+        <extracomment>Refers to the app - which is currently running the background and waiting</extracomment>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ConnectionController</name>
     <message>
-        <location filename="../ui/controllers/connectionController.cpp" line="32"/>
+        <location filename="../ui/controllers/connectionController.cpp" line="53"/>
         <source>VPN Protocols is not installed.
  Please install VPN container at first</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/controllers/connectionController.cpp" line="53"/>
+        <location filename="../ui/controllers/connectionController.cpp" line="74"/>
         <source>Connection...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/controllers/connectionController.cpp" line="58"/>
-        <source>Disconnect</source>
+        <location filename="../ui/controllers/connectionController.cpp" line="79"/>
+        <source>Connected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/controllers/connectionController.cpp" line="67"/>
+        <location filename="../ui/controllers/connectionController.cpp" line="124"/>
+        <source>Settings updated successfully, Reconnnection...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/controllers/connectionController.cpp" line="88"/>
         <source>Reconnection...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/controllers/connectionController.cpp" line="72"/>
-        <location filename="../ui/controllers/connectionController.cpp" line="86"/>
-        <location filename="../ui/controllers/connectionController.cpp" line="92"/>
-        <location filename="../ui/controllers/connectionController.h" line="49"/>
+        <location filename="../ui/controllers/connectionController.h" line="54"/>
+        <location filename="../ui/controllers/connectionController.cpp" line="93"/>
+        <location filename="../ui/controllers/connectionController.cpp" line="107"/>
+        <location filename="../ui/controllers/connectionController.cpp" line="113"/>
         <source>Connect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/controllers/connectionController.cpp" line="77"/>
+        <location filename="../ui/controllers/connectionController.cpp" line="98"/>
         <source>Disconnection...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -157,24 +84,24 @@
     </message>
 </context>
 <context>
-    <name>ContextMenu</name>
+    <name>ContextMenuType</name>
     <message>
-        <location filename="../ui/qml/Controls/ContextMenu.qml" line="9"/>
+        <location filename="../ui/qml/Controls2/ContextMenuType.qml" line="9"/>
         <source>C&amp;ut</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Controls/ContextMenu.qml" line="15"/>
+        <location filename="../ui/qml/Controls2/ContextMenuType.qml" line="15"/>
         <source>&amp;Copy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Controls/ContextMenu.qml" line="21"/>
+        <location filename="../ui/qml/Controls2/ContextMenuType.qml" line="21"/>
         <source>&amp;Paste</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Controls/ContextMenu.qml" line="28"/>
+        <location filename="../ui/qml/Controls2/ContextMenuType.qml" line="28"/>
         <source>&amp;SelectAll</source>
         <translation type="unfinished"></translation>
     </message>
@@ -182,70 +109,106 @@
 <context>
     <name>ExportController</name>
     <message>
-        <location filename="../ui/controllers/exportController.cpp" line="35"/>
+        <location filename="../ui/controllers/exportController.cpp" line="34"/>
         <source>Access error!</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>HomeContainersListView</name>
     <message>
-        <location filename="../ui/controllers/exportController.cpp" line="235"/>
-        <source>Save AmneziaVPN config</source>
+        <location filename="../ui/qml/Components/HomeContainersListView.qml" line="58"/>
+        <source>The selected protocol is not supported on the current platform</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Components/HomeContainersListView.qml" line="77"/>
+        <source>Reconnect via VPN Procotol: </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ImportController</name>
     <message>
-        <location filename="../ui/controllers/importController.cpp" line="84"/>
-        <source>Open config file</source>
+        <location filename="../ui/controllers/importController.cpp" line="384"/>
+        <source>Scanned %1 of %2.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>InstallController</name>
     <message>
-        <location filename="../ui/controllers/installController.cpp" line="97"/>
-        <location filename="../ui/controllers/installController.cpp" line="149"/>
+        <location filename="../ui/controllers/installController.cpp" line="110"/>
+        <location filename="../ui/controllers/installController.cpp" line="163"/>
         <source> installed successfully. </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/controllers/installController.cpp" line="100"/>
-        <location filename="../ui/controllers/installController.cpp" line="152"/>
+        <location filename="../ui/controllers/installController.cpp" line="113"/>
+        <location filename="../ui/controllers/installController.cpp" line="166"/>
         <source> is already installed on the server. </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/controllers/installController.cpp" line="103"/>
-        <location filename="../ui/controllers/installController.cpp" line="171"/>
+        <location filename="../ui/controllers/installController.cpp" line="116"/>
+        <location filename="../ui/controllers/installController.cpp" line="185"/>
         <source>
 Already installed containers were found on the server. All installed containers have been added to the application</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/controllers/installController.cpp" line="258"/>
+        <location filename="../ui/controllers/installController.cpp" line="266"/>
+        <source>Settings updated successfully</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/controllers/installController.cpp" line="281"/>
         <source>Server &apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/controllers/installController.cpp" line="258"/>
+        <location filename="../ui/controllers/installController.cpp" line="281"/>
         <source>&apos; was removed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/controllers/installController.cpp" line="268"/>
+        <location filename="../ui/controllers/installController.cpp" line="291"/>
         <source>All containers from server &apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/controllers/installController.cpp" line="284"/>
+        <location filename="../ui/controllers/installController.cpp" line="307"/>
         <source> has been removed from the server &apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/controllers/installController.cpp" line="408"/>
+        <location filename="../ui/controllers/installController.cpp" line="454"/>
         <source>Please login as the user</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../ui/controllers/installController.cpp" line="481"/>
+        <source>Server added successfully</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>KeyChainClass</name>
+    <message>
+        <location filename="../3rd/qtkeychain/TestAppExample/keychainclass.cpp" line="22"/>
+        <source>Read key failed: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../3rd/qtkeychain/TestAppExample/keychainclass.cpp" line="37"/>
+        <source>Write key failed: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../3rd/qtkeychain/TestAppExample/keychainclass.cpp" line="54"/>
+        <source>Delete key failed: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>NotificationHandler</name>
@@ -276,742 +239,57 @@ Already installed containers were found on the server. All installed containers
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>PageAbout</name>
-    <message>
-        <location filename="../ui/qml/Pages/PageAbout.qml" line="19"/>
-        <source>About Amnezia</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Pages/PageAbout.qml" line="26"/>
-        <source>AmneziaVPN is opensource software, it&apos;s free forever. Our goal is to make the best VPN client in the world.
-&lt;ul&gt;
-&lt;li&gt;Sources on &lt;a href=&quot;https://github.com/amnezia-vpn/desktop-client&quot;&gt;GitHub&lt;/a&gt;&lt;/li&gt;
-&lt;li&gt;&lt;a href=&quot;https://amnezia.org/&quot;&gt;Web Site&lt;/a&gt;&lt;/li&gt;
-&lt;li&gt;&lt;a href=&quot;https://t.me/amnezia_vpn_en&quot;&gt;Telegram group&lt;/a&gt;&lt;/li&gt;
-&lt;li&gt;&lt;a href=&quot;https://signal.group/#CjQKIB2gUf8QH_IXnOJMGQWMDjYz9cNfmRQipGWLFiIgc4MwEhAKBONrSiWHvoUFbbD0xwdh&quot;&gt;Signal group&lt;/a&gt;&lt;/li&gt;
-&lt;/ul&gt;
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Pages/PageAbout.qml" line="40"/>
-        <source>Support</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Pages/PageAbout.qml" line="48"/>
-        <source>Have questions? You can get support by:
-&lt;ul&gt;
-&lt;li&gt;&lt;a href=&quot;https://t.me/amnezia_vpn_en&quot;&gt;Telegram group&lt;/a&gt; (preferred way)&lt;/li&gt;
-&lt;li&gt;Create issue on &lt;a href=&quot;https://github.com/amnezia-vpn/desktop-client/issues&quot;&gt;GitHub&lt;/a&gt;&lt;/li&gt;
-&lt;li&gt;Email to: &lt;a href=&quot;support@amnezia.org&quot;&gt;support@amnezia.org&lt;/a&gt;&lt;/li&gt;
-&lt;/ul&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Pages/PageAbout.qml" line="60"/>
-        <source>Donate</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Pages/PageAbout.qml" line="78"/>
-        <source>Please support Amnezia project by donation, we really need it now more than ever.
-&lt;ul&gt;
-&lt;li&gt;By credit card on &lt;a href=&quot;https://www.patreon.com/amneziavpn&quot;&gt;Patreon&lt;/a&gt; (starting from $1)&lt;/li&gt;
-&lt;li&gt;Send some coins to addresses listed &lt;a href=&quot;https://github.com/amnezia-vpn/desktop-client/blob/master/README.md&quot;&gt;on GitHub page&lt;/a&gt;&lt;/li&gt;
-&lt;/ul&gt;
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>PageAdvancedServerSettings</name>
-    <message>
-        <location filename="../ui/qml/Pages/PageAdvancedServerSettings.qml" line="22"/>
-        <source>Advanced server settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Pages/PageAdvancedServerSettings.qml" line="94"/>
-        <source>Clients Management</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>PageAppSetting</name>
-    <message>
-        <location filename="../ui/qml/Pages/PageAppSetting.qml" line="19"/>
-        <source>Application Settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Pages/PageAppSetting.qml" line="38"/>
-        <source>Auto connect</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Pages/PageAppSetting.qml" line="48"/>
-        <source>Auto start</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Pages/PageAppSetting.qml" line="58"/>
-        <source>Start minimized</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Pages/PageAppSetting.qml" line="73"/>
-        <source>Check for updates</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Pages/PageAppSetting.qml" line="82"/>
-        <source>Keep logs</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Pages/PageAppSetting.qml" line="91"/>
-        <source>Open logs folder</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Pages/PageAppSetting.qml" line="100"/>
-        <source>Export logs</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Pages/PageAppSetting.qml" line="110"/>
-        <source>Clear logs</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Pages/PageAppSetting.qml" line="111"/>
-        <source>Cleared</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Pages/PageAppSetting.qml" line="129"/>
-        <source>Backup and restore configuration</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Pages/PageAppSetting.qml" line="136"/>
-        <source>Backup app config</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Pages/PageAppSetting.qml" line="145"/>
-        <source>Restore app config</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>PageClientInfoOpenVPN</name>
-    <message>
-        <location filename="../ui/qml/Pages/ClientInfo/PageClientInfoOpenVPN.qml" line="20"/>
-        <source>Client Info</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Pages/ClientInfo/PageClientInfoOpenVPN.qml" line="55"/>
-        <source>Client name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Pages/ClientInfo/PageClientInfoOpenVPN.qml" line="75"/>
-        <source>Certificate id</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Pages/ClientInfo/PageClientInfoOpenVPN.qml" line="89"/>
-        <source>Certificate</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Pages/ClientInfo/PageClientInfoOpenVPN.qml" line="107"/>
-        <source>Revoke Certificate</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>PageClientInfoWireGuard</name>
-    <message>
-        <location filename="../ui/qml/Pages/ClientInfo/PageClientInfoWireGuard.qml" line="20"/>
-        <source>Client Info</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Pages/ClientInfo/PageClientInfoWireGuard.qml" line="54"/>
-        <source>Client name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Pages/ClientInfo/PageClientInfoWireGuard.qml" line="74"/>
-        <source>Public Key</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Pages/ClientInfo/PageClientInfoWireGuard.qml" line="92"/>
-        <source>Revoke Key</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>PageClientManagement</name>
-    <message>
-        <location filename="../ui/qml/Pages/PageClientManagement.qml" line="23"/>
-        <source>Clients Management</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
     <name>PageDeinstalling</name>
     <message>
-        <location filename="../ui/qml/Pages2/PageDeinstalling.qml" line="59"/>
+        <location filename="../ui/qml/Pages2/PageDeinstalling.qml" line="62"/>
         <source>Removing services from </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageDeinstalling.qml" line="84"/>
+        <location filename="../ui/qml/Pages2/PageDeinstalling.qml" line="87"/>
         <source>Usually it takes no more than 5 minutes</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>PageGeneralSettings</name>
-    <message>
-        <location filename="../ui/qml/Pages/PageGeneralSettings.qml" line="48"/>
-        <source>App settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Pages/PageGeneralSettings.qml" line="64"/>
-        <source>Network settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Pages/PageGeneralSettings.qml" line="80"/>
-        <source>Server Settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Pages/PageGeneralSettings.qml" line="97"/>
-        <source>Share connection</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Pages/PageGeneralSettings.qml" line="115"/>
-        <source>Servers</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Pages/PageGeneralSettings.qml" line="132"/>
-        <source>Add server</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Pages/PageGeneralSettings.qml" line="159"/>
-        <source>Exit</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
     <name>PageHome</name>
     <message>
-        <location filename="../ui/qml/Pages2/PageHome.qml" line="158"/>
+        <location filename="../ui/qml/Pages2/PageHome.qml" line="193"/>
         <source>VPN protocol</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageHome.qml" line="204"/>
+        <location filename="../ui/qml/Pages2/PageHome.qml" line="238"/>
         <source>Servers</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>PageNetworkSetting</name>
-    <message>
-        <location filename="../ui/qml/Pages/PageNetworkSetting.qml" line="19"/>
-        <source>DNS Servers</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Pages/PageNetworkSetting.qml" line="37"/>
-        <source>Use AmneziaDNS service (recommended)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Pages/PageNetworkSetting.qml" line="48"/>
-        <source>Use AmneziaDNS container on your server, when it installed.
-
-Your AmneziaDNS server available only when it installed and VPN connected, it has internal IP address 172.29.172.254
-
-If AmneziaDNS service is not installed on the same server, or this option is unchecked, the following DNS servers will be used:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Pages/PageNetworkSetting.qml" line="55"/>
-        <source>Primary DNS server</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Pages/PageNetworkSetting.qml" line="72"/>
-        <location filename="../ui/qml/Pages/PageNetworkSetting.qml" line="101"/>
-        <source>Reset to default</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Pages/PageNetworkSetting.qml" line="84"/>
-        <source>Secondary DNS server</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>PageNewServer</name>
-    <message>
-        <location filename="../ui/qml/Pages/PageNewServer.qml" line="17"/>
-        <source>Setup your server to use VPN</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Pages/PageNewServer.qml" line="23"/>
-        <source>If you want easily configure your server just run Wizard</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Pages/PageNewServer.qml" line="30"/>
-        <source>Run Setup Wizard</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Pages/PageNewServer.qml" line="42"/>
-        <source>Press configure manually to choose VPN protocols you want to install</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Pages/PageNewServer.qml" line="49"/>
-        <source>Configure</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>PageNewServerProtocols</name>
-    <message>
-        <location filename="../ui/qml/Pages/PageNewServerProtocols.qml" line="27"/>
-        <source>Select VPN protocols</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Pages/PageNewServerProtocols.qml" line="37"/>
-        <source>Setup server</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Pages/PageNewServerProtocols.qml" line="54"/>
-        <source>Select protocol container</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Pages/PageNewServerProtocols.qml" line="134"/>
-        <source>Port</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Pages/PageNewServerProtocols.qml" line="142"/>
-        <source>Network Protocol</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Pages/PageNewServerProtocols.qml" line="148"/>
-        <source>udp</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Pages/PageNewServerProtocols.qml" line="149"/>
-        <source>tcp</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>PageProtoCloak</name>
-    <message>
-        <location filename="../ui/qml/Pages/Protocols/PageProtoCloak.qml" line="21"/>
-        <source>Cloak Settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Pages/Protocols/PageProtoCloak.qml" line="40"/>
-        <source>Cipher</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Pages/Protocols/PageProtoCloak.qml" line="48"/>
-        <source>chacha20-poly1305</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Pages/Protocols/PageProtoCloak.qml" line="49"/>
-        <source>aes-256-gcm</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Pages/Protocols/PageProtoCloak.qml" line="50"/>
-        <source>aes-192-gcm</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Pages/Protocols/PageProtoCloak.qml" line="51"/>
-        <source>aes-128-gcm</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Pages/Protocols/PageProtoCloak.qml" line="73"/>
-        <source>Fake Web Site</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Pages/Protocols/PageProtoCloak.qml" line="93"/>
-        <source>Port</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Pages/Protocols/PageProtoCloak.qml" line="178"/>
-        <source>Save and restart VPN</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Pages/Protocols/PageProtoCloak.qml" line="187"/>
-        <source>Cancel</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>PageProtoOpenVPN</name>
-    <message>
-        <location filename="../ui/qml/Pages/Protocols/PageProtoOpenVPN.qml" line="21"/>
-        <source>OpenVPN Settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Pages/Protocols/PageProtoOpenVPN.qml" line="43"/>
-        <source>VPN Addresses Subnet</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Pages/Protocols/PageProtoOpenVPN.qml" line="62"/>
-        <source>Network protocol</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Pages/Protocols/PageProtoOpenVPN.qml" line="78"/>
-        <source>TCP</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Pages/Protocols/PageProtoOpenVPN.qml" line="90"/>
-        <source>UDP</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Pages/Protocols/PageProtoOpenVPN.qml" line="106"/>
-        <source>Port</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Pages/Protocols/PageProtoOpenVPN.qml" line="127"/>
-        <source>Auto-negotiate encryption</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Pages/Protocols/PageProtoOpenVPN.qml" line="141"/>
-        <source>Cipher</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Pages/Protocols/PageProtoOpenVPN.qml" line="151"/>
-        <source>AES-256-GCM</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Pages/Protocols/PageProtoOpenVPN.qml" line="152"/>
-        <source>AES-192-GCM</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Pages/Protocols/PageProtoOpenVPN.qml" line="153"/>
-        <source>AES-128-GCM</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Pages/Protocols/PageProtoOpenVPN.qml" line="154"/>
-        <source>AES-256-CBC</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Pages/Protocols/PageProtoOpenVPN.qml" line="155"/>
-        <source>AES-192-CBC</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Pages/Protocols/PageProtoOpenVPN.qml" line="156"/>
-        <source>AES-128-CBC</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Pages/Protocols/PageProtoOpenVPN.qml" line="157"/>
-        <source>ChaCha20-Poly1305</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Pages/Protocols/PageProtoOpenVPN.qml" line="158"/>
-        <source>ARIA-256-CBC</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Pages/Protocols/PageProtoOpenVPN.qml" line="159"/>
-        <source>CAMELLIA-256-CBC</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Pages/Protocols/PageProtoOpenVPN.qml" line="160"/>
-        <source>none</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Pages/Protocols/PageProtoOpenVPN.qml" line="180"/>
-        <source>Hash</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Pages/Protocols/PageProtoOpenVPN.qml" line="189"/>
-        <source>SHA512</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Pages/Protocols/PageProtoOpenVPN.qml" line="190"/>
-        <source>SHA384</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Pages/Protocols/PageProtoOpenVPN.qml" line="191"/>
-        <source>SHA256</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Pages/Protocols/PageProtoOpenVPN.qml" line="192"/>
-        <source>SHA3-512</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Pages/Protocols/PageProtoOpenVPN.qml" line="193"/>
-        <source>SHA3-384</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Pages/Protocols/PageProtoOpenVPN.qml" line="194"/>
-        <source>SHA3-256</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Pages/Protocols/PageProtoOpenVPN.qml" line="195"/>
-        <source>whirlpool</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Pages/Protocols/PageProtoOpenVPN.qml" line="196"/>
-        <source>BLAKE2b512</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Pages/Protocols/PageProtoOpenVPN.qml" line="197"/>
-        <source>BLAKE2s256</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Pages/Protocols/PageProtoOpenVPN.qml" line="198"/>
-        <source>SHA1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Pages/Protocols/PageProtoOpenVPN.qml" line="219"/>
-        <source>Enable TLS auth</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Pages/Protocols/PageProtoOpenVPN.qml" line="232"/>
-        <source>Block DNS requests outside of VPN</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Pages/Protocols/PageProtoOpenVPN.qml" line="244"/>
-        <source>Additional client config commands →</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Pages/Protocols/PageProtoOpenVPN.qml" line="295"/>
-        <source>Additional server config commands →</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Pages/Protocols/PageProtoOpenVPN.qml" line="373"/>
-        <source>Save and restart VPN</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Pages/Protocols/PageProtoOpenVPN.qml" line="384"/>
-        <source>Cancel</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>PageProtoSftp</name>
-    <message>
-        <location filename="../ui/qml/Pages/Protocols/PageProtoSftp.qml" line="19"/>
-        <source>SFTP settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Pages/Protocols/PageProtoSftp.qml" line="47"/>
-        <source>Port</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Pages/Protocols/PageProtoSftp.qml" line="58"/>
-        <source>User Name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Pages/Protocols/PageProtoSftp.qml" line="69"/>
-        <source>Password</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Pages/Protocols/PageProtoSftp.qml" line="115"/>
-        <source>Restore drive when client starts</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Pages/Protocols/PageProtoSftp.qml" line="135"/>
-        <source>Mount drive</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>PageProtoShadowSocks</name>
-    <message>
-        <location filename="../ui/qml/Pages/Protocols/PageProtoShadowSocks.qml" line="21"/>
-        <source>ShadowSocks Settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Pages/Protocols/PageProtoShadowSocks.qml" line="42"/>
-        <source>Cipher</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Pages/Protocols/PageProtoShadowSocks.qml" line="51"/>
-        <source>chacha20-ietf-poly1305</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Pages/Protocols/PageProtoShadowSocks.qml" line="52"/>
-        <source>xchacha20-ietf-poly1305</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Pages/Protocols/PageProtoShadowSocks.qml" line="53"/>
-        <source>aes-256-gcm</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Pages/Protocols/PageProtoShadowSocks.qml" line="54"/>
-        <source>aes-192-gcm</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Pages/Protocols/PageProtoShadowSocks.qml" line="55"/>
-        <source>aes-128-gcm</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Pages/Protocols/PageProtoShadowSocks.qml" line="74"/>
-        <source>Port</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Pages/Protocols/PageProtoShadowSocks.qml" line="159"/>
-        <source>Save and restart VPN</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Pages/Protocols/PageProtoShadowSocks.qml" line="168"/>
-        <source>Cancel</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>PageProtoTorWebSite</name>
-    <message>
-        <location filename="../ui/qml/Pages/Protocols/PageProtoTorWebSite.qml" line="20"/>
-        <source>Tor Web Site settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Pages/Protocols/PageProtoTorWebSite.qml" line="41"/>
-        <source>Web site onion address</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Pages/Protocols/PageProtoTorWebSite.qml" line="60"/>
-        <source>Notes:&lt;ul&gt;
-&lt;li&gt;Use &lt;a href=&quot;https://www.torproject.org/download/&quot;&gt;Tor Browser&lt;/a&gt; to open this url.&lt;/li&gt;
-&lt;li&gt;After installation it takes several minutes while your onion site will become available in the Tor Network.&lt;/li&gt;
-&lt;li&gt;When configuring WordPress set the domain as this onion address.&lt;/li&gt;
-&lt;/ul&gt;
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>PageProtoWireGuard</name>
-    <message>
-        <location filename="../ui/qml/Pages/Protocols/PageProtoWireGuard.qml" line="19"/>
-        <source>WireGuard Settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
     <name>PageProtocolCloakSettings</name>
     <message>
-        <location filename="../ui/qml/Pages2/PageProtocolCloakSettings.qml" line="22"/>
-        <source>Settings updated successfully</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Pages2/PageProtocolCloakSettings.qml" line="84"/>
+        <location filename="../ui/qml/Pages2/PageProtocolCloakSettings.qml" line="74"/>
         <source>Cloak settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageProtocolCloakSettings.qml" line="91"/>
+        <location filename="../ui/qml/Pages2/PageProtocolCloakSettings.qml" line="81"/>
         <source>Disguised as traffic from</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageProtocolCloakSettings.qml" line="105"/>
+        <location filename="../ui/qml/Pages2/PageProtocolCloakSettings.qml" line="103"/>
         <source>Port</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../ui/qml/Pages2/PageProtocolCloakSettings.qml" line="120"/>
         <location filename="../ui/qml/Pages2/PageProtocolCloakSettings.qml" line="121"/>
-        <location filename="../ui/qml/Pages2/PageProtocolCloakSettings.qml" line="122"/>
         <source>Cipher</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageProtocolCloakSettings.qml" line="160"/>
+        <location filename="../ui/qml/Pages2/PageProtocolCloakSettings.qml" line="159"/>
         <source>Save and Restart Amnezia</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1019,195 +297,195 @@ If AmneziaDNS service is not installed on the same server, or this option is unc
 <context>
     <name>PageProtocolOpenVpnSettings</name>
     <message>
-        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="23"/>
-        <source>Settings updated successfully</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="85"/>
+        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="76"/>
         <source>OpenVPN settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="92"/>
+        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="83"/>
         <source>VPN Addresses Subnet</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="106"/>
+        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="97"/>
         <source>Network protocol</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="135"/>
+        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="126"/>
         <source>Port</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="151"/>
+        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="144"/>
         <source>Auto-negotiate encryption</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="169"/>
-        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="170"/>
+        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="161"/>
+        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="162"/>
         <source>Hash</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="178"/>
+        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="170"/>
         <source>SHA512</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="179"/>
+        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="171"/>
         <source>SHA384</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="180"/>
+        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="172"/>
         <source>SHA256</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="181"/>
+        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="173"/>
         <source>SHA3-512</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="182"/>
+        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="174"/>
         <source>SHA3-384</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="183"/>
+        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="175"/>
         <source>SHA3-256</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="184"/>
+        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="176"/>
         <source>whirlpool</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="185"/>
+        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="177"/>
         <source>BLAKE2b512</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="186"/>
+        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="178"/>
         <source>BLAKE2s256</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="187"/>
+        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="179"/>
         <source>SHA1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="216"/>
-        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="217"/>
+        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="207"/>
+        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="208"/>
         <source>Cipher</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="225"/>
+        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="216"/>
         <source>AES-256-GCM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="226"/>
+        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="217"/>
         <source>AES-192-GCM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="227"/>
+        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="218"/>
         <source>AES-128-GCM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="228"/>
+        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="219"/>
         <source>AES-256-CBC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="229"/>
+        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="220"/>
         <source>AES-192-CBC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="230"/>
+        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="221"/>
         <source>AES-128-CBC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="231"/>
+        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="222"/>
         <source>ChaCha20-Poly1305</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="232"/>
+        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="223"/>
         <source>ARIA-256-CBC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="233"/>
+        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="224"/>
         <source>CAMELLIA-256-CBC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="234"/>
+        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="225"/>
         <source>none</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="267"/>
+        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="258"/>
         <source>TLS auth</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="282"/>
+        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="273"/>
         <source>Block DNS requests outside of VPN</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="301"/>
+        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="292"/>
         <source>Additional client configuration commands</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="338"/>
-        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="396"/>
+        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="308"/>
+        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="340"/>
         <source>Commands:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="359"/>
+        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="324"/>
         <source>Additional server configuration commands</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="420"/>
+        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="359"/>
         <source>Remove OpenVPN</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="423"/>
+        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="362"/>
         <source>Remove OpenVpn from server?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="424"/>
+        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="363"/>
+        <source>All users with whom you shared a connection will no longer be able to connect to it</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="364"/>
         <source>Continue</source>
         <translation type="unfinished">Продолжить</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="425"/>
+        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="365"/>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="444"/>
+        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="384"/>
         <source>Save and Restart Amnezia</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1242,11 +520,16 @@ If AmneziaDNS service is not installed on the same server, or this option is unc
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageProtocolRaw.qml" line="177"/>
+        <source>All users with whom you shared a connection will no longer be able to connect to it</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageProtocolRaw.qml" line="178"/>
         <source>Continue</source>
         <translation type="unfinished">Продолжить</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageProtocolRaw.qml" line="178"/>
+        <location filename="../ui/qml/Pages2/PageProtocolRaw.qml" line="179"/>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1254,177 +537,96 @@ If AmneziaDNS service is not installed on the same server, or this option is unc
 <context>
     <name>PageProtocolShadowSocksSettings</name>
     <message>
-        <location filename="../ui/qml/Pages2/PageProtocolShadowSocksSettings.qml" line="22"/>
-        <source>Settings updated successfully</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Pages2/PageProtocolShadowSocksSettings.qml" line="84"/>
+        <location filename="../ui/qml/Pages2/PageProtocolShadowSocksSettings.qml" line="74"/>
         <source>ShadowSocks settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageProtocolShadowSocksSettings.qml" line="91"/>
+        <location filename="../ui/qml/Pages2/PageProtocolShadowSocksSettings.qml" line="81"/>
         <source>Port</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageProtocolShadowSocksSettings.qml" line="107"/>
-        <location filename="../ui/qml/Pages2/PageProtocolShadowSocksSettings.qml" line="108"/>
+        <location filename="../ui/qml/Pages2/PageProtocolShadowSocksSettings.qml" line="98"/>
+        <location filename="../ui/qml/Pages2/PageProtocolShadowSocksSettings.qml" line="99"/>
         <source>Cipher</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageProtocolShadowSocksSettings.qml" line="146"/>
+        <location filename="../ui/qml/Pages2/PageProtocolShadowSocksSettings.qml" line="137"/>
         <source>Save and Restart Amnezia</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>PageQrDecoderIos</name>
-    <message>
-        <location filename="../ui/qml/Pages/PageQrDecoderIos.qml" line="24"/>
-        <source>Import configuration</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>PageServerConfiguringProgress</name>
-    <message>
-        <location filename="../ui/qml/Pages/PageServerConfiguringProgress.qml" line="15"/>
-        <source>Configuring...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Pages/PageServerConfiguringProgress.qml" line="25"/>
-        <source>Please wait.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Pages/PageServerConfiguringProgress.qml" line="67"/>
-        <source>Cancel</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
     <name>PageServerContainers</name>
     <message>
-        <location filename="../ui/qml/Pages/PageServerContainers.qml" line="39"/>
-        <location filename="../ui/qml/Pages/PageServerContainers.qml" line="430"/>
-        <source>Install new service</source>
+        <source>Continue</source>
+        <translation type="obsolete">Продолжить</translation>
+    </message>
+</context>
+<context>
+    <name>PageServiceDnsSettings</name>
+    <message>
+        <location filename="../ui/qml/Pages2/PageServiceDnsSettings.qml" line="52"/>
+        <source>A DNS service is installed on your server, and it is only accessible via VPN.
+</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages/PageServerContainers.qml" line="39"/>
-        <source>Installed services</source>
+        <location filename="../ui/qml/Pages2/PageServiceDnsSettings.qml" line="53"/>
+        <source>The DNS address is the same as the address of your server. You can configure DNS in the settings, under the connections tab.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages/PageServerContainers.qml" line="55"/>
-        <source>Default</source>
+        <location filename="../ui/qml/Pages2/PageServiceDnsSettings.qml" line="62"/>
+        <location filename="../ui/qml/Pages2/PageServiceDnsSettings.qml" line="66"/>
+        <source>Remove </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages/PageServerContainers.qml" line="120"/>
-        <source>Port</source>
+        <location filename="../ui/qml/Pages2/PageServiceDnsSettings.qml" line="66"/>
+        <source> from server?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages/PageServerContainers.qml" line="128"/>
-        <source>Network Protocol</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Pages/PageServerContainers.qml" line="134"/>
-        <source>udp</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Pages/PageServerContainers.qml" line="135"/>
-        <source>tcp</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Pages/PageServerContainers.qml" line="151"/>
-        <source>Cancel</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Pages/PageServerContainers.qml" line="167"/>
+        <location filename="../ui/qml/Pages2/PageServiceDnsSettings.qml" line="67"/>
         <source>Continue</source>
         <translation type="unfinished">Продолжить</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages/PageServerContainers.qml" line="196"/>
-        <source>Installed Protocols and Services</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Pages/PageServerContainers.qml" line="306"/>
-        <source>Remove container</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Pages/PageServerContainers.qml" line="306"/>
-        <source>This action will erase all data of this container on the server.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>PageServerList</name>
-    <message>
-        <location filename="../ui/qml/Pages/PageServerList.qml" line="19"/>
-        <source>Servers</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>PageServerSettings</name>
-    <message>
-        <location filename="../ui/qml/Pages/PageServerSettings.qml" line="22"/>
-        <source>Server settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Pages/PageServerSettings.qml" line="71"/>
-        <source>Protocols and Services</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Pages/PageServerSettings.qml" line="82"/>
-        <source>Share Server (FULL ACCESS)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Pages/PageServerSettings.qml" line="92"/>
-        <source>Advanced server settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Pages/PageServerSettings.qml" line="111"/>
-        <source>Forget this server</source>
+        <location filename="../ui/qml/Pages2/PageServiceDnsSettings.qml" line="68"/>
+        <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PageServiceSftpSettings</name>
     <message>
-        <location filename="../ui/qml/Pages2/PageServiceSftpSettings.qml" line="24"/>
+        <location filename="../ui/qml/Pages2/PageServiceSftpSettings.qml" line="22"/>
         <source>Settings updated successfully</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageServiceSftpSettings.qml" line="85"/>
+        <location filename="../ui/qml/Pages2/PageServiceSftpSettings.qml" line="83"/>
         <source>SFTP settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageServiceSftpSettings.qml" line="92"/>
+        <location filename="../ui/qml/Pages2/PageServiceSftpSettings.qml" line="90"/>
         <source>Host</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageServiceSftpSettings.qml" line="108"/>
+        <location filename="../ui/qml/Pages2/PageServiceSftpSettings.qml" line="100"/>
+        <location filename="../ui/qml/Pages2/PageServiceSftpSettings.qml" line="117"/>
+        <location filename="../ui/qml/Pages2/PageServiceSftpSettings.qml" line="134"/>
+        <location filename="../ui/qml/Pages2/PageServiceSftpSettings.qml" line="151"/>
+        <source>Copied</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageServiceSftpSettings.qml" line="107"/>
         <source>Port</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1434,54 +636,54 @@ If AmneziaDNS service is not installed on the same server, or this option is unc
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageServiceSftpSettings.qml" line="140"/>
+        <location filename="../ui/qml/Pages2/PageServiceSftpSettings.qml" line="141"/>
         <source>Password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageServiceSftpSettings.qml" line="179"/>
+        <location filename="../ui/qml/Pages2/PageServiceSftpSettings.qml" line="183"/>
         <source>Mount folder on device</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageServiceSftpSettings.qml" line="202"/>
+        <location filename="../ui/qml/Pages2/PageServiceSftpSettings.qml" line="208"/>
         <source>In order to mount remote SFTP folder as local drive, perform following steps: &lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageServiceSftpSettings.qml" line="204"/>
-        <location filename="../ui/qml/Pages2/PageServiceSftpSettings.qml" line="207"/>
+        <location filename="../ui/qml/Pages2/PageServiceSftpSettings.qml" line="210"/>
+        <location filename="../ui/qml/Pages2/PageServiceSftpSettings.qml" line="213"/>
         <source>&lt;br&gt;1. Install the latest version of </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageServiceSftpSettings.qml" line="205"/>
-        <location filename="../ui/qml/Pages2/PageServiceSftpSettings.qml" line="208"/>
+        <location filename="../ui/qml/Pages2/PageServiceSftpSettings.qml" line="211"/>
+        <location filename="../ui/qml/Pages2/PageServiceSftpSettings.qml" line="214"/>
         <source>&lt;br&gt;2. Install the latest version of </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageServiceSftpSettings.qml" line="229"/>
+        <location filename="../ui/qml/Pages2/PageServiceSftpSettings.qml" line="242"/>
         <source>Detailed instructions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageServiceSftpSettings.qml" line="247"/>
+        <location filename="../ui/qml/Pages2/PageServiceSftpSettings.qml" line="260"/>
         <source>Remove SFTP and all data stored there</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageServiceSftpSettings.qml" line="250"/>
-        <source>Some description</source>
+        <location filename="../ui/qml/Pages2/PageServiceSftpSettings.qml" line="263"/>
+        <source>Remove SFTP and all data stored there?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageServiceSftpSettings.qml" line="251"/>
+        <location filename="../ui/qml/Pages2/PageServiceSftpSettings.qml" line="264"/>
         <source>Continue</source>
         <translation type="unfinished">Продолжить</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageServiceSftpSettings.qml" line="252"/>
+        <location filename="../ui/qml/Pages2/PageServiceSftpSettings.qml" line="265"/>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1489,52 +691,57 @@ If AmneziaDNS service is not installed on the same server, or this option is unc
 <context>
     <name>PageServiceTorWebsiteSettings</name>
     <message>
-        <location filename="../ui/qml/Pages2/PageServiceTorWebsiteSettings.qml" line="25"/>
+        <location filename="../ui/qml/Pages2/PageServiceTorWebsiteSettings.qml" line="23"/>
         <source>Settings updated successfully</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageServiceTorWebsiteSettings.qml" line="62"/>
+        <location filename="../ui/qml/Pages2/PageServiceTorWebsiteSettings.qml" line="60"/>
         <source>Tor website settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageServiceTorWebsiteSettings.qml" line="69"/>
+        <location filename="../ui/qml/Pages2/PageServiceTorWebsiteSettings.qml" line="67"/>
         <source>Website address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageServiceTorWebsiteSettings.qml" line="107"/>
+        <location filename="../ui/qml/Pages2/PageServiceTorWebsiteSettings.qml" line="82"/>
+        <source>Copied</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageServiceTorWebsiteSettings.qml" line="106"/>
         <source>Use &lt;a href=&quot;https://www.torproject.org/download/&quot; style=&quot;color: #FBB26A;&quot;&gt;Tor Browser&lt;/a&gt; to open this url.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageServiceTorWebsiteSettings.qml" line="116"/>
+        <location filename="../ui/qml/Pages2/PageServiceTorWebsiteSettings.qml" line="115"/>
         <source>After installation it takes several minutes while your onion site will become available in the Tor Network.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageServiceTorWebsiteSettings.qml" line="125"/>
+        <location filename="../ui/qml/Pages2/PageServiceTorWebsiteSettings.qml" line="124"/>
         <source>When configuring WordPress set the domain as this onion address.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageServiceTorWebsiteSettings.qml" line="139"/>
+        <location filename="../ui/qml/Pages2/PageServiceTorWebsiteSettings.qml" line="138"/>
         <source>Remove website</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageServiceTorWebsiteSettings.qml" line="142"/>
-        <source>Some description</source>
+        <location filename="../ui/qml/Pages2/PageServiceTorWebsiteSettings.qml" line="141"/>
+        <source>The site with all data will be removed from the tor network.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageServiceTorWebsiteSettings.qml" line="143"/>
+        <location filename="../ui/qml/Pages2/PageServiceTorWebsiteSettings.qml" line="142"/>
         <source>Continue</source>
         <translation type="unfinished">Продолжить</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageServiceTorWebsiteSettings.qml" line="144"/>
+        <location filename="../ui/qml/Pages2/PageServiceTorWebsiteSettings.qml" line="143"/>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1542,32 +749,32 @@ If AmneziaDNS service is not installed on the same server, or this option is unc
 <context>
     <name>PageSettings</name>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettings.qml" line="35"/>
+        <location filename="../ui/qml/Pages2/PageSettings.qml" line="37"/>
         <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettings.qml" line="42"/>
+        <location filename="../ui/qml/Pages2/PageSettings.qml" line="44"/>
         <source>Servers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettings.qml" line="56"/>
+        <location filename="../ui/qml/Pages2/PageSettings.qml" line="58"/>
         <source>Connection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettings.qml" line="70"/>
+        <location filename="../ui/qml/Pages2/PageSettings.qml" line="72"/>
         <source>Application</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettings.qml" line="84"/>
+        <location filename="../ui/qml/Pages2/PageSettings.qml" line="86"/>
         <source>Backup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettings.qml" line="98"/>
+        <location filename="../ui/qml/Pages2/PageSettings.qml" line="100"/>
         <source>About AmneziaVPN</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1591,47 +798,67 @@ And if you don&apos;t like the app, all the more support it - the donation will
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsAbout.qml" line="101"/>
+        <location filename="../ui/qml/Pages2/PageSettingsAbout.qml" line="85"/>
+        <source>https://www.patreon.com/amneziavpn</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsAbout.qml" line="102"/>
         <source>Show other methods on Github</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsAbout.qml" line="112"/>
+        <location filename="../ui/qml/Pages2/PageSettingsAbout.qml" line="113"/>
         <source>Contacts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsAbout.qml" line="119"/>
+        <location filename="../ui/qml/Pages2/PageSettingsAbout.qml" line="120"/>
         <source>Telegram group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsAbout.qml" line="120"/>
+        <location filename="../ui/qml/Pages2/PageSettingsAbout.qml" line="121"/>
         <source>To discuss features</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsAbout.qml" line="133"/>
-        <source>Mail</source>
+        <location filename="../ui/qml/Pages2/PageSettingsAbout.qml" line="125"/>
+        <source>https://t.me/amnezia_vpn_en</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsAbout.qml" line="134"/>
+        <source>Mail</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsAbout.qml" line="135"/>
         <source>For reviews and bug reports</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsAbout.qml" line="146"/>
+        <location filename="../ui/qml/Pages2/PageSettingsAbout.qml" line="147"/>
         <source>Github</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsAbout.qml" line="159"/>
+        <location filename="../ui/qml/Pages2/PageSettingsAbout.qml" line="151"/>
+        <source>https://github.com/amnezia-vpn/amnezia-client</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsAbout.qml" line="160"/>
         <source>Website</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsAbout.qml" line="190"/>
+        <location filename="../ui/qml/Pages2/PageSettingsAbout.qml" line="164"/>
+        <source>https://amnezia.org</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsAbout.qml" line="192"/>
         <source>Check for updates</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1644,47 +871,72 @@ And if you don&apos;t like the app, all the more support it - the donation will
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="50"/>
+        <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="52"/>
+        <source>Auto start</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="53"/>
+        <source>Launch the application every time </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="53"/>
+        <source> starts</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="73"/>
+        <source>Start minimized</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="74"/>
+        <source>Launch application minimized</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="91"/>
         <source>Language</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="69"/>
+        <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="110"/>
         <source>Logging</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="70"/>
+        <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="111"/>
         <source>Enabled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="70"/>
+        <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="111"/>
         <source>Disabled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="83"/>
+        <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="124"/>
         <source>Reset settings and remove all data from the application</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="87"/>
+        <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="128"/>
         <source>Reset settings and remove all data from the application?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="88"/>
+        <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="129"/>
         <source>All settings will be reset to default. All installed AmneziaVPN services will still remain on the server.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="89"/>
+        <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="130"/>
         <source>Continue</source>
         <translation type="unfinished">Продолжить</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="90"/>
+        <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="131"/>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1692,35 +944,71 @@ And if you don&apos;t like the app, all the more support it - the donation will
 <context>
     <name>PageSettingsBackup</name>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsBackup.qml" line="58"/>
+        <location filename="../ui/qml/Pages2/PageSettingsBackup.qml" line="66"/>
         <source>Backup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsBackup.qml" line="23"/>
+        <location filename="../ui/qml/Pages2/PageSettingsBackup.qml" line="27"/>
         <source>Settings restored from backup file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsBackup.qml" line="65"/>
+        <location filename="../ui/qml/Pages2/PageSettingsBackup.qml" line="73"/>
         <source>Configuration backup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsBackup.qml" line="72"/>
+        <location filename="../ui/qml/Pages2/PageSettingsBackup.qml" line="80"/>
         <source>It will help you instantly restore connection settings at the next installation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsBackup.qml" line="80"/>
+        <location filename="../ui/qml/Pages2/PageSettingsBackup.qml" line="89"/>
         <source>Make a backup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsBackup.qml" line="100"/>
+        <location filename="../ui/qml/Pages2/PageSettingsBackup.qml" line="96"/>
+        <source>Save backup file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsBackup.qml" line="97"/>
+        <location filename="../ui/qml/Pages2/PageSettingsBackup.qml" line="125"/>
+        <source>Backup files (*.backup)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsBackup.qml" line="121"/>
         <source>Restore from backup</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsBackup.qml" line="124"/>
+        <source>Open backup file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsBackup.qml" line="135"/>
+        <source>Import settings from a backup file?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsBackup.qml" line="136"/>
+        <source>All current settings will be reset</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsBackup.qml" line="137"/>
+        <source>Continue</source>
+        <translation type="unfinished">Продолжить</translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsBackup.qml" line="138"/>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PageSettingsConnection</name>
@@ -1729,43 +1017,48 @@ And if you don&apos;t like the app, all the more support it - the donation will
         <source>Connection</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsConnection.qml" line="50"/>
+        <source>Auto connect</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsConnection.qml" line="51"/>
+        <source>Connect to VPN on app start</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsConnection.qml" line="69"/>
         <source>Use AmneziaDNS if installed on the server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsConnection.qml" line="52"/>
-        <source>Internal IP address 172.29.172.254</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Pages2/PageSettingsConnection.qml" line="67"/>
+        <location filename="../ui/qml/Pages2/PageSettingsConnection.qml" line="84"/>
         <source>DNS servers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsConnection.qml" line="68"/>
+        <location filename="../ui/qml/Pages2/PageSettingsConnection.qml" line="85"/>
         <source>If AmneziaDNS is not used or installed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsConnection.qml" line="81"/>
+        <location filename="../ui/qml/Pages2/PageSettingsConnection.qml" line="98"/>
         <source>Split site tunneling</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsConnection.qml" line="82"/>
+        <location filename="../ui/qml/Pages2/PageSettingsConnection.qml" line="99"/>
         <source>Allows you to connect to some sites through a secure connection, and to others bypassing it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsConnection.qml" line="94"/>
+        <location filename="../ui/qml/Pages2/PageSettingsConnection.qml" line="112"/>
         <source>Separate application tunneling</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsConnection.qml" line="95"/>
+        <location filename="../ui/qml/Pages2/PageSettingsConnection.qml" line="113"/>
         <source>Allows you to use the VPN only for certain applications</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1773,45 +1066,101 @@ And if you don&apos;t like the app, all the more support it - the donation will
 <context>
     <name>PageSettingsDns</name>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsDns.qml" line="44"/>
+        <location filename="../ui/qml/Pages2/PageSettingsDns.qml" line="45"/>
         <source>DNS servers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsDns.qml" line="48"/>
+        <location filename="../ui/qml/Pages2/PageSettingsDns.qml" line="49"/>
         <source>If AmneziaDNS is not used or installed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsDns.qml" line="78"/>
+        <location filename="../ui/qml/Pages2/PageSettingsDns.qml" line="86"/>
+        <source>Restore default</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsDns.qml" line="89"/>
+        <source>Restore default DNS settings?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsDns.qml" line="90"/>
+        <source>Continue</source>
+        <translation type="unfinished">Продолжить</translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsDns.qml" line="91"/>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsDns.qml" line="99"/>
+        <source>Settings have been reset</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsDns.qml" line="111"/>
         <source>Save</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsDns.qml" line="120"/>
+        <source>Settings saved</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PageSettingsLogging</name>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsLogging.qml" line="44"/>
+        <location filename="../ui/qml/Pages2/PageSettingsLogging.qml" line="47"/>
         <source>Logging</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsLogging.qml" line="51"/>
+        <location filename="../ui/qml/Pages2/PageSettingsLogging.qml" line="54"/>
+        <location filename="../ui/qml/Pages2/PageSettingsLogging.qml" line="108"/>
         <source>Save logs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsLogging.qml" line="83"/>
+        <location filename="../ui/qml/Pages2/PageSettingsLogging.qml" line="86"/>
         <source>Open folder with logs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsLogging.qml" line="107"/>
+        <location filename="../ui/qml/Pages2/PageSettingsLogging.qml" line="109"/>
+        <source>Logs files (*.log)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsLogging.qml" line="126"/>
         <source>Save logs to file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsLogging.qml" line="131"/>
+        <location filename="../ui/qml/Pages2/PageSettingsLogging.qml" line="144"/>
+        <source>Clear logs?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsLogging.qml" line="145"/>
+        <source>Continue</source>
+        <translation type="unfinished">Продолжить</translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsLogging.qml" line="146"/>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsLogging.qml" line="153"/>
+        <source>Logs have been cleaned up</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsLogging.qml" line="166"/>
         <source>Clear logs</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1824,109 +1173,109 @@ And if you don&apos;t like the app, all the more support it - the donation will
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsServerData.qml" line="25"/>
-        <source>No installed containers found</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Pages2/PageSettingsServerData.qml" line="80"/>
+        <location filename="../ui/qml/Pages2/PageSettingsServerData.qml" line="87"/>
         <source>Clear Amnezia cache</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsServerData.qml" line="81"/>
+        <location filename="../ui/qml/Pages2/PageSettingsServerData.qml" line="88"/>
         <source>May be needed when changing other settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsServerData.qml" line="84"/>
+        <location filename="../ui/qml/Pages2/PageSettingsServerData.qml" line="91"/>
         <source>Clear cached profiles?</source>
         <translation>Очистить закешированные профили</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsServerData.qml" line="85"/>
-        <source>some description</source>
+        <location filename="../ui/qml/Pages2/PageSettingsServerData.qml" line="25"/>
+        <source>No new installed containers found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsServerData.qml" line="86"/>
-        <location filename="../ui/qml/Pages2/PageSettingsServerData.qml" line="131"/>
-        <location filename="../ui/qml/Pages2/PageSettingsServerData.qml" line="162"/>
+        <location filename="../ui/qml/Pages2/PageSettingsServerData.qml" line="92"/>
+        <source></source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsServerData.qml" line="93"/>
+        <location filename="../ui/qml/Pages2/PageSettingsServerData.qml" line="140"/>
+        <location filename="../ui/qml/Pages2/PageSettingsServerData.qml" line="171"/>
         <source>Continue</source>
         <translation>Продолжить</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsServerData.qml" line="87"/>
-        <location filename="../ui/qml/Pages2/PageSettingsServerData.qml" line="132"/>
-        <location filename="../ui/qml/Pages2/PageSettingsServerData.qml" line="163"/>
+        <location filename="../ui/qml/Pages2/PageSettingsServerData.qml" line="94"/>
+        <location filename="../ui/qml/Pages2/PageSettingsServerData.qml" line="141"/>
+        <location filename="../ui/qml/Pages2/PageSettingsServerData.qml" line="172"/>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsServerData.qml" line="108"/>
+        <location filename="../ui/qml/Pages2/PageSettingsServerData.qml" line="117"/>
         <source>Check the server for previously installed Amnezia services</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsServerData.qml" line="109"/>
+        <location filename="../ui/qml/Pages2/PageSettingsServerData.qml" line="118"/>
         <source>Add them to the application if they were not displayed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsServerData.qml" line="125"/>
+        <location filename="../ui/qml/Pages2/PageSettingsServerData.qml" line="134"/>
         <source>Remove server from application</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsServerData.qml" line="129"/>
+        <location filename="../ui/qml/Pages2/PageSettingsServerData.qml" line="138"/>
         <source>Remove server?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsServerData.qml" line="130"/>
+        <location filename="../ui/qml/Pages2/PageSettingsServerData.qml" line="139"/>
         <source>All installed AmneziaVPN services will still remain on the server.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsServerData.qml" line="156"/>
+        <location filename="../ui/qml/Pages2/PageSettingsServerData.qml" line="165"/>
         <source>Clear server from Amnezia software</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsServerData.qml" line="160"/>
+        <location filename="../ui/qml/Pages2/PageSettingsServerData.qml" line="169"/>
         <source>Clear server from Amnezia software?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsServerData.qml" line="161"/>
-        <source> All containers will be deleted on the server. This means that configuration files, keys and certificates will be deleted.</source>
+        <location filename="../ui/qml/Pages2/PageSettingsServerData.qml" line="170"/>
+        <source>All containers will be deleted on the server. This means that configuration files, keys and certificates will be deleted.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PageSettingsServerInfo</name>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsServerInfo.qml" line="94"/>
+        <location filename="../ui/qml/Pages2/PageSettingsServerInfo.qml" line="102"/>
         <source>Server name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsServerInfo.qml" line="109"/>
+        <location filename="../ui/qml/Pages2/PageSettingsServerInfo.qml" line="110"/>
         <source>Save</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsServerInfo.qml" line="136"/>
+        <location filename="../ui/qml/Pages2/PageSettingsServerInfo.qml" line="137"/>
         <source>Protocols</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsServerInfo.qml" line="142"/>
+        <location filename="../ui/qml/Pages2/PageSettingsServerInfo.qml" line="143"/>
         <source>Services</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsServerInfo.qml" line="146"/>
+        <location filename="../ui/qml/Pages2/PageSettingsServerInfo.qml" line="147"/>
         <source>Data</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1939,23 +1288,28 @@ And if you don&apos;t like the app, all the more support it - the donation will
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsServerProtocol.qml" line="111"/>
-        <location filename="../ui/qml/Pages2/PageSettingsServerProtocol.qml" line="115"/>
+        <location filename="../ui/qml/Pages2/PageSettingsServerProtocol.qml" line="112"/>
+        <location filename="../ui/qml/Pages2/PageSettingsServerProtocol.qml" line="116"/>
         <source>Remove </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsServerProtocol.qml" line="115"/>
+        <location filename="../ui/qml/Pages2/PageSettingsServerProtocol.qml" line="116"/>
         <source> from server?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsServerProtocol.qml" line="116"/>
+        <location filename="../ui/qml/Pages2/PageSettingsServerProtocol.qml" line="117"/>
+        <source>All users with whom you shared a connection will no longer be able to connect to it</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsServerProtocol.qml" line="118"/>
         <source>Continue</source>
         <translation type="unfinished">Продолжить</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsServerProtocol.qml" line="117"/>
+        <location filename="../ui/qml/Pages2/PageSettingsServerProtocol.qml" line="119"/>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1969,85 +1323,137 @@ And if you don&apos;t like the app, all the more support it - the donation will
     </message>
 </context>
 <context>
-    <name>PageSetupWizard</name>
+    <name>PageSettingsSplitTunneling</name>
     <message>
-        <location filename="../ui/qml/Pages/PageSetupWizard.qml" line="19"/>
-        <source>Setup your server to use VPN</source>
+        <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="49"/>
+        <source>Only the addresses in the list must be opened via VPN</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages/PageSetupWizard.qml" line="39"/>
-        <source>High censorship level</source>
+        <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="54"/>
+        <source>Addresses from the list should never be opened via VPN</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages/PageSetupWizard.qml" line="49"/>
-        <source>I&apos;m living in a country with a high censorship level. Many of the foreign websites and VPNs are blocked by my government. I want to setup a reliable VPN, which can not be detected by my internet provider and my government.
-OpenVPN and ShadowSocks over Cloak (VPN obfuscation) profiles will be installed.
-</source>
+        <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="84"/>
+        <source>Split site tunneling</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages/PageSetupWizard.qml" line="57"/>
-        <source>Medium censorship level</source>
+        <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="120"/>
+        <source>Mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages/PageSetupWizard.qml" line="67"/>
-        <source>I&apos;m living in a country with a medium censorship level. Some websites are blocked by my government, but VPNs are not blocked at all. I want to setup a flexible solution.
-OpenVPN over ShadowSocks profile will be installed.
-</source>
+        <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="198"/>
+        <source>Remove </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages/PageSetupWizard.qml" line="75"/>
-        <source>Low censorship level</source>
+        <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="199"/>
+        <source>Continue</source>
+        <translation type="unfinished">Продолжить</translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="200"/>
+        <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages/PageSetupWizard.qml" line="85"/>
-        <source>I want to improve my privacy on the internet.
-OpenVPN profile will be installed.
-</source>
+        <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="238"/>
+        <source>Site or IP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages/PageSetupWizard.qml" line="97"/>
-        <source>Next</source>
+        <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="282"/>
+        <source>Import/Export Sites</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="288"/>
+        <source>Import</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="300"/>
+        <source>Save site list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="307"/>
+        <source>Save sites</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="308"/>
+        <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="375"/>
+        <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="390"/>
+        <source>Sites files (*.json)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="365"/>
+        <source>Import a list of sites</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="371"/>
+        <source>Replace site list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="374"/>
+        <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="389"/>
+        <source>Open sites file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="386"/>
+        <source>Add imported sites to existing ones</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PageSetupWizardConfigSource</name>
     <message>
-        <location filename="../ui/qml/Pages2/PageSetupWizardConfigSource.qml" line="49"/>
+        <location filename="../ui/qml/Pages2/PageSetupWizardConfigSource.qml" line="50"/>
         <source>Server connection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSetupWizardConfigSource.qml" line="50"/>
+        <location filename="../ui/qml/Pages2/PageSetupWizardConfigSource.qml" line="51"/>
         <source>Do not use connection code from public sources. It may have been created to intercept your data.
 
-It&apos;s okay if a friend passed the code.</source>
+It&apos;s okay as long as it&apos;s from someone you trust.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSetupWizardConfigSource.qml" line="60"/>
+        <location filename="../ui/qml/Pages2/PageSetupWizardConfigSource.qml" line="61"/>
         <source>What do you have?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSetupWizardConfigSource.qml" line="67"/>
+        <location filename="../ui/qml/Pages2/PageSetupWizardConfigSource.qml" line="68"/>
         <source>File with connection settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSetupWizardConfigSource.qml" line="83"/>
+        <location filename="../ui/qml/Pages2/PageSetupWizardConfigSource.qml" line="68"/>
+        <source>File with connection settings or backup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSetupWizardConfigSource.qml" line="75"/>
+        <source>Open config file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSetupWizardConfigSource.qml" line="95"/>
         <source>QR-code</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSetupWizardConfigSource.qml" line="100"/>
+        <location filename="../ui/qml/Pages2/PageSetupWizardConfigSource.qml" line="114"/>
         <source>Key as text</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2070,43 +1476,37 @@ It&apos;s okay if a friend passed the code.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSetupWizardCredentials.qml" line="56"/>
-        <location filename="../ui/qml/Pages2/PageSetupWizardCredentials.qml" line="70"/>
-        <source>Insert</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Pages2/PageSetupWizardCredentials.qml" line="84"/>
+        <location filename="../ui/qml/Pages2/PageSetupWizardCredentials.qml" line="76"/>
         <source>Password / SSH private key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSetupWizardCredentials.qml" line="97"/>
+        <location filename="../ui/qml/Pages2/PageSetupWizardCredentials.qml" line="90"/>
         <source>Continue</source>
         <translation type="unfinished">Продолжить</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSetupWizardCredentials.qml" line="152"/>
+        <location filename="../ui/qml/Pages2/PageSetupWizardCredentials.qml" line="120"/>
         <source>Enter the address in the format 255.255.255.255:88</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSetupWizardCredentials.qml" line="68"/>
+        <location filename="../ui/qml/Pages2/PageSetupWizardCredentials.qml" line="66"/>
         <source>Login to connect via SSH</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSetupWizardCredentials.qml" line="149"/>
+        <location filename="../ui/qml/Pages2/PageSetupWizardCredentials.qml" line="117"/>
         <source>Ip address cannot be empty</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSetupWizardCredentials.qml" line="156"/>
+        <location filename="../ui/qml/Pages2/PageSetupWizardCredentials.qml" line="124"/>
         <source>Login cannot be empty</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSetupWizardCredentials.qml" line="160"/>
+        <location filename="../ui/qml/Pages2/PageSetupWizardCredentials.qml" line="128"/>
         <source>Password/private key cannot be empty</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2119,123 +1519,60 @@ It&apos;s okay if a friend passed the code.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSetupWizardEasy.qml" line="132"/>
+        <location filename="../ui/qml/Pages2/PageSetupWizardEasy.qml" line="136"/>
         <source>Set up a VPN yourself</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSetupWizardEasy.qml" line="133"/>
+        <location filename="../ui/qml/Pages2/PageSetupWizardEasy.qml" line="137"/>
         <source>I want to choose a VPN protocol</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSetupWizardEasy.qml" line="148"/>
+        <location filename="../ui/qml/Pages2/PageSetupWizardEasy.qml" line="157"/>
         <source>Continue</source>
         <translation type="unfinished">Продолжить</translation>
     </message>
-</context>
-<context>
-    <name>PageSetupWizardHighLevel</name>
     <message>
-        <location filename="../ui/qml/Pages/PageSetupWizardHighLevel.qml" line="19"/>
-        <source>Setup Wizard</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Pages/PageSetupWizardHighLevel.qml" line="39"/>
-        <source>AmneziaVPN will install a VPN protocol which is not visible to your internet provider and government firewall. Your VPN connection will be seen by your internet provider as regular web traffic to a particular website.
-
-You SHOULD set this website address to some foreign website which is not blocked by your internet provider. In other words, you need to type some foreign website address which is accessible to you without a VPN.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Pages/PageSetupWizardHighLevel.qml" line="48"/>
-        <source>Type another web site address for masking or keep it by default. Your internet provider will think you working on this web site when you connected to VPN.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Pages/PageSetupWizardHighLevel.qml" line="74"/>
-        <source>OpenVPN and ShadowSocks over Cloak (VPN obfuscation) profiles will be installed.
-
-This protocol support exporting connection profiles to mobile devices by exporting ShadowSocks and Cloak configs (you should launch the 3rd party open source VPN client - ShadowSocks VPN and install Cloak plugin).</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Pages/PageSetupWizardHighLevel.qml" line="87"/>
-        <source>Next</source>
+        <location filename="../ui/qml/Pages2/PageSetupWizardEasy.qml" line="186"/>
+        <source>Set up later</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PageSetupWizardInstalling</name>
     <message>
-        <location filename="../ui/qml/Pages2/PageSetupWizardInstalling.qml" line="52"/>
+        <location filename="../ui/qml/Pages2/PageSetupWizardInstalling.qml" line="61"/>
         <source>The server has already been added to the application</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSetupWizardInstalling.qml" line="106"/>
+        <location filename="../ui/qml/Pages2/PageSetupWizardInstalling.qml" line="66"/>
+        <source>Amnesia has detected that your server is currently </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSetupWizardInstalling.qml" line="67"/>
+        <source>busy installing other software. Amnesia installation </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSetupWizardInstalling.qml" line="68"/>
+        <source>will pause until the server finishes installing other software</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSetupWizardInstalling.qml" line="125"/>
         <source>Installing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSetupWizardInstalling.qml" line="132"/>
+        <location filename="../ui/qml/Pages2/PageSetupWizardInstalling.qml" line="21"/>
+        <location filename="../ui/qml/Pages2/PageSetupWizardInstalling.qml" line="71"/>
         <source>Usually it takes no more than 5 minutes</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>PageSetupWizardLowLevel</name>
-    <message>
-        <location filename="../ui/qml/Pages/PageSetupWizardLowLevel.qml" line="19"/>
-        <source>Setup Wizard</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Pages/PageSetupWizardLowLevel.qml" line="39"/>
-        <source>AmneziaVPN will install the OpenVPN protocol with public/private key pairs generated on both server and client sides.
-
-You can also configure the connection on your mobile device by copying the exported &quot;.ovpn&quot; file to your device, and setting up the official OpenVPN client.
-
-We recommend not to use messaging applications for sending the connection profile - it contains VPN private keys.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Pages/PageSetupWizardLowLevel.qml" line="48"/>
-        <source>OpenVPN profile will be installed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Pages/PageSetupWizardLowLevel.qml" line="60"/>
-        <source>Start configuring</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>PageSetupWizardMediumLevel</name>
-    <message>
-        <location filename="../ui/qml/Pages/PageSetupWizardMediumLevel.qml" line="19"/>
-        <source>Setup Wizard</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Pages/PageSetupWizardMediumLevel.qml" line="39"/>
-        <source>AmneziaVPN will install a VPN protocol which is difficult to detect by your internet provider and government firewall (but possible). In most cases, this is the most suitable protocol. This protocol is faster compared to the VPN protocols with &quot;VPN masking&quot;.
-
-This protocol supports exporting connection profiles to mobile devices by using QR codes (you should launch the 3rd party open source VPN client - ShadowSocks VPN).</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Pages/PageSetupWizardMediumLevel.qml" line="44"/>
-        <source>OpenVPN over ShadowSocks profile will be installed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Pages/PageSetupWizardMediumLevel.qml" line="55"/>
-        <source>Next</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
     <name>PageSetupWizardProtocolSettings</name>
     <message>
@@ -2243,38 +1580,28 @@ This protocol supports exporting connection profiles to mobile devices by using
         <source>Installing </source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../ui/qml/Pages2/PageSetupWizardProtocolSettings.qml" line="76"/>
-        <source>protocol description</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSetupWizardProtocolSettings.qml" line="93"/>
         <source>More detailed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSetupWizardProtocolSettings.qml" line="162"/>
-        <source>detailed protocol description</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Pages2/PageSetupWizardProtocolSettings.qml" line="182"/>
+        <location filename="../ui/qml/Pages2/PageSetupWizardProtocolSettings.qml" line="183"/>
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSetupWizardProtocolSettings.qml" line="197"/>
+        <location filename="../ui/qml/Pages2/PageSetupWizardProtocolSettings.qml" line="198"/>
         <source>Network protocol</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSetupWizardProtocolSettings.qml" line="213"/>
+        <location filename="../ui/qml/Pages2/PageSetupWizardProtocolSettings.qml" line="214"/>
         <source>Port</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSetupWizardProtocolSettings.qml" line="227"/>
+        <location filename="../ui/qml/Pages2/PageSetupWizardProtocolSettings.qml" line="230"/>
         <source>Install</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2295,30 +1622,35 @@ This protocol supports exporting connection profiles to mobile devices by using
 <context>
     <name>PageSetupWizardQrReader</name>
     <message>
-        <location filename="../ui/qml/Pages2/PageSetupWizardQrReader.qml" line="29"/>
-        <source>Point the camera at the QR code and hold for a couple of seconds.</source>
+        <location filename="../ui/qml/Pages2/PageSetupWizardQrReader.qml" line="37"/>
+        <source>Point the camera at the QR code and hold for a couple of seconds. </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PageSetupWizardStart</name>
     <message>
-        <location filename="../ui/qml/Pages2/PageSetupWizardStart.qml" line="56"/>
+        <location filename="../ui/qml/Pages2/PageSetupWizardStart.qml" line="54"/>
+        <source>Settings restored from backup file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSetupWizardStart.qml" line="105"/>
         <source>Free service for creating a personal VPN on your server.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSetupWizardStart.qml" line="57"/>
+        <location filename="../ui/qml/Pages2/PageSetupWizardStart.qml" line="106"/>
         <source> Helps you access blocked content without revealing your privacy, even to VPN providers.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSetupWizardStart.qml" line="66"/>
+        <location filename="../ui/qml/Pages2/PageSetupWizardStart.qml" line="115"/>
         <source>I have the data to connect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSetupWizardStart.qml" line="86"/>
+        <location filename="../ui/qml/Pages2/PageSetupWizardStart.qml" line="135"/>
         <source>I have nothing</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2351,33 +1683,6 @@ This protocol supports exporting connection profiles to mobile devices by using
         <translation type="unfinished">Продолжить</translation>
     </message>
 </context>
-<context>
-    <name>PageSetupWizardVPNMode</name>
-    <message>
-        <location filename="../ui/qml/Pages/PageSetupWizardVPNMode.qml" line="19"/>
-        <source>Setup Wizard</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Pages/PageSetupWizardVPNMode.qml" line="39"/>
-        <source>Optional.
-
-You can enable VPN mode &quot;For selected sites&quot; and add blocked sites you need to visit manually. If you will choose this option, you will need add every blocked site you want to visit to the access list. You may switch between modes later.
-
-Please note, you should add addresses to the list after VPN connection established. You may add any domain, URL or IP address, it will be resolved to IP address.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Pages/PageSetupWizardVPNMode.qml" line="45"/>
-        <source>Turn on mode &quot;VPN for selected sites&quot;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Pages/PageSetupWizardVPNMode.qml" line="60"/>
-        <source>Start configuring</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
     <name>PageSetupWizardViewConfig</name>
     <message>
@@ -2386,22 +1691,22 @@ Please note, you should add addresses to the list after VPN connection establish
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSetupWizardViewConfig.qml" line="89"/>
+        <location filename="../ui/qml/Pages2/PageSetupWizardViewConfig.qml" line="90"/>
         <source>Do not use connection code from public sources. It could be created to intercept your data.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSetupWizardViewConfig.qml" line="100"/>
+        <location filename="../ui/qml/Pages2/PageSetupWizardViewConfig.qml" line="105"/>
         <source>Collapse content</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSetupWizardViewConfig.qml" line="100"/>
+        <location filename="../ui/qml/Pages2/PageSetupWizardViewConfig.qml" line="105"/>
         <source>Show content</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSetupWizardViewConfig.qml" line="143"/>
+        <location filename="../ui/qml/Pages2/PageSetupWizardViewConfig.qml" line="148"/>
         <source>Connect</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2409,76 +1714,91 @@ Please note, you should add addresses to the list after VPN connection establish
 <context>
     <name>PageShare</name>
     <message>
-        <location filename="../ui/qml/Pages2/PageShare.qml" line="73"/>
+        <location filename="../ui/qml/Pages2/PageShare.qml" line="91"/>
         <source>OpenVpn native format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageShare.qml" line="78"/>
+        <location filename="../ui/qml/Pages2/PageShare.qml" line="96"/>
         <source>WireGuard native format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageShare.qml" line="101"/>
+        <location filename="../ui/qml/Pages2/PageShare.qml" line="121"/>
         <source>VPN Access</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageShare.qml" line="126"/>
+        <location filename="../ui/qml/Pages2/PageShare.qml" line="146"/>
         <source>Connection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageShare.qml" line="153"/>
+        <location filename="../ui/qml/Pages2/PageShare.qml" line="174"/>
         <source>VPN access without the ability to manage the server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageShare.qml" line="154"/>
+        <location filename="../ui/qml/Pages2/PageShare.qml" line="175"/>
         <source>Full access to server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageShare.qml" line="168"/>
-        <source>Server and service</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Pages2/PageShare.qml" line="169"/>
+        <location filename="../ui/qml/Pages2/PageShare.qml" line="191"/>
         <source>Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageShare.qml" line="197"/>
+        <location filename="../ui/qml/Pages2/PageShare.qml" line="221"/>
         <source>Accessing </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageShare.qml" line="256"/>
-        <source>Protocols and services</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Pages2/PageShare.qml" line="303"/>
+        <location filename="../ui/qml/Pages2/PageShare.qml" line="306"/>
         <source>Connection to </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageShare.qml" line="198"/>
-        <location filename="../ui/qml/Pages2/PageShare.qml" line="304"/>
+        <location filename="../ui/qml/Pages2/PageShare.qml" line="222"/>
+        <location filename="../ui/qml/Pages2/PageShare.qml" line="307"/>
         <source>File with connection settings to </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageShare.qml" line="68"/>
+        <location filename="../ui/qml/Pages2/PageShare.qml" line="48"/>
+        <source>Save OpenVPN config</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageShare.qml" line="55"/>
+        <source>Save WireGuard config</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageShare.qml" line="86"/>
         <source>For the AmneziaVPN app</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageShare.qml" line="138"/>
+        <location filename="../ui/qml/Pages2/PageShare.qml" line="158"/>
         <source>Full access</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageShare.qml" line="190"/>
+        <source>Servers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageShare.qml" line="248"/>
+        <source>Protocols</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageShare.qml" line="249"/>
+        <source>Protocol</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location filename="../ui/qml/Pages2/PageShare.qml" line="340"/>
         <location filename="../ui/qml/Pages2/PageShare.qml" line="341"/>
@@ -2486,454 +1806,11 @@ Please note, you should add addresses to the list after VPN connection establish
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageShare.qml" line="375"/>
+        <location filename="../ui/qml/Pages2/PageShare.qml" line="379"/>
         <source>Share</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>PageShareConnection</name>
-    <message>
-        <location filename="../ui/qml/Pages/PageShareConnection.qml" line="25"/>
-        <source>Share protocol config</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Pages/PageShareConnection.qml" line="56"/>
-        <source>Share for Amnezia</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Pages/PageShareConnection.qml" line="78"/>
-        <source>Share for </source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>PageShareProtoAmnezia</name>
-    <message>
-        <location filename="../ui/qml/Pages/Share/PageShareProtoAmnezia.qml" line="18"/>
-        <source>Share for Amnezia</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Pages/Share/PageShareProtoAmnezia.qml" line="52"/>
-        <source>Anyone who logs in with this code will have the same permissions to use VPN and YOUR SERVER as you. 
-
-This code includes your server credentials!
-
-Provide this code only to TRUSTED users.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Pages/Share/PageShareProtoAmnezia.qml" line="55"/>
-        <source>Anyone who logs in with this code will be able to connect to this VPN server. 
-
-This code does not include server credentials.
-
-New encryption keys pair will be generated.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Pages/Share/PageShareProtoAmnezia.qml" line="106"/>
-        <source>Share</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Pages/Share/PageShareProtoAmnezia.qml" line="106"/>
-        <source>Save to file</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Pages/Share/PageShareProtoAmnezia.qml" line="111"/>
-        <source>Save AmneziaVPN config</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Pages/Share/PageShareProtoAmnezia.qml" line="141"/>
-        <source>Scan QR code using AmneziaVPN mobile</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>PageShareProtoCloak</name>
-    <message>
-        <location filename="../ui/qml/Pages/Share/PageShareProtoCloak.qml" line="18"/>
-        <source>Share Cloak Settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Pages/Share/PageShareProtoCloak.qml" line="42"/>
-        <source>Note: Cloak protocol using same password for all connections</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Pages/Share/PageShareProtoCloak.qml" line="87"/>
-        <source>Share</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Pages/Share/PageShareProtoCloak.qml" line="87"/>
-        <source>Save to file</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Pages/Share/PageShareProtoCloak.qml" line="92"/>
-        <source>Save AmneziaVPN config</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>PageShareProtoIkev2</name>
-    <message>
-        <location filename="../ui/qml/Pages/Share/PageShareProtoIkev2.qml" line="18"/>
-        <source>Share IKEv2 Settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Pages/Share/PageShareProtoIkev2.qml" line="91"/>
-        <location filename="../ui/qml/Pages/Share/PageShareProtoIkev2.qml" line="96"/>
-        <source>Export p12 certificate</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Pages/Share/PageShareProtoIkev2.qml" line="106"/>
-        <location filename="../ui/qml/Pages/Share/PageShareProtoIkev2.qml" line="111"/>
-        <source>Export config for Apple</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Pages/Share/PageShareProtoIkev2.qml" line="121"/>
-        <location filename="../ui/qml/Pages/Share/PageShareProtoIkev2.qml" line="126"/>
-        <source>Export config for StrongSwan</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>PageShareProtoOpenVPN</name>
-    <message>
-        <location filename="../ui/qml/Pages/Share/PageShareProtoOpenVPN.qml" line="18"/>
-        <source>Share OpenVPN Settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Pages/Share/PageShareProtoOpenVPN.qml" line="42"/>
-        <source>New encryption keys pair will be generated.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Pages/Share/PageShareProtoOpenVPN.qml" line="86"/>
-        <source>Share</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Pages/Share/PageShareProtoOpenVPN.qml" line="86"/>
-        <source>Save to file</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Pages/Share/PageShareProtoOpenVPN.qml" line="91"/>
-        <source>Save OpenVPN config</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>PageShareProtoSftp</name>
-    <message>
-        <location filename="../ui/qml/Pages/Share/PageShareProtoSftp.qml" line="18"/>
-        <source>Share SFTP settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>PageShareProtoShadowSocks</name>
-    <message>
-        <location filename="../ui/qml/Pages/Share/PageShareProtoShadowSocks.qml" line="18"/>
-        <source>Share ShadowSocks Settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Pages/Share/PageShareProtoShadowSocks.qml" line="42"/>
-        <source>Note: ShadowSocks protocol using same password for all connections</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Pages/Share/PageShareProtoShadowSocks.qml" line="79"/>
-        <source>Copy config</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Pages/Share/PageShareProtoShadowSocks.qml" line="86"/>
-        <source>Connection string</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Pages/Share/PageShareProtoShadowSocks.qml" line="101"/>
-        <source>Copy string</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>PageShareProtoTorWebSite</name>
-    <message>
-        <location filename="../ui/qml/Pages/Share/PageShareProtoTorWebSite.qml" line="18"/>
-        <source>Share Tor Web site</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>PageShareProtoWireGuard</name>
-    <message>
-        <location filename="../ui/qml/Pages/Share/PageShareProtoWireGuard.qml" line="18"/>
-        <source>Share WireGuard Settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Pages/Share/PageShareProtoWireGuard.qml" line="42"/>
-        <source>New encryption keys pair will be generated.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Pages/Share/PageShareProtoWireGuard.qml" line="85"/>
-        <source>Share</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Pages/Share/PageShareProtoWireGuard.qml" line="85"/>
-        <source>Save to file</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Pages/Share/PageShareProtoWireGuard.qml" line="90"/>
-        <source>Save OpenVPN config</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>PageShareProtocolBase</name>
-    <message>
-        <location filename="../ui/qml/Pages/Share/PageShareProtocolBase.qml" line="15"/>
-        <source>Generate config</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Pages/Share/PageShareProtocolBase.qml" line="16"/>
-        <source>Generating config...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Pages/Share/PageShareProtocolBase.qml" line="17"/>
-        <source>Show config</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>PageSites</name>
-    <message>
-        <location filename="../ui/qml/Pages/PageSites.qml" line="30"/>
-        <source>Web site/Hostname/IP address/Subnet</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Pages/PageSites.qml" line="46"/>
-        <source>yousite.com or IP address</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Pages/PageSites.qml" line="102"/>
-        <source>Import IP addresses</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Pages/PageSites.qml" line="279"/>
-        <source>Delete selected</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Pages/PageSites.qml" line="297"/>
-        <source>Select all</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Pages/PageSites.qml" line="310"/>
-        <source>Export all</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>PageStart</name>
-    <message>
-        <location filename="../ui/qml/Pages/PageStart.qml" line="46"/>
-        <source>Setup your server to use VPN</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Pages/PageStart.qml" line="47"/>
-        <source>Connect to the already created VPN server</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Pages/PageStart.qml" line="65"/>
-        <location filename="../ui/qml/Pages/PageStart.qml" line="77"/>
-        <source>Set up your own server</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Pages/PageStart.qml" line="72"/>
-        <source>Import connection</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Pages/PageStart.qml" line="115"/>
-        <source>Connection code</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Pages/PageStart.qml" line="133"/>
-        <source>Connect</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Pages/PageStart.qml" line="146"/>
-        <source>Open file</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Pages/PageStart.qml" line="160"/>
-        <source>Scan QR code</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Pages/PageStart.qml" line="179"/>
-        <source>Restore app config</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Pages/PageStart.qml" line="203"/>
-        <source>How to get own server? →</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Pages/PageStart.qml" line="229"/>
-        <source>Server IP address [:port]</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Pages/PageStart.qml" line="248"/>
-        <source>Login to connect via SSH</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Pages/PageStart.qml" line="263"/>
-        <location filename="../ui/qml/Pages/PageStart.qml" line="331"/>
-        <source>Password</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Pages/PageStart.qml" line="324"/>
-        <location filename="../ui/qml/Pages/PageStart.qml" line="332"/>
-        <source>Connect using SSH key</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Pages/PageStart.qml" line="331"/>
-        <source>Private key</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Pages/PageStart.qml" line="332"/>
-        <source>Connect using SSH password</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>PageVPN</name>
-    <message>
-        <location filename="../ui/qml/Pages/PageVPN.qml" line="39"/>
-        <source>Donate</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Pages/PageVPN.qml" line="134"/>
-        <source>Server</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Pages/PageVPN.qml" line="134"/>
-        <source>Profile</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Pages/PageVPN.qml" line="162"/>
-        <source>Proto</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Pages/PageVPN.qml" line="190"/>
-        <source>DNS</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Pages/PageVPN.qml" line="307"/>
-        <source>How to use VPN</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Pages/PageVPN.qml" line="324"/>
-        <source>For all connections</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Pages/PageVPN.qml" line="333"/>
-        <source>Except selected sites</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Pages/PageVPN.qml" line="343"/>
-        <source>For selected sites</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Pages/PageVPN.qml" line="356"/>
-        <source>+ Add site</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>PageViewConfig</name>
-    <message>
-        <location filename="../ui/qml/Pages/PageViewConfig.qml" line="20"/>
-        <source>Check config</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Pages/PageViewConfig.qml" line="54"/>
-        <source>Attention!
-The config above contains cached OpenVPN connection profile.
-AmneziaVPN detected this profile may contain malicious scripts. Please, carefully review the config and import this config only if you completely trust it.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Pages/PageViewConfig.qml" line="62"/>
-        <source>Suspicious string:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Pages/PageViewConfig.qml" line="85"/>
-        <source>Cached connection profile:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Pages/PageViewConfig.qml" line="120"/>
-        <source>Cancel</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Pages/PageViewConfig.qml" line="129"/>
-        <source>Import config</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
     <name>PopupType</name>
     <message>
@@ -2942,6 +1819,241 @@ AmneziaVPN detected this profile may contain malicious scripts. Please, carefull
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>QKeychain::DeletePasswordJobPrivate</name>
+    <message>
+        <location filename="../3rd/qtkeychain/keychain_win.cpp" line="104"/>
+        <source>Password entry not found</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../3rd/qtkeychain/keychain_win.cpp" line="108"/>
+        <source>Could not decrypt data</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="552"/>
+        <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="560"/>
+        <source>Unknown error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="578"/>
+        <source>Could not open wallet: %1; %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../3rd/qtkeychain/keychain_haiku.cpp" line="177"/>
+        <source>Password not found</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../3rd/qtkeychain/keychain_android.cpp" line="173"/>
+        <source>Could not open keystore</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../3rd/qtkeychain/keychain_android.cpp" line="179"/>
+        <source>Could not remove private key from keystore</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QKeychain::JobPrivate</name>
+    <message>
+        <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="265"/>
+        <source>Unknown error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="509"/>
+        <source>Access to keychain denied</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QKeychain::PlainTextStore</name>
+    <message>
+        <location filename="../3rd/qtkeychain/plaintextstore.cpp" line="65"/>
+        <source>Could not store data in settings: access error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../3rd/qtkeychain/plaintextstore.cpp" line="67"/>
+        <source>Could not store data in settings: format error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../3rd/qtkeychain/plaintextstore.cpp" line="85"/>
+        <source>Could not delete data from settings: access error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../3rd/qtkeychain/plaintextstore.cpp" line="87"/>
+        <source>Could not delete data from settings: format error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../3rd/qtkeychain/plaintextstore.cpp" line="104"/>
+        <source>Entry not found</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QKeychain::ReadPasswordJobPrivate</name>
+    <message>
+        <location filename="../3rd/qtkeychain/keychain_win.cpp" line="32"/>
+        <source>Password entry not found</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../3rd/qtkeychain/keychain_win.cpp" line="36"/>
+        <location filename="../3rd/qtkeychain/keychain_win.cpp" line="139"/>
+        <source>Could not decrypt data</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="178"/>
+        <source>D-Bus is not running</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="187"/>
+        <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="197"/>
+        <source>Unknown error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="286"/>
+        <source>No keychain service available</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="288"/>
+        <source>Could not open wallet: %1; %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="333"/>
+        <source>Access to keychain denied</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="354"/>
+        <source>Could not determine data type: %1; %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="363"/>
+        <location filename="../3rd/qtkeychain/keychain_android.cpp" line="52"/>
+        <source>Entry not found</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="372"/>
+        <source>Unsupported entry type &apos;Map&apos;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="375"/>
+        <source>Unknown kwallet entry type &apos;%1&apos;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../3rd/qtkeychain/keychain_haiku.cpp" line="96"/>
+        <source>Password not found</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../3rd/qtkeychain/keychain_android.cpp" line="60"/>
+        <source>Could not open keystore</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../3rd/qtkeychain/keychain_android.cpp" line="68"/>
+        <source>Could not retrieve private key from keystore</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../3rd/qtkeychain/keychain_android.cpp" line="75"/>
+        <source>Could not create decryption cipher</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QKeychain::WritePasswordJobPrivate</name>
+    <message>
+        <location filename="../3rd/qtkeychain/keychain_win.cpp" line="78"/>
+        <source>Credential size exceeds maximum size of %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../3rd/qtkeychain/keychain_win.cpp" line="87"/>
+        <source>Credential key exceeds maximum size of %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../3rd/qtkeychain/keychain_win.cpp" line="92"/>
+        <source>Writing credentials failed: Win32 error code %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../3rd/qtkeychain/keychain_win.cpp" line="162"/>
+        <source>Encryption failed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="415"/>
+        <source>D-Bus is not running</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="425"/>
+        <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="452"/>
+        <source>Unknown error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="468"/>
+        <source>Could not open wallet: %1; %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../3rd/qtkeychain/keychain_haiku.cpp" line="144"/>
+        <source>Password not found</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../3rd/qtkeychain/keychain_android.cpp" line="95"/>
+        <source>Could not open keystore</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../3rd/qtkeychain/keychain_android.cpp" line="124"/>
+        <source>Could not create private key generator</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../3rd/qtkeychain/keychain_android.cpp" line="131"/>
+        <source>Could not generate new private key</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../3rd/qtkeychain/keychain_android.cpp" line="139"/>
+        <source>Could not retrieve private key from keystore</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../3rd/qtkeychain/keychain_android.cpp" line="147"/>
+        <source>Could not create encryption cipher</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../3rd/qtkeychain/keychain_android.cpp" line="155"/>
+        <source>Could not encrypt data</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>QObject</name>
     <message>
@@ -3155,13 +2267,7 @@ AmneziaVPN detected this profile may contain malicious scripts. Please, carefull
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../containers/containers_defs.cpp" line="89"/>
-        <location filename="../containers/containers_defs.cpp" line="105"/>
-        <source>Web site in Tor network</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../containers/containers_defs.cpp" line="106"/>
+        <location filename="../containers/containers_defs.cpp" line="133"/>
         <source>DNS Service</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3170,62 +2276,150 @@ AmneziaVPN detected this profile may contain malicious scripts. Please, carefull
         <source>Sftp file sharing service</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../containers/containers_defs.cpp" line="89"/>
+        <location filename="../containers/containers_defs.cpp" line="132"/>
+        <source>Website in Tor network</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location filename="../containers/containers_defs.cpp" line="90"/>
         <source>Amnezia DNS</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../containers/containers_defs.cpp" line="97"/>
-        <source>OpenVPN container</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="../containers/containers_defs.cpp" line="98"/>
-        <source>Container with OpenVpn and ShadowSocks</source>
+        <source>OpenVPN is the most popular VPN protocol, with flexible configuration options. It uses its own security protocol with SSL/TLS for key exchange.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../containers/containers_defs.cpp" line="100"/>
-        <source>Container with OpenVpn and ShadowSocks protocols configured with traffic masking by Cloak plugin</source>
+        <location filename="../containers/containers_defs.cpp" line="101"/>
+        <source>ShadowSocks - masks VPN traffic, making it similar to normal web traffic, but is recognised by analysis systems in some highly censored regions.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../containers/containers_defs.cpp" line="102"/>
-        <source>WireGuard container</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../containers/containers_defs.cpp" line="103"/>
-        <source>IPsec container</source>
+        <location filename="../containers/containers_defs.cpp" line="104"/>
+        <source>OpenVPN over Cloak - OpenVPN with VPN masquerading as web traffic and protection against active-probbing detection. Ideal for bypassing blocking in regions with the highest levels of censorship.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../containers/containers_defs.cpp" line="108"/>
+        <source>WireGuard - New popular VPN protocol with high performance, high speed and low power consumption. Recommended for regions with low levels of censorship.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../containers/containers_defs.cpp" line="111"/>
+        <source>IKEv2 -  Modern stable protocol, a bit faster than others, restores connection after signal loss. It has native support on the latest versions of Android and iOS.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../containers/containers_defs.cpp" line="114"/>
+        <source>Deploy a WordPress site on the Tor network in two clicks.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../containers/containers_defs.cpp" line="116"/>
+        <source>Replace the current DNS server with your own. This will increase your privacy level.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../containers/containers_defs.cpp" line="119"/>
+        <source>Creates a file vault on your server to securely store and transfer files.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../containers/containers_defs.cpp" line="124"/>
+        <source>OpenVPN container</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../containers/containers_defs.cpp" line="125"/>
+        <source>Container with OpenVpn and ShadowSocks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../containers/containers_defs.cpp" line="127"/>
+        <source>Container with OpenVpn and ShadowSocks protocols configured with traffic masking by Cloak plugin</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../containers/containers_defs.cpp" line="129"/>
+        <source>WireGuard container</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../containers/containers_defs.cpp" line="130"/>
+        <source>IPsec container</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../containers/containers_defs.cpp" line="135"/>
         <source>Sftp file sharing service - is secure FTP service</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../protocols/protocols_defs.cpp" line="72"/>
+        <location filename="../protocols/protocols_defs.cpp" line="75"/>
         <source>Sftp service</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/pages_logic/ClientInfoLogic.cpp" line="15"/>
-        <source>An error occurred while saving the list of clients.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>SelectContainer</name>
-    <message>
-        <location filename="../ui/qml/Pages/InstallSettings/SelectContainer.qml" line="66"/>
-        <source>VPN containers</source>
+        <location filename="../3rd/qtkeychain/libsecret.cpp" line="119"/>
+        <source>Entry not found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages/InstallSettings/SelectContainer.qml" line="133"/>
-        <source>Other containers</source>
+        <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="225"/>
+        <source>Access to keychain denied</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="227"/>
+        <source>No keyring daemon</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="229"/>
+        <source>Already unlocked</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="231"/>
+        <source>No such keyring</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="233"/>
+        <source>Bad arguments</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="235"/>
+        <source>I/O error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="237"/>
+        <source>Cancelled</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="239"/>
+        <source>Keyring already exists</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="241"/>
+        <source>No match</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="246"/>
+        <source>Unknown error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../3rd/qtkeychain/keychain_haiku.cpp" line="72"/>
+        <source>error 0x%1: %2</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -3237,62 +2431,6 @@ AmneziaVPN detected this profile may contain malicious scripts. Please, carefull
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>ServerConfiguringProgressLogic</name>
-    <message>
-        <location filename="../ui/pages_logic/ServerConfiguringProgressLogic.cpp" line="13"/>
-        <location filename="../ui/pages_logic/ServerConfiguringProgressLogic.cpp" line="88"/>
-        <source>Please wait, configuring process may take up to 5 minutes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/pages_logic/ServerConfiguringProgressLogic.cpp" line="17"/>
-        <source>Configuring...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/pages_logic/ServerConfiguringProgressLogic.cpp" line="179"/>
-        <source>Operation finished</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>ServerContainersLogic</name>
-    <message>
-        <location filename="../ui/pages_logic/ServerContainersLogic.cpp" line="124"/>
-        <source>Error occurred while configuring server.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/pages_logic/ServerContainersLogic.cpp" line="124"/>
-        <source>Error message: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/pages_logic/ServerContainersLogic.cpp" line="125"/>
-        <source>See logs for details.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>ServerSettingsLogic</name>
-    <message>
-        <location filename="../ui/pages_logic/ServerSettingsLogic.cpp" line="21"/>
-        <location filename="../ui/pages_logic/ServerSettingsLogic.cpp" line="88"/>
-        <source>Clear client cached profile</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/pages_logic/ServerSettingsLogic.cpp" line="48"/>
-        <source>Service: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/pages_logic/ServerSettingsLogic.cpp" line="81"/>
-        <source>Cache cleared</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
     <name>Settings</name>
     <message>
@@ -3310,130 +2448,100 @@ AmneziaVPN detected this profile may contain malicious scripts. Please, carefull
 <context>
     <name>SettingsController</name>
     <message>
-        <location filename="../ui/controllers/settingsController.cpp" line="14"/>
+        <location filename="../ui/controllers/settingsController.cpp" line="20"/>
         <source>Software version</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/controllers/settingsController.cpp" line="67"/>
-        <source>Save log</source>
+        <location filename="../ui/controllers/settingsController.cpp" line="117"/>
+        <source>All settings have been reset to default values</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/controllers/settingsController.cpp" line="78"/>
-        <source>Backup application config</source>
+        <location filename="../ui/controllers/settingsController.cpp" line="123"/>
+        <source>Cached profiles cleared</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/controllers/settingsController.cpp" line="84"/>
-        <source>Open backup</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/controllers/settingsController.cpp" line="88"/>
-        <source>Backup file is empty</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/controllers/settingsController.cpp" line="101"/>
+        <location filename="../ui/controllers/settingsController.cpp" line="102"/>
         <source>Backup file is corrupted</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>ShareConnectionButtonCopyType</name>
-    <message>
-        <location filename="../ui/qml/Controls/ShareConnectionButtonCopyType.qml" line="5"/>
-        <source>Copy</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Controls/ShareConnectionButtonCopyType.qml" line="6"/>
-        <source>Copied</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
     <name>ShareConnectionDrawer</name>
     <message>
-        <location filename="../ui/qml/Components/ShareConnectionDrawer.qml" line="57"/>
+        <location filename="../ui/qml/Components/ShareConnectionDrawer.qml" line="27"/>
+        <location filename="../ui/qml/Components/ShareConnectionDrawer.qml" line="35"/>
+        <source>Save AmneziaVPN config</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Components/ShareConnectionDrawer.qml" line="71"/>
         <source>Share</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Components/ShareConnectionDrawer.qml" line="76"/>
+        <location filename="../ui/qml/Components/ShareConnectionDrawer.qml" line="104"/>
         <source>Copy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Components/ShareConnectionDrawer.qml" line="96"/>
+        <location filename="../ui/qml/Components/ShareConnectionDrawer.qml" line="111"/>
+        <source>Copied</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Components/ShareConnectionDrawer.qml" line="126"/>
         <source>Show content</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Components/ShareConnectionDrawer.qml" line="218"/>
-        <source>To read the QR code in the Amnezia app, select &quot;Add Server&quot; → &quot;I have connection details&quot;</source>
+        <location filename="../ui/qml/Components/ShareConnectionDrawer.qml" line="250"/>
+        <source>To read the QR code in the Amnezia app, select &quot;Add server&quot; → &quot;I have data to connect&quot; → &quot;QR code, key or settings file&quot;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>ShareConnectionLogic</name>
+    <name>SitesController</name>
     <message>
-        <location filename="../ui/pages_logic/ShareConnectionLogic.cpp" line="111"/>
-        <source>Error while generating connection profile</source>
+        <location filename="../ui/controllers/sitesController.cpp" line="24"/>
+        <source>Hostname not look like ip adress or domain name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/pages_logic/ShareConnectionLogic.cpp" line="220"/>
-        <source>Error occurred while generating the config.</source>
+        <location filename="../ui/controllers/sitesController.cpp" line="67"/>
+        <source>New site added: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/pages_logic/ShareConnectionLogic.cpp" line="221"/>
-        <source>Error message: </source>
+        <location filename="../ui/controllers/sitesController.cpp" line="80"/>
+        <source>Site removed: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/pages_logic/ShareConnectionLogic.cpp" line="222"/>
-        <source>See logs for details.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>SitesLogic</name>
-    <message>
-        <location filename="../ui/pages_logic/SitesLogic.cpp" line="31"/>
-        <source>These sites will be opened using VPN</source>
+        <location filename="../ui/controllers/sitesController.cpp" line="88"/>
+        <source>Can&apos;t open file: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/pages_logic/SitesLogic.cpp" line="34"/>
-        <source>These sites will be excepted from VPN</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>StartPageLogic</name>
-    <message>
-        <location filename="../ui/pages_logic/StartPageLogic.cpp" line="55"/>
-        <location filename="../ui/pages_logic/StartPageLogic.cpp" line="171"/>
-        <source>Connect</source>
+        <location filename="../ui/controllers/sitesController.cpp" line="95"/>
+        <source>Failed to parse JSON data from file: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/pages_logic/StartPageLogic.cpp" line="95"/>
-        <location filename="../ui/pages_logic/StartPageLogic.cpp" line="100"/>
-        <source>Please fill in all fields</source>
+        <location filename="../ui/controllers/sitesController.cpp" line="100"/>
+        <source>The JSON data is not an array in file: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/pages_logic/StartPageLogic.cpp" line="129"/>
-        <source>Connecting...</source>
+        <location filename="../ui/controllers/sitesController.cpp" line="131"/>
+        <source>Import completed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/pages_logic/StartPageLogic.cpp" line="185"/>
-        <source>Open config file</source>
+        <location filename="../ui/controllers/sitesController.cpp" line="150"/>
+        <source>Export completed</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -3465,57 +2573,14 @@ AmneziaVPN detected this profile may contain malicious scripts. Please, carefull
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>UiLogic</name>
-    <message>
-        <location filename="../ui/uilogic.cpp" line="369"/>
-        <source>Error occurred while configuring server.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/uilogic.cpp" line="369"/>
-        <source>Error message: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/uilogic.cpp" line="370"/>
-        <source>See logs for details.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
     <name>VpnConnection</name>
     <message>
-        <location filename="../vpnconnection.cpp" line="420"/>
+        <location filename="../vpnconnection.cpp" line="405"/>
         <source>Mbps</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>VpnLogic</name>
-    <message>
-        <location filename="../ui/pages_logic/VpnLogic.cpp" line="22"/>
-        <location filename="../ui/pages_logic/VpnLogic.cpp" line="23"/>
-        <source>0 Mbps</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/pages_logic/VpnLogic.cpp" line="85"/>
-        <source>AmneziaVPN not supporting selected protocol on this device. Select another protocol.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/pages_logic/VpnLogic.cpp" line="214"/>
-        <source>VPN Protocols is not installed.
- Please install VPN container at first</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/pages_logic/VpnLogic.cpp" line="220"/>
-        <source>VPN Protocol not chosen</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
     <name>VpnProtocol</name>
     <message>
@@ -3562,56 +2627,46 @@ AmneziaVPN detected this profile may contain malicious scripts. Please, carefull
 <context>
     <name>amnezia::ContainerProps</name>
     <message>
-        <location filename="../containers/containers_defs.cpp" line="209"/>
+        <location filename="../containers/containers_defs.cpp" line="236"/>
         <source>Low</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../containers/containers_defs.cpp" line="210"/>
+        <location filename="../containers/containers_defs.cpp" line="237"/>
         <source>High</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../containers/containers_defs.cpp" line="211"/>
+        <location filename="../containers/containers_defs.cpp" line="238"/>
         <source>Medium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../containers/containers_defs.cpp" line="221"/>
+        <location filename="../containers/containers_defs.cpp" line="247"/>
         <source>Many foreign websites and VPN providers are blocked</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../containers/containers_defs.cpp" line="220"/>
+        <location filename="../containers/containers_defs.cpp" line="248"/>
         <source>Some foreign sites are blocked, but VPN providers are not blocked</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../containers/containers_defs.cpp" line="219"/>
+        <location filename="../containers/containers_defs.cpp" line="246"/>
         <source>I just want to increase the level of privacy</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>main</name>
+    <name>main2</name>
     <message>
-        <location filename="../ui/qml/main.qml" line="271"/>
-        <source>It&apos;s public key. Private key required</source>
+        <location filename="../ui/qml/main2.qml" line="172"/>
+        <source>Private key passphrase</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/main.qml" line="312"/>
-        <source>Ssh log</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/main.qml" line="322"/>
-        <source>App log</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/main.qml" line="326"/>
-        <source>Wrap words</source>
+        <location filename="../ui/qml/main2.qml" line="191"/>
+        <source>Save</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/client/translations/amneziavpn_zh_CN.ts b/client/translations/amneziavpn_zh_CN.ts
new file mode 100644
index 00000000..257a3378
--- /dev/null
+++ b/client/translations/amneziavpn_zh_CN.ts
@@ -0,0 +1,2666 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1" language="zh_CN">
+<context>
+    <name>AmneziaApplication</name>
+    <message>
+        <location filename="../amnezia_application.cpp" line="299"/>
+        <source>Split tunneling for WireGuard is not implemented, the option was disabled</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>AndroidController</name>
+    <message>
+        <location filename="../platforms/android/android_controller.cpp" line="236"/>
+        <source>AmneziaVPN</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../platforms/android/android_controller.cpp" line="239"/>
+        <source>VPN Connected</source>
+        <extracomment>Refers to the app - which is currently running the background and waiting</extracomment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ConnectionController</name>
+    <message>
+        <location filename="../ui/controllers/connectionController.h" line="54"/>
+        <location filename="../ui/controllers/connectionController.cpp" line="93"/>
+        <location filename="../ui/controllers/connectionController.cpp" line="107"/>
+        <location filename="../ui/controllers/connectionController.cpp" line="113"/>
+        <source>Connect</source>
+        <translation type="unfinished">连接</translation>
+    </message>
+    <message>
+        <location filename="../ui/controllers/connectionController.cpp" line="53"/>
+        <source>VPN Protocols is not installed.
+ Please install VPN container at first</source>
+        <translation type="unfinished">未安装VPN协议，请安装</translation>
+    </message>
+    <message>
+        <location filename="../ui/controllers/connectionController.cpp" line="74"/>
+        <source>Connection...</source>
+        <translation type="unfinished">连接中</translation>
+    </message>
+    <message>
+        <location filename="../ui/controllers/connectionController.cpp" line="79"/>
+        <source>Connected</source>
+        <translation type="unfinished">已连接</translation>
+    </message>
+    <message>
+        <location filename="../ui/controllers/connectionController.cpp" line="88"/>
+        <source>Reconnection...</source>
+        <translation type="unfinished">重连中</translation>
+    </message>
+    <message>
+        <location filename="../ui/controllers/connectionController.cpp" line="98"/>
+        <source>Disconnection...</source>
+        <translation type="unfinished">断开中</translation>
+    </message>
+    <message>
+        <location filename="../ui/controllers/connectionController.cpp" line="124"/>
+        <source>Settings updated successfully, Reconnnection...</source>
+        <translation type="unfinished">配置已更新，重连中</translation>
+    </message>
+</context>
+<context>
+    <name>ConnectionTypeSelectionDrawer</name>
+    <message>
+        <location filename="../ui/qml/Components/ConnectionTypeSelectionDrawer.qml" line="31"/>
+        <source>Connection data</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Components/ConnectionTypeSelectionDrawer.qml" line="40"/>
+        <source>Server IP, login and password</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Components/ConnectionTypeSelectionDrawer.qml" line="54"/>
+        <source>QR code, key or configuration file</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ContextMenuType</name>
+    <message>
+        <location filename="../ui/qml/Controls2/ContextMenuType.qml" line="9"/>
+        <source>C&amp;ut</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Controls2/ContextMenuType.qml" line="15"/>
+        <source>&amp;Copy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Controls2/ContextMenuType.qml" line="21"/>
+        <source>&amp;Paste</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Controls2/ContextMenuType.qml" line="28"/>
+        <source>&amp;SelectAll</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ExportController</name>
+    <message>
+        <location filename="../ui/controllers/exportController.cpp" line="34"/>
+        <source>Access error!</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>HomeContainersListView</name>
+    <message>
+        <location filename="../ui/qml/Components/HomeContainersListView.qml" line="58"/>
+        <source>The selected protocol is not supported on the current platform</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Components/HomeContainersListView.qml" line="77"/>
+        <source>Reconnect via VPN Procotol: </source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ImportController</name>
+    <message>
+        <location filename="../ui/controllers/importController.cpp" line="384"/>
+        <source>Scanned %1 of %2.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>InstallController</name>
+    <message>
+        <location filename="../ui/controllers/installController.cpp" line="110"/>
+        <location filename="../ui/controllers/installController.cpp" line="163"/>
+        <source> installed successfully. </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/controllers/installController.cpp" line="113"/>
+        <location filename="../ui/controllers/installController.cpp" line="166"/>
+        <source> is already installed on the server. </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/controllers/installController.cpp" line="116"/>
+        <location filename="../ui/controllers/installController.cpp" line="185"/>
+        <source>
+Already installed containers were found on the server. All installed containers have been added to the application</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/controllers/installController.cpp" line="266"/>
+        <source>Settings updated successfully</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/controllers/installController.cpp" line="281"/>
+        <source>Server &apos;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/controllers/installController.cpp" line="281"/>
+        <source>&apos; was removed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/controllers/installController.cpp" line="291"/>
+        <source>All containers from server &apos;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/controllers/installController.cpp" line="307"/>
+        <source> has been removed from the server &apos;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/controllers/installController.cpp" line="454"/>
+        <source>Please login as the user</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/controllers/installController.cpp" line="481"/>
+        <source>Server added successfully</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>KeyChainClass</name>
+    <message>
+        <location filename="../3rd/qtkeychain/TestAppExample/keychainclass.cpp" line="22"/>
+        <source>Read key failed: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../3rd/qtkeychain/TestAppExample/keychainclass.cpp" line="37"/>
+        <source>Write key failed: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../3rd/qtkeychain/TestAppExample/keychainclass.cpp" line="54"/>
+        <source>Delete key failed: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>NotificationHandler</name>
+    <message>
+        <location filename="../ui/notificationhandler.cpp" line="68"/>
+        <location filename="../ui/notificationhandler.cpp" line="75"/>
+        <source>AmneziaVPN</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/notificationhandler.cpp" line="69"/>
+        <source>VPN Connected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/notificationhandler.cpp" line="76"/>
+        <source>VPN Disconnected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/notificationhandler.cpp" line="95"/>
+        <source>AmneziaVPN notification</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/notificationhandler.cpp" line="96"/>
+        <source>Unsecured network detected: </source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PageDeinstalling</name>
+    <message>
+        <location filename="../ui/qml/Pages2/PageDeinstalling.qml" line="62"/>
+        <source>Removing services from </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageDeinstalling.qml" line="87"/>
+        <source>Usually it takes no more than 5 minutes</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PageHome</name>
+    <message>
+        <location filename="../ui/qml/Pages2/PageHome.qml" line="193"/>
+        <source>VPN protocol</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageHome.qml" line="238"/>
+        <source>Servers</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PageProtocolCloakSettings</name>
+    <message>
+        <location filename="../ui/qml/Pages2/PageProtocolCloakSettings.qml" line="74"/>
+        <source>Cloak settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageProtocolCloakSettings.qml" line="81"/>
+        <source>Disguised as traffic from</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageProtocolCloakSettings.qml" line="103"/>
+        <source>Port</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageProtocolCloakSettings.qml" line="120"/>
+        <location filename="../ui/qml/Pages2/PageProtocolCloakSettings.qml" line="121"/>
+        <source>Cipher</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageProtocolCloakSettings.qml" line="159"/>
+        <source>Save and Restart Amnezia</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PageProtocolOpenVpnSettings</name>
+    <message>
+        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="76"/>
+        <source>OpenVPN settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="83"/>
+        <source>VPN Addresses Subnet</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="97"/>
+        <source>Network protocol</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="126"/>
+        <source>Port</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="144"/>
+        <source>Auto-negotiate encryption</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="161"/>
+        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="162"/>
+        <source>Hash</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="170"/>
+        <source>SHA512</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="171"/>
+        <source>SHA384</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="172"/>
+        <source>SHA256</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="173"/>
+        <source>SHA3-512</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="174"/>
+        <source>SHA3-384</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="175"/>
+        <source>SHA3-256</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="176"/>
+        <source>whirlpool</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="177"/>
+        <source>BLAKE2b512</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="178"/>
+        <source>BLAKE2s256</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="179"/>
+        <source>SHA1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="207"/>
+        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="208"/>
+        <source>Cipher</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="216"/>
+        <source>AES-256-GCM</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="217"/>
+        <source>AES-192-GCM</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="218"/>
+        <source>AES-128-GCM</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="219"/>
+        <source>AES-256-CBC</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="220"/>
+        <source>AES-192-CBC</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="221"/>
+        <source>AES-128-CBC</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="222"/>
+        <source>ChaCha20-Poly1305</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="223"/>
+        <source>ARIA-256-CBC</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="224"/>
+        <source>CAMELLIA-256-CBC</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="225"/>
+        <source>none</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="258"/>
+        <source>TLS auth</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="273"/>
+        <source>Block DNS requests outside of VPN</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="292"/>
+        <source>Additional client configuration commands</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="308"/>
+        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="340"/>
+        <source>Commands:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="324"/>
+        <source>Additional server configuration commands</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="359"/>
+        <source>Remove OpenVPN</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="362"/>
+        <source>Remove OpenVpn from server?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="363"/>
+        <source>All users with whom you shared a connection will no longer be able to connect to it</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="364"/>
+        <source>Continue</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="365"/>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="384"/>
+        <source>Save and Restart Amnezia</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PageProtocolRaw</name>
+    <message>
+        <location filename="../ui/qml/Pages2/PageProtocolRaw.qml" line="38"/>
+        <source> settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageProtocolRaw.qml" line="78"/>
+        <source>Show connection options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageProtocolRaw.qml" line="130"/>
+        <source>Connection options </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageProtocolRaw.qml" line="172"/>
+        <location filename="../ui/qml/Pages2/PageProtocolRaw.qml" line="176"/>
+        <source>Remove </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageProtocolRaw.qml" line="176"/>
+        <source> from server?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageProtocolRaw.qml" line="177"/>
+        <source>All users with whom you shared a connection will no longer be able to connect to it</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageProtocolRaw.qml" line="178"/>
+        <source>Continue</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageProtocolRaw.qml" line="179"/>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PageProtocolShadowSocksSettings</name>
+    <message>
+        <location filename="../ui/qml/Pages2/PageProtocolShadowSocksSettings.qml" line="74"/>
+        <source>ShadowSocks settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageProtocolShadowSocksSettings.qml" line="81"/>
+        <source>Port</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageProtocolShadowSocksSettings.qml" line="98"/>
+        <location filename="../ui/qml/Pages2/PageProtocolShadowSocksSettings.qml" line="99"/>
+        <source>Cipher</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageProtocolShadowSocksSettings.qml" line="137"/>
+        <source>Save and Restart Amnezia</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PageServiceDnsSettings</name>
+    <message>
+        <location filename="../ui/qml/Pages2/PageServiceDnsSettings.qml" line="52"/>
+        <source>A DNS service is installed on your server, and it is only accessible via VPN.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageServiceDnsSettings.qml" line="53"/>
+        <source>The DNS address is the same as the address of your server. You can configure DNS in the settings, under the connections tab.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageServiceDnsSettings.qml" line="62"/>
+        <location filename="../ui/qml/Pages2/PageServiceDnsSettings.qml" line="66"/>
+        <source>Remove </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageServiceDnsSettings.qml" line="66"/>
+        <source> from server?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageServiceDnsSettings.qml" line="67"/>
+        <source>Continue</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageServiceDnsSettings.qml" line="68"/>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PageServiceSftpSettings</name>
+    <message>
+        <location filename="../ui/qml/Pages2/PageServiceSftpSettings.qml" line="22"/>
+        <source>Settings updated successfully</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageServiceSftpSettings.qml" line="83"/>
+        <source>SFTP settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageServiceSftpSettings.qml" line="90"/>
+        <source>Host</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageServiceSftpSettings.qml" line="100"/>
+        <location filename="../ui/qml/Pages2/PageServiceSftpSettings.qml" line="117"/>
+        <location filename="../ui/qml/Pages2/PageServiceSftpSettings.qml" line="134"/>
+        <location filename="../ui/qml/Pages2/PageServiceSftpSettings.qml" line="151"/>
+        <source>Copied</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageServiceSftpSettings.qml" line="107"/>
+        <source>Port</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageServiceSftpSettings.qml" line="124"/>
+        <source>Login</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageServiceSftpSettings.qml" line="141"/>
+        <source>Password</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageServiceSftpSettings.qml" line="183"/>
+        <source>Mount folder on device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageServiceSftpSettings.qml" line="208"/>
+        <source>In order to mount remote SFTP folder as local drive, perform following steps: &lt;br&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageServiceSftpSettings.qml" line="210"/>
+        <location filename="../ui/qml/Pages2/PageServiceSftpSettings.qml" line="213"/>
+        <source>&lt;br&gt;1. Install the latest version of </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageServiceSftpSettings.qml" line="211"/>
+        <location filename="../ui/qml/Pages2/PageServiceSftpSettings.qml" line="214"/>
+        <source>&lt;br&gt;2. Install the latest version of </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageServiceSftpSettings.qml" line="242"/>
+        <source>Detailed instructions</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageServiceSftpSettings.qml" line="260"/>
+        <source>Remove SFTP and all data stored there</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageServiceSftpSettings.qml" line="263"/>
+        <source>Remove SFTP and all data stored there?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageServiceSftpSettings.qml" line="264"/>
+        <source>Continue</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageServiceSftpSettings.qml" line="265"/>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PageServiceTorWebsiteSettings</name>
+    <message>
+        <location filename="../ui/qml/Pages2/PageServiceTorWebsiteSettings.qml" line="23"/>
+        <source>Settings updated successfully</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageServiceTorWebsiteSettings.qml" line="60"/>
+        <source>Tor website settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageServiceTorWebsiteSettings.qml" line="67"/>
+        <source>Website address</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageServiceTorWebsiteSettings.qml" line="82"/>
+        <source>Copied</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageServiceTorWebsiteSettings.qml" line="106"/>
+        <source>Use &lt;a href=&quot;https://www.torproject.org/download/&quot; style=&quot;color: #FBB26A;&quot;&gt;Tor Browser&lt;/a&gt; to open this url.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageServiceTorWebsiteSettings.qml" line="115"/>
+        <source>After installation it takes several minutes while your onion site will become available in the Tor Network.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageServiceTorWebsiteSettings.qml" line="124"/>
+        <source>When configuring WordPress set the domain as this onion address.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageServiceTorWebsiteSettings.qml" line="138"/>
+        <source>Remove website</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageServiceTorWebsiteSettings.qml" line="141"/>
+        <source>The site with all data will be removed from the tor network.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageServiceTorWebsiteSettings.qml" line="142"/>
+        <source>Continue</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageServiceTorWebsiteSettings.qml" line="143"/>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PageSettings</name>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettings.qml" line="37"/>
+        <source>Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettings.qml" line="44"/>
+        <source>Servers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettings.qml" line="58"/>
+        <source>Connection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettings.qml" line="72"/>
+        <source>Application</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettings.qml" line="86"/>
+        <source>Backup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettings.qml" line="100"/>
+        <source>About AmneziaVPN</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PageSettingsAbout</name>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsAbout.qml" line="56"/>
+        <source>Support the project with a donation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsAbout.qml" line="71"/>
+        <source>This is a free and open source application. If you like it, support the developers with a donation.
+And if you don&apos;t like the app, all the more support it - the donation will be used to improve the app.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsAbout.qml" line="82"/>
+        <source>Card on Patreon</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsAbout.qml" line="85"/>
+        <source>https://www.patreon.com/amneziavpn</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsAbout.qml" line="102"/>
+        <source>Show other methods on Github</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsAbout.qml" line="113"/>
+        <source>Contacts</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsAbout.qml" line="120"/>
+        <source>Telegram group</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsAbout.qml" line="121"/>
+        <source>To discuss features</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsAbout.qml" line="125"/>
+        <source>https://t.me/amnezia_vpn_en</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsAbout.qml" line="134"/>
+        <source>Mail</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsAbout.qml" line="135"/>
+        <source>For reviews and bug reports</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsAbout.qml" line="147"/>
+        <source>Github</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsAbout.qml" line="151"/>
+        <source>https://github.com/amnezia-vpn/amnezia-client</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsAbout.qml" line="160"/>
+        <source>Website</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsAbout.qml" line="164"/>
+        <source>https://amnezia.org</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsAbout.qml" line="192"/>
+        <source>Check for updates</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PageSettingsApplication</name>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="43"/>
+        <source>Application</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="52"/>
+        <source>Auto start</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="53"/>
+        <source>Launch the application every time </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="53"/>
+        <source> starts</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="73"/>
+        <source>Start minimized</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="74"/>
+        <source>Launch application minimized</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="91"/>
+        <source>Language</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="110"/>
+        <source>Logging</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="111"/>
+        <source>Enabled</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="111"/>
+        <source>Disabled</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="124"/>
+        <source>Reset settings and remove all data from the application</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="128"/>
+        <source>Reset settings and remove all data from the application?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="129"/>
+        <source>All settings will be reset to default. All installed AmneziaVPN services will still remain on the server.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="130"/>
+        <source>Continue</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="131"/>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PageSettingsBackup</name>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsBackup.qml" line="27"/>
+        <source>Settings restored from backup file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsBackup.qml" line="66"/>
+        <source>Backup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsBackup.qml" line="73"/>
+        <source>Configuration backup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsBackup.qml" line="80"/>
+        <source>It will help you instantly restore connection settings at the next installation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsBackup.qml" line="89"/>
+        <source>Make a backup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsBackup.qml" line="96"/>
+        <source>Save backup file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsBackup.qml" line="97"/>
+        <location filename="../ui/qml/Pages2/PageSettingsBackup.qml" line="125"/>
+        <source>Backup files (*.backup)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsBackup.qml" line="121"/>
+        <source>Restore from backup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsBackup.qml" line="124"/>
+        <source>Open backup file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsBackup.qml" line="135"/>
+        <source>Import settings from a backup file?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsBackup.qml" line="136"/>
+        <source>All current settings will be reset</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsBackup.qml" line="137"/>
+        <source>Continue</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsBackup.qml" line="138"/>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PageSettingsConnection</name>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsConnection.qml" line="41"/>
+        <source>Connection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsConnection.qml" line="50"/>
+        <source>Auto connect</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsConnection.qml" line="51"/>
+        <source>Connect to VPN on app start</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsConnection.qml" line="69"/>
+        <source>Use AmneziaDNS if installed on the server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsConnection.qml" line="84"/>
+        <source>DNS servers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsConnection.qml" line="85"/>
+        <source>If AmneziaDNS is not used or installed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsConnection.qml" line="98"/>
+        <source>Split site tunneling</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsConnection.qml" line="99"/>
+        <source>Allows you to connect to some sites through a secure connection, and to others bypassing it</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsConnection.qml" line="112"/>
+        <source>Separate application tunneling</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsConnection.qml" line="113"/>
+        <source>Allows you to use the VPN only for certain applications</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PageSettingsDns</name>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsDns.qml" line="45"/>
+        <source>DNS servers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsDns.qml" line="49"/>
+        <source>If AmneziaDNS is not used or installed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsDns.qml" line="86"/>
+        <source>Restore default</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsDns.qml" line="89"/>
+        <source>Restore default DNS settings?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsDns.qml" line="90"/>
+        <source>Continue</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsDns.qml" line="91"/>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsDns.qml" line="99"/>
+        <source>Settings have been reset</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsDns.qml" line="111"/>
+        <source>Save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsDns.qml" line="120"/>
+        <source>Settings saved</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PageSettingsLogging</name>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsLogging.qml" line="47"/>
+        <source>Logging</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsLogging.qml" line="54"/>
+        <location filename="../ui/qml/Pages2/PageSettingsLogging.qml" line="108"/>
+        <source>Save logs</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsLogging.qml" line="86"/>
+        <source>Open folder with logs</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsLogging.qml" line="109"/>
+        <source>Logs files (*.log)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsLogging.qml" line="126"/>
+        <source>Save logs to file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsLogging.qml" line="144"/>
+        <source>Clear logs?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsLogging.qml" line="145"/>
+        <source>Continue</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsLogging.qml" line="146"/>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsLogging.qml" line="153"/>
+        <source>Logs have been cleaned up</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsLogging.qml" line="166"/>
+        <source>Clear logs</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PageSettingsServerData</name>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsServerData.qml" line="23"/>
+        <source>All installed containers have been added to the application</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsServerData.qml" line="25"/>
+        <source>No new installed containers found</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsServerData.qml" line="87"/>
+        <source>Clear Amnezia cache</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsServerData.qml" line="88"/>
+        <source>May be needed when changing other settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsServerData.qml" line="91"/>
+        <source>Clear cached profiles?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsServerData.qml" line="92"/>
+        <source></source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsServerData.qml" line="93"/>
+        <location filename="../ui/qml/Pages2/PageSettingsServerData.qml" line="140"/>
+        <location filename="../ui/qml/Pages2/PageSettingsServerData.qml" line="171"/>
+        <source>Continue</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsServerData.qml" line="94"/>
+        <location filename="../ui/qml/Pages2/PageSettingsServerData.qml" line="141"/>
+        <location filename="../ui/qml/Pages2/PageSettingsServerData.qml" line="172"/>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsServerData.qml" line="117"/>
+        <source>Check the server for previously installed Amnezia services</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsServerData.qml" line="118"/>
+        <source>Add them to the application if they were not displayed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsServerData.qml" line="134"/>
+        <source>Remove server from application</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsServerData.qml" line="138"/>
+        <source>Remove server?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsServerData.qml" line="139"/>
+        <source>All installed AmneziaVPN services will still remain on the server.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsServerData.qml" line="165"/>
+        <source>Clear server from Amnezia software</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsServerData.qml" line="169"/>
+        <source>Clear server from Amnezia software?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsServerData.qml" line="170"/>
+        <source>All containers will be deleted on the server. This means that configuration files, keys and certificates will be deleted.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PageSettingsServerInfo</name>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsServerInfo.qml" line="102"/>
+        <source>Server name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsServerInfo.qml" line="110"/>
+        <source>Save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsServerInfo.qml" line="137"/>
+        <source>Protocols</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsServerInfo.qml" line="143"/>
+        <source>Services</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsServerInfo.qml" line="147"/>
+        <source>Data</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PageSettingsServerProtocol</name>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsServerProtocol.qml" line="38"/>
+        <source> settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsServerProtocol.qml" line="112"/>
+        <location filename="../ui/qml/Pages2/PageSettingsServerProtocol.qml" line="116"/>
+        <source>Remove </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsServerProtocol.qml" line="116"/>
+        <source> from server?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsServerProtocol.qml" line="117"/>
+        <source>All users with whom you shared a connection will no longer be able to connect to it</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsServerProtocol.qml" line="118"/>
+        <source>Continue</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsServerProtocol.qml" line="119"/>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PageSettingsServersList</name>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsServersList.qml" line="39"/>
+        <source>Servers</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PageSettingsSplitTunneling</name>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="49"/>
+        <source>Only the addresses in the list must be opened via VPN</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="54"/>
+        <source>Addresses from the list should never be opened via VPN</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="84"/>
+        <source>Split site tunneling</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="120"/>
+        <source>Mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="198"/>
+        <source>Remove </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="199"/>
+        <source>Continue</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="200"/>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="238"/>
+        <source>Site or IP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="282"/>
+        <source>Import/Export Sites</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="288"/>
+        <source>Import</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="300"/>
+        <source>Save site list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="307"/>
+        <source>Save sites</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="308"/>
+        <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="375"/>
+        <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="390"/>
+        <source>Sites files (*.json)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="365"/>
+        <source>Import a list of sites</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="371"/>
+        <source>Replace site list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="374"/>
+        <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="389"/>
+        <source>Open sites file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="386"/>
+        <source>Add imported sites to existing ones</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PageSetupWizardConfigSource</name>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSetupWizardConfigSource.qml" line="50"/>
+        <source>Server connection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSetupWizardConfigSource.qml" line="51"/>
+        <source>Do not use connection code from public sources. It may have been created to intercept your data.
+
+It&apos;s okay as long as it&apos;s from someone you trust.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSetupWizardConfigSource.qml" line="61"/>
+        <source>What do you have?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSetupWizardConfigSource.qml" line="68"/>
+        <source>File with connection settings or backup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSetupWizardConfigSource.qml" line="68"/>
+        <source>File with connection settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSetupWizardConfigSource.qml" line="75"/>
+        <source>Open config file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSetupWizardConfigSource.qml" line="95"/>
+        <source>QR-code</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSetupWizardConfigSource.qml" line="114"/>
+        <source>Key as text</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PageSetupWizardCredentials</name>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSetupWizardCredentials.qml" line="44"/>
+        <source>Server connection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSetupWizardCredentials.qml" line="51"/>
+        <source>Server IP address [:port]</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSetupWizardCredentials.qml" line="52"/>
+        <source>255.255.255.255:88</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSetupWizardCredentials.qml" line="66"/>
+        <source>Login to connect via SSH</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSetupWizardCredentials.qml" line="76"/>
+        <source>Password / SSH private key</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSetupWizardCredentials.qml" line="90"/>
+        <source>Continue</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSetupWizardCredentials.qml" line="117"/>
+        <source>Ip address cannot be empty</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSetupWizardCredentials.qml" line="120"/>
+        <source>Enter the address in the format 255.255.255.255:88</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSetupWizardCredentials.qml" line="124"/>
+        <source>Login cannot be empty</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSetupWizardCredentials.qml" line="128"/>
+        <source>Password/private key cannot be empty</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PageSetupWizardEasy</name>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSetupWizardEasy.qml" line="66"/>
+        <source>What is the level of internet control in your region?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSetupWizardEasy.qml" line="136"/>
+        <source>Set up a VPN yourself</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSetupWizardEasy.qml" line="137"/>
+        <source>I want to choose a VPN protocol</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSetupWizardEasy.qml" line="157"/>
+        <source>Continue</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSetupWizardEasy.qml" line="186"/>
+        <source>Set up later</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PageSetupWizardInstalling</name>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSetupWizardInstalling.qml" line="21"/>
+        <location filename="../ui/qml/Pages2/PageSetupWizardInstalling.qml" line="71"/>
+        <source>Usually it takes no more than 5 minutes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSetupWizardInstalling.qml" line="61"/>
+        <source>The server has already been added to the application</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSetupWizardInstalling.qml" line="66"/>
+        <source>Amnesia has detected that your server is currently </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSetupWizardInstalling.qml" line="67"/>
+        <source>busy installing other software. Amnesia installation </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSetupWizardInstalling.qml" line="68"/>
+        <source>will pause until the server finishes installing other software</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSetupWizardInstalling.qml" line="125"/>
+        <source>Installing</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PageSetupWizardProtocolSettings</name>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSetupWizardProtocolSettings.qml" line="75"/>
+        <source>Installing </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSetupWizardProtocolSettings.qml" line="93"/>
+        <source>More detailed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSetupWizardProtocolSettings.qml" line="183"/>
+        <source>Close</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSetupWizardProtocolSettings.qml" line="198"/>
+        <source>Network protocol</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSetupWizardProtocolSettings.qml" line="214"/>
+        <source>Port</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSetupWizardProtocolSettings.qml" line="230"/>
+        <source>Install</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PageSetupWizardProtocols</name>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSetupWizardProtocols.qml" line="73"/>
+        <source>VPN protocol</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSetupWizardProtocols.qml" line="74"/>
+        <source>Choose the one with the highest priority for you. Later, you can install other protocols and additional services, such as DNS proxy and SFTP.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PageSetupWizardQrReader</name>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSetupWizardQrReader.qml" line="37"/>
+        <source>Point the camera at the QR code and hold for a couple of seconds. </source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PageSetupWizardStart</name>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSetupWizardStart.qml" line="54"/>
+        <source>Settings restored from backup file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSetupWizardStart.qml" line="105"/>
+        <source>Free service for creating a personal VPN on your server.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSetupWizardStart.qml" line="106"/>
+        <source> Helps you access blocked content without revealing your privacy, even to VPN providers.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSetupWizardStart.qml" line="115"/>
+        <source>I have the data to connect</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSetupWizardStart.qml" line="135"/>
+        <source>I have nothing</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PageSetupWizardTextKey</name>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSetupWizardTextKey.qml" line="39"/>
+        <source>Connection key</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSetupWizardTextKey.qml" line="40"/>
+        <source>A line that starts with vpn://...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSetupWizardTextKey.qml" line="51"/>
+        <source>Key</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSetupWizardTextKey.qml" line="53"/>
+        <source>Insert</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSetupWizardTextKey.qml" line="71"/>
+        <source>Continue</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PageSetupWizardViewConfig</name>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSetupWizardViewConfig.qml" line="63"/>
+        <source>New connection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSetupWizardViewConfig.qml" line="90"/>
+        <source>Do not use connection code from public sources. It could be created to intercept your data.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSetupWizardViewConfig.qml" line="105"/>
+        <source>Collapse content</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSetupWizardViewConfig.qml" line="105"/>
+        <source>Show content</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSetupWizardViewConfig.qml" line="148"/>
+        <source>Connect</source>
+        <translation type="unfinished">连接</translation>
+    </message>
+</context>
+<context>
+    <name>PageShare</name>
+    <message>
+        <location filename="../ui/qml/Pages2/PageShare.qml" line="48"/>
+        <source>Save OpenVPN config</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageShare.qml" line="55"/>
+        <source>Save WireGuard config</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageShare.qml" line="86"/>
+        <source>For the AmneziaVPN app</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageShare.qml" line="91"/>
+        <source>OpenVpn native format</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageShare.qml" line="96"/>
+        <source>WireGuard native format</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageShare.qml" line="121"/>
+        <source>VPN Access</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageShare.qml" line="146"/>
+        <source>Connection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageShare.qml" line="158"/>
+        <source>Full access</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageShare.qml" line="174"/>
+        <source>VPN access without the ability to manage the server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageShare.qml" line="175"/>
+        <source>Full access to server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageShare.qml" line="190"/>
+        <source>Servers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageShare.qml" line="191"/>
+        <source>Server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageShare.qml" line="221"/>
+        <source>Accessing </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageShare.qml" line="222"/>
+        <location filename="../ui/qml/Pages2/PageShare.qml" line="307"/>
+        <source>File with connection settings to </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageShare.qml" line="248"/>
+        <source>Protocols</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageShare.qml" line="249"/>
+        <source>Protocol</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageShare.qml" line="306"/>
+        <source>Connection to </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageShare.qml" line="340"/>
+        <location filename="../ui/qml/Pages2/PageShare.qml" line="341"/>
+        <source>Connection format</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageShare.qml" line="379"/>
+        <source>Share</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PopupType</name>
+    <message>
+        <location filename="../ui/qml/Controls2/PopupType.qml" line="68"/>
+        <source>Close</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QKeychain::DeletePasswordJobPrivate</name>
+    <message>
+        <location filename="../3rd/qtkeychain/keychain_win.cpp" line="104"/>
+        <source>Password entry not found</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../3rd/qtkeychain/keychain_win.cpp" line="108"/>
+        <source>Could not decrypt data</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="552"/>
+        <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="560"/>
+        <source>Unknown error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="578"/>
+        <source>Could not open wallet: %1; %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../3rd/qtkeychain/keychain_haiku.cpp" line="177"/>
+        <source>Password not found</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../3rd/qtkeychain/keychain_android.cpp" line="173"/>
+        <source>Could not open keystore</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../3rd/qtkeychain/keychain_android.cpp" line="179"/>
+        <source>Could not remove private key from keystore</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QKeychain::JobPrivate</name>
+    <message>
+        <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="265"/>
+        <source>Unknown error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="509"/>
+        <source>Access to keychain denied</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QKeychain::PlainTextStore</name>
+    <message>
+        <location filename="../3rd/qtkeychain/plaintextstore.cpp" line="65"/>
+        <source>Could not store data in settings: access error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../3rd/qtkeychain/plaintextstore.cpp" line="67"/>
+        <source>Could not store data in settings: format error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../3rd/qtkeychain/plaintextstore.cpp" line="85"/>
+        <source>Could not delete data from settings: access error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../3rd/qtkeychain/plaintextstore.cpp" line="87"/>
+        <source>Could not delete data from settings: format error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../3rd/qtkeychain/plaintextstore.cpp" line="104"/>
+        <source>Entry not found</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QKeychain::ReadPasswordJobPrivate</name>
+    <message>
+        <location filename="../3rd/qtkeychain/keychain_win.cpp" line="32"/>
+        <source>Password entry not found</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../3rd/qtkeychain/keychain_win.cpp" line="36"/>
+        <location filename="../3rd/qtkeychain/keychain_win.cpp" line="139"/>
+        <source>Could not decrypt data</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="178"/>
+        <source>D-Bus is not running</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="187"/>
+        <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="197"/>
+        <source>Unknown error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="286"/>
+        <source>No keychain service available</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="288"/>
+        <source>Could not open wallet: %1; %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="333"/>
+        <source>Access to keychain denied</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="354"/>
+        <source>Could not determine data type: %1; %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="363"/>
+        <location filename="../3rd/qtkeychain/keychain_android.cpp" line="52"/>
+        <source>Entry not found</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="372"/>
+        <source>Unsupported entry type &apos;Map&apos;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="375"/>
+        <source>Unknown kwallet entry type &apos;%1&apos;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../3rd/qtkeychain/keychain_haiku.cpp" line="96"/>
+        <source>Password not found</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../3rd/qtkeychain/keychain_android.cpp" line="60"/>
+        <source>Could not open keystore</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../3rd/qtkeychain/keychain_android.cpp" line="68"/>
+        <source>Could not retrieve private key from keystore</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../3rd/qtkeychain/keychain_android.cpp" line="75"/>
+        <source>Could not create decryption cipher</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QKeychain::WritePasswordJobPrivate</name>
+    <message>
+        <location filename="../3rd/qtkeychain/keychain_win.cpp" line="78"/>
+        <source>Credential size exceeds maximum size of %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../3rd/qtkeychain/keychain_win.cpp" line="87"/>
+        <source>Credential key exceeds maximum size of %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../3rd/qtkeychain/keychain_win.cpp" line="92"/>
+        <source>Writing credentials failed: Win32 error code %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../3rd/qtkeychain/keychain_win.cpp" line="162"/>
+        <source>Encryption failed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="415"/>
+        <source>D-Bus is not running</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="425"/>
+        <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="452"/>
+        <source>Unknown error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="468"/>
+        <source>Could not open wallet: %1; %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../3rd/qtkeychain/keychain_haiku.cpp" line="144"/>
+        <source>Password not found</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../3rd/qtkeychain/keychain_android.cpp" line="95"/>
+        <source>Could not open keystore</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../3rd/qtkeychain/keychain_android.cpp" line="124"/>
+        <source>Could not create private key generator</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../3rd/qtkeychain/keychain_android.cpp" line="131"/>
+        <source>Could not generate new private key</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../3rd/qtkeychain/keychain_android.cpp" line="139"/>
+        <source>Could not retrieve private key from keystore</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../3rd/qtkeychain/keychain_android.cpp" line="147"/>
+        <source>Could not create encryption cipher</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../3rd/qtkeychain/keychain_android.cpp" line="155"/>
+        <source>Could not encrypt data</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <location filename="../protocols/protocols_defs.cpp" line="75"/>
+        <source>Sftp service</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../core/errorstrings.cpp" line="9"/>
+        <source>No error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../core/errorstrings.cpp" line="10"/>
+        <source>Unknown Error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../core/errorstrings.cpp" line="11"/>
+        <source>Function not implemented</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../core/errorstrings.cpp" line="14"/>
+        <source>Server check failed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../core/errorstrings.cpp" line="15"/>
+        <source>Server port already used. Check for another software</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../core/errorstrings.cpp" line="16"/>
+        <source>Server error: Docker container missing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../core/errorstrings.cpp" line="17"/>
+        <source>Server error: Docker failed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../core/errorstrings.cpp" line="18"/>
+        <source>Installation canceled by user</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../core/errorstrings.cpp" line="19"/>
+        <source>The user does not have permission to use sudo</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../core/errorstrings.cpp" line="22"/>
+        <source>Ssh request was denied</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../core/errorstrings.cpp" line="23"/>
+        <source>Ssh request was interrupted</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../core/errorstrings.cpp" line="24"/>
+        <source>Ssh internal error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../core/errorstrings.cpp" line="25"/>
+        <source>Invalid private key or invalid passphrase entered</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../core/errorstrings.cpp" line="26"/>
+        <source>The selected private key format is not supported, use openssh ED25519 key types or PEM key types</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../core/errorstrings.cpp" line="27"/>
+        <source>Timeout connecting to server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../core/errorstrings.cpp" line="30"/>
+        <source>Sftp error: End-of-file encountered</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../core/errorstrings.cpp" line="31"/>
+        <source>Sftp error: File does not exist</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../core/errorstrings.cpp" line="32"/>
+        <source>Sftp error: Permission denied</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../core/errorstrings.cpp" line="33"/>
+        <source>Sftp error: Generic failure</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../core/errorstrings.cpp" line="34"/>
+        <source>Sftp error: Garbage received from server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../core/errorstrings.cpp" line="35"/>
+        <source>Sftp error: No connection has been set up</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../core/errorstrings.cpp" line="36"/>
+        <source>Sftp error: There was a connection, but we lost it</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../core/errorstrings.cpp" line="37"/>
+        <source>Sftp error: Operation not supported by libssh yet</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../core/errorstrings.cpp" line="38"/>
+        <source>Sftp error: Invalid file handle</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../core/errorstrings.cpp" line="39"/>
+        <source>Sftp error: No such file or directory path exists</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../core/errorstrings.cpp" line="40"/>
+        <source>Sftp error: An attempt to create an already existing file or directory has been made</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../core/errorstrings.cpp" line="41"/>
+        <source>Sftp error: Write-protected filesystem</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../core/errorstrings.cpp" line="42"/>
+        <source>Sftp error: No media was in remote drive</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../core/errorstrings.cpp" line="45"/>
+        <source>Failed to save config to disk</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../core/errorstrings.cpp" line="46"/>
+        <source>OpenVPN config missing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../core/errorstrings.cpp" line="47"/>
+        <source>OpenVPN management server error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../core/errorstrings.cpp" line="50"/>
+        <source>OpenVPN executable missing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../core/errorstrings.cpp" line="51"/>
+        <source>ShadowSocks (ss-local) executable missing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../core/errorstrings.cpp" line="52"/>
+        <source>Cloak (ck-client) executable missing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../core/errorstrings.cpp" line="53"/>
+        <source>Amnezia helper service error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../core/errorstrings.cpp" line="54"/>
+        <source>OpenSSL failed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../core/errorstrings.cpp" line="57"/>
+        <source>Can&apos;t connect: another VPN connection is active</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../core/errorstrings.cpp" line="58"/>
+        <source>Can&apos;t setup OpenVPN TAP network adapter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../core/errorstrings.cpp" line="59"/>
+        <source>VPN pool error: no available addresses</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../core/errorstrings.cpp" line="61"/>
+        <source>The config does not contain any containers and credentiaks for connecting to the server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../core/errorstrings.cpp" line="65"/>
+        <source>Internal error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../containers/containers_defs.cpp" line="87"/>
+        <source>IPsec</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../containers/containers_defs.cpp" line="89"/>
+        <location filename="../containers/containers_defs.cpp" line="132"/>
+        <source>Website in Tor network</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../containers/containers_defs.cpp" line="90"/>
+        <source>Amnezia DNS</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../containers/containers_defs.cpp" line="92"/>
+        <source>Sftp file sharing service</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../containers/containers_defs.cpp" line="98"/>
+        <source>OpenVPN is the most popular VPN protocol, with flexible configuration options. It uses its own security protocol with SSL/TLS for key exchange.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../containers/containers_defs.cpp" line="101"/>
+        <source>ShadowSocks - masks VPN traffic, making it similar to normal web traffic, but is recognised by analysis systems in some highly censored regions.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../containers/containers_defs.cpp" line="104"/>
+        <source>OpenVPN over Cloak - OpenVPN with VPN masquerading as web traffic and protection against active-probbing detection. Ideal for bypassing blocking in regions with the highest levels of censorship.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../containers/containers_defs.cpp" line="108"/>
+        <source>WireGuard - New popular VPN protocol with high performance, high speed and low power consumption. Recommended for regions with low levels of censorship.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../containers/containers_defs.cpp" line="111"/>
+        <source>IKEv2 -  Modern stable protocol, a bit faster than others, restores connection after signal loss. It has native support on the latest versions of Android and iOS.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../containers/containers_defs.cpp" line="114"/>
+        <source>Deploy a WordPress site on the Tor network in two clicks.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../containers/containers_defs.cpp" line="116"/>
+        <source>Replace the current DNS server with your own. This will increase your privacy level.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../containers/containers_defs.cpp" line="119"/>
+        <source>Creates a file vault on your server to securely store and transfer files.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../containers/containers_defs.cpp" line="124"/>
+        <source>OpenVPN container</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../containers/containers_defs.cpp" line="125"/>
+        <source>Container with OpenVpn and ShadowSocks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../containers/containers_defs.cpp" line="127"/>
+        <source>Container with OpenVpn and ShadowSocks protocols configured with traffic masking by Cloak plugin</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../containers/containers_defs.cpp" line="129"/>
+        <source>WireGuard container</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../containers/containers_defs.cpp" line="130"/>
+        <source>IPsec container</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../containers/containers_defs.cpp" line="133"/>
+        <source>DNS Service</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../containers/containers_defs.cpp" line="135"/>
+        <source>Sftp file sharing service - is secure FTP service</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../3rd/qtkeychain/libsecret.cpp" line="119"/>
+        <source>Entry not found</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="225"/>
+        <source>Access to keychain denied</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="227"/>
+        <source>No keyring daemon</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="229"/>
+        <source>Already unlocked</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="231"/>
+        <source>No such keyring</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="233"/>
+        <source>Bad arguments</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="235"/>
+        <source>I/O error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="237"/>
+        <source>Cancelled</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="239"/>
+        <source>Keyring already exists</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="241"/>
+        <source>No match</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="246"/>
+        <source>Unknown error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../3rd/qtkeychain/keychain_haiku.cpp" line="72"/>
+        <source>error 0x%1: %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>SelectLanguageDrawer</name>
+    <message>
+        <location filename="../ui/qml/Components/SelectLanguageDrawer.qml" line="49"/>
+        <source>Choose language</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Settings</name>
+    <message>
+        <location filename="../settings.cpp" line="26"/>
+        <source>Server #1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../settings.cpp" line="202"/>
+        <location filename="../settings.cpp" line="209"/>
+        <source>Server</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>SettingsController</name>
+    <message>
+        <location filename="../ui/controllers/settingsController.cpp" line="20"/>
+        <source>Software version</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/controllers/settingsController.cpp" line="102"/>
+        <source>Backup file is corrupted</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/controllers/settingsController.cpp" line="117"/>
+        <source>All settings have been reset to default values</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/controllers/settingsController.cpp" line="123"/>
+        <source>Cached profiles cleared</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ShareConnectionDrawer</name>
+    <message>
+        <location filename="../ui/qml/Components/ShareConnectionDrawer.qml" line="27"/>
+        <location filename="../ui/qml/Components/ShareConnectionDrawer.qml" line="35"/>
+        <source>Save AmneziaVPN config</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Components/ShareConnectionDrawer.qml" line="71"/>
+        <source>Share</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Components/ShareConnectionDrawer.qml" line="104"/>
+        <source>Copy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Components/ShareConnectionDrawer.qml" line="111"/>
+        <source>Copied</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Components/ShareConnectionDrawer.qml" line="126"/>
+        <source>Show content</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Components/ShareConnectionDrawer.qml" line="250"/>
+        <source>To read the QR code in the Amnezia app, select &quot;Add server&quot; → &quot;I have data to connect&quot; → &quot;QR code, key or settings file&quot;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>SitesController</name>
+    <message>
+        <location filename="../ui/controllers/sitesController.cpp" line="24"/>
+        <source>Hostname not look like ip adress or domain name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/controllers/sitesController.cpp" line="67"/>
+        <source>New site added: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/controllers/sitesController.cpp" line="80"/>
+        <source>Site removed: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/controllers/sitesController.cpp" line="88"/>
+        <source>Can&apos;t open file: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/controllers/sitesController.cpp" line="95"/>
+        <source>Failed to parse JSON data from file: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/controllers/sitesController.cpp" line="100"/>
+        <source>The JSON data is not an array in file: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/controllers/sitesController.cpp" line="131"/>
+        <source>Import completed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/controllers/sitesController.cpp" line="150"/>
+        <source>Export completed</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>SystemTrayNotificationHandler</name>
+    <message>
+        <location filename="../ui/systemtray_notificationhandler.cpp" line="30"/>
+        <source>Show</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/systemtray_notificationhandler.cpp" line="34"/>
+        <source>Connect</source>
+        <translation type="unfinished">连接</translation>
+    </message>
+    <message>
+        <location filename="../ui/systemtray_notificationhandler.cpp" line="35"/>
+        <source>Disconnect</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/systemtray_notificationhandler.cpp" line="39"/>
+        <source>Visit Website</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/systemtray_notificationhandler.cpp" line="43"/>
+        <source>Quit</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>VpnConnection</name>
+    <message>
+        <location filename="../vpnconnection.cpp" line="405"/>
+        <source>Mbps</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>VpnProtocol</name>
+    <message>
+        <location filename="../protocols/vpnprotocol.cpp" line="130"/>
+        <source>Unknown</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../protocols/vpnprotocol.cpp" line="131"/>
+        <source>Disconnected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../protocols/vpnprotocol.cpp" line="132"/>
+        <source>Preparing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../protocols/vpnprotocol.cpp" line="133"/>
+        <source>Connecting...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../protocols/vpnprotocol.cpp" line="134"/>
+        <source>Connected</source>
+        <translation type="unfinished">已连接</translation>
+    </message>
+    <message>
+        <location filename="../protocols/vpnprotocol.cpp" line="135"/>
+        <source>Disconnecting...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../protocols/vpnprotocol.cpp" line="136"/>
+        <source>Reconnecting...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../protocols/vpnprotocol.cpp" line="137"/>
+        <source>Error</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>amnezia::ContainerProps</name>
+    <message>
+        <location filename="../containers/containers_defs.cpp" line="236"/>
+        <source>Low</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../containers/containers_defs.cpp" line="237"/>
+        <source>High</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../containers/containers_defs.cpp" line="238"/>
+        <source>Medium</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../containers/containers_defs.cpp" line="246"/>
+        <source>I just want to increase the level of privacy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../containers/containers_defs.cpp" line="247"/>
+        <source>Many foreign websites and VPN providers are blocked</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../containers/containers_defs.cpp" line="248"/>
+        <source>Some foreign sites are blocked, but VPN providers are not blocked</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>main2</name>
+    <message>
+        <location filename="../ui/qml/main2.qml" line="172"/>
+        <source>Private key passphrase</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/main2.qml" line="191"/>
+        <source>Save</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/client/ui/models/languageModel.cpp b/client/ui/models/languageModel.cpp
index 5135f348..b860b9da 100644
--- a/client/ui/models/languageModel.cpp
+++ b/client/ui/models/languageModel.cpp
@@ -6,7 +6,8 @@ LanguageModel::LanguageModel(std::shared_ptr<Settings> settings, QObject *parent
     QMetaEnum metaEnum = QMetaEnum::fromType<LanguageSettings::AvailableLanguageEnum>();
     for (int i = 0; i < metaEnum.keyCount(); i++) {
         m_availableLanguages.push_back(
-                LanguageModelData { metaEnum.valueToKey(i), static_cast<LanguageSettings::AvailableLanguageEnum>(i) });
+            LanguageModelData {getLocalLanguageName(static_cast<LanguageSettings::AvailableLanguageEnum>(i)),
+                              static_cast<LanguageSettings::AvailableLanguageEnum>(i) });
     }
 }
 
@@ -36,11 +37,26 @@ QHash<int, QByteArray> LanguageModel::roleNames() const
     return roles;
 }
 
+QString LanguageModel::getLocalLanguageName(const LanguageSettings::AvailableLanguageEnum language)
+{
+    QString strLanguage("");
+    switch (language) {
+    case LanguageSettings::AvailableLanguageEnum::English: strLanguage = "English"; break;
+    case LanguageSettings::AvailableLanguageEnum::Russian: strLanguage = "Русский"; break;
+    case LanguageSettings::AvailableLanguageEnum::China_cn: strLanguage = "\347\256\200\344\275\223\344\270\255\346\226\207"; break;
+    default:
+        break;
+    }
+
+    return strLanguage;
+}
+
 void LanguageModel::changeLanguage(const LanguageSettings::AvailableLanguageEnum language)
 {
     switch (language) {
     case LanguageSettings::AvailableLanguageEnum::English: emit updateTranslations(QLocale::English); break;
     case LanguageSettings::AvailableLanguageEnum::Russian: emit updateTranslations(QLocale::Russian); break;
+    case LanguageSettings::AvailableLanguageEnum::China_cn: emit updateTranslations(QLocale::Chinese); break;
     default: emit updateTranslations(QLocale::English); break;
     }
 }
@@ -51,6 +67,7 @@ int LanguageModel::getCurrentLanguageIndex()
     switch (locale.language()) {
     case QLocale::English: return static_cast<int>(LanguageSettings::AvailableLanguageEnum::English); break;
     case QLocale::Russian: return static_cast<int>(LanguageSettings::AvailableLanguageEnum::Russian); break;
+    case QLocale::Chinese: return static_cast<int>(LanguageSettings::AvailableLanguageEnum::China_cn); break;
     default: return static_cast<int>(LanguageSettings::AvailableLanguageEnum::English); break;
     }
 }
diff --git a/client/ui/models/languageModel.h b/client/ui/models/languageModel.h
index b64862dd..c8879a34 100644
--- a/client/ui/models/languageModel.h
+++ b/client/ui/models/languageModel.h
@@ -11,7 +11,8 @@ namespace LanguageSettings
     Q_NAMESPACE
     enum class AvailableLanguageEnum {
         English,
-        Russian
+        Russian,
+        China_cn
     };
     Q_ENUM_NS(AvailableLanguageEnum)
 
@@ -59,6 +60,8 @@ protected:
     QHash<int, QByteArray> roleNames() const override;
 
 private:
+    QString getLocalLanguageName(const LanguageSettings::AvailableLanguageEnum language);
+
     QVector<LanguageModelData> m_availableLanguages;
 
     std::shared_ptr<Settings> m_settings;

From 2986a18c8f3bc4bc54e2bfba97511f117f821cfe Mon Sep 17 00:00:00 2001
From: Mykola Baibuz <mykola.baibuz@gmail.com>
Date: Thu, 28 Sep 2023 23:54:32 +0300
Subject: [PATCH 149/278] iOS AWG support

---
 .gitmodules                                                 | 6 +++---
 client/3rd/awg-apple                                        | 1 +
 client/3rd/wireguard-apple                                  | 1 -
 client/cmake/ios.cmake                                      | 2 +-
 client/ios/networkextension/CMakeLists.txt                  | 2 +-
 .../WireGuardNetworkExtension-Bridging-Header.h             | 4 ++--
 client/macos/app/WireGuard-Bridging-Header.h                | 2 +-
 .../WireGuardNetworkExtension-Bridging-Header.h             | 2 +-
 client/platforms/ios/WireGuard-Bridging-Header.h            | 2 +-
 9 files changed, 11 insertions(+), 11 deletions(-)
 create mode 160000 client/3rd/awg-apple
 delete mode 160000 client/3rd/wireguard-apple

diff --git a/.gitmodules b/.gitmodules
index 453a8ee4..c96dd6bc 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,3 @@
-[submodule "client/3rd/wireguard-apple"]
-	path = client/3rd/wireguard-apple
-	url = https://github.com/WireGuard/wireguard-apple
 [submodule "client/3rd/OpenVPNAdapter"]
 	path = client/3rd/OpenVPNAdapter
 	url = https://github.com/amnezia-vpn/OpenVPNAdapter.git
@@ -25,3 +22,6 @@
 [submodule "client/3rd-prebuilt"]
 	path = client/3rd-prebuilt
 	url = https://github.com/amnezia-vpn/3rd-prebuilt
+[submodule "client/3rd/awg-apple"]
+	path = client/3rd/awg-apple
+	url = https://github.com/amnezia-vpn/awg-apple
diff --git a/client/3rd/awg-apple b/client/3rd/awg-apple
new file mode 160000
index 00000000..5767a03f
--- /dev/null
+++ b/client/3rd/awg-apple
@@ -0,0 +1 @@
+Subproject commit 5767a03f75a2b77d4f78fdd77ff51a1eefabe3b0
diff --git a/client/3rd/wireguard-apple b/client/3rd/wireguard-apple
deleted file mode 160000
index 23618f99..00000000
--- a/client/3rd/wireguard-apple
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 23618f994f17d8ad8f2f65d79b4a1e8a0830b334
diff --git a/client/cmake/ios.cmake b/client/cmake/ios.cmake
index 5dc1b2e7..7aa9f1a9 100644
--- a/client/cmake/ios.cmake
+++ b/client/cmake/ios.cmake
@@ -97,7 +97,7 @@ target_compile_options(${PROJECT} PRIVATE
     -DVPN_NE_BUNDLEID=\"${BUILD_IOS_APP_IDENTIFIER}.network-extension\"
 )
 
-set(WG_APPLE_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/3rd/wireguard-apple/Sources)
+set(WG_APPLE_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/3rd/awg-apple/Sources)
 
 target_sources(${PROJECT} PRIVATE
 #    ${CMAKE_CURRENT_SOURCE_DIR}/platforms/ios/iosvpnprotocol.swift
diff --git a/client/ios/networkextension/CMakeLists.txt b/client/ios/networkextension/CMakeLists.txt
index 29dc0bbe..16769ea3 100644
--- a/client/ios/networkextension/CMakeLists.txt
+++ b/client/ios/networkextension/CMakeLists.txt
@@ -58,7 +58,7 @@ target_link_libraries(networkextension PRIVATE ${FW_UI_KIT})
 target_compile_options(networkextension PRIVATE -DGROUP_ID=\"${BUILD_IOS_GROUP_IDENTIFIER}\")
 target_compile_options(networkextension PRIVATE -DNETWORK_EXTENSION=1)
 
-set(WG_APPLE_SOURCE_DIR ${CLIENT_ROOT_DIR}/3rd/wireguard-apple/Sources)
+set(WG_APPLE_SOURCE_DIR ${CLIENT_ROOT_DIR}/3rd/awg-apple/Sources)
 
 target_sources(networkextension PRIVATE
     ${WG_APPLE_SOURCE_DIR}/WireGuardKit/WireGuardAdapter.swift
diff --git a/client/ios/networkextension/WireGuardNetworkExtension-Bridging-Header.h b/client/ios/networkextension/WireGuardNetworkExtension-Bridging-Header.h
index 03a987ad..44d0b6b0 100644
--- a/client/ios/networkextension/WireGuardNetworkExtension-Bridging-Header.h
+++ b/client/ios/networkextension/WireGuardNetworkExtension-Bridging-Header.h
@@ -1,6 +1,6 @@
 #include "wireguard-go-version.h"
-#include "3rd/wireguard-apple/Sources/WireGuardKitGo/wireguard.h"
-#include "3rd/wireguard-apple/Sources/WireGuardKitC/WireGuardKitC.h"
+#include "3rd/awg-apple/Sources/WireGuardKitGo/wireguard.h"
+#include "3rd/awg-apple/Sources/WireGuardKitC/WireGuardKitC.h"
 
 #include <stdbool.h>
 #include <stdint.h>
diff --git a/client/macos/app/WireGuard-Bridging-Header.h b/client/macos/app/WireGuard-Bridging-Header.h
index 40b6c89d..da71002d 100644
--- a/client/macos/app/WireGuard-Bridging-Header.h
+++ b/client/macos/app/WireGuard-Bridging-Header.h
@@ -3,7 +3,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "wireguard-go-version.h"
-#include "3rd/wireguard-apple/Sources/WireGuardKitC/WireGuardKitC.h"
+#include "3rd/awg-apple/Sources/WireGuardKitC/WireGuardKitC.h"
 
 #include <stdbool.h>
 #include <stdint.h>
diff --git a/client/macos/networkextension/WireGuardNetworkExtension-Bridging-Header.h b/client/macos/networkextension/WireGuardNetworkExtension-Bridging-Header.h
index 8a437ce0..ea5c8e38 100644
--- a/client/macos/networkextension/WireGuardNetworkExtension-Bridging-Header.h
+++ b/client/macos/networkextension/WireGuardNetworkExtension-Bridging-Header.h
@@ -4,7 +4,7 @@
 
 #include "macos/gobridge/wireguard.h"
 #include "wireguard-go-version.h"
-#include "3rd/wireguard-apple/Sources/WireGuardKitC/WireGuardKitC.h"
+#include "3rd/awg-apple/Sources/WireGuardKitC/WireGuardKitC.h"
 #include "3rd/ShadowSocks/ShadowSocks/ShadowSocks.h"
 #include "platforms/ios/ssconnectivity.h"
 #include "platforms/ios/iosopenvpn2ssadapter.h"
diff --git a/client/platforms/ios/WireGuard-Bridging-Header.h b/client/platforms/ios/WireGuard-Bridging-Header.h
index e5dfa39f..fbccb2d4 100644
--- a/client/platforms/ios/WireGuard-Bridging-Header.h
+++ b/client/platforms/ios/WireGuard-Bridging-Header.h
@@ -2,7 +2,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#include "3rd/wireguard-apple/Sources/WireGuardKitC/WireGuardKitC.h"
+#include "3rd/awg-apple/Sources/WireGuardKitC/WireGuardKitC.h"
 
 #include <stdbool.h>
 #include <stdint.h>

From 54b45a36e124176fe05ff620ef43ff9fccbd2c3f Mon Sep 17 00:00:00 2001
From: "vladimir.kuznetsov" <nethiuswork@gmail.com>
Date: Fri, 29 Sep 2023 18:41:00 +0500
Subject: [PATCH 150/278] test configuration using wg instead of wg-quick to
 configure the server

---
 client/server_scripts/amnezia_wireguard/Dockerfile         | 2 +-
 .../amnezia_wireguard/configure_container.sh               | 2 +-
 client/server_scripts/amnezia_wireguard/start.sh           | 7 ++++---
 client/server_scripts/build_container.sh                   | 2 +-
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/client/server_scripts/amnezia_wireguard/Dockerfile b/client/server_scripts/amnezia_wireguard/Dockerfile
index ed974dc6..8c536fc7 100644
--- a/client/server_scripts/amnezia_wireguard/Dockerfile
+++ b/client/server_scripts/amnezia_wireguard/Dockerfile
@@ -3,7 +3,7 @@ FROM amneziavpn/amnezia-wg:latest
 LABEL maintainer="AmneziaVPN"
 
 #Install required packages
-RUN apk add --no-cache curl wireguard-tools dumb-init
+RUN apk add --no-cache bash curl dumb-init
 RUN apk --update upgrade --no-cache
 
 RUN mkdir -p /opt/amnezia
diff --git a/client/server_scripts/amnezia_wireguard/configure_container.sh b/client/server_scripts/amnezia_wireguard/configure_container.sh
index 8653a932..fa7b09f9 100644
--- a/client/server_scripts/amnezia_wireguard/configure_container.sh
+++ b/client/server_scripts/amnezia_wireguard/configure_container.sh
@@ -12,7 +12,7 @@ echo $WIREGUARD_PSK > /opt/amnezia/amneziawireguard/wireguard_psk.key
 cat > /opt/amnezia/amneziawireguard/wg0.conf <<EOF
 [Interface]
 PrivateKey = $WIREGUARD_SERVER_PRIVATE_KEY
-Address = $WIREGUARD_SUBNET_IP/$WIREGUARD_SUBNET_CIDR
+# Address = $WIREGUARD_SUBNET_IP/$WIREGUARD_SUBNET_CIDR
 ListenPort = $AMNEZIAWIREGUARD_SERVER_PORT
 Jc = $JUNK_PACKET_COUNT
 Jmin = $JUNK_PACKET_MIN_SIZE
diff --git a/client/server_scripts/amnezia_wireguard/start.sh b/client/server_scripts/amnezia_wireguard/start.sh
index b371d5b5..505ce53e 100644
--- a/client/server_scripts/amnezia_wireguard/start.sh
+++ b/client/server_scripts/amnezia_wireguard/start.sh
@@ -6,10 +6,11 @@ echo "Container startup"
 #ifconfig eth0:0 $SERVER_IP_ADDRESS netmask 255.255.255.255 up
 
 # kill daemons in case of restart
-wg-quick down /opt/amnezia/amneziawireguard/wg0.conf
+# wg-quick down /opt/amnezia/amneziawireguard/wg0.conf
 
-# start daemons if configured
-if [ -f /opt/amnezia/amneziawireguard/wg0.conf ]; then (wg-quick up /opt/amnezia/amneziawireguard/wg0.conf); fi
+/usr/bin/amnezia-wg wg0 && /usr/bin/wg setconf wg0 /opt/amnezia/amneziawireguard/wg0.conf && ip address add dev wg0 10.8.1.1/24 && ip link set up dev wg0
+# # # start daemons if configured
+# # if [ -f /opt/amnezia/amneziawireguard/wg0.conf ]; then (wg-quick up /opt/amnezia/amneziawireguard/wg0.conf); fi
 
 # Allow traffic on the TUN interface.
 iptables -A INPUT -i wg0 -j ACCEPT
diff --git a/client/server_scripts/build_container.sh b/client/server_scripts/build_container.sh
index 2cda240c..3468ef6f 100644
--- a/client/server_scripts/build_container.sh
+++ b/client/server_scripts/build_container.sh
@@ -1 +1 @@
-sudo docker build -t $CONTAINER_NAME $DOCKERFILE_FOLDER --build-arg SERVER_ARCH=$(uname -m)
+sudo docker build --no-cache --pull -t $CONTAINER_NAME $DOCKERFILE_FOLDER --build-arg SERVER_ARCH=$(uname -m)

From b7fbb84a58e1315ecd9a562a9a2ee3a3020977ea Mon Sep 17 00:00:00 2001
From: Mykola Baibuz <mykola.baibuz@gmail.com>
Date: Sat, 30 Sep 2023 00:58:08 +0300
Subject: [PATCH 151/278] iOS AWG protocol Setup

---
 client/3rd-prebuilt                    |  2 +-
 client/containers/containers_defs.cpp  |  1 +
 client/platforms/ios/ios_controller.h  |  1 +
 client/platforms/ios/ios_controller.mm | 12 ++++++++++++
 4 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/client/3rd-prebuilt b/client/3rd-prebuilt
index e8795854..6f0d654a 160000
--- a/client/3rd-prebuilt
+++ b/client/3rd-prebuilt
@@ -1 +1 @@
-Subproject commit e8795854a5cf27004fe78caecc90a961688d1d41
+Subproject commit 6f0d654a2409e2f634e7f7b95d34998c8eba2d7b
diff --git a/client/containers/containers_defs.cpp b/client/containers/containers_defs.cpp
index 21f7b044..0b9e44a2 100644
--- a/client/containers/containers_defs.cpp
+++ b/client/containers/containers_defs.cpp
@@ -186,6 +186,7 @@ bool ContainerProps::isSupportedByCurrentPlatform(DockerContainer c)
     switch (c) {
     case DockerContainer::WireGuard: return true;
     case DockerContainer::OpenVpn: return true;
+    case DockerContainer::AmneziaWireGuard: return true;
     case DockerContainer::Cloak:
         return true;
         //    case DockerContainer::ShadowSocks: return true;
diff --git a/client/platforms/ios/ios_controller.h b/client/platforms/ios/ios_controller.h
index ea8adbc0..6d10dc08 100644
--- a/client/platforms/ios/ios_controller.h
+++ b/client/platforms/ios/ios_controller.h
@@ -62,6 +62,7 @@ private:
     bool setupOpenVPN();
     bool setupCloak();
     bool setupWireGuard();
+    bool setupAmneziaWireGuard();
 
     bool startOpenVPN(const QString &config);
     bool startWireGuard(const QString &jsonConfig);
diff --git a/client/platforms/ios/ios_controller.mm b/client/platforms/ios/ios_controller.mm
index 57394383..6782c8da 100644
--- a/client/platforms/ios/ios_controller.mm
+++ b/client/platforms/ios/ios_controller.mm
@@ -204,6 +204,9 @@ bool IosController::connectVpn(amnezia::Proto proto, const QJsonObject& configur
     if (proto == amnezia::Proto::WireGuard) {
         return setupWireGuard();
     }
+    if (proto == amnezia::Proto::AmneziaWireGuard) {
+        return setupAmneziaWireGuard();
+    }
 
     return false;
 }
@@ -307,6 +310,15 @@ bool IosController::setupWireGuard()
     return startWireGuard(wgConfig);
 }
 
+bool IosController::setupAmneziaWireGuard()
+{
+    QJsonObject config = m_rawConfig[ProtocolProps::key_proto_config_data(amnezia::Proto::AmneziaWireGuard)].toObject();
+
+    QString wgConfig = config[config_key::config].toString();
+    
+    return startWireGuard(wgConfig);
+}
+
 bool IosController::startOpenVPN(const QString &config)
 {
     qDebug() << "IosController::startOpenVPN";

From 5535b6a6e3cdd83db8cb993d34ab71485a500cb9 Mon Sep 17 00:00:00 2001
From: ronoaer <ronoaer@gmail.com>
Date: Sat, 30 Sep 2023 17:36:06 +0800
Subject: [PATCH 152/278] embedded qm files into qrc file

---
 client/CMakeLists.txt                   | 40 +++++++++++++------------
 client/amnezia_application.cpp          |  7 +++--
 client/translations/amneziavpn_ru.ts    |  2 +-
 client/translations/amneziavpn_zh_CN.ts |  2 +-
 client/translations/translations.qrc.in |  5 ++++
 5 files changed, 32 insertions(+), 24 deletions(-)
 create mode 100644 client/translations/translations.qrc.in

diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt
index f149e204..21f4513e 100644
--- a/client/CMakeLists.txt
+++ b/client/CMakeLists.txt
@@ -50,29 +50,31 @@ endif()
 
 qt6_add_resources(QRC ${QRC} ${CMAKE_CURRENT_LIST_DIR}/resources.qrc)
 
-set(AMNEZIAVPN_TR_FILES
+# -- i18n begin
+set(CMAKE_AUTORCC ON)
+
+set(AMNEZIAVPN_TS_FILES
     ${CMAKE_CURRENT_LIST_DIR}/translations/amneziavpn_ru.ts
     ${CMAKE_CURRENT_LIST_DIR}/translations/amneziavpn_zh_CN.ts
 )
 
-file(GLOB_RECURSE AMNEZIAVPN_TR_SOURCES *.qrc *.cpp *.h *.ui)
-if ( BUILD_TRANSLATIONS )
-    qt_create_translation(AMNEZIAVPN_MESSAGES ${AMNEZIAVPN_TR_SOURCES} ${AMNEZIAVPN_TR_FILES})
-    qt_add_translation(AMNEZIAVPN_QM_FILES ${AMNEZIAVPN_TR_FILES})
-    add_custom_target(amnezia_messages DEPENDS ${AMNEZIAVPN_MESSAGES})
-    add_custom_target(amnezia_translations DEPENDS ${AMNEZIAVPN_QM_FILES} amnezia_messages)
-    add_dependencies(${PROJECT} amnezia_translations)
+file(GLOB_RECURSE AMNEZIAVPN_TS_SOURCES *.qrc *.cpp *.h *.ui)
 
-    if (BUILD_TRANSLATIONS_AS_RESOURCES)
-        set(QM_FILE_LIST "")
-        foreach(FILE ${AMNEZIAVPN_QM_FILES})
-            list(APPEND QM_FILE_LIST "<file>${FILE}</file>")
-        endforeach()
-        string(REPLACE ";" "" QM_FILE_LIST ${QM_FILE_LIST})
-        configure_file(${CMAKE_CURRENT_LIST_DIR}/translations/translations.qrc ${CMAKE_CURRENT_LIST_DIR}/translations.qrc)
-        target_sources(${PROJECT} PRIVATE ${CMAKE_CURRENT_LIST_DIR}/translations.qrc)
-    endif()
-endif( BUILD_TRANSLATIONS )
+qt_create_translation(AMNEZIAVPN_QM_FILES ${AMNEZIAVPN_TS_SOURCES} ${AMNEZIAVPN_TS_FILES})
+#add_custom_target(amnezia_messages DEPENDS ${AMNEZIAVPN_MESSAGES})
+#add_custom_target(amnezia_translations DEPENDS ${AMNEZIAVPN_QM_FILES} amnezia_messages)
+#add_dependencies(${PROJECT} amnezia_translations)
+
+set(QM_FILE_LIST "")
+foreach(FILE ${AMNEZIAVPN_QM_FILES})
+    get_filename_component(QM_FILE_NAME ${FILE} NAME)
+    list(APPEND QM_FILE_LIST "<file>${QM_FILE_NAME}</file>")
+endforeach()
+string(REPLACE ";" "" QM_FILE_LIST ${QM_FILE_LIST})
+
+configure_file(${CMAKE_CURRENT_LIST_DIR}/translations/translations.qrc.in ${CMAKE_CURRENT_BINARY_DIR}/translations.qrc)
+qt6_add_resources(QRC ${I18NQRC} ${CMAKE_CURRENT_BINARY_DIR}/translations.qrc)
+# -- i18n end
 
 if(IOS)
     #execute_process(COMMAND bash ${CMAKE_CURRENT_LIST_DIR}/scripts/run-build-cloak.sh)
@@ -342,5 +344,5 @@ if(NOT IOS AND NOT ANDROID)
 
 endif()
 
-target_sources(${PROJECT} PRIVATE ${SOURCES} ${HEADERS} ${RESOURCES} ${QRC})
+target_sources(${PROJECT} PRIVATE ${SOURCES} ${HEADERS} ${RESOURCES} ${QRC} ${I18NQRC})
 qt_finalize_target(${PROJECT})
diff --git a/client/amnezia_application.cpp b/client/amnezia_application.cpp
index d87f326e..6203e3af 100644
--- a/client/amnezia_application.cpp
+++ b/client/amnezia_application.cpp
@@ -227,15 +227,16 @@ void AmneziaApplication::loadTranslator()
 
 void AmneziaApplication::updateTranslator(const QLocale &locale)
 {
-    QResource::registerResource(":/translations.qrc");
     if (!m_translator->isEmpty()) {
         QCoreApplication::removeTranslator(m_translator.get());
     }
 
     m_settings->setAppLanguage(locale);
 
-    QString strFileName = QString("amneziavpn")+QLatin1String("_")+locale.name()+".qm";
-    if (m_translator->load(strFileName, "../../../")) {
+    QString strFileName = QString(":/translations/amneziavpn")+QLatin1String("_")+locale.name()+".qm";
+
+    if (m_translator->load(strFileName)) {
+        qDebug() << "yyyyyyxxxxxxxx--------------" <<strFileName;
         if (QCoreApplication::installTranslator(m_translator.get())) {
             m_settings->setAppLanguage(locale);
         }
diff --git a/client/translations/amneziavpn_ru.ts b/client/translations/amneziavpn_ru.ts
index e6c60a33..82393e38 100644
--- a/client/translations/amneziavpn_ru.ts
+++ b/client/translations/amneziavpn_ru.ts
@@ -4,7 +4,7 @@
 <context>
     <name>AmneziaApplication</name>
     <message>
-        <location filename="../amnezia_application.cpp" line="299"/>
+        <location filename="../amnezia_application.cpp" line="300"/>
         <source>Split tunneling for WireGuard is not implemented, the option was disabled</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/client/translations/amneziavpn_zh_CN.ts b/client/translations/amneziavpn_zh_CN.ts
index 257a3378..c70b0f75 100644
--- a/client/translations/amneziavpn_zh_CN.ts
+++ b/client/translations/amneziavpn_zh_CN.ts
@@ -4,7 +4,7 @@
 <context>
     <name>AmneziaApplication</name>
     <message>
-        <location filename="../amnezia_application.cpp" line="299"/>
+        <location filename="../amnezia_application.cpp" line="300"/>
         <source>Split tunneling for WireGuard is not implemented, the option was disabled</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/client/translations/translations.qrc.in b/client/translations/translations.qrc.in
new file mode 100644
index 00000000..f49df661
--- /dev/null
+++ b/client/translations/translations.qrc.in
@@ -0,0 +1,5 @@
+<RCC>
+    <qresource prefix="/translations">
+				@QM_FILE_LIST@
+    </qresource>
+</RCC>

From 07d7fac49059d4630b0917a5dd1ea56b58a1f4da Mon Sep 17 00:00:00 2001
From: ronoaer <ronoaer@gmail.com>
Date: Sat, 30 Sep 2023 17:40:26 +0800
Subject: [PATCH 153/278] removed invalid code

---
 client/CMakeLists.txt          | 3 ---
 client/amnezia_application.cpp | 2 --
 2 files changed, 5 deletions(-)

diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt
index 21f4513e..cc192268 100644
--- a/client/CMakeLists.txt
+++ b/client/CMakeLists.txt
@@ -61,9 +61,6 @@ set(AMNEZIAVPN_TS_FILES
 file(GLOB_RECURSE AMNEZIAVPN_TS_SOURCES *.qrc *.cpp *.h *.ui)
 
 qt_create_translation(AMNEZIAVPN_QM_FILES ${AMNEZIAVPN_TS_SOURCES} ${AMNEZIAVPN_TS_FILES})
-#add_custom_target(amnezia_messages DEPENDS ${AMNEZIAVPN_MESSAGES})
-#add_custom_target(amnezia_translations DEPENDS ${AMNEZIAVPN_QM_FILES} amnezia_messages)
-#add_dependencies(${PROJECT} amnezia_translations)
 
 set(QM_FILE_LIST "")
 foreach(FILE ${AMNEZIAVPN_QM_FILES})
diff --git a/client/amnezia_application.cpp b/client/amnezia_application.cpp
index 6203e3af..41a541ac 100644
--- a/client/amnezia_application.cpp
+++ b/client/amnezia_application.cpp
@@ -234,9 +234,7 @@ void AmneziaApplication::updateTranslator(const QLocale &locale)
     m_settings->setAppLanguage(locale);
 
     QString strFileName = QString(":/translations/amneziavpn")+QLatin1String("_")+locale.name()+".qm";
-
     if (m_translator->load(strFileName)) {
-        qDebug() << "yyyyyyxxxxxxxx--------------" <<strFileName;
         if (QCoreApplication::installTranslator(m_translator.get())) {
             m_settings->setAppLanguage(locale);
         }

From 4ed153373f585d93ddf3c566ba63fbf7cc43cba3 Mon Sep 17 00:00:00 2001
From: Mykola Baibuz <mykola.baibuz@gmail.com>
Date: Sat, 30 Sep 2023 16:05:23 -0400
Subject: [PATCH 154/278] Fix Linux build, some naming changes

---
 .../{amneziaWireGuardConfigurator.cpp => awg_configurator.cpp}  | 2 +-
 .../{amneziaWireGuardConfigurator.h => awg_configurator.h}      | 0
 client/configurators/vpn_configurator.cpp                       | 2 +-
 ...mneziaWireGuardProtocol.cpp => amneziawireguardprotocol.cpp} | 2 +-
 .../{amneziaWireGuardProtocol.h => amneziawireguardprotocol.h}  | 0
 5 files changed, 3 insertions(+), 3 deletions(-)
 rename client/configurators/{amneziaWireGuardConfigurator.cpp => awg_configurator.cpp} (98%)
 rename client/configurators/{amneziaWireGuardConfigurator.h => awg_configurator.h} (100%)
 rename client/protocols/{amneziaWireGuardProtocol.cpp => amneziawireguardprotocol.cpp} (84%)
 rename client/protocols/{amneziaWireGuardProtocol.h => amneziawireguardprotocol.h} (100%)

diff --git a/client/configurators/amneziaWireGuardConfigurator.cpp b/client/configurators/awg_configurator.cpp
similarity index 98%
rename from client/configurators/amneziaWireGuardConfigurator.cpp
rename to client/configurators/awg_configurator.cpp
index 3ed27208..85dbd6de 100644
--- a/client/configurators/amneziaWireGuardConfigurator.cpp
+++ b/client/configurators/awg_configurator.cpp
@@ -1,4 +1,4 @@
-#include "amneziaWireGuardConfigurator.h"
+#include "awg_configurator.h"
 
 #include <QJsonDocument>
 #include <QJsonObject>
diff --git a/client/configurators/amneziaWireGuardConfigurator.h b/client/configurators/awg_configurator.h
similarity index 100%
rename from client/configurators/amneziaWireGuardConfigurator.h
rename to client/configurators/awg_configurator.h
diff --git a/client/configurators/vpn_configurator.cpp b/client/configurators/vpn_configurator.cpp
index 6706deed..8ab43499 100644
--- a/client/configurators/vpn_configurator.cpp
+++ b/client/configurators/vpn_configurator.cpp
@@ -5,7 +5,7 @@
 #include "shadowsocks_configurator.h"
 #include "ssh_configurator.h"
 #include "wireguard_configurator.h"
-#include "amneziaWireGuardConfigurator.h"
+#include "awg_configurator.h"
 
 #include <QFile>
 #include <QJsonDocument>
diff --git a/client/protocols/amneziaWireGuardProtocol.cpp b/client/protocols/amneziawireguardprotocol.cpp
similarity index 84%
rename from client/protocols/amneziaWireGuardProtocol.cpp
rename to client/protocols/amneziawireguardprotocol.cpp
index b4c5b430..cab03da9 100644
--- a/client/protocols/amneziaWireGuardProtocol.cpp
+++ b/client/protocols/amneziawireguardprotocol.cpp
@@ -1,4 +1,4 @@
-#include "amneziaWireGuardProtocol.h"
+#include "amneziawireguardprotocol.h"
 
 AmneziaWireGuardProtocol::AmneziaWireGuardProtocol(const QJsonObject &configuration, QObject *parent)
     : WireguardProtocol(configuration, parent)
diff --git a/client/protocols/amneziaWireGuardProtocol.h b/client/protocols/amneziawireguardprotocol.h
similarity index 100%
rename from client/protocols/amneziaWireGuardProtocol.h
rename to client/protocols/amneziawireguardprotocol.h

From eaede032b4fe3ab940a22aad456aea0063a77584 Mon Sep 17 00:00:00 2001
From: ronoaer <ronoaer@gmail.com>
Date: Sun, 1 Oct 2023 11:12:27 +0800
Subject: [PATCH 155/278] 1. updated memory text when language changed, 2.
 updated initialize index

---
 client/amnezia_application.cpp                 |  9 +++++----
 client/main.cpp                                |  1 -
 client/ui/controllers/connectionController.cpp | 14 ++++++++++++++
 client/ui/controllers/connectionController.h   |  6 ++++++
 client/ui/qml/Pages2/PageStart.qml             |  2 ++
 5 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/client/amnezia_application.cpp b/client/amnezia_application.cpp
index 41a541ac..01b37229 100644
--- a/client/amnezia_application.cpp
+++ b/client/amnezia_application.cpp
@@ -87,6 +87,7 @@ void AmneziaApplication::init()
     m_vpnConnectionThread.start();
 
     initModels();
+    loadTranslator();
     initControllers();
 
 #ifdef Q_OS_ANDROID
@@ -231,17 +232,17 @@ void AmneziaApplication::updateTranslator(const QLocale &locale)
         QCoreApplication::removeTranslator(m_translator.get());
     }
 
-    m_settings->setAppLanguage(locale);
-
     QString strFileName = QString(":/translations/amneziavpn")+QLatin1String("_")+locale.name()+".qm";
     if (m_translator->load(strFileName)) {
         if (QCoreApplication::installTranslator(m_translator.get())) {
             m_settings->setAppLanguage(locale);
         }
-
-        m_engine->retranslate();
+    } else {
+        m_settings->setAppLanguage(QLocale::English);
     }
 
+    m_engine->retranslate();
+
     emit translationsUpdated();
 }
 
diff --git a/client/main.cpp b/client/main.cpp
index 53c3238f..396b7625 100644
--- a/client/main.cpp
+++ b/client/main.cpp
@@ -59,7 +59,6 @@ int main(int argc, char *argv[])
 
     if (doExec) {
         app.init();
-        app.loadTranslator();
 
         qInfo().noquote() << QString("Started %1 version %2").arg(APPLICATION_NAME, APP_VERSION);
         qInfo().noquote() << QString("%1 (%2)").arg(QSysInfo::prettyProductName(), QSysInfo::currentCpuArchitecture());
diff --git a/client/ui/controllers/connectionController.cpp b/client/ui/controllers/connectionController.cpp
index 77ca0f5f..8df62a94 100644
--- a/client/ui/controllers/connectionController.cpp
+++ b/client/ui/controllers/connectionController.cpp
@@ -19,6 +19,8 @@ ConnectionController::ConnectionController(const QSharedPointer<ServersModel> &s
             Qt::QueuedConnection);
     connect(this, &ConnectionController::disconnectFromVpn, m_vpnConnection.get(), &VpnConnection::disconnectFromVpn,
             Qt::QueuedConnection);
+
+    m_state = Vpn::ConnectionState::Disconnected;
 }
 
 ConnectionController::~ConnectionController()
@@ -70,6 +72,8 @@ QString ConnectionController::getLastConnectionError()
 
 void ConnectionController::onConnectionStateChanged(Vpn::ConnectionState state)
 {
+    m_state = state;
+
     m_isConnected = false;
     m_connectionStateText = tr("Connection...");
     switch (state) {
@@ -126,6 +130,16 @@ void ConnectionController::onCurrentContainerUpdated()
     }
 }
 
+void ConnectionController::translateMemoryText()
+{
+    onConnectionStateChanged(getCurrentConnectionState());
+}
+
+Vpn::ConnectionState ConnectionController::getCurrentConnectionState()
+{
+    return m_state;
+}
+
 QString ConnectionController::connectionStateText() const
 {
     return m_connectionStateText;
diff --git a/client/ui/controllers/connectionController.h b/client/ui/controllers/connectionController.h
index 7bfe0fac..c1eaf38f 100644
--- a/client/ui/controllers/connectionController.h
+++ b/client/ui/controllers/connectionController.h
@@ -34,6 +34,8 @@ public slots:
 
     void onCurrentContainerUpdated();
 
+    void translateMemoryText();
+
 signals:
     void connectToVpn(int serverIndex, const ServerCredentials &credentials, DockerContainer container,
                       const QJsonObject &containerConfig);
@@ -44,6 +46,8 @@ signals:
     void reconnectWithUpdatedContainer(const QString &message);
 
 private:
+    Vpn::ConnectionState getCurrentConnectionState();
+
     QSharedPointer<ServersModel> m_serversModel;
     QSharedPointer<ContainersModel> m_containersModel;
 
@@ -52,6 +56,8 @@ private:
     bool m_isConnected = false;
     bool m_isConnectionInProgress = false;
     QString m_connectionStateText = tr("Connect");
+
+    Vpn::ConnectionState m_state;
 };
 
 #endif // CONNECTIONCONTROLLER_H
diff --git a/client/ui/qml/Pages2/PageStart.qml b/client/ui/qml/Pages2/PageStart.qml
index 43366af7..f36aac41 100644
--- a/client/ui/qml/Pages2/PageStart.qml
+++ b/client/ui/qml/Pages2/PageStart.qml
@@ -171,6 +171,8 @@ PageType {
             onClicked: {
                 tabBarStackView.goToTabBarPage(PageEnum.PageHome)
                 ServersModel.currentlyProcessedIndex = ServersModel.defaultIndex
+
+                ConnectionController.translateMemoryText()
             }
         }
         TabImageButtonType {

From 784ae0da53b1eb738a827f670d7acb257cb75ab7 Mon Sep 17 00:00:00 2001
From: ronoaer <ronoaer@gmail.com>
Date: Sun, 1 Oct 2023 12:11:13 +0800
Subject: [PATCH 156/278] updated visible logic of button 'set up later'

---
 client/ui/controllers/pageController.cpp     | 12 ++++++++++++
 client/ui/controllers/pageController.h       |  6 ++++++
 client/ui/qml/Components/ConnectButton.qml   |  2 ++
 client/ui/qml/Pages2/PageSetupWizardEasy.qml | 11 ++++++++++-
 4 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/client/ui/controllers/pageController.cpp b/client/ui/controllers/pageController.cpp
index 7b8f74ab..2a14548c 100644
--- a/client/ui/controllers/pageController.cpp
+++ b/client/ui/controllers/pageController.cpp
@@ -37,6 +37,8 @@ PageController::PageController(const QSharedPointer<ServersModel> &serversModel,
     connect(this, &PageController::raiseMainWindow, []() { setDockIconVisible(true); });
     connect(this, &PageController::hideMainWindow, []() { setDockIconVisible(false); });
 #endif
+
+    m_bConnectTrigger = false;
 }
 
 QString PageController::getInitialPage()
@@ -145,3 +147,13 @@ void PageController::drawerClose()
         m_drawerLayer = 0;
     }
 }
+
+bool PageController::isConnectTrigger()
+{
+    return m_bConnectTrigger;
+}
+
+void PageController::setConnectTrigger(bool trigger)
+{
+    m_bConnectTrigger = trigger;
+}
diff --git a/client/ui/controllers/pageController.h b/client/ui/controllers/pageController.h
index a8f883fe..d16c36a6 100644
--- a/client/ui/controllers/pageController.h
+++ b/client/ui/controllers/pageController.h
@@ -84,6 +84,10 @@ public slots:
     void drawerOpen();
     void drawerClose();
 
+
+    bool isConnectTrigger();
+    void setConnectTrigger(bool trigger);
+
 signals:
     void goToPage(PageLoader::PageEnum page, bool slide = true);
     void goToStartPage();
@@ -120,6 +124,8 @@ private:
 
     PageLoader::PageEnum m_currentRootPage;
     int m_drawerLayer;
+
+    bool m_bConnectTrigger;
 };
 
 #endif // PAGECONTROLLER_H
diff --git a/client/ui/qml/Components/ConnectButton.qml b/client/ui/qml/Components/ConnectButton.qml
index b7484c73..b5c94ea8 100644
--- a/client/ui/qml/Components/ConnectButton.qml
+++ b/client/ui/qml/Components/ConnectButton.qml
@@ -139,6 +139,8 @@ Button {
 
     onClicked: {
         if (!ContainersModel.isAnyContainerInstalled()) {
+            PageController.setConnectTrigger(true)
+
             ServersModel.currentlyProcessedIndex = ServersModel.getDefaultServerIndex()
             PageController.goToPage(PageEnum.PageSetupWizardEasy)
 
diff --git a/client/ui/qml/Pages2/PageSetupWizardEasy.qml b/client/ui/qml/Pages2/PageSetupWizardEasy.qml
index 4f94e985..08542b23 100644
--- a/client/ui/qml/Pages2/PageSetupWizardEasy.qml
+++ b/client/ui/qml/Pages2/PageSetupWizardEasy.qml
@@ -183,7 +183,16 @@ PageType {
                 textColor: "#D7D8DB"
                 borderWidth: 1
 
-                visible: ContainersModel.isAnyContainerInstalled()
+                visible: {
+                    if (PageController.isConnectTrigger()) {
+                        PageController.setConnectTrigger(false)
+
+                        return ContainersModel.isAnyContainerInstalled()
+                    }
+
+
+                    return  true
+                }
 
                 text: qsTr("Set up later")
 

From 4e3955b39d1c22e86d81d238a8e037dbb3c9e61e Mon Sep 17 00:00:00 2001
From: "vladimir.kuznetsov" <nethiuswork@gmail.com>
Date: Sun, 1 Oct 2023 12:06:50 +0300
Subject: [PATCH 157/278] Added switcher "Allow app screenshots" for android

---
 client/settings.h                             |  9 ++++
 client/ui/controllers/importController.cpp    |  9 ----
 client/ui/controllers/settingsController.cpp  | 42 +++++++++++++++++++
 client/ui/controllers/settingsController.h    |  3 ++
 .../ui/qml/Pages2/PageSettingsApplication.qml | 20 +++++++++
 5 files changed, 74 insertions(+), 9 deletions(-)

diff --git a/client/settings.h b/client/settings.h
index 919ca731..f530f6c5 100644
--- a/client/settings.h
+++ b/client/settings.h
@@ -178,6 +178,15 @@ public:
         m_settings.setValue("Conf/appLanguage", locale);
     };
 
+    bool isScreenshotsEnabled() const
+    {
+        return m_settings.value("Conf/screenshotsEnabled", false).toBool();
+    }
+    void setScreenshotsEnabled(bool enabled)
+    {
+        m_settings.setValue("Conf/screenshotsEnabled", enabled);
+    }
+
     void clearSettings();
 
 signals:
diff --git a/client/ui/controllers/importController.cpp b/client/ui/controllers/importController.cpp
index d9278ece..aaea8db3 100644
--- a/client/ui/controllers/importController.cpp
+++ b/client/ui/controllers/importController.cpp
@@ -61,15 +61,6 @@ ImportController::ImportController(const QSharedPointer<ServersModel> &serversMo
 {
 #ifdef Q_OS_ANDROID
     mInstance = this;
-    // Set security screen for Android app
-    AndroidUtils::runOnAndroidThreadSync([]() {
-        QJniObject activity = AndroidUtils::getActivity();
-        QJniObject window = activity.callObjectMethod("getWindow", "()Landroid/view/Window;");
-        if (window.isValid()) {
-            const int FLAG_SECURE = 8192;
-            window.callMethod<void>("addFlags", "(I)V", FLAG_SECURE);
-        }
-    });
 
     AndroidUtils::runOnAndroidThreadAsync([]() {
         JNINativeMethod methods[] {
diff --git a/client/ui/controllers/settingsController.cpp b/client/ui/controllers/settingsController.cpp
index 46993f6a..3edfe3d9 100644
--- a/client/ui/controllers/settingsController.cpp
+++ b/client/ui/controllers/settingsController.cpp
@@ -6,6 +6,11 @@
 #include "systemController.h"
 #include "ui/qautostart.h"
 #include "version.h"
+#ifdef Q_OS_ANDROID
+    #include "../../platforms/android/android_controller.h"
+    #include "../../platforms/android/androidutils.h"
+    #include <QJniObject>
+#endif
 
 SettingsController::SettingsController(const QSharedPointer<ServersModel> &serversModel,
                                        const QSharedPointer<ContainersModel> &containersModel,
@@ -18,6 +23,20 @@ SettingsController::SettingsController(const QSharedPointer<ServersModel> &serve
       m_settings(settings)
 {
     m_appVersion = QString("%1: %2 (%3)").arg(tr("Software version"), QString(APP_MAJOR_VERSION), __DATE__);
+
+#ifdef Q_OS_ANDROID
+    if (!m_settings->isScreenshotsEnabled()) {
+        // Set security screen for Android app
+        AndroidUtils::runOnAndroidThreadSync([]() {
+            QJniObject activity = AndroidUtils::getActivity();
+            QJniObject window = activity.callObjectMethod("getWindow", "()Landroid/view/Window;");
+            if (window.isValid()) {
+                const int FLAG_SECURE = 8192;
+                window.callMethod<void>("addFlags", "(I)V", FLAG_SECURE);
+            }
+        });
+    }
+#endif
 }
 
 void SettingsController::toggleAmneziaDns(bool enable)
@@ -152,3 +171,26 @@ void SettingsController::toggleStartMinimized(bool enable)
 {
     m_settings->setStartMinimized(enable);
 }
+
+bool SettingsController::isScreenshotsEnabled()
+{
+    return m_settings->isScreenshotsEnabled();
+}
+
+void SettingsController::toggleScreenshotsEnabled(bool enable)
+{
+    m_settings->setScreenshotsEnabled(enable);
+#ifdef Q_OS_ANDROID
+    std::string command = enable ? "clearFlags" : "addFlags";
+
+    // Set security screen for Android app
+    AndroidUtils::runOnAndroidThreadSync([&command]() {
+        QJniObject activity = AndroidUtils::getActivity();
+        QJniObject window = activity.callObjectMethod("getWindow", "()Landroid/view/Window;");
+        if (window.isValid()) {
+            const int FLAG_SECURE = 8192;
+            window.callMethod<void>(command.c_str(), "(I)V", FLAG_SECURE);
+        }
+    });
+#endif
+}
\ No newline at end of file
diff --git a/client/ui/controllers/settingsController.h b/client/ui/controllers/settingsController.h
index 5a51a3b4..be041f3e 100644
--- a/client/ui/controllers/settingsController.h
+++ b/client/ui/controllers/settingsController.h
@@ -54,6 +54,9 @@ public slots:
     bool isStartMinimizedEnabled();
     void toggleStartMinimized(bool enable);
 
+    bool isScreenshotsEnabled();
+    void toggleScreenshotsEnabled(bool enable);
+
 signals:
     void primaryDnsChanged();
     void secondaryDnsChanged();
diff --git a/client/ui/qml/Pages2/PageSettingsApplication.qml b/client/ui/qml/Pages2/PageSettingsApplication.qml
index 6f5e48a2..c5536fdb 100644
--- a/client/ui/qml/Pages2/PageSettingsApplication.qml
+++ b/client/ui/qml/Pages2/PageSettingsApplication.qml
@@ -43,6 +43,26 @@ PageType {
                 headerText: qsTr("Application")
             }
 
+            SwitcherType {
+                visible: GC.isMobile()
+
+                Layout.fillWidth: true
+                Layout.margins: 16
+
+                text: qsTr("Allow application screenshots")
+
+                checked: SettingsController.isScreenshotsEnabled()
+                onCheckedChanged: {
+                    if (checked !== SettingsController.isScreenshotsEnabled()) {
+                        SettingsController.toggleScreenshotsEnabled(checked)
+                    }
+                }
+            }
+
+            DividerType {
+                visible: GC.isMobile()
+            }
+
             SwitcherType {
                 visible: !GC.isMobile()
 

From 39c2124a26d1401fa4434fb790ff2780f5a20d84 Mon Sep 17 00:00:00 2001
From: "vladimir.kuznetsov" <nethiuswork@gmail.com>
Date: Sun, 1 Oct 2023 21:43:30 +0500
Subject: [PATCH 158/278] returned the awg setting via wg-quick

---
 client/server_scripts/amnezia_wireguard/start.sh | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/client/server_scripts/amnezia_wireguard/start.sh b/client/server_scripts/amnezia_wireguard/start.sh
index 505ce53e..b371d5b5 100644
--- a/client/server_scripts/amnezia_wireguard/start.sh
+++ b/client/server_scripts/amnezia_wireguard/start.sh
@@ -6,11 +6,10 @@ echo "Container startup"
 #ifconfig eth0:0 $SERVER_IP_ADDRESS netmask 255.255.255.255 up
 
 # kill daemons in case of restart
-# wg-quick down /opt/amnezia/amneziawireguard/wg0.conf
+wg-quick down /opt/amnezia/amneziawireguard/wg0.conf
 
-/usr/bin/amnezia-wg wg0 && /usr/bin/wg setconf wg0 /opt/amnezia/amneziawireguard/wg0.conf && ip address add dev wg0 10.8.1.1/24 && ip link set up dev wg0
-# # # start daemons if configured
-# # if [ -f /opt/amnezia/amneziawireguard/wg0.conf ]; then (wg-quick up /opt/amnezia/amneziawireguard/wg0.conf); fi
+# start daemons if configured
+if [ -f /opt/amnezia/amneziawireguard/wg0.conf ]; then (wg-quick up /opt/amnezia/amneziawireguard/wg0.conf); fi
 
 # Allow traffic on the TUN interface.
 iptables -A INPUT -i wg0 -j ACCEPT

From 3d999a503c865402cd38c22713071e001cc4f614 Mon Sep 17 00:00:00 2001
From: Matthew Schwiebert <Matthewschwiebert@gmail.com>
Date: Sun, 1 Oct 2023 20:35:05 -0400
Subject: [PATCH 159/278] Add custom drawer behavior to pageHome, for mobile
 and desktop

---
 client/ui/qml/Controls2/DrawerType.qml |  23 ++--
 client/ui/qml/Pages2/PageHome.qml      | 156 ++++++++++++++++++-------
 2 files changed, 121 insertions(+), 58 deletions(-)

diff --git a/client/ui/qml/Controls2/DrawerType.qml b/client/ui/qml/Controls2/DrawerType.qml
index bb2ee4aa..4ea24091 100644
--- a/client/ui/qml/Controls2/DrawerType.qml
+++ b/client/ui/qml/Controls2/DrawerType.qml
@@ -5,7 +5,6 @@ Drawer {
     id: drawer
     property bool needCloseButton: true
     property bool isOpened: false
-    property int pageHeight
 
     Connections {
         target: PageController
@@ -51,26 +50,23 @@ Drawer {
         if (PageController.getInitialPageNavigationBarColor() !== 0xFF1C1D21) {
             PageController.updateNavigationBarColor(0xFF1C1D21)
         }
-
-        if (needCloseButton) {
-            PageController.drawerOpen()
-        }
-        position = (dragMargin / pageHeight)
-    }
-
-    onAboutToHide: {
-        if (needCloseButton) {
-            PageController.drawerClose()
-        }
     }
 
     onOpened: {
         isOpened = true
+
+        if (needCloseButton) {
+            PageController.drawerOpen()
+        }
     }
 
     onClosed: {
         isOpened = false
 
+        if (needCloseButton) {
+            PageController.drawerClose()
+        }
+
         var initialPageNavigationBarColor = PageController.getInitialPageNavigationBarColor()
         if (initialPageNavigationBarColor !== 0xFF1C1D21) {
             PageController.updateNavigationBarColor(initialPageNavigationBarColor)
@@ -79,10 +75,9 @@ Drawer {
 
 
     onPositionChanged: {
-        if (position < (dragMargin / root.height)) {
+        if (isOpened && (position <= 0.99 && position >= 0.95)) {
             mouseArea.canceled()
             drawer.close()
-            position = 0
             mouseArea.exited()
             dropArea.exited()
         }
diff --git a/client/ui/qml/Pages2/PageHome.qml b/client/ui/qml/Pages2/PageHome.qml
index bfebbb21..d38cec15 100644
--- a/client/ui/qml/Pages2/PageHome.qml
+++ b/client/ui/qml/Pages2/PageHome.qml
@@ -27,10 +27,8 @@ PageType {
     property string defaultContainerName: ContainersModel.defaultContainerName
 
     Item {
-        anchors.top: parent.top
-        anchors.bottom: buttonBackground.top
-        anchors.right: parent.right
-        anchors.left: parent.left
+        anchors.fill: parent
+        anchors.bottomMargin: buttonContent.collapsedHeight
 
         ConnectButton {
             anchors.centerIn: parent
@@ -41,17 +39,45 @@ PageType {
         target: PageController
 
         function onRestorePageHomeState(isContainerInstalled) {
-            menu.visible = true
+            buttonContent.state = "expanded"
             if (isContainerInstalled) {
                 containersDropDown.menuVisible = true
             }
         }
+        function onForceCloseDrawer() {
+            buttonContent.state = "collapsed"
+        }
+    }
+
+    MouseArea {
+        id: dragArea
+
+        anchors.fill: buttonBackground
+        cursorShape: Qt.PointingHandCursor
+        hoverEnabled: true
+
+        drag.target: buttonContent
+        drag.axis: Drag.YAxis
+        drag.maximumY: root.height - buttonContent.collapsedHeight
+        drag.minimumY: 100
+
+        onReleased: {
+            if (buttonContent.state === "collapsed" && buttonContent.y < dragArea.drag.maximumY) {
+                buttonContent.state = "expanded"
+                return
+            }
+            if (buttonContent.state === "expanded" && buttonContent.y > dragArea.drag.minimumY) {
+                buttonContent.state = "collapsed"
+                return
+            }
+        }
     }
 
     Rectangle {
         id: buttonBackground
-        anchors.fill: buttonContent
 
+        anchors { left: buttonContent.left; right: buttonContent.right; top: buttonContent.top }
+        height: root.height
         radius: 16
         color: root.defaultColor
         border.color: root.borderColor
@@ -69,15 +95,67 @@ PageType {
 
     ColumnLayout {
         id: buttonContent
-        anchors.right: parent.right
-        anchors.left: parent.left
-        anchors.bottom: parent.bottom
+
+        property int collapsedHeight: 0
+        property bool expandedVisibility: buttonContent.state === "expanded" || (buttonContent.state === "collapsed" && dragArea.drag.active == true)
+        property bool collapsedVisibility: (buttonContent.state === "collapsed" && dragArea.drag.active == false) || buttonContent.state === "collapsed"
+
+        Drag.active: dragArea.drag.active
+        anchors.right: root.right
+        anchors.left: root.left
+        y: root.height - buttonContent.height
+
+        Component.onCompleted: {
+            buttonContent.state = "collapsed"
+        }
+
+        onImplicitHeightChanged: {
+            if (buttonContent.state === "collapsed" && collapsedHeight == 0) {
+                collapsedHeight = implicitHeight
+            }
+        }
+
+        onStateChanged: {
+            if (buttonContent.state === "collapsed") {
+                var initialPageNavigationBarColor = PageController.getInitialPageNavigationBarColor()
+                if (initialPageNavigationBarColor !== 0xFF1C1D21) {
+                    PageController.updateNavigationBarColor(initialPageNavigationBarColor)
+                }
+                PageController.drawerClose()
+                return
+            }
+            if (buttonContent.state === "expanded") {
+                if (PageController.getInitialPageNavigationBarColor() !== 0xFF1C1D21) {
+                    PageController.updateNavigationBarColor(0xFF1C1D21)
+                }
+                PageController.drawerOpen()
+                return
+            }
+        }
+
+        states: [
+            State {
+            name: "collapsed"
+            PropertyChanges {
+                target: buttonContent
+                y: root.height - collapsedHeight
+            }
+        },
+            State {
+                name: "expanded"
+                PropertyChanges {
+                    target: buttonContent
+                    y: dragArea.drag.minimumY
+
+                }
+            }]
 
         RowLayout {
             Layout.topMargin: 24
             Layout.leftMargin: 24
             Layout.rightMargin: 24
             Layout.alignment: Qt.AlignHCenter | Qt.AlignVCenter
+            visible: buttonContent.collapsedVisibility
 
             spacing: 0
 
@@ -104,6 +182,7 @@ PageType {
         LabelTextType {
             Layout.bottomMargin: 44
             Layout.alignment: Qt.AlignHCenter | Qt.AlignVCenter
+            visible: buttonContent.collapsedVisibility
 
             text: {
                 var description = ""
@@ -122,39 +201,13 @@ PageType {
                 return description
             }
         }
-    }
-
-    MouseArea {
-        anchors.fill: buttonBackground
-        cursorShape: Qt.PointingHandCursor
-        hoverEnabled: true
-
-        onClicked: {
-            menu.visible = true
-        }
-    }
-
-    DrawerType {
-        id: menu
-
-        interactive: {
-            if (stackView && stackView.currentItem) {
-                return (stackView.currentItem.objectName === PageController.getPagePath(PageEnum.PageHome)) ? true : false
-            } else {
-                return false
-            }
-        }
-        dragMargin: buttonBackground.height + 56 // page start tabBar height
-
-        width: parent.width
-        height: parent.height * 0.9
-        pageHeight: root.height
 
         ColumnLayout {
             id: serversMenuHeader
-            anchors.top: parent.top
-            anchors.right: parent.right
-            anchors.left: parent.left
+
+            Layout.alignment: Qt.AlignTop | Qt.AlignHCenter
+            Layout.fillWidth: true
+            visible: buttonContent.expandedVisibility
 
             Header1TextType {
                 Layout.fillWidth: true
@@ -233,13 +286,14 @@ PageType {
                 Layout.topMargin: 48
                 Layout.leftMargin: 16
                 Layout.rightMargin: 16
+                visible: buttonContent.expandedVisibility
 
                 actionButtonImage: "qrc:/images/controls/plus.svg"
 
                 headerText: qsTr("Servers")
 
                 actionButtonFunction: function() {
-                    menu.visible = false
+                    buttonContent.state = "collapsed"
                     connectionTypeSelection.visible = true
                 }
             }
@@ -249,10 +303,23 @@ PageType {
             }
         }
 
-        FlickableType {
-            anchors.top: serversMenuHeader.bottom
-            anchors.topMargin: 16
+        Flickable {
+            id: serversContainer
+            Layout.alignment: Qt.AlignTop | Qt.AlignHCenter
+            Layout.fillWidth: true
+            Layout.topMargin: 16
             contentHeight: col.implicitHeight
+            height: 500
+            visible: buttonContent.expandedVisibility
+            clip: true
+
+            ScrollBar.vertical: ScrollBar {
+                id: scrollBar
+                policy: serversContainer.height >= serversContainer.contentHeight ? ScrollBar.AlwaysOff : ScrollBar.AlwaysOn
+            }
+
+            Keys.onUpPressed: scrollBar.decrease()
+            Keys.onDownPressed: scrollBar.increase()
 
             Column {
                 id: col
@@ -266,6 +333,7 @@ PageType {
                     id: serversRadioButtonGroup
                 }
 
+
                 ListView {
                     id: serversMenuContent
                     width: parent.width
@@ -347,7 +415,7 @@ PageType {
                                     onClicked: function() {
                                         ServersModel.currentlyProcessedIndex = index
                                         PageController.goToPage(PageEnum.PageSettingsServerInfo)
-                                        menu.visible = false
+                                        buttonContent.state = "collapsed"
                                     }
                                 }
                             }

From a6134ca10f0611fdb7c2522b24c589231cf79931 Mon Sep 17 00:00:00 2001
From: Matthew Schwiebert <Matthewschwiebert@gmail.com>
Date: Sun, 1 Oct 2023 20:43:39 -0400
Subject: [PATCH 160/278] fix visibility bug of collapsed state

---
 client/ui/qml/Pages2/PageHome.qml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/ui/qml/Pages2/PageHome.qml b/client/ui/qml/Pages2/PageHome.qml
index d38cec15..61fff248 100644
--- a/client/ui/qml/Pages2/PageHome.qml
+++ b/client/ui/qml/Pages2/PageHome.qml
@@ -97,8 +97,8 @@ PageType {
         id: buttonContent
 
         property int collapsedHeight: 0
-        property bool expandedVisibility: buttonContent.state === "expanded" || (buttonContent.state === "collapsed" && dragArea.drag.active == true)
-        property bool collapsedVisibility: (buttonContent.state === "collapsed" && dragArea.drag.active == false) || buttonContent.state === "collapsed"
+        property bool expandedVisibility: buttonContent.state === "expanded" || (buttonContent.state === "collapsed" && dragArea.drag.active === true)
+        property bool collapsedVisibility: buttonContent.state === "collapsed" && dragArea.drag.active === false
 
         Drag.active: dragArea.drag.active
         anchors.right: root.right

From 4e6c1094f3aa275ae3127b492490baf659ed4daa Mon Sep 17 00:00:00 2001
From: "vladimir.kuznetsov" <nethiuswork@gmail.com>
Date: Mon, 2 Oct 2023 16:31:50 +0500
Subject: [PATCH 161/278] minor ui fixes

---
 .../ui/qml/Components/HomeRootMenuButton.qml  | 31 ++++++-------------
 client/ui/qml/Controls2/BackButtonType.qml    |  3 ++
 client/ui/qml/Controls2/DropDownType.qml      | 17 ++++++++++
 client/ui/qml/Controls2/Header2Type.qml       |  3 ++
 client/ui/qml/Controls2/HeaderType.qml        |  3 ++
 client/ui/qml/Controls2/ImageButtonType.qml   | 11 +++----
 .../ui/qml/Controls2/LabelWithButtonType.qml  |  3 ++
 .../qml/Controls2/TextFieldWithHeaderType.qml |  2 +-
 .../ui/qml/Controls2/TopCloseButtonType.qml   |  3 ++
 client/ui/qml/Pages2/PageHome.qml             |  6 +++-
 client/ui/qml/Pages2/PageSetupWizardEasy.qml  |  4 +--
 11 files changed, 53 insertions(+), 33 deletions(-)

diff --git a/client/ui/qml/Components/HomeRootMenuButton.qml b/client/ui/qml/Components/HomeRootMenuButton.qml
index aa6d8f9b..ca800125 100644
--- a/client/ui/qml/Components/HomeRootMenuButton.qml
+++ b/client/ui/qml/Components/HomeRootMenuButton.qml
@@ -62,25 +62,13 @@ Item {
                 hoverEnabled: false
                 image: rightImageSource
                 imageColor: rightImageColor
-                visible: rightImageSource ? true : false
 
-                implicitSize: 18
-                backGroudRadius: 5
-                horizontalPadding: 0
-                padding: 0
-                spacing: 0
-
-
-                Rectangle {
-                    id: rightImageBackground
-                    anchors.fill: parent
-                    radius: 16
-                    color: "transparent"
-
-                    Behavior on color {
-                        PropertyAnimation { duration: 200 }
-                    }
-                }
+                icon.width: 18
+                icon.height: 18
+                backgroundRadius: 16
+                horizontalPadding: 4
+                topPadding: 4
+                bottomPadding: 3
             }
         }
 
@@ -107,26 +95,25 @@ Item {
         }
     }
 
-
     MouseArea {
         anchors.fill: parent
         cursorShape: Qt.PointingHandCursor
         hoverEnabled: true
 
         onEntered: {
-            rightImageBackground.color = rightImage.hoveredColor
+            rightImage.backgroundColor = rightImage.hoveredColor
 
             root.textOpacity = 0.8
         }
 
         onExited: {
-            rightImageBackground.color = rightImage.defaultColor
+            rightImage.backgroundColor = rightImage.defaultColor
 
             root.textOpacity = 1
         }
 
         onPressedChanged: {
-            rightImageBackground.color = pressed ? rightImage.pressedColor : entered ? rightImage.hoveredColor : rightImage.defaultColor
+            rightImage.backgroundColor = pressed ? rightImage.pressedColor : entered ? rightImage.hoveredColor : rightImage.defaultColor
 
             root.textOpacity = 0.7
         }
diff --git a/client/ui/qml/Controls2/BackButtonType.qml b/client/ui/qml/Controls2/BackButtonType.qml
index 67ffbd9c..f1044745 100644
--- a/client/ui/qml/Controls2/BackButtonType.qml
+++ b/client/ui/qml/Controls2/BackButtonType.qml
@@ -23,6 +23,9 @@ Item {
             image: backButtonImage
             imageColor: "#D7D8DB"
 
+            implicitWidth: 40
+            implicitHeight: 40
+
             onClicked: {
                 if (backButtonFunction && typeof backButtonFunction === "function") {
                     backButtonFunction()
diff --git a/client/ui/qml/Controls2/DropDownType.qml b/client/ui/qml/Controls2/DropDownType.qml
index 2feb5e17..b91f0b7a 100644
--- a/client/ui/qml/Controls2/DropDownType.qml
+++ b/client/ui/qml/Controls2/DropDownType.qml
@@ -24,6 +24,8 @@ Item {
     property string rootButtonImage: "qrc:/images/controls/chevron-down.svg"
     property string rootButtonImageColor: "#D7D8DB"
     property string rootButtonBackgroundColor: "#1C1D21"
+    property string rootButtonBackgroundHoveredColor: "#1C1D21"
+    property string rootButtonBackgroundPressedColor: "#1C1D21"
 
     property string rootButtonHoveredBorderColor: "#494B50"
     property string rootButtonDefaultBorderColor: "#2C2D30"
@@ -71,6 +73,10 @@ Item {
         Behavior on border.color {
             PropertyAnimation { duration: 200 }
         }
+
+        Behavior on color {
+            PropertyAnimation { duration: 200 }
+        }
     }
 
     RowLayout {
@@ -112,6 +118,9 @@ Item {
         ImageButtonType {
             Layout.rightMargin: 16
 
+            implicitWidth: 40
+            implicitHeight: 40
+
             hoverEnabled: false
             image: rootButtonImage
             imageColor: rootButtonImageColor
@@ -126,12 +135,20 @@ Item {
         onEntered: {
             if (menu.visible === false) {
                 rootButtonBackground.border.color = rootButtonHoveredBorderColor
+                rootButtonBackground.color = rootButtonBackgroundHoveredColor
             }
         }
 
         onExited: {
             if (menu.visible === false) {
                 rootButtonBackground.border.color = rootButtonDefaultBorderColor
+                rootButtonBackground.color = rootButtonBackgroundColor
+            }
+        }
+
+        onPressed: {
+            if (menu.visible === false) {
+                rootButtonBackground.color = pressed ? rootButtonBackgroundPressedColor : entered ? rootButtonHoveredBorderColor : rootButtonDefaultBorderColor
             }
         }
 
diff --git a/client/ui/qml/Controls2/Header2Type.qml b/client/ui/qml/Controls2/Header2Type.qml
index 9433f52a..4d812f6c 100644
--- a/client/ui/qml/Controls2/Header2Type.qml
+++ b/client/ui/qml/Controls2/Header2Type.qml
@@ -31,6 +31,9 @@ Item {
             ImageButtonType {
                 id: headerActionButton
 
+                implicitWidth: 40
+                implicitHeight: 40
+
                 image: root.actionButtonImage
                 imageColor: "#D7D8DB"
 
diff --git a/client/ui/qml/Controls2/HeaderType.qml b/client/ui/qml/Controls2/HeaderType.qml
index b4af3784..d0ed3418 100644
--- a/client/ui/qml/Controls2/HeaderType.qml
+++ b/client/ui/qml/Controls2/HeaderType.qml
@@ -36,6 +36,9 @@ Item {
             ImageButtonType {
                 id: headerActionButton
 
+                implicitWidth: 40
+                implicitHeight: 40
+
                 Layout.alignment: Qt.AlignRight
 
                 image: root.actionButtonImage
diff --git a/client/ui/qml/Controls2/ImageButtonType.qml b/client/ui/qml/Controls2/ImageButtonType.qml
index 55e19f42..1ab57511 100644
--- a/client/ui/qml/Controls2/ImageButtonType.qml
+++ b/client/ui/qml/Controls2/ImageButtonType.qml
@@ -15,11 +15,8 @@ Button {
     property string imageColor: "#878B91"
     property string disableImageColor: "#2C2D30"
 
-    property int backGroudRadius: 12
-    property int implicitSize: 40
-
-    implicitWidth: implicitSize
-    implicitHeight: implicitSize
+    property alias backgroundColor: background.color
+    property alias backgroundRadius: background.radius
 
     hoverEnabled: true
 
@@ -34,16 +31,16 @@ Button {
         id: background
 
         anchors.fill: parent
-        radius: backGroudRadius
         color: {
             if (root.enabled) {
-                if(root.pressed) {
+                if (root.pressed) {
                     return pressedColor
                 }
                 return hovered ? hoveredColor : defaultColor
             }
             return defaultColor
         }
+        radius: 12
         Behavior on color {
             PropertyAnimation { duration: 200 }
         }
diff --git a/client/ui/qml/Controls2/LabelWithButtonType.qml b/client/ui/qml/Controls2/LabelWithButtonType.qml
index 7a1489c0..bb051f76 100644
--- a/client/ui/qml/Controls2/LabelWithButtonType.qml
+++ b/client/ui/qml/Controls2/LabelWithButtonType.qml
@@ -119,6 +119,9 @@ Item {
         ImageButtonType {
             id: rightImage
 
+            implicitWidth: 40
+            implicitHeight: 40
+
             hoverEnabled: false
             image: rightImageSource
             imageColor: rightImageColor
diff --git a/client/ui/qml/Controls2/TextFieldWithHeaderType.qml b/client/ui/qml/Controls2/TextFieldWithHeaderType.qml
index 3a3f5a1a..b09ae00d 100644
--- a/client/ui/qml/Controls2/TextFieldWithHeaderType.qml
+++ b/client/ui/qml/Controls2/TextFieldWithHeaderType.qml
@@ -167,7 +167,7 @@ Item {
         }
 
         onEntered: {
-            backgroud.border.color =  getBackgroundBorderColor(bgBorderHoveredColor)
+            backgroud.border.color = getBackgroundBorderColor(bgBorderHoveredColor)
         }
 
 
diff --git a/client/ui/qml/Controls2/TopCloseButtonType.qml b/client/ui/qml/Controls2/TopCloseButtonType.qml
index ed89b5a6..4a738214 100644
--- a/client/ui/qml/Controls2/TopCloseButtonType.qml
+++ b/client/ui/qml/Controls2/TopCloseButtonType.qml
@@ -23,6 +23,9 @@ Popup {
         image: "qrc:/images/svg/close_black_24dp.svg"
         imageColor: "#D7D8DB"
 
+        implicitWidth: 40
+        implicitHeight: 40
+
         onClicked: {
             PageController.goToDrawerRootPage()
         }
diff --git a/client/ui/qml/Pages2/PageHome.qml b/client/ui/qml/Pages2/PageHome.qml
index 77c60684..ee7cc678 100644
--- a/client/ui/qml/Pages2/PageHome.qml
+++ b/client/ui/qml/Pages2/PageHome.qml
@@ -134,8 +134,10 @@ PageType {
 
                     rootButtonImageColor: "#0E0E11"
                     rootButtonBackgroundColor: "#D7D8DB"
+                    rootButtonBackgroundHoveredColor: Qt.rgba(215, 216, 219, 0.8)
+                    rootButtonBackgroundPressedColor: Qt.rgba(215, 216, 219, 0.65)
                     rootButtonHoveredBorderColor: "transparent"
-                    rootButtonPressedBorderColor: "transparent"
+                    rootButtonDefaultBorderColor: "transparent"
                     rootButtonTextTopMargin: 8
                     rootButtonTextBottomMargin: 8
 
@@ -304,6 +306,8 @@ PageType {
 
                             DividerType {
                                 Layout.fillWidth: true
+                                Layout.leftMargin: 0
+                                Layout.rightMargin: 0
                             }
                         }
                     }
diff --git a/client/ui/qml/Pages2/PageSetupWizardEasy.qml b/client/ui/qml/Pages2/PageSetupWizardEasy.qml
index 4f94e985..04814c5c 100644
--- a/client/ui/qml/Pages2/PageSetupWizardEasy.qml
+++ b/client/ui/qml/Pages2/PageSetupWizardEasy.qml
@@ -62,6 +62,7 @@ PageType {
                 id: header
 
                 implicitWidth: parent.width
+                headerTextMaximumLineCount: 10
 
                 headerText: qsTr("What is the level of internet control in your region?")
             }
@@ -145,14 +146,13 @@ PageType {
 
             Item {
                 implicitWidth: 1
-                implicitHeight: 1
+                implicitHeight: 54
             }
 
             BasicButtonType {
                 id: continueButton
 
                 implicitWidth: parent.width
-                anchors.topMargin: 24
 
                 text: qsTr("Continue")
 

From 50b8b3d649714a3465fbebaa0aa26543fa0b3ad1 Mon Sep 17 00:00:00 2001
From: "vladimir.kuznetsov" <nethiuswork@gmail.com>
Date: Mon, 2 Oct 2023 18:30:32 +0500
Subject: [PATCH 162/278] added parsing of wireguard config parameters when
 importing native configs

---
 client/ui/controllers/importController.cpp | 68 +++++++++++++++++++---
 1 file changed, 61 insertions(+), 7 deletions(-)

diff --git a/client/ui/controllers/importController.cpp b/client/ui/controllers/importController.cpp
index d9278ece..f9cc2d03 100644
--- a/client/ui/controllers/importController.cpp
+++ b/client/ui/controllers/importController.cpp
@@ -223,21 +223,75 @@ QJsonObject ImportController::extractOpenVpnConfig(const QString &data)
 
 QJsonObject ImportController::extractWireGuardConfig(const QString &data)
 {
+    QMap<QString, QString> configMap;
+    auto configByLines = data.split("\n");
+    for (const QString &line : configByLines) {
+        QString trimmedLine = line.trimmed();
+        if (trimmedLine.startsWith("[") && trimmedLine.endsWith("]")) {
+            continue;
+        } else {
+            QStringList parts = trimmedLine.split(" = ");
+            if (parts.count() == 2) {
+                configMap[parts.at(0).trimmed()] = parts.at(1).trimmed();
+            }
+        }
+    }
+
     QJsonObject lastConfig;
     lastConfig[config_key::config] = data;
 
-    const static QRegularExpression hostNameAndPortRegExp("Endpoint = (.*)(?::([0-9]*))?");
+    const static QRegularExpression hostNameAndPortRegExp("Endpoint = (.*):([0-9]*)");
     QRegularExpressionMatch hostNameAndPortMatch = hostNameAndPortRegExp.match(data);
     QString hostName;
     QString port;
     if (hostNameAndPortMatch.hasCaptured(1)) {
         hostName = hostNameAndPortMatch.captured(1);
-    } /*else {
-        qDebug() << "send error?"
-    }*/
+    } else {
+        qDebug() << "Failed to import profile";
+        emit importErrorOccurred(errorString(ErrorCode::ImportInvalidConfigError));
+    }
 
     if (hostNameAndPortMatch.hasCaptured(2)) {
         port = hostNameAndPortMatch.captured(2);
+    } else {
+        port = protocols::wireguard::defaultPort;
+    }
+
+    lastConfig[config_key::hostName] = hostName;
+    lastConfig[config_key::port] = port.toInt();
+
+//    if (!configMap.value("PrivateKey").isEmpty() && !configMap.value("Address").isEmpty()
+//        && !configMap.value("PresharedKey").isEmpty() && !configMap.value("PublicKey").isEmpty()) {
+        lastConfig[config_key::client_priv_key] = configMap.value("PrivateKey");
+        lastConfig[config_key::client_ip] = configMap.value("Address");
+        lastConfig[config_key::psk_key] = configMap.value("PresharedKey");
+        lastConfig[config_key::server_pub_key] = configMap.value("PublicKey");
+//    } else {
+//        qDebug() << "Failed to import profile";
+//        emit importErrorOccurred(errorString(ErrorCode::ImportInvalidConfigError));
+//        return QJsonObject();
+//    }
+
+    QString protocolName = "wireguard";
+    if (!configMap.value(config_key::junkPacketCount).isEmpty()
+        && !configMap.value(config_key::junkPacketMinSize).isEmpty()
+        && !configMap.value(config_key::junkPacketMaxSize).isEmpty()
+        && !configMap.value(config_key::initPacketJunkSize).isEmpty()
+        && !configMap.value(config_key::responsePacketJunkSize).isEmpty()
+        && !configMap.value(config_key::initPacketMagicHeader).isEmpty()
+        && !configMap.value(config_key::responsePacketMagicHeader).isEmpty()
+        && !configMap.value(config_key::underloadPacketMagicHeader).isEmpty()
+        && !configMap.value(config_key::transportPacketMagicHeader).isEmpty()) {
+        lastConfig[config_key::junkPacketCount] = configMap.value(config_key::junkPacketCount);
+        lastConfig[config_key::junkPacketMinSize] = configMap.value(config_key::junkPacketMinSize);
+        lastConfig[config_key::junkPacketMaxSize] = configMap.value(config_key::junkPacketMaxSize);
+        lastConfig[config_key::initPacketJunkSize] = configMap.value(config_key::initPacketJunkSize);
+        lastConfig[config_key::responsePacketJunkSize] = configMap.value(config_key::responsePacketJunkSize);
+        lastConfig[config_key::initPacketMagicHeader] = configMap.value(config_key::initPacketMagicHeader);
+        lastConfig[config_key::responsePacketMagicHeader] = configMap.value(config_key::responsePacketMagicHeader);
+        lastConfig[config_key::underloadPacketMagicHeader] = configMap.value(config_key::underloadPacketMagicHeader);
+        lastConfig[config_key::transportPacketMagicHeader] = configMap.value(config_key::transportPacketMagicHeader);
+        protocolName = "amneziawireguard";
     }
 
     QJsonObject wireguardConfig;
@@ -247,15 +301,15 @@ QJsonObject ImportController::extractWireGuardConfig(const QString &data)
     wireguardConfig[config_key::transport_proto] = "udp";
 
     QJsonObject containers;
-    containers.insert(config_key::container, QJsonValue("amnezia-wireguard"));
-    containers.insert(config_key::wireguard, QJsonValue(wireguardConfig));
+    containers.insert(config_key::container, QJsonValue("amnezia-" + protocolName));
+    containers.insert(protocolName, QJsonValue(wireguardConfig));
 
     QJsonArray arr;
     arr.push_back(containers);
 
     QJsonObject config;
     config[config_key::containers] = arr;
-    config[config_key::defaultContainer] = "amnezia-wireguard";
+    config[config_key::defaultContainer] = "amnezia-" + protocolName;
     config[config_key::description] = m_settings->nextAvailableServerName();
 
     const static QRegularExpression dnsRegExp(

From 304f29bfac020be5600ef1a8c9c2dc59177a4805 Mon Sep 17 00:00:00 2001
From: "vladimir.kuznetsov" <nethiuswork@gmail.com>
Date: Mon, 2 Oct 2023 20:03:01 +0500
Subject: [PATCH 163/278] returned 'address' to awg server config and set it to
 10.8.1.1/24

---
 client/server_scripts/amnezia_wireguard/configure_container.sh | 2 +-
 client/server_scripts/amnezia_wireguard/start.sh               | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/client/server_scripts/amnezia_wireguard/configure_container.sh b/client/server_scripts/amnezia_wireguard/configure_container.sh
index fa7b09f9..6ebebc4a 100644
--- a/client/server_scripts/amnezia_wireguard/configure_container.sh
+++ b/client/server_scripts/amnezia_wireguard/configure_container.sh
@@ -12,7 +12,7 @@ echo $WIREGUARD_PSK > /opt/amnezia/amneziawireguard/wireguard_psk.key
 cat > /opt/amnezia/amneziawireguard/wg0.conf <<EOF
 [Interface]
 PrivateKey = $WIREGUARD_SERVER_PRIVATE_KEY
-# Address = $WIREGUARD_SUBNET_IP/$WIREGUARD_SUBNET_CIDR
+Address = 10.8.1.1/24
 ListenPort = $AMNEZIAWIREGUARD_SERVER_PORT
 Jc = $JUNK_PACKET_COUNT
 Jmin = $JUNK_PACKET_MIN_SIZE
diff --git a/client/server_scripts/amnezia_wireguard/start.sh b/client/server_scripts/amnezia_wireguard/start.sh
index b371d5b5..bbc68f37 100644
--- a/client/server_scripts/amnezia_wireguard/start.sh
+++ b/client/server_scripts/amnezia_wireguard/start.sh
@@ -5,6 +5,9 @@
 echo "Container startup"
 #ifconfig eth0:0 $SERVER_IP_ADDRESS netmask 255.255.255.255 up
 
+mkdir -p /dev/net
+mknod /dev/net/tun c 10 200
+
 # kill daemons in case of restart
 wg-quick down /opt/amnezia/amneziawireguard/wg0.conf
 

From 6dbbf1fc899fbffd00efea105895c894efe92ad4 Mon Sep 17 00:00:00 2001
From: "vladimir.kuznetsov" <nethiuswork@gmail.com>
Date: Mon, 2 Oct 2023 18:48:11 +0300
Subject: [PATCH 164/278] added parsing parameters for windows

---
 client/daemon/daemon.cpp          |  6 +++++-
 client/daemon/interfaceconfig.cpp | 31 +++++++++++++++++++++++++++++++
 2 files changed, 36 insertions(+), 1 deletion(-)

diff --git a/client/daemon/daemon.cpp b/client/daemon/daemon.cpp
index 63a5c7f6..b85b2c33 100644
--- a/client/daemon/daemon.cpp
+++ b/client/daemon/daemon.cpp
@@ -360,7 +360,11 @@ bool Daemon::parseConfig(const QJsonObject& obj, InterfaceConfig& config) {
     return false;
   }
 
-  if (!obj.value("Jc").isNull()) {
+  if (!obj.value("Jc").isNull() && !obj.value("Jmin").isNull() 
+  && !obj.value("Jmax").isNull() && !obj.value("S1").isNull() 
+  && !obj.value("S2").isNull() && !obj.value("H1").isNull() 
+  && !obj.value("H2").isNull() && !obj.value("H3").isNull() 
+  && !obj.value("H4").isNull()) {
     config.m_junkPacketCount = obj.value("Jc").toString();
     config.m_junkPacketMinSize = obj.value("Jmin").toString();
     config.m_junkPacketMaxSize = obj.value("Jmax").toString();
diff --git a/client/daemon/interfaceconfig.cpp b/client/daemon/interfaceconfig.cpp
index 68bebca0..b24a35c7 100644
--- a/client/daemon/interfaceconfig.cpp
+++ b/client/daemon/interfaceconfig.cpp
@@ -97,6 +97,37 @@ QString InterfaceConfig::toWgConf(const QMap<QString, QString>& extra) const {
     out << "DNS = " << dnsServers.join(", ") << "\n";
   }
 
+  if (!m_junkPacketCount.isNull()) {
+    out << "JunkPacketCount = " << m_junkPacketCount << "\n";
+  }
+  if (!m_junkPacketMinSize.isNull()) {
+    out << "JunkPacketMinSize = " << m_junkPacketMinSize << "\n";
+  }
+  if (!m_junkPacketMaxSize.isNull()) {
+    out << "JunkPacketMaxSize = " << m_junkPacketMaxSize << "\n";
+  }
+  if (!m_initPacketJunkSize.isNull()) {
+    out << "InitPacketJunkSize = " << m_initPacketJunkSize << "\n";
+  }
+  if (!m_responsePacketJunkSize.isNull()) {
+    out << "ResponsePacketJunkSize = " << m_responsePacketJunkSize << "\n";
+  }
+  if (!m_initPacketMagicHeader.isNull()) {
+    out << "InitPacketMagicHeader = " << m_initPacketMagicHeader << "\n";
+  }
+  if (!m_responsePacketMagicHeader.isNull()) {
+    out << "ResponsePacketMagicHeader = " << m_responsePacketMagicHeader
+        << "\n";
+  }
+  if (!m_underloadPacketMagicHeader.isNull()) {
+    out << "UnderloadPacketMagicHeader = " << m_underloadPacketMagicHeader
+        << "\n";
+  }
+  if (!m_transportPacketMagicHeader.isNull()) {
+    out << "TransportPacketMagicHeader = " << m_transportPacketMagicHeader
+        << "\n";
+  }
+
   // If any extra config was provided, append it now.
   for (const QString& key : extra.keys()) {
     out << key << " = " << extra[key] << "\n";

From 2664a52007596e2b7151e9d04a2efdbb8cbe1182 Mon Sep 17 00:00:00 2001
From: "vladimir.kuznetsov" <nethiuswork@gmail.com>
Date: Mon, 2 Oct 2023 22:04:18 +0500
Subject: [PATCH 165/278] removed the dropdown with protocols on the share full
 access page

---
 client/ui/qml/Pages2/PageShare.qml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/client/ui/qml/Pages2/PageShare.qml b/client/ui/qml/Pages2/PageShare.qml
index a03b3717..b1f0221b 100644
--- a/client/ui/qml/Pages2/PageShare.qml
+++ b/client/ui/qml/Pages2/PageShare.qml
@@ -219,13 +219,14 @@ PageType {
 
                         if (accessTypeSelector.currentIndex !== 0) {
                             shareConnectionDrawer.headerText = qsTr("Accessing ") + serverSelector.text
-                            shareConnectionDrawer.configContentHeaderText = qsTr("File with connection settings to ") + serverSelector.text
+                            shareConnectionDrawer.configContentHeaderText = qsTr("File with accessing settings to ") + serverSelector.text
                         }
                         serverSelector.menuVisible = false
                     }
 
                     Component.onCompleted: {
                         handler()
+                        serverSelector.severSelectorIndexChanged()
                     }
 
                     function handler() {
@@ -240,6 +241,8 @@ PageType {
             DropDownType {
                 id: protocolSelector
 
+                visible: accessTypeSelector.currentIndex === 0
+
                 Layout.fillWidth: true
                 Layout.topMargin: 16
 

From 5bfc581ad2ba8bb10070ae769c33e6df0dd2b3fd Mon Sep 17 00:00:00 2001
From: Matthew Schwiebert <Matthewschwiebert@gmail.com>
Date: Mon, 2 Oct 2023 15:40:25 -0400
Subject: [PATCH 166/278] add documentation, remove uneeded changes of
 drawertype

---
 client/ui/qml/Controls2/DrawerType.qml | 16 +++++++++-------
 client/ui/qml/Pages2/PageHome.qml      |  6 ++++++
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/client/ui/qml/Controls2/DrawerType.qml b/client/ui/qml/Controls2/DrawerType.qml
index 4ea24091..c22d00c2 100644
--- a/client/ui/qml/Controls2/DrawerType.qml
+++ b/client/ui/qml/Controls2/DrawerType.qml
@@ -50,22 +50,24 @@ Drawer {
         if (PageController.getInitialPageNavigationBarColor() !== 0xFF1C1D21) {
             PageController.updateNavigationBarColor(0xFF1C1D21)
         }
-    }
-
-    onOpened: {
-        isOpened = true
 
         if (needCloseButton) {
             PageController.drawerOpen()
         }
     }
 
-    onClosed: {
-        isOpened = false
-
+    onAboutToHide: {
         if (needCloseButton) {
             PageController.drawerClose()
         }
+    }
+
+    onOpened: {
+        isOpened = true
+    }
+
+    onClosed: {
+        isOpened = false
 
         var initialPageNavigationBarColor = PageController.getInitialPageNavigationBarColor()
         if (initialPageNavigationBarColor !== 0xFF1C1D21) {
diff --git a/client/ui/qml/Pages2/PageHome.qml b/client/ui/qml/Pages2/PageHome.qml
index 61fff248..0d39a51e 100644
--- a/client/ui/qml/Pages2/PageHome.qml
+++ b/client/ui/qml/Pages2/PageHome.qml
@@ -61,6 +61,7 @@ PageType {
         drag.maximumY: root.height - buttonContent.collapsedHeight
         drag.minimumY: 100
 
+        /** If drag area is released at any point other than min or max y, transition to the other state */
         onReleased: {
             if (buttonContent.state === "collapsed" && buttonContent.y < dragArea.drag.maximumY) {
                 buttonContent.state = "expanded"
@@ -96,8 +97,11 @@ PageType {
     ColumnLayout {
         id: buttonContent
 
+        /** Initial height of button content */
         property int collapsedHeight: 0
+        /** True when expanded objects should be visible */
         property bool expandedVisibility: buttonContent.state === "expanded" || (buttonContent.state === "collapsed" && dragArea.drag.active === true)
+        /** True when collapsed objects should be visible */
         property bool collapsedVisibility: buttonContent.state === "collapsed" && dragArea.drag.active === false
 
         Drag.active: dragArea.drag.active
@@ -109,6 +113,7 @@ PageType {
             buttonContent.state = "collapsed"
         }
 
+        /** Set once based on first implicit height change once all children are layed out */
         onImplicitHeightChanged: {
             if (buttonContent.state === "collapsed" && collapsedHeight == 0) {
                 collapsedHeight = implicitHeight
@@ -133,6 +138,7 @@ PageType {
             }
         }
 
+        /** Two states of buttonContent, great place to add any future animations for the drawer */
         states: [
             State {
             name: "collapsed"

From 27f770604bb4b48a879668bc89a68dc228dbb5b5 Mon Sep 17 00:00:00 2001
From: ronoaer <ronoaer@gmail.com>
Date: Tue, 3 Oct 2023 15:59:53 +0800
Subject: [PATCH 167/278] tried to translate some pages, from English to
 Chinese

---
 client/translations/amneziavpn_ru.ts         |  28 ++--
 client/translations/amneziavpn_zh_CN.ts      | 132 ++++++++++---------
 client/ui/qml/Pages2/PageSettingsLogging.qml |   2 +-
 3 files changed, 85 insertions(+), 77 deletions(-)

diff --git a/client/translations/amneziavpn_ru.ts b/client/translations/amneziavpn_ru.ts
index 82393e38..f108cbcd 100644
--- a/client/translations/amneziavpn_ru.ts
+++ b/client/translations/amneziavpn_ru.ts
@@ -4,7 +4,7 @@
 <context>
     <name>AmneziaApplication</name>
     <message>
-        <location filename="../amnezia_application.cpp" line="300"/>
+        <location filename="../amnezia_application.cpp" line="299"/>
         <source>Split tunneling for WireGuard is not implemented, the option was disabled</source>
         <translation type="unfinished"></translation>
     </message>
@@ -26,41 +26,41 @@
 <context>
     <name>ConnectionController</name>
     <message>
-        <location filename="../ui/controllers/connectionController.cpp" line="53"/>
+        <location filename="../ui/controllers/connectionController.cpp" line="55"/>
         <source>VPN Protocols is not installed.
  Please install VPN container at first</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/controllers/connectionController.cpp" line="74"/>
+        <location filename="../ui/controllers/connectionController.cpp" line="78"/>
         <source>Connection...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/controllers/connectionController.cpp" line="79"/>
+        <location filename="../ui/controllers/connectionController.cpp" line="83"/>
         <source>Connected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/controllers/connectionController.cpp" line="124"/>
+        <location filename="../ui/controllers/connectionController.cpp" line="128"/>
         <source>Settings updated successfully, Reconnnection...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/controllers/connectionController.cpp" line="88"/>
+        <location filename="../ui/controllers/connectionController.cpp" line="92"/>
         <source>Reconnection...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/controllers/connectionController.h" line="54"/>
-        <location filename="../ui/controllers/connectionController.cpp" line="93"/>
-        <location filename="../ui/controllers/connectionController.cpp" line="107"/>
-        <location filename="../ui/controllers/connectionController.cpp" line="113"/>
+        <location filename="../ui/controllers/connectionController.h" line="58"/>
+        <location filename="../ui/controllers/connectionController.cpp" line="97"/>
+        <location filename="../ui/controllers/connectionController.cpp" line="111"/>
+        <location filename="../ui/controllers/connectionController.cpp" line="117"/>
         <source>Connect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/controllers/connectionController.cpp" line="98"/>
+        <location filename="../ui/controllers/connectionController.cpp" line="102"/>
         <source>Disconnection...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1120,7 +1120,6 @@ And if you don&apos;t like the app, all the more support it - the donation will
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsLogging.qml" line="54"/>
-        <location filename="../ui/qml/Pages2/PageSettingsLogging.qml" line="108"/>
         <source>Save logs</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1129,6 +1128,11 @@ And if you don&apos;t like the app, all the more support it - the donation will
         <source>Open folder with logs</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsLogging.qml" line="108"/>
+        <source>Save</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsLogging.qml" line="109"/>
         <source>Logs files (*.log)</source>
diff --git a/client/translations/amneziavpn_zh_CN.ts b/client/translations/amneziavpn_zh_CN.ts
index c70b0f75..a1f4c4e9 100644
--- a/client/translations/amneziavpn_zh_CN.ts
+++ b/client/translations/amneziavpn_zh_CN.ts
@@ -4,7 +4,7 @@
 <context>
     <name>AmneziaApplication</name>
     <message>
-        <location filename="../amnezia_application.cpp" line="300"/>
+        <location filename="../amnezia_application.cpp" line="299"/>
         <source>Split tunneling for WireGuard is not implemented, the option was disabled</source>
         <translation type="unfinished"></translation>
     </message>
@@ -26,41 +26,41 @@
 <context>
     <name>ConnectionController</name>
     <message>
-        <location filename="../ui/controllers/connectionController.h" line="54"/>
-        <location filename="../ui/controllers/connectionController.cpp" line="93"/>
-        <location filename="../ui/controllers/connectionController.cpp" line="107"/>
-        <location filename="../ui/controllers/connectionController.cpp" line="113"/>
+        <location filename="../ui/controllers/connectionController.h" line="58"/>
+        <location filename="../ui/controllers/connectionController.cpp" line="97"/>
+        <location filename="../ui/controllers/connectionController.cpp" line="111"/>
+        <location filename="../ui/controllers/connectionController.cpp" line="117"/>
         <source>Connect</source>
         <translation type="unfinished">连接</translation>
     </message>
     <message>
-        <location filename="../ui/controllers/connectionController.cpp" line="53"/>
+        <location filename="../ui/controllers/connectionController.cpp" line="55"/>
         <source>VPN Protocols is not installed.
  Please install VPN container at first</source>
         <translation type="unfinished">未安装VPN协议，请安装</translation>
     </message>
     <message>
-        <location filename="../ui/controllers/connectionController.cpp" line="74"/>
+        <location filename="../ui/controllers/connectionController.cpp" line="78"/>
         <source>Connection...</source>
         <translation type="unfinished">连接中</translation>
     </message>
     <message>
-        <location filename="../ui/controllers/connectionController.cpp" line="79"/>
+        <location filename="../ui/controllers/connectionController.cpp" line="83"/>
         <source>Connected</source>
         <translation type="unfinished">已连接</translation>
     </message>
     <message>
-        <location filename="../ui/controllers/connectionController.cpp" line="88"/>
+        <location filename="../ui/controllers/connectionController.cpp" line="92"/>
         <source>Reconnection...</source>
         <translation type="unfinished">重连中</translation>
     </message>
     <message>
-        <location filename="../ui/controllers/connectionController.cpp" line="98"/>
+        <location filename="../ui/controllers/connectionController.cpp" line="102"/>
         <source>Disconnection...</source>
         <translation type="unfinished">断开中</translation>
     </message>
     <message>
-        <location filename="../ui/controllers/connectionController.cpp" line="124"/>
+        <location filename="../ui/controllers/connectionController.cpp" line="128"/>
         <source>Settings updated successfully, Reconnnection...</source>
         <translation type="unfinished">配置已更新，重连中</translation>
     </message>
@@ -477,12 +477,12 @@ Already installed containers were found on the server. All installed containers
     <message>
         <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="364"/>
         <source>Continue</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">继续</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="365"/>
         <source>Cancel</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">取消</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="384"/>
@@ -526,12 +526,12 @@ Already installed containers were found on the server. All installed containers
     <message>
         <location filename="../ui/qml/Pages2/PageProtocolRaw.qml" line="178"/>
         <source>Continue</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">继续</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageProtocolRaw.qml" line="179"/>
         <source>Cancel</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">取消</translation>
     </message>
 </context>
 <context>
@@ -585,12 +585,12 @@ Already installed containers were found on the server. All installed containers
     <message>
         <location filename="../ui/qml/Pages2/PageServiceDnsSettings.qml" line="67"/>
         <source>Continue</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">继续</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageServiceDnsSettings.qml" line="68"/>
         <source>Cancel</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">取消</translation>
     </message>
 </context>
 <context>
@@ -673,12 +673,12 @@ Already installed containers were found on the server. All installed containers
     <message>
         <location filename="../ui/qml/Pages2/PageServiceSftpSettings.qml" line="264"/>
         <source>Continue</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">继续</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageServiceSftpSettings.qml" line="265"/>
         <source>Cancel</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">取消</translation>
     </message>
 </context>
 <context>
@@ -731,12 +731,12 @@ Already installed containers were found on the server. All installed containers
     <message>
         <location filename="../ui/qml/Pages2/PageServiceTorWebsiteSettings.qml" line="142"/>
         <source>Continue</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">继续</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageServiceTorWebsiteSettings.qml" line="143"/>
         <source>Cancel</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">取消</translation>
     </message>
 </context>
 <context>
@@ -759,7 +759,7 @@ Already installed containers were found on the server. All installed containers
     <message>
         <location filename="../ui/qml/Pages2/PageSettings.qml" line="72"/>
         <source>Application</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">应用</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettings.qml" line="86"/>
@@ -861,77 +861,77 @@ And if you don&apos;t like the app, all the more support it - the donation will
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="43"/>
         <source>Application</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">应用</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="52"/>
         <source>Auto start</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">自动运行</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="53"/>
         <source>Launch the application every time </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">当系统 </translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="53"/>
         <source> starts</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"> 启动时应用自动运行</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="73"/>
         <source>Start minimized</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">最小化启动</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="74"/>
         <source>Launch application minimized</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">最小化启动应用程序</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="91"/>
         <source>Language</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">语言</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="110"/>
         <source>Logging</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">日志</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="111"/>
         <source>Enabled</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">开启</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="111"/>
         <source>Disabled</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">关闭</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="124"/>
         <source>Reset settings and remove all data from the application</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">重置并清理应用的所有数据</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="128"/>
         <source>Reset settings and remove all data from the application?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">重置并清理应用的所有数据？</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="129"/>
         <source>All settings will be reset to default. All installed AmneziaVPN services will still remain on the server.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">所有配置恢复为默认值。所有已安装的AmneziaVPN服务将保留服务器上。</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="130"/>
         <source>Continue</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">继续</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="131"/>
         <source>Cancel</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">取消</translation>
     </message>
 </context>
 <context>
@@ -995,12 +995,12 @@ And if you don&apos;t like the app, all the more support it - the donation will
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsBackup.qml" line="137"/>
         <source>Continue</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">继续</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsBackup.qml" line="138"/>
         <source>Cancel</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">取消</translation>
     </message>
 </context>
 <context>
@@ -1081,12 +1081,12 @@ And if you don&apos;t like the app, all the more support it - the donation will
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsDns.qml" line="90"/>
         <source>Continue</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">继续</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsDns.qml" line="91"/>
         <source>Cancel</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">取消</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsDns.qml" line="99"/>
@@ -1096,7 +1096,7 @@ And if you don&apos;t like the app, all the more support it - the donation will
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsDns.qml" line="111"/>
         <source>Save</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">保存</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsDns.qml" line="120"/>
@@ -1109,18 +1109,22 @@ And if you don&apos;t like the app, all the more support it - the donation will
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsLogging.qml" line="47"/>
         <source>Logging</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">日志</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsLogging.qml" line="54"/>
-        <location filename="../ui/qml/Pages2/PageSettingsLogging.qml" line="108"/>
         <source>Save logs</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">记录日志</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsLogging.qml" line="86"/>
         <source>Open folder with logs</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">打开日志文件夹</translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsLogging.qml" line="108"/>
+        <source>Save</source>
+        <translation type="unfinished">保存</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsLogging.qml" line="109"/>
@@ -1130,32 +1134,32 @@ And if you don&apos;t like the app, all the more support it - the donation will
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsLogging.qml" line="126"/>
         <source>Save logs to file</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">保存日志到文件</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsLogging.qml" line="144"/>
         <source>Clear logs?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">清除日志？</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsLogging.qml" line="145"/>
         <source>Continue</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">继续</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsLogging.qml" line="146"/>
         <source>Cancel</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">取消</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsLogging.qml" line="153"/>
         <source>Logs have been cleaned up</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">已清理日志</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsLogging.qml" line="166"/>
         <source>Clear logs</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">清理日志</translation>
     </message>
 </context>
 <context>
@@ -1195,14 +1199,14 @@ And if you don&apos;t like the app, all the more support it - the donation will
         <location filename="../ui/qml/Pages2/PageSettingsServerData.qml" line="140"/>
         <location filename="../ui/qml/Pages2/PageSettingsServerData.qml" line="171"/>
         <source>Continue</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">继续</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsServerData.qml" line="94"/>
         <location filename="../ui/qml/Pages2/PageSettingsServerData.qml" line="141"/>
         <location filename="../ui/qml/Pages2/PageSettingsServerData.qml" line="172"/>
         <source>Cancel</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">取消</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsServerData.qml" line="117"/>
@@ -1255,7 +1259,7 @@ And if you don&apos;t like the app, all the more support it - the donation will
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsServerInfo.qml" line="110"/>
         <source>Save</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">保存</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsServerInfo.qml" line="137"/>
@@ -1299,12 +1303,12 @@ And if you don&apos;t like the app, all the more support it - the donation will
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsServerProtocol.qml" line="118"/>
         <source>Continue</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">继续</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsServerProtocol.qml" line="119"/>
         <source>Cancel</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">取消</translation>
     </message>
 </context>
 <context>
@@ -1345,12 +1349,12 @@ And if you don&apos;t like the app, all the more support it - the donation will
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="199"/>
         <source>Continue</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">继续</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="200"/>
         <source>Cancel</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">取消</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="238"/>
@@ -1481,7 +1485,7 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
     <message>
         <location filename="../ui/qml/Pages2/PageSetupWizardCredentials.qml" line="90"/>
         <source>Continue</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">继续</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSetupWizardCredentials.qml" line="117"/>
@@ -1524,7 +1528,7 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
     <message>
         <location filename="../ui/qml/Pages2/PageSetupWizardEasy.qml" line="157"/>
         <source>Continue</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">继续</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSetupWizardEasy.qml" line="186"/>
@@ -1673,7 +1677,7 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
     <message>
         <location filename="../ui/qml/Pages2/PageSetupWizardTextKey.qml" line="71"/>
         <source>Continue</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">继续</translation>
     </message>
 </context>
 <context>
@@ -2421,7 +2425,7 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
     <message>
         <location filename="../ui/qml/Components/SelectLanguageDrawer.qml" line="49"/>
         <source>Choose language</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">选择语言</translation>
     </message>
 </context>
 <context>
@@ -2660,7 +2664,7 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
     <message>
         <location filename="../ui/qml/main2.qml" line="191"/>
         <source>Save</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">保存</translation>
     </message>
 </context>
 </TS>
diff --git a/client/ui/qml/Pages2/PageSettingsLogging.qml b/client/ui/qml/Pages2/PageSettingsLogging.qml
index 42f33901..4141f51f 100644
--- a/client/ui/qml/Pages2/PageSettingsLogging.qml
+++ b/client/ui/qml/Pages2/PageSettingsLogging.qml
@@ -105,7 +105,7 @@ PageType {
                             if (GC.isMobile()) {
                                 fileName = "AmneziaVPN.log"
                             } else {
-                                fileName = SystemController.getFileName(qsTr("Save logs"),
+                                fileName = SystemController.getFileName(qsTr("Save"),
                                                                         qsTr("Logs files (*.log)"),
                                                                         StandardPaths.standardLocations(StandardPaths.DocumentsLocation) + "/AmneziaVPN",
                                                                         true,

From 617e772cc16ce843fec947b27c5479a717ed8f45 Mon Sep 17 00:00:00 2001
From: "vladimir.kuznetsov" <nethiuswork@gmail.com>
Date: Tue, 3 Oct 2023 18:49:54 +0500
Subject: [PATCH 168/278] added transitions and open/close by clicking on an
 item for the center menu button

---
 client/ui/qml/Controls2/DrawerType.qml | 28 -------------
 client/ui/qml/Pages2/PageHome.qml      | 55 +++++++++++++++++++++-----
 2 files changed, 45 insertions(+), 38 deletions(-)

diff --git a/client/ui/qml/Controls2/DrawerType.qml b/client/ui/qml/Controls2/DrawerType.qml
index 4ea24091..72765d78 100644
--- a/client/ui/qml/Controls2/DrawerType.qml
+++ b/client/ui/qml/Controls2/DrawerType.qml
@@ -4,7 +4,6 @@ import QtQuick.Controls
 Drawer {
     id: drawer
     property bool needCloseButton: true
-    property bool isOpened: false
 
     Connections {
         target: PageController
@@ -53,16 +52,12 @@ Drawer {
     }
 
     onOpened: {
-        isOpened = true
-
         if (needCloseButton) {
             PageController.drawerOpen()
         }
     }
 
     onClosed: {
-        isOpened = false
-
         if (needCloseButton) {
             PageController.drawerClose()
         }
@@ -72,27 +67,4 @@ Drawer {
             PageController.updateNavigationBarColor(initialPageNavigationBarColor)
         }
     }
-
-
-    onPositionChanged: {
-        if (isOpened && (position <= 0.99 && position >= 0.95)) {
-            mouseArea.canceled()
-            drawer.close()
-            mouseArea.exited()
-            dropArea.exited()
-        }
-    }
-
-    DropArea {
-        id: dropArea
-    }
-
-    MouseArea {
-        id: mouseArea
-        anchors.fill: parent
-
-        onPressed: {
-            isOpened = true
-        }
-    }
 }
diff --git a/client/ui/qml/Pages2/PageHome.qml b/client/ui/qml/Pages2/PageHome.qml
index 61fff248..8a015e4c 100644
--- a/client/ui/qml/Pages2/PageHome.qml
+++ b/client/ui/qml/Pages2/PageHome.qml
@@ -26,6 +26,14 @@ PageType {
     property string defaultServerHostName: ServersModel.defaultServerHostName
     property string defaultContainerName: ContainersModel.defaultContainerName
 
+    MouseArea {
+        anchors.fill: parent
+        enabled: buttonContent.state === "expanded"
+        onClicked: {
+            buttonContent.state = "collapsed"
+        }
+    }
+
     Item {
         anchors.fill: parent
         anchors.bottomMargin: buttonContent.collapsedHeight
@@ -59,7 +67,7 @@ PageType {
         drag.target: buttonContent
         drag.axis: Drag.YAxis
         drag.maximumY: root.height - buttonContent.collapsedHeight
-        drag.minimumY: 100
+        drag.minimumY: root.height - root.height * 0.9
 
         onReleased: {
             if (buttonContent.state === "collapsed" && buttonContent.y < dragArea.drag.maximumY) {
@@ -71,6 +79,12 @@ PageType {
                 return
             }
         }
+
+        onClicked: {
+            if (buttonContent.state === "collapsed") {
+                buttonContent.state = "expanded"
+            }
+        }
     }
 
     Rectangle {
@@ -135,12 +149,12 @@ PageType {
 
         states: [
             State {
-            name: "collapsed"
-            PropertyChanges {
-                target: buttonContent
-                y: root.height - collapsedHeight
-            }
-        },
+                name: "collapsed"
+                PropertyChanges {
+                    target: buttonContent
+                    y: root.height - collapsedHeight
+                }
+            },
             State {
                 name: "expanded"
                 PropertyChanges {
@@ -148,7 +162,29 @@ PageType {
                     y: dragArea.drag.minimumY
 
                 }
-            }]
+            }
+        ]
+
+        transitions: [
+            Transition {
+                from: "collapsed"
+                to: "expanded"
+                PropertyAnimation {
+                    target: buttonContent
+                    properties: "y"
+                    duration: 200
+                }
+            },
+            Transition {
+                from: "expanded"
+                to: "collapsed"
+                PropertyAnimation {
+                    target: buttonContent
+                    properties: "y"
+                    duration: 200
+                }
+            }
+        ]
 
         RowLayout {
             Layout.topMargin: 24
@@ -309,7 +345,7 @@ PageType {
             Layout.fillWidth: true
             Layout.topMargin: 16
             contentHeight: col.implicitHeight
-            height: 500
+            implicitHeight: root.height - (root.height * 0.1) - serversMenuHeader.implicitHeight - 52 //todo 52 is tabbar height
             visible: buttonContent.expandedVisibility
             clip: true
 
@@ -333,7 +369,6 @@ PageType {
                     id: serversRadioButtonGroup
                 }
 
-
                 ListView {
                     id: serversMenuContent
                     width: parent.width

From e2d61cb5188d8526955eb71015b22694cc92c9a3 Mon Sep 17 00:00:00 2001
From: "vladimir.kuznetsov" <nethiuswork@gmail.com>
Date: Tue, 3 Oct 2023 22:38:17 +0500
Subject: [PATCH 169/278] renamed functions and variables

---
 client/ui/controllers/pageController.cpp     | 12 ++++++------
 client/ui/controllers/pageController.h       |  6 +++---
 client/ui/qml/Components/ConnectButton.qml   |  2 +-
 client/ui/qml/Pages2/PageSetupWizardEasy.qml |  4 ++--
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/client/ui/controllers/pageController.cpp b/client/ui/controllers/pageController.cpp
index 2a14548c..cb500618 100644
--- a/client/ui/controllers/pageController.cpp
+++ b/client/ui/controllers/pageController.cpp
@@ -37,8 +37,8 @@ PageController::PageController(const QSharedPointer<ServersModel> &serversModel,
     connect(this, &PageController::raiseMainWindow, []() { setDockIconVisible(true); });
     connect(this, &PageController::hideMainWindow, []() { setDockIconVisible(false); });
 #endif
-
-    m_bConnectTrigger = false;
+    
+    m_isTriggeredByConnectButton = false;
 }
 
 QString PageController::getInitialPage()
@@ -148,12 +148,12 @@ void PageController::drawerClose()
     }
 }
 
-bool PageController::isConnectTrigger()
+bool PageController::isTriggeredByConnectButton()
 {
-    return m_bConnectTrigger;
+    return m_isTriggeredByConnectButton;
 }
 
-void PageController::setConnectTrigger(bool trigger)
+void PageController::setTriggeredBtConnectButton(bool trigger)
 {
-    m_bConnectTrigger = trigger;
+    m_isTriggeredByConnectButton = trigger;
 }
diff --git a/client/ui/controllers/pageController.h b/client/ui/controllers/pageController.h
index d16c36a6..70732bd9 100644
--- a/client/ui/controllers/pageController.h
+++ b/client/ui/controllers/pageController.h
@@ -85,8 +85,8 @@ public slots:
     void drawerClose();
 
 
-    bool isConnectTrigger();
-    void setConnectTrigger(bool trigger);
+    bool isTriggeredByConnectButton();
+    void setTriggeredBtConnectButton(bool trigger);
 
 signals:
     void goToPage(PageLoader::PageEnum page, bool slide = true);
@@ -125,7 +125,7 @@ private:
     PageLoader::PageEnum m_currentRootPage;
     int m_drawerLayer;
 
-    bool m_bConnectTrigger;
+    bool m_isTriggeredByConnectButton;
 };
 
 #endif // PAGECONTROLLER_H
diff --git a/client/ui/qml/Components/ConnectButton.qml b/client/ui/qml/Components/ConnectButton.qml
index b5c94ea8..76e83da5 100644
--- a/client/ui/qml/Components/ConnectButton.qml
+++ b/client/ui/qml/Components/ConnectButton.qml
@@ -139,7 +139,7 @@ Button {
 
     onClicked: {
         if (!ContainersModel.isAnyContainerInstalled()) {
-            PageController.setConnectTrigger(true)
+            PageController.setTriggeredBtConnectButton(true)
 
             ServersModel.currentlyProcessedIndex = ServersModel.getDefaultServerIndex()
             PageController.goToPage(PageEnum.PageSetupWizardEasy)
diff --git a/client/ui/qml/Pages2/PageSetupWizardEasy.qml b/client/ui/qml/Pages2/PageSetupWizardEasy.qml
index 08542b23..a5c2eddf 100644
--- a/client/ui/qml/Pages2/PageSetupWizardEasy.qml
+++ b/client/ui/qml/Pages2/PageSetupWizardEasy.qml
@@ -184,8 +184,8 @@ PageType {
                 borderWidth: 1
 
                 visible: {
-                    if (PageController.isConnectTrigger()) {
-                        PageController.setConnectTrigger(false)
+                    if (PageController.isTriggeredByConnectButton()) {
+                        PageController.setTriggeredBtConnectButton(false)
 
                         return ContainersModel.isAnyContainerInstalled()
                     }

From 7d4a01c757c1b67357b1a0164573ebad8bfd87e2 Mon Sep 17 00:00:00 2001
From: "vladimir.kuznetsov" <nethiuswork@gmail.com>
Date: Tue, 3 Oct 2023 23:28:44 +0500
Subject: [PATCH 170/278] minor ui fixes

---
 client/ui/controllers/installController.cpp          | 3 +--
 client/ui/qml/Components/ShareConnectionDrawer.qml   | 4 ++--
 client/ui/qml/Controls2/BasicButtonType.qml          | 3 +++
 client/ui/qml/Controls2/TextTypes/ButtonTextType.qml | 2 +-
 client/ui/qml/Pages2/PageShare.qml                   | 2 +-
 5 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/client/ui/controllers/installController.cpp b/client/ui/controllers/installController.cpp
index 63510d1a..7e32ff89 100644
--- a/client/ui/controllers/installController.cpp
+++ b/client/ui/controllers/installController.cpp
@@ -113,8 +113,7 @@ void InstallController::installServer(DockerContainer container, QJsonObject &co
                 ContainerProps::containerHumanNames().value(container) + tr(" is already installed on the server. ");
     }
     if (installedContainers.size() > 1) {
-        finishMessage += tr("\nAlready installed containers were found on the server. "
-                            "All installed containers have been added to the application");
+        finishMessage += tr("\nAdded containers that were already installed on the server");
     }
 
     if (errorCode == ErrorCode::NoError) {
diff --git a/client/ui/qml/Components/ShareConnectionDrawer.qml b/client/ui/qml/Components/ShareConnectionDrawer.qml
index 3a8a4175..2419b51a 100644
--- a/client/ui/qml/Components/ShareConnectionDrawer.qml
+++ b/client/ui/qml/Components/ShareConnectionDrawer.qml
@@ -114,7 +114,7 @@ DrawerType {
 
                 BasicButtonType {
                     Layout.fillWidth: true
-                    Layout.topMargin: 8
+                    Layout.topMargin: 24
 
                     defaultColor: "transparent"
                     hoveredColor: Qt.rgba(1, 1, 1, 0.08)
@@ -123,7 +123,7 @@ DrawerType {
                     textColor: "#D7D8DB"
                     borderWidth: 1
 
-                    text: qsTr("Show content")
+                    text: qsTr("Show connection settings")
 
                     onClicked: {
                         configContentDrawer.visible = true
diff --git a/client/ui/qml/Controls2/BasicButtonType.qml b/client/ui/qml/Controls2/BasicButtonType.qml
index b0c39ddc..a5cde951 100644
--- a/client/ui/qml/Controls2/BasicButtonType.qml
+++ b/client/ui/qml/Controls2/BasicButtonType.qml
@@ -90,6 +90,9 @@ Button {
             anchors.centerIn: parent
 
             Image {
+                Layout.preferredHeight: 20
+                Layout.preferredWidth: 20
+
                 source: root.imageSource
                 visible: root.imageSource === "" ? false : true
 
diff --git a/client/ui/qml/Controls2/TextTypes/ButtonTextType.qml b/client/ui/qml/Controls2/TextTypes/ButtonTextType.qml
index e3b14e63..94b48081 100644
--- a/client/ui/qml/Controls2/TextTypes/ButtonTextType.qml
+++ b/client/ui/qml/Controls2/TextTypes/ButtonTextType.qml
@@ -6,7 +6,7 @@ Text {
 
     color: "#D7D8DB"
     font.pixelSize: 16
-    font.weight: 500
+    font.weight: 600
     font.family: "PT Root UI VF"
 
     wrapMode: Text.WordWrap
diff --git a/client/ui/qml/Pages2/PageShare.qml b/client/ui/qml/Pages2/PageShare.qml
index b1f0221b..00b65310 100644
--- a/client/ui/qml/Pages2/PageShare.qml
+++ b/client/ui/qml/Pages2/PageShare.qml
@@ -248,7 +248,7 @@ PageType {
 
                 drawerHeight: 0.5
 
-                descriptionText: qsTr("Protocols")
+                descriptionText: qsTr("Protocol")
                 headerText: qsTr("Protocol")
 
                 listView: ListViewWithRadioButtonType {

From 30709c66ef397d84342a050cc46f96eb4e215e85 Mon Sep 17 00:00:00 2001
From: ronoaer <ronoaer@gmail.com>
Date: Wed, 4 Oct 2023 09:05:29 +0800
Subject: [PATCH 171/278] translated settings page

---
 client/translations/amneziavpn_zh_CN.ts | 44 ++++++++++++-------------
 1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/client/translations/amneziavpn_zh_CN.ts b/client/translations/amneziavpn_zh_CN.ts
index a1f4c4e9..08e170b1 100644
--- a/client/translations/amneziavpn_zh_CN.ts
+++ b/client/translations/amneziavpn_zh_CN.ts
@@ -262,7 +262,7 @@ Already installed containers were found on the server. All installed containers
     <message>
         <location filename="../ui/qml/Pages2/PageHome.qml" line="238"/>
         <source>Servers</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">服务器列表</translation>
     </message>
 </context>
 <context>
@@ -744,17 +744,17 @@ Already installed containers were found on the server. All installed containers
     <message>
         <location filename="../ui/qml/Pages2/PageSettings.qml" line="37"/>
         <source>Settings</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">配置列表</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettings.qml" line="44"/>
         <source>Servers</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">服务器列表</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettings.qml" line="58"/>
         <source>Connection</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">连接</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettings.qml" line="72"/>
@@ -764,12 +764,12 @@ Already installed containers were found on the server. All installed containers
     <message>
         <location filename="../ui/qml/Pages2/PageSettings.qml" line="86"/>
         <source>Backup</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">备份</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettings.qml" line="100"/>
         <source>About AmneziaVPN</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">关于AmneziaVPN</translation>
     </message>
 </context>
 <context>
@@ -944,7 +944,7 @@ And if you don&apos;t like the app, all the more support it - the donation will
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsBackup.qml" line="66"/>
         <source>Backup</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">备份</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsBackup.qml" line="73"/>
@@ -1008,32 +1008,32 @@ And if you don&apos;t like the app, all the more support it - the donation will
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsConnection.qml" line="41"/>
         <source>Connection</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">连接</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsConnection.qml" line="50"/>
         <source>Auto connect</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">自动连接</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsConnection.qml" line="51"/>
         <source>Connect to VPN on app start</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">应用启动时连接到VPN</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsConnection.qml" line="69"/>
         <source>Use AmneziaDNS if installed on the server</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">使用AmneziaDNS，如果服务器上已安装</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsConnection.qml" line="84"/>
         <source>DNS servers</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">DNS服务器列表</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsConnection.qml" line="85"/>
         <source>If AmneziaDNS is not used or installed</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">如果AmneziaDNS未使用或安装</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsConnection.qml" line="98"/>
@@ -1061,22 +1061,22 @@ And if you don&apos;t like the app, all the more support it - the donation will
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsDns.qml" line="45"/>
         <source>DNS servers</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">DNS服务器列表</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsDns.qml" line="49"/>
         <source>If AmneziaDNS is not used or installed</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Amnezia DNS未使用或安装</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsDns.qml" line="86"/>
         <source>Restore default</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">恢复为默认DNS配置</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsDns.qml" line="89"/>
         <source>Restore default DNS settings?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">是否恢复为默认DNS配置？</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsDns.qml" line="90"/>
@@ -1091,7 +1091,7 @@ And if you don&apos;t like the app, all the more support it - the donation will
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsDns.qml" line="99"/>
         <source>Settings have been reset</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">已重配置</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsDns.qml" line="111"/>
@@ -1101,7 +1101,7 @@ And if you don&apos;t like the app, all the more support it - the donation will
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsDns.qml" line="120"/>
         <source>Settings saved</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">配置已保存</translation>
     </message>
 </context>
 <context>
@@ -1316,7 +1316,7 @@ And if you don&apos;t like the app, all the more support it - the donation will
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsServersList.qml" line="39"/>
         <source>Servers</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">服务器列表</translation>
     </message>
 </context>
 <context>
@@ -1743,7 +1743,7 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
     <message>
         <location filename="../ui/qml/Pages2/PageShare.qml" line="146"/>
         <source>Connection</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">连接</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageShare.qml" line="158"/>
@@ -1763,7 +1763,7 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
     <message>
         <location filename="../ui/qml/Pages2/PageShare.qml" line="190"/>
         <source>Servers</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">服务器列表</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageShare.qml" line="191"/>

From 2353cc4f2c7513d6a9cc62deff68109e629ac1bb Mon Sep 17 00:00:00 2001
From: ronoaer <ronoaer@gmail.com>
Date: Wed, 4 Oct 2023 15:48:35 +0800
Subject: [PATCH 172/278] translated sub-page of Settings to Chinese

---
 client/translations/amneziavpn_ru.ts          |  19 +--
 client/translations/amneziavpn_zh_CN.ts       | 118 ++++++++++--------
 .../ui/qml/Pages2/PageSettingsConnection.qml  |   3 +-
 3 files changed, 78 insertions(+), 62 deletions(-)

diff --git a/client/translations/amneziavpn_ru.ts b/client/translations/amneziavpn_ru.ts
index f108cbcd..df1cdf47 100644
--- a/client/translations/amneziavpn_ru.ts
+++ b/client/translations/amneziavpn_ru.ts
@@ -1029,36 +1029,41 @@ And if you don&apos;t like the app, all the more support it - the donation will
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsConnection.qml" line="69"/>
-        <source>Use AmneziaDNS if installed on the server</source>
+        <source>Use AmneziaDNS</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsConnection.qml" line="84"/>
-        <source>DNS servers</source>
+        <location filename="../ui/qml/Pages2/PageSettingsConnection.qml" line="70"/>
+        <source>If AmneziaDNS is installed on the server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsConnection.qml" line="85"/>
+        <source>DNS servers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsConnection.qml" line="86"/>
         <source>If AmneziaDNS is not used or installed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsConnection.qml" line="98"/>
+        <location filename="../ui/qml/Pages2/PageSettingsConnection.qml" line="99"/>
         <source>Split site tunneling</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsConnection.qml" line="99"/>
+        <location filename="../ui/qml/Pages2/PageSettingsConnection.qml" line="100"/>
         <source>Allows you to connect to some sites through a secure connection, and to others bypassing it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsConnection.qml" line="112"/>
+        <location filename="../ui/qml/Pages2/PageSettingsConnection.qml" line="113"/>
         <source>Separate application tunneling</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsConnection.qml" line="113"/>
+        <location filename="../ui/qml/Pages2/PageSettingsConnection.qml" line="114"/>
         <source>Allows you to use the VPN only for certain applications</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/client/translations/amneziavpn_zh_CN.ts b/client/translations/amneziavpn_zh_CN.ts
index 08e170b1..cd46676f 100644
--- a/client/translations/amneziavpn_zh_CN.ts
+++ b/client/translations/amneziavpn_zh_CN.ts
@@ -6,7 +6,7 @@
     <message>
         <location filename="../amnezia_application.cpp" line="299"/>
         <source>Split tunneling for WireGuard is not implemented, the option was disabled</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">禁用选项，还未实现基于WireGuard协议的VPN分流</translation>
     </message>
 </context>
 <context>
@@ -37,7 +37,7 @@
         <location filename="../ui/controllers/connectionController.cpp" line="55"/>
         <source>VPN Protocols is not installed.
  Please install VPN container at first</source>
-        <translation type="unfinished">未安装VPN协议，请安装</translation>
+        <translation type="unfinished">不存在VPN协议，请先安装</translation>
     </message>
     <message>
         <location filename="../ui/controllers/connectionController.cpp" line="78"/>
@@ -262,7 +262,7 @@ Already installed containers were found on the server. All installed containers
     <message>
         <location filename="../ui/qml/Pages2/PageHome.qml" line="238"/>
         <source>Servers</source>
-        <translation type="unfinished">服务器列表</translation>
+        <translation type="unfinished">服务器</translation>
     </message>
 </context>
 <context>
@@ -744,12 +744,12 @@ Already installed containers were found on the server. All installed containers
     <message>
         <location filename="../ui/qml/Pages2/PageSettings.qml" line="37"/>
         <source>Settings</source>
-        <translation type="unfinished">配置列表</translation>
+        <translation type="unfinished">设置</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettings.qml" line="44"/>
         <source>Servers</source>
-        <translation type="unfinished">服务器列表</translation>
+        <translation type="unfinished">服务器</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettings.qml" line="58"/>
@@ -769,7 +769,7 @@ Already installed containers were found on the server. All installed containers
     <message>
         <location filename="../ui/qml/Pages2/PageSettings.qml" line="100"/>
         <source>About AmneziaVPN</source>
-        <translation type="unfinished">关于AmneziaVPN</translation>
+        <translation type="unfinished">关于</translation>
     </message>
 </context>
 <context>
@@ -777,13 +777,14 @@ Already installed containers were found on the server. All installed containers
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsAbout.qml" line="56"/>
         <source>Support the project with a donation</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">捐赠项目</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsAbout.qml" line="71"/>
         <source>This is a free and open source application. If you like it, support the developers with a donation.
 And if you don&apos;t like the app, all the more support it - the donation will be used to improve the app.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">这是一个免费且开源的应用程序。如果您喜欢，请捐款支持开发人员。
+如果您不喜欢该应用程序，请更加支持它 - 捐款将用于改进该应用程序。</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsAbout.qml" line="82"/>
@@ -803,17 +804,17 @@ And if you don&apos;t like the app, all the more support it - the donation will
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsAbout.qml" line="113"/>
         <source>Contacts</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">联系方式</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsAbout.qml" line="120"/>
         <source>Telegram group</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">电报群</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsAbout.qml" line="121"/>
         <source>To discuss features</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">用于功能讨论</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsAbout.qml" line="125"/>
@@ -823,12 +824,12 @@ And if you don&apos;t like the app, all the more support it - the donation will
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsAbout.qml" line="134"/>
         <source>Mail</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">邮件</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsAbout.qml" line="135"/>
         <source>For reviews and bug reports</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">用于评论和提交软件的缺陷</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsAbout.qml" line="147"/>
@@ -843,7 +844,7 @@ And if you don&apos;t like the app, all the more support it - the donation will
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsAbout.qml" line="160"/>
         <source>Website</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">官网</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsAbout.qml" line="164"/>
@@ -853,7 +854,7 @@ And if you don&apos;t like the app, all the more support it - the donation will
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsAbout.qml" line="192"/>
         <source>Check for updates</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">检查更新</translation>
     </message>
 </context>
 <context>
@@ -871,22 +872,22 @@ And if you don&apos;t like the app, all the more support it - the donation will
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="53"/>
         <source>Launch the application every time </source>
-        <translation type="unfinished">当系统 </translation>
+        <translation type="unfinished">总是在系统 </translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="53"/>
         <source> starts</source>
-        <translation type="unfinished"> 启动时应用自动运行</translation>
+        <translation type="unfinished"> 启动时自动运行运用程序</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="73"/>
         <source>Start minimized</source>
-        <translation type="unfinished">最小化启动</translation>
+        <translation type="unfinished">最小化</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="74"/>
         <source>Launch application minimized</source>
-        <translation type="unfinished">最小化启动应用程序</translation>
+        <translation type="unfinished">开启应用程序时窗口最小化</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="91"/>
@@ -921,7 +922,7 @@ And if you don&apos;t like the app, all the more support it - the donation will
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="129"/>
         <source>All settings will be reset to default. All installed AmneziaVPN services will still remain on the server.</source>
-        <translation type="unfinished">所有配置恢复为默认值。所有已安装的AmneziaVPN服务将保留服务器上。</translation>
+        <translation type="unfinished">所有配置恢复为默认值。在服务器上保留所有已安装的AmneziaVPN服务。</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="130"/>
@@ -939,7 +940,7 @@ And if you don&apos;t like the app, all the more support it - the donation will
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsBackup.qml" line="27"/>
         <source>Settings restored from backup file</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">从备份文件还原配置</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsBackup.qml" line="66"/>
@@ -949,22 +950,22 @@ And if you don&apos;t like the app, all the more support it - the donation will
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsBackup.qml" line="73"/>
         <source>Configuration backup</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">配置备份</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsBackup.qml" line="80"/>
         <source>It will help you instantly restore connection settings at the next installation</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">帮助您在下次安装时立即恢复连接设置</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsBackup.qml" line="89"/>
         <source>Make a backup</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">进行备份</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsBackup.qml" line="96"/>
         <source>Save backup file</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">保存备份</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsBackup.qml" line="97"/>
@@ -975,22 +976,22 @@ And if you don&apos;t like the app, all the more support it - the donation will
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsBackup.qml" line="121"/>
         <source>Restore from backup</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">从备份还原</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsBackup.qml" line="124"/>
         <source>Open backup file</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">打开备份文件</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsBackup.qml" line="135"/>
         <source>Import settings from a backup file?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">从备份文件导入设置？</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsBackup.qml" line="136"/>
         <source>All current settings will be reset</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">当前所有设置将重置</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsBackup.qml" line="137"/>
@@ -1018,42 +1019,51 @@ And if you don&apos;t like the app, all the more support it - the donation will
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsConnection.qml" line="51"/>
         <source>Connect to VPN on app start</source>
-        <translation type="unfinished">应用启动时连接到VPN</translation>
+        <translation type="unfinished">应用开启时连接VPN</translation>
+    </message>
+    <message>
+        <source>Use AmneziaDNS if installed on the server</source>
+        <translation type="obsolete">使用AmneziaDNS，如其已安装在服务器上</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsConnection.qml" line="69"/>
-        <source>Use AmneziaDNS if installed on the server</source>
-        <translation type="unfinished">使用AmneziaDNS，如果服务器上已安装</translation>
+        <source>Use AmneziaDNS</source>
+        <translation type="unfinished">使用AmneziaDNS</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsConnection.qml" line="84"/>
+        <location filename="../ui/qml/Pages2/PageSettingsConnection.qml" line="70"/>
+        <source>If AmneziaDNS is installed on the server</source>
+        <translation type="unfinished">如其已安装至服务上</translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsConnection.qml" line="85"/>
         <source>DNS servers</source>
         <translation type="unfinished">DNS服务器列表</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsConnection.qml" line="85"/>
+        <location filename="../ui/qml/Pages2/PageSettingsConnection.qml" line="86"/>
         <source>If AmneziaDNS is not used or installed</source>
-        <translation type="unfinished">如果AmneziaDNS未使用或安装</translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Pages2/PageSettingsConnection.qml" line="98"/>
-        <source>Split site tunneling</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">如果未使用或未安装AmneziaDNS</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsConnection.qml" line="99"/>
-        <source>Allows you to connect to some sites through a secure connection, and to others bypassing it</source>
-        <translation type="unfinished"></translation>
+        <source>Split site tunneling</source>
+        <translation type="unfinished">网站级VPN分流</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsConnection.qml" line="112"/>
-        <source>Separate application tunneling</source>
-        <translation type="unfinished"></translation>
+        <location filename="../ui/qml/Pages2/PageSettingsConnection.qml" line="100"/>
+        <source>Allows you to connect to some sites through a secure connection, and to others bypassing it</source>
+        <translation type="unfinished">使用VPN访问指定网站，其他的则绕过</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsConnection.qml" line="113"/>
+        <source>Separate application tunneling</source>
+        <translation type="unfinished">应用级VPN分流</translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsConnection.qml" line="114"/>
         <source>Allows you to use the VPN only for certain applications</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">仅限指定应用使用VPN</translation>
     </message>
 </context>
 <context>
@@ -1061,22 +1071,22 @@ And if you don&apos;t like the app, all the more support it - the donation will
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsDns.qml" line="45"/>
         <source>DNS servers</source>
-        <translation type="unfinished">DNS服务器列表</translation>
+        <translation type="unfinished">DNS服务器</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsDns.qml" line="49"/>
         <source>If AmneziaDNS is not used or installed</source>
-        <translation type="unfinished">Amnezia DNS未使用或安装</translation>
+        <translation type="unfinished">如果未使用或未安装Amnezia DNS</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsDns.qml" line="86"/>
         <source>Restore default</source>
-        <translation type="unfinished">恢复为默认DNS配置</translation>
+        <translation type="unfinished">恢复默认配置</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsDns.qml" line="89"/>
         <source>Restore default DNS settings?</source>
-        <translation type="unfinished">是否恢复为默认DNS配置？</translation>
+        <translation type="unfinished">是否恢复默认DNS配置？</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsDns.qml" line="90"/>
@@ -1316,7 +1326,7 @@ And if you don&apos;t like the app, all the more support it - the donation will
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsServersList.qml" line="39"/>
         <source>Servers</source>
-        <translation type="unfinished">服务器列表</translation>
+        <translation type="unfinished">服务器</translation>
     </message>
 </context>
 <context>
@@ -1334,7 +1344,7 @@ And if you don&apos;t like the app, all the more support it - the donation will
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="84"/>
         <source>Split site tunneling</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">网站级VPN分流</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="120"/>
@@ -1629,7 +1639,7 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
     <message>
         <location filename="../ui/qml/Pages2/PageSetupWizardStart.qml" line="54"/>
         <source>Settings restored from backup file</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">从备份文件还原配置</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSetupWizardStart.qml" line="105"/>
@@ -1763,7 +1773,7 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
     <message>
         <location filename="../ui/qml/Pages2/PageShare.qml" line="190"/>
         <source>Servers</source>
-        <translation type="unfinished">服务器列表</translation>
+        <translation type="unfinished">服务器</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageShare.qml" line="191"/>
diff --git a/client/ui/qml/Pages2/PageSettingsConnection.qml b/client/ui/qml/Pages2/PageSettingsConnection.qml
index 78d4a681..ae5fd7f4 100644
--- a/client/ui/qml/Pages2/PageSettingsConnection.qml
+++ b/client/ui/qml/Pages2/PageSettingsConnection.qml
@@ -66,7 +66,8 @@ PageType {
                 Layout.fillWidth: true
                 Layout.margins: 16
 
-                text: qsTr("Use AmneziaDNS if installed on the server")
+                text: qsTr("Use AmneziaDNS")
+                descriptionText: qsTr("If AmneziaDNS is installed on the server")
 
                 checked: SettingsController.isAmneziaDnsEnabled()
                 onCheckedChanged: {

From a93f75fb5a6defd9a77398324046021b9347ec68 Mon Sep 17 00:00:00 2001
From: "vladimir.kuznetsov" <nethiuswork@gmail.com>
Date: Wed, 4 Oct 2023 14:40:17 +0500
Subject: [PATCH 173/278] added full version to page about

---
 client/ui/controllers/settingsController.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/ui/controllers/settingsController.cpp b/client/ui/controllers/settingsController.cpp
index 3edfe3d9..78d0dd67 100644
--- a/client/ui/controllers/settingsController.cpp
+++ b/client/ui/controllers/settingsController.cpp
@@ -22,7 +22,7 @@ SettingsController::SettingsController(const QSharedPointer<ServersModel> &serve
       m_languageModel(languageModel),
       m_settings(settings)
 {
-    m_appVersion = QString("%1: %2 (%3)").arg(tr("Software version"), QString(APP_MAJOR_VERSION), __DATE__);
+    m_appVersion = QString("%1: %2 (%3)").arg(tr("Software version"), QString(APP_VERSION), __DATE__);
 
 #ifdef Q_OS_ANDROID
     if (!m_settings->isScreenshotsEnabled()) {
@@ -193,4 +193,4 @@ void SettingsController::toggleScreenshotsEnabled(bool enable)
         }
     });
 #endif
-}
\ No newline at end of file
+}

From a83ec10b61ae4b3d704f5063e45a4bd1a427d6ac Mon Sep 17 00:00:00 2001
From: "vladimir.kuznetsov" <nethiuswork@gmail.com>
Date: Wed, 4 Oct 2023 14:47:10 +0500
Subject: [PATCH 174/278] updated description for full access sharing

---
 client/ui/qml/Pages2/PageShare.qml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/ui/qml/Pages2/PageShare.qml b/client/ui/qml/Pages2/PageShare.qml
index 00b65310..6c284278 100644
--- a/client/ui/qml/Pages2/PageShare.qml
+++ b/client/ui/qml/Pages2/PageShare.qml
@@ -172,7 +172,7 @@ PageType {
                 Layout.bottomMargin: 24
 
                 text: accessTypeSelector.currentIndex === 0 ? qsTr("VPN access without the ability to manage the server") :
-                                                              qsTr("Full access to server")
+                                                              qsTr("Access to server management. The user with whom you share full access to the connection will be able to add and remove your protocols and services to the servers, as well as change settings.")
                 color: "#878B91"
             }
 

From 6f392ce12632b0c0f18d92be2202cb12b41e1f30 Mon Sep 17 00:00:00 2001
From: pokamest <pokamest@gmail.com>
Date: Wed, 4 Oct 2023 16:09:03 +0100
Subject: [PATCH 175/278] Crash on exit fix for Windows

---
 client/protocols/wireguardprotocol.cpp         |  2 --
 client/ui/controllers/connectionController.cpp | 17 -----------------
 client/ui/controllers/connectionController.h   |  2 +-
 3 files changed, 1 insertion(+), 20 deletions(-)

diff --git a/client/protocols/wireguardprotocol.cpp b/client/protocols/wireguardprotocol.cpp
index a4005efb..d675cd02 100644
--- a/client/protocols/wireguardprotocol.cpp
+++ b/client/protocols/wireguardprotocol.cpp
@@ -101,8 +101,6 @@ void WireguardProtocol::stop()
 #if defined(Q_OS_MAC) || defined(Q_OS_WIN) || defined(Q_OS_LINUX)
 ErrorCode WireguardProtocol::startMzImpl()
 {
-
-    qDebug() << "WireguardProtocol::startMzImpl():" << m_rawConfig;
     m_impl->activate(m_rawConfig);
     return ErrorCode::NoError;
 }
diff --git a/client/ui/controllers/connectionController.cpp b/client/ui/controllers/connectionController.cpp
index 77ca0f5f..9b4ae6d4 100644
--- a/client/ui/controllers/connectionController.cpp
+++ b/client/ui/controllers/connectionController.cpp
@@ -21,23 +21,6 @@ ConnectionController::ConnectionController(const QSharedPointer<ServersModel> &s
             Qt::QueuedConnection);
 }
 
-ConnectionController::~ConnectionController()
-{
-// todo use ConnectionController instead of using m_vpnConnection directly
-#ifdef AMNEZIA_DESKTOP
-    if (m_vpnConnection->connectionState() != Vpn::ConnectionState::Disconnected) {
-        m_vpnConnection->disconnectFromVpn();
-        for (int i = 0; i < 50; i++) {
-            qApp->processEvents(QEventLoop::ExcludeUserInputEvents);
-            QThread::msleep(100);
-            if (m_vpnConnection->isDisconnected()) {
-                break;
-            }
-        }
-    }
-#endif
-}
-
 void ConnectionController::openConnection()
 {
     int serverIndex = m_serversModel->getDefaultServerIndex();
diff --git a/client/ui/controllers/connectionController.h b/client/ui/controllers/connectionController.h
index 7bfe0fac..e09cdcdf 100644
--- a/client/ui/controllers/connectionController.h
+++ b/client/ui/controllers/connectionController.h
@@ -19,7 +19,7 @@ public:
                                   const QSharedPointer<ContainersModel> &containersModel,
                                   const QSharedPointer<VpnConnection> &vpnConnection, QObject *parent = nullptr);
 
-    ~ConnectionController();
+    ~ConnectionController() = default;
 
     bool isConnected() const;
     bool isConnectionInProgress() const;

From 9df262d5028c36de1ac4b0af00c02dd7f7021bad Mon Sep 17 00:00:00 2001
From: "vladimir.kuznetsov" <nethiuswork@gmail.com>
Date: Wed, 4 Oct 2023 19:14:27 +0300
Subject: [PATCH 176/278] fixed sending parameters to the awg daemon for
 windows

---
 client/daemon/interfaceconfig.cpp | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/client/daemon/interfaceconfig.cpp b/client/daemon/interfaceconfig.cpp
index b24a35c7..8aa06b9b 100644
--- a/client/daemon/interfaceconfig.cpp
+++ b/client/daemon/interfaceconfig.cpp
@@ -98,34 +98,31 @@ QString InterfaceConfig::toWgConf(const QMap<QString, QString>& extra) const {
   }
 
   if (!m_junkPacketCount.isNull()) {
-    out << "JunkPacketCount = " << m_junkPacketCount << "\n";
+    out << "Jc = " << m_junkPacketCount << "\n";
   }
   if (!m_junkPacketMinSize.isNull()) {
-    out << "JunkPacketMinSize = " << m_junkPacketMinSize << "\n";
+    out << "JMin = " << m_junkPacketMinSize << "\n";
   }
   if (!m_junkPacketMaxSize.isNull()) {
-    out << "JunkPacketMaxSize = " << m_junkPacketMaxSize << "\n";
+    out << "JMax = " << m_junkPacketMaxSize << "\n";
   }
   if (!m_initPacketJunkSize.isNull()) {
-    out << "InitPacketJunkSize = " << m_initPacketJunkSize << "\n";
+    out << "S1 = " << m_initPacketJunkSize << "\n";
   }
   if (!m_responsePacketJunkSize.isNull()) {
-    out << "ResponsePacketJunkSize = " << m_responsePacketJunkSize << "\n";
+    out << "S2 = " << m_responsePacketJunkSize << "\n";
   }
   if (!m_initPacketMagicHeader.isNull()) {
-    out << "InitPacketMagicHeader = " << m_initPacketMagicHeader << "\n";
+    out << "H1 = " << m_initPacketMagicHeader << "\n";
   }
   if (!m_responsePacketMagicHeader.isNull()) {
-    out << "ResponsePacketMagicHeader = " << m_responsePacketMagicHeader
-        << "\n";
+    out << "H2 = " << m_responsePacketMagicHeader << "\n";
   }
   if (!m_underloadPacketMagicHeader.isNull()) {
-    out << "UnderloadPacketMagicHeader = " << m_underloadPacketMagicHeader
-        << "\n";
+    out << "H3 = " << m_underloadPacketMagicHeader << "\n";
   }
   if (!m_transportPacketMagicHeader.isNull()) {
-    out << "TransportPacketMagicHeader = " << m_transportPacketMagicHeader
-        << "\n";
+    out << "H4 = " << m_transportPacketMagicHeader << "\n";
   }
 
   // If any extra config was provided, append it now.

From 79d371fb76f94b5ea11e0149b33332ac83abb178 Mon Sep 17 00:00:00 2001
From: ronoaer <ronoaer@gmail.com>
Date: Thu, 5 Oct 2023 00:54:49 +0800
Subject: [PATCH 177/278] translated pages from english to chinese

---
 client/translations/amneziavpn_ru.ts        |  20 +
 client/translations/amneziavpn_zh_CN.ts     | 581 ++++++++++----------
 client/ui/controllers/installController.cpp |   4 +-
 client/ui/qml/Pages2/PageSettingsDns.qml    |   4 +-
 4 files changed, 325 insertions(+), 284 deletions(-)

diff --git a/client/translations/amneziavpn_ru.ts b/client/translations/amneziavpn_ru.ts
index df1cdf47..4f397034 100644
--- a/client/translations/amneziavpn_ru.ts
+++ b/client/translations/amneziavpn_ru.ts
@@ -176,11 +176,21 @@ Already installed containers were found on the server. All installed containers
         <source>All containers from server &apos;</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../ui/controllers/installController.cpp" line="291"/>
+        <source>&apos; have been removed</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location filename="../ui/controllers/installController.cpp" line="307"/>
         <source> has been removed from the server &apos;</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../ui/controllers/installController.cpp" line="308"/>
+        <source>&apos;</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location filename="../ui/controllers/installController.cpp" line="454"/>
         <source>Please login as the user</source>
@@ -1080,6 +1090,16 @@ And if you don&apos;t like the app, all the more support it - the donation will
         <source>If AmneziaDNS is not used or installed</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsDns.qml" line="56"/>
+        <source>Primary DNS</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsDns.qml" line="68"/>
+        <source>Secondary DNS</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsDns.qml" line="86"/>
         <source>Restore default</source>
diff --git a/client/translations/amneziavpn_zh_CN.ts b/client/translations/amneziavpn_zh_CN.ts
index cd46676f..a956c4e0 100644
--- a/client/translations/amneziavpn_zh_CN.ts
+++ b/client/translations/amneziavpn_zh_CN.ts
@@ -20,7 +20,7 @@
         <location filename="../platforms/android/android_controller.cpp" line="239"/>
         <source>VPN Connected</source>
         <extracomment>Refers to the app - which is currently running the background and waiting</extracomment>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">VPN已连接</translation>
     </message>
 </context>
 <context>
@@ -70,17 +70,17 @@
     <message>
         <location filename="../ui/qml/Components/ConnectionTypeSelectionDrawer.qml" line="31"/>
         <source>Connection data</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">连接数据</translation>
     </message>
     <message>
         <location filename="../ui/qml/Components/ConnectionTypeSelectionDrawer.qml" line="40"/>
         <source>Server IP, login and password</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">服务器IP，用户名和密码</translation>
     </message>
     <message>
         <location filename="../ui/qml/Components/ConnectionTypeSelectionDrawer.qml" line="54"/>
         <source>QR code, key or configuration file</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">二维码，授权码或者配置文件</translation>
     </message>
 </context>
 <context>
@@ -88,22 +88,22 @@
     <message>
         <location filename="../ui/qml/Controls2/ContextMenuType.qml" line="9"/>
         <source>C&amp;ut</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">剪切</translation>
     </message>
     <message>
         <location filename="../ui/qml/Controls2/ContextMenuType.qml" line="15"/>
         <source>&amp;Copy</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">拷贝</translation>
     </message>
     <message>
         <location filename="../ui/qml/Controls2/ContextMenuType.qml" line="21"/>
         <source>&amp;Paste</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">粘贴</translation>
     </message>
     <message>
         <location filename="../ui/qml/Controls2/ContextMenuType.qml" line="28"/>
         <source>&amp;SelectAll</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">全选</translation>
     </message>
 </context>
 <context>
@@ -111,7 +111,7 @@
     <message>
         <location filename="../ui/controllers/exportController.cpp" line="34"/>
         <source>Access error!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">访问错误</translation>
     </message>
 </context>
 <context>
@@ -119,12 +119,12 @@
     <message>
         <location filename="../ui/qml/Components/HomeContainersListView.qml" line="58"/>
         <source>The selected protocol is not supported on the current platform</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">当前平台不支持所选协议</translation>
     </message>
     <message>
         <location filename="../ui/qml/Components/HomeContainersListView.qml" line="77"/>
         <source>Reconnect via VPN Procotol: </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">重连基于VPN协议: </translation>
     </message>
 </context>
 <context>
@@ -132,7 +132,7 @@
     <message>
         <location filename="../ui/controllers/importController.cpp" line="384"/>
         <source>Scanned %1 of %2.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">扫描 %1 of %2.</translation>
     </message>
 </context>
 <context>
@@ -141,55 +141,65 @@
         <location filename="../ui/controllers/installController.cpp" line="110"/>
         <location filename="../ui/controllers/installController.cpp" line="163"/>
         <source> installed successfully. </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">安装成功</translation>
     </message>
     <message>
         <location filename="../ui/controllers/installController.cpp" line="113"/>
         <location filename="../ui/controllers/installController.cpp" line="166"/>
         <source> is already installed on the server. </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"> 已安装在服务上</translation>
     </message>
     <message>
         <location filename="../ui/controllers/installController.cpp" line="116"/>
         <location filename="../ui/controllers/installController.cpp" line="185"/>
         <source>
 Already installed containers were found on the server. All installed containers have been added to the application</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">在服务上发现已经安装协议并添加到应用程序</translation>
     </message>
     <message>
         <location filename="../ui/controllers/installController.cpp" line="266"/>
         <source>Settings updated successfully</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">配置更新成功</translation>
     </message>
     <message>
         <location filename="../ui/controllers/installController.cpp" line="281"/>
         <source>Server &apos;</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">服务器 </translation>
     </message>
     <message>
         <location filename="../ui/controllers/installController.cpp" line="281"/>
         <source>&apos; was removed</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"> 已经移除</translation>
     </message>
     <message>
         <location filename="../ui/controllers/installController.cpp" line="291"/>
         <source>All containers from server &apos;</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../ui/controllers/installController.cpp" line="291"/>
+        <source>&apos; have been removed</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location filename="../ui/controllers/installController.cpp" line="307"/>
         <source> has been removed from the server &apos;</source>
+        <translation type="unfinished"> 协议已从</translation>
+    </message>
+    <message>
+        <location filename="../ui/controllers/installController.cpp" line="308"/>
+        <source>&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../ui/controllers/installController.cpp" line="454"/>
         <source>Please login as the user</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">请以用户身份登录</translation>
     </message>
     <message>
         <location filename="../ui/controllers/installController.cpp" line="481"/>
         <source>Server added successfully</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">服务器添加成功</translation>
     </message>
 </context>
 <context>
@@ -197,17 +207,17 @@ Already installed containers were found on the server. All installed containers
     <message>
         <location filename="../3rd/qtkeychain/TestAppExample/keychainclass.cpp" line="22"/>
         <source>Read key failed: %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">获取授权码失败: %1</translation>
     </message>
     <message>
         <location filename="../3rd/qtkeychain/TestAppExample/keychainclass.cpp" line="37"/>
         <source>Write key failed: %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">写入授权码失败: %1</translation>
     </message>
     <message>
         <location filename="../3rd/qtkeychain/TestAppExample/keychainclass.cpp" line="54"/>
         <source>Delete key failed: %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">删除授权码失败: %1</translation>
     </message>
 </context>
 <context>
@@ -221,22 +231,22 @@ Already installed containers were found on the server. All installed containers
     <message>
         <location filename="../ui/notificationhandler.cpp" line="69"/>
         <source>VPN Connected</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">已连接到VPN</translation>
     </message>
     <message>
         <location filename="../ui/notificationhandler.cpp" line="76"/>
         <source>VPN Disconnected</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">已从VPN断开</translation>
     </message>
     <message>
         <location filename="../ui/notificationhandler.cpp" line="95"/>
         <source>AmneziaVPN notification</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">AmneziaVPN 提示</translation>
     </message>
     <message>
         <location filename="../ui/notificationhandler.cpp" line="96"/>
         <source>Unsecured network detected: </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">发现不安全网络</translation>
     </message>
 </context>
 <context>
@@ -249,7 +259,7 @@ Already installed containers were found on the server. All installed containers
     <message>
         <location filename="../ui/qml/Pages2/PageDeinstalling.qml" line="87"/>
         <source>Usually it takes no more than 5 minutes</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">通常5分钟之内完成</translation>
     </message>
 </context>
 <context>
@@ -257,7 +267,7 @@ Already installed containers were found on the server. All installed containers
     <message>
         <location filename="../ui/qml/Pages2/PageHome.qml" line="193"/>
         <source>VPN protocol</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">VPN协议</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageHome.qml" line="238"/>
@@ -270,28 +280,28 @@ Already installed containers were found on the server. All installed containers
     <message>
         <location filename="../ui/qml/Pages2/PageProtocolCloakSettings.qml" line="74"/>
         <source>Cloak settings</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Cloak 配置</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageProtocolCloakSettings.qml" line="81"/>
         <source>Disguised as traffic from</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">伪装流量来自</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageProtocolCloakSettings.qml" line="103"/>
         <source>Port</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">端口</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageProtocolCloakSettings.qml" line="120"/>
         <location filename="../ui/qml/Pages2/PageProtocolCloakSettings.qml" line="121"/>
         <source>Cipher</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">解码</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageProtocolCloakSettings.qml" line="159"/>
         <source>Save and Restart Amnezia</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">保存并重启Amnezia</translation>
     </message>
 </context>
 <context>
@@ -299,27 +309,27 @@ Already installed containers were found on the server. All installed containers
     <message>
         <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="76"/>
         <source>OpenVPN settings</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">OpenVPN 配置</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="83"/>
         <source>VPN Addresses Subnet</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">VPN子网掩码</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="97"/>
         <source>Network protocol</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">网络协议</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="126"/>
         <source>Port</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">端口</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="144"/>
         <source>Auto-negotiate encryption</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">自动协商加密</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="161"/>
@@ -381,7 +391,7 @@ Already installed containers were found on the server. All installed containers
         <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="207"/>
         <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="208"/>
         <source>Cipher</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">解码</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="216"/>
@@ -436,43 +446,43 @@ Already installed containers were found on the server. All installed containers
     <message>
         <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="258"/>
         <source>TLS auth</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">TLS认证</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="273"/>
         <source>Block DNS requests outside of VPN</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">阻止VPN外的DNS请求</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="292"/>
         <source>Additional client configuration commands</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">附加客户端配置命令</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="308"/>
         <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="340"/>
         <source>Commands:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">命令:</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="324"/>
         <source>Additional server configuration commands</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">附加服务器端配置命令</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="359"/>
         <source>Remove OpenVPN</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">移除OpenVPN</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="362"/>
         <source>Remove OpenVpn from server?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">从服务器移除OpenVPN吗?</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="363"/>
         <source>All users with whom you shared a connection will no longer be able to connect to it</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">与您共享连接的所有用户将无法再连接到此链接</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="364"/>
@@ -487,7 +497,7 @@ Already installed containers were found on the server. All installed containers
     <message>
         <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="384"/>
         <source>Save and Restart Amnezia</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">保存并重启Amnezia</translation>
     </message>
 </context>
 <context>
@@ -495,33 +505,33 @@ Already installed containers were found on the server. All installed containers
     <message>
         <location filename="../ui/qml/Pages2/PageProtocolRaw.qml" line="38"/>
         <source> settings</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"> 配置</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageProtocolRaw.qml" line="78"/>
         <source>Show connection options</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">展示连接选项</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageProtocolRaw.qml" line="130"/>
         <source>Connection options </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">连接选项</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageProtocolRaw.qml" line="172"/>
         <location filename="../ui/qml/Pages2/PageProtocolRaw.qml" line="176"/>
         <source>Remove </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">移除</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageProtocolRaw.qml" line="176"/>
         <source> from server?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"> 从服务器</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageProtocolRaw.qml" line="177"/>
         <source>All users with whom you shared a connection will no longer be able to connect to it</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">与您共享连接的所有用户将无法再连接到此链接</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageProtocolRaw.qml" line="178"/>
@@ -539,23 +549,23 @@ Already installed containers were found on the server. All installed containers
     <message>
         <location filename="../ui/qml/Pages2/PageProtocolShadowSocksSettings.qml" line="74"/>
         <source>ShadowSocks settings</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">ShadowSocks 配置</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageProtocolShadowSocksSettings.qml" line="81"/>
         <source>Port</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">端口</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageProtocolShadowSocksSettings.qml" line="98"/>
         <location filename="../ui/qml/Pages2/PageProtocolShadowSocksSettings.qml" line="99"/>
         <source>Cipher</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">解码</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageProtocolShadowSocksSettings.qml" line="137"/>
         <source>Save and Restart Amnezia</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">保存并重启Amnezia</translation>
     </message>
 </context>
 <context>
@@ -564,23 +574,23 @@ Already installed containers were found on the server. All installed containers
         <location filename="../ui/qml/Pages2/PageServiceDnsSettings.qml" line="52"/>
         <source>A DNS service is installed on your server, and it is only accessible via VPN.
 </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">您的服务器上安装了DNS服务，并且只能通过VPN访问。</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageServiceDnsSettings.qml" line="53"/>
         <source>The DNS address is the same as the address of your server. You can configure DNS in the settings, under the connections tab.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">DNS地址与您的服务器地址相同。您可以在连接选项卡下的设置中配置 DNS</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageServiceDnsSettings.qml" line="62"/>
         <location filename="../ui/qml/Pages2/PageServiceDnsSettings.qml" line="66"/>
         <source>Remove </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">移除</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageServiceDnsSettings.qml" line="66"/>
         <source> from server?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"> 从服务器</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageServiceDnsSettings.qml" line="67"/>
@@ -598,17 +608,17 @@ Already installed containers were found on the server. All installed containers
     <message>
         <location filename="../ui/qml/Pages2/PageServiceSftpSettings.qml" line="22"/>
         <source>Settings updated successfully</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">配置更新成功</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageServiceSftpSettings.qml" line="83"/>
         <source>SFTP settings</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">SFTP 配置</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageServiceSftpSettings.qml" line="90"/>
         <source>Host</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">主机</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageServiceSftpSettings.qml" line="100"/>
@@ -616,59 +626,59 @@ Already installed containers were found on the server. All installed containers
         <location filename="../ui/qml/Pages2/PageServiceSftpSettings.qml" line="134"/>
         <location filename="../ui/qml/Pages2/PageServiceSftpSettings.qml" line="151"/>
         <source>Copied</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">拷贝</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageServiceSftpSettings.qml" line="107"/>
         <source>Port</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">端口</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageServiceSftpSettings.qml" line="124"/>
         <source>Login</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">用户</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageServiceSftpSettings.qml" line="141"/>
         <source>Password</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">密码</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageServiceSftpSettings.qml" line="183"/>
         <source>Mount folder on device</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">在设备上挂载文件夹</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageServiceSftpSettings.qml" line="208"/>
         <source>In order to mount remote SFTP folder as local drive, perform following steps: &lt;br&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">要将远程 SFTP 文件夹安装为本地驱动器，请执行以下步骤: &lt;br&gt;</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageServiceSftpSettings.qml" line="210"/>
         <location filename="../ui/qml/Pages2/PageServiceSftpSettings.qml" line="213"/>
         <source>&lt;br&gt;1. Install the latest version of </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">&lt;br&gt;1. 安装最新版的 </translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageServiceSftpSettings.qml" line="211"/>
         <location filename="../ui/qml/Pages2/PageServiceSftpSettings.qml" line="214"/>
         <source>&lt;br&gt;2. Install the latest version of </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">&lt;br&gt;2. 安装最新版的 </translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageServiceSftpSettings.qml" line="242"/>
         <source>Detailed instructions</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">详细说明</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageServiceSftpSettings.qml" line="260"/>
         <source>Remove SFTP and all data stored there</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">删除SFTP和其存储在这里的所有数据</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageServiceSftpSettings.qml" line="263"/>
         <source>Remove SFTP and all data stored there?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">删除SFTP和其存储在这里的所有数据?</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageServiceSftpSettings.qml" line="264"/>
@@ -686,27 +696,27 @@ Already installed containers were found on the server. All installed containers
     <message>
         <location filename="../ui/qml/Pages2/PageServiceTorWebsiteSettings.qml" line="23"/>
         <source>Settings updated successfully</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">配置更新成功</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageServiceTorWebsiteSettings.qml" line="60"/>
         <source>Tor website settings</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Tor网站配置</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageServiceTorWebsiteSettings.qml" line="67"/>
         <source>Website address</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">网址</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageServiceTorWebsiteSettings.qml" line="82"/>
         <source>Copied</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">拷贝</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageServiceTorWebsiteSettings.qml" line="106"/>
         <source>Use &lt;a href=&quot;https://www.torproject.org/download/&quot; style=&quot;color: #FBB26A;&quot;&gt;Tor Browser&lt;/a&gt; to open this url.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Use &lt;a href=&quot;https://www.torproject.org/download/&quot; style=&quot;color: #FBB26A;&quot;&gt;Tor 浏览器&lt;/a&gt; to open this url.</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageServiceTorWebsiteSettings.qml" line="115"/>
@@ -721,7 +731,7 @@ Already installed containers were found on the server. All installed containers
     <message>
         <location filename="../ui/qml/Pages2/PageServiceTorWebsiteSettings.qml" line="138"/>
         <source>Remove website</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">移除网站</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageServiceTorWebsiteSettings.qml" line="141"/>
@@ -1033,7 +1043,7 @@ And if you don&apos;t like the app, all the more support it - the donation will
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsConnection.qml" line="70"/>
         <source>If AmneziaDNS is installed on the server</source>
-        <translation type="unfinished">如其已安装至服务上</translation>
+        <translation type="unfinished">如其已安装至服务器上</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsConnection.qml" line="85"/>
@@ -1078,6 +1088,16 @@ And if you don&apos;t like the app, all the more support it - the donation will
         <source>If AmneziaDNS is not used or installed</source>
         <translation type="unfinished">如果未使用或未安装Amnezia DNS</translation>
     </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsDns.qml" line="56"/>
+        <source>Primary DNS</source>
+        <translation type="unfinished">首选 DNS</translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsDns.qml" line="68"/>
+        <source>Secondary DNS</source>
+        <translation type="unfinished">备用 DNS</translation>
+    </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsDns.qml" line="86"/>
         <source>Restore default</source>
@@ -1101,7 +1121,7 @@ And if you don&apos;t like the app, all the more support it - the donation will
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsDns.qml" line="99"/>
         <source>Settings have been reset</source>
-        <translation type="unfinished">已重配置</translation>
+        <translation type="unfinished">已重置</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsDns.qml" line="111"/>
@@ -1177,27 +1197,27 @@ And if you don&apos;t like the app, all the more support it - the donation will
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsServerData.qml" line="23"/>
         <source>All installed containers have been added to the application</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">所有已安装的容器已添加到应用程序中</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsServerData.qml" line="25"/>
         <source>No new installed containers found</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">未找到新安装的容器</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsServerData.qml" line="87"/>
         <source>Clear Amnezia cache</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">清除 Amnezia 缓存</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsServerData.qml" line="88"/>
         <source>May be needed when changing other settings</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">更改其他设置时可能需要</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsServerData.qml" line="91"/>
         <source>Clear cached profiles?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">清除缓存的配置文件？</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsServerData.qml" line="92"/>
@@ -1221,42 +1241,42 @@ And if you don&apos;t like the app, all the more support it - the donation will
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsServerData.qml" line="117"/>
         <source>Check the server for previously installed Amnezia services</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">检查服务器上是否有以前安装的 Amnezia 服务</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsServerData.qml" line="118"/>
         <source>Add them to the application if they were not displayed</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">如果未显示，请将它们添加到应用程序中</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsServerData.qml" line="134"/>
         <source>Remove server from application</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">从应用程序中移除服务器</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsServerData.qml" line="138"/>
         <source>Remove server?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">移除服务器?</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsServerData.qml" line="139"/>
         <source>All installed AmneziaVPN services will still remain on the server.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">所有已安装的 AmneziaVPN 服务仍将保留在服务器上。</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsServerData.qml" line="165"/>
         <source>Clear server from Amnezia software</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">从Amnezia中清除服务器</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsServerData.qml" line="169"/>
         <source>Clear server from Amnezia software?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">从Amnezia中清除服务器?</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsServerData.qml" line="170"/>
         <source>All containers will be deleted on the server. This means that configuration files, keys and certificates will be deleted.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">服务器上的所有容器都将被删除。这意味着配置文件、密钥和证书将被删除。</translation>
     </message>
 </context>
 <context>
@@ -1264,7 +1284,7 @@ And if you don&apos;t like the app, all the more support it - the donation will
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsServerInfo.qml" line="102"/>
         <source>Server name</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">服务器名称</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsServerInfo.qml" line="110"/>
@@ -1274,17 +1294,17 @@ And if you don&apos;t like the app, all the more support it - the donation will
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsServerInfo.qml" line="137"/>
         <source>Protocols</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">协议</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsServerInfo.qml" line="143"/>
         <source>Services</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">服务</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsServerInfo.qml" line="147"/>
         <source>Data</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">数据</translation>
     </message>
 </context>
 <context>
@@ -1292,23 +1312,23 @@ And if you don&apos;t like the app, all the more support it - the donation will
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsServerProtocol.qml" line="38"/>
         <source> settings</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">配置</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsServerProtocol.qml" line="112"/>
         <location filename="../ui/qml/Pages2/PageSettingsServerProtocol.qml" line="116"/>
         <source>Remove </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">移除</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsServerProtocol.qml" line="116"/>
         <source> from server?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"> 从服务器</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsServerProtocol.qml" line="117"/>
         <source>All users with whom you shared a connection will no longer be able to connect to it</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">与您共享连接的所有用户将无法再连接到此链接</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsServerProtocol.qml" line="118"/>
@@ -1334,12 +1354,12 @@ And if you don&apos;t like the app, all the more support it - the donation will
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="49"/>
         <source>Only the addresses in the list must be opened via VPN</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">仅列表中的地址须通过VPN访问</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="54"/>
         <source>Addresses from the list should never be opened via VPN</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">勿通过VPN访问列表中的地址</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="84"/>
@@ -1349,12 +1369,12 @@ And if you don&apos;t like the app, all the more support it - the donation will
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="120"/>
         <source>Mode</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">方式</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="198"/>
         <source>Remove </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">移除</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="199"/>
@@ -1369,27 +1389,27 @@ And if you don&apos;t like the app, all the more support it - the donation will
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="238"/>
         <source>Site or IP</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">网址或IP地址</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="282"/>
         <source>Import/Export Sites</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">导入/导出网址</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="288"/>
         <source>Import</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">导入</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="300"/>
         <source>Save site list</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">保存网址</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="307"/>
         <source>Save sites</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">保存网址</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="308"/>
@@ -1401,23 +1421,23 @@ And if you don&apos;t like the app, all the more support it - the donation will
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="365"/>
         <source>Import a list of sites</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">导入网址列表</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="371"/>
         <source>Replace site list</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">替换网址列表</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="374"/>
         <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="389"/>
         <source>Open sites file</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">打开网址文件</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="386"/>
         <source>Add imported sites to existing ones</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">将导入的网址添加到现有网址中</translation>
     </message>
 </context>
 <context>
@@ -1425,14 +1445,15 @@ And if you don&apos;t like the app, all the more support it - the donation will
     <message>
         <location filename="../ui/qml/Pages2/PageSetupWizardConfigSource.qml" line="50"/>
         <source>Server connection</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">服务器连接</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSetupWizardConfigSource.qml" line="51"/>
         <source>Do not use connection code from public sources. It may have been created to intercept your data.
 
 It&apos;s okay as long as it&apos;s from someone you trust.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">请勿使用公共来源的连接代码。它可能是为了拦截您的数据而创建的。
+最好是来源可信。</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSetupWizardConfigSource.qml" line="61"/>
@@ -1442,27 +1463,27 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
     <message>
         <location filename="../ui/qml/Pages2/PageSetupWizardConfigSource.qml" line="68"/>
         <source>File with connection settings or backup</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">包含连接配置或备份的文件</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSetupWizardConfigSource.qml" line="68"/>
         <source>File with connection settings</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">包含连接配置的文件</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSetupWizardConfigSource.qml" line="75"/>
         <source>Open config file</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">打开配置文件</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSetupWizardConfigSource.qml" line="95"/>
         <source>QR-code</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">二维码</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSetupWizardConfigSource.qml" line="114"/>
         <source>Key as text</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">授权码文本</translation>
     </message>
 </context>
 <context>
@@ -1470,12 +1491,12 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
     <message>
         <location filename="../ui/qml/Pages2/PageSetupWizardCredentials.qml" line="44"/>
         <source>Server connection</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">服务器连接</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSetupWizardCredentials.qml" line="51"/>
         <source>Server IP address [:port]</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">服务器IP [:端口]</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSetupWizardCredentials.qml" line="52"/>
@@ -1485,12 +1506,12 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
     <message>
         <location filename="../ui/qml/Pages2/PageSetupWizardCredentials.qml" line="66"/>
         <source>Login to connect via SSH</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">用户名</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSetupWizardCredentials.qml" line="76"/>
         <source>Password / SSH private key</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">密码 或者 私钥</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSetupWizardCredentials.qml" line="90"/>
@@ -1500,22 +1521,22 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
     <message>
         <location filename="../ui/qml/Pages2/PageSetupWizardCredentials.qml" line="117"/>
         <source>Ip address cannot be empty</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">IP不能为空</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSetupWizardCredentials.qml" line="120"/>
         <source>Enter the address in the format 255.255.255.255:88</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">按照这种格式输入 255.255.255.255:88</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSetupWizardCredentials.qml" line="124"/>
         <source>Login cannot be empty</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">用户名不能为空</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSetupWizardCredentials.qml" line="128"/>
         <source>Password/private key cannot be empty</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">密码或者私钥不能为空</translation>
     </message>
 </context>
 <context>
@@ -1523,17 +1544,17 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
     <message>
         <location filename="../ui/qml/Pages2/PageSetupWizardEasy.qml" line="66"/>
         <source>What is the level of internet control in your region?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">您所在地区的互联网控制力度如何？</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSetupWizardEasy.qml" line="136"/>
         <source>Set up a VPN yourself</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">自己架设VPN</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSetupWizardEasy.qml" line="137"/>
         <source>I want to choose a VPN protocol</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">我想选择VPN协议</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSetupWizardEasy.qml" line="157"/>
@@ -1543,7 +1564,7 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
     <message>
         <location filename="../ui/qml/Pages2/PageSetupWizardEasy.qml" line="186"/>
         <source>Set up later</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">稍后设置</translation>
     </message>
 </context>
 <context>
@@ -1552,32 +1573,32 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
         <location filename="../ui/qml/Pages2/PageSetupWizardInstalling.qml" line="21"/>
         <location filename="../ui/qml/Pages2/PageSetupWizardInstalling.qml" line="71"/>
         <source>Usually it takes no more than 5 minutes</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">通常不超过5分钟</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSetupWizardInstalling.qml" line="61"/>
         <source>The server has already been added to the application</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">服务器已添加到应用程序中</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSetupWizardInstalling.qml" line="66"/>
         <source>Amnesia has detected that your server is currently </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Amnezia 检测到您的服务器当前处于</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSetupWizardInstalling.qml" line="67"/>
         <source>busy installing other software. Amnesia installation </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">正安装其他软件。Amnezia安装</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSetupWizardInstalling.qml" line="68"/>
         <source>will pause until the server finishes installing other software</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">将暂停，直到服务器完成安装其他软件。</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSetupWizardInstalling.qml" line="125"/>
         <source>Installing</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">安装中</translation>
     </message>
 </context>
 <context>
@@ -1595,17 +1616,17 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
     <message>
         <location filename="../ui/qml/Pages2/PageSetupWizardProtocolSettings.qml" line="183"/>
         <source>Close</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">关闭</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSetupWizardProtocolSettings.qml" line="198"/>
         <source>Network protocol</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">网络协议</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSetupWizardProtocolSettings.qml" line="214"/>
         <source>Port</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">端口</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSetupWizardProtocolSettings.qml" line="230"/>
@@ -1618,12 +1639,12 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
     <message>
         <location filename="../ui/qml/Pages2/PageSetupWizardProtocols.qml" line="73"/>
         <source>VPN protocol</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">VPN 协议</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSetupWizardProtocols.qml" line="74"/>
         <source>Choose the one with the highest priority for you. Later, you can install other protocols and additional services, such as DNS proxy and SFTP.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">选择最适合您的一项。稍后，您可以安装其他协议和附加服务，例如 DNS 代理和 SFTP。</translation>
     </message>
 </context>
 <context>
@@ -1631,7 +1652,7 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
     <message>
         <location filename="../ui/qml/Pages2/PageSetupWizardQrReader.qml" line="37"/>
         <source>Point the camera at the QR code and hold for a couple of seconds. </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">将相机对准二维码并按住几秒钟</translation>
     </message>
 </context>
 <context>
@@ -1667,22 +1688,22 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
     <message>
         <location filename="../ui/qml/Pages2/PageSetupWizardTextKey.qml" line="39"/>
         <source>Connection key</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">连接授权码</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSetupWizardTextKey.qml" line="40"/>
         <source>A line that starts with vpn://...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">以 vpn://... 开始的行</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSetupWizardTextKey.qml" line="51"/>
         <source>Key</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">授权码</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSetupWizardTextKey.qml" line="53"/>
         <source>Insert</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">插入</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSetupWizardTextKey.qml" line="71"/>
@@ -1695,12 +1716,12 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
     <message>
         <location filename="../ui/qml/Pages2/PageSetupWizardViewConfig.qml" line="63"/>
         <source>New connection</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">新连接</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSetupWizardViewConfig.qml" line="90"/>
         <source>Do not use connection code from public sources. It could be created to intercept your data.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">请勿使用公共来源的连接代码。它可以被创建来拦截您的数据。</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSetupWizardViewConfig.qml" line="105"/>
@@ -1723,32 +1744,32 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
     <message>
         <location filename="../ui/qml/Pages2/PageShare.qml" line="48"/>
         <source>Save OpenVPN config</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">保存OpenVPN配置</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageShare.qml" line="55"/>
         <source>Save WireGuard config</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">保存WireGuard配置</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageShare.qml" line="86"/>
         <source>For the AmneziaVPN app</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">来自应用AmneziaVPN</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageShare.qml" line="91"/>
         <source>OpenVpn native format</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">OpenVPN原生格式</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageShare.qml" line="96"/>
         <source>WireGuard native format</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">WireGuard原生格式</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageShare.qml" line="121"/>
         <source>VPN Access</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">访问VPN</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageShare.qml" line="146"/>
@@ -1758,17 +1779,17 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
     <message>
         <location filename="../ui/qml/Pages2/PageShare.qml" line="158"/>
         <source>Full access</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">完全授权</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageShare.qml" line="174"/>
         <source>VPN access without the ability to manage the server</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">VPN 访问，不能管理服务器</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageShare.qml" line="175"/>
         <source>Full access to server</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">完全授权方式访问服务器</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageShare.qml" line="190"/>
@@ -1778,44 +1799,44 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
     <message>
         <location filename="../ui/qml/Pages2/PageShare.qml" line="191"/>
         <source>Server</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">服务器</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageShare.qml" line="221"/>
         <source>Accessing </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">访问</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageShare.qml" line="222"/>
         <location filename="../ui/qml/Pages2/PageShare.qml" line="307"/>
         <source>File with connection settings to </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">连接配置文件到 </translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageShare.qml" line="248"/>
         <source>Protocols</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">协议</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageShare.qml" line="249"/>
         <source>Protocol</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">协议</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageShare.qml" line="306"/>
         <source>Connection to </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">连接到</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageShare.qml" line="340"/>
         <location filename="../ui/qml/Pages2/PageShare.qml" line="341"/>
         <source>Connection format</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">连接方式</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageShare.qml" line="379"/>
         <source>Share</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">共享</translation>
     </message>
 </context>
 <context>
@@ -1823,7 +1844,7 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
     <message>
         <location filename="../ui/qml/Controls2/PopupType.qml" line="68"/>
         <source>Close</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">关闭</translation>
     </message>
 </context>
 <context>
@@ -1831,38 +1852,38 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
     <message>
         <location filename="../3rd/qtkeychain/keychain_win.cpp" line="104"/>
         <source>Password entry not found</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">没有密码输入</translation>
     </message>
     <message>
         <location filename="../3rd/qtkeychain/keychain_win.cpp" line="108"/>
         <source>Could not decrypt data</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">不能加密数据</translation>
     </message>
     <message>
         <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="552"/>
         <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="560"/>
         <source>Unknown error</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">位置错误</translation>
     </message>
     <message>
         <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="578"/>
         <source>Could not open wallet: %1; %2</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">无法打开钱包: %1; %2</translation>
     </message>
     <message>
         <location filename="../3rd/qtkeychain/keychain_haiku.cpp" line="177"/>
         <source>Password not found</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">未发现密码</translation>
     </message>
     <message>
         <location filename="../3rd/qtkeychain/keychain_android.cpp" line="173"/>
         <source>Could not open keystore</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">无法打开密钥库</translation>
     </message>
     <message>
         <location filename="../3rd/qtkeychain/keychain_android.cpp" line="179"/>
         <source>Could not remove private key from keystore</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">无法从密钥库中删除私钥</translation>
     </message>
 </context>
 <context>
@@ -1870,12 +1891,12 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
     <message>
         <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="265"/>
         <source>Unknown error</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">未知错误</translation>
     </message>
     <message>
         <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="509"/>
         <source>Access to keychain denied</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">访问钥匙串被拒绝</translation>
     </message>
 </context>
 <context>
@@ -1883,27 +1904,27 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
     <message>
         <location filename="../3rd/qtkeychain/plaintextstore.cpp" line="65"/>
         <source>Could not store data in settings: access error</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">无法在配置中存储数据：访问错误</translation>
     </message>
     <message>
         <location filename="../3rd/qtkeychain/plaintextstore.cpp" line="67"/>
         <source>Could not store data in settings: format error</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">无法在陪置中存储数据：格式错误</translation>
     </message>
     <message>
         <location filename="../3rd/qtkeychain/plaintextstore.cpp" line="85"/>
         <source>Could not delete data from settings: access error</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">无法在配置中删除数据：访问错误</translation>
     </message>
     <message>
         <location filename="../3rd/qtkeychain/plaintextstore.cpp" line="87"/>
         <source>Could not delete data from settings: format error</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">无法在配置中删除数据：格式错误</translation>
     </message>
     <message>
         <location filename="../3rd/qtkeychain/plaintextstore.cpp" line="104"/>
         <source>Entry not found</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">未找到条目</translation>
     </message>
 </context>
 <context>
@@ -1911,13 +1932,13 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
     <message>
         <location filename="../3rd/qtkeychain/keychain_win.cpp" line="32"/>
         <source>Password entry not found</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">没有密码输入</translation>
     </message>
     <message>
         <location filename="../3rd/qtkeychain/keychain_win.cpp" line="36"/>
         <location filename="../3rd/qtkeychain/keychain_win.cpp" line="139"/>
         <source>Could not decrypt data</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">不能加密数据</translation>
     </message>
     <message>
         <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="178"/>
@@ -1938,12 +1959,12 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
     <message>
         <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="288"/>
         <source>Could not open wallet: %1; %2</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">无法打开钱包: %1; %2</translation>
     </message>
     <message>
         <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="333"/>
         <source>Access to keychain denied</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">访问钥匙串被拒绝</translation>
     </message>
     <message>
         <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="354"/>
@@ -1969,12 +1990,12 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
     <message>
         <location filename="../3rd/qtkeychain/keychain_haiku.cpp" line="96"/>
         <source>Password not found</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">未发现密码</translation>
     </message>
     <message>
         <location filename="../3rd/qtkeychain/keychain_android.cpp" line="60"/>
         <source>Could not open keystore</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">无法打开密钥库</translation>
     </message>
     <message>
         <location filename="../3rd/qtkeychain/keychain_android.cpp" line="68"/>
@@ -2023,17 +2044,17 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
     <message>
         <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="468"/>
         <source>Could not open wallet: %1; %2</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">无法打开钱包: %1; %2</translation>
     </message>
     <message>
         <location filename="../3rd/qtkeychain/keychain_haiku.cpp" line="144"/>
         <source>Password not found</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">未发现密码</translation>
     </message>
     <message>
         <location filename="../3rd/qtkeychain/keychain_android.cpp" line="95"/>
         <source>Could not open keystore</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">无法打开密钥库</translation>
     </message>
     <message>
         <location filename="../3rd/qtkeychain/keychain_android.cpp" line="124"/>
@@ -2066,107 +2087,107 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
     <message>
         <location filename="../protocols/protocols_defs.cpp" line="75"/>
         <source>Sftp service</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Sftp 服务</translation>
     </message>
     <message>
         <location filename="../core/errorstrings.cpp" line="9"/>
         <source>No error</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">没有错误</translation>
     </message>
     <message>
         <location filename="../core/errorstrings.cpp" line="10"/>
         <source>Unknown Error</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">位置错误</translation>
     </message>
     <message>
         <location filename="../core/errorstrings.cpp" line="11"/>
         <source>Function not implemented</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">功能未实现</translation>
     </message>
     <message>
         <location filename="../core/errorstrings.cpp" line="14"/>
         <source>Server check failed</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">服务器检测失败</translation>
     </message>
     <message>
         <location filename="../core/errorstrings.cpp" line="15"/>
         <source>Server port already used. Check for another software</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">检测服务器该端口是否被其他软件被占用</translation>
     </message>
     <message>
         <location filename="../core/errorstrings.cpp" line="16"/>
         <source>Server error: Docker container missing</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Server error: Docker容器丢失</translation>
     </message>
     <message>
         <location filename="../core/errorstrings.cpp" line="17"/>
         <source>Server error: Docker failed</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Server error: Docker失败</translation>
     </message>
     <message>
         <location filename="../core/errorstrings.cpp" line="18"/>
         <source>Installation canceled by user</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">用户取消安装</translation>
     </message>
     <message>
         <location filename="../core/errorstrings.cpp" line="19"/>
         <source>The user does not have permission to use sudo</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">用户没有root权限</translation>
     </message>
     <message>
         <location filename="../core/errorstrings.cpp" line="22"/>
         <source>Ssh request was denied</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">ssh请求被拒绝</translation>
     </message>
     <message>
         <location filename="../core/errorstrings.cpp" line="23"/>
         <source>Ssh request was interrupted</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">ssh请求中断</translation>
     </message>
     <message>
         <location filename="../core/errorstrings.cpp" line="24"/>
         <source>Ssh internal error</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">ssh内部错误</translation>
     </message>
     <message>
         <location filename="../core/errorstrings.cpp" line="25"/>
         <source>Invalid private key or invalid passphrase entered</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">输入的私钥或密码无效</translation>
     </message>
     <message>
         <location filename="../core/errorstrings.cpp" line="26"/>
         <source>The selected private key format is not supported, use openssh ED25519 key types or PEM key types</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">不支持所选私钥格式，请使用 openssh ED25519 密钥类型或 PEM 密钥类型</translation>
     </message>
     <message>
         <location filename="../core/errorstrings.cpp" line="27"/>
         <source>Timeout connecting to server</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">连接服务器超时</translation>
     </message>
     <message>
         <location filename="../core/errorstrings.cpp" line="30"/>
         <source>Sftp error: End-of-file encountered</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Sftp错误: 遇到文件结尾</translation>
     </message>
     <message>
         <location filename="../core/errorstrings.cpp" line="31"/>
         <source>Sftp error: File does not exist</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Sftp错误: 文件不存在</translation>
     </message>
     <message>
         <location filename="../core/errorstrings.cpp" line="32"/>
         <source>Sftp error: Permission denied</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Sftp错误: 权限受限</translation>
     </message>
     <message>
         <location filename="../core/errorstrings.cpp" line="33"/>
         <source>Sftp error: Generic failure</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Sftp错误: 一般失败</translation>
     </message>
     <message>
         <location filename="../core/errorstrings.cpp" line="34"/>
         <source>Sftp error: Garbage received from server</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Sftp错误: 从服务器收到垃圾信息</translation>
     </message>
     <message>
         <location filename="../core/errorstrings.cpp" line="35"/>
@@ -2211,67 +2232,67 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
     <message>
         <location filename="../core/errorstrings.cpp" line="45"/>
         <source>Failed to save config to disk</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">配置保存到磁盘失败</translation>
     </message>
     <message>
         <location filename="../core/errorstrings.cpp" line="46"/>
         <source>OpenVPN config missing</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">OpenVPN配置丢失</translation>
     </message>
     <message>
         <location filename="../core/errorstrings.cpp" line="47"/>
         <source>OpenVPN management server error</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">OpenVPN 管理服务器错误</translation>
     </message>
     <message>
         <location filename="../core/errorstrings.cpp" line="50"/>
         <source>OpenVPN executable missing</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">OpenVPN 可执行文件丢失</translation>
     </message>
     <message>
         <location filename="../core/errorstrings.cpp" line="51"/>
         <source>ShadowSocks (ss-local) executable missing</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">ShadowSocks (ss-local) 执行文件丢失</translation>
     </message>
     <message>
         <location filename="../core/errorstrings.cpp" line="52"/>
         <source>Cloak (ck-client) executable missing</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Cloak (ck-client) 执行文件丢失</translation>
     </message>
     <message>
         <location filename="../core/errorstrings.cpp" line="53"/>
         <source>Amnezia helper service error</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Amnezia 帮助服务错误</translation>
     </message>
     <message>
         <location filename="../core/errorstrings.cpp" line="54"/>
         <source>OpenSSL failed</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">OpenSSL失败</translation>
     </message>
     <message>
         <location filename="../core/errorstrings.cpp" line="57"/>
         <source>Can&apos;t connect: another VPN connection is active</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">无法连接：另一个VPN连接处于活动状态</translation>
     </message>
     <message>
         <location filename="../core/errorstrings.cpp" line="58"/>
         <source>Can&apos;t setup OpenVPN TAP network adapter</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">无法设置 OpenVPN TAP 网络适配器</translation>
     </message>
     <message>
         <location filename="../core/errorstrings.cpp" line="59"/>
         <source>VPN pool error: no available addresses</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">VPN 池错误：没有可用地址</translation>
     </message>
     <message>
         <location filename="../core/errorstrings.cpp" line="61"/>
         <source>The config does not contain any containers and credentiaks for connecting to the server</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">该配置不包含任何用于连接到服务器的容器和凭据。</translation>
     </message>
     <message>
         <location filename="../core/errorstrings.cpp" line="65"/>
         <source>Internal error</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">内部错误</translation>
     </message>
     <message>
         <location filename="../containers/containers_defs.cpp" line="87"/>
@@ -2292,142 +2313,142 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
     <message>
         <location filename="../containers/containers_defs.cpp" line="92"/>
         <source>Sftp file sharing service</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">SFTP文件共享服务</translation>
     </message>
     <message>
         <location filename="../containers/containers_defs.cpp" line="98"/>
         <source>OpenVPN is the most popular VPN protocol, with flexible configuration options. It uses its own security protocol with SSL/TLS for key exchange.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">OpenVPN 是最流行的 VPN 协议，具有灵活的配置选项。它使用自己的安全协议与 SSL/TLS 进行密钥交换。</translation>
     </message>
     <message>
         <location filename="../containers/containers_defs.cpp" line="101"/>
         <source>ShadowSocks - masks VPN traffic, making it similar to normal web traffic, but is recognised by analysis systems in some highly censored regions.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">ShadowSocks - 混淆 VPN 流量，使其与正常的 Web 流量相似，但在一些审查力度高的地区可以被分析系统识别。</translation>
     </message>
     <message>
         <location filename="../containers/containers_defs.cpp" line="104"/>
         <source>OpenVPN over Cloak - OpenVPN with VPN masquerading as web traffic and protection against active-probbing detection. Ideal for bypassing blocking in regions with the highest levels of censorship.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">OpenVPN over Cloak - OpenVPN，具有伪装成网络流量的 VPN 和针对主动探测检测的保护.非常适合绕过审查力度特别强的地区的封锁。</translation>
     </message>
     <message>
         <location filename="../containers/containers_defs.cpp" line="108"/>
         <source>WireGuard - New popular VPN protocol with high performance, high speed and low power consumption. Recommended for regions with low levels of censorship.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">WireGuard - 新型流行的VPN协议，具有高性能、高速度和低功耗。建议用于审查力度较低的地区</translation>
     </message>
     <message>
         <location filename="../containers/containers_defs.cpp" line="111"/>
         <source>IKEv2 -  Modern stable protocol, a bit faster than others, restores connection after signal loss. It has native support on the latest versions of Android and iOS.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">IKEv2 - 现代稳定协议，比其他协议快一点，在信号丢失后恢复连接。Android 和 iOS最新版原生支持。</translation>
     </message>
     <message>
         <location filename="../containers/containers_defs.cpp" line="114"/>
         <source>Deploy a WordPress site on the Tor network in two clicks.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">只需点击两次即可在 Tor 网络上部署 WordPress 网站</translation>
     </message>
     <message>
         <location filename="../containers/containers_defs.cpp" line="116"/>
         <source>Replace the current DNS server with your own. This will increase your privacy level.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">将当前的 DNS 服务器替换为您自己的。这将提高您的隐私级别。</translation>
     </message>
     <message>
         <location filename="../containers/containers_defs.cpp" line="119"/>
         <source>Creates a file vault on your server to securely store and transfer files.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">在您的服务器上创建文件库以安全地存储和传输文件</translation>
     </message>
     <message>
         <location filename="../containers/containers_defs.cpp" line="124"/>
         <source>OpenVPN container</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">OpenVPN容器</translation>
     </message>
     <message>
         <location filename="../containers/containers_defs.cpp" line="125"/>
         <source>Container with OpenVpn and ShadowSocks</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">带有 OpenVpn 和 ShadowSocks 的容器</translation>
     </message>
     <message>
         <location filename="../containers/containers_defs.cpp" line="127"/>
         <source>Container with OpenVpn and ShadowSocks protocols configured with traffic masking by Cloak plugin</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">具有 OpenVpn 和 ShadowSocks 协议的容器，通过 Cloak 插件配置混淆流量</translation>
     </message>
     <message>
         <location filename="../containers/containers_defs.cpp" line="129"/>
         <source>WireGuard container</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">WireGuard 容器</translation>
     </message>
     <message>
         <location filename="../containers/containers_defs.cpp" line="130"/>
         <source>IPsec container</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">IPsec 容器</translation>
     </message>
     <message>
         <location filename="../containers/containers_defs.cpp" line="133"/>
         <source>DNS Service</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">DNS 服务</translation>
     </message>
     <message>
         <location filename="../containers/containers_defs.cpp" line="135"/>
         <source>Sftp file sharing service - is secure FTP service</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Sftp 文件共享服务 - 安全的 FTP 服务</translation>
     </message>
     <message>
         <location filename="../3rd/qtkeychain/libsecret.cpp" line="119"/>
         <source>Entry not found</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">未找到记录</translation>
     </message>
     <message>
         <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="225"/>
         <source>Access to keychain denied</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">访问钥匙串被拒绝</translation>
     </message>
     <message>
         <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="227"/>
         <source>No keyring daemon</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">没有密钥环守护进程</translation>
     </message>
     <message>
         <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="229"/>
         <source>Already unlocked</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">已经解锁</translation>
     </message>
     <message>
         <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="231"/>
         <source>No such keyring</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">没有这样的密钥环</translation>
     </message>
     <message>
         <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="233"/>
         <source>Bad arguments</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">错误参数</translation>
     </message>
     <message>
         <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="235"/>
         <source>I/O error</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">I/O错误</translation>
     </message>
     <message>
         <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="237"/>
         <source>Cancelled</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">已取消</translation>
     </message>
     <message>
         <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="239"/>
         <source>Keyring already exists</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">密匙环已经存在</translation>
     </message>
     <message>
         <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="241"/>
         <source>No match</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">不匹配</translation>
     </message>
     <message>
         <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="246"/>
         <source>Unknown error</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">未知错误</translation>
     </message>
     <message>
         <location filename="../3rd/qtkeychain/keychain_haiku.cpp" line="72"/>
         <source>error 0x%1: %2</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">错误 0x%1: %2</translation>
     </message>
 </context>
 <context>
@@ -2449,7 +2470,7 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
         <location filename="../settings.cpp" line="202"/>
         <location filename="../settings.cpp" line="209"/>
         <source>Server</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">服务器</translation>
     </message>
 </context>
 <context>
@@ -2486,7 +2507,7 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
     <message>
         <location filename="../ui/qml/Components/ShareConnectionDrawer.qml" line="71"/>
         <source>Share</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">共享</translation>
     </message>
     <message>
         <location filename="../ui/qml/Components/ShareConnectionDrawer.qml" line="104"/>
@@ -2496,7 +2517,7 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
     <message>
         <location filename="../ui/qml/Components/ShareConnectionDrawer.qml" line="111"/>
         <source>Copied</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">拷贝</translation>
     </message>
     <message>
         <location filename="../ui/qml/Components/ShareConnectionDrawer.qml" line="126"/>
@@ -2557,7 +2578,7 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
     <message>
         <location filename="../ui/systemtray_notificationhandler.cpp" line="30"/>
         <source>Show</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">显示界面</translation>
     </message>
     <message>
         <location filename="../ui/systemtray_notificationhandler.cpp" line="34"/>
@@ -2567,17 +2588,17 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
     <message>
         <location filename="../ui/systemtray_notificationhandler.cpp" line="35"/>
         <source>Disconnect</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">断开</translation>
     </message>
     <message>
         <location filename="../ui/systemtray_notificationhandler.cpp" line="39"/>
         <source>Visit Website</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">访问官网</translation>
     </message>
     <message>
         <location filename="../ui/systemtray_notificationhandler.cpp" line="43"/>
         <source>Quit</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">退出</translation>
     </message>
 </context>
 <context>
@@ -2593,22 +2614,22 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
     <message>
         <location filename="../protocols/vpnprotocol.cpp" line="130"/>
         <source>Unknown</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">未知</translation>
     </message>
     <message>
         <location filename="../protocols/vpnprotocol.cpp" line="131"/>
         <source>Disconnected</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">断开连接</translation>
     </message>
     <message>
         <location filename="../protocols/vpnprotocol.cpp" line="132"/>
         <source>Preparing</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">准备中</translation>
     </message>
     <message>
         <location filename="../protocols/vpnprotocol.cpp" line="133"/>
         <source>Connecting...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">连接中</translation>
     </message>
     <message>
         <location filename="../protocols/vpnprotocol.cpp" line="134"/>
@@ -2618,17 +2639,17 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
     <message>
         <location filename="../protocols/vpnprotocol.cpp" line="135"/>
         <source>Disconnecting...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">断开中</translation>
     </message>
     <message>
         <location filename="../protocols/vpnprotocol.cpp" line="136"/>
         <source>Reconnecting...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">重连中</translation>
     </message>
     <message>
         <location filename="../protocols/vpnprotocol.cpp" line="137"/>
         <source>Error</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">错误</translation>
     </message>
 </context>
 <context>
@@ -2636,32 +2657,32 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
     <message>
         <location filename="../containers/containers_defs.cpp" line="236"/>
         <source>Low</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">低</translation>
     </message>
     <message>
         <location filename="../containers/containers_defs.cpp" line="237"/>
         <source>High</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">高</translation>
     </message>
     <message>
         <location filename="../containers/containers_defs.cpp" line="238"/>
         <source>Medium</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">中</translation>
     </message>
     <message>
         <location filename="../containers/containers_defs.cpp" line="246"/>
         <source>I just want to increase the level of privacy</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">我只是想提高隐私级别</translation>
     </message>
     <message>
         <location filename="../containers/containers_defs.cpp" line="247"/>
         <source>Many foreign websites and VPN providers are blocked</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">许多国外网站和VPN提供商被屏蔽</translation>
     </message>
     <message>
         <location filename="../containers/containers_defs.cpp" line="248"/>
         <source>Some foreign sites are blocked, but VPN providers are not blocked</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">一些国外网站被屏蔽，但VPN提供商未被屏蔽</translation>
     </message>
 </context>
 <context>
@@ -2669,7 +2690,7 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
     <message>
         <location filename="../ui/qml/main2.qml" line="172"/>
         <source>Private key passphrase</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">私钥密码</translation>
     </message>
     <message>
         <location filename="../ui/qml/main2.qml" line="191"/>
diff --git a/client/ui/controllers/installController.cpp b/client/ui/controllers/installController.cpp
index 63510d1a..8b77252f 100644
--- a/client/ui/controllers/installController.cpp
+++ b/client/ui/controllers/installController.cpp
@@ -288,7 +288,7 @@ void InstallController::removeAllContainers()
 
     ErrorCode errorCode = m_containersModel->removeAllContainers();
     if (errorCode == ErrorCode::NoError) {
-        emit removeAllContainersFinished(tr("All containers from server '") + serverName + ("' have been removed"));
+        emit removeAllContainersFinished(tr("All containers from server '") + serverName + tr("' have been removed"));
         return;
     }
     emit installationErrorOccurred(errorString(errorCode));
@@ -305,7 +305,7 @@ void InstallController::removeCurrentlyProcessedContainer()
     ErrorCode errorCode = m_containersModel->removeCurrentlyProcessedContainer();
     if (errorCode == ErrorCode::NoError) {
         emit removeCurrentlyProcessedContainerFinished(containerName + tr(" has been removed from the server '")
-                                                       + serverName + "'");
+                                                       + serverName + tr("'"));
         return;
     }
     emit installationErrorOccurred(errorString(errorCode));
diff --git a/client/ui/qml/Pages2/PageSettingsDns.qml b/client/ui/qml/Pages2/PageSettingsDns.qml
index 0bc13eae..58ec0783 100644
--- a/client/ui/qml/Pages2/PageSettingsDns.qml
+++ b/client/ui/qml/Pages2/PageSettingsDns.qml
@@ -53,7 +53,7 @@ PageType {
                 id: primaryDns
 
                 Layout.fillWidth: true
-                headerText: "Primary DNS"
+                headerText: qsTr("Primary DNS")
 
                 textFieldText: SettingsController.primaryDns
                 textField.validator: RegularExpressionValidator {
@@ -65,7 +65,7 @@ PageType {
                 id: secondaryDns
 
                 Layout.fillWidth: true
-                headerText: "Secondary DNS"
+                headerText: qsTr("Secondary DNS")
 
                 textFieldText: SettingsController.secondaryDns
                 textField.validator: RegularExpressionValidator {

From 08defbbbd84f7e5f4fddbbb490841ca5b6a9d69f Mon Sep 17 00:00:00 2001
From: ronoaer <ronoaer@gmail.com>
Date: Thu, 5 Oct 2023 13:26:11 +0800
Subject: [PATCH 178/278] updated original string format, for adapting
 multi-language

---
 client/translations/amneziavpn_ru.ts          |  66 +++----
 client/translations/amneziavpn_zh_CN.ts       | 183 ++++++++++--------
 client/ui/controllers/installController.cpp   |  18 +-
 client/ui/controllers/sitesController.cpp     |  10 +-
 client/ui/qml/Pages2/PageDeinstalling.qml     |   2 +-
 client/ui/qml/Pages2/PageProtocolRaw.qml      |   2 +-
 .../ui/qml/Pages2/PageServiceDnsSettings.qml  |   2 +-
 .../qml/Pages2/PageSettingsServerProtocol.qml |   2 +-
 8 files changed, 140 insertions(+), 145 deletions(-)

diff --git a/client/translations/amneziavpn_ru.ts b/client/translations/amneziavpn_ru.ts
index 4f397034..000e0907 100644
--- a/client/translations/amneziavpn_ru.ts
+++ b/client/translations/amneziavpn_ru.ts
@@ -139,65 +139,50 @@
     <name>InstallController</name>
     <message>
         <location filename="../ui/controllers/installController.cpp" line="110"/>
-        <location filename="../ui/controllers/installController.cpp" line="163"/>
-        <source> installed successfully. </source>
+        <location filename="../ui/controllers/installController.cpp" line="162"/>
+        <source>%1 installed successfully. </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/controllers/installController.cpp" line="113"/>
-        <location filename="../ui/controllers/installController.cpp" line="166"/>
-        <source> is already installed on the server. </source>
+        <location filename="../ui/controllers/installController.cpp" line="112"/>
+        <location filename="../ui/controllers/installController.cpp" line="164"/>
+        <source>%1 is already installed on the server. </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/controllers/installController.cpp" line="116"/>
-        <location filename="../ui/controllers/installController.cpp" line="185"/>
+        <location filename="../ui/controllers/installController.cpp" line="115"/>
+        <location filename="../ui/controllers/installController.cpp" line="183"/>
         <source>
 Already installed containers were found on the server. All installed containers have been added to the application</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/controllers/installController.cpp" line="266"/>
+        <location filename="../ui/controllers/installController.cpp" line="264"/>
         <source>Settings updated successfully</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/controllers/installController.cpp" line="281"/>
-        <source>Server &apos;</source>
+        <location filename="../ui/controllers/installController.cpp" line="279"/>
+        <source>Server &apos;%1&apos; was removed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/controllers/installController.cpp" line="281"/>
-        <source>&apos; was removed</source>
+        <location filename="../ui/controllers/installController.cpp" line="289"/>
+        <source>All containers from server &apos;%1&apos; have been removed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/controllers/installController.cpp" line="291"/>
-        <source>All containers from server &apos;</source>
+        <location filename="../ui/controllers/installController.cpp" line="306"/>
+        <source>1% has been removed from the server &apos;%2&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/controllers/installController.cpp" line="291"/>
-        <source>&apos; have been removed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/controllers/installController.cpp" line="307"/>
-        <source> has been removed from the server &apos;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/controllers/installController.cpp" line="308"/>
-        <source>&apos;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/controllers/installController.cpp" line="454"/>
+        <location filename="../ui/controllers/installController.cpp" line="452"/>
         <source>Please login as the user</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/controllers/installController.cpp" line="481"/>
+        <location filename="../ui/controllers/installController.cpp" line="479"/>
         <source>Server added successfully</source>
         <translation type="unfinished"></translation>
     </message>
@@ -253,7 +238,7 @@ Already installed containers were found on the server. All installed containers
     <name>PageDeinstalling</name>
     <message>
         <location filename="../ui/qml/Pages2/PageDeinstalling.qml" line="62"/>
-        <source>Removing services from </source>
+        <source>Removing services from %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -519,13 +504,12 @@ Already installed containers were found on the server. All installed containers
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageProtocolRaw.qml" line="172"/>
-        <location filename="../ui/qml/Pages2/PageProtocolRaw.qml" line="176"/>
         <source>Remove </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageProtocolRaw.qml" line="176"/>
-        <source> from server?</source>
+        <source>Remove %1 from server?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -590,13 +574,12 @@ Already installed containers were found on the server. All installed containers
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageServiceDnsSettings.qml" line="62"/>
-        <location filename="../ui/qml/Pages2/PageServiceDnsSettings.qml" line="66"/>
         <source>Remove </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageServiceDnsSettings.qml" line="66"/>
-        <source> from server?</source>
+        <source>Remove %1 from server?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1318,13 +1301,12 @@ And if you don&apos;t like the app, all the more support it - the donation will
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsServerProtocol.qml" line="112"/>
-        <location filename="../ui/qml/Pages2/PageSettingsServerProtocol.qml" line="116"/>
         <source>Remove </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsServerProtocol.qml" line="116"/>
-        <source> from server?</source>
+        <source>Remove %1 from server?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -2540,22 +2522,22 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
     </message>
     <message>
         <location filename="../ui/controllers/sitesController.cpp" line="67"/>
-        <source>New site added: </source>
+        <source>New site added: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../ui/controllers/sitesController.cpp" line="80"/>
-        <source>Site removed: </source>
+        <source>Site removed: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../ui/controllers/sitesController.cpp" line="88"/>
-        <source>Can&apos;t open file: </source>
+        <source>Can&apos;t open file: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../ui/controllers/sitesController.cpp" line="95"/>
-        <source>Failed to parse JSON data from file: </source>
+        <source>Failed to parse JSON data from file: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/client/translations/amneziavpn_zh_CN.ts b/client/translations/amneziavpn_zh_CN.ts
index a956c4e0..71e0169b 100644
--- a/client/translations/amneziavpn_zh_CN.ts
+++ b/client/translations/amneziavpn_zh_CN.ts
@@ -6,7 +6,7 @@
     <message>
         <location filename="../amnezia_application.cpp" line="299"/>
         <source>Split tunneling for WireGuard is not implemented, the option was disabled</source>
-        <translation type="unfinished">禁用选项，还未实现基于WireGuard协议的VPN分流</translation>
+        <translation type="unfinished">未启用选项，还未实现基于WireGuard协议的VPN分流</translation>
     </message>
 </context>
 <context>
@@ -138,66 +138,72 @@
 <context>
     <name>InstallController</name>
     <message>
-        <location filename="../ui/controllers/installController.cpp" line="110"/>
-        <location filename="../ui/controllers/installController.cpp" line="163"/>
         <source> installed successfully. </source>
-        <translation type="unfinished">安装成功</translation>
+        <translation type="obsolete">安装成功</translation>
     </message>
     <message>
-        <location filename="../ui/controllers/installController.cpp" line="113"/>
-        <location filename="../ui/controllers/installController.cpp" line="166"/>
         <source> is already installed on the server. </source>
-        <translation type="unfinished"> 已安装在服务上</translation>
+        <translation type="obsolete"> 已安装在服务器上</translation>
     </message>
     <message>
-        <location filename="../ui/controllers/installController.cpp" line="116"/>
-        <location filename="../ui/controllers/installController.cpp" line="185"/>
+        <location filename="../ui/controllers/installController.cpp" line="110"/>
+        <location filename="../ui/controllers/installController.cpp" line="162"/>
+        <source>%1 installed successfully. </source>
+        <translation type="unfinished">%1 安装成功。</translation>
+    </message>
+    <message>
+        <location filename="../ui/controllers/installController.cpp" line="112"/>
+        <location filename="../ui/controllers/installController.cpp" line="164"/>
+        <source>%1 is already installed on the server. </source>
+        <translation type="unfinished">服务器上已经安装 %1。</translation>
+    </message>
+    <message>
+        <location filename="../ui/controllers/installController.cpp" line="115"/>
+        <location filename="../ui/controllers/installController.cpp" line="183"/>
         <source>
 Already installed containers were found on the server. All installed containers have been added to the application</source>
-        <translation type="unfinished">在服务上发现已经安装协议并添加到应用程序</translation>
+        <translation type="unfinished">
+在服务上发现已经安装协议并添加到应用程序</translation>
     </message>
     <message>
-        <location filename="../ui/controllers/installController.cpp" line="266"/>
+        <location filename="../ui/controllers/installController.cpp" line="264"/>
         <source>Settings updated successfully</source>
         <translation type="unfinished">配置更新成功</translation>
     </message>
     <message>
-        <location filename="../ui/controllers/installController.cpp" line="281"/>
+        <location filename="../ui/controllers/installController.cpp" line="279"/>
+        <source>Server &apos;%1&apos; was removed</source>
+        <translation type="unfinished">已移除服务器 &apos;%1&apos;</translation>
+    </message>
+    <message>
+        <location filename="../ui/controllers/installController.cpp" line="289"/>
+        <source>All containers from server &apos;%1&apos; have been removed</source>
+        <translation type="unfinished">服务器 &apos;%1&apos; 的所有容器已移除</translation>
+    </message>
+    <message>
+        <location filename="../ui/controllers/installController.cpp" line="306"/>
+        <source>1% has been removed from the server &apos;%2&apos;</source>
+        <translation type="unfinished">容器 1% 已从服务器 &apos;%2&apos; 上移除</translation>
+    </message>
+    <message>
         <source>Server &apos;</source>
-        <translation type="unfinished">服务器 </translation>
+        <translation type="obsolete">服务器 </translation>
     </message>
     <message>
-        <location filename="../ui/controllers/installController.cpp" line="281"/>
         <source>&apos; was removed</source>
-        <translation type="unfinished"> 已经移除</translation>
+        <translation type="obsolete"> 已经移除</translation>
     </message>
     <message>
-        <location filename="../ui/controllers/installController.cpp" line="291"/>
-        <source>All containers from server &apos;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/controllers/installController.cpp" line="291"/>
-        <source>&apos; have been removed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/controllers/installController.cpp" line="307"/>
         <source> has been removed from the server &apos;</source>
-        <translation type="unfinished"> 协议已从</translation>
+        <translation type="obsolete"> 协议已从</translation>
     </message>
     <message>
-        <location filename="../ui/controllers/installController.cpp" line="308"/>
-        <source>&apos;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/controllers/installController.cpp" line="454"/>
+        <location filename="../ui/controllers/installController.cpp" line="452"/>
         <source>Please login as the user</source>
         <translation type="unfinished">请以用户身份登录</translation>
     </message>
     <message>
-        <location filename="../ui/controllers/installController.cpp" line="481"/>
+        <location filename="../ui/controllers/installController.cpp" line="479"/>
         <source>Server added successfully</source>
         <translation type="unfinished">服务器添加成功</translation>
     </message>
@@ -253,8 +259,8 @@ Already installed containers were found on the server. All installed containers
     <name>PageDeinstalling</name>
     <message>
         <location filename="../ui/qml/Pages2/PageDeinstalling.qml" line="62"/>
-        <source>Removing services from </source>
-        <translation type="unfinished"></translation>
+        <source>Removing services from %1</source>
+        <translation type="unfinished">正从 %1 移除服务</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageDeinstalling.qml" line="87"/>
@@ -519,14 +525,17 @@ Already installed containers were found on the server. All installed containers
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageProtocolRaw.qml" line="172"/>
-        <location filename="../ui/qml/Pages2/PageProtocolRaw.qml" line="176"/>
         <source>Remove </source>
         <translation type="unfinished">移除</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageProtocolRaw.qml" line="176"/>
+        <source>Remove %1 from server?</source>
+        <translation type="unfinished">从服务器移除 %1 ?</translation>
+    </message>
+    <message>
         <source> from server?</source>
-        <translation type="unfinished"> 从服务器</translation>
+        <translation type="obsolete"> 从服务器</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageProtocolRaw.qml" line="177"/>
@@ -583,14 +592,17 @@ Already installed containers were found on the server. All installed containers
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageServiceDnsSettings.qml" line="62"/>
-        <location filename="../ui/qml/Pages2/PageServiceDnsSettings.qml" line="66"/>
         <source>Remove </source>
         <translation type="unfinished">移除</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageServiceDnsSettings.qml" line="66"/>
+        <source>Remove %1 from server?</source>
+        <translation type="unfinished">从服务器移除 %1 ?</translation>
+    </message>
+    <message>
         <source> from server?</source>
-        <translation type="unfinished"> 从服务器</translation>
+        <translation type="obsolete"> 从服务器</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageServiceDnsSettings.qml" line="67"/>
@@ -673,12 +685,12 @@ Already installed containers were found on the server. All installed containers
     <message>
         <location filename="../ui/qml/Pages2/PageServiceSftpSettings.qml" line="260"/>
         <source>Remove SFTP and all data stored there</source>
-        <translation type="unfinished">删除SFTP和其存储在这里的所有数据</translation>
+        <translation type="unfinished">移除SFTP和其本地所有数据</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageServiceSftpSettings.qml" line="263"/>
         <source>Remove SFTP and all data stored there?</source>
-        <translation type="unfinished">删除SFTP和其存储在这里的所有数据?</translation>
+        <translation type="unfinished">移除SFTP和其本地所有数据?</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageServiceSftpSettings.qml" line="264"/>
@@ -864,7 +876,7 @@ And if you don&apos;t like the app, all the more support it - the donation will
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsAbout.qml" line="192"/>
         <source>Check for updates</source>
-        <translation type="unfinished">检查更新</translation>
+        <translation type="unfinished">更新</translation>
     </message>
 </context>
 <context>
@@ -917,7 +929,7 @@ And if you don&apos;t like the app, all the more support it - the donation will
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="111"/>
         <source>Disabled</source>
-        <translation type="unfinished">关闭</translation>
+        <translation type="unfinished">禁用</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="124"/>
@@ -1241,22 +1253,22 @@ And if you don&apos;t like the app, all the more support it - the donation will
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsServerData.qml" line="117"/>
         <source>Check the server for previously installed Amnezia services</source>
-        <translation type="unfinished">检查服务器上是否有以前安装的 Amnezia 服务</translation>
+        <translation type="unfinished">检查服务器上是否存在 Amnezia 服务</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsServerData.qml" line="118"/>
         <source>Add them to the application if they were not displayed</source>
-        <translation type="unfinished">如果未显示，请将它们添加到应用程序中</translation>
+        <translation type="unfinished">如果存在且未被显示，则添加到应用程序里</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsServerData.qml" line="134"/>
         <source>Remove server from application</source>
-        <translation type="unfinished">从应用程序中移除服务器</translation>
+        <translation type="unfinished">移除本地服务器信息</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsServerData.qml" line="138"/>
         <source>Remove server?</source>
-        <translation type="unfinished">移除服务器?</translation>
+        <translation type="unfinished">移除本地服务器信息?</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsServerData.qml" line="139"/>
@@ -1266,7 +1278,7 @@ And if you don&apos;t like the app, all the more support it - the donation will
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsServerData.qml" line="165"/>
         <source>Clear server from Amnezia software</source>
-        <translation type="unfinished">从Amnezia中清除服务器</translation>
+        <translation type="unfinished">移除Amnezia中服务器信息</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsServerData.qml" line="169"/>
@@ -1316,14 +1328,17 @@ And if you don&apos;t like the app, all the more support it - the donation will
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsServerProtocol.qml" line="112"/>
-        <location filename="../ui/qml/Pages2/PageSettingsServerProtocol.qml" line="116"/>
         <source>Remove </source>
         <translation type="unfinished">移除</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsServerProtocol.qml" line="116"/>
         <source> from server?</source>
-        <translation type="unfinished"> 从服务器</translation>
+        <translation type="obsolete"> 从服务器</translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsServerProtocol.qml" line="116"/>
+        <source>Remove %1 from server?</source>
+        <translation type="unfinished">从服务器移除 %1 ?</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsServerProtocol.qml" line="117"/>
@@ -1374,7 +1389,7 @@ And if you don&apos;t like the app, all the more support it - the donation will
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="198"/>
         <source>Remove </source>
-        <translation type="unfinished">移除</translation>
+        <translation type="unfinished">移除 </translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="199"/>
@@ -1583,7 +1598,7 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
     <message>
         <location filename="../ui/qml/Pages2/PageSetupWizardInstalling.qml" line="66"/>
         <source>Amnesia has detected that your server is currently </source>
-        <translation type="unfinished">Amnezia 检测到您的服务器当前处于</translation>
+        <translation type="unfinished">Amnezia 检测到您的服务器当前</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSetupWizardInstalling.qml" line="67"/>
@@ -1731,7 +1746,7 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
     <message>
         <location filename="../ui/qml/Pages2/PageSetupWizardViewConfig.qml" line="105"/>
         <source>Show content</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">展示内容</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSetupWizardViewConfig.qml" line="148"/>
@@ -1754,7 +1769,7 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
     <message>
         <location filename="../ui/qml/Pages2/PageShare.qml" line="86"/>
         <source>For the AmneziaVPN app</source>
-        <translation type="unfinished">来自应用AmneziaVPN</translation>
+        <translation type="unfinished">AmneziaVPN 应用</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageShare.qml" line="91"/>
@@ -1779,17 +1794,17 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
     <message>
         <location filename="../ui/qml/Pages2/PageShare.qml" line="158"/>
         <source>Full access</source>
-        <translation type="unfinished">完全授权</translation>
+        <translation type="unfinished">完整授权</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageShare.qml" line="174"/>
         <source>VPN access without the ability to manage the server</source>
-        <translation type="unfinished">VPN 访问，不能管理服务器</translation>
+        <translation type="unfinished">无权控制服务器</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageShare.qml" line="175"/>
         <source>Full access to server</source>
-        <translation type="unfinished">完全授权方式访问服务器</translation>
+        <translation type="unfinished">获得服务器完整授权</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageShare.qml" line="190"/>
@@ -1810,7 +1825,7 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
         <location filename="../ui/qml/Pages2/PageShare.qml" line="222"/>
         <location filename="../ui/qml/Pages2/PageShare.qml" line="307"/>
         <source>File with connection settings to </source>
-        <translation type="unfinished">连接配置文件到 </translation>
+        <translation type="unfinished">连接配置文件的内容为:</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageShare.qml" line="248"/>
@@ -2000,12 +2015,12 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
     <message>
         <location filename="../3rd/qtkeychain/keychain_android.cpp" line="68"/>
         <source>Could not retrieve private key from keystore</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">无法从密钥存储库中检索私钥</translation>
     </message>
     <message>
         <location filename="../3rd/qtkeychain/keychain_android.cpp" line="75"/>
         <source>Could not create decryption cipher</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">无法创建解密密码</translation>
     </message>
 </context>
 <context>
@@ -2059,27 +2074,27 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
     <message>
         <location filename="../3rd/qtkeychain/keychain_android.cpp" line="124"/>
         <source>Could not create private key generator</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">无法创建私钥生成器</translation>
     </message>
     <message>
         <location filename="../3rd/qtkeychain/keychain_android.cpp" line="131"/>
         <source>Could not generate new private key</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">无法生成新的私钥</translation>
     </message>
     <message>
         <location filename="../3rd/qtkeychain/keychain_android.cpp" line="139"/>
         <source>Could not retrieve private key from keystore</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">无法从密钥库检索私钥</translation>
     </message>
     <message>
         <location filename="../3rd/qtkeychain/keychain_android.cpp" line="147"/>
         <source>Could not create encryption cipher</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">无法创建加密密码</translation>
     </message>
     <message>
         <location filename="../3rd/qtkeychain/keychain_android.cpp" line="155"/>
         <source>Could not encrypt data</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">无法加密数据</translation>
     </message>
 </context>
 <context>
@@ -2328,7 +2343,7 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
     <message>
         <location filename="../containers/containers_defs.cpp" line="104"/>
         <source>OpenVPN over Cloak - OpenVPN with VPN masquerading as web traffic and protection against active-probbing detection. Ideal for bypassing blocking in regions with the highest levels of censorship.</source>
-        <translation type="unfinished">OpenVPN over Cloak - OpenVPN，具有伪装成网络流量的 VPN 和针对主动探测检测的保护.非常适合绕过审查力度特别强的地区的封锁。</translation>
+        <translation type="unfinished">OpenVPN over Cloak - OpenVPN 与 VPN 具有伪装成网络流量和防止主动探测检测的保护。非常适合绕过审查力度特别强的地区的封锁。</translation>
     </message>
     <message>
         <location filename="../containers/containers_defs.cpp" line="108"/>
@@ -2338,7 +2353,7 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
     <message>
         <location filename="../containers/containers_defs.cpp" line="111"/>
         <source>IKEv2 -  Modern stable protocol, a bit faster than others, restores connection after signal loss. It has native support on the latest versions of Android and iOS.</source>
-        <translation type="unfinished">IKEv2 - 现代稳定协议，比其他协议快一点，在信号丢失后恢复连接。Android 和 iOS最新版原生支持。</translation>
+        <translation type="unfinished">IKEv2 - 现代稳定协议，相比其他协议较快一些，在信号丢失后恢复连接。Android 和 iOS最新版原生支持。</translation>
     </message>
     <message>
         <location filename="../containers/containers_defs.cpp" line="114"/>
@@ -2478,22 +2493,22 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
     <message>
         <location filename="../ui/controllers/settingsController.cpp" line="20"/>
         <source>Software version</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">软件版本</translation>
     </message>
     <message>
         <location filename="../ui/controllers/settingsController.cpp" line="102"/>
         <source>Backup file is corrupted</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">备份文件已损坏</translation>
     </message>
     <message>
         <location filename="../ui/controllers/settingsController.cpp" line="117"/>
         <source>All settings have been reset to default values</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">所配置恢复为默认值</translation>
     </message>
     <message>
         <location filename="../ui/controllers/settingsController.cpp" line="123"/>
         <source>Cached profiles cleared</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">缓存的配置文件已清除</translation>
     </message>
 </context>
 <context>
@@ -2502,7 +2517,7 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
         <location filename="../ui/qml/Components/ShareConnectionDrawer.qml" line="27"/>
         <location filename="../ui/qml/Components/ShareConnectionDrawer.qml" line="35"/>
         <source>Save AmneziaVPN config</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">保存配置</translation>
     </message>
     <message>
         <location filename="../ui/qml/Components/ShareConnectionDrawer.qml" line="71"/>
@@ -2512,22 +2527,22 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
     <message>
         <location filename="../ui/qml/Components/ShareConnectionDrawer.qml" line="104"/>
         <source>Copy</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">拷贝</translation>
     </message>
     <message>
         <location filename="../ui/qml/Components/ShareConnectionDrawer.qml" line="111"/>
         <source>Copied</source>
-        <translation type="unfinished">拷贝</translation>
+        <translation type="unfinished">已拷贝</translation>
     </message>
     <message>
         <location filename="../ui/qml/Components/ShareConnectionDrawer.qml" line="126"/>
         <source>Show content</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">展示内容</translation>
     </message>
     <message>
         <location filename="../ui/qml/Components/ShareConnectionDrawer.qml" line="250"/>
         <source>To read the QR code in the Amnezia app, select &quot;Add server&quot; → &quot;I have data to connect&quot; → &quot;QR code, key or settings file&quot;</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">要读取 Amnezia 应用程序中的二维码，请选择“添加服务器”→“我有数据要连接”→“二维码、密钥或配置文件”</translation>
     </message>
 </context>
 <context>
@@ -2539,22 +2554,22 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
     </message>
     <message>
         <location filename="../ui/controllers/sitesController.cpp" line="67"/>
-        <source>New site added: </source>
+        <source>New site added: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../ui/controllers/sitesController.cpp" line="80"/>
-        <source>Site removed: </source>
+        <source>Site removed: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../ui/controllers/sitesController.cpp" line="88"/>
-        <source>Can&apos;t open file: </source>
+        <source>Can&apos;t open file: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../ui/controllers/sitesController.cpp" line="95"/>
-        <source>Failed to parse JSON data from file: </source>
+        <source>Failed to parse JSON data from file: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -2593,7 +2608,7 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
     <message>
         <location filename="../ui/systemtray_notificationhandler.cpp" line="39"/>
         <source>Visit Website</source>
-        <translation type="unfinished">访问官网</translation>
+        <translation type="unfinished">官网</translation>
     </message>
     <message>
         <location filename="../ui/systemtray_notificationhandler.cpp" line="43"/>
@@ -2677,7 +2692,7 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
     <message>
         <location filename="../containers/containers_defs.cpp" line="247"/>
         <source>Many foreign websites and VPN providers are blocked</source>
-        <translation type="unfinished">许多国外网站和VPN提供商被屏蔽</translation>
+        <translation type="unfinished">大多国外网站和VPN提供商被屏蔽</translation>
     </message>
     <message>
         <location filename="../containers/containers_defs.cpp" line="248"/>
diff --git a/client/ui/controllers/installController.cpp b/client/ui/controllers/installController.cpp
index 8b77252f..b03a45d8 100644
--- a/client/ui/controllers/installController.cpp
+++ b/client/ui/controllers/installController.cpp
@@ -107,10 +107,9 @@ void InstallController::installServer(DockerContainer container, QJsonObject &co
     if (!installedContainers.contains(container)) {
         errorCode = serverController.setupContainer(m_currentlyInstalledServerCredentials, container, config);
         installedContainers.insert(container, config);
-        finishMessage = ContainerProps::containerHumanNames().value(container) + tr(" installed successfully. ");
+        finishMessage = tr("%1 installed successfully. ").arg(ContainerProps::containerHumanNames().value(container));
     } else {
-        finishMessage =
-                ContainerProps::containerHumanNames().value(container) + tr(" is already installed on the server. ");
+        finishMessage = tr("%1 is already installed on the server. ").arg(ContainerProps::containerHumanNames().value(container));
     }
     if (installedContainers.size() > 1) {
         finishMessage += tr("\nAlready installed containers were found on the server. "
@@ -160,10 +159,9 @@ void InstallController::installContainer(DockerContainer container, QJsonObject
     if (!installedContainers.contains(container)) {
         errorCode = serverController.setupContainer(serverCredentials, container, config);
         installedContainers.insert(container, config);
-        finishMessage = ContainerProps::containerHumanNames().value(container) + tr(" installed successfully. ");
+        finishMessage = tr("%1 installed successfully. ").arg(ContainerProps::containerHumanNames().value(container));
     } else {
-        finishMessage =
-                ContainerProps::containerHumanNames().value(container) + tr(" is already installed on the server. ");
+        finishMessage = tr("%1 is already installed on the server. ").arg(ContainerProps::containerHumanNames().value(container));
     }
 
     bool isInstalledContainerAddedToGui = false;
@@ -278,7 +276,7 @@ void InstallController::removeCurrentlyProcessedServer()
     QString serverName = m_serversModel->data(serverIndex, ServersModel::Roles::NameRole).toString();
 
     m_serversModel->removeServer();
-    emit removeCurrentlyProcessedServerFinished(tr("Server '") + serverName + tr("' was removed"));
+    emit removeCurrentlyProcessedServerFinished(tr("Server '%1' was removed").arg(serverName));
 }
 
 void InstallController::removeAllContainers()
@@ -288,7 +286,7 @@ void InstallController::removeAllContainers()
 
     ErrorCode errorCode = m_containersModel->removeAllContainers();
     if (errorCode == ErrorCode::NoError) {
-        emit removeAllContainersFinished(tr("All containers from server '") + serverName + tr("' have been removed"));
+        emit removeAllContainersFinished(tr("All containers from server '%1' have been removed").arg(serverName));
         return;
     }
     emit installationErrorOccurred(errorString(errorCode));
@@ -304,8 +302,8 @@ void InstallController::removeCurrentlyProcessedContainer()
 
     ErrorCode errorCode = m_containersModel->removeCurrentlyProcessedContainer();
     if (errorCode == ErrorCode::NoError) {
-        emit removeCurrentlyProcessedContainerFinished(containerName + tr(" has been removed from the server '")
-                                                       + serverName + tr("'"));
+
+        emit removeCurrentlyProcessedContainerFinished(tr("1% has been removed from the server '%2'").arg(containerName).arg(serverName));
         return;
     }
     emit installationErrorOccurred(errorString(errorCode));
diff --git a/client/ui/controllers/sitesController.cpp b/client/ui/controllers/sitesController.cpp
index a27e91d0..4d0391be 100644
--- a/client/ui/controllers/sitesController.cpp
+++ b/client/ui/controllers/sitesController.cpp
@@ -64,7 +64,7 @@ void SitesController::addSite(QString hostname)
         QHostInfo::lookupHost(hostname, this, resolveCallback);
     }
 
-    emit finished(tr("New site added: ") + hostname);
+    emit finished(tr("New site added: %1").arg(hostname));
 }
 
 void SitesController::removeSite(int index)
@@ -77,7 +77,7 @@ void SitesController::removeSite(int index)
                               Q_ARG(QStringList, QStringList() << hostname));
     QMetaObject::invokeMethod(m_vpnConnection.get(), "flushDns", Qt::QueuedConnection);
 
-    emit finished(tr("Site removed: ") + hostname);
+    emit finished(tr("Site removed: %1").arg(hostname));
 }
 
 void SitesController::importSites(const QString &fileName, bool replaceExisting)
@@ -85,19 +85,19 @@ void SitesController::importSites(const QString &fileName, bool replaceExisting)
     QFile file(fileName);
 
     if (!file.open(QIODevice::ReadOnly)) {
-        emit errorOccurred(tr("Can't open file: ") + fileName);
+        emit errorOccurred(tr("Can't open file: %1").arg(fileName));
         return;
     }
 
     QByteArray jsonData = file.readAll();
     QJsonDocument jsonDocument = QJsonDocument::fromJson(jsonData);
     if (jsonDocument.isNull()) {
-        emit errorOccurred(tr("Failed to parse JSON data from file: ") + fileName);
+        emit errorOccurred(tr("Failed to parse JSON data from file: %1").arg(fileName));
         return;
     }
 
     if (!jsonDocument.isArray()) {
-        emit errorOccurred(tr("The JSON data is not an array in file: ") + fileName);
+        emit errorOccurred(tr("The JSON data is not an array in file: ").arg(fileName));
         return;
     }
 
diff --git a/client/ui/qml/Pages2/PageDeinstalling.qml b/client/ui/qml/Pages2/PageDeinstalling.qml
index 243b1205..8dffbbce 100644
--- a/client/ui/qml/Pages2/PageDeinstalling.qml
+++ b/client/ui/qml/Pages2/PageDeinstalling.qml
@@ -59,7 +59,7 @@ PageType {
                             Layout.fillWidth: true
                             Layout.topMargin: 20
 
-                            headerText: qsTr("Removing services from ") + name
+                            headerText: qsTr("Removing services from %1").arg(name)
                         }
 
                         ProgressBarType {
diff --git a/client/ui/qml/Pages2/PageProtocolRaw.qml b/client/ui/qml/Pages2/PageProtocolRaw.qml
index 8bbfab14..34ca4055 100644
--- a/client/ui/qml/Pages2/PageProtocolRaw.qml
+++ b/client/ui/qml/Pages2/PageProtocolRaw.qml
@@ -173,7 +173,7 @@ PageType {
                 textColor: "#EB5757"
 
                 clickedFunction: function() {
-                    questionDrawer.headerText = qsTr("Remove ") + ContainersModel.getCurrentlyProcessedContainerName() + qsTr(" from server?")
+                    questionDrawer.headerText = qsTr("Remove %1 from server?").arg(ContainersModel.getCurrentlyProcessedContainerName())
                     questionDrawer.descriptionText = qsTr("All users with whom you shared a connection will no longer be able to connect to it")
                     questionDrawer.yesButtonText = qsTr("Continue")
                     questionDrawer.noButtonText = qsTr("Cancel")
diff --git a/client/ui/qml/Pages2/PageServiceDnsSettings.qml b/client/ui/qml/Pages2/PageServiceDnsSettings.qml
index 016a7c88..10fe6f56 100644
--- a/client/ui/qml/Pages2/PageServiceDnsSettings.qml
+++ b/client/ui/qml/Pages2/PageServiceDnsSettings.qml
@@ -63,7 +63,7 @@ PageType {
                 textColor: "#EB5757"
 
                 clickedFunction: function() {
-                    questionDrawer.headerText = qsTr("Remove ") + ContainersModel.getCurrentlyProcessedContainerName() + qsTr(" from server?")
+                    questionDrawer.headerText = qsTr("Remove %1 from server?").arg(ContainersModel.getCurrentlyProcessedContainerName())
                     questionDrawer.yesButtonText = qsTr("Continue")
                     questionDrawer.noButtonText = qsTr("Cancel")
 
diff --git a/client/ui/qml/Pages2/PageSettingsServerProtocol.qml b/client/ui/qml/Pages2/PageSettingsServerProtocol.qml
index 14d34590..998948d1 100644
--- a/client/ui/qml/Pages2/PageSettingsServerProtocol.qml
+++ b/client/ui/qml/Pages2/PageSettingsServerProtocol.qml
@@ -113,7 +113,7 @@ PageType {
                 textColor: "#EB5757"
 
                 clickedFunction: function() {
-                    questionDrawer.headerText = qsTr("Remove ") + ContainersModel.getCurrentlyProcessedContainerName() + qsTr(" from server?")
+                    questionDrawer.headerText = qsTr("Remove %1 from server?").arg(ContainersModel.getCurrentlyProcessedContainerName())
                     questionDrawer.descriptionText = qsTr("All users with whom you shared a connection will no longer be able to connect to it")
                     questionDrawer.yesButtonText = qsTr("Continue")
                     questionDrawer.noButtonText = qsTr("Cancel")

From 396b7aac18977d04caacc3ff9bd2c67daea72757 Mon Sep 17 00:00:00 2001
From: "vladimir.kuznetsov" <nethiuswork@gmail.com>
Date: Thu, 5 Oct 2023 13:56:00 +0500
Subject: [PATCH 179/278] fixed display of amnezia dns description on main menu

---
 client/ui/qml/Pages2/PageHome.qml | 92 +++++++++++++++++++------------
 1 file changed, 56 insertions(+), 36 deletions(-)

diff --git a/client/ui/qml/Pages2/PageHome.qml b/client/ui/qml/Pages2/PageHome.qml
index d395cd22..3808fb15 100644
--- a/client/ui/qml/Pages2/PageHome.qml
+++ b/client/ui/qml/Pages2/PageHome.qml
@@ -26,6 +26,55 @@ PageType {
     property string defaultServerHostName: ServersModel.defaultServerHostName
     property string defaultContainerName: ContainersModel.defaultContainerName
 
+    Connections {
+        target: PageController
+
+        function onRestorePageHomeState(isContainerInstalled) {
+            buttonContent.state = "expanded"
+            if (isContainerInstalled) {
+                containersDropDown.menuVisible = true
+            }
+        }
+        function onForceCloseDrawer() {
+            buttonContent.state = "collapsed"
+        }
+    }
+
+    Connections {
+        target: ServersModel
+
+        function onDefaultServerIndexChanged() {
+            updateDescriptions()
+        }
+    }
+
+    Connections {
+        target: ContainersModel
+
+        function onDefaultContainerChanged() {
+            updateDescriptions()
+        }
+    }
+
+    function updateDescriptions() {
+        var description = ""
+        if (ServersModel.isDefaultServerHasWriteAccess()) {
+            if (SettingsController.isAmneziaDnsEnabled()
+                    && ContainersModel.isAmneziaDnsContainerInstalled(ServersModel.getDefaultServerIndex())) {
+                description += "Amnezia DNS | "
+            }
+        } else {
+            if (ServersModel.isDefaultServerConfigContainsAmneziaDns()) {
+                description += "Amnezia DNS | "
+            }
+        }
+
+        collapsedServerMenuDescription.text = description + root.defaultContainerName + " | " + root.defaultServerHostName
+        expandedServersMenuDescription.text = description + root.defaultServerHostName
+    }
+
+    Component.onCompleted: updateDescriptions()
+
     MouseArea {
         anchors.fill: parent
         enabled: buttonContent.state === "expanded"
@@ -43,20 +92,6 @@ PageType {
         }
     }
 
-    Connections {
-        target: PageController
-
-        function onRestorePageHomeState(isContainerInstalled) {
-            buttonContent.state = "expanded"
-            if (isContainerInstalled) {
-                containersDropDown.menuVisible = true
-            }
-        }
-        function onForceCloseDrawer() {
-            buttonContent.state = "collapsed"
-        }
-    }
-
     MouseArea {
         id: dragArea
 
@@ -255,26 +290,10 @@ PageType {
         }
 
         LabelTextType {
+            id: collapsedServerMenuDescription
             Layout.bottomMargin: 44
             Layout.alignment: Qt.AlignHCenter | Qt.AlignVCenter
             visible: buttonContent.collapsedVisibility
-
-            text: {
-                var description = ""
-                if (ServersModel.isDefaultServerHasWriteAccess()) {
-                    if (SettingsController.isAmneziaDnsEnabled()
-                            && ContainersModel.isAmneziaDnsContainerInstalled(ServersModel.getDefaultServerIndex())) {
-                        description += "Amnezia DNS | "
-                    }
-                } else {
-                    if (ServersModel.isDefaultServerConfigContainsAmneziaDns()) {
-                        description += "Amnezia DNS | "
-                    }
-                }
-
-                description += root.defaultContainerName + " | " + root.defaultServerHostName
-                return description
-            }
         }
 
         ColumnLayout {
@@ -297,10 +316,11 @@ PageType {
             }
 
             LabelTextType {
+                id: expandedServersMenuDescription
                 Layout.bottomMargin: 24
-                Layout.alignment: Qt.AlignHCenter | Qt.AlignVCenter
-
-                text: root.defaultServerHostName
+                Layout.fillWidth: true
+                horizontalAlignment: Qt.AlignHCenter
+                verticalAlignment: Qt.AlignVCenter
             }
 
             RowLayout {
@@ -450,11 +470,11 @@ PageType {
                                         if (hasWriteAccess) {
                                             if (SettingsController.isAmneziaDnsEnabled()
                                                     && ContainersModel.isAmneziaDnsContainerInstalled(index)) {
-                                                description += "AmneziaDNS | "
+                                                description += "Amnezia DNS | "
                                             }
                                         } else {
                                             if (containsAmneziaDns) {
-                                                description += "AmneziaDNS | "
+                                                description += "Amnezia DNS | "
                                             }
                                         }
 

From 1eafa9a38a8c0c02d8f85e4c0afdda50d58012b7 Mon Sep 17 00:00:00 2001
From: ronoaer <ronoaer@gmail.com>
Date: Thu, 5 Oct 2023 23:47:50 +0800
Subject: [PATCH 180/278] updated about and tor

---
 client/translations/amneziavpn_zh_CN.ts | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/client/translations/amneziavpn_zh_CN.ts b/client/translations/amneziavpn_zh_CN.ts
index 71e0169b..e7171ce2 100644
--- a/client/translations/amneziavpn_zh_CN.ts
+++ b/client/translations/amneziavpn_zh_CN.ts
@@ -728,17 +728,17 @@ Already installed containers were found on the server. All installed containers
     <message>
         <location filename="../ui/qml/Pages2/PageServiceTorWebsiteSettings.qml" line="106"/>
         <source>Use &lt;a href=&quot;https://www.torproject.org/download/&quot; style=&quot;color: #FBB26A;&quot;&gt;Tor Browser&lt;/a&gt; to open this url.</source>
-        <translation type="unfinished">Use &lt;a href=&quot;https://www.torproject.org/download/&quot; style=&quot;color: #FBB26A;&quot;&gt;Tor 浏览器&lt;/a&gt; to open this url.</translation>
+        <translation type="unfinished">用 &lt;a href=&quot;https://www.torproject.org/download/&quot; style=&quot;color: #FBB26A;&quot;&gt;Tor 浏览器&lt;/a&gt; 打开上面网址</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageServiceTorWebsiteSettings.qml" line="115"/>
         <source>After installation it takes several minutes while your onion site will become available in the Tor Network.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">安装几分钟后,洋葱站点才会在 Tor 网络中生效。</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageServiceTorWebsiteSettings.qml" line="124"/>
         <source>When configuring WordPress set the domain as this onion address.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">配置 WordPress 时，将域设置为此洋葱地址。</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageServiceTorWebsiteSettings.qml" line="138"/>
@@ -748,7 +748,7 @@ Already installed containers were found on the server. All installed containers
     <message>
         <location filename="../ui/qml/Pages2/PageServiceTorWebsiteSettings.qml" line="141"/>
         <source>The site with all data will be removed from the tor network.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">网站及其所有数据将从 Tor 网络中删除</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageServiceTorWebsiteSettings.qml" line="142"/>
@@ -805,13 +805,13 @@ Already installed containers were found on the server. All installed containers
         <location filename="../ui/qml/Pages2/PageSettingsAbout.qml" line="71"/>
         <source>This is a free and open source application. If you like it, support the developers with a donation.
 And if you don&apos;t like the app, all the more support it - the donation will be used to improve the app.</source>
-        <translation type="unfinished">这是一个免费且开源的应用程序。如果您喜欢，请捐款支持开发人员。
-如果您不喜欢该应用程序，请更加支持它 - 捐款将用于改进该应用程序。</translation>
+        <translation type="unfinished">这是一个免费且开源的应用。如果您喜欢，请捐助支持我们。
+如果您不喜欢该应用，请更加支持它 - 捐款将用于改进该应用。</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsAbout.qml" line="82"/>
         <source>Card on Patreon</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">请在Patreon上支持我们</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsAbout.qml" line="85"/>
@@ -2358,7 +2358,7 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
     <message>
         <location filename="../containers/containers_defs.cpp" line="114"/>
         <source>Deploy a WordPress site on the Tor network in two clicks.</source>
-        <translation type="unfinished">只需点击两次即可在 Tor 网络上部署 WordPress 网站</translation>
+        <translation type="unfinished">只需点两次即可架设 WordPress 网站到 Tor 网络</translation>
     </message>
     <message>
         <location filename="../containers/containers_defs.cpp" line="116"/>
@@ -2593,7 +2593,7 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
     <message>
         <location filename="../ui/systemtray_notificationhandler.cpp" line="30"/>
         <source>Show</source>
-        <translation type="unfinished">显示界面</translation>
+        <translation type="unfinished">界面</translation>
     </message>
     <message>
         <location filename="../ui/systemtray_notificationhandler.cpp" line="34"/>

From 3a77705142d8ee99c73f3269986d27bda9499ed9 Mon Sep 17 00:00:00 2001
From: Mykola Baibuz <mykola.baibuz@gmail.com>
Date: Thu, 5 Oct 2023 15:55:32 -0400
Subject: [PATCH 181/278] Update AWG binary

---
 client/3rd-prebuilt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/3rd-prebuilt b/client/3rd-prebuilt
index 6f0d654a..c6d77cff 160000
--- a/client/3rd-prebuilt
+++ b/client/3rd-prebuilt
@@ -1 +1 @@
-Subproject commit 6f0d654a2409e2f634e7f7b95d34998c8eba2d7b
+Subproject commit c6d77cff35bcdef34306ab5ef594a313726949da

From 08863edb520d99ac2931510469302ca1d755f730 Mon Sep 17 00:00:00 2001
From: Mykola Baibuz <mykola.baibuz@gmail.com>
Date: Thu, 5 Oct 2023 17:11:40 -0400
Subject: [PATCH 182/278] Update AWG iOS binary again

---
 client/3rd-prebuilt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/3rd-prebuilt b/client/3rd-prebuilt
index c6d77cff..994f4f2b 160000
--- a/client/3rd-prebuilt
+++ b/client/3rd-prebuilt
@@ -1 +1 @@
-Subproject commit c6d77cff35bcdef34306ab5ef594a313726949da
+Subproject commit 994f4f2b030600f2d8dbf9dccf409b1591c9e463

From d77be5a244252849720763ff7a2c7e672f53b520 Mon Sep 17 00:00:00 2001
From: Mykola Baibuz <mykola.baibuz@gmail.com>
Date: Fri, 6 Oct 2023 00:38:54 +0300
Subject: [PATCH 183/278] Update iOS network extension

---
 client/3rd/awg-apple | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/3rd/awg-apple b/client/3rd/awg-apple
index 5767a03f..fab07138 160000
--- a/client/3rd/awg-apple
+++ b/client/3rd/awg-apple
@@ -1 +1 @@
-Subproject commit 5767a03f75a2b77d4f78fdd77ff51a1eefabe3b0
+Subproject commit fab07138dbab06ac0de256021e47e273f4df8e88

From 1357c4a3096f7c142d505cad48b01e31ef2c52e7 Mon Sep 17 00:00:00 2001
From: ronoaer <ronoaer@gmail.com>
Date: Fri, 6 Oct 2023 13:43:32 +0800
Subject: [PATCH 184/278] applied translation-funcation to SystemTray

---
 client/amnezia_application.cpp               |  1 +
 client/ui/notificationhandler.cpp            |  4 ++++
 client/ui/notificationhandler.h              |  1 +
 client/ui/systemtray_notificationhandler.cpp | 17 ++++++++++++-----
 client/ui/systemtray_notificationhandler.h   |  6 +++++-
 5 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/client/amnezia_application.cpp b/client/amnezia_application.cpp
index 01b37229..801b90b4 100644
--- a/client/amnezia_application.cpp
+++ b/client/amnezia_application.cpp
@@ -139,6 +139,7 @@ void AmneziaApplication::init()
             &ConnectionController::openConnection);
     connect(m_notificationHandler.get(), &NotificationHandler::disconnectRequested, m_connectionController.get(),
             &ConnectionController::closeConnection);
+    connect(this, &AmneziaApplication::translationsUpdated, m_notificationHandler.get(),  &NotificationHandler::onTranslationsUpdated);
 
     m_engine->load(url);
     m_systemController->setQmlRoot(m_engine->rootObjects().value(0));
diff --git a/client/ui/notificationhandler.cpp b/client/ui/notificationhandler.cpp
index f932eb17..1f81c2c2 100644
--- a/client/ui/notificationhandler.cpp
+++ b/client/ui/notificationhandler.cpp
@@ -88,6 +88,10 @@ void NotificationHandler::setConnectionState(Vpn::ConnectionState state)
     }
 }
 
+void NotificationHandler::onTranslationsUpdated()
+{
+}
+
 void NotificationHandler::unsecuredNetworkNotification(const QString& networkName) {
     qDebug() << "Unsecured network notification shown";
 
diff --git a/client/ui/notificationhandler.h b/client/ui/notificationhandler.h
index 9a2182de..abdce27b 100644
--- a/client/ui/notificationhandler.h
+++ b/client/ui/notificationhandler.h
@@ -32,6 +32,7 @@ public:
 
 public slots:
     virtual void setConnectionState(Vpn::ConnectionState state);
+    virtual void onTranslationsUpdated();
 
 signals:
     void notificationShown(const QString& title, const QString& message);
diff --git a/client/ui/systemtray_notificationhandler.cpp b/client/ui/systemtray_notificationhandler.cpp
index 6adc8818..2c7c695f 100644
--- a/client/ui/systemtray_notificationhandler.cpp
+++ b/client/ui/systemtray_notificationhandler.cpp
@@ -17,7 +17,6 @@
 
 #include "version.h"
 
-
 SystemTrayNotificationHandler::SystemTrayNotificationHandler(QObject* parent) :
     NotificationHandler(parent),
     m_systemTrayIcon(parent)
@@ -26,8 +25,7 @@ SystemTrayNotificationHandler::SystemTrayNotificationHandler(QObject* parent) :
     m_systemTrayIcon.show();
     connect(&m_systemTrayIcon, &QSystemTrayIcon::activated, this, &SystemTrayNotificationHandler::onTrayActivated);
 
-
-    m_menu.addAction(QIcon(":/images/tray/application.png"), tr("Show") + " " + APPLICATION_NAME, this, [this](){
+    m_trayActionShow =  m_menu.addAction(QIcon(":/images/tray/application.png"), tr("Show") + " " + APPLICATION_NAME, this, [this](){
         emit raiseRequested();
     });
     m_menu.addSeparator();
@@ -36,11 +34,11 @@ SystemTrayNotificationHandler::SystemTrayNotificationHandler(QObject* parent) :
 
     m_menu.addSeparator();
 
-    m_menu.addAction(QIcon(":/images/tray/link.png"), tr("Visit Website"), [&](){
+    m_trayActionVisitWebSite = m_menu.addAction(QIcon(":/images/tray/link.png"), tr("Visit Website"), [&](){
         QDesktopServices::openUrl(QUrl("https://amnezia.org"));
     });
 
-    m_menu.addAction(QIcon(":/images/tray/cancel.png"), tr("Quit") + " " + APPLICATION_NAME, this, [&](){
+    m_trayActionQuit = m_menu.addAction(QIcon(":/images/tray/cancel.png"), tr("Quit") + " " + APPLICATION_NAME, this, [&](){
         qApp->quit();
     });
 
@@ -57,6 +55,15 @@ void SystemTrayNotificationHandler::setConnectionState(Vpn::ConnectionState stat
     NotificationHandler::setConnectionState(state);
 }
 
+void SystemTrayNotificationHandler::onTranslationsUpdated()
+{
+    m_trayActionShow->setText(tr("Show") + " " + APPLICATION_NAME);
+    m_trayActionConnect->setText(tr("Connect"));
+    m_trayActionDisconnect->setText(tr("Disconnect"));
+    m_trayActionVisitWebSite->setText(tr("Visit Website"));
+    m_trayActionQuit->setText(tr("Quit")+ " " + APPLICATION_NAME);
+}
+
 void SystemTrayNotificationHandler::setTrayIcon(const QString &iconPath)
 {
     QIcon trayIconMask(QPixmap(iconPath).scaled(128,128));
diff --git a/client/ui/systemtray_notificationhandler.h b/client/ui/systemtray_notificationhandler.h
index 96134f14..60bf0b35 100644
--- a/client/ui/systemtray_notificationhandler.h
+++ b/client/ui/systemtray_notificationhandler.h
@@ -19,6 +19,8 @@ public:
 
     void setConnectionState(Vpn::ConnectionState state) override;
 
+    void onTranslationsUpdated() override;
+
 protected:
     virtual void notify(Message type, const QString& title,
                         const QString& message, int timerMsec) override;
@@ -35,9 +37,11 @@ private:
     QMenu m_menu;
     QSystemTrayIcon m_systemTrayIcon;
 
+    QAction* m_trayActionShow = nullptr;
     QAction* m_trayActionConnect = nullptr;
     QAction* m_trayActionDisconnect = nullptr;
-    QAction* m_preferencesAction = nullptr;
+    QAction* m_trayActionVisitWebSite = nullptr;
+    QAction* m_trayActionQuit = nullptr;
     QAction* m_statusLabel = nullptr;    
     QAction* m_separator = nullptr;
 

From 9377a0b545740cd0133c5a74b2d255caf6fc37a4 Mon Sep 17 00:00:00 2001
From: ronoaer <ronoaer@gmail.com>
Date: Fri, 6 Oct 2023 14:37:10 +0800
Subject: [PATCH 185/278] updated translated-text to connectStatusText in
 ConnectionController

---
 client/amnezia_application.cpp                 | 2 ++
 client/ui/controllers/connectionController.cpp | 3 ++-
 client/ui/controllers/connectionController.h   | 2 +-
 client/ui/qml/Pages2/PageStart.qml             | 2 --
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/client/amnezia_application.cpp b/client/amnezia_application.cpp
index 801b90b4..d8039d9b 100644
--- a/client/amnezia_application.cpp
+++ b/client/amnezia_application.cpp
@@ -330,6 +330,8 @@ void AmneziaApplication::initControllers()
     m_connectionController.reset(new ConnectionController(m_serversModel, m_containersModel, m_vpnConnection));
     m_engine->rootContext()->setContextProperty("ConnectionController", m_connectionController.get());
 
+    connect(this, &AmneziaApplication::translationsUpdated, m_connectionController.get(), &ConnectionController::onTranslationsUpdated);
+
     m_pageController.reset(new PageController(m_serversModel, m_settings));
     m_engine->rootContext()->setContextProperty("PageController", m_pageController.get());
 
diff --git a/client/ui/controllers/connectionController.cpp b/client/ui/controllers/connectionController.cpp
index 8df62a94..34ac1399 100644
--- a/client/ui/controllers/connectionController.cpp
+++ b/client/ui/controllers/connectionController.cpp
@@ -130,8 +130,9 @@ void ConnectionController::onCurrentContainerUpdated()
     }
 }
 
-void ConnectionController::translateMemoryText()
+void ConnectionController::onTranslationsUpdated()
 {
+    // get translated text of current state
     onConnectionStateChanged(getCurrentConnectionState());
 }
 
diff --git a/client/ui/controllers/connectionController.h b/client/ui/controllers/connectionController.h
index c1eaf38f..9d3082a2 100644
--- a/client/ui/controllers/connectionController.h
+++ b/client/ui/controllers/connectionController.h
@@ -34,7 +34,7 @@ public slots:
 
     void onCurrentContainerUpdated();
 
-    void translateMemoryText();
+    void onTranslationsUpdated();
 
 signals:
     void connectToVpn(int serverIndex, const ServerCredentials &credentials, DockerContainer container,
diff --git a/client/ui/qml/Pages2/PageStart.qml b/client/ui/qml/Pages2/PageStart.qml
index f36aac41..43366af7 100644
--- a/client/ui/qml/Pages2/PageStart.qml
+++ b/client/ui/qml/Pages2/PageStart.qml
@@ -171,8 +171,6 @@ PageType {
             onClicked: {
                 tabBarStackView.goToTabBarPage(PageEnum.PageHome)
                 ServersModel.currentlyProcessedIndex = ServersModel.defaultIndex
-
-                ConnectionController.translateMemoryText()
             }
         }
         TabImageButtonType {

From 079c9176ef9afef6dd489be5cdbb6d8cd706fae6 Mon Sep 17 00:00:00 2001
From: ronoaer <ronoaer@gmail.com>
Date: Fri, 6 Oct 2023 15:29:15 +0800
Subject: [PATCH 186/278] fixed minor issues of translation

---
 client/translations/amneziavpn_ru.ts          | 25 +++++++-----
 client/translations/amneziavpn_zh_CN.ts       | 39 ++++++++++++-------
 client/ui/controllers/installController.cpp   |  2 +-
 .../PageSetupWizardProtocolSettings.qml       |  2 +-
 4 files changed, 41 insertions(+), 27 deletions(-)

diff --git a/client/translations/amneziavpn_ru.ts b/client/translations/amneziavpn_ru.ts
index 000e0907..e0bab018 100644
--- a/client/translations/amneziavpn_ru.ts
+++ b/client/translations/amneziavpn_ru.ts
@@ -4,7 +4,7 @@
 <context>
     <name>AmneziaApplication</name>
     <message>
-        <location filename="../amnezia_application.cpp" line="299"/>
+        <location filename="../amnezia_application.cpp" line="300"/>
         <source>Split tunneling for WireGuard is not implemented, the option was disabled</source>
         <translation type="unfinished"></translation>
     </message>
@@ -173,7 +173,7 @@ Already installed containers were found on the server. All installed containers
     </message>
     <message>
         <location filename="../ui/controllers/installController.cpp" line="306"/>
-        <source>1% has been removed from the server &apos;%2&apos;</source>
+        <source>%1 has been removed from the server &apos;%2&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -224,12 +224,12 @@ Already installed containers were found on the server. All installed containers
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/notificationhandler.cpp" line="95"/>
+        <location filename="../ui/notificationhandler.cpp" line="99"/>
         <source>AmneziaVPN notification</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/notificationhandler.cpp" line="96"/>
+        <location filename="../ui/notificationhandler.cpp" line="100"/>
         <source>Unsecured network detected: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -1588,7 +1588,7 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
     <name>PageSetupWizardProtocolSettings</name>
     <message>
         <location filename="../ui/qml/Pages2/PageSetupWizardProtocolSettings.qml" line="75"/>
-        <source>Installing </source>
+        <source>Installing %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -2559,27 +2559,32 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
 <context>
     <name>SystemTrayNotificationHandler</name>
     <message>
-        <location filename="../ui/systemtray_notificationhandler.cpp" line="30"/>
+        <location filename="../ui/systemtray_notificationhandler.cpp" line="28"/>
+        <location filename="../ui/systemtray_notificationhandler.cpp" line="60"/>
         <source>Show</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/systemtray_notificationhandler.cpp" line="34"/>
+        <location filename="../ui/systemtray_notificationhandler.cpp" line="32"/>
+        <location filename="../ui/systemtray_notificationhandler.cpp" line="61"/>
         <source>Connect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/systemtray_notificationhandler.cpp" line="35"/>
+        <location filename="../ui/systemtray_notificationhandler.cpp" line="33"/>
+        <location filename="../ui/systemtray_notificationhandler.cpp" line="62"/>
         <source>Disconnect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/systemtray_notificationhandler.cpp" line="39"/>
+        <location filename="../ui/systemtray_notificationhandler.cpp" line="37"/>
+        <location filename="../ui/systemtray_notificationhandler.cpp" line="63"/>
         <source>Visit Website</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/systemtray_notificationhandler.cpp" line="43"/>
+        <location filename="../ui/systemtray_notificationhandler.cpp" line="41"/>
+        <location filename="../ui/systemtray_notificationhandler.cpp" line="64"/>
         <source>Quit</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/client/translations/amneziavpn_zh_CN.ts b/client/translations/amneziavpn_zh_CN.ts
index e7171ce2..b89674e5 100644
--- a/client/translations/amneziavpn_zh_CN.ts
+++ b/client/translations/amneziavpn_zh_CN.ts
@@ -4,7 +4,7 @@
 <context>
     <name>AmneziaApplication</name>
     <message>
-        <location filename="../amnezia_application.cpp" line="299"/>
+        <location filename="../amnezia_application.cpp" line="300"/>
         <source>Split tunneling for WireGuard is not implemented, the option was disabled</source>
         <translation type="unfinished">未启用选项，还未实现基于WireGuard协议的VPN分流</translation>
     </message>
@@ -182,8 +182,12 @@ Already installed containers were found on the server. All installed containers
     </message>
     <message>
         <location filename="../ui/controllers/installController.cpp" line="306"/>
+        <source>%1 has been removed from the server &apos;%2&apos;</source>
+        <translation type="unfinished">%1 已从服务器 &apos;%2&apos; 上移除</translation>
+    </message>
+    <message>
         <source>1% has been removed from the server &apos;%2&apos;</source>
-        <translation type="unfinished">容器 1% 已从服务器 &apos;%2&apos; 上移除</translation>
+        <translation type="obsolete">%1 已从服务器 &apos;%2&apos; 上移除</translation>
     </message>
     <message>
         <source>Server &apos;</source>
@@ -245,12 +249,12 @@ Already installed containers were found on the server. All installed containers
         <translation type="unfinished">已从VPN断开</translation>
     </message>
     <message>
-        <location filename="../ui/notificationhandler.cpp" line="95"/>
+        <location filename="../ui/notificationhandler.cpp" line="99"/>
         <source>AmneziaVPN notification</source>
         <translation type="unfinished">AmneziaVPN 提示</translation>
     </message>
     <message>
-        <location filename="../ui/notificationhandler.cpp" line="96"/>
+        <location filename="../ui/notificationhandler.cpp" line="100"/>
         <source>Unsecured network detected: </source>
         <translation type="unfinished">发现不安全网络</translation>
     </message>
@@ -1620,13 +1624,13 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
     <name>PageSetupWizardProtocolSettings</name>
     <message>
         <location filename="../ui/qml/Pages2/PageSetupWizardProtocolSettings.qml" line="75"/>
-        <source>Installing </source>
-        <translation type="unfinished"></translation>
+        <source>Installing %1</source>
+        <translation type="unfinished">正在安装 %1</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSetupWizardProtocolSettings.qml" line="93"/>
         <source>More detailed</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">更多细节</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSetupWizardProtocolSettings.qml" line="183"/>
@@ -1646,7 +1650,7 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
     <message>
         <location filename="../ui/qml/Pages2/PageSetupWizardProtocolSettings.qml" line="230"/>
         <source>Install</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">安装</translation>
     </message>
 </context>
 <context>
@@ -2318,7 +2322,7 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
         <location filename="../containers/containers_defs.cpp" line="89"/>
         <location filename="../containers/containers_defs.cpp" line="132"/>
         <source>Website in Tor network</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">在 Tor 网络中架设网站</translation>
     </message>
     <message>
         <location filename="../containers/containers_defs.cpp" line="90"/>
@@ -2358,7 +2362,7 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
     <message>
         <location filename="../containers/containers_defs.cpp" line="114"/>
         <source>Deploy a WordPress site on the Tor network in two clicks.</source>
-        <translation type="unfinished">只需点两次即可架设 WordPress 网站到 Tor 网络</translation>
+        <translation type="unfinished">只需点击两次即可架设 WordPress 网站到 Tor 网络</translation>
     </message>
     <message>
         <location filename="../containers/containers_defs.cpp" line="116"/>
@@ -2591,27 +2595,32 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
 <context>
     <name>SystemTrayNotificationHandler</name>
     <message>
-        <location filename="../ui/systemtray_notificationhandler.cpp" line="30"/>
+        <location filename="../ui/systemtray_notificationhandler.cpp" line="28"/>
+        <location filename="../ui/systemtray_notificationhandler.cpp" line="60"/>
         <source>Show</source>
         <translation type="unfinished">界面</translation>
     </message>
     <message>
-        <location filename="../ui/systemtray_notificationhandler.cpp" line="34"/>
+        <location filename="../ui/systemtray_notificationhandler.cpp" line="32"/>
+        <location filename="../ui/systemtray_notificationhandler.cpp" line="61"/>
         <source>Connect</source>
         <translation type="unfinished">连接</translation>
     </message>
     <message>
-        <location filename="../ui/systemtray_notificationhandler.cpp" line="35"/>
+        <location filename="../ui/systemtray_notificationhandler.cpp" line="33"/>
+        <location filename="../ui/systemtray_notificationhandler.cpp" line="62"/>
         <source>Disconnect</source>
         <translation type="unfinished">断开</translation>
     </message>
     <message>
-        <location filename="../ui/systemtray_notificationhandler.cpp" line="39"/>
+        <location filename="../ui/systemtray_notificationhandler.cpp" line="37"/>
+        <location filename="../ui/systemtray_notificationhandler.cpp" line="63"/>
         <source>Visit Website</source>
         <translation type="unfinished">官网</translation>
     </message>
     <message>
-        <location filename="../ui/systemtray_notificationhandler.cpp" line="43"/>
+        <location filename="../ui/systemtray_notificationhandler.cpp" line="41"/>
+        <location filename="../ui/systemtray_notificationhandler.cpp" line="64"/>
         <source>Quit</source>
         <translation type="unfinished">退出</translation>
     </message>
diff --git a/client/ui/controllers/installController.cpp b/client/ui/controllers/installController.cpp
index b03a45d8..c25a3129 100644
--- a/client/ui/controllers/installController.cpp
+++ b/client/ui/controllers/installController.cpp
@@ -303,7 +303,7 @@ void InstallController::removeCurrentlyProcessedContainer()
     ErrorCode errorCode = m_containersModel->removeCurrentlyProcessedContainer();
     if (errorCode == ErrorCode::NoError) {
 
-        emit removeCurrentlyProcessedContainerFinished(tr("1% has been removed from the server '%2'").arg(containerName).arg(serverName));
+        emit removeCurrentlyProcessedContainerFinished(tr("%1 has been removed from the server '%2'").arg(containerName).arg(serverName));
         return;
     }
     emit installationErrorOccurred(errorString(errorCode));
diff --git a/client/ui/qml/Pages2/PageSetupWizardProtocolSettings.qml b/client/ui/qml/Pages2/PageSetupWizardProtocolSettings.qml
index 07eef177..7535464a 100644
--- a/client/ui/qml/Pages2/PageSetupWizardProtocolSettings.qml
+++ b/client/ui/qml/Pages2/PageSetupWizardProtocolSettings.qml
@@ -72,7 +72,7 @@ PageType {
 
                             Layout.fillWidth: true
 
-                            headerText: qsTr("Installing ") + name
+                            headerText: qsTr("Installing %1").arg(name)
                             descriptionText: description
                         }
 

From 3fb97d16bbb6566c2a26e2c2c4afc4581a992c9d Mon Sep 17 00:00:00 2001
From: ronoaer <ronoaer@gmail.com>
Date: Fri, 6 Oct 2023 15:49:48 +0800
Subject: [PATCH 187/278] updated about page

---
 client/translations/amneziavpn_zh_CN.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/client/translations/amneziavpn_zh_CN.ts b/client/translations/amneziavpn_zh_CN.ts
index b89674e5..cd82e8f7 100644
--- a/client/translations/amneziavpn_zh_CN.ts
+++ b/client/translations/amneziavpn_zh_CN.ts
@@ -803,14 +803,14 @@ Already installed containers were found on the server. All installed containers
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsAbout.qml" line="56"/>
         <source>Support the project with a donation</source>
-        <translation type="unfinished">捐赠项目</translation>
+        <translation type="unfinished">捐款</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsAbout.qml" line="71"/>
         <source>This is a free and open source application. If you like it, support the developers with a donation.
 And if you don&apos;t like the app, all the more support it - the donation will be used to improve the app.</source>
-        <translation type="unfinished">这是一个免费且开源的应用。如果您喜欢，请捐助支持我们。
-如果您不喜欢该应用，请更加支持它 - 捐款将用于改进该应用。</translation>
+        <translation type="unfinished">这是一个免费且开源的应用软件。如果您喜欢它，请捐助支持我们继续研发。
+如果您不喜欢，请捐助支持我们改进它。</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsAbout.qml" line="82"/>

From 673f28ed648677f92a46001ee774bbfce5260ba0 Mon Sep 17 00:00:00 2001
From: ronoaer <ronoaer@gmail.com>
Date: Fri, 6 Oct 2023 16:32:04 +0800
Subject: [PATCH 188/278] retanslate donation way

---
 client/translations/amneziavpn_zh_CN.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/translations/amneziavpn_zh_CN.ts b/client/translations/amneziavpn_zh_CN.ts
index cd82e8f7..37e27786 100644
--- a/client/translations/amneziavpn_zh_CN.ts
+++ b/client/translations/amneziavpn_zh_CN.ts
@@ -815,7 +815,7 @@ And if you don&apos;t like the app, all the more support it - the donation will
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsAbout.qml" line="82"/>
         <source>Card on Patreon</source>
-        <translation type="unfinished">请在Patreon上支持我们</translation>
+        <translation type="unfinished">Patreon订阅</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsAbout.qml" line="85"/>
@@ -825,7 +825,7 @@ And if you don&apos;t like the app, all the more support it - the donation will
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsAbout.qml" line="102"/>
         <source>Show other methods on Github</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">其他捐款途径</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsAbout.qml" line="113"/>

From b7a65343af4373753841b7db3c8f2bd5c4260cc6 Mon Sep 17 00:00:00 2001
From: "vladimir.kuznetsov" <nethiuswork@gmail.com>
Date: Fri, 6 Oct 2023 16:43:52 +0500
Subject: [PATCH 189/278] added the ability to change awg parameters on the
 protocol settings page

---
 client/configurators/awg_configurator.cpp     |  73 ++++++-----
 .../configurators/wireguard_configurator.cpp  |   8 +-
 client/configurators/wireguard_configurator.h |   2 +
 client/core/servercontroller.cpp              |   4 +
 .../protocols/amneziaWireGuardConfigModel.cpp |  81 ++++++++++--
 .../protocols/amneziaWireGuardConfigModel.h   |  10 +-
 .../Components/SettingsContainersListView.qml |   2 +-
 .../qml/Controls2/TextFieldWithHeaderType.qml |   7 ++
 .../PageProtocolAmneziaWireGuardSettings.qml  | 117 +++++++++++++-----
 9 files changed, 224 insertions(+), 80 deletions(-)

diff --git a/client/configurators/awg_configurator.cpp b/client/configurators/awg_configurator.cpp
index 85dbd6de..6ed1cd1b 100644
--- a/client/configurators/awg_configurator.cpp
+++ b/client/configurators/awg_configurator.cpp
@@ -3,6 +3,8 @@
 #include <QJsonDocument>
 #include <QJsonObject>
 
+#include "core/servercontroller.h"
+
 AmneziaWireGuardConfigurator::AmneziaWireGuardConfigurator(std::shared_ptr<Settings> settings, QObject *parent)
     : WireguardConfigurator(settings, true, parent)
 {
@@ -15,46 +17,43 @@ QString AmneziaWireGuardConfigurator::genAmneziaWireGuardConfig(const ServerCred
     QString config = WireguardConfigurator::genWireguardConfig(credentials, container, containerConfig, errorCode);
 
     QJsonObject jsonConfig = QJsonDocument::fromJson(config.toUtf8()).object();
-    QJsonObject awgConfig = containerConfig.value(config_key::amneziaWireguard).toObject();
 
-    auto junkPacketCount =
-            awgConfig.value(config_key::junkPacketCount).toString(protocols::amneziawireguard::defaultJunkPacketCount);
-    auto junkPacketMinSize =
-            awgConfig.value(config_key::junkPacketMinSize).toString(protocols::amneziawireguard::defaultJunkPacketMinSize);
-    auto junkPacketMaxSize =
-            awgConfig.value(config_key::junkPacketMaxSize).toString(protocols::amneziawireguard::defaultJunkPacketMaxSize);
-    auto initPacketJunkSize =
-            awgConfig.value(config_key::initPacketJunkSize).toString(protocols::amneziawireguard::defaultInitPacketJunkSize);
-    auto responsePacketJunkSize =
-            awgConfig.value(config_key::responsePacketJunkSize).toString(protocols::amneziawireguard::defaultResponsePacketJunkSize);
-    auto initPacketMagicHeader =
-            awgConfig.value(config_key::initPacketMagicHeader).toString(protocols::amneziawireguard::defaultInitPacketMagicHeader);
-    auto responsePacketMagicHeader =
-            awgConfig.value(config_key::responsePacketMagicHeader).toString(protocols::amneziawireguard::defaultResponsePacketMagicHeader);
-    auto underloadPacketMagicHeader =
-            awgConfig.value(config_key::underloadPacketMagicHeader).toString(protocols::amneziawireguard::defaultUnderloadPacketMagicHeader);
-    auto transportPacketMagicHeader =
-            awgConfig.value(config_key::transportPacketMagicHeader).toString(protocols::amneziawireguard::defaultTransportPacketMagicHeader);
+    ServerController serverController(m_settings);
+    QString serverConfig = serverController.getTextFileFromContainer(container, credentials, protocols::amneziawireguard::serverConfigPath, errorCode);
 
-    config.replace("$JUNK_PACKET_COUNT", junkPacketCount);
-    config.replace("$JUNK_PACKET_MIN_SIZE", junkPacketMinSize);
-    config.replace("$JUNK_PACKET_MAX_SIZE", junkPacketMaxSize);
-    config.replace("$INIT_PACKET_JUNK_SIZE", initPacketJunkSize);
-    config.replace("$RESPONSE_PACKET_JUNK_SIZE", responsePacketJunkSize);
-    config.replace("$INIT_PACKET_MAGIC_HEADER", initPacketMagicHeader);
-    config.replace("$RESPONSE_PACKET_MAGIC_HEADER", responsePacketMagicHeader);
-    config.replace("$UNDERLOAD_PACKET_MAGIC_HEADER", underloadPacketMagicHeader);
-    config.replace("$TRANSPORT_PACKET_MAGIC_HEADER", transportPacketMagicHeader);
+    QMap<QString, QString> serverConfigMap;
+    auto serverConfigLines = serverConfig.split("\n");
+    for (auto &line : serverConfigLines) {
+        auto trimmedLine = line.trimmed();
+        if (trimmedLine.startsWith("[") && trimmedLine.endsWith("]")) {
+            continue;
+        } else {
+            QStringList parts = trimmedLine.split(" = ");
+            if (parts.count() == 2) {
+                serverConfigMap.insert(parts[0].trimmed(), parts[1].trimmed());
+            }
+        }
+    }
 
-    jsonConfig[config_key::junkPacketCount] = junkPacketCount;
-    jsonConfig[config_key::junkPacketMinSize] = junkPacketMinSize;
-    jsonConfig[config_key::junkPacketMaxSize] = junkPacketMaxSize;
-    jsonConfig[config_key::initPacketJunkSize] = initPacketJunkSize;
-    jsonConfig[config_key::responsePacketJunkSize] = responsePacketJunkSize;
-    jsonConfig[config_key::initPacketMagicHeader] = initPacketMagicHeader;
-    jsonConfig[config_key::responsePacketMagicHeader] = responsePacketMagicHeader;
-    jsonConfig[config_key::underloadPacketMagicHeader] = underloadPacketMagicHeader;
-    jsonConfig[config_key::transportPacketMagicHeader] = transportPacketMagicHeader;
+    config.replace("$JUNK_PACKET_COUNT", serverConfigMap.value(config_key::junkPacketCount));
+    config.replace("$JUNK_PACKET_MIN_SIZE", serverConfigMap.value(config_key::junkPacketMinSize));
+    config.replace("$JUNK_PACKET_MAX_SIZE", serverConfigMap.value(config_key::junkPacketMaxSize));
+    config.replace("$INIT_PACKET_JUNK_SIZE", serverConfigMap.value(config_key::initPacketJunkSize));
+    config.replace("$RESPONSE_PACKET_JUNK_SIZE", serverConfigMap.value(config_key::responsePacketJunkSize));
+    config.replace("$INIT_PACKET_MAGIC_HEADER", serverConfigMap.value(config_key::initPacketMagicHeader));
+    config.replace("$RESPONSE_PACKET_MAGIC_HEADER", serverConfigMap.value(config_key::responsePacketMagicHeader));
+    config.replace("$UNDERLOAD_PACKET_MAGIC_HEADER", serverConfigMap.value(config_key::underloadPacketMagicHeader));
+    config.replace("$TRANSPORT_PACKET_MAGIC_HEADER", serverConfigMap.value(config_key::transportPacketMagicHeader));
+
+    jsonConfig[config_key::junkPacketCount] = serverConfigMap.value(config_key::junkPacketCount);
+    jsonConfig[config_key::junkPacketMinSize] = serverConfigMap.value(config_key::junkPacketMinSize);
+    jsonConfig[config_key::junkPacketMaxSize] = serverConfigMap.value(config_key::junkPacketMaxSize);
+    jsonConfig[config_key::initPacketJunkSize] = serverConfigMap.value(config_key::initPacketJunkSize);
+    jsonConfig[config_key::responsePacketJunkSize] = serverConfigMap.value(config_key::responsePacketJunkSize);
+    jsonConfig[config_key::initPacketMagicHeader] = serverConfigMap.value(config_key::initPacketMagicHeader);
+    jsonConfig[config_key::responsePacketMagicHeader] = serverConfigMap.value(config_key::responsePacketMagicHeader);
+    jsonConfig[config_key::underloadPacketMagicHeader] = serverConfigMap.value(config_key::underloadPacketMagicHeader);
+    jsonConfig[config_key::transportPacketMagicHeader] = serverConfigMap.value(config_key::transportPacketMagicHeader);
 
     return QJsonDocument(jsonConfig).toJson();
 }
diff --git a/client/configurators/wireguard_configurator.cpp b/client/configurators/wireguard_configurator.cpp
index dd836a18..5ea042c1 100644
--- a/client/configurators/wireguard_configurator.cpp
+++ b/client/configurators/wireguard_configurator.cpp
@@ -30,6 +30,9 @@ WireguardConfigurator::WireguardConfigurator(std::shared_ptr<Settings> settings,
                                               : amnezia::protocols::wireguard::serverPskKeyPath;
     m_configTemplate = m_isAmneziaWireGuard ? ProtocolScriptType::amnezia_wireguard_template
                                             : ProtocolScriptType::wireguard_template;
+
+    m_protocolName = m_isAmneziaWireGuard ? config_key::amneziaWireguard : config_key::wireguard;
+    m_defaultPort = m_isAmneziaWireGuard ? protocols::wireguard::defaultPort : protocols::amneziawireguard::defaultPort;
 }
 
 WireguardConfigurator::ConnectionData WireguardConfigurator::genClientKeys()
@@ -70,10 +73,7 @@ WireguardConfigurator::ConnectionData WireguardConfigurator::prepareWireguardCon
 {
     WireguardConfigurator::ConnectionData connData = WireguardConfigurator::genClientKeys();
     connData.host = credentials.hostName;
-    connData.port = containerConfig.value(m_isAmneziaWireGuard ? config_key::amneziaWireguard : config_key::wireguard)
-                            .toObject()
-                            .value(config_key::port)
-                            .toString(protocols::wireguard::defaultPort);
+    connData.port = containerConfig.value(m_protocolName).toObject().value(config_key::port).toString(m_defaultPort);
 
     if (connData.clientPrivKey.isEmpty() || connData.clientPubKey.isEmpty()) {
         if (errorCode)
diff --git a/client/configurators/wireguard_configurator.h b/client/configurators/wireguard_configurator.h
index 70ed729b..10eecbb4 100644
--- a/client/configurators/wireguard_configurator.h
+++ b/client/configurators/wireguard_configurator.h
@@ -42,6 +42,8 @@ private:
     QString m_serverPublicKeyPath;
     QString m_serverPskKeyPath;
     amnezia::ProtocolScriptType m_configTemplate;
+    QString m_protocolName;
+    QString m_defaultPort;
 };
 
 #endif // WIREGUARD_CONFIGURATOR_H
diff --git a/client/core/servercontroller.cpp b/client/core/servercontroller.cpp
index 3b30451f..b5467dac 100644
--- a/client/core/servercontroller.cpp
+++ b/client/core/servercontroller.cpp
@@ -338,6 +338,10 @@ bool ServerController::isReinstallContainerRequired(DockerContainer container, c
             return true;
     }
 
+    if (container == DockerContainer::AmneziaWireGuard) {
+        return true;
+    }
+
     return false;
 }
 
diff --git a/client/ui/models/protocols/amneziaWireGuardConfigModel.cpp b/client/ui/models/protocols/amneziaWireGuardConfigModel.cpp
index 9cf4ed14..a1ce4385 100644
--- a/client/ui/models/protocols/amneziaWireGuardConfigModel.cpp
+++ b/client/ui/models/protocols/amneziaWireGuardConfigModel.cpp
@@ -1,5 +1,7 @@
 #include "amneziaWireGuardConfigModel.h"
 
+#include <QJsonDocument>
+
 #include "protocols/protocols_defs.h"
 
 AmneziaWireGuardConfigModel::AmneziaWireGuardConfigModel(QObject *parent) : QAbstractListModel(parent)
@@ -20,7 +22,27 @@ bool AmneziaWireGuardConfigModel::setData(const QModelIndex &index, const QVaria
 
     switch (role) {
     case Roles::PortRole: m_protocolConfig.insert(config_key::port, value.toString()); break;
-    case Roles::CipherRole: m_protocolConfig.insert(config_key::cipher, value.toString()); break;
+    case Roles::JunkPacketCountRole: m_protocolConfig.insert(config_key::junkPacketCount, value.toString()); break;
+    case Roles::JunkPacketMinSizeRole: m_protocolConfig.insert(config_key::junkPacketMinSize, value.toString()); break;
+    case Roles::JunkPacketMaxSizeRole: m_protocolConfig.insert(config_key::junkPacketMaxSize, value.toString()); break;
+    case Roles::InitPacketJunkSizeRole:
+        m_protocolConfig.insert(config_key::initPacketJunkSize, value.toString());
+        break;
+    case Roles::ResponsePacketJunkSizeRole:
+        m_protocolConfig.insert(config_key::responsePacketJunkSize, value.toString());
+        break;
+    case Roles::InitPacketMagicHeaderRole:
+        m_protocolConfig.insert(config_key::initPacketMagicHeader, value.toString());
+        break;
+    case Roles::ResponsePacketMagicHeaderRole:
+        m_protocolConfig.insert(config_key::responsePacketMagicHeader, value.toString());
+        break;
+    case Roles::UnderloadPacketMagicHeaderRole:
+        m_protocolConfig.insert(config_key::underloadPacketMagicHeader, value.toString());
+        break;
+    case Roles::TransportPacketMagicHeaderRole:
+        m_protocolConfig.insert(config_key::transportPacketMagicHeader, value.toString());
+        break;
     }
 
     emit dataChanged(index, index, QList { role });
@@ -34,9 +56,16 @@ QVariant AmneziaWireGuardConfigModel::data(const QModelIndex &index, int role) c
     }
 
     switch (role) {
-    case Roles::PortRole: return m_protocolConfig.value(config_key::port).toString(protocols::shadowsocks::defaultPort);
-    case Roles::CipherRole:
-        return m_protocolConfig.value(config_key::cipher).toString(protocols::shadowsocks::defaultCipher);
+    case Roles::PortRole: return m_protocolConfig.value(config_key::port).toString();
+    case Roles::JunkPacketCountRole: return m_protocolConfig.value(config_key::junkPacketCount);
+    case Roles::JunkPacketMinSizeRole: return m_protocolConfig.value(config_key::junkPacketMinSize);
+    case Roles::JunkPacketMaxSizeRole: return m_protocolConfig.value(config_key::junkPacketMaxSize);
+    case Roles::InitPacketJunkSizeRole: return m_protocolConfig.value(config_key::initPacketJunkSize);
+    case Roles::ResponsePacketJunkSizeRole: return m_protocolConfig.value(config_key::responsePacketJunkSize);
+    case Roles::InitPacketMagicHeaderRole: return m_protocolConfig.value(config_key::initPacketMagicHeader);
+    case Roles::ResponsePacketMagicHeaderRole: return m_protocolConfig.value(config_key::responsePacketMagicHeader);
+    case Roles::UnderloadPacketMagicHeaderRole: return m_protocolConfig.value(config_key::underloadPacketMagicHeader);
+    case Roles::TransportPacketMagicHeaderRole: return m_protocolConfig.value(config_key::transportPacketMagicHeader);
     }
 
     return QVariant();
@@ -48,14 +77,44 @@ void AmneziaWireGuardConfigModel::updateModel(const QJsonObject &config)
     m_container = ContainerProps::containerFromString(config.value(config_key::container).toString());
 
     m_fullConfig = config;
-    QJsonObject protocolConfig = config.value(config_key::wireguard).toObject();
+
+    QJsonObject protocolConfig = config.value(config_key::amneziaWireguard).toObject();
+
+    m_protocolConfig[config_key::port] =
+            protocolConfig.value(config_key::port).toString(protocols::amneziawireguard::defaultPort);
+    m_protocolConfig[config_key::junkPacketCount] =
+            protocolConfig.value(config_key::junkPacketCount).toString(protocols::amneziawireguard::defaultJunkPacketCount);
+    m_protocolConfig[config_key::junkPacketMinSize] =
+            protocolConfig.value(config_key::junkPacketMinSize)
+                    .toString(protocols::amneziawireguard::defaultJunkPacketMinSize);
+    m_protocolConfig[config_key::junkPacketMaxSize] =
+            protocolConfig.value(config_key::junkPacketMaxSize)
+                    .toString(protocols::amneziawireguard::defaultJunkPacketMaxSize);
+    m_protocolConfig[config_key::initPacketJunkSize] =
+            protocolConfig.value(config_key::initPacketJunkSize)
+                    .toString(protocols::amneziawireguard::defaultInitPacketJunkSize);
+    m_protocolConfig[config_key::responsePacketJunkSize] =
+            protocolConfig.value(config_key::responsePacketJunkSize)
+                    .toString(protocols::amneziawireguard::defaultResponsePacketJunkSize);
+    m_protocolConfig[config_key::initPacketMagicHeader] =
+            protocolConfig.value(config_key::initPacketMagicHeader)
+                    .toString(protocols::amneziawireguard::defaultInitPacketMagicHeader);
+    m_protocolConfig[config_key::responsePacketMagicHeader] =
+            protocolConfig.value(config_key::responsePacketMagicHeader)
+                    .toString(protocols::amneziawireguard::defaultResponsePacketMagicHeader);
+    m_protocolConfig[config_key::underloadPacketMagicHeader] =
+            protocolConfig.value(config_key::underloadPacketMagicHeader)
+                    .toString(protocols::amneziawireguard::defaultUnderloadPacketMagicHeader);
+    m_protocolConfig[config_key::transportPacketMagicHeader] =
+            protocolConfig.value(config_key::transportPacketMagicHeader)
+                    .toString(protocols::amneziawireguard::defaultTransportPacketMagicHeader);
 
     endResetModel();
 }
 
 QJsonObject AmneziaWireGuardConfigModel::getConfig()
 {
-    m_fullConfig.insert(config_key::wireguard, m_protocolConfig);
+    m_fullConfig.insert(config_key::amneziaWireguard, m_protocolConfig);
     return m_fullConfig;
 }
 
@@ -64,7 +123,15 @@ QHash<int, QByteArray> AmneziaWireGuardConfigModel::roleNames() const
     QHash<int, QByteArray> roles;
 
     roles[PortRole] = "port";
-    roles[CipherRole] = "cipher";
+    roles[JunkPacketCountRole] = "junkPacketCount";
+    roles[JunkPacketMinSizeRole] = "junkPacketMinSize";
+    roles[JunkPacketMaxSizeRole] = "junkPacketMaxSize";
+    roles[InitPacketJunkSizeRole] = "initPacketJunkSize";
+    roles[ResponsePacketJunkSizeRole] = "responsePacketJunkSize";
+    roles[InitPacketMagicHeaderRole] = "initPacketMagicHeader";
+    roles[ResponsePacketMagicHeaderRole] = "responsePacketMagicHeader";
+    roles[UnderloadPacketMagicHeaderRole] = "underloadPacketMagicHeader";
+    roles[TransportPacketMagicHeaderRole] = "transportPacketMagicHeader";
 
     return roles;
 }
diff --git a/client/ui/models/protocols/amneziaWireGuardConfigModel.h b/client/ui/models/protocols/amneziaWireGuardConfigModel.h
index b798c289..9419d5c9 100644
--- a/client/ui/models/protocols/amneziaWireGuardConfigModel.h
+++ b/client/ui/models/protocols/amneziaWireGuardConfigModel.h
@@ -13,7 +13,15 @@ class AmneziaWireGuardConfigModel : public QAbstractListModel
 public:
     enum Roles {
         PortRole = Qt::UserRole + 1,
-        CipherRole
+        JunkPacketCountRole,
+        JunkPacketMinSizeRole,
+        JunkPacketMaxSizeRole,
+        InitPacketJunkSizeRole,
+        ResponsePacketJunkSizeRole,
+        InitPacketMagicHeaderRole,
+        ResponsePacketMagicHeaderRole,
+        UnderloadPacketMagicHeaderRole,
+        TransportPacketMagicHeaderRole
     };
 
     explicit AmneziaWireGuardConfigModel(QObject *parent = nullptr);
diff --git a/client/ui/qml/Components/SettingsContainersListView.qml b/client/ui/qml/Components/SettingsContainersListView.qml
index 250ba1eb..df25b492 100644
--- a/client/ui/qml/Components/SettingsContainersListView.qml
+++ b/client/ui/qml/Components/SettingsContainersListView.qml
@@ -65,7 +65,7 @@ ListView {
                             break
                         }
                         case ContainerEnum.AmneziaWireGuard: {
-                            WireGuardConfigModel.updateModel(config)
+                            AmneziaWireGuardConfigModel.updateModel(config)
                             PageController.goToPage(PageEnum.PageProtocolAmneziaWireGuardSettings)
                             break
                         }
diff --git a/client/ui/qml/Controls2/TextFieldWithHeaderType.qml b/client/ui/qml/Controls2/TextFieldWithHeaderType.qml
index 3f80428e..a23e9354 100644
--- a/client/ui/qml/Controls2/TextFieldWithHeaderType.qml
+++ b/client/ui/qml/Controls2/TextFieldWithHeaderType.qml
@@ -12,6 +12,7 @@ Item {
     property string headerTextColor: "#878b91"
 
     property alias errorText: errorField.text
+    property bool checkEmptyText: false
 
     property string buttonText
     property string buttonImageSource
@@ -98,6 +99,12 @@ Item {
                             root.errorText = ""
                         }
 
+                        onActiveFocusChanged: {
+                            if (checkEmptyText && textFieldText === "") {
+                                errorText = qsTr("The field can't be empty")
+                            }
+                        }
+
                         MouseArea {
                             anchors.fill: parent
                             acceptedButtons: Qt.RightButton
diff --git a/client/ui/qml/Pages2/PageProtocolAmneziaWireGuardSettings.qml b/client/ui/qml/Pages2/PageProtocolAmneziaWireGuardSettings.qml
index a905f47a..35edb15c 100644
--- a/client/ui/qml/Pages2/PageProtocolAmneziaWireGuardSettings.qml
+++ b/client/ui/qml/Pages2/PageProtocolAmneziaWireGuardSettings.qml
@@ -4,6 +4,8 @@ import QtQuick.Layouts
 
 import SortFilterProxyModel 0.2
 
+import PageEnum 1.0
+
 import "./"
 import "../Controls2"
 import "../Controls2/TextTypes"
@@ -75,6 +77,7 @@ PageType {
                         }
 
                         TextFieldWithHeaderType {
+                            id: portTextField
                             Layout.fillWidth: true
                             Layout.topMargin: 40
 
@@ -88,132 +91,175 @@ PageType {
                                     port = textFieldText
                                 }
                             }
+
+                            checkEmptyText: true
                         }
 
                         TextFieldWithHeaderType {
+                            id: junkPacketCountTextField
                             Layout.fillWidth: true
                             Layout.topMargin: 16
 
                             headerText: qsTr("Junk packet count")
-                            textFieldText: port
+                            textFieldText: junkPacketCount
+                            textField.validator: IntValidator { bottom: 0 }
 
                             textField.onEditingFinished: {
-                                if (textFieldText !== port) {
-                                    port = textFieldText
+                                console.log("1")
+                                if (textFieldText === "") {
+                                    textFieldText = "0"
+                                }
+
+                                if (textFieldText !== junkPacketCount) {
+                                    junkPacketCount = textFieldText
                                 }
                             }
+
+                            checkEmptyText: true
                         }
 
                         TextFieldWithHeaderType {
+                            id: junkPacketMinSizeTextField
                             Layout.fillWidth: true
                             Layout.topMargin: 16
 
                             headerText: qsTr("Junk packet minimum size")
-                            textFieldText: port
+                            textFieldText: junkPacketMinSize
+                            textField.validator: IntValidator { bottom: 0 }
 
                             textField.onEditingFinished: {
-                                if (textFieldText !== port) {
-                                    port = textFieldText
+                                if (textFieldText !== junkPacketMinSize) {
+                                    junkPacketMinSize = textFieldText
                                 }
                             }
+
+                            checkEmptyText: true
                         }
 
                         TextFieldWithHeaderType {
+                            id: junkPacketMaxSizeTextField
                             Layout.fillWidth: true
                             Layout.topMargin: 16
 
                             headerText: qsTr("Junk packet maximum size")
-                            textFieldText: port
+                            textFieldText: junkPacketMaxSize
+                            textField.validator: IntValidator { bottom: 0 }
 
                             textField.onEditingFinished: {
-                                if (textFieldText !== port) {
-                                    port = textFieldText
+                                if (textFieldText !== junkPacketMaxSize) {
+                                    junkPacketMaxSize = textFieldText
                                 }
                             }
+
+                            checkEmptyText: true
                         }
 
                         TextFieldWithHeaderType {
+                            id: initPacketJunkSizeTextField
                             Layout.fillWidth: true
                             Layout.topMargin: 16
 
                             headerText: qsTr("Init packet junk size")
-                            textFieldText: port
+                            textFieldText: initPacketJunkSize
+                            textField.validator: IntValidator { bottom: 0 }
 
                             textField.onEditingFinished: {
-                                if (textFieldText !== port) {
-                                    port = textFieldText
+                                if (textFieldText !== initPacketJunkSize) {
+                                    initPacketJunkSize = textFieldText
                                 }
                             }
+
+                            checkEmptyText: true
                         }
 
                         TextFieldWithHeaderType {
+                            id: responsePacketJunkSizeTextField
                             Layout.fillWidth: true
                             Layout.topMargin: 16
 
                             headerText: qsTr("Response packet junk size")
-                            textFieldText: port
+                            textFieldText: responsePacketJunkSize
+                            textField.validator: IntValidator { bottom: 0 }
 
                             textField.onEditingFinished: {
-                                if (textFieldText !== port) {
-                                    port = textFieldText
+                                if (textFieldText !== responsePacketJunkSize) {
+                                    responsePacketJunkSize = textFieldText
                                 }
                             }
+
+                            checkEmptyText: true
                         }
 
                         TextFieldWithHeaderType {
+                            id: initPacketMagicHeaderTextField
                             Layout.fillWidth: true
                             Layout.topMargin: 16
 
                             headerText: qsTr("Init packet magic header")
-                            textFieldText: port
+                            textFieldText: initPacketMagicHeader
+                            textField.validator: IntValidator { bottom: 0 }
 
                             textField.onEditingFinished: {
-                                if (textFieldText !== port) {
-                                    port = textFieldText
+                                if (textFieldText !== initPacketMagicHeader) {
+                                    initPacketMagicHeader = textFieldText
                                 }
                             }
+
+                            checkEmptyText: true
                         }
 
                         TextFieldWithHeaderType {
+                            id: responsePacketMagicHeaderTextField
                             Layout.fillWidth: true
                             Layout.topMargin: 16
 
                             headerText: qsTr("Response packet magic header")
-                            textFieldText: port
+                            textFieldText: responsePacketMagicHeader
+                            textField.validator: IntValidator { bottom: 0 }
 
                             textField.onEditingFinished: {
-                                if (textFieldText !== port) {
-                                    port = textFieldText
+                                if (textFieldText !== responsePacketMagicHeader) {
+                                    responsePacketMagicHeader = textFieldText
                                 }
                             }
+
+                            checkEmptyText: true
                         }
 
                         TextFieldWithHeaderType {
+                            id: transportPacketMagicHeaderTextField
                             Layout.fillWidth: true
                             Layout.topMargin: 16
 
                             headerText: qsTr("Transport packet magic header")
-                            textFieldText: port
+                            textFieldText: transportPacketMagicHeader
+                            textField.validator: IntValidator { bottom: 0 }
 
                             textField.onEditingFinished: {
-                                if (textFieldText !== port) {
-                                    port = textFieldText
+                                if (textFieldText !== transportPacketMagicHeader) {
+                                    transportPacketMagicHeader = textFieldText
                                 }
                             }
+
+                            checkEmptyText: true
                         }
 
                         TextFieldWithHeaderType {
+                            id: underloadPacketMagicHeaderTextField
                             Layout.fillWidth: true
                             Layout.topMargin: 16
 
                             headerText: qsTr("Underload packet magic header")
-                            textFieldText: port
+                            textFieldText: underloadPacketMagicHeader
+                            textField.validator: IntValidator { bottom: 0 }
 
                             textField.onEditingFinished: {
-                                if (textFieldText !== port) {
-                                    port = textFieldText
+                                if (textFieldText !== underloadPacketMagicHeader) {
+                                    underloadPacketMagicHeader = textFieldText
                                 }
                             }
+
+                            checkEmptyText: true
                         }
 
                         BasicButtonType {
@@ -251,13 +297,24 @@ PageType {
                             Layout.topMargin: 24
                             Layout.bottomMargin: 24
 
+                            enabled: underloadPacketMagicHeaderTextField.errorText === "" &&
+                                     transportPacketMagicHeaderTextField.errorText === "" &&
+                                     responsePacketMagicHeaderTextField.errorText === "" &&
+                                     initPacketMagicHeaderTextField.errorText === "" &&
+                                     responsePacketJunkSizeTextField.errorText === "" &&
+                                     initPacketJunkSizeTextField.errorText === "" &&
+                                     junkPacketMaxSizeTextField.errorText === "" &&
+                                     junkPacketMinSizeTextField.errorText === "" &&
+                                     junkPacketCountTextField.errorText === "" &&
+                                     portTextField.errorText === ""
+
                             text: qsTr("Save and Restart Amnezia")
 
                             onClicked: {
                                 forceActiveFocus()
-//                                PageController.showBusyIndicator(true)
-//                                InstallController.updateContainer(ShadowSocksConfigModel.getConfig())
-//                                PageController.showBusyIndicator(false)
+                                PageController.showBusyIndicator(true)
+                                InstallController.updateContainer(AmneziaWireGuardConfigModel.getConfig())
+                                PageController.showBusyIndicator(false)
                             }
                         }
                     }

From 16fc0617e479a1e4b4b1dd1b320765af4bc117ba Mon Sep 17 00:00:00 2001
From: "vladimir.kuznetsov" <nethiuswork@gmail.com>
Date: Fri, 6 Oct 2023 17:02:28 +0500
Subject: [PATCH 190/278] renamed amneziawireguard files to awg

---
 .../{amneziaWireGuardConfigModel.cpp => awgConfigModel.cpp}       | 0
 .../protocols/{amneziaWireGuardConfigModel.h => awgConfigModel.h} | 0
 ...olAmneziaWireGuardSettings.qml => PageProtocolAwgSettings.qml} | 0
 3 files changed, 0 insertions(+), 0 deletions(-)
 rename client/ui/models/protocols/{amneziaWireGuardConfigModel.cpp => awgConfigModel.cpp} (100%)
 rename client/ui/models/protocols/{amneziaWireGuardConfigModel.h => awgConfigModel.h} (100%)
 rename client/ui/qml/Pages2/{PageProtocolAmneziaWireGuardSettings.qml => PageProtocolAwgSettings.qml} (100%)

diff --git a/client/ui/models/protocols/amneziaWireGuardConfigModel.cpp b/client/ui/models/protocols/awgConfigModel.cpp
similarity index 100%
rename from client/ui/models/protocols/amneziaWireGuardConfigModel.cpp
rename to client/ui/models/protocols/awgConfigModel.cpp
diff --git a/client/ui/models/protocols/amneziaWireGuardConfigModel.h b/client/ui/models/protocols/awgConfigModel.h
similarity index 100%
rename from client/ui/models/protocols/amneziaWireGuardConfigModel.h
rename to client/ui/models/protocols/awgConfigModel.h
diff --git a/client/ui/qml/Pages2/PageProtocolAmneziaWireGuardSettings.qml b/client/ui/qml/Pages2/PageProtocolAwgSettings.qml
similarity index 100%
rename from client/ui/qml/Pages2/PageProtocolAmneziaWireGuardSettings.qml
rename to client/ui/qml/Pages2/PageProtocolAwgSettings.qml

From aa4a79934a90e71c9f48a345ddcfcd22224214c8 Mon Sep 17 00:00:00 2001
From: "vladimir.kuznetsov" <nethiuswork@gmail.com>
Date: Fri, 6 Oct 2023 17:19:44 +0500
Subject: [PATCH 191/278] renamed amenziawireguard to awg

---
 client/amnezia_application.cpp                |  4 +--
 client/amnezia_application.h                  |  4 +--
 client/configurators/awg_configurator.cpp     |  6 ++--
 client/configurators/awg_configurator.h       | 12 ++++----
 client/configurators/vpn_configurator.cpp     |  6 ++--
 client/configurators/vpn_configurator.h       |  4 +--
 .../configurators/wireguard_configurator.cpp  | 16 +++++------
 client/configurators/wireguard_configurator.h |  6 ++--
 client/containers/containers_defs.cpp         | 10 +++----
 client/containers/containers_defs.h           |  2 +-
 client/core/scripts_registry.cpp              |  2 +-
 client/core/servercontroller.cpp              | 28 +++++++++----------
 client/mozilla/localsocketcontroller.cpp      |  4 +--
 client/protocols/amneziawireguardprotocol.cpp |  4 +--
 client/protocols/amneziawireguardprotocol.h   | 12 ++++----
 client/protocols/protocols_defs.cpp           | 10 +++----
 client/protocols/protocols_defs.h             | 12 ++++----
 client/protocols/vpnprotocol.cpp              |  2 +-
 client/resources.qrc                          |  2 +-
 .../amnezia_wireguard/configure_container.sh  | 16 +++++------
 .../amnezia_wireguard/run_container.sh        |  2 +-
 .../server_scripts/amnezia_wireguard/start.sh |  7 ++---
 .../amnezia_wireguard/template.conf           |  2 +-
 client/ui/controllers/importController.cpp    |  2 +-
 client/ui/controllers/pageController.h        |  2 +-
 client/ui/models/protocols/awgConfigModel.cpp | 16 +++++------
 client/ui/models/protocols/awgConfigModel.h   | 10 +++----
 .../Components/SettingsContainersListView.qml |  6 ++--
 .../ui/qml/Pages2/PageProtocolAwgSettings.qml |  4 +--
 29 files changed, 105 insertions(+), 108 deletions(-)

diff --git a/client/amnezia_application.cpp b/client/amnezia_application.cpp
index cef722b1..f372a1d8 100644
--- a/client/amnezia_application.cpp
+++ b/client/amnezia_application.cpp
@@ -321,8 +321,8 @@ void AmneziaApplication::initModels()
     m_wireGuardConfigModel.reset(new WireGuardConfigModel(this));
     m_engine->rootContext()->setContextProperty("WireGuardConfigModel", m_wireGuardConfigModel.get());
 
-    m_amneziaWireGuardConfigModel.reset(new AmneziaWireGuardConfigModel(this));
-    m_engine->rootContext()->setContextProperty("AmneziaWireGuardConfigModel", m_amneziaWireGuardConfigModel.get());
+    m_awgConfigModel.reset(new AwgConfigModel(this));
+    m_engine->rootContext()->setContextProperty("AwgConfigModel", m_awgConfigModel.get());
 
 #ifdef Q_OS_WINDOWS
     m_ikev2ConfigModel.reset(new Ikev2ConfigModel(this));
diff --git a/client/amnezia_application.h b/client/amnezia_application.h
index 77e50c92..32300421 100644
--- a/client/amnezia_application.h
+++ b/client/amnezia_application.h
@@ -31,7 +31,7 @@
 #ifdef Q_OS_WINDOWS
     #include "ui/models/protocols/ikev2ConfigModel.h"
 #endif
-#include "ui/models/protocols/amneziaWireGuardConfigModel.h"
+#include "ui/models/protocols/awgConfigModel.h"
 #include "ui/models/protocols/openvpnConfigModel.h"
 #include "ui/models/protocols/shadowsocksConfigModel.h"
 #include "ui/models/protocols/wireguardConfigModel.h"
@@ -99,7 +99,7 @@ private:
     QScopedPointer<ShadowSocksConfigModel> m_shadowSocksConfigModel;
     QScopedPointer<CloakConfigModel> m_cloakConfigModel;
     QScopedPointer<WireGuardConfigModel> m_wireGuardConfigModel;
-    QScopedPointer<AmneziaWireGuardConfigModel> m_amneziaWireGuardConfigModel;
+    QScopedPointer<AwgConfigModel> m_awgConfigModel;
 #ifdef Q_OS_WINDOWS
     QScopedPointer<Ikev2ConfigModel> m_ikev2ConfigModel;
 #endif
diff --git a/client/configurators/awg_configurator.cpp b/client/configurators/awg_configurator.cpp
index 6ed1cd1b..8962067a 100644
--- a/client/configurators/awg_configurator.cpp
+++ b/client/configurators/awg_configurator.cpp
@@ -5,12 +5,12 @@
 
 #include "core/servercontroller.h"
 
-AmneziaWireGuardConfigurator::AmneziaWireGuardConfigurator(std::shared_ptr<Settings> settings, QObject *parent)
+AwgConfigurator::AwgConfigurator(std::shared_ptr<Settings> settings, QObject *parent)
     : WireguardConfigurator(settings, true, parent)
 {
 }
 
-QString AmneziaWireGuardConfigurator::genAmneziaWireGuardConfig(const ServerCredentials &credentials,
+QString AwgConfigurator::genAwgConfig(const ServerCredentials &credentials,
                                                                 DockerContainer container,
                                                                 const QJsonObject &containerConfig, ErrorCode *errorCode)
 {
@@ -19,7 +19,7 @@ QString AmneziaWireGuardConfigurator::genAmneziaWireGuardConfig(const ServerCred
     QJsonObject jsonConfig = QJsonDocument::fromJson(config.toUtf8()).object();
 
     ServerController serverController(m_settings);
-    QString serverConfig = serverController.getTextFileFromContainer(container, credentials, protocols::amneziawireguard::serverConfigPath, errorCode);
+    QString serverConfig = serverController.getTextFileFromContainer(container, credentials, protocols::awg::serverConfigPath, errorCode);
 
     QMap<QString, QString> serverConfigMap;
     auto serverConfigLines = serverConfig.split("\n");
diff --git a/client/configurators/awg_configurator.h b/client/configurators/awg_configurator.h
index 02961cf1..cf0f2cae 100644
--- a/client/configurators/awg_configurator.h
+++ b/client/configurators/awg_configurator.h
@@ -1,18 +1,18 @@
-#ifndef AMNEZIAWIREGUARDCONFIGURATOR_H
-#define AMNEZIAWIREGUARDCONFIGURATOR_H
+#ifndef AWGCONFIGURATOR_H
+#define AWGCONFIGURATOR_H
 
 #include <QObject>
 
 #include "wireguard_configurator.h"
 
-class AmneziaWireGuardConfigurator : public WireguardConfigurator
+class AwgConfigurator : public WireguardConfigurator
 {
     Q_OBJECT
 public:
-    AmneziaWireGuardConfigurator(std::shared_ptr<Settings> settings, QObject *parent = nullptr);
+    AwgConfigurator(std::shared_ptr<Settings> settings, QObject *parent = nullptr);
 
-    QString genAmneziaWireGuardConfig(const ServerCredentials &credentials, DockerContainer container,
+    QString genAwgConfig(const ServerCredentials &credentials, DockerContainer container,
                                       const QJsonObject &containerConfig, ErrorCode *errorCode = nullptr);
 };
 
-#endif // AMNEZIAWIREGUARDCONFIGURATOR_H
+#endif // AWGCONFIGURATOR_H
diff --git a/client/configurators/vpn_configurator.cpp b/client/configurators/vpn_configurator.cpp
index 8ab43499..6c5286c2 100644
--- a/client/configurators/vpn_configurator.cpp
+++ b/client/configurators/vpn_configurator.cpp
@@ -24,7 +24,7 @@ VpnConfigurator::VpnConfigurator(std::shared_ptr<Settings> settings, QObject *pa
     wireguardConfigurator = std::shared_ptr<WireguardConfigurator>(new WireguardConfigurator(settings, false, this));
     ikev2Configurator = std::shared_ptr<Ikev2Configurator>(new Ikev2Configurator(settings, this));
     sshConfigurator = std::shared_ptr<SshConfigurator>(new SshConfigurator(settings, this));
-    amneziaWireGuardConfigurator = std::shared_ptr<AmneziaWireGuardConfigurator>(new AmneziaWireGuardConfigurator(settings, this));
+    awgConfigurator = std::shared_ptr<AwgConfigurator>(new AwgConfigurator(settings, this));
 }
 
 QString VpnConfigurator::genVpnProtocolConfig(const ServerCredentials &credentials, DockerContainer container,
@@ -42,8 +42,8 @@ QString VpnConfigurator::genVpnProtocolConfig(const ServerCredentials &credentia
     case Proto::WireGuard:
         return wireguardConfigurator->genWireguardConfig(credentials, container, containerConfig, errorCode);
 
-    case Proto::AmneziaWireGuard:
-        return amneziaWireGuardConfigurator->genAmneziaWireGuardConfig(credentials, container, containerConfig, errorCode);
+    case Proto::Awg:
+        return awgConfigurator->genAwgConfig(credentials, container, containerConfig, errorCode);
 
     case Proto::Ikev2: return ikev2Configurator->genIkev2Config(credentials, container, containerConfig, errorCode);
 
diff --git a/client/configurators/vpn_configurator.h b/client/configurators/vpn_configurator.h
index d304e4c3..ac89b0e4 100644
--- a/client/configurators/vpn_configurator.h
+++ b/client/configurators/vpn_configurator.h
@@ -13,7 +13,7 @@ class CloakConfigurator;
 class WireguardConfigurator;
 class Ikev2Configurator;
 class SshConfigurator;
-class AmneziaWireGuardConfigurator;
+class AwgConfigurator;
 
 // Retrieve connection settings from server
 class VpnConfigurator : ConfiguratorBase
@@ -41,7 +41,7 @@ public:
     std::shared_ptr<WireguardConfigurator> wireguardConfigurator;
     std::shared_ptr<Ikev2Configurator> ikev2Configurator;
     std::shared_ptr<SshConfigurator> sshConfigurator;
-    std::shared_ptr<AmneziaWireGuardConfigurator> amneziaWireGuardConfigurator;
+    std::shared_ptr<AwgConfigurator> awgConfigurator;
 };
 
 #endif // VPN_CONFIGURATOR_H
diff --git a/client/configurators/wireguard_configurator.cpp b/client/configurators/wireguard_configurator.cpp
index 5ea042c1..a526e109 100644
--- a/client/configurators/wireguard_configurator.cpp
+++ b/client/configurators/wireguard_configurator.cpp
@@ -19,20 +19,20 @@
 #include "settings.h"
 #include "utilities.h"
 
-WireguardConfigurator::WireguardConfigurator(std::shared_ptr<Settings> settings, bool isAmneziaWireGuard, QObject *parent)
-    : ConfiguratorBase(settings, parent), m_isAmneziaWireGuard(isAmneziaWireGuard)
+WireguardConfigurator::WireguardConfigurator(std::shared_ptr<Settings> settings, bool isAwg, QObject *parent)
+    : ConfiguratorBase(settings, parent), m_isAwg(isAwg)
 {
-    m_serverConfigPath = m_isAmneziaWireGuard ? amnezia::protocols::amneziawireguard::serverConfigPath
+    m_serverConfigPath = m_isAwg ? amnezia::protocols::awg::serverConfigPath
                                               : amnezia::protocols::wireguard::serverConfigPath;
-    m_serverPublicKeyPath = m_isAmneziaWireGuard ? amnezia::protocols::amneziawireguard::serverPublicKeyPath
+    m_serverPublicKeyPath = m_isAwg ? amnezia::protocols::awg::serverPublicKeyPath
                                                  : amnezia::protocols::wireguard::serverPublicKeyPath;
-    m_serverPskKeyPath = m_isAmneziaWireGuard ? amnezia::protocols::amneziawireguard::serverPskKeyPath
+    m_serverPskKeyPath = m_isAwg ? amnezia::protocols::awg::serverPskKeyPath
                                               : amnezia::protocols::wireguard::serverPskKeyPath;
-    m_configTemplate = m_isAmneziaWireGuard ? ProtocolScriptType::amnezia_wireguard_template
+    m_configTemplate = m_isAwg ? ProtocolScriptType::amnezia_wireguard_template
                                             : ProtocolScriptType::wireguard_template;
 
-    m_protocolName = m_isAmneziaWireGuard ? config_key::amneziaWireguard : config_key::wireguard;
-    m_defaultPort = m_isAmneziaWireGuard ? protocols::wireguard::defaultPort : protocols::amneziawireguard::defaultPort;
+    m_protocolName = m_isAwg ? config_key::awg : config_key::wireguard;
+    m_defaultPort = m_isAwg ? protocols::wireguard::defaultPort : protocols::awg::defaultPort;
 }
 
 WireguardConfigurator::ConnectionData WireguardConfigurator::genClientKeys()
diff --git a/client/configurators/wireguard_configurator.h b/client/configurators/wireguard_configurator.h
index 10eecbb4..7f8e1587 100644
--- a/client/configurators/wireguard_configurator.h
+++ b/client/configurators/wireguard_configurator.h
@@ -12,7 +12,7 @@ class WireguardConfigurator : public ConfiguratorBase
 {
     Q_OBJECT
 public:
-    WireguardConfigurator(std::shared_ptr<Settings> settings, bool isAmneziaWireGuard, QObject *parent = nullptr);
+    WireguardConfigurator(std::shared_ptr<Settings> settings, bool isAwg, QObject *parent = nullptr);
 
     struct ConnectionData
     {
@@ -36,8 +36,8 @@ private:
                                           const QJsonObject &containerConfig, ErrorCode *errorCode = nullptr);
 
     ConnectionData genClientKeys();
-
-    bool m_isAmneziaWireGuard;
+    
+    bool m_isAwg;
     QString m_serverConfigPath;
     QString m_serverPublicKeyPath;
     QString m_serverPskKeyPath;
diff --git a/client/containers/containers_defs.cpp b/client/containers/containers_defs.cpp
index 0b9e44a2..5f8d2e51 100644
--- a/client/containers/containers_defs.cpp
+++ b/client/containers/containers_defs.cpp
@@ -84,7 +84,7 @@ QMap<DockerContainer, QString> ContainerProps::containerHumanNames()
              { DockerContainer::ShadowSocks, "ShadowSocks" },
              { DockerContainer::Cloak, "OpenVPN over Cloak" },
              { DockerContainer::WireGuard, "WireGuard" },
-             { DockerContainer::AmneziaWireGuard, "Amnezia WireGuard" },
+            { DockerContainer::Awg, "Amnezia WireGuard" },
              { DockerContainer::Ipsec, QObject::tr("IPsec") },
 
              { DockerContainer::TorWebSite, QObject::tr("Website in Tor network") },
@@ -108,7 +108,7 @@ QMap<DockerContainer, QString> ContainerProps::containerDescriptions()
              { DockerContainer::WireGuard,
                QObject::tr("WireGuard - New popular VPN protocol with high performance, high speed and low power "
                            "consumption. Recommended for regions with low levels of censorship.") },
-             { DockerContainer::AmneziaWireGuard,
+            { DockerContainer::Awg,
                QObject::tr("WireGuard - New popular VPN protocol with high performance, high speed and low power "
                            "consumption. Recommended for regions with low levels of censorship.") },
              { DockerContainer::Ipsec,
@@ -148,7 +148,7 @@ amnezia::ServiceType ContainerProps::containerService(DockerContainer c)
     case DockerContainer::Cloak: return ServiceType::Vpn;
     case DockerContainer::ShadowSocks: return ServiceType::Vpn;
     case DockerContainer::WireGuard: return ServiceType::Vpn;
-    case DockerContainer::AmneziaWireGuard: return ServiceType::Vpn;
+    case DockerContainer::Awg: return ServiceType::Vpn;
     case DockerContainer::Ipsec: return ServiceType::Vpn;
     case DockerContainer::TorWebSite: return ServiceType::Other;
     case DockerContainer::Dns: return ServiceType::Other;
@@ -166,7 +166,7 @@ Proto ContainerProps::defaultProtocol(DockerContainer c)
     case DockerContainer::Cloak: return Proto::Cloak;
     case DockerContainer::ShadowSocks: return Proto::ShadowSocks;
     case DockerContainer::WireGuard: return Proto::WireGuard;
-    case DockerContainer::AmneziaWireGuard: return Proto::AmneziaWireGuard;
+    case DockerContainer::Awg: return Proto::Awg;
     case DockerContainer::Ipsec: return Proto::Ikev2;
 
     case DockerContainer::TorWebSite: return Proto::TorWebSite;
@@ -186,7 +186,7 @@ bool ContainerProps::isSupportedByCurrentPlatform(DockerContainer c)
     switch (c) {
     case DockerContainer::WireGuard: return true;
     case DockerContainer::OpenVpn: return true;
-    case DockerContainer::AmneziaWireGuard: return true;
+    case DockerContainer::Awg: return true;
     case DockerContainer::Cloak:
         return true;
         //    case DockerContainer::ShadowSocks: return true;
diff --git a/client/containers/containers_defs.h b/client/containers/containers_defs.h
index 774611c8..ce8a2683 100644
--- a/client/containers/containers_defs.h
+++ b/client/containers/containers_defs.h
@@ -20,7 +20,7 @@ namespace amnezia
             ShadowSocks,
             Cloak,
             WireGuard,
-            AmneziaWireGuard,
+            Awg,
             Ipsec,
 
             // non-vpn
diff --git a/client/core/scripts_registry.cpp b/client/core/scripts_registry.cpp
index 24deb41a..82ae1fce 100644
--- a/client/core/scripts_registry.cpp
+++ b/client/core/scripts_registry.cpp
@@ -11,7 +11,7 @@ QString amnezia::scriptFolder(amnezia::DockerContainer container)
     case DockerContainer::Cloak: return QLatin1String("openvpn_cloak");
     case DockerContainer::ShadowSocks: return QLatin1String("openvpn_shadowsocks");
     case DockerContainer::WireGuard: return QLatin1String("wireguard");
-    case DockerContainer::AmneziaWireGuard: return QLatin1String("amnezia_wireguard");
+    case DockerContainer::Awg: return QLatin1String("amnezia_wireguard");
     case DockerContainer::Ipsec: return QLatin1String("ipsec");
 
     case DockerContainer::TorWebSite: return QLatin1String("website_tor");
diff --git a/client/core/servercontroller.cpp b/client/core/servercontroller.cpp
index b5467dac..60691759 100644
--- a/client/core/servercontroller.cpp
+++ b/client/core/servercontroller.cpp
@@ -337,8 +337,8 @@ bool ServerController::isReinstallContainerRequired(DockerContainer container, c
             != newProtoConfig.value(config_key::port).toString(protocols::shadowsocks::defaultPort))
             return true;
     }
-
-    if (container == DockerContainer::AmneziaWireGuard) {
+    
+    if (container == DockerContainer::Awg) {
         return true;
     }
 
@@ -491,7 +491,7 @@ ServerController::Vars ServerController::genVarsForScript(const ServerCredential
     const QJsonObject &ssConfig = config.value(ProtocolProps::protoToString(Proto::ShadowSocks)).toObject();
     const QJsonObject &wireguarConfig = config.value(ProtocolProps::protoToString(Proto::WireGuard)).toObject();
     const QJsonObject &amneziaWireguarConfig =
-            config.value(ProtocolProps::protoToString(Proto::AmneziaWireGuard)).toObject();
+        config.value(ProtocolProps::protoToString(Proto::Awg)).toObject();
     const QJsonObject &sftpConfig = config.value(ProtocolProps::protoToString(Proto::Sftp)).toObject();
 
     Vars vars;
@@ -589,35 +589,35 @@ ServerController::Vars ServerController::genVarsForScript(const ServerCredential
     vars.append({ { "$SFTP_PASSWORD", sftpConfig.value(config_key::password).toString() } });
 
     // Amnezia wireguard vars
-    vars.append({ { "$AMNEZIAWIREGUARD_SERVER_PORT",
-                    amneziaWireguarConfig.value(config_key::port).toString(protocols::amneziawireguard::defaultPort) } });
+    vars.append({ { "$AWG_SERVER_PORT",
+                    amneziaWireguarConfig.value(config_key::port).toString(protocols::awg::defaultPort) } });
     vars.append({ { "$JUNK_PACKET_COUNT",
                     amneziaWireguarConfig.value(config_key::junkPacketCount)
-                            .toString(protocols::amneziawireguard::defaultJunkPacketCount) } });
+                            .toString(protocols::awg::defaultJunkPacketCount) } });
     vars.append({ { "$JUNK_PACKET_MIN_SIZE",
                     amneziaWireguarConfig.value(config_key::junkPacketMinSize)
-                            .toString(protocols::amneziawireguard::defaultJunkPacketMinSize) } });
+                            .toString(protocols::awg::defaultJunkPacketMinSize) } });
     vars.append({ { "$JUNK_PACKET_MAX_SIZE",
                     amneziaWireguarConfig.value(config_key::junkPacketMaxSize)
-                            .toString(protocols::amneziawireguard::defaultJunkPacketMaxSize) } });
+                            .toString(protocols::awg::defaultJunkPacketMaxSize) } });
     vars.append({ { "$INIT_PACKET_JUNK_SIZE",
                     amneziaWireguarConfig.value(config_key::initPacketJunkSize)
-                            .toString(protocols::amneziawireguard::defaultInitPacketJunkSize) } });
+                            .toString(protocols::awg::defaultInitPacketJunkSize) } });
     vars.append({ { "$RESPONSE_PACKET_JUNK_SIZE",
                     amneziaWireguarConfig.value(config_key::responsePacketJunkSize)
-                            .toString(protocols::amneziawireguard::defaultResponsePacketJunkSize) } });
+                            .toString(protocols::awg::defaultResponsePacketJunkSize) } });
     vars.append({ { "$INIT_PACKET_MAGIC_HEADER",
                     amneziaWireguarConfig.value(config_key::initPacketMagicHeader)
-                            .toString(protocols::amneziawireguard::defaultInitPacketMagicHeader) } });
+                            .toString(protocols::awg::defaultInitPacketMagicHeader) } });
     vars.append({ { "$RESPONSE_PACKET_MAGIC_HEADER",
                     amneziaWireguarConfig.value(config_key::responsePacketMagicHeader)
-                            .toString(protocols::amneziawireguard::defaultResponsePacketMagicHeader) } });
+                            .toString(protocols::awg::defaultResponsePacketMagicHeader) } });
     vars.append({ { "$UNDERLOAD_PACKET_MAGIC_HEADER",
                     amneziaWireguarConfig.value(config_key::underloadPacketMagicHeader)
-                            .toString(protocols::amneziawireguard::defaultUnderloadPacketMagicHeader) } });
+                            .toString(protocols::awg::defaultUnderloadPacketMagicHeader) } });
     vars.append({ { "$TRANSPORT_PACKET_MAGIC_HEADER",
                     amneziaWireguarConfig.value(config_key::transportPacketMagicHeader)
-                            .toString(protocols::amneziawireguard::defaultTransportPacketMagicHeader) } });
+                            .toString(protocols::awg::defaultTransportPacketMagicHeader) } });
 
     QString serverIp = Utils::getIPAddress(credentials.hostName);
     if (!serverIp.isEmpty()) {
diff --git a/client/mozilla/localsocketcontroller.cpp b/client/mozilla/localsocketcontroller.cpp
index d454c16e..2f6fe371 100644
--- a/client/mozilla/localsocketcontroller.cpp
+++ b/client/mozilla/localsocketcontroller.cpp
@@ -162,8 +162,8 @@ void LocalSocketController::activate(const QJsonObject &rawConfig) {
   //    splitTunnelApps.append(QJsonValue(uri));
   //  }
   //  json.insert("vpnDisabledApps", splitTunnelApps);
-
-  if (protocolName == amnezia::config_key::amneziaWireguard) {
+  
+  if (protocolName == amnezia::config_key::awg) {
     json.insert(amnezia::config_key::junkPacketCount, wgConfig.value(amnezia::config_key::junkPacketCount));
     json.insert(amnezia::config_key::junkPacketMinSize, wgConfig.value(amnezia::config_key::junkPacketMinSize));
     json.insert(amnezia::config_key::junkPacketMaxSize, wgConfig.value(amnezia::config_key::junkPacketMaxSize));
diff --git a/client/protocols/amneziawireguardprotocol.cpp b/client/protocols/amneziawireguardprotocol.cpp
index cab03da9..e0e51296 100644
--- a/client/protocols/amneziawireguardprotocol.cpp
+++ b/client/protocols/amneziawireguardprotocol.cpp
@@ -1,10 +1,10 @@
 #include "amneziawireguardprotocol.h"
 
-AmneziaWireGuardProtocol::AmneziaWireGuardProtocol(const QJsonObject &configuration, QObject *parent)
+Awg::Awg(const QJsonObject &configuration, QObject *parent)
     : WireguardProtocol(configuration, parent)
 {
 }
 
-AmneziaWireGuardProtocol::~AmneziaWireGuardProtocol()
+Awg::~Awg()
 {
 }
diff --git a/client/protocols/amneziawireguardprotocol.h b/client/protocols/amneziawireguardprotocol.h
index 329a585e..d7fc9c92 100644
--- a/client/protocols/amneziawireguardprotocol.h
+++ b/client/protocols/amneziawireguardprotocol.h
@@ -1,17 +1,17 @@
-#ifndef AMNEZIAWIREGUARDPROTOCOL_H
-#define AMNEZIAWIREGUARDPROTOCOL_H
+#ifndef AWGPROTOCOL_H
+#define AWGPROTOCOL_H
 
 #include <QObject>
 
 #include "wireguardprotocol.h"
 
-class AmneziaWireGuardProtocol : public WireguardProtocol
+class Awg : public WireguardProtocol
 {
     Q_OBJECT
 
 public:
-    explicit AmneziaWireGuardProtocol(const QJsonObject &configuration, QObject *parent = nullptr);
-    virtual ~AmneziaWireGuardProtocol() override;
+    explicit Awg(const QJsonObject &configuration, QObject *parent = nullptr);
+    virtual ~Awg() override;
 };
 
-#endif // AMNEZIAWIREGUARDPROTOCOL_H
+#endif // AWGPROTOCOL_H
diff --git a/client/protocols/protocols_defs.cpp b/client/protocols/protocols_defs.cpp
index 64cdd003..3982ef9c 100644
--- a/client/protocols/protocols_defs.cpp
+++ b/client/protocols/protocols_defs.cpp
@@ -89,7 +89,7 @@ amnezia::ServiceType ProtocolProps::protocolService(Proto p)
     case Proto::Cloak: return ServiceType::Vpn;
     case Proto::ShadowSocks: return ServiceType::Vpn;
     case Proto::WireGuard: return ServiceType::Vpn;
-    case Proto::AmneziaWireGuard: return ServiceType::Vpn;
+    case Proto::Awg: return ServiceType::Vpn;
     case Proto::TorWebSite: return ServiceType::Other;
     case Proto::Dns: return ServiceType::Other;
     case Proto::FileShare: return ServiceType::Other;
@@ -105,7 +105,7 @@ int ProtocolProps::defaultPort(Proto p)
     case Proto::Cloak: return 443;
     case Proto::ShadowSocks: return 6789;
     case Proto::WireGuard: return 51820;
-    case Proto::AmneziaWireGuard: return 55424;
+    case Proto::Awg: return 55424;
     case Proto::Ikev2: return -1;
     case Proto::L2tp: return -1;
 
@@ -125,7 +125,7 @@ bool ProtocolProps::defaultPortChangeable(Proto p)
     case Proto::Cloak: return true;
     case Proto::ShadowSocks: return true;
     case Proto::WireGuard: return true;
-    case Proto::AmneziaWireGuard: return true;
+    case Proto::Awg: return true;
     case Proto::Ikev2: return false;
     case Proto::L2tp: return false;
 
@@ -144,7 +144,7 @@ TransportProto ProtocolProps::defaultTransportProto(Proto p)
     case Proto::Cloak: return TransportProto::Tcp;
     case Proto::ShadowSocks: return TransportProto::Tcp;
     case Proto::WireGuard: return TransportProto::Udp;
-    case Proto::AmneziaWireGuard: return TransportProto::Udp;
+    case Proto::Awg: return TransportProto::Udp;
     case Proto::Ikev2: return TransportProto::Udp;
     case Proto::L2tp: return TransportProto::Udp;
     // non-vpn
@@ -163,7 +163,7 @@ bool ProtocolProps::defaultTransportProtoChangeable(Proto p)
     case Proto::Cloak: return false;
     case Proto::ShadowSocks: return false;
     case Proto::WireGuard: return false;
-    case Proto::AmneziaWireGuard: return false;
+    case Proto::Awg: return false;
     case Proto::Ikev2: return false;
     case Proto::L2tp: return false;
     // non-vpn
diff --git a/client/protocols/protocols_defs.h b/client/protocols/protocols_defs.h
index e26e60a4..d6af132b 100644
--- a/client/protocols/protocols_defs.h
+++ b/client/protocols/protocols_defs.h
@@ -76,7 +76,7 @@ namespace amnezia
         constexpr char shadowsocks[] = "shadowsocks";
         constexpr char cloak[] = "cloak";
         constexpr char sftp[] = "sftp";
-        constexpr char amneziaWireguard[] = "amneziawireguard";
+        constexpr char awg[] = "awg";
 
     }
 
@@ -151,13 +151,13 @@ namespace amnezia
 
         } // namespace sftp
 
-        namespace amneziawireguard
+        namespace awg
         {
             constexpr char defaultPort[] = "55424";
 
-            constexpr char serverConfigPath[] = "/opt/amnezia/amneziawireguard/wg0.conf";
-            constexpr char serverPublicKeyPath[] = "/opt/amnezia/amneziawireguard/wireguard_server_public_key.key";
-            constexpr char serverPskKeyPath[] = "/opt/amnezia/amneziawireguard/wireguard_psk.key";
+            constexpr char serverConfigPath[] = "/opt/amnezia/awg/wg0.conf";
+            constexpr char serverPublicKeyPath[] = "/opt/amnezia/awg/wireguard_server_public_key.key";
+            constexpr char serverPskKeyPath[] = "/opt/amnezia/awg/wireguard_psk.key";
 
             constexpr char defaultJunkPacketCount[] = "3";
             constexpr char defaultJunkPacketMinSize[] = "10";
@@ -188,7 +188,7 @@ namespace amnezia
             ShadowSocks,
             Cloak,
             WireGuard,
-            AmneziaWireGuard,
+            Awg,
             Ikev2,
             L2tp,
 
diff --git a/client/protocols/vpnprotocol.cpp b/client/protocols/vpnprotocol.cpp
index 527ede47..2ddc0684 100644
--- a/client/protocols/vpnprotocol.cpp
+++ b/client/protocols/vpnprotocol.cpp
@@ -113,7 +113,7 @@ VpnProtocol *VpnProtocol::factory(DockerContainer container, const QJsonObject &
     case DockerContainer::Cloak: return new OpenVpnOverCloakProtocol(configuration);
     case DockerContainer::ShadowSocks: return new ShadowSocksVpnProtocol(configuration);
     case DockerContainer::WireGuard: return new WireguardProtocol(configuration);
-    case DockerContainer::AmneziaWireGuard: return new WireguardProtocol(configuration);
+    case DockerContainer::Awg: return new WireguardProtocol(configuration);
 #endif
     default: return nullptr;
     }
diff --git a/client/resources.qrc b/client/resources.qrc
index b79ed3d2..1688d79e 100644
--- a/client/resources.qrc
+++ b/client/resources.qrc
@@ -215,7 +215,7 @@
         <file>ui/qml/Controls2/ListViewWithLabelsType.qml</file>
         <file>ui/qml/Pages2/PageServiceDnsSettings.qml</file>
         <file>ui/qml/Controls2/TopCloseButtonType.qml</file>
-        <file>ui/qml/Pages2/PageProtocolAmneziaWireGuardSettings.qml</file>
+        <file>ui/qml/Pages2/PageProtocolAwgSettings.qml</file>
         <file>server_scripts/amnezia_wireguard/template.conf</file>
         <file>server_scripts/amnezia_wireguard/start.sh</file>
         <file>server_scripts/amnezia_wireguard/configure_container.sh</file>
diff --git a/client/server_scripts/amnezia_wireguard/configure_container.sh b/client/server_scripts/amnezia_wireguard/configure_container.sh
index 6ebebc4a..322cc38f 100644
--- a/client/server_scripts/amnezia_wireguard/configure_container.sh
+++ b/client/server_scripts/amnezia_wireguard/configure_container.sh
@@ -1,19 +1,19 @@
-mkdir -p /opt/amnezia/amneziawireguard
-cd /opt/amnezia/amneziawireguard
+mkdir -p /opt/amnezia/awg
+cd /opt/amnezia/awg
 WIREGUARD_SERVER_PRIVATE_KEY=$(wg genkey)
-echo $WIREGUARD_SERVER_PRIVATE_KEY > /opt/amnezia/amneziawireguard/wireguard_server_private_key.key
+echo $WIREGUARD_SERVER_PRIVATE_KEY > /opt/amnezia/awg/wireguard_server_private_key.key
 
 WIREGUARD_SERVER_PUBLIC_KEY=$(echo $WIREGUARD_SERVER_PRIVATE_KEY | wg pubkey)
-echo $WIREGUARD_SERVER_PUBLIC_KEY > /opt/amnezia/amneziawireguard/wireguard_server_public_key.key
+echo $WIREGUARD_SERVER_PUBLIC_KEY > /opt/amnezia/awg/wireguard_server_public_key.key
 
 WIREGUARD_PSK=$(wg genpsk)
-echo $WIREGUARD_PSK > /opt/amnezia/amneziawireguard/wireguard_psk.key
+echo $WIREGUARD_PSK > /opt/amnezia/awg/wireguard_psk.key
 
-cat > /opt/amnezia/amneziawireguard/wg0.conf <<EOF
+cat > /opt/amnezia/awg/wg0.conf <<EOF
 [Interface]
 PrivateKey = $WIREGUARD_SERVER_PRIVATE_KEY
-Address = 10.8.1.1/24
-ListenPort = $AMNEZIAWIREGUARD_SERVER_PORT
+Address = $WIREGUARD_SUBNET_IP/$WIREGUARD_SUBNET_CIDR
+ListenPort = $AWG_SERVER_PORT
 Jc = $JUNK_PACKET_COUNT
 Jmin = $JUNK_PACKET_MIN_SIZE
 Jmax = $JUNK_PACKET_MAX_SIZE
diff --git a/client/server_scripts/amnezia_wireguard/run_container.sh b/client/server_scripts/amnezia_wireguard/run_container.sh
index 2dafb67f..af2a1e17 100644
--- a/client/server_scripts/amnezia_wireguard/run_container.sh
+++ b/client/server_scripts/amnezia_wireguard/run_container.sh
@@ -5,7 +5,7 @@ sudo docker run -d \
 --privileged \
 --cap-add=NET_ADMIN \
 --cap-add=SYS_MODULE \
--p $AMNEZIAWIREGUARD_SERVER_PORT:$AMNEZIAWIREGUARD_SERVER_PORT/udp \
+-p $AWG_SERVER_PORT:$AWG_SERVER_PORT/udp \
 -v /lib/modules:/lib/modules \
 --sysctl="net.ipv4.conf.all.src_valid_mark=1" \
 --name $CONTAINER_NAME \
diff --git a/client/server_scripts/amnezia_wireguard/start.sh b/client/server_scripts/amnezia_wireguard/start.sh
index bbc68f37..dc713ec2 100644
--- a/client/server_scripts/amnezia_wireguard/start.sh
+++ b/client/server_scripts/amnezia_wireguard/start.sh
@@ -5,14 +5,11 @@
 echo "Container startup"
 #ifconfig eth0:0 $SERVER_IP_ADDRESS netmask 255.255.255.255 up
 
-mkdir -p /dev/net
-mknod /dev/net/tun c 10 200
-
 # kill daemons in case of restart
-wg-quick down /opt/amnezia/amneziawireguard/wg0.conf
+wg-quick down /opt/amnezia/awg/wg0.conf
 
 # start daemons if configured
-if [ -f /opt/amnezia/amneziawireguard/wg0.conf ]; then (wg-quick up /opt/amnezia/amneziawireguard/wg0.conf); fi
+if [ -f /opt/amnezia/awg/wg0.conf ]; then (wg-quick up /opt/amnezia/awg/wg0.conf); fi
 
 # Allow traffic on the TUN interface.
 iptables -A INPUT -i wg0 -j ACCEPT
diff --git a/client/server_scripts/amnezia_wireguard/template.conf b/client/server_scripts/amnezia_wireguard/template.conf
index a872bb9a..79932806 100644
--- a/client/server_scripts/amnezia_wireguard/template.conf
+++ b/client/server_scripts/amnezia_wireguard/template.conf
@@ -16,5 +16,5 @@ H4 = $TRANSPORT_PACKET_MAGIC_HEADER
 PublicKey = $WIREGUARD_SERVER_PUBLIC_KEY
 PresharedKey = $WIREGUARD_PSK
 AllowedIPs = 0.0.0.0/0, ::/0
-Endpoint = $SERVER_IP_ADDRESS:$AMNEZIAWIREGUARD_SERVER_PORT
+Endpoint = $SERVER_IP_ADDRESS:$AWG_SERVER_PORT
 PersistentKeepalive = 25
diff --git a/client/ui/controllers/importController.cpp b/client/ui/controllers/importController.cpp
index f9cc2d03..5a060cf1 100644
--- a/client/ui/controllers/importController.cpp
+++ b/client/ui/controllers/importController.cpp
@@ -291,7 +291,7 @@ QJsonObject ImportController::extractWireGuardConfig(const QString &data)
         lastConfig[config_key::responsePacketMagicHeader] = configMap.value(config_key::responsePacketMagicHeader);
         lastConfig[config_key::underloadPacketMagicHeader] = configMap.value(config_key::underloadPacketMagicHeader);
         lastConfig[config_key::transportPacketMagicHeader] = configMap.value(config_key::transportPacketMagicHeader);
-        protocolName = "amneziawireguard";
+        protocolName = "awg";
     }
 
     QJsonObject wireguardConfig;
diff --git a/client/ui/controllers/pageController.h b/client/ui/controllers/pageController.h
index cf248900..f1de02f3 100644
--- a/client/ui/controllers/pageController.h
+++ b/client/ui/controllers/pageController.h
@@ -49,7 +49,7 @@ namespace PageLoader
         PageProtocolShadowSocksSettings,
         PageProtocolCloakSettings,
         PageProtocolWireGuardSettings,
-        PageProtocolAmneziaWireGuardSettings,
+        PageProtocolAwgSettings,
         PageProtocolIKev2Settings,
         PageProtocolRaw
     };
diff --git a/client/ui/models/protocols/awgConfigModel.cpp b/client/ui/models/protocols/awgConfigModel.cpp
index a1ce4385..7e12be0d 100644
--- a/client/ui/models/protocols/awgConfigModel.cpp
+++ b/client/ui/models/protocols/awgConfigModel.cpp
@@ -1,20 +1,20 @@
-#include "amneziaWireGuardConfigModel.h"
+#include "awgConfigModel.h"
 
 #include <QJsonDocument>
 
 #include "protocols/protocols_defs.h"
 
-AmneziaWireGuardConfigModel::AmneziaWireGuardConfigModel(QObject *parent) : QAbstractListModel(parent)
+AwgConfigModel::AwgConfigModel(QObject *parent) : QAbstractListModel(parent)
 {
 }
 
-int AmneziaWireGuardConfigModel::rowCount(const QModelIndex &parent) const
+int AwgConfigModel::rowCount(const QModelIndex &parent) const
 {
     Q_UNUSED(parent);
     return 1;
 }
 
-bool AmneziaWireGuardConfigModel::setData(const QModelIndex &index, const QVariant &value, int role)
+bool AwgConfigModel::setData(const QModelIndex &index, const QVariant &value, int role)
 {
     if (!index.isValid() || index.row() < 0 || index.row() >= ContainerProps::allContainers().size()) {
         return false;
@@ -49,7 +49,7 @@ bool AmneziaWireGuardConfigModel::setData(const QModelIndex &index, const QVaria
     return true;
 }
 
-QVariant AmneziaWireGuardConfigModel::data(const QModelIndex &index, int role) const
+QVariant AwgConfigModel::data(const QModelIndex &index, int role) const
 {
     if (!index.isValid() || index.row() < 0 || index.row() >= rowCount()) {
         return false;
@@ -71,7 +71,7 @@ QVariant AmneziaWireGuardConfigModel::data(const QModelIndex &index, int role) c
     return QVariant();
 }
 
-void AmneziaWireGuardConfigModel::updateModel(const QJsonObject &config)
+void AwgConfigModel::updateModel(const QJsonObject &config)
 {
     beginResetModel();
     m_container = ContainerProps::containerFromString(config.value(config_key::container).toString());
@@ -112,13 +112,13 @@ void AmneziaWireGuardConfigModel::updateModel(const QJsonObject &config)
     endResetModel();
 }
 
-QJsonObject AmneziaWireGuardConfigModel::getConfig()
+QJsonObject AwgConfigModel::getConfig()
 {
     m_fullConfig.insert(config_key::amneziaWireguard, m_protocolConfig);
     return m_fullConfig;
 }
 
-QHash<int, QByteArray> AmneziaWireGuardConfigModel::roleNames() const
+QHash<int, QByteArray> AwgConfigModel::roleNames() const
 {
     QHash<int, QByteArray> roles;
 
diff --git a/client/ui/models/protocols/awgConfigModel.h b/client/ui/models/protocols/awgConfigModel.h
index 9419d5c9..e67a3708 100644
--- a/client/ui/models/protocols/awgConfigModel.h
+++ b/client/ui/models/protocols/awgConfigModel.h
@@ -1,12 +1,12 @@
-#ifndef AMNEZIAWIREGUARDCONFIGMODEL_H
-#define AMNEZIAWIREGUARDCONFIGMODEL_H
+#ifndef AWGCONFIGMODEL_H
+#define AWGCONFIGMODEL_H
 
 #include <QAbstractListModel>
 #include <QJsonObject>
 
 #include "containers/containers_defs.h"
 
-class AmneziaWireGuardConfigModel : public QAbstractListModel
+class AwgConfigModel : public QAbstractListModel
 {
     Q_OBJECT
 
@@ -24,7 +24,7 @@ public:
         TransportPacketMagicHeaderRole
     };
 
-    explicit AmneziaWireGuardConfigModel(QObject *parent = nullptr);
+    explicit AwgConfigModel(QObject *parent = nullptr);
 
     int rowCount(const QModelIndex &parent = QModelIndex()) const override;
 
@@ -44,4 +44,4 @@ private:
     QJsonObject m_fullConfig;
 };
 
-#endif // AMNEZIAWIREGUARDCONFIGMODEL_H
+#endif // AWGCONFIGMODEL_H
diff --git a/client/ui/qml/Components/SettingsContainersListView.qml b/client/ui/qml/Components/SettingsContainersListView.qml
index df25b492..89eb727e 100644
--- a/client/ui/qml/Components/SettingsContainersListView.qml
+++ b/client/ui/qml/Components/SettingsContainersListView.qml
@@ -64,9 +64,9 @@ ListView {
     //                        goToPage(PageEnum.PageProtocolWireGuardSettings)
                             break
                         }
-                        case ContainerEnum.AmneziaWireGuard: {
-                            AmneziaWireGuardConfigModel.updateModel(config)
-                            PageController.goToPage(PageEnum.PageProtocolAmneziaWireGuardSettings)
+                        case ContainerEnum.Awg: {
+                            AwgConfigModel.updateModel(config)
+                            PageController.goToPage(PageEnum.PageProtocolAwgSettings)
                             break
                         }
                         case ContainerEnum.Ipsec: {
diff --git a/client/ui/qml/Pages2/PageProtocolAwgSettings.qml b/client/ui/qml/Pages2/PageProtocolAwgSettings.qml
index 35edb15c..69d34114 100644
--- a/client/ui/qml/Pages2/PageProtocolAwgSettings.qml
+++ b/client/ui/qml/Pages2/PageProtocolAwgSettings.qml
@@ -52,7 +52,7 @@ PageType {
                 clip: true
                 interactive: false
 
-                model: AmneziaWireGuardConfigModel
+                model: AwgConfigModel
 
                 delegate: Item {
                     implicitWidth: listview.width
@@ -313,7 +313,7 @@ PageType {
                             onClicked: {
                                 forceActiveFocus()
                                 PageController.showBusyIndicator(true)
-                                InstallController.updateContainer(AmneziaWireGuardConfigModel.getConfig())
+                                InstallController.updateContainer(AwgConfigModel.getConfig())
                                 PageController.showBusyIndicator(false)
                             }
                         }

From 671ca0a66fa1f7fef101f9cf3a835940847e770b Mon Sep 17 00:00:00 2001
From: "vladimir.kuznetsov" <nethiuswork@gmail.com>
Date: Fri, 6 Oct 2023 17:26:45 +0500
Subject: [PATCH 192/278] renamed amneziawireguard to awg

---
 client/CMakeLists.txt                         |  4 ++--
 ...awireguardprotocol.cpp => awgprotocol.cpp} |  2 +-
 ...neziawireguardprotocol.h => awgprotocol.h} |  0
 client/ui/models/protocols/awgConfigModel.cpp | 24 +++++++++----------
 client/ui/qml/Pages2/PageShare.qml            |  2 +-
 5 files changed, 16 insertions(+), 16 deletions(-)
 rename client/protocols/{amneziawireguardprotocol.cpp => awgprotocol.cpp} (77%)
 rename client/protocols/{amneziawireguardprotocol.h => awgprotocol.h} (100%)

diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt
index f0f71f52..3988f9b5 100644
--- a/client/CMakeLists.txt
+++ b/client/CMakeLists.txt
@@ -263,7 +263,7 @@ if(WIN32 OR (APPLE AND NOT IOS) OR (LINUX AND NOT ANDROID))
         ${CMAKE_CURRENT_LIST_DIR}/protocols/openvpnovercloakprotocol.h
         ${CMAKE_CURRENT_LIST_DIR}/protocols/shadowsocksvpnprotocol.h
         ${CMAKE_CURRENT_LIST_DIR}/protocols/wireguardprotocol.h
-        ${CMAKE_CURRENT_LIST_DIR}/protocols/amneziawireguardprotocol.h
+        ${CMAKE_CURRENT_LIST_DIR}/protocols/awgprotocol.h
     )
 
     set(SOURCES ${SOURCES}
@@ -274,7 +274,7 @@ if(WIN32 OR (APPLE AND NOT IOS) OR (LINUX AND NOT ANDROID))
         ${CMAKE_CURRENT_LIST_DIR}/protocols/openvpnovercloakprotocol.cpp
         ${CMAKE_CURRENT_LIST_DIR}/protocols/shadowsocksvpnprotocol.cpp
         ${CMAKE_CURRENT_LIST_DIR}/protocols/wireguardprotocol.cpp
-        ${CMAKE_CURRENT_LIST_DIR}/protocols/amneziawireguardprotocol.cpp
+        ${CMAKE_CURRENT_LIST_DIR}/protocols/awgprotocol.cpp
     )
 endif()
 
diff --git a/client/protocols/amneziawireguardprotocol.cpp b/client/protocols/awgprotocol.cpp
similarity index 77%
rename from client/protocols/amneziawireguardprotocol.cpp
rename to client/protocols/awgprotocol.cpp
index e0e51296..64415dbe 100644
--- a/client/protocols/amneziawireguardprotocol.cpp
+++ b/client/protocols/awgprotocol.cpp
@@ -1,4 +1,4 @@
-#include "amneziawireguardprotocol.h"
+#include "awgprotocol.h"
 
 Awg::Awg(const QJsonObject &configuration, QObject *parent)
     : WireguardProtocol(configuration, parent)
diff --git a/client/protocols/amneziawireguardprotocol.h b/client/protocols/awgprotocol.h
similarity index 100%
rename from client/protocols/amneziawireguardprotocol.h
rename to client/protocols/awgprotocol.h
diff --git a/client/ui/models/protocols/awgConfigModel.cpp b/client/ui/models/protocols/awgConfigModel.cpp
index 7e12be0d..7d0277b9 100644
--- a/client/ui/models/protocols/awgConfigModel.cpp
+++ b/client/ui/models/protocols/awgConfigModel.cpp
@@ -78,43 +78,43 @@ void AwgConfigModel::updateModel(const QJsonObject &config)
 
     m_fullConfig = config;
 
-    QJsonObject protocolConfig = config.value(config_key::amneziaWireguard).toObject();
+    QJsonObject protocolConfig = config.value(config_key::awg).toObject();
 
     m_protocolConfig[config_key::port] =
-            protocolConfig.value(config_key::port).toString(protocols::amneziawireguard::defaultPort);
+            protocolConfig.value(config_key::port).toString(protocols::awg::defaultPort);
     m_protocolConfig[config_key::junkPacketCount] =
-            protocolConfig.value(config_key::junkPacketCount).toString(protocols::amneziawireguard::defaultJunkPacketCount);
+            protocolConfig.value(config_key::junkPacketCount).toString(protocols::awg::defaultJunkPacketCount);
     m_protocolConfig[config_key::junkPacketMinSize] =
             protocolConfig.value(config_key::junkPacketMinSize)
-                    .toString(protocols::amneziawireguard::defaultJunkPacketMinSize);
+                    .toString(protocols::awg::defaultJunkPacketMinSize);
     m_protocolConfig[config_key::junkPacketMaxSize] =
             protocolConfig.value(config_key::junkPacketMaxSize)
-                    .toString(protocols::amneziawireguard::defaultJunkPacketMaxSize);
+                    .toString(protocols::awg::defaultJunkPacketMaxSize);
     m_protocolConfig[config_key::initPacketJunkSize] =
             protocolConfig.value(config_key::initPacketJunkSize)
-                    .toString(protocols::amneziawireguard::defaultInitPacketJunkSize);
+                    .toString(protocols::awg::defaultInitPacketJunkSize);
     m_protocolConfig[config_key::responsePacketJunkSize] =
             protocolConfig.value(config_key::responsePacketJunkSize)
-                    .toString(protocols::amneziawireguard::defaultResponsePacketJunkSize);
+                    .toString(protocols::awg::defaultResponsePacketJunkSize);
     m_protocolConfig[config_key::initPacketMagicHeader] =
             protocolConfig.value(config_key::initPacketMagicHeader)
-                    .toString(protocols::amneziawireguard::defaultInitPacketMagicHeader);
+                    .toString(protocols::awg::defaultInitPacketMagicHeader);
     m_protocolConfig[config_key::responsePacketMagicHeader] =
             protocolConfig.value(config_key::responsePacketMagicHeader)
-                    .toString(protocols::amneziawireguard::defaultResponsePacketMagicHeader);
+                    .toString(protocols::awg::defaultResponsePacketMagicHeader);
     m_protocolConfig[config_key::underloadPacketMagicHeader] =
             protocolConfig.value(config_key::underloadPacketMagicHeader)
-                    .toString(protocols::amneziawireguard::defaultUnderloadPacketMagicHeader);
+                    .toString(protocols::awg::defaultUnderloadPacketMagicHeader);
     m_protocolConfig[config_key::transportPacketMagicHeader] =
             protocolConfig.value(config_key::transportPacketMagicHeader)
-                    .toString(protocols::amneziawireguard::defaultTransportPacketMagicHeader);
+                    .toString(protocols::awg::defaultTransportPacketMagicHeader);
 
     endResetModel();
 }
 
 QJsonObject AwgConfigModel::getConfig()
 {
-    m_fullConfig.insert(config_key::amneziaWireguard, m_protocolConfig);
+    m_fullConfig.insert(config_key::awg, m_protocolConfig);
     return m_fullConfig;
 }
 
diff --git a/client/ui/qml/Pages2/PageShare.qml b/client/ui/qml/Pages2/PageShare.qml
index a03b3717..16759da1 100644
--- a/client/ui/qml/Pages2/PageShare.qml
+++ b/client/ui/qml/Pages2/PageShare.qml
@@ -317,7 +317,7 @@ PageType {
 
                         if (index === ContainerProps.containerFromString("amnezia-openvpn")) {
                             root.connectionTypesModel.push(openVpnConnectionFormat)
-                        } else if (index === ContainerProps.containerFromString("amnezia-wireguard")) {
+                        } else if (index === ContainerProps.containerFromString("amnezia-awg")) {
                             root.connectionTypesModel.push(wireGuardConnectionFormat)
                         }
                     }

From 445fc6efb1ccd1717530a2bb80b1c41d55839159 Mon Sep 17 00:00:00 2001
From: "vladimir.kuznetsov" <nethiuswork@gmail.com>
Date: Fri, 6 Oct 2023 22:05:48 +0500
Subject: [PATCH 193/278] renamed amneziawireguard to awg in ios  controller

---
 client/platforms/ios/ios_controller.h  | 2 +-
 client/platforms/ios/ios_controller.mm | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/client/platforms/ios/ios_controller.h b/client/platforms/ios/ios_controller.h
index 6d10dc08..68f30ce8 100644
--- a/client/platforms/ios/ios_controller.h
+++ b/client/platforms/ios/ios_controller.h
@@ -62,7 +62,7 @@ private:
     bool setupOpenVPN();
     bool setupCloak();
     bool setupWireGuard();
-    bool setupAmneziaWireGuard();
+    bool setupAwg();
 
     bool startOpenVPN(const QString &config);
     bool startWireGuard(const QString &jsonConfig);
diff --git a/client/platforms/ios/ios_controller.mm b/client/platforms/ios/ios_controller.mm
index 6782c8da..5665ff1d 100644
--- a/client/platforms/ios/ios_controller.mm
+++ b/client/platforms/ios/ios_controller.mm
@@ -204,8 +204,8 @@ bool IosController::connectVpn(amnezia::Proto proto, const QJsonObject& configur
     if (proto == amnezia::Proto::WireGuard) {
         return setupWireGuard();
     }
-    if (proto == amnezia::Proto::AmneziaWireGuard) {
-        return setupAmneziaWireGuard();
+    if (proto == amnezia::Proto::Awg) {
+        return setupAwg();
     }
 
     return false;
@@ -310,9 +310,9 @@ bool IosController::setupWireGuard()
     return startWireGuard(wgConfig);
 }
 
-bool IosController::setupAmneziaWireGuard()
+bool IosController::setupAwg()
 {
-    QJsonObject config = m_rawConfig[ProtocolProps::key_proto_config_data(amnezia::Proto::AmneziaWireGuard)].toObject();
+    QJsonObject config = m_rawConfig[ProtocolProps::key_proto_config_data(amnezia::Proto::Awg)].toObject();
 
     QString wgConfig = config[config_key::config].toString();
     

From 7f2ef65fe6acc1215633d0900cbe2e7a95bf3b92 Mon Sep 17 00:00:00 2001
From: Mykola Baibuz <mykola.baibuz@gmail.com>
Date: Fri, 6 Oct 2023 17:20:41 -0400
Subject: [PATCH 194/278] Update WG to AWG for Android

---
 client/3rd-prebuilt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/3rd-prebuilt b/client/3rd-prebuilt
index 994f4f2b..fbb5f586 160000
--- a/client/3rd-prebuilt
+++ b/client/3rd-prebuilt
@@ -1 +1 @@
-Subproject commit 994f4f2b030600f2d8dbf9dccf409b1591c9e463
+Subproject commit fbb5f586b94efc3f65edeaf9559c8a5c4e752d66

From bdfa8bfe5b78d4ff55dad27853c2a67cf44350af Mon Sep 17 00:00:00 2001
From: Mykola Baibuz <mykola.baibuz@gmail.com>
Date: Sat, 7 Oct 2023 09:01:29 -0400
Subject: [PATCH 195/278] AWG Android support

---
 .../wireguard/config/BadConfigException.java  |   9 +
 .../src/com/wireguard/config/Interface.java   | 278 +++++++++++++++++-
 .../android/src/org/amnezia/vpn/VPNService.kt |  31 +-
 client/containers/containers_defs.cpp         |   1 +
 4 files changed, 309 insertions(+), 10 deletions(-)

diff --git a/client/android/src/com/wireguard/config/BadConfigException.java b/client/android/src/com/wireguard/config/BadConfigException.java
index 33910501..af909b0d 100644
--- a/client/android/src/com/wireguard/config/BadConfigException.java
+++ b/client/android/src/com/wireguard/config/BadConfigException.java
@@ -70,6 +70,15 @@ public class BadConfigException extends Exception {
     EXCLUDED_APPLICATIONS("ExcludedApplications"),
     INCLUDED_APPLICATIONS("IncludedApplications"),
     LISTEN_PORT("ListenPort"),
+    JC("Jc"),
+    JMIN("Jmin"),
+    JMAX("Jmax"),
+    S1("S1"),
+    S2("S2"),
+    H1("H1"),
+    H2("H2"),
+    H3("H3"),
+    H4("H4"),
     MTU("MTU"),
     PERSISTENT_KEEPALIVE("PersistentKeepalive"),
     PRE_SHARED_KEY("PresharedKey"),
diff --git a/client/android/src/com/wireguard/config/Interface.java b/client/android/src/com/wireguard/config/Interface.java
index 2594d701..df6b7fb1 100644
--- a/client/android/src/com/wireguard/config/Interface.java
+++ b/client/android/src/com/wireguard/config/Interface.java
@@ -44,6 +44,15 @@ public final class Interface {
   private final KeyPair keyPair;
   private final Optional<Integer> listenPort;
   private final Optional<Integer> mtu;
+  private final Optional<Integer> jc;
+  private final Optional<Integer> jmin;
+  private final Optional<Integer> jmax;
+  private final Optional<Integer> s1;
+  private final Optional<Integer> s2;
+  private final Optional<Long> h1;
+  private final Optional<Long> h2;
+  private final Optional<Long> h3;
+  private final Optional<Long> h4;
 
   private Interface(final Builder builder) {
     // Defensively copy to ensure immutability even if the Builder is reused.
@@ -56,6 +65,15 @@ public final class Interface {
     keyPair = Objects.requireNonNull(builder.keyPair, "Interfaces must have a private key");
     listenPort = builder.listenPort;
     mtu = builder.mtu;
+    jc = builder.jc;
+    jmax = builder.jmax;
+    jmin = builder.jmin;
+    s1 = builder.s1;
+    s2 = builder.s2;
+    h1 = builder.h1;
+    h2 = builder.h2;
+    h3 = builder.h3;
+    h4 = builder.h4;
   }
 
   /**
@@ -95,6 +113,33 @@ public final class Interface {
         case "privatekey":
           builder.parsePrivateKey(attribute.getValue());
           break;
+        case "jc":
+          builder.parseJc(attribute.getValue());
+          break;
+        case "jmin":
+          builder.parseJmin(attribute.getValue());
+          break;
+        case "jmax":
+          builder.parseJmax(attribute.getValue());
+          break;
+        case "s1":
+          builder.parseS1(attribute.getValue());
+          break;                   
+        case "s2":
+          builder.parseS2(attribute.getValue());
+          break;
+        case "h1":
+          builder.parseH1(attribute.getValue());
+          break;          
+        case "h2":
+          builder.parseH2(attribute.getValue());
+          break;
+        case "h3":
+          builder.parseH3(attribute.getValue());
+          break; 
+        case "h4":
+          builder.parseH4(attribute.getValue());
+          break;                          
         default:
           throw new BadConfigException(
               Section.INTERFACE, Location.TOP_LEVEL, Reason.UNKNOWN_ATTRIBUTE, attribute.getKey());
@@ -111,7 +156,9 @@ public final class Interface {
     return addresses.equals(other.addresses) && dnsServers.equals(other.dnsServers)
         && excludedApplications.equals(other.excludedApplications)
         && includedApplications.equals(other.includedApplications) && keyPair.equals(other.keyPair)
-        && listenPort.equals(other.listenPort) && mtu.equals(other.mtu);
+        && listenPort.equals(other.listenPort) && mtu.equals(other.mtu) && jc.equals(other.jc) && jmin.equals(other.jmin)
+        && jmax.equals(other.jmax) && s1.equals(other.s1) && s2.equals(other.s2) && h1.equals(other.h1) && h2.equals(other.h2)
+        && h3.equals(other.h3) && h4.equals(other.h4);
   }
 
   /**
@@ -180,6 +227,42 @@ public final class Interface {
   public Optional<Integer> getMtu() {
     return mtu;
   }
+  
+  public Optional<Integer> getJc() {
+    return jc;
+  }
+  
+  public Optional<Integer> getJmin() {
+    return jmin;
+  }
+
+  public Optional<Integer> getJmax() {
+    return jmax;
+  }
+
+  public Optional<Integer> getS1() {
+    return s1;
+  }
+
+  public Optional<Integer> getS2() {
+    return s2;
+  }
+
+  public Optional<Long> getH1() {
+    return h1;
+  }
+
+  public Optional<Long> getH2() {
+    return h2;
+  }
+
+  public Optional<Long> getH3() {
+    return h3;
+  }
+
+  public Optional<Long> getH4() {
+    return h4;
+  }
 
   @Override
   public int hashCode() {
@@ -191,6 +274,15 @@ public final class Interface {
     hash = 31 * hash + keyPair.hashCode();
     hash = 31 * hash + listenPort.hashCode();
     hash = 31 * hash + mtu.hashCode();
+    hash = 31 * hash + jc.hashCode();
+    hash = 31 * hash + jmin.hashCode();
+    hash = 31 * hash + jmax.hashCode();
+    hash = 31 * hash + s1.hashCode();
+    hash = 31 * hash + s2.hashCode();
+    hash = 31 * hash + h1.hashCode();
+    hash = 31 * hash + h2.hashCode();
+    hash = 31 * hash + h3.hashCode();
+    hash = 31 * hash + h4.hashCode();
     return hash;
   }
 
@@ -234,6 +326,19 @@ public final class Interface {
           .append('\n');
     listenPort.ifPresent(lp -> sb.append("ListenPort = ").append(lp).append('\n'));
     mtu.ifPresent(m -> sb.append("MTU = ").append(m).append('\n'));
+    
+    jc.ifPresent(t_jc -> sb.append("Jc = ").append(t_jc).append('\n'));
+    jmin.ifPresent(t_jmin -> sb.append("Jmin = ").append(t_jmin).append('\n'));
+    jmax.ifPresent(t_jmax -> sb.append("Jmax = ").append(t_jmax).append('\n'));
+
+    s1.ifPresent(t_s1 -> sb.append("S1 = ").append(t_s1).append('\n'));
+    s2.ifPresent(t_s2 -> sb.append("S2 = ").append(t_s2).append('\n'));
+
+    h1.ifPresent(t_h1 -> sb.append("H1 = ").append(t_h1).append('\n'));
+    h2.ifPresent(t_h2 -> sb.append("H2 = ").append(t_h2).append('\n'));
+    h3.ifPresent(t_h3 -> sb.append("H3 = ").append(t_h3).append('\n'));
+    h4.ifPresent(t_h4 -> sb.append("H4 = ").append(t_h4).append('\n'));
+    
     sb.append("PrivateKey = ").append(keyPair.getPrivateKey().toBase64()).append('\n');
     return sb.toString();
   }
@@ -248,6 +353,18 @@ public final class Interface {
     final StringBuilder sb = new StringBuilder();
     sb.append("private_key=").append(keyPair.getPrivateKey().toHex()).append('\n');
     listenPort.ifPresent(lp -> sb.append("listen_port=").append(lp).append('\n'));
+
+    jc.ifPresent(t_jc -> sb.append("jc=").append(t_jc).append('\n'));
+    jmin.ifPresent(t_jmin -> sb.append("jmin=").append(t_jmin).append('\n'));
+    jmax.ifPresent(t_jmax -> sb.append("jmax=").append(t_jmax).append('\n'));
+    
+    s1.ifPresent(t_s1 -> sb.append("s1=").append(t_s1).append('\n'));
+    s2.ifPresent(t_s2 -> sb.append("s2=").append(t_s2).append('\n'));
+    
+    h1.ifPresent(t_h1 -> sb.append("h1=").append(t_h1).append('\n'));
+    h2.ifPresent(t_h2 -> sb.append("h2=").append(t_h2).append('\n'));
+    h3.ifPresent(t_h3 -> sb.append("h3=").append(t_h3).append('\n'));
+    h4.ifPresent(t_h4 -> sb.append("h4=").append(t_h4).append('\n'));    
     return sb.toString();
   }
 
@@ -267,6 +384,17 @@ public final class Interface {
     private Optional<Integer> listenPort = Optional.empty();
     // Defaults to not present.
     private Optional<Integer> mtu = Optional.empty();
+    private Optional<Integer> jc = Optional.empty();
+    private Optional<Integer> jmin = Optional.empty();
+    private Optional<Integer> jmax = Optional.empty();
+    
+    private Optional<Integer> s1 = Optional.empty();
+    private Optional<Integer> s2 = Optional.empty();
+    
+    private Optional<Long> h1 = Optional.empty();
+    private Optional<Long> h2 = Optional.empty();
+    private Optional<Long> h3 = Optional.empty();
+    private Optional<Long> h4 = Optional.empty();
 
     public Builder addAddress(final InetNetwork address) {
       addresses.add(address);
@@ -362,6 +490,78 @@ public final class Interface {
       }
     }
 
+    public Builder parseJc(final String jc) throws BadConfigException {
+      try {
+        return setJc(Integer.parseInt(jc));
+      } catch (final NumberFormatException e) {
+        throw new BadConfigException(Section.INTERFACE, Location.JC, jc, e);
+      }
+    }
+    
+    public Builder parseJmax(final String jmax) throws BadConfigException {
+      try {
+        return setJmax(Integer.parseInt(jmax));
+      } catch (final NumberFormatException e) {
+        throw new BadConfigException(Section.INTERFACE, Location.JMAX, jmax, e);
+      }
+    }
+
+    public Builder parseJmin(final String jmin) throws BadConfigException {
+      try {
+        return setJmin(Integer.parseInt(jmin));
+      } catch (final NumberFormatException e) {
+        throw new BadConfigException(Section.INTERFACE, Location.JMIN, jmin, e);
+      }
+    }    
+
+    public Builder parseS1(final String s1) throws BadConfigException {
+      try {
+        return setS1(Integer.parseInt(s1));
+      } catch (final NumberFormatException e) {
+        throw new BadConfigException(Section.INTERFACE, Location.S1, s1, e);
+      }
+    } 
+
+    public Builder parseS2(final String s2) throws BadConfigException {
+      try {
+        return setS2(Integer.parseInt(s2));
+      } catch (final NumberFormatException e) {
+        throw new BadConfigException(Section.INTERFACE, Location.S2, s2, e);
+      }
+    } 
+
+    public Builder parseH1(final String h1) throws BadConfigException {
+      try {
+        return setH1(Long.parseLong(h1));
+      } catch (final NumberFormatException e) {
+        throw new BadConfigException(Section.INTERFACE, Location.H1, h1, e);
+      }
+    } 
+
+    public Builder parseH2(final String h2) throws BadConfigException {
+      try {
+        return setH2(Long.parseLong(h2));
+      } catch (final NumberFormatException e) {
+        throw new BadConfigException(Section.INTERFACE, Location.H2, h2, e);
+      }
+    } 
+
+    public Builder parseH3(final String h3) throws BadConfigException {
+      try {
+        return setH3(Long.parseLong(h3));
+      } catch (final NumberFormatException e) {
+        throw new BadConfigException(Section.INTERFACE, Location.H3, h3, e);
+      }
+    } 
+
+    public Builder parseH4(final String h4) throws BadConfigException {
+      try {
+        return setH4(Long.parseLong(h4));
+      } catch (final NumberFormatException e) {
+        throw new BadConfigException(Section.INTERFACE, Location.H4, h4, e);
+      }
+    } 
+
     public Builder parsePrivateKey(final String privateKey) throws BadConfigException {
       try {
         return setKeyPair(new KeyPair(Key.fromBase64(privateKey)));
@@ -386,9 +586,81 @@ public final class Interface {
     public Builder setMtu(final int mtu) throws BadConfigException {
       if (mtu < 0)
         throw new BadConfigException(
-            Section.INTERFACE, Location.LISTEN_PORT, Reason.INVALID_VALUE, String.valueOf(mtu));
+            Section.INTERFACE, Location.MTU, Reason.INVALID_VALUE, String.valueOf(mtu));
       this.mtu = mtu == 0 ? Optional.empty() : Optional.of(mtu);
       return this;
     }
+    
+    public Builder setJc(final int jc) throws BadConfigException {
+      if (jc < 0)
+        throw new BadConfigException(
+            Section.INTERFACE, Location.JC, Reason.INVALID_VALUE, String.valueOf(jc));
+      this.jc = jc == 0 ? Optional.empty() : Optional.of(jc);
+      return this;
+    }      
+    
+    public Builder setJmin(final int jmin) throws BadConfigException {
+      if (jmin < 0)
+        throw new BadConfigException(
+            Section.INTERFACE, Location.JMIN, Reason.INVALID_VALUE, String.valueOf(jmin));
+      this.jmin = jmin == 0 ? Optional.empty() : Optional.of(jmin);
+      return this;
+    }
+
+    public Builder setJmax(final int jmax) throws BadConfigException {
+      if (jmax < 0)
+        throw new BadConfigException(
+            Section.INTERFACE, Location.JMAX, Reason.INVALID_VALUE, String.valueOf(jmax));
+      this.jmax = jmax == 0 ? Optional.empty() : Optional.of(jmax);
+      return this;
+    }
+
+    public Builder setS1(final int s1) throws BadConfigException {
+      if (s1 < 0)
+        throw new BadConfigException(
+            Section.INTERFACE, Location.S1, Reason.INVALID_VALUE, String.valueOf(s1));
+      this.s1 = s1 == 0 ? Optional.empty() : Optional.of(s1);
+      return this;
+    }
+
+    public Builder setS2(final int s2) throws BadConfigException {
+      if (s2 < 0)
+        throw new BadConfigException(
+            Section.INTERFACE, Location.S2, Reason.INVALID_VALUE, String.valueOf(s2));
+      this.s2 = s2 == 0 ? Optional.empty() : Optional.of(s2);
+      return this;
+    }
+
+    public Builder setH1(final long h1) throws BadConfigException {
+      if (h1 < 0)
+        throw new BadConfigException(
+            Section.INTERFACE, Location.H1, Reason.INVALID_VALUE, String.valueOf(h1));
+      this.h1 = h1 == 0 ? Optional.empty() : Optional.of(h1);
+      return this;
+    }
+
+    public Builder setH2(final long h2) throws BadConfigException {
+      if (h2 < 0)
+        throw new BadConfigException(
+            Section.INTERFACE, Location.H2, Reason.INVALID_VALUE, String.valueOf(h2));
+      this.h2 = h2 == 0 ? Optional.empty() : Optional.of(h2);
+      return this;
+    }
+
+    public Builder setH3(final long h3) throws BadConfigException {
+      if (h3 < 0)
+        throw new BadConfigException(
+            Section.INTERFACE, Location.H3, Reason.INVALID_VALUE, String.valueOf(h3));
+      this.h3 = h3 == 0 ? Optional.empty() : Optional.of(h3);
+      return this;
+    }
+
+    public Builder setH4(final long h4) throws BadConfigException {
+      if (h4 < 0)
+        throw new BadConfigException(
+            Section.INTERFACE, Location.H4, Reason.INVALID_VALUE, String.valueOf(h4));
+      this.h4 = h4 == 0 ? Optional.empty() : Optional.of(h4);
+      return this;
+    }
   }
-}
+}    
diff --git a/client/android/src/org/amnezia/vpn/VPNService.kt b/client/android/src/org/amnezia/vpn/VPNService.kt
index 082fe412..fe08a3cf 100644
--- a/client/android/src/org/amnezia/vpn/VPNService.kt
+++ b/client/android/src/org/amnezia/vpn/VPNService.kt
@@ -380,7 +380,10 @@ class VPNService : BaseVpnService(), LocalDnsService.Interface {
                 mNetworkState.bindNetworkListener()
             }
             "wireguard" -> {
-                startWireGuard()
+                startWireGuard("wireguard")
+            }
+            "awg" -> {
+                startWireGuard("awg")
             }
             "shadowsocks" -> {
                 startShadowsocks()
@@ -457,7 +460,8 @@ class VPNService : BaseVpnService(), LocalDnsService.Interface {
     fun turnOff() {
         Log.v(tag, "Aman: turnOff....................")
         when (mProtocol) {
-            "wireguard" -> {
+            "wireguard",
+            "awg" -> {
                 GoBackend.wgTurnOff(currentTunnelHandle)
             }
             "cloak",
@@ -559,14 +563,14 @@ class VPNService : BaseVpnService(), LocalDnsService.Interface {
         }
         return parseData
     }
-
+    
     /**
      * Create a Wireguard [Config]  from a [json] string -
      * The [json] will be created in AndroidVpnProtocol.cpp
      */
-    private fun buildWireguardConfig(obj: JSONObject): Config {
+    private fun buildWireguardConfig(obj: JSONObject, type: String): Config {
         val confBuilder = Config.Builder()
-        val wireguardConfigData = obj.getJSONObject("wireguard_config_data")
+        val wireguardConfigData = obj.getJSONObject(type)
         val config = parseConfigData(wireguardConfigData.getString("config"))
         val peerBuilder = Peer.Builder()
         val peerConfig = config["Peer"]!!
@@ -599,6 +603,19 @@ class VPNService : BaseVpnService(), LocalDnsService.Interface {
         ifaceConfig["DNS"]!!.split(",").forEach {
             ifaceBuilder.addDnsServer(InetNetwork.parse(it.trim()).address)
         }
+        
+        ifaceBuilder.parsePrivateKey(ifaceConfig["PrivateKey"])
+        if (type == "awg_config_data") {
+            ifaceBuilder.parseJc(ifaceConfig["Jc"])
+            ifaceBuilder.parseJmin(ifaceConfig["Jmin"])
+            ifaceBuilder.parseJmax(ifaceConfig["Jmax"])
+            ifaceBuilder.parseS1(ifaceConfig["S1"])
+            ifaceBuilder.parseS2(ifaceConfig["S2"])
+            ifaceBuilder.parseH1(ifaceConfig["H1"])
+            ifaceBuilder.parseH2(ifaceConfig["H2"])
+            ifaceBuilder.parseH3(ifaceConfig["H3"])
+            ifaceBuilder.parseH4(ifaceConfig["H4"])
+        }
         /*val jExcludedApplication = obj.getJSONArray("excludedApps")
     (0 until jExcludedApplication.length()).toList().forEach {
         val appName = jExcludedApplication.get(it).toString()
@@ -716,8 +733,8 @@ class VPNService : BaseVpnService(), LocalDnsService.Interface {
         }).start()
     }
 
-    private fun startWireGuard() {
-        val wireguard_conf = buildWireguardConfig(mConfig!!)
+    private fun startWireGuard(type: String) {
+        val wireguard_conf = buildWireguardConfig(mConfig!!, type + "_config_data")
         Log.i(tag, "startWireGuard: wireguard_conf : $wireguard_conf")
         if (currentTunnelHandle != -1) {
             Log.e(tag, "Tunnel already up")
diff --git a/client/containers/containers_defs.cpp b/client/containers/containers_defs.cpp
index 5f8d2e51..0337eb44 100644
--- a/client/containers/containers_defs.cpp
+++ b/client/containers/containers_defs.cpp
@@ -204,6 +204,7 @@ bool ContainerProps::isSupportedByCurrentPlatform(DockerContainer c)
     case DockerContainer::WireGuard: return true;
     case DockerContainer::OpenVpn: return true;
     case DockerContainer::ShadowSocks: return true;
+    case DockerContainer::Awg: return true;
     case DockerContainer::Cloak: return true;
     default: return false;
     }

From 357c283437372e827fe3581a7398695f8a86cca8 Mon Sep 17 00:00:00 2001
From: albexk <albexk@proton.me>
Date: Sun, 8 Oct 2023 20:08:32 +0300
Subject: [PATCH 196/278] Disable android accessibility

---
 client/main.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/client/main.cpp b/client/main.cpp
index 396b7625..bf861dc2 100644
--- a/client/main.cpp
+++ b/client/main.cpp
@@ -26,6 +26,11 @@ int main(int argc, char *argv[])
     AllowSetForegroundWindow(ASFW_ANY);
 #endif
 
+// QTBUG-95974 QTBUG-95764 QTBUG-102168
+#ifdef Q_OS_ANDROID
+    qputenv("QT_ANDROID_DISABLE_ACCESSIBILITY", "1");
+#endif
+
 #if defined(Q_OS_ANDROID) || defined(Q_OS_IOS)
     AmneziaApplication app(argc, argv);
 #else

From e01dd2bf57e6edd93bdcd499dd512c5e2c53617b Mon Sep 17 00:00:00 2001
From: "vladimir.kuznetsov" <nethiuswork@gmail.com>
Date: Mon, 9 Oct 2023 19:16:06 +0500
Subject: [PATCH 197/278] added close application button in settings page

---
 client/images/controls/x-circle.svg           |   5 +
 client/resources.qrc                          |   1 +
 client/translations/amneziavpn_ru.ts          | 145 ++++++++++--------
 client/translations/amneziavpn_zh_CN.ts       | 141 ++++++++++-------
 client/ui/controllers/pageController.cpp      |   5 +
 client/ui/controllers/pageController.h        |   3 +-
 .../ui/qml/Controls2/LabelWithButtonType.qml  |   7 +-
 client/ui/qml/Pages2/PageSettings.qml         |  14 ++
 8 files changed, 205 insertions(+), 116 deletions(-)
 create mode 100644 client/images/controls/x-circle.svg

diff --git a/client/images/controls/x-circle.svg b/client/images/controls/x-circle.svg
new file mode 100644
index 00000000..2d3f5b26
--- /dev/null
+++ b/client/images/controls/x-circle.svg
@@ -0,0 +1,5 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M12 22C17.5228 22 22 17.5228 22 12C22 6.47715 17.5228 2 12 2C6.47715 2 2 6.47715 2 12C2 17.5228 6.47715 22 12 22Z" stroke="#D7D8DB" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M15 9L9 15" stroke="#D7D8DB" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M9 9L15 15" stroke="#D7D8DB" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/client/resources.qrc b/client/resources.qrc
index 5b4d6ae7..f0494852 100644
--- a/client/resources.qrc
+++ b/client/resources.qrc
@@ -215,5 +215,6 @@
         <file>ui/qml/Controls2/ListViewWithLabelsType.qml</file>
         <file>ui/qml/Pages2/PageServiceDnsSettings.qml</file>
         <file>ui/qml/Controls2/TopCloseButtonType.qml</file>
+        <file>images/controls/x-circle.svg</file>
     </qresource>
 </RCC>
diff --git a/client/translations/amneziavpn_ru.ts b/client/translations/amneziavpn_ru.ts
index e0bab018..92061f89 100644
--- a/client/translations/amneziavpn_ru.ts
+++ b/client/translations/amneziavpn_ru.ts
@@ -26,41 +26,41 @@
 <context>
     <name>ConnectionController</name>
     <message>
-        <location filename="../ui/controllers/connectionController.cpp" line="55"/>
+        <location filename="../ui/controllers/connectionController.cpp" line="38"/>
         <source>VPN Protocols is not installed.
  Please install VPN container at first</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/controllers/connectionController.cpp" line="78"/>
+        <location filename="../ui/controllers/connectionController.cpp" line="61"/>
         <source>Connection...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/controllers/connectionController.cpp" line="83"/>
+        <location filename="../ui/controllers/connectionController.cpp" line="66"/>
         <source>Connected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/controllers/connectionController.cpp" line="128"/>
+        <location filename="../ui/controllers/connectionController.cpp" line="111"/>
         <source>Settings updated successfully, Reconnnection...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/controllers/connectionController.cpp" line="92"/>
+        <location filename="../ui/controllers/connectionController.cpp" line="75"/>
         <source>Reconnection...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../ui/controllers/connectionController.h" line="58"/>
-        <location filename="../ui/controllers/connectionController.cpp" line="97"/>
-        <location filename="../ui/controllers/connectionController.cpp" line="111"/>
-        <location filename="../ui/controllers/connectionController.cpp" line="117"/>
+        <location filename="../ui/controllers/connectionController.cpp" line="80"/>
+        <location filename="../ui/controllers/connectionController.cpp" line="94"/>
+        <location filename="../ui/controllers/connectionController.cpp" line="100"/>
         <source>Connect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/controllers/connectionController.cpp" line="102"/>
+        <location filename="../ui/controllers/connectionController.cpp" line="85"/>
         <source>Disconnection...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -130,7 +130,7 @@
 <context>
     <name>ImportController</name>
     <message>
-        <location filename="../ui/controllers/importController.cpp" line="384"/>
+        <location filename="../ui/controllers/importController.cpp" line="375"/>
         <source>Scanned %1 of %2.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -139,50 +139,55 @@
     <name>InstallController</name>
     <message>
         <location filename="../ui/controllers/installController.cpp" line="110"/>
-        <location filename="../ui/controllers/installController.cpp" line="162"/>
+        <location filename="../ui/controllers/installController.cpp" line="161"/>
         <source>%1 installed successfully. </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../ui/controllers/installController.cpp" line="112"/>
-        <location filename="../ui/controllers/installController.cpp" line="164"/>
+        <location filename="../ui/controllers/installController.cpp" line="163"/>
         <source>%1 is already installed on the server. </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../ui/controllers/installController.cpp" line="115"/>
-        <location filename="../ui/controllers/installController.cpp" line="183"/>
+        <source>
+Added containers that were already installed on the server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/controllers/installController.cpp" line="182"/>
         <source>
 Already installed containers were found on the server. All installed containers have been added to the application</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/controllers/installController.cpp" line="264"/>
+        <location filename="../ui/controllers/installController.cpp" line="263"/>
         <source>Settings updated successfully</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/controllers/installController.cpp" line="279"/>
+        <location filename="../ui/controllers/installController.cpp" line="278"/>
         <source>Server &apos;%1&apos; was removed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/controllers/installController.cpp" line="289"/>
+        <location filename="../ui/controllers/installController.cpp" line="288"/>
         <source>All containers from server &apos;%1&apos; have been removed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/controllers/installController.cpp" line="306"/>
+        <location filename="../ui/controllers/installController.cpp" line="305"/>
         <source>%1 has been removed from the server &apos;%2&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/controllers/installController.cpp" line="452"/>
+        <location filename="../ui/controllers/installController.cpp" line="451"/>
         <source>Please login as the user</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/controllers/installController.cpp" line="479"/>
+        <location filename="../ui/controllers/installController.cpp" line="478"/>
         <source>Server added successfully</source>
         <translation type="unfinished"></translation>
     </message>
@@ -250,12 +255,12 @@ Already installed containers were found on the server. All installed containers
 <context>
     <name>PageHome</name>
     <message>
-        <location filename="../ui/qml/Pages2/PageHome.qml" line="193"/>
+        <location filename="../ui/qml/Pages2/PageHome.qml" line="344"/>
         <source>VPN protocol</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageHome.qml" line="238"/>
+        <location filename="../ui/qml/Pages2/PageHome.qml" line="390"/>
         <source>Servers</source>
         <translation type="unfinished"></translation>
     </message>
@@ -771,6 +776,11 @@ Already installed containers were found on the server. All installed containers
         <source>About AmneziaVPN</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettings.qml" line="114"/>
+        <source>Close application</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PageSettingsAbout</name>
@@ -865,71 +875,76 @@ And if you don&apos;t like the app, all the more support it - the donation will
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="52"/>
+        <source>Allow application screenshots</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="72"/>
         <source>Auto start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="53"/>
+        <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="73"/>
         <source>Launch the application every time </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="53"/>
+        <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="73"/>
         <source> starts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="73"/>
+        <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="93"/>
         <source>Start minimized</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="74"/>
+        <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="94"/>
         <source>Launch application minimized</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="91"/>
+        <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="111"/>
         <source>Language</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="110"/>
+        <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="130"/>
         <source>Logging</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="111"/>
+        <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="131"/>
         <source>Enabled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="111"/>
+        <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="131"/>
         <source>Disabled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="124"/>
+        <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="144"/>
         <source>Reset settings and remove all data from the application</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="128"/>
+        <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="148"/>
         <source>Reset settings and remove all data from the application?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="129"/>
+        <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="149"/>
         <source>All settings will be reset to default. All installed AmneziaVPN services will still remain on the server.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="130"/>
+        <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="150"/>
         <source>Continue</source>
         <translation type="unfinished">Продолжить</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="131"/>
+        <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="151"/>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1525,17 +1540,17 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
 <context>
     <name>PageSetupWizardEasy</name>
     <message>
-        <location filename="../ui/qml/Pages2/PageSetupWizardEasy.qml" line="66"/>
+        <location filename="../ui/qml/Pages2/PageSetupWizardEasy.qml" line="67"/>
         <source>What is the level of internet control in your region?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSetupWizardEasy.qml" line="136"/>
+        <location filename="../ui/qml/Pages2/PageSetupWizardEasy.qml" line="137"/>
         <source>Set up a VPN yourself</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSetupWizardEasy.qml" line="137"/>
+        <location filename="../ui/qml/Pages2/PageSetupWizardEasy.qml" line="138"/>
         <source>I want to choose a VPN protocol</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1545,7 +1560,7 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
         <translation type="unfinished">Продолжить</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSetupWizardEasy.qml" line="186"/>
+        <location filename="../ui/qml/Pages2/PageSetupWizardEasy.qml" line="197"/>
         <source>Set up later</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1749,11 +1764,6 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
         <source>VPN access without the ability to manage the server</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../ui/qml/Pages2/PageShare.qml" line="175"/>
-        <source>Full access to server</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="../ui/qml/Pages2/PageShare.qml" line="191"/>
         <source>Server</source>
@@ -1765,13 +1775,17 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageShare.qml" line="306"/>
+        <location filename="../ui/qml/Pages2/PageShare.qml" line="222"/>
+        <source>File with accessing settings to </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageShare.qml" line="309"/>
         <source>Connection to </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageShare.qml" line="222"/>
-        <location filename="../ui/qml/Pages2/PageShare.qml" line="307"/>
+        <location filename="../ui/qml/Pages2/PageShare.qml" line="310"/>
         <source>File with connection settings to </source>
         <translation type="unfinished"></translation>
     </message>
@@ -1795,29 +1809,30 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
         <source>Full access</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageShare.qml" line="175"/>
+        <source>Access to server management. The user with whom you share full access to the connection will be able to add and remove your protocols and services to the servers, as well as change settings.</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location filename="../ui/qml/Pages2/PageShare.qml" line="190"/>
         <source>Servers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageShare.qml" line="248"/>
-        <source>Protocols</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Pages2/PageShare.qml" line="249"/>
+        <location filename="../ui/qml/Pages2/PageShare.qml" line="251"/>
+        <location filename="../ui/qml/Pages2/PageShare.qml" line="252"/>
         <source>Protocol</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageShare.qml" line="340"/>
-        <location filename="../ui/qml/Pages2/PageShare.qml" line="341"/>
+        <location filename="../ui/qml/Pages2/PageShare.qml" line="343"/>
+        <location filename="../ui/qml/Pages2/PageShare.qml" line="344"/>
         <source>Connection format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageShare.qml" line="379"/>
+        <location filename="../ui/qml/Pages2/PageShare.qml" line="382"/>
         <source>Share</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2433,6 +2448,16 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
         <source>error 0x%1: %2</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../3rd/wireguard-tools/contrib/highlighter/gui/highlight.cpp" line="39"/>
+        <source>WireGuard Configuration Highlighter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../3rd/wireguard-tools/contrib/highlighter/gui/highlight.cpp" line="82"/>
+        <source>&amp;Randomize colors</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SelectLanguageDrawer</name>
@@ -2459,22 +2484,22 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
 <context>
     <name>SettingsController</name>
     <message>
-        <location filename="../ui/controllers/settingsController.cpp" line="20"/>
+        <location filename="../ui/controllers/settingsController.cpp" line="25"/>
         <source>Software version</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/controllers/settingsController.cpp" line="117"/>
+        <location filename="../ui/controllers/settingsController.cpp" line="136"/>
         <source>All settings have been reset to default values</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/controllers/settingsController.cpp" line="123"/>
+        <location filename="../ui/controllers/settingsController.cpp" line="142"/>
         <source>Cached profiles cleared</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/controllers/settingsController.cpp" line="102"/>
+        <location filename="../ui/controllers/settingsController.cpp" line="121"/>
         <source>Backup file is corrupted</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2504,7 +2529,7 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
     </message>
     <message>
         <location filename="../ui/qml/Components/ShareConnectionDrawer.qml" line="126"/>
-        <source>Show content</source>
+        <source>Show connection settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/client/translations/amneziavpn_zh_CN.ts b/client/translations/amneziavpn_zh_CN.ts
index 37e27786..6c57e9f1 100644
--- a/client/translations/amneziavpn_zh_CN.ts
+++ b/client/translations/amneziavpn_zh_CN.ts
@@ -27,40 +27,40 @@
     <name>ConnectionController</name>
     <message>
         <location filename="../ui/controllers/connectionController.h" line="58"/>
-        <location filename="../ui/controllers/connectionController.cpp" line="97"/>
-        <location filename="../ui/controllers/connectionController.cpp" line="111"/>
-        <location filename="../ui/controllers/connectionController.cpp" line="117"/>
+        <location filename="../ui/controllers/connectionController.cpp" line="80"/>
+        <location filename="../ui/controllers/connectionController.cpp" line="94"/>
+        <location filename="../ui/controllers/connectionController.cpp" line="100"/>
         <source>Connect</source>
         <translation type="unfinished">连接</translation>
     </message>
     <message>
-        <location filename="../ui/controllers/connectionController.cpp" line="55"/>
+        <location filename="../ui/controllers/connectionController.cpp" line="38"/>
         <source>VPN Protocols is not installed.
  Please install VPN container at first</source>
         <translation type="unfinished">不存在VPN协议，请先安装</translation>
     </message>
     <message>
-        <location filename="../ui/controllers/connectionController.cpp" line="78"/>
+        <location filename="../ui/controllers/connectionController.cpp" line="61"/>
         <source>Connection...</source>
         <translation type="unfinished">连接中</translation>
     </message>
     <message>
-        <location filename="../ui/controllers/connectionController.cpp" line="83"/>
+        <location filename="../ui/controllers/connectionController.cpp" line="66"/>
         <source>Connected</source>
         <translation type="unfinished">已连接</translation>
     </message>
     <message>
-        <location filename="../ui/controllers/connectionController.cpp" line="92"/>
+        <location filename="../ui/controllers/connectionController.cpp" line="75"/>
         <source>Reconnection...</source>
         <translation type="unfinished">重连中</translation>
     </message>
     <message>
-        <location filename="../ui/controllers/connectionController.cpp" line="102"/>
+        <location filename="../ui/controllers/connectionController.cpp" line="85"/>
         <source>Disconnection...</source>
         <translation type="unfinished">断开中</translation>
     </message>
     <message>
-        <location filename="../ui/controllers/connectionController.cpp" line="128"/>
+        <location filename="../ui/controllers/connectionController.cpp" line="111"/>
         <source>Settings updated successfully, Reconnnection...</source>
         <translation type="unfinished">配置已更新，重连中</translation>
     </message>
@@ -130,7 +130,7 @@
 <context>
     <name>ImportController</name>
     <message>
-        <location filename="../ui/controllers/importController.cpp" line="384"/>
+        <location filename="../ui/controllers/importController.cpp" line="375"/>
         <source>Scanned %1 of %2.</source>
         <translation type="unfinished">扫描 %1 of %2.</translation>
     </message>
@@ -147,41 +147,46 @@
     </message>
     <message>
         <location filename="../ui/controllers/installController.cpp" line="110"/>
-        <location filename="../ui/controllers/installController.cpp" line="162"/>
+        <location filename="../ui/controllers/installController.cpp" line="161"/>
         <source>%1 installed successfully. </source>
         <translation type="unfinished">%1 安装成功。</translation>
     </message>
     <message>
         <location filename="../ui/controllers/installController.cpp" line="112"/>
-        <location filename="../ui/controllers/installController.cpp" line="164"/>
+        <location filename="../ui/controllers/installController.cpp" line="163"/>
         <source>%1 is already installed on the server. </source>
         <translation type="unfinished">服务器上已经安装 %1。</translation>
     </message>
     <message>
         <location filename="../ui/controllers/installController.cpp" line="115"/>
-        <location filename="../ui/controllers/installController.cpp" line="183"/>
+        <source>
+Added containers that were already installed on the server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/controllers/installController.cpp" line="182"/>
         <source>
 Already installed containers were found on the server. All installed containers have been added to the application</source>
         <translation type="unfinished">
 在服务上发现已经安装协议并添加到应用程序</translation>
     </message>
     <message>
-        <location filename="../ui/controllers/installController.cpp" line="264"/>
+        <location filename="../ui/controllers/installController.cpp" line="263"/>
         <source>Settings updated successfully</source>
         <translation type="unfinished">配置更新成功</translation>
     </message>
     <message>
-        <location filename="../ui/controllers/installController.cpp" line="279"/>
+        <location filename="../ui/controllers/installController.cpp" line="278"/>
         <source>Server &apos;%1&apos; was removed</source>
         <translation type="unfinished">已移除服务器 &apos;%1&apos;</translation>
     </message>
     <message>
-        <location filename="../ui/controllers/installController.cpp" line="289"/>
+        <location filename="../ui/controllers/installController.cpp" line="288"/>
         <source>All containers from server &apos;%1&apos; have been removed</source>
         <translation type="unfinished">服务器 &apos;%1&apos; 的所有容器已移除</translation>
     </message>
     <message>
-        <location filename="../ui/controllers/installController.cpp" line="306"/>
+        <location filename="../ui/controllers/installController.cpp" line="305"/>
         <source>%1 has been removed from the server &apos;%2&apos;</source>
         <translation type="unfinished">%1 已从服务器 &apos;%2&apos; 上移除</translation>
     </message>
@@ -202,12 +207,12 @@ Already installed containers were found on the server. All installed containers
         <translation type="obsolete"> 协议已从</translation>
     </message>
     <message>
-        <location filename="../ui/controllers/installController.cpp" line="452"/>
+        <location filename="../ui/controllers/installController.cpp" line="451"/>
         <source>Please login as the user</source>
         <translation type="unfinished">请以用户身份登录</translation>
     </message>
     <message>
-        <location filename="../ui/controllers/installController.cpp" line="479"/>
+        <location filename="../ui/controllers/installController.cpp" line="478"/>
         <source>Server added successfully</source>
         <translation type="unfinished">服务器添加成功</translation>
     </message>
@@ -275,12 +280,12 @@ Already installed containers were found on the server. All installed containers
 <context>
     <name>PageHome</name>
     <message>
-        <location filename="../ui/qml/Pages2/PageHome.qml" line="193"/>
+        <location filename="../ui/qml/Pages2/PageHome.qml" line="344"/>
         <source>VPN protocol</source>
         <translation type="unfinished">VPN协议</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageHome.qml" line="238"/>
+        <location filename="../ui/qml/Pages2/PageHome.qml" line="390"/>
         <source>Servers</source>
         <translation type="unfinished">服务器</translation>
     </message>
@@ -797,6 +802,11 @@ Already installed containers were found on the server. All installed containers
         <source>About AmneziaVPN</source>
         <translation type="unfinished">关于</translation>
     </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettings.qml" line="114"/>
+        <source>Close application</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PageSettingsAbout</name>
@@ -892,71 +902,76 @@ And if you don&apos;t like the app, all the more support it - the donation will
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="52"/>
+        <source>Allow application screenshots</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="72"/>
         <source>Auto start</source>
         <translation type="unfinished">自动运行</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="53"/>
+        <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="73"/>
         <source>Launch the application every time </source>
         <translation type="unfinished">总是在系统 </translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="53"/>
+        <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="73"/>
         <source> starts</source>
         <translation type="unfinished"> 启动时自动运行运用程序</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="73"/>
+        <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="93"/>
         <source>Start minimized</source>
         <translation type="unfinished">最小化</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="74"/>
+        <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="94"/>
         <source>Launch application minimized</source>
         <translation type="unfinished">开启应用程序时窗口最小化</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="91"/>
+        <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="111"/>
         <source>Language</source>
         <translation type="unfinished">语言</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="110"/>
+        <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="130"/>
         <source>Logging</source>
         <translation type="unfinished">日志</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="111"/>
+        <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="131"/>
         <source>Enabled</source>
         <translation type="unfinished">开启</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="111"/>
+        <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="131"/>
         <source>Disabled</source>
         <translation type="unfinished">禁用</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="124"/>
+        <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="144"/>
         <source>Reset settings and remove all data from the application</source>
         <translation type="unfinished">重置并清理应用的所有数据</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="128"/>
+        <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="148"/>
         <source>Reset settings and remove all data from the application?</source>
         <translation type="unfinished">重置并清理应用的所有数据？</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="129"/>
+        <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="149"/>
         <source>All settings will be reset to default. All installed AmneziaVPN services will still remain on the server.</source>
         <translation type="unfinished">所有配置恢复为默认值。在服务器上保留所有已安装的AmneziaVPN服务。</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="130"/>
+        <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="150"/>
         <source>Continue</source>
         <translation type="unfinished">继续</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="131"/>
+        <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="151"/>
         <source>Cancel</source>
         <translation type="unfinished">取消</translation>
     </message>
@@ -1561,17 +1576,17 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
 <context>
     <name>PageSetupWizardEasy</name>
     <message>
-        <location filename="../ui/qml/Pages2/PageSetupWizardEasy.qml" line="66"/>
+        <location filename="../ui/qml/Pages2/PageSetupWizardEasy.qml" line="67"/>
         <source>What is the level of internet control in your region?</source>
         <translation type="unfinished">您所在地区的互联网控制力度如何？</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSetupWizardEasy.qml" line="136"/>
+        <location filename="../ui/qml/Pages2/PageSetupWizardEasy.qml" line="137"/>
         <source>Set up a VPN yourself</source>
         <translation type="unfinished">自己架设VPN</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSetupWizardEasy.qml" line="137"/>
+        <location filename="../ui/qml/Pages2/PageSetupWizardEasy.qml" line="138"/>
         <source>I want to choose a VPN protocol</source>
         <translation type="unfinished">我想选择VPN协议</translation>
     </message>
@@ -1581,7 +1596,7 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
         <translation type="unfinished">继续</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSetupWizardEasy.qml" line="186"/>
+        <location filename="../ui/qml/Pages2/PageSetupWizardEasy.qml" line="197"/>
         <source>Set up later</source>
         <translation type="unfinished">稍后设置</translation>
     </message>
@@ -1807,8 +1822,12 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageShare.qml" line="175"/>
+        <source>Access to server management. The user with whom you share full access to the connection will be able to add and remove your protocols and services to the servers, as well as change settings.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Full access to server</source>
-        <translation type="unfinished">获得服务器完整授权</translation>
+        <translation type="obsolete">获得服务器完整授权</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageShare.qml" line="190"/>
@@ -1827,33 +1846,37 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageShare.qml" line="222"/>
-        <location filename="../ui/qml/Pages2/PageShare.qml" line="307"/>
+        <source>File with accessing settings to </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageShare.qml" line="310"/>
         <source>File with connection settings to </source>
         <translation type="unfinished">连接配置文件的内容为:</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageShare.qml" line="248"/>
         <source>Protocols</source>
-        <translation type="unfinished">协议</translation>
+        <translation type="obsolete">协议</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageShare.qml" line="249"/>
+        <location filename="../ui/qml/Pages2/PageShare.qml" line="251"/>
+        <location filename="../ui/qml/Pages2/PageShare.qml" line="252"/>
         <source>Protocol</source>
         <translation type="unfinished">协议</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageShare.qml" line="306"/>
+        <location filename="../ui/qml/Pages2/PageShare.qml" line="309"/>
         <source>Connection to </source>
         <translation type="unfinished">连接到</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageShare.qml" line="340"/>
-        <location filename="../ui/qml/Pages2/PageShare.qml" line="341"/>
+        <location filename="../ui/qml/Pages2/PageShare.qml" line="343"/>
+        <location filename="../ui/qml/Pages2/PageShare.qml" line="344"/>
         <source>Connection format</source>
         <translation type="unfinished">连接方式</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageShare.qml" line="379"/>
+        <location filename="../ui/qml/Pages2/PageShare.qml" line="382"/>
         <source>Share</source>
         <translation type="unfinished">共享</translation>
     </message>
@@ -2469,6 +2492,16 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
         <source>error 0x%1: %2</source>
         <translation type="unfinished">错误 0x%1: %2</translation>
     </message>
+    <message>
+        <location filename="../3rd/wireguard-tools/contrib/highlighter/gui/highlight.cpp" line="39"/>
+        <source>WireGuard Configuration Highlighter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../3rd/wireguard-tools/contrib/highlighter/gui/highlight.cpp" line="82"/>
+        <source>&amp;Randomize colors</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SelectLanguageDrawer</name>
@@ -2495,22 +2528,22 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
 <context>
     <name>SettingsController</name>
     <message>
-        <location filename="../ui/controllers/settingsController.cpp" line="20"/>
+        <location filename="../ui/controllers/settingsController.cpp" line="25"/>
         <source>Software version</source>
         <translation type="unfinished">软件版本</translation>
     </message>
     <message>
-        <location filename="../ui/controllers/settingsController.cpp" line="102"/>
+        <location filename="../ui/controllers/settingsController.cpp" line="121"/>
         <source>Backup file is corrupted</source>
         <translation type="unfinished">备份文件已损坏</translation>
     </message>
     <message>
-        <location filename="../ui/controllers/settingsController.cpp" line="117"/>
+        <location filename="../ui/controllers/settingsController.cpp" line="136"/>
         <source>All settings have been reset to default values</source>
         <translation type="unfinished">所配置恢复为默认值</translation>
     </message>
     <message>
-        <location filename="../ui/controllers/settingsController.cpp" line="123"/>
+        <location filename="../ui/controllers/settingsController.cpp" line="142"/>
         <source>Cached profiles cleared</source>
         <translation type="unfinished">缓存的配置文件已清除</translation>
     </message>
@@ -2540,8 +2573,12 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
     </message>
     <message>
         <location filename="../ui/qml/Components/ShareConnectionDrawer.qml" line="126"/>
+        <source>Show connection settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Show content</source>
-        <translation type="unfinished">展示内容</translation>
+        <translation type="obsolete">展示内容</translation>
     </message>
     <message>
         <location filename="../ui/qml/Components/ShareConnectionDrawer.qml" line="250"/>
diff --git a/client/ui/controllers/pageController.cpp b/client/ui/controllers/pageController.cpp
index cb500618..ed60500a 100644
--- a/client/ui/controllers/pageController.cpp
+++ b/client/ui/controllers/pageController.cpp
@@ -157,3 +157,8 @@ void PageController::setTriggeredBtConnectButton(bool trigger)
 {
     m_isTriggeredByConnectButton = trigger;
 }
+
+void PageController::closeApplication()
+{
+    qApp->quit();
+}
diff --git a/client/ui/controllers/pageController.h b/client/ui/controllers/pageController.h
index 70732bd9..69c80fe6 100644
--- a/client/ui/controllers/pageController.h
+++ b/client/ui/controllers/pageController.h
@@ -84,10 +84,11 @@ public slots:
     void drawerOpen();
     void drawerClose();
 
-
     bool isTriggeredByConnectButton();
     void setTriggeredBtConnectButton(bool trigger);
 
+    void closeApplication();
+
 signals:
     void goToPage(PageLoader::PageEnum page, bool slide = true);
     void goToStartPage();
diff --git a/client/ui/qml/Controls2/LabelWithButtonType.qml b/client/ui/qml/Controls2/LabelWithButtonType.qml
index bb051f76..6bc45a8c 100644
--- a/client/ui/qml/Controls2/LabelWithButtonType.qml
+++ b/client/ui/qml/Controls2/LabelWithButtonType.qml
@@ -17,6 +17,7 @@ Item {
 
     property string rightImageSource
     property string leftImageSource
+    property bool isLeftImageHoverEnabled: true //todo separete this qml file to 3
 
     property string textColor: "#d7d8db"
     property string descriptionColor: "#878B91"
@@ -42,9 +43,9 @@ Item {
 
             visible: leftImageSource ? true : false
 
-            Layout.preferredHeight: rightImageSource ? leftImage.implicitHeight : 56
-            Layout.preferredWidth: rightImageSource ? leftImage.implicitWidth : 56
-            Layout.rightMargin: rightImageSource ? 16 : 0
+            Layout.preferredHeight: rightImageSource || !isLeftImageHoverEnabled ? leftImage.implicitHeight : 56
+            Layout.preferredWidth: rightImageSource || !isLeftImageHoverEnabled ? leftImage.implicitWidth : 56
+            Layout.rightMargin: rightImageSource || !isLeftImageHoverEnabled ? 16 : 0
 
             radius: 12
             color: "transparent"
diff --git a/client/ui/qml/Pages2/PageSettings.qml b/client/ui/qml/Pages2/PageSettings.qml
index e020dc2c..a806d472 100644
--- a/client/ui/qml/Pages2/PageSettings.qml
+++ b/client/ui/qml/Pages2/PageSettings.qml
@@ -107,6 +107,20 @@ PageType {
             }
 
             DividerType {}
+
+            LabelWithButtonType {
+                Layout.fillWidth: true
+
+                text: qsTr("Close application")
+                leftImageSource: "qrc:/images/controls/x-circle.svg"
+                isLeftImageHoverEnabled: false
+
+                clickedFunction: function() {
+                    PageController.closeApplication()
+                }
+            }
+
+            DividerType {}
         }
     }
 }

From c08e23085ed9361fd19d75008f99542d59d0d9f4 Mon Sep 17 00:00:00 2001
From: Mykola Baibuz <mykola.baibuz@gmail.com>
Date: Mon, 9 Oct 2023 10:29:42 -0400
Subject: [PATCH 198/278] Fix protocol change from AWG to WG for Android

---
 client/3rd-prebuilt                           |  2 +-
 .../src/com/wireguard/config/Interface.java   | 18 ++++++++--------
 .../android/src/org/amnezia/vpn/VPNService.kt | 21 +++++++++++++++++--
 3 files changed, 29 insertions(+), 12 deletions(-)

diff --git a/client/3rd-prebuilt b/client/3rd-prebuilt
index fbb5f586..c3ca525f 160000
--- a/client/3rd-prebuilt
+++ b/client/3rd-prebuilt
@@ -1 +1 @@
-Subproject commit fbb5f586b94efc3f65edeaf9559c8a5c4e752d66
+Subproject commit c3ca525f92e57fecdd6047e35b4ccded8b173407
diff --git a/client/android/src/com/wireguard/config/Interface.java b/client/android/src/com/wireguard/config/Interface.java
index df6b7fb1..4b561680 100644
--- a/client/android/src/com/wireguard/config/Interface.java
+++ b/client/android/src/com/wireguard/config/Interface.java
@@ -595,7 +595,7 @@ public final class Interface {
       if (jc < 0)
         throw new BadConfigException(
             Section.INTERFACE, Location.JC, Reason.INVALID_VALUE, String.valueOf(jc));
-      this.jc = jc == 0 ? Optional.empty() : Optional.of(jc);
+      this.jc = Optional.of(jc);
       return this;
     }      
     
@@ -603,7 +603,7 @@ public final class Interface {
       if (jmin < 0)
         throw new BadConfigException(
             Section.INTERFACE, Location.JMIN, Reason.INVALID_VALUE, String.valueOf(jmin));
-      this.jmin = jmin == 0 ? Optional.empty() : Optional.of(jmin);
+      this.jmin = Optional.of(jmin);
       return this;
     }
 
@@ -611,7 +611,7 @@ public final class Interface {
       if (jmax < 0)
         throw new BadConfigException(
             Section.INTERFACE, Location.JMAX, Reason.INVALID_VALUE, String.valueOf(jmax));
-      this.jmax = jmax == 0 ? Optional.empty() : Optional.of(jmax);
+      this.jmax = Optional.of(jmax);
       return this;
     }
 
@@ -619,7 +619,7 @@ public final class Interface {
       if (s1 < 0)
         throw new BadConfigException(
             Section.INTERFACE, Location.S1, Reason.INVALID_VALUE, String.valueOf(s1));
-      this.s1 = s1 == 0 ? Optional.empty() : Optional.of(s1);
+      this.s1 = Optional.of(s1);
       return this;
     }
 
@@ -627,7 +627,7 @@ public final class Interface {
       if (s2 < 0)
         throw new BadConfigException(
             Section.INTERFACE, Location.S2, Reason.INVALID_VALUE, String.valueOf(s2));
-      this.s2 = s2 == 0 ? Optional.empty() : Optional.of(s2);
+      this.s2 = Optional.of(s2);
       return this;
     }
 
@@ -635,7 +635,7 @@ public final class Interface {
       if (h1 < 0)
         throw new BadConfigException(
             Section.INTERFACE, Location.H1, Reason.INVALID_VALUE, String.valueOf(h1));
-      this.h1 = h1 == 0 ? Optional.empty() : Optional.of(h1);
+      this.h1 = Optional.of(h1);
       return this;
     }
 
@@ -643,7 +643,7 @@ public final class Interface {
       if (h2 < 0)
         throw new BadConfigException(
             Section.INTERFACE, Location.H2, Reason.INVALID_VALUE, String.valueOf(h2));
-      this.h2 = h2 == 0 ? Optional.empty() : Optional.of(h2);
+      this.h2 = Optional.of(h2);
       return this;
     }
 
@@ -651,7 +651,7 @@ public final class Interface {
       if (h3 < 0)
         throw new BadConfigException(
             Section.INTERFACE, Location.H3, Reason.INVALID_VALUE, String.valueOf(h3));
-      this.h3 = h3 == 0 ? Optional.empty() : Optional.of(h3);
+      this.h3 = Optional.of(h3);
       return this;
     }
 
@@ -659,7 +659,7 @@ public final class Interface {
       if (h4 < 0)
         throw new BadConfigException(
             Section.INTERFACE, Location.H4, Reason.INVALID_VALUE, String.valueOf(h4));
-      this.h4 = h4 == 0 ? Optional.empty() : Optional.of(h4);
+      this.h4 = Optional.of(h4);
       return this;
     }
   }
diff --git a/client/android/src/org/amnezia/vpn/VPNService.kt b/client/android/src/org/amnezia/vpn/VPNService.kt
index fe08a3cf..06f58980 100644
--- a/client/android/src/org/amnezia/vpn/VPNService.kt
+++ b/client/android/src/org/amnezia/vpn/VPNService.kt
@@ -615,6 +615,17 @@ class VPNService : BaseVpnService(), LocalDnsService.Interface {
             ifaceBuilder.parseH2(ifaceConfig["H2"])
             ifaceBuilder.parseH3(ifaceConfig["H3"])
             ifaceBuilder.parseH4(ifaceConfig["H4"])
+        } else {
+            ifaceBuilder.parseJc("0")
+            ifaceBuilder.parseJmin("0")
+            ifaceBuilder.parseJmax("0")
+            ifaceBuilder.parseS1("0")
+            ifaceBuilder.parseS2("0")
+            ifaceBuilder.parseH1("0")
+            ifaceBuilder.parseH2("0")
+            ifaceBuilder.parseH3("0")
+            ifaceBuilder.parseH4("0")           
+        
         }
         /*val jExcludedApplication = obj.getJSONArray("excludedApps")
     (0 until jExcludedApplication.length()).toList().forEach {
@@ -745,9 +756,15 @@ class VPNService : BaseVpnService(), LocalDnsService.Interface {
         val builder = Builder()
         setupBuilder(wireguard_conf, builder)
         builder.setSession("Amnezia")
+        
+        
         builder.establish().use { tun ->
-            if (tun == null) return
-            currentTunnelHandle = GoBackend.wgTurnOn("Amnezia", tun.detachFd(), wgConfig)
+        if (tun == null) return
+            if (type == "awg"){
+      	        currentTunnelHandle = GoBackend.wgTurnOn("awg0", tun.detachFd(), wgConfig)
+            } else {
+                currentTunnelHandle = GoBackend.wgTurnOn("amn0", tun.detachFd(), wgConfig)
+            }
         }
         if (currentTunnelHandle < 0) {
             Log.e(tag, "Activation Error Code -> $currentTunnelHandle")

From 042788bec3f8316e9b5ccd73f5b6362ef84cd330 Mon Sep 17 00:00:00 2001
From: "vladimir.kuznetsov" <nethiuswork@gmail.com>
Date: Mon, 9 Oct 2023 20:19:22 +0500
Subject: [PATCH 199/278] moved add new server button to main tabbar

---
 client/ui/qml/Pages2/PageHome.qml             | 13 +------
 .../ui/qml/Pages2/PageSettingsServersList.qml | 10 ------
 .../qml/Pages2/PageSetupWizardInstalling.qml  |  6 +---
 client/ui/qml/Pages2/PageStart.qml            | 35 ++++++++++++++++---
 4 files changed, 33 insertions(+), 31 deletions(-)

diff --git a/client/ui/qml/Pages2/PageHome.qml b/client/ui/qml/Pages2/PageHome.qml
index 3808fb15..519c17a5 100644
--- a/client/ui/qml/Pages2/PageHome.qml
+++ b/client/ui/qml/Pages2/PageHome.qml
@@ -96,7 +96,7 @@ PageType {
         id: dragArea
 
         anchors.fill: buttonBackground
-        cursorShape: Qt.PointingHandCursor
+        cursorShape: buttonContent.state === "collapsed" ? Qt.PointingHandCursor : Qt.ArrowCursor
         hoverEnabled: true
 
         drag.target: buttonContent
@@ -385,18 +385,7 @@ PageType {
                 Layout.rightMargin: 16
                 visible: buttonContent.expandedVisibility
 
-                actionButtonImage: "qrc:/images/controls/plus.svg"
-
                 headerText: qsTr("Servers")
-
-                actionButtonFunction: function() {
-                    buttonContent.state = "collapsed"
-                    connectionTypeSelection.visible = true
-                }
-            }
-
-            ConnectionTypeSelectionDrawer {
-                id: connectionTypeSelection
             }
         }
 
diff --git a/client/ui/qml/Pages2/PageSettingsServersList.qml b/client/ui/qml/Pages2/PageSettingsServersList.qml
index c0807f35..040aafc3 100644
--- a/client/ui/qml/Pages2/PageSettingsServersList.qml
+++ b/client/ui/qml/Pages2/PageSettingsServersList.qml
@@ -34,20 +34,10 @@ PageType {
             Layout.leftMargin: 16
             Layout.rightMargin: 16
 
-            actionButtonImage: "qrc:/images/controls/plus.svg"
-
             headerText: qsTr("Servers")
-
-            actionButtonFunction: function() {
-                connectionTypeSelection.visible = true
-            }
         }
     }
 
-    ConnectionTypeSelectionDrawer {
-        id: connectionTypeSelection
-    }
-
     FlickableType {
         anchors.top: header.bottom
         anchors.topMargin: 16
diff --git a/client/ui/qml/Pages2/PageSetupWizardInstalling.qml b/client/ui/qml/Pages2/PageSetupWizardInstalling.qml
index f2919398..84f6be89 100644
--- a/client/ui/qml/Pages2/PageSetupWizardInstalling.qml
+++ b/client/ui/qml/Pages2/PageSetupWizardInstalling.qml
@@ -42,11 +42,7 @@ PageType {
 
         function onInstallServerFinished(finishedMessage) {
             PageController.goToStartPage()
-            if (stackView.currentItem.objectName === PageController.getPagePath(PageEnum.PageHome)) {
-                PageController.restorePageHomeState()
-            } else if (stackView.currentItem.objectName === PageController.getPagePath(PageEnum.PageSettings)) {
-                PageController.goToPage(PageEnum.PageSettingsServersList, false)
-            } else {
+            if (stackView.currentItem.objectName === PageController.getPagePath(PageEnum.PageSetupWizardStart)) {
                 PageController.replaceStartPage()
             }
 
diff --git a/client/ui/qml/Pages2/PageStart.qml b/client/ui/qml/Pages2/PageStart.qml
index 43366af7..99132bf1 100644
--- a/client/ui/qml/Pages2/PageStart.qml
+++ b/client/ui/qml/Pages2/PageStart.qml
@@ -9,6 +9,7 @@ import "./"
 import "../Controls2"
 import "../Controls2/TextTypes"
 import "../Config"
+import "../Components"
 
 PageType {
     id: root
@@ -17,14 +18,14 @@ PageType {
         target: PageController
 
         function onGoToPageHome() {
-            tabBar.currentIndex = 0
+            tabBar.setCurrentIndex(0)
             tabBarStackView.goToTabBarPage(PageEnum.PageHome)
 
             PageController.updateDrawerRootPage(PageEnum.PageHome)
         }
 
         function onGoToPageSettings() {
-            tabBar.currentIndex = 2
+            tabBar.setCurrentIndex(2)
             tabBarStackView.goToTabBarPage(PageEnum.PageSettings)
 
             PageController.updateDrawerRootPage(PageEnum.PageSettings)
@@ -70,6 +71,7 @@ PageType {
         }
 
         function onGoToStartPage() {
+            connectionTypeSelection.close()
             while (tabBarStackView.depth > 1) {
                 tabBarStackView.pop()
             }
@@ -120,6 +122,8 @@ PageType {
         height: root.height - tabBar.implicitHeight
 
         function goToTabBarPage(page) {
+            connectionTypeSelection.close()
+
             var pagePath = PageController.getPagePath(page)
             tabBarStackView.clear(StackView.Immediate)
             tabBarStackView.replace(pagePath, { "objectName" : pagePath }, StackView.Immediate)
@@ -137,14 +141,16 @@ PageType {
     TabBar {
         id: tabBar
 
+        property int previousIndex: 0
+
         anchors.right: parent.right
         anchors.left: parent.left
         anchors.bottom: parent.bottom
 
         topPadding: 8
         bottomPadding: 8
-        leftPadding: shareTabButton.visible ? 96 : 128
-        rightPadding: shareTabButton.visible ? 96 : 128
+        leftPadding: 96
+        rightPadding: 96
 
         background: Shape {
             width: parent.width
@@ -171,8 +177,10 @@ PageType {
             onClicked: {
                 tabBarStackView.goToTabBarPage(PageEnum.PageHome)
                 ServersModel.currentlyProcessedIndex = ServersModel.defaultIndex
+                tabBar.previousIndex = 0
             }
         }
+
         TabImageButtonType {
             id: shareTabButton
 
@@ -193,13 +201,24 @@ PageType {
             image: "qrc:/images/controls/share-2.svg"
             onClicked: {
                 tabBarStackView.goToTabBarPage(PageEnum.PageShare)
+                tabBar.previousIndex = 1
             }
         }
+
         TabImageButtonType {
             isSelected: tabBar.currentIndex === 2
             image: "qrc:/images/controls/settings-2.svg"
             onClicked: {
                 tabBarStackView.goToTabBarPage(PageEnum.PageSettings)
+                tabBar.previousIndex = 2
+            }
+        }
+
+        TabImageButtonType {
+            isSelected: tabBar.currentIndex === 3
+            image: "qrc:/images/controls/plus.svg"
+            onClicked: {
+                connectionTypeSelection.open()
             }
         }
     }
@@ -215,4 +234,12 @@ PageType {
         x: tabBarStackView.width - topCloseButton.width
         z: 1
     }
+
+    ConnectionTypeSelectionDrawer {
+        id: connectionTypeSelection
+
+        onAboutToHide: {
+            tabBar.setCurrentIndex(tabBar.previousIndex)
+        }
+    }
 }

From d364dbac2ce6c3e1f82bc55950f323915f869b8e Mon Sep 17 00:00:00 2001
From: "vladimir.kuznetsov" <nethiuswork@gmail.com>
Date: Mon, 9 Oct 2023 22:39:32 +0500
Subject: [PATCH 200/278] now when a new container is installed, it is selected
 as the default container

---
 client/translations/amneziavpn_ru.ts          | 28 +++++++++----------
 client/translations/amneziavpn_zh_CN.ts       | 28 +++++++++----------
 client/ui/controllers/installController.cpp   |  1 +
 .../qml/Components/HomeContainersListView.qml |  2 --
 .../qml/Pages2/PageSetupWizardViewConfig.qml  |  6 +---
 client/ui/qml/Pages2/PageShare.qml            |  2 +-
 6 files changed, 31 insertions(+), 36 deletions(-)

diff --git a/client/translations/amneziavpn_ru.ts b/client/translations/amneziavpn_ru.ts
index 92061f89..2f36f748 100644
--- a/client/translations/amneziavpn_ru.ts
+++ b/client/translations/amneziavpn_ru.ts
@@ -162,32 +162,32 @@ Already installed containers were found on the server. All installed containers
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/controllers/installController.cpp" line="263"/>
+        <location filename="../ui/controllers/installController.cpp" line="264"/>
         <source>Settings updated successfully</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/controllers/installController.cpp" line="278"/>
+        <location filename="../ui/controllers/installController.cpp" line="279"/>
         <source>Server &apos;%1&apos; was removed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/controllers/installController.cpp" line="288"/>
+        <location filename="../ui/controllers/installController.cpp" line="289"/>
         <source>All containers from server &apos;%1&apos; have been removed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/controllers/installController.cpp" line="305"/>
+        <location filename="../ui/controllers/installController.cpp" line="306"/>
         <source>%1 has been removed from the server &apos;%2&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/controllers/installController.cpp" line="451"/>
+        <location filename="../ui/controllers/installController.cpp" line="452"/>
         <source>Please login as the user</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/controllers/installController.cpp" line="478"/>
+        <location filename="../ui/controllers/installController.cpp" line="479"/>
         <source>Server added successfully</source>
         <translation type="unfinished"></translation>
     </message>
@@ -260,7 +260,7 @@ Already installed containers were found on the server. All installed containers
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageHome.qml" line="390"/>
+        <location filename="../ui/qml/Pages2/PageHome.qml" line="388"/>
         <source>Servers</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1343,7 +1343,7 @@ And if you don&apos;t like the app, all the more support it - the donation will
 <context>
     <name>PageSettingsServersList</name>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsServersList.qml" line="39"/>
+        <location filename="../ui/qml/Pages2/PageSettingsServersList.qml" line="37"/>
         <source>Servers</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1568,33 +1568,33 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
 <context>
     <name>PageSetupWizardInstalling</name>
     <message>
-        <location filename="../ui/qml/Pages2/PageSetupWizardInstalling.qml" line="61"/>
+        <location filename="../ui/qml/Pages2/PageSetupWizardInstalling.qml" line="57"/>
         <source>The server has already been added to the application</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSetupWizardInstalling.qml" line="66"/>
+        <location filename="../ui/qml/Pages2/PageSetupWizardInstalling.qml" line="62"/>
         <source>Amnesia has detected that your server is currently </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSetupWizardInstalling.qml" line="67"/>
+        <location filename="../ui/qml/Pages2/PageSetupWizardInstalling.qml" line="63"/>
         <source>busy installing other software. Amnesia installation </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSetupWizardInstalling.qml" line="68"/>
+        <location filename="../ui/qml/Pages2/PageSetupWizardInstalling.qml" line="64"/>
         <source>will pause until the server finishes installing other software</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSetupWizardInstalling.qml" line="125"/>
+        <location filename="../ui/qml/Pages2/PageSetupWizardInstalling.qml" line="121"/>
         <source>Installing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSetupWizardInstalling.qml" line="21"/>
-        <location filename="../ui/qml/Pages2/PageSetupWizardInstalling.qml" line="71"/>
+        <location filename="../ui/qml/Pages2/PageSetupWizardInstalling.qml" line="67"/>
         <source>Usually it takes no more than 5 minutes</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/client/translations/amneziavpn_zh_CN.ts b/client/translations/amneziavpn_zh_CN.ts
index 6c57e9f1..c2376be0 100644
--- a/client/translations/amneziavpn_zh_CN.ts
+++ b/client/translations/amneziavpn_zh_CN.ts
@@ -171,22 +171,22 @@ Already installed containers were found on the server. All installed containers
 在服务上发现已经安装协议并添加到应用程序</translation>
     </message>
     <message>
-        <location filename="../ui/controllers/installController.cpp" line="263"/>
+        <location filename="../ui/controllers/installController.cpp" line="264"/>
         <source>Settings updated successfully</source>
         <translation type="unfinished">配置更新成功</translation>
     </message>
     <message>
-        <location filename="../ui/controllers/installController.cpp" line="278"/>
+        <location filename="../ui/controllers/installController.cpp" line="279"/>
         <source>Server &apos;%1&apos; was removed</source>
         <translation type="unfinished">已移除服务器 &apos;%1&apos;</translation>
     </message>
     <message>
-        <location filename="../ui/controllers/installController.cpp" line="288"/>
+        <location filename="../ui/controllers/installController.cpp" line="289"/>
         <source>All containers from server &apos;%1&apos; have been removed</source>
         <translation type="unfinished">服务器 &apos;%1&apos; 的所有容器已移除</translation>
     </message>
     <message>
-        <location filename="../ui/controllers/installController.cpp" line="305"/>
+        <location filename="../ui/controllers/installController.cpp" line="306"/>
         <source>%1 has been removed from the server &apos;%2&apos;</source>
         <translation type="unfinished">%1 已从服务器 &apos;%2&apos; 上移除</translation>
     </message>
@@ -207,12 +207,12 @@ Already installed containers were found on the server. All installed containers
         <translation type="obsolete"> 协议已从</translation>
     </message>
     <message>
-        <location filename="../ui/controllers/installController.cpp" line="451"/>
+        <location filename="../ui/controllers/installController.cpp" line="452"/>
         <source>Please login as the user</source>
         <translation type="unfinished">请以用户身份登录</translation>
     </message>
     <message>
-        <location filename="../ui/controllers/installController.cpp" line="478"/>
+        <location filename="../ui/controllers/installController.cpp" line="479"/>
         <source>Server added successfully</source>
         <translation type="unfinished">服务器添加成功</translation>
     </message>
@@ -285,7 +285,7 @@ Already installed containers were found on the server. All installed containers
         <translation type="unfinished">VPN协议</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageHome.qml" line="390"/>
+        <location filename="../ui/qml/Pages2/PageHome.qml" line="388"/>
         <source>Servers</source>
         <translation type="unfinished">服务器</translation>
     </message>
@@ -1378,7 +1378,7 @@ And if you don&apos;t like the app, all the more support it - the donation will
 <context>
     <name>PageSettingsServersList</name>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsServersList.qml" line="39"/>
+        <location filename="../ui/qml/Pages2/PageSettingsServersList.qml" line="37"/>
         <source>Servers</source>
         <translation type="unfinished">服务器</translation>
     </message>
@@ -1605,32 +1605,32 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
     <name>PageSetupWizardInstalling</name>
     <message>
         <location filename="../ui/qml/Pages2/PageSetupWizardInstalling.qml" line="21"/>
-        <location filename="../ui/qml/Pages2/PageSetupWizardInstalling.qml" line="71"/>
+        <location filename="../ui/qml/Pages2/PageSetupWizardInstalling.qml" line="67"/>
         <source>Usually it takes no more than 5 minutes</source>
         <translation type="unfinished">通常不超过5分钟</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSetupWizardInstalling.qml" line="61"/>
+        <location filename="../ui/qml/Pages2/PageSetupWizardInstalling.qml" line="57"/>
         <source>The server has already been added to the application</source>
         <translation type="unfinished">服务器已添加到应用程序中</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSetupWizardInstalling.qml" line="66"/>
+        <location filename="../ui/qml/Pages2/PageSetupWizardInstalling.qml" line="62"/>
         <source>Amnesia has detected that your server is currently </source>
         <translation type="unfinished">Amnezia 检测到您的服务器当前</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSetupWizardInstalling.qml" line="67"/>
+        <location filename="../ui/qml/Pages2/PageSetupWizardInstalling.qml" line="63"/>
         <source>busy installing other software. Amnesia installation </source>
         <translation type="unfinished">正安装其他软件。Amnezia安装</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSetupWizardInstalling.qml" line="68"/>
+        <location filename="../ui/qml/Pages2/PageSetupWizardInstalling.qml" line="64"/>
         <source>will pause until the server finishes installing other software</source>
         <translation type="unfinished">将暂停，直到服务器完成安装其他软件。</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSetupWizardInstalling.qml" line="125"/>
+        <location filename="../ui/qml/Pages2/PageSetupWizardInstalling.qml" line="121"/>
         <source>Installing</source>
         <translation type="unfinished">安装中</translation>
     </message>
diff --git a/client/ui/controllers/installController.cpp b/client/ui/controllers/installController.cpp
index 72cc34b6..34917cac 100644
--- a/client/ui/controllers/installController.cpp
+++ b/client/ui/controllers/installController.cpp
@@ -183,6 +183,7 @@ void InstallController::installContainer(DockerContainer container, QJsonObject
                                 "All installed containers have been added to the application");
         }
 
+        m_containersModel->setData(m_containersModel->index(0, 0), container, ContainersModel::Roles::IsDefaultRole);
         emit installContainerFinished(finishMessage, ContainerProps::containerService(container) == ServiceType::Other);
         return;
     }
diff --git a/client/ui/qml/Components/HomeContainersListView.qml b/client/ui/qml/Components/HomeContainersListView.qml
index 4708128f..86a755c1 100644
--- a/client/ui/qml/Components/HomeContainersListView.qml
+++ b/client/ui/qml/Components/HomeContainersListView.qml
@@ -76,7 +76,6 @@ ListView {
                                 (ConnectionController.isConnected || ConnectionController.isConnectionInProgress)) {
                             PageController.showNotificationMessage(qsTr("Reconnect via VPN Procotol: ") + name)
                             PageController.goToPageHome()
-                            menu.visible = false
                             ConnectionController.openConnection()
                         }
                     } else {
@@ -84,7 +83,6 @@ ListView {
                         InstallController.setShouldCreateServer(false)
                         PageController.goToPage(PageEnum.PageSetupWizardProtocolSettings)
                         containersDropDown.menuVisible = false
-                        menu.visible = false
                     }
                 }
 
diff --git a/client/ui/qml/Pages2/PageSetupWizardViewConfig.qml b/client/ui/qml/Pages2/PageSetupWizardViewConfig.qml
index 2f1fc392..83132bd9 100644
--- a/client/ui/qml/Pages2/PageSetupWizardViewConfig.qml
+++ b/client/ui/qml/Pages2/PageSetupWizardViewConfig.qml
@@ -25,11 +25,7 @@ PageType {
 
         function onImportFinished() {
             PageController.goToStartPage()
-            if (stackView.currentItem.objectName === PageController.getPagePath(PageEnum.PageHome)) {
-                PageController.restorePageHomeState()
-            } else if (stackView.currentItem.objectName === PageController.getPagePath(PageEnum.PageSettings)) {
-                PageController.goToPage(PageEnum.PageSettingsServersList, false)
-            } else {
+            if (stackView.currentItem.objectName === PageController.getPagePath(PageEnum.PageSetupWizardStart)) {
                 PageController.replaceStartPage()
             }
         }
diff --git a/client/ui/qml/Pages2/PageShare.qml b/client/ui/qml/Pages2/PageShare.qml
index 6c284278..2fa5e4a1 100644
--- a/client/ui/qml/Pages2/PageShare.qml
+++ b/client/ui/qml/Pages2/PageShare.qml
@@ -187,7 +187,7 @@ PageType {
 
                 drawerHeight: 0.4375
 
-                descriptionText: qsTr("Servers")
+                descriptionText: qsTr("Server")
                 headerText: qsTr("Server")
 
                 listView: ListViewWithRadioButtonType {

From cb7fe50d46190b59c73793956aed0e00778fa67f Mon Sep 17 00:00:00 2001
From: "vladimir.kuznetsov" <nethiuswork@gmail.com>
Date: Mon, 9 Oct 2023 22:40:06 +0500
Subject: [PATCH 201/278] added margins for picture with qr code

---
 client/ui/qml/Components/ShareConnectionDrawer.qml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/client/ui/qml/Components/ShareConnectionDrawer.qml b/client/ui/qml/Components/ShareConnectionDrawer.qml
index 2419b51a..1158dadc 100644
--- a/client/ui/qml/Components/ShareConnectionDrawer.qml
+++ b/client/ui/qml/Components/ShareConnectionDrawer.qml
@@ -213,6 +213,7 @@ DrawerType {
 
                     Image {
                         anchors.fill: parent
+                        anchors.margins: 2
                         smooth: false
 
                         source: ExportController.qrCodesCount ? ExportController.qrCodes[0] : ""

From 00be3c3ccc61be2640c39aa69e96d8210ea81c2e Mon Sep 17 00:00:00 2001
From: "vladimir.kuznetsov" <nethiuswork@gmail.com>
Date: Mon, 9 Oct 2023 22:54:33 +0500
Subject: [PATCH 202/278] corrections to the text

---
 client/ui/qml/Pages2/PageProtocolOpenVpnSettings.qml | 2 +-
 client/ui/qml/Pages2/PageProtocolRaw.qml             | 2 +-
 client/ui/qml/Pages2/PageSettingsAbout.qml           | 4 ++--
 client/ui/qml/Pages2/PageSettingsBackup.qml          | 2 +-
 client/ui/qml/Pages2/PageSettingsConnection.qml      | 2 +-
 client/ui/qml/Pages2/PageSettingsServerProtocol.qml  | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/client/ui/qml/Pages2/PageProtocolOpenVpnSettings.qml b/client/ui/qml/Pages2/PageProtocolOpenVpnSettings.qml
index 491bdf31..c8469dcb 100644
--- a/client/ui/qml/Pages2/PageProtocolOpenVpnSettings.qml
+++ b/client/ui/qml/Pages2/PageProtocolOpenVpnSettings.qml
@@ -360,7 +360,7 @@ PageType {
 
                             onClicked: {
                                 questionDrawer.headerText = qsTr("Remove OpenVpn from server?")
-                                questionDrawer.descriptionText = qsTr("All users with whom you shared a connection will no longer be able to connect to it")
+                                questionDrawer.descriptionText = qsTr("All users who you shared a connection with will no longer be able to connect to it.")
                                 questionDrawer.yesButtonText = qsTr("Continue")
                                 questionDrawer.noButtonText = qsTr("Cancel")
 
diff --git a/client/ui/qml/Pages2/PageProtocolRaw.qml b/client/ui/qml/Pages2/PageProtocolRaw.qml
index 34ca4055..2324c091 100644
--- a/client/ui/qml/Pages2/PageProtocolRaw.qml
+++ b/client/ui/qml/Pages2/PageProtocolRaw.qml
@@ -174,7 +174,7 @@ PageType {
 
                 clickedFunction: function() {
                     questionDrawer.headerText = qsTr("Remove %1 from server?").arg(ContainersModel.getCurrentlyProcessedContainerName())
-                    questionDrawer.descriptionText = qsTr("All users with whom you shared a connection will no longer be able to connect to it")
+                    questionDrawer.descriptionText = qsTr("All users who you shared a connection with will no longer be able to connect to it.")
                     questionDrawer.yesButtonText = qsTr("Continue")
                     questionDrawer.noButtonText = qsTr("Cancel")
 
diff --git a/client/ui/qml/Pages2/PageSettingsAbout.qml b/client/ui/qml/Pages2/PageSettingsAbout.qml
index e73ef88f..eaa9eb3d 100644
--- a/client/ui/qml/Pages2/PageSettingsAbout.qml
+++ b/client/ui/qml/Pages2/PageSettingsAbout.qml
@@ -68,8 +68,8 @@ PageType {
                 height: 20
                 font.pixelSize: 14
 
-                text: qsTr("This is a free and open source application. If you like it, support the developers with a donation.
-And if you don't like the app, all the more support it - the donation will be used to improve the app.")
+                text: qsTr("This is a free and open source application. If you like it, support the developers with a donation. ") +
+                      qsTr("And if you don’t like the application, all the more reason to support it - the donation will be used for the improving the application.")
                 color: "#CCCAC8"
             }
 
diff --git a/client/ui/qml/Pages2/PageSettingsBackup.qml b/client/ui/qml/Pages2/PageSettingsBackup.qml
index 7a556dfb..96214893 100644
--- a/client/ui/qml/Pages2/PageSettingsBackup.qml
+++ b/client/ui/qml/Pages2/PageSettingsBackup.qml
@@ -77,7 +77,7 @@ PageType {
                 Layout.fillWidth: true
                 Layout.topMargin: -12
 
-                text: qsTr("It will help you instantly restore connection settings at the next installation")
+                text: qsTr("You can save your settings to a backup file to restore them the next time you install the application.")
                 color: "#878B91"
             }
 
diff --git a/client/ui/qml/Pages2/PageSettingsConnection.qml b/client/ui/qml/Pages2/PageSettingsConnection.qml
index ae5fd7f4..374e1ce4 100644
--- a/client/ui/qml/Pages2/PageSettingsConnection.qml
+++ b/client/ui/qml/Pages2/PageSettingsConnection.qml
@@ -97,7 +97,7 @@ PageType {
                 Layout.fillWidth: true
 
                 text: qsTr("Split site tunneling")
-                descriptionText: qsTr("Allows you to connect to some sites through a secure connection, and to others bypassing it")
+                descriptionText: qsTr("Allows you to choose which sites you want to use the VPN for.")
                 rightImageSource: "qrc:/images/controls/chevron-right.svg"
 
                 clickedFunction: function() {
diff --git a/client/ui/qml/Pages2/PageSettingsServerProtocol.qml b/client/ui/qml/Pages2/PageSettingsServerProtocol.qml
index 998948d1..30758da4 100644
--- a/client/ui/qml/Pages2/PageSettingsServerProtocol.qml
+++ b/client/ui/qml/Pages2/PageSettingsServerProtocol.qml
@@ -114,7 +114,7 @@ PageType {
 
                 clickedFunction: function() {
                     questionDrawer.headerText = qsTr("Remove %1 from server?").arg(ContainersModel.getCurrentlyProcessedContainerName())
-                    questionDrawer.descriptionText = qsTr("All users with whom you shared a connection will no longer be able to connect to it")
+                    questionDrawer.descriptionText = qsTr("All users who you shared a connection with will no longer be able to connect to it.")
                     questionDrawer.yesButtonText = qsTr("Continue")
                     questionDrawer.noButtonText = qsTr("Cancel")
 

From 4a2706a9d9d9df05767661fbb7ceaeb966ff94b2 Mon Sep 17 00:00:00 2001
From: "vladimir.kuznetsov" <nethiuswork@gmail.com>
Date: Mon, 9 Oct 2023 23:00:53 +0500
Subject: [PATCH 203/278] increased the application version to 4.0.8.1

---
 CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 716d6a7f..af4ae898 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.25.0 FATAL_ERROR)
 
 set(PROJECT AmneziaVPN)
 
-project(${PROJECT} VERSION 4.0.7.1
+project(${PROJECT} VERSION 4.0.8.1
         DESCRIPTION "AmneziaVPN"
         HOMEPAGE_URL "https://amnezia.org/"
 )

From bb2d794b6fe596b11321e9fbb0e8cc828ea59c01 Mon Sep 17 00:00:00 2001
From: "vladimir.kuznetsov" <nethiuswork@gmail.com>
Date: Mon, 9 Oct 2023 23:18:24 +0500
Subject: [PATCH 204/278] corrections to the text

---
 client/containers/containers_defs.cpp         |   4 +-
 client/protocols/protocols_defs.cpp           |   2 +-
 client/translations/amneziavpn_ru.ts          | 298 ++++++++++++------
 client/translations/amneziavpn_zh_CN.ts       | 294 ++++++++++++-----
 .../ui/qml/Pages2/PageProtocolAwgSettings.qml |   8 +-
 5 files changed, 431 insertions(+), 175 deletions(-)

diff --git a/client/containers/containers_defs.cpp b/client/containers/containers_defs.cpp
index 0337eb44..fd13bfe0 100644
--- a/client/containers/containers_defs.cpp
+++ b/client/containers/containers_defs.cpp
@@ -84,7 +84,7 @@ QMap<DockerContainer, QString> ContainerProps::containerHumanNames()
              { DockerContainer::ShadowSocks, "ShadowSocks" },
              { DockerContainer::Cloak, "OpenVPN over Cloak" },
              { DockerContainer::WireGuard, "WireGuard" },
-            { DockerContainer::Awg, "Amnezia WireGuard" },
+             { DockerContainer::Awg, "AmneziaWG" },
              { DockerContainer::Ipsec, QObject::tr("IPsec") },
 
              { DockerContainer::TorWebSite, QObject::tr("Website in Tor network") },
@@ -131,7 +131,7 @@ QMap<DockerContainer, QString> ContainerProps::containerDetailedDescriptions()
                QObject::tr("Container with OpenVpn and ShadowSocks protocols "
                            "configured with traffic masking by Cloak plugin") },
              { DockerContainer::WireGuard, QObject::tr("WireGuard container") },
-             { DockerContainer::WireGuard, QObject::tr("Amnezia WireGuard container") },
+             { DockerContainer::WireGuard, QObject::tr("AmneziaWG container") },
              { DockerContainer::Ipsec, QObject::tr("IPsec container") },
 
              { DockerContainer::TorWebSite, QObject::tr("Website in Tor network") },
diff --git a/client/protocols/protocols_defs.cpp b/client/protocols/protocols_defs.cpp
index 3982ef9c..b7f6b1d8 100644
--- a/client/protocols/protocols_defs.cpp
+++ b/client/protocols/protocols_defs.cpp
@@ -66,7 +66,7 @@ QMap<amnezia::Proto, QString> ProtocolProps::protocolHumanNames()
              { Proto::ShadowSocks, "ShadowSocks" },
              { Proto::Cloak, "Cloak" },
              { Proto::WireGuard, "WireGuard" },
-             { Proto::WireGuard, "Amnezia WireGuard" },
+             { Proto::WireGuard, "AmneziaWG" },
              { Proto::Ikev2, "IKEv2" },
              { Proto::L2tp, "L2TP" },
 
diff --git a/client/translations/amneziavpn_ru.ts b/client/translations/amneziavpn_ru.ts
index e0bab018..f2e7a811 100644
--- a/client/translations/amneziavpn_ru.ts
+++ b/client/translations/amneziavpn_ru.ts
@@ -26,41 +26,41 @@
 <context>
     <name>ConnectionController</name>
     <message>
-        <location filename="../ui/controllers/connectionController.cpp" line="55"/>
+        <location filename="../ui/controllers/connectionController.cpp" line="38"/>
         <source>VPN Protocols is not installed.
  Please install VPN container at first</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/controllers/connectionController.cpp" line="78"/>
+        <location filename="../ui/controllers/connectionController.cpp" line="61"/>
         <source>Connection...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/controllers/connectionController.cpp" line="83"/>
+        <location filename="../ui/controllers/connectionController.cpp" line="66"/>
         <source>Connected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/controllers/connectionController.cpp" line="128"/>
+        <location filename="../ui/controllers/connectionController.cpp" line="111"/>
         <source>Settings updated successfully, Reconnnection...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/controllers/connectionController.cpp" line="92"/>
+        <location filename="../ui/controllers/connectionController.cpp" line="75"/>
         <source>Reconnection...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../ui/controllers/connectionController.h" line="58"/>
-        <location filename="../ui/controllers/connectionController.cpp" line="97"/>
-        <location filename="../ui/controllers/connectionController.cpp" line="111"/>
-        <location filename="../ui/controllers/connectionController.cpp" line="117"/>
+        <location filename="../ui/controllers/connectionController.cpp" line="80"/>
+        <location filename="../ui/controllers/connectionController.cpp" line="94"/>
+        <location filename="../ui/controllers/connectionController.cpp" line="100"/>
         <source>Connect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/controllers/connectionController.cpp" line="102"/>
+        <location filename="../ui/controllers/connectionController.cpp" line="85"/>
         <source>Disconnection...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -122,7 +122,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Components/HomeContainersListView.qml" line="77"/>
+        <location filename="../ui/qml/Components/HomeContainersListView.qml" line="76"/>
         <source>Reconnect via VPN Procotol: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -130,7 +130,7 @@
 <context>
     <name>ImportController</name>
     <message>
-        <location filename="../ui/controllers/importController.cpp" line="384"/>
+        <location filename="../ui/controllers/importController.cpp" line="429"/>
         <source>Scanned %1 of %2.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -139,50 +139,55 @@
     <name>InstallController</name>
     <message>
         <location filename="../ui/controllers/installController.cpp" line="110"/>
-        <location filename="../ui/controllers/installController.cpp" line="162"/>
+        <location filename="../ui/controllers/installController.cpp" line="161"/>
         <source>%1 installed successfully. </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../ui/controllers/installController.cpp" line="112"/>
-        <location filename="../ui/controllers/installController.cpp" line="164"/>
+        <location filename="../ui/controllers/installController.cpp" line="163"/>
         <source>%1 is already installed on the server. </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../ui/controllers/installController.cpp" line="115"/>
-        <location filename="../ui/controllers/installController.cpp" line="183"/>
+        <source>
+Added containers that were already installed on the server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/controllers/installController.cpp" line="182"/>
         <source>
 Already installed containers were found on the server. All installed containers have been added to the application</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/controllers/installController.cpp" line="264"/>
+        <location filename="../ui/controllers/installController.cpp" line="263"/>
         <source>Settings updated successfully</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/controllers/installController.cpp" line="279"/>
+        <location filename="../ui/controllers/installController.cpp" line="278"/>
         <source>Server &apos;%1&apos; was removed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/controllers/installController.cpp" line="289"/>
+        <location filename="../ui/controllers/installController.cpp" line="288"/>
         <source>All containers from server &apos;%1&apos; have been removed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/controllers/installController.cpp" line="306"/>
+        <location filename="../ui/controllers/installController.cpp" line="305"/>
         <source>%1 has been removed from the server &apos;%2&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/controllers/installController.cpp" line="452"/>
+        <location filename="../ui/controllers/installController.cpp" line="451"/>
         <source>Please login as the user</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/controllers/installController.cpp" line="479"/>
+        <location filename="../ui/controllers/installController.cpp" line="478"/>
         <source>Server added successfully</source>
         <translation type="unfinished"></translation>
     </message>
@@ -250,16 +255,104 @@ Already installed containers were found on the server. All installed containers
 <context>
     <name>PageHome</name>
     <message>
-        <location filename="../ui/qml/Pages2/PageHome.qml" line="193"/>
+        <location filename="../ui/qml/Pages2/PageHome.qml" line="344"/>
         <source>VPN protocol</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageHome.qml" line="238"/>
+        <location filename="../ui/qml/Pages2/PageHome.qml" line="390"/>
         <source>Servers</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>PageProtocolAwgSettings</name>
+    <message>
+        <location filename="../ui/qml/Pages2/PageProtocolAwgSettings.qml" line="76"/>
+        <source>AmneziaWG settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageProtocolAwgSettings.qml" line="84"/>
+        <source>Port</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageProtocolAwgSettings.qml" line="103"/>
+        <source>Junk packet count</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageProtocolAwgSettings.qml" line="126"/>
+        <source>Junk packet minimum size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageProtocolAwgSettings.qml" line="144"/>
+        <source>Junk packet maximum size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageProtocolAwgSettings.qml" line="162"/>
+        <source>Init packet junk size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageProtocolAwgSettings.qml" line="180"/>
+        <source>Response packet junk size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageProtocolAwgSettings.qml" line="198"/>
+        <source>Init packet magic header</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageProtocolAwgSettings.qml" line="216"/>
+        <source>Response packet magic header</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageProtocolAwgSettings.qml" line="234"/>
+        <source>Transport packet magic header</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageProtocolAwgSettings.qml" line="252"/>
+        <source>Underload packet magic header</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageProtocolAwgSettings.qml" line="275"/>
+        <source>Remove AmneziaWG</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageProtocolAwgSettings.qml" line="278"/>
+        <source>Remove AmneziaWG from server?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageProtocolAwgSettings.qml" line="279"/>
+        <source>All users who you shared a connection with will no longer be able to connect to it.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageProtocolAwgSettings.qml" line="280"/>
+        <source>Continue</source>
+        <translation type="unfinished">Продолжить</translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageProtocolAwgSettings.qml" line="281"/>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageProtocolAwgSettings.qml" line="311"/>
+        <source>Save and Restart Amnezia</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>PageProtocolCloakSettings</name>
     <message>
@@ -865,71 +958,76 @@ And if you don&apos;t like the app, all the more support it - the donation will
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="52"/>
+        <source>Allow application screenshots</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="72"/>
         <source>Auto start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="53"/>
+        <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="73"/>
         <source>Launch the application every time </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="53"/>
+        <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="73"/>
         <source> starts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="73"/>
+        <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="93"/>
         <source>Start minimized</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="74"/>
+        <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="94"/>
         <source>Launch application minimized</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="91"/>
+        <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="111"/>
         <source>Language</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="110"/>
+        <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="130"/>
         <source>Logging</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="111"/>
+        <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="131"/>
         <source>Enabled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="111"/>
+        <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="131"/>
         <source>Disabled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="124"/>
+        <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="144"/>
         <source>Reset settings and remove all data from the application</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="128"/>
+        <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="148"/>
         <source>Reset settings and remove all data from the application?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="129"/>
+        <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="149"/>
         <source>All settings will be reset to default. All installed AmneziaVPN services will still remain on the server.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="130"/>
+        <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="150"/>
         <source>Continue</source>
         <translation type="unfinished">Продолжить</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="131"/>
+        <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="151"/>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1525,17 +1623,17 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
 <context>
     <name>PageSetupWizardEasy</name>
     <message>
-        <location filename="../ui/qml/Pages2/PageSetupWizardEasy.qml" line="66"/>
+        <location filename="../ui/qml/Pages2/PageSetupWizardEasy.qml" line="67"/>
         <source>What is the level of internet control in your region?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSetupWizardEasy.qml" line="136"/>
+        <location filename="../ui/qml/Pages2/PageSetupWizardEasy.qml" line="137"/>
         <source>Set up a VPN yourself</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSetupWizardEasy.qml" line="137"/>
+        <location filename="../ui/qml/Pages2/PageSetupWizardEasy.qml" line="138"/>
         <source>I want to choose a VPN protocol</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1545,7 +1643,7 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
         <translation type="unfinished">Продолжить</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSetupWizardEasy.qml" line="186"/>
+        <location filename="../ui/qml/Pages2/PageSetupWizardEasy.qml" line="197"/>
         <source>Set up later</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1749,11 +1847,6 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
         <source>VPN access without the ability to manage the server</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../ui/qml/Pages2/PageShare.qml" line="175"/>
-        <source>Full access to server</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="../ui/qml/Pages2/PageShare.qml" line="191"/>
         <source>Server</source>
@@ -1765,13 +1858,17 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageShare.qml" line="306"/>
+        <location filename="../ui/qml/Pages2/PageShare.qml" line="222"/>
+        <source>File with accessing settings to </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageShare.qml" line="309"/>
         <source>Connection to </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageShare.qml" line="222"/>
-        <location filename="../ui/qml/Pages2/PageShare.qml" line="307"/>
+        <location filename="../ui/qml/Pages2/PageShare.qml" line="310"/>
         <source>File with connection settings to </source>
         <translation type="unfinished"></translation>
     </message>
@@ -1795,29 +1892,30 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
         <source>Full access</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageShare.qml" line="175"/>
+        <source>Access to server management. The user with whom you share full access to the connection will be able to add and remove your protocols and services to the servers, as well as change settings.</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location filename="../ui/qml/Pages2/PageShare.qml" line="190"/>
         <source>Servers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageShare.qml" line="248"/>
-        <source>Protocols</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Pages2/PageShare.qml" line="249"/>
+        <location filename="../ui/qml/Pages2/PageShare.qml" line="251"/>
+        <location filename="../ui/qml/Pages2/PageShare.qml" line="252"/>
         <source>Protocol</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageShare.qml" line="340"/>
-        <location filename="../ui/qml/Pages2/PageShare.qml" line="341"/>
+        <location filename="../ui/qml/Pages2/PageShare.qml" line="343"/>
+        <location filename="../ui/qml/Pages2/PageShare.qml" line="344"/>
         <source>Connection format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageShare.qml" line="379"/>
+        <location filename="../ui/qml/Pages2/PageShare.qml" line="382"/>
         <source>Share</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2273,103 +2371,109 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../containers/containers_defs.cpp" line="87"/>
+        <location filename="../containers/containers_defs.cpp" line="88"/>
         <source>IPsec</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../containers/containers_defs.cpp" line="133"/>
+        <location filename="../containers/containers_defs.cpp" line="138"/>
         <source>DNS Service</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../containers/containers_defs.cpp" line="92"/>
+        <location filename="../containers/containers_defs.cpp" line="93"/>
         <source>Sftp file sharing service</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../containers/containers_defs.cpp" line="89"/>
-        <location filename="../containers/containers_defs.cpp" line="132"/>
+        <location filename="../containers/containers_defs.cpp" line="90"/>
+        <location filename="../containers/containers_defs.cpp" line="137"/>
         <source>Website in Tor network</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../containers/containers_defs.cpp" line="90"/>
+        <location filename="../containers/containers_defs.cpp" line="91"/>
         <source>Amnezia DNS</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../containers/containers_defs.cpp" line="98"/>
+        <location filename="../containers/containers_defs.cpp" line="99"/>
         <source>OpenVPN is the most popular VPN protocol, with flexible configuration options. It uses its own security protocol with SSL/TLS for key exchange.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../containers/containers_defs.cpp" line="101"/>
+        <location filename="../containers/containers_defs.cpp" line="102"/>
         <source>ShadowSocks - masks VPN traffic, making it similar to normal web traffic, but is recognised by analysis systems in some highly censored regions.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../containers/containers_defs.cpp" line="104"/>
+        <location filename="../containers/containers_defs.cpp" line="105"/>
         <source>OpenVPN over Cloak - OpenVPN with VPN masquerading as web traffic and protection against active-probbing detection. Ideal for bypassing blocking in regions with the highest levels of censorship.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../containers/containers_defs.cpp" line="108"/>
+        <location filename="../containers/containers_defs.cpp" line="109"/>
+        <location filename="../containers/containers_defs.cpp" line="112"/>
         <source>WireGuard - New popular VPN protocol with high performance, high speed and low power consumption. Recommended for regions with low levels of censorship.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../containers/containers_defs.cpp" line="111"/>
+        <location filename="../containers/containers_defs.cpp" line="115"/>
         <source>IKEv2 -  Modern stable protocol, a bit faster than others, restores connection after signal loss. It has native support on the latest versions of Android and iOS.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../containers/containers_defs.cpp" line="114"/>
+        <location filename="../containers/containers_defs.cpp" line="118"/>
         <source>Deploy a WordPress site on the Tor network in two clicks.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../containers/containers_defs.cpp" line="116"/>
+        <location filename="../containers/containers_defs.cpp" line="120"/>
         <source>Replace the current DNS server with your own. This will increase your privacy level.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../containers/containers_defs.cpp" line="119"/>
+        <location filename="../containers/containers_defs.cpp" line="123"/>
         <source>Creates a file vault on your server to securely store and transfer files.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../containers/containers_defs.cpp" line="124"/>
+        <location filename="../containers/containers_defs.cpp" line="128"/>
         <source>OpenVPN container</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../containers/containers_defs.cpp" line="125"/>
+        <location filename="../containers/containers_defs.cpp" line="129"/>
         <source>Container with OpenVpn and ShadowSocks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../containers/containers_defs.cpp" line="127"/>
+        <location filename="../containers/containers_defs.cpp" line="131"/>
         <source>Container with OpenVpn and ShadowSocks protocols configured with traffic masking by Cloak plugin</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../containers/containers_defs.cpp" line="129"/>
+        <location filename="../containers/containers_defs.cpp" line="133"/>
         <source>WireGuard container</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../containers/containers_defs.cpp" line="130"/>
-        <source>IPsec container</source>
+        <location filename="../containers/containers_defs.cpp" line="134"/>
+        <source>AmneziaWG container</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../containers/containers_defs.cpp" line="135"/>
+        <source>IPsec container</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../containers/containers_defs.cpp" line="140"/>
         <source>Sftp file sharing service - is secure FTP service</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../protocols/protocols_defs.cpp" line="75"/>
+        <location filename="../protocols/protocols_defs.cpp" line="76"/>
         <source>Sftp service</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2433,6 +2537,16 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
         <source>error 0x%1: %2</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../3rd/wireguard-tools/contrib/highlighter/gui/highlight.cpp" line="39"/>
+        <source>WireGuard Configuration Highlighter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../3rd/wireguard-tools/contrib/highlighter/gui/highlight.cpp" line="82"/>
+        <source>&amp;Randomize colors</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SelectLanguageDrawer</name>
@@ -2459,22 +2573,22 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
 <context>
     <name>SettingsController</name>
     <message>
-        <location filename="../ui/controllers/settingsController.cpp" line="20"/>
+        <location filename="../ui/controllers/settingsController.cpp" line="25"/>
         <source>Software version</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/controllers/settingsController.cpp" line="117"/>
+        <location filename="../ui/controllers/settingsController.cpp" line="136"/>
         <source>All settings have been reset to default values</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/controllers/settingsController.cpp" line="123"/>
+        <location filename="../ui/controllers/settingsController.cpp" line="142"/>
         <source>Cached profiles cleared</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/controllers/settingsController.cpp" line="102"/>
+        <location filename="../ui/controllers/settingsController.cpp" line="121"/>
         <source>Backup file is corrupted</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2504,7 +2618,7 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
     </message>
     <message>
         <location filename="../ui/qml/Components/ShareConnectionDrawer.qml" line="126"/>
-        <source>Show content</source>
+        <source>Show connection settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -2589,6 +2703,14 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>TextFieldWithHeaderType</name>
+    <message>
+        <location filename="../ui/qml/Controls2/TextFieldWithHeaderType.qml" line="105"/>
+        <source>The field can&apos;t be empty</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>VpnConnection</name>
     <message>
@@ -2643,32 +2765,32 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
 <context>
     <name>amnezia::ContainerProps</name>
     <message>
-        <location filename="../containers/containers_defs.cpp" line="236"/>
+        <location filename="../containers/containers_defs.cpp" line="245"/>
         <source>Low</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../containers/containers_defs.cpp" line="237"/>
+        <location filename="../containers/containers_defs.cpp" line="246"/>
         <source>High</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../containers/containers_defs.cpp" line="238"/>
+        <location filename="../containers/containers_defs.cpp" line="247"/>
         <source>Medium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../containers/containers_defs.cpp" line="247"/>
+        <location filename="../containers/containers_defs.cpp" line="256"/>
         <source>Many foreign websites and VPN providers are blocked</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../containers/containers_defs.cpp" line="248"/>
+        <location filename="../containers/containers_defs.cpp" line="257"/>
         <source>Some foreign sites are blocked, but VPN providers are not blocked</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../containers/containers_defs.cpp" line="246"/>
+        <location filename="../containers/containers_defs.cpp" line="255"/>
         <source>I just want to increase the level of privacy</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/client/translations/amneziavpn_zh_CN.ts b/client/translations/amneziavpn_zh_CN.ts
index 37e27786..cbf0caa1 100644
--- a/client/translations/amneziavpn_zh_CN.ts
+++ b/client/translations/amneziavpn_zh_CN.ts
@@ -27,40 +27,40 @@
     <name>ConnectionController</name>
     <message>
         <location filename="../ui/controllers/connectionController.h" line="58"/>
-        <location filename="../ui/controllers/connectionController.cpp" line="97"/>
-        <location filename="../ui/controllers/connectionController.cpp" line="111"/>
-        <location filename="../ui/controllers/connectionController.cpp" line="117"/>
+        <location filename="../ui/controllers/connectionController.cpp" line="80"/>
+        <location filename="../ui/controllers/connectionController.cpp" line="94"/>
+        <location filename="../ui/controllers/connectionController.cpp" line="100"/>
         <source>Connect</source>
         <translation type="unfinished">连接</translation>
     </message>
     <message>
-        <location filename="../ui/controllers/connectionController.cpp" line="55"/>
+        <location filename="../ui/controllers/connectionController.cpp" line="38"/>
         <source>VPN Protocols is not installed.
  Please install VPN container at first</source>
         <translation type="unfinished">不存在VPN协议，请先安装</translation>
     </message>
     <message>
-        <location filename="../ui/controllers/connectionController.cpp" line="78"/>
+        <location filename="../ui/controllers/connectionController.cpp" line="61"/>
         <source>Connection...</source>
         <translation type="unfinished">连接中</translation>
     </message>
     <message>
-        <location filename="../ui/controllers/connectionController.cpp" line="83"/>
+        <location filename="../ui/controllers/connectionController.cpp" line="66"/>
         <source>Connected</source>
         <translation type="unfinished">已连接</translation>
     </message>
     <message>
-        <location filename="../ui/controllers/connectionController.cpp" line="92"/>
+        <location filename="../ui/controllers/connectionController.cpp" line="75"/>
         <source>Reconnection...</source>
         <translation type="unfinished">重连中</translation>
     </message>
     <message>
-        <location filename="../ui/controllers/connectionController.cpp" line="102"/>
+        <location filename="../ui/controllers/connectionController.cpp" line="85"/>
         <source>Disconnection...</source>
         <translation type="unfinished">断开中</translation>
     </message>
     <message>
-        <location filename="../ui/controllers/connectionController.cpp" line="128"/>
+        <location filename="../ui/controllers/connectionController.cpp" line="111"/>
         <source>Settings updated successfully, Reconnnection...</source>
         <translation type="unfinished">配置已更新，重连中</translation>
     </message>
@@ -122,7 +122,7 @@
         <translation type="unfinished">当前平台不支持所选协议</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Components/HomeContainersListView.qml" line="77"/>
+        <location filename="../ui/qml/Components/HomeContainersListView.qml" line="76"/>
         <source>Reconnect via VPN Procotol: </source>
         <translation type="unfinished">重连基于VPN协议: </translation>
     </message>
@@ -130,7 +130,7 @@
 <context>
     <name>ImportController</name>
     <message>
-        <location filename="../ui/controllers/importController.cpp" line="384"/>
+        <location filename="../ui/controllers/importController.cpp" line="429"/>
         <source>Scanned %1 of %2.</source>
         <translation type="unfinished">扫描 %1 of %2.</translation>
     </message>
@@ -147,41 +147,46 @@
     </message>
     <message>
         <location filename="../ui/controllers/installController.cpp" line="110"/>
-        <location filename="../ui/controllers/installController.cpp" line="162"/>
+        <location filename="../ui/controllers/installController.cpp" line="161"/>
         <source>%1 installed successfully. </source>
         <translation type="unfinished">%1 安装成功。</translation>
     </message>
     <message>
         <location filename="../ui/controllers/installController.cpp" line="112"/>
-        <location filename="../ui/controllers/installController.cpp" line="164"/>
+        <location filename="../ui/controllers/installController.cpp" line="163"/>
         <source>%1 is already installed on the server. </source>
         <translation type="unfinished">服务器上已经安装 %1。</translation>
     </message>
     <message>
         <location filename="../ui/controllers/installController.cpp" line="115"/>
-        <location filename="../ui/controllers/installController.cpp" line="183"/>
+        <source>
+Added containers that were already installed on the server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/controllers/installController.cpp" line="182"/>
         <source>
 Already installed containers were found on the server. All installed containers have been added to the application</source>
         <translation type="unfinished">
 在服务上发现已经安装协议并添加到应用程序</translation>
     </message>
     <message>
-        <location filename="../ui/controllers/installController.cpp" line="264"/>
+        <location filename="../ui/controllers/installController.cpp" line="263"/>
         <source>Settings updated successfully</source>
         <translation type="unfinished">配置更新成功</translation>
     </message>
     <message>
-        <location filename="../ui/controllers/installController.cpp" line="279"/>
+        <location filename="../ui/controllers/installController.cpp" line="278"/>
         <source>Server &apos;%1&apos; was removed</source>
         <translation type="unfinished">已移除服务器 &apos;%1&apos;</translation>
     </message>
     <message>
-        <location filename="../ui/controllers/installController.cpp" line="289"/>
+        <location filename="../ui/controllers/installController.cpp" line="288"/>
         <source>All containers from server &apos;%1&apos; have been removed</source>
         <translation type="unfinished">服务器 &apos;%1&apos; 的所有容器已移除</translation>
     </message>
     <message>
-        <location filename="../ui/controllers/installController.cpp" line="306"/>
+        <location filename="../ui/controllers/installController.cpp" line="305"/>
         <source>%1 has been removed from the server &apos;%2&apos;</source>
         <translation type="unfinished">%1 已从服务器 &apos;%2&apos; 上移除</translation>
     </message>
@@ -202,12 +207,12 @@ Already installed containers were found on the server. All installed containers
         <translation type="obsolete"> 协议已从</translation>
     </message>
     <message>
-        <location filename="../ui/controllers/installController.cpp" line="452"/>
+        <location filename="../ui/controllers/installController.cpp" line="451"/>
         <source>Please login as the user</source>
         <translation type="unfinished">请以用户身份登录</translation>
     </message>
     <message>
-        <location filename="../ui/controllers/installController.cpp" line="479"/>
+        <location filename="../ui/controllers/installController.cpp" line="478"/>
         <source>Server added successfully</source>
         <translation type="unfinished">服务器添加成功</translation>
     </message>
@@ -275,16 +280,104 @@ Already installed containers were found on the server. All installed containers
 <context>
     <name>PageHome</name>
     <message>
-        <location filename="../ui/qml/Pages2/PageHome.qml" line="193"/>
+        <location filename="../ui/qml/Pages2/PageHome.qml" line="344"/>
         <source>VPN protocol</source>
         <translation type="unfinished">VPN协议</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageHome.qml" line="238"/>
+        <location filename="../ui/qml/Pages2/PageHome.qml" line="390"/>
         <source>Servers</source>
         <translation type="unfinished">服务器</translation>
     </message>
 </context>
+<context>
+    <name>PageProtocolAwgSettings</name>
+    <message>
+        <location filename="../ui/qml/Pages2/PageProtocolAwgSettings.qml" line="76"/>
+        <source>AmneziaWG settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageProtocolAwgSettings.qml" line="84"/>
+        <source>Port</source>
+        <translation type="unfinished">端口</translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageProtocolAwgSettings.qml" line="103"/>
+        <source>Junk packet count</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageProtocolAwgSettings.qml" line="126"/>
+        <source>Junk packet minimum size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageProtocolAwgSettings.qml" line="144"/>
+        <source>Junk packet maximum size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageProtocolAwgSettings.qml" line="162"/>
+        <source>Init packet junk size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageProtocolAwgSettings.qml" line="180"/>
+        <source>Response packet junk size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageProtocolAwgSettings.qml" line="198"/>
+        <source>Init packet magic header</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageProtocolAwgSettings.qml" line="216"/>
+        <source>Response packet magic header</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageProtocolAwgSettings.qml" line="234"/>
+        <source>Transport packet magic header</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageProtocolAwgSettings.qml" line="252"/>
+        <source>Underload packet magic header</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageProtocolAwgSettings.qml" line="275"/>
+        <source>Remove AmneziaWG</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageProtocolAwgSettings.qml" line="278"/>
+        <source>Remove AmneziaWG from server?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageProtocolAwgSettings.qml" line="279"/>
+        <source>All users who you shared a connection with will no longer be able to connect to it.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageProtocolAwgSettings.qml" line="280"/>
+        <source>Continue</source>
+        <translation type="unfinished">继续</translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageProtocolAwgSettings.qml" line="281"/>
+        <source>Cancel</source>
+        <translation type="unfinished">取消</translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageProtocolAwgSettings.qml" line="311"/>
+        <source>Save and Restart Amnezia</source>
+        <translation type="unfinished">保存并重启Amnezia</translation>
+    </message>
+</context>
 <context>
     <name>PageProtocolCloakSettings</name>
     <message>
@@ -892,71 +985,76 @@ And if you don&apos;t like the app, all the more support it - the donation will
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="52"/>
+        <source>Allow application screenshots</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="72"/>
         <source>Auto start</source>
         <translation type="unfinished">自动运行</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="53"/>
+        <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="73"/>
         <source>Launch the application every time </source>
         <translation type="unfinished">总是在系统 </translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="53"/>
+        <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="73"/>
         <source> starts</source>
         <translation type="unfinished"> 启动时自动运行运用程序</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="73"/>
+        <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="93"/>
         <source>Start minimized</source>
         <translation type="unfinished">最小化</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="74"/>
+        <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="94"/>
         <source>Launch application minimized</source>
         <translation type="unfinished">开启应用程序时窗口最小化</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="91"/>
+        <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="111"/>
         <source>Language</source>
         <translation type="unfinished">语言</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="110"/>
+        <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="130"/>
         <source>Logging</source>
         <translation type="unfinished">日志</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="111"/>
+        <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="131"/>
         <source>Enabled</source>
         <translation type="unfinished">开启</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="111"/>
+        <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="131"/>
         <source>Disabled</source>
         <translation type="unfinished">禁用</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="124"/>
+        <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="144"/>
         <source>Reset settings and remove all data from the application</source>
         <translation type="unfinished">重置并清理应用的所有数据</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="128"/>
+        <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="148"/>
         <source>Reset settings and remove all data from the application?</source>
         <translation type="unfinished">重置并清理应用的所有数据？</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="129"/>
+        <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="149"/>
         <source>All settings will be reset to default. All installed AmneziaVPN services will still remain on the server.</source>
         <translation type="unfinished">所有配置恢复为默认值。在服务器上保留所有已安装的AmneziaVPN服务。</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="130"/>
+        <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="150"/>
         <source>Continue</source>
         <translation type="unfinished">继续</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="131"/>
+        <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="151"/>
         <source>Cancel</source>
         <translation type="unfinished">取消</translation>
     </message>
@@ -1561,17 +1659,17 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
 <context>
     <name>PageSetupWizardEasy</name>
     <message>
-        <location filename="../ui/qml/Pages2/PageSetupWizardEasy.qml" line="66"/>
+        <location filename="../ui/qml/Pages2/PageSetupWizardEasy.qml" line="67"/>
         <source>What is the level of internet control in your region?</source>
         <translation type="unfinished">您所在地区的互联网控制力度如何？</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSetupWizardEasy.qml" line="136"/>
+        <location filename="../ui/qml/Pages2/PageSetupWizardEasy.qml" line="137"/>
         <source>Set up a VPN yourself</source>
         <translation type="unfinished">自己架设VPN</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSetupWizardEasy.qml" line="137"/>
+        <location filename="../ui/qml/Pages2/PageSetupWizardEasy.qml" line="138"/>
         <source>I want to choose a VPN protocol</source>
         <translation type="unfinished">我想选择VPN协议</translation>
     </message>
@@ -1581,7 +1679,7 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
         <translation type="unfinished">继续</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSetupWizardEasy.qml" line="186"/>
+        <location filename="../ui/qml/Pages2/PageSetupWizardEasy.qml" line="197"/>
         <source>Set up later</source>
         <translation type="unfinished">稍后设置</translation>
     </message>
@@ -1807,8 +1905,12 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageShare.qml" line="175"/>
+        <source>Access to server management. The user with whom you share full access to the connection will be able to add and remove your protocols and services to the servers, as well as change settings.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Full access to server</source>
-        <translation type="unfinished">获得服务器完整授权</translation>
+        <translation type="obsolete">获得服务器完整授权</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageShare.qml" line="190"/>
@@ -1827,33 +1929,37 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageShare.qml" line="222"/>
-        <location filename="../ui/qml/Pages2/PageShare.qml" line="307"/>
+        <source>File with accessing settings to </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageShare.qml" line="310"/>
         <source>File with connection settings to </source>
         <translation type="unfinished">连接配置文件的内容为:</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageShare.qml" line="248"/>
         <source>Protocols</source>
-        <translation type="unfinished">协议</translation>
+        <translation type="obsolete">协议</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageShare.qml" line="249"/>
+        <location filename="../ui/qml/Pages2/PageShare.qml" line="251"/>
+        <location filename="../ui/qml/Pages2/PageShare.qml" line="252"/>
         <source>Protocol</source>
         <translation type="unfinished">协议</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageShare.qml" line="306"/>
+        <location filename="../ui/qml/Pages2/PageShare.qml" line="309"/>
         <source>Connection to </source>
         <translation type="unfinished">连接到</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageShare.qml" line="340"/>
-        <location filename="../ui/qml/Pages2/PageShare.qml" line="341"/>
+        <location filename="../ui/qml/Pages2/PageShare.qml" line="343"/>
+        <location filename="../ui/qml/Pages2/PageShare.qml" line="344"/>
         <source>Connection format</source>
         <translation type="unfinished">连接方式</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageShare.qml" line="379"/>
+        <location filename="../ui/qml/Pages2/PageShare.qml" line="382"/>
         <source>Share</source>
         <translation type="unfinished">共享</translation>
     </message>
@@ -2104,7 +2210,7 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../protocols/protocols_defs.cpp" line="75"/>
+        <location filename="../protocols/protocols_defs.cpp" line="76"/>
         <source>Sftp service</source>
         <translation type="unfinished">Sftp 服务</translation>
     </message>
@@ -2314,98 +2420,104 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
         <translation type="unfinished">内部错误</translation>
     </message>
     <message>
-        <location filename="../containers/containers_defs.cpp" line="87"/>
+        <location filename="../containers/containers_defs.cpp" line="88"/>
         <source>IPsec</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../containers/containers_defs.cpp" line="89"/>
-        <location filename="../containers/containers_defs.cpp" line="132"/>
+        <location filename="../containers/containers_defs.cpp" line="90"/>
+        <location filename="../containers/containers_defs.cpp" line="137"/>
         <source>Website in Tor network</source>
         <translation type="unfinished">在 Tor 网络中架设网站</translation>
     </message>
     <message>
-        <location filename="../containers/containers_defs.cpp" line="90"/>
+        <location filename="../containers/containers_defs.cpp" line="91"/>
         <source>Amnezia DNS</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../containers/containers_defs.cpp" line="92"/>
+        <location filename="../containers/containers_defs.cpp" line="93"/>
         <source>Sftp file sharing service</source>
         <translation type="unfinished">SFTP文件共享服务</translation>
     </message>
     <message>
-        <location filename="../containers/containers_defs.cpp" line="98"/>
+        <location filename="../containers/containers_defs.cpp" line="99"/>
         <source>OpenVPN is the most popular VPN protocol, with flexible configuration options. It uses its own security protocol with SSL/TLS for key exchange.</source>
         <translation type="unfinished">OpenVPN 是最流行的 VPN 协议，具有灵活的配置选项。它使用自己的安全协议与 SSL/TLS 进行密钥交换。</translation>
     </message>
     <message>
-        <location filename="../containers/containers_defs.cpp" line="101"/>
+        <location filename="../containers/containers_defs.cpp" line="102"/>
         <source>ShadowSocks - masks VPN traffic, making it similar to normal web traffic, but is recognised by analysis systems in some highly censored regions.</source>
         <translation type="unfinished">ShadowSocks - 混淆 VPN 流量，使其与正常的 Web 流量相似，但在一些审查力度高的地区可以被分析系统识别。</translation>
     </message>
     <message>
-        <location filename="../containers/containers_defs.cpp" line="104"/>
+        <location filename="../containers/containers_defs.cpp" line="105"/>
         <source>OpenVPN over Cloak - OpenVPN with VPN masquerading as web traffic and protection against active-probbing detection. Ideal for bypassing blocking in regions with the highest levels of censorship.</source>
         <translation type="unfinished">OpenVPN over Cloak - OpenVPN 与 VPN 具有伪装成网络流量和防止主动探测检测的保护。非常适合绕过审查力度特别强的地区的封锁。</translation>
     </message>
     <message>
-        <location filename="../containers/containers_defs.cpp" line="108"/>
+        <location filename="../containers/containers_defs.cpp" line="109"/>
+        <location filename="../containers/containers_defs.cpp" line="112"/>
         <source>WireGuard - New popular VPN protocol with high performance, high speed and low power consumption. Recommended for regions with low levels of censorship.</source>
         <translation type="unfinished">WireGuard - 新型流行的VPN协议，具有高性能、高速度和低功耗。建议用于审查力度较低的地区</translation>
     </message>
     <message>
-        <location filename="../containers/containers_defs.cpp" line="111"/>
+        <location filename="../containers/containers_defs.cpp" line="115"/>
         <source>IKEv2 -  Modern stable protocol, a bit faster than others, restores connection after signal loss. It has native support on the latest versions of Android and iOS.</source>
         <translation type="unfinished">IKEv2 - 现代稳定协议，相比其他协议较快一些，在信号丢失后恢复连接。Android 和 iOS最新版原生支持。</translation>
     </message>
     <message>
-        <location filename="../containers/containers_defs.cpp" line="114"/>
+        <location filename="../containers/containers_defs.cpp" line="118"/>
         <source>Deploy a WordPress site on the Tor network in two clicks.</source>
         <translation type="unfinished">只需点击两次即可架设 WordPress 网站到 Tor 网络</translation>
     </message>
     <message>
-        <location filename="../containers/containers_defs.cpp" line="116"/>
+        <location filename="../containers/containers_defs.cpp" line="120"/>
         <source>Replace the current DNS server with your own. This will increase your privacy level.</source>
         <translation type="unfinished">将当前的 DNS 服务器替换为您自己的。这将提高您的隐私级别。</translation>
     </message>
     <message>
-        <location filename="../containers/containers_defs.cpp" line="119"/>
+        <location filename="../containers/containers_defs.cpp" line="123"/>
         <source>Creates a file vault on your server to securely store and transfer files.</source>
         <translation type="unfinished">在您的服务器上创建文件库以安全地存储和传输文件</translation>
     </message>
     <message>
-        <location filename="../containers/containers_defs.cpp" line="124"/>
+        <location filename="../containers/containers_defs.cpp" line="128"/>
         <source>OpenVPN container</source>
         <translation type="unfinished">OpenVPN容器</translation>
     </message>
     <message>
-        <location filename="../containers/containers_defs.cpp" line="125"/>
+        <location filename="../containers/containers_defs.cpp" line="129"/>
         <source>Container with OpenVpn and ShadowSocks</source>
         <translation type="unfinished">带有 OpenVpn 和 ShadowSocks 的容器</translation>
     </message>
     <message>
-        <location filename="../containers/containers_defs.cpp" line="127"/>
+        <location filename="../containers/containers_defs.cpp" line="131"/>
         <source>Container with OpenVpn and ShadowSocks protocols configured with traffic masking by Cloak plugin</source>
         <translation type="unfinished">具有 OpenVpn 和 ShadowSocks 协议的容器，通过 Cloak 插件配置混淆流量</translation>
     </message>
     <message>
-        <location filename="../containers/containers_defs.cpp" line="129"/>
+        <location filename="../containers/containers_defs.cpp" line="133"/>
         <source>WireGuard container</source>
         <translation type="unfinished">WireGuard 容器</translation>
     </message>
     <message>
-        <location filename="../containers/containers_defs.cpp" line="130"/>
+        <location filename="../containers/containers_defs.cpp" line="134"/>
+        <source>AmneziaWG container</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../containers/containers_defs.cpp" line="135"/>
         <source>IPsec container</source>
         <translation type="unfinished">IPsec 容器</translation>
     </message>
     <message>
-        <location filename="../containers/containers_defs.cpp" line="133"/>
+        <location filename="../containers/containers_defs.cpp" line="138"/>
         <source>DNS Service</source>
         <translation type="unfinished">DNS 服务</translation>
     </message>
     <message>
-        <location filename="../containers/containers_defs.cpp" line="135"/>
+        <location filename="../containers/containers_defs.cpp" line="140"/>
         <source>Sftp file sharing service - is secure FTP service</source>
         <translation type="unfinished">Sftp 文件共享服务 - 安全的 FTP 服务</translation>
     </message>
@@ -2469,6 +2581,16 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
         <source>error 0x%1: %2</source>
         <translation type="unfinished">错误 0x%1: %2</translation>
     </message>
+    <message>
+        <location filename="../3rd/wireguard-tools/contrib/highlighter/gui/highlight.cpp" line="39"/>
+        <source>WireGuard Configuration Highlighter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../3rd/wireguard-tools/contrib/highlighter/gui/highlight.cpp" line="82"/>
+        <source>&amp;Randomize colors</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SelectLanguageDrawer</name>
@@ -2495,22 +2617,22 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
 <context>
     <name>SettingsController</name>
     <message>
-        <location filename="../ui/controllers/settingsController.cpp" line="20"/>
+        <location filename="../ui/controllers/settingsController.cpp" line="25"/>
         <source>Software version</source>
         <translation type="unfinished">软件版本</translation>
     </message>
     <message>
-        <location filename="../ui/controllers/settingsController.cpp" line="102"/>
+        <location filename="../ui/controllers/settingsController.cpp" line="121"/>
         <source>Backup file is corrupted</source>
         <translation type="unfinished">备份文件已损坏</translation>
     </message>
     <message>
-        <location filename="../ui/controllers/settingsController.cpp" line="117"/>
+        <location filename="../ui/controllers/settingsController.cpp" line="136"/>
         <source>All settings have been reset to default values</source>
         <translation type="unfinished">所配置恢复为默认值</translation>
     </message>
     <message>
-        <location filename="../ui/controllers/settingsController.cpp" line="123"/>
+        <location filename="../ui/controllers/settingsController.cpp" line="142"/>
         <source>Cached profiles cleared</source>
         <translation type="unfinished">缓存的配置文件已清除</translation>
     </message>
@@ -2540,8 +2662,12 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
     </message>
     <message>
         <location filename="../ui/qml/Components/ShareConnectionDrawer.qml" line="126"/>
+        <source>Show connection settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Show content</source>
-        <translation type="unfinished">展示内容</translation>
+        <translation type="obsolete">展示内容</translation>
     </message>
     <message>
         <location filename="../ui/qml/Components/ShareConnectionDrawer.qml" line="250"/>
@@ -2625,6 +2751,14 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
         <translation type="unfinished">退出</translation>
     </message>
 </context>
+<context>
+    <name>TextFieldWithHeaderType</name>
+    <message>
+        <location filename="../ui/qml/Controls2/TextFieldWithHeaderType.qml" line="105"/>
+        <source>The field can&apos;t be empty</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>VpnConnection</name>
     <message>
@@ -2679,32 +2813,32 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
 <context>
     <name>amnezia::ContainerProps</name>
     <message>
-        <location filename="../containers/containers_defs.cpp" line="236"/>
+        <location filename="../containers/containers_defs.cpp" line="245"/>
         <source>Low</source>
         <translation type="unfinished">低</translation>
     </message>
     <message>
-        <location filename="../containers/containers_defs.cpp" line="237"/>
+        <location filename="../containers/containers_defs.cpp" line="246"/>
         <source>High</source>
         <translation type="unfinished">高</translation>
     </message>
     <message>
-        <location filename="../containers/containers_defs.cpp" line="238"/>
+        <location filename="../containers/containers_defs.cpp" line="247"/>
         <source>Medium</source>
         <translation type="unfinished">中</translation>
     </message>
     <message>
-        <location filename="../containers/containers_defs.cpp" line="246"/>
+        <location filename="../containers/containers_defs.cpp" line="255"/>
         <source>I just want to increase the level of privacy</source>
         <translation type="unfinished">我只是想提高隐私级别</translation>
     </message>
     <message>
-        <location filename="../containers/containers_defs.cpp" line="247"/>
+        <location filename="../containers/containers_defs.cpp" line="256"/>
         <source>Many foreign websites and VPN providers are blocked</source>
         <translation type="unfinished">大多国外网站和VPN提供商被屏蔽</translation>
     </message>
     <message>
-        <location filename="../containers/containers_defs.cpp" line="248"/>
+        <location filename="../containers/containers_defs.cpp" line="257"/>
         <source>Some foreign sites are blocked, but VPN providers are not blocked</source>
         <translation type="unfinished">一些国外网站被屏蔽，但VPN提供商未被屏蔽</translation>
     </message>
diff --git a/client/ui/qml/Pages2/PageProtocolAwgSettings.qml b/client/ui/qml/Pages2/PageProtocolAwgSettings.qml
index 69d34114..079c85a1 100644
--- a/client/ui/qml/Pages2/PageProtocolAwgSettings.qml
+++ b/client/ui/qml/Pages2/PageProtocolAwgSettings.qml
@@ -73,7 +73,7 @@ PageType {
                         HeaderType {
                             Layout.fillWidth: true
 
-                            headerText: qsTr("Amnezia WireGuard settings")
+                            headerText: qsTr("AmneziaWG settings")
                         }
 
                         TextFieldWithHeaderType {
@@ -272,11 +272,11 @@ PageType {
                             pressedColor: Qt.rgba(1, 1, 1, 0.12)
                             textColor: "#EB5757"
 
-                            text: qsTr("Remove Amnezia WireGuard")
+                            text: qsTr("Remove AmneziaWG")
 
                             onClicked: {
-                                questionDrawer.headerText = qsTr("Remove Amnezia WireGuard from server?")
-                                questionDrawer.descriptionText = qsTr("All users with whom you shared a connection will no longer be able to connect to it")
+                                questionDrawer.headerText = qsTr("Remove AmneziaWG from server?")
+                                questionDrawer.descriptionText = qsTr("All users who you shared a connection with will no longer be able to connect to it.")
                                 questionDrawer.yesButtonText = qsTr("Continue")
                                 questionDrawer.noButtonText = qsTr("Cancel")
 

From 992961c4888cd848b6ae86fbb3a8def9bb586d1a Mon Sep 17 00:00:00 2001
From: Mykola Baibuz <mykola.baibuz@gmail.com>
Date: Mon, 9 Oct 2023 16:32:43 -0400
Subject: [PATCH 205/278] Update Windows WG to AWG protocol support

---
 client/3rd-prebuilt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/3rd-prebuilt b/client/3rd-prebuilt
index c3ca525f..15b0ff39 160000
--- a/client/3rd-prebuilt
+++ b/client/3rd-prebuilt
@@ -1 +1 @@
-Subproject commit c3ca525f92e57fecdd6047e35b4ccded8b173407
+Subproject commit 15b0ff395d9d372339c5ea8ea35cb2715b975ea9

From da02f498509c4f7ba4178ab9fbbdd92caf599647 Mon Sep 17 00:00:00 2001
From: ronoaer <ronoaer@gmail.com>
Date: Tue, 10 Oct 2023 08:43:56 +0800
Subject: [PATCH 206/278] update x value of topbutton  when resize window

---
 client/ui/qml/Controls2/TopCloseButtonType.qml | 4 ++++
 client/ui/qml/Pages2/PageStart.qml             | 7 ++++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/client/ui/qml/Controls2/TopCloseButtonType.qml b/client/ui/qml/Controls2/TopCloseButtonType.qml
index 4a738214..e29b0be4 100644
--- a/client/ui/qml/Controls2/TopCloseButtonType.qml
+++ b/client/ui/qml/Controls2/TopCloseButtonType.qml
@@ -5,6 +5,8 @@ import QtQuick.Shapes
 Popup {
     id: root
 
+    property alias buttonWidth: button.implicitWidth
+
     modal: false
     closePolicy: Popup.NoAutoClose
     padding: 4
@@ -20,6 +22,8 @@ Popup {
     }
 
     ImageButtonType {
+        id: button
+
         image: "qrc:/images/svg/close_black_24dp.svg"
         imageColor: "#D7D8DB"
 
diff --git a/client/ui/qml/Pages2/PageStart.qml b/client/ui/qml/Pages2/PageStart.qml
index 99132bf1..4af774fa 100644
--- a/client/ui/qml/Pages2/PageStart.qml
+++ b/client/ui/qml/Pages2/PageStart.qml
@@ -136,6 +136,11 @@ PageType {
             ServersModel.currentlyProcessedIndex = ServersModel.defaultIndex
             tabBarStackView.push(pagePath, { "objectName" : pagePath })
         }
+
+        onWidthChanged: {
+            topCloseButton.x = tabBarStackView.x + tabBarStackView.width -
+                    topCloseButton.buttonWidth - topCloseButton.rightPadding
+        }
     }
 
     TabBar {
@@ -231,7 +236,7 @@ PageType {
 
     TopCloseButtonType {
         id: topCloseButton
-        x: tabBarStackView.width - topCloseButton.width
+        x: tabBarStackView.width - topCloseButton.buttonWidth - topCloseButton.rightPadding
         z: 1
     }
 

From 9d6559f0d732008387936addf1e9c3061019bf59 Mon Sep 17 00:00:00 2001
From: "vladimir.kuznetsov" <nethiuswork@gmail.com>
Date: Tue, 10 Oct 2023 12:50:41 +0500
Subject: [PATCH 207/278] fixed an error when after the first connection with
 admin config the container model was not updated

---
 client/amnezia_application.cpp          |  2 +
 client/translations/amneziavpn_ru.ts    | 54 ++++++++--------
 client/translations/amneziavpn_zh_CN.ts | 86 ++++++++++++++++---------
 client/ui/models/containers_model.cpp   |  5 ++
 client/ui/models/containers_model.h     |  2 +
 client/vpnconnection.cpp                |  1 +
 client/vpnconnection.h                  |  2 +
 7 files changed, 95 insertions(+), 57 deletions(-)

diff --git a/client/amnezia_application.cpp b/client/amnezia_application.cpp
index 5b6d2491..4e6bce2b 100644
--- a/client/amnezia_application.cpp
+++ b/client/amnezia_application.cpp
@@ -279,6 +279,8 @@ void AmneziaApplication::initModels()
 {
     m_containersModel.reset(new ContainersModel(m_settings, this));
     m_engine->rootContext()->setContextProperty("ContainersModel", m_containersModel.get());
+    connect(m_vpnConnection.get(), &VpnConnection::newVpnConfigurationCreated, m_containersModel.get(),
+            &ContainersModel::updateContainersConfig);
 
     m_serversModel.reset(new ServersModel(m_settings, this));
     m_engine->rootContext()->setContextProperty("ServersModel", m_serversModel.get());
diff --git a/client/translations/amneziavpn_ru.ts b/client/translations/amneziavpn_ru.ts
index 47d0510f..27cb25e2 100644
--- a/client/translations/amneziavpn_ru.ts
+++ b/client/translations/amneziavpn_ru.ts
@@ -4,7 +4,7 @@
 <context>
     <name>AmneziaApplication</name>
     <message>
-        <location filename="../amnezia_application.cpp" line="300"/>
+        <location filename="../amnezia_application.cpp" line="302"/>
         <source>Split tunneling for WireGuard is not implemented, the option was disabled</source>
         <translation type="unfinished"></translation>
     </message>
@@ -130,7 +130,7 @@
 <context>
     <name>ImportController</name>
     <message>
-        <location filename="../ui/controllers/importController.cpp" line="375"/>
+        <location filename="../ui/controllers/importController.cpp" line="429"/>
         <source>Scanned %1 of %2.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -162,32 +162,32 @@ Already installed containers were found on the server. All installed containers
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/controllers/installController.cpp" line="263"/>
+        <location filename="../ui/controllers/installController.cpp" line="264"/>
         <source>Settings updated successfully</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/controllers/installController.cpp" line="278"/>
+        <location filename="../ui/controllers/installController.cpp" line="279"/>
         <source>Server &apos;%1&apos; was removed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/controllers/installController.cpp" line="288"/>
+        <location filename="../ui/controllers/installController.cpp" line="289"/>
         <source>All containers from server &apos;%1&apos; have been removed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/controllers/installController.cpp" line="305"/>
+        <location filename="../ui/controllers/installController.cpp" line="306"/>
         <source>%1 has been removed from the server &apos;%2&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/controllers/installController.cpp" line="451"/>
+        <location filename="../ui/controllers/installController.cpp" line="452"/>
         <source>Please login as the user</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/controllers/installController.cpp" line="478"/>
+        <location filename="../ui/controllers/installController.cpp" line="479"/>
         <source>Server added successfully</source>
         <translation type="unfinished"></translation>
     </message>
@@ -559,7 +559,7 @@ Already installed containers were found on the server. All installed containers
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="363"/>
-        <source>All users with whom you shared a connection will no longer be able to connect to it</source>
+        <source>All users who you shared a connection with will no longer be able to connect to it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -607,7 +607,7 @@ Already installed containers were found on the server. All installed containers
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageProtocolRaw.qml" line="177"/>
-        <source>All users with whom you shared a connection will no longer be able to connect to it</source>
+        <source>All users who you shared a connection with will no longer be able to connect to it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -879,8 +879,12 @@ Already installed containers were found on the server. All installed containers
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsAbout.qml" line="71"/>
-        <source>This is a free and open source application. If you like it, support the developers with a donation.
-And if you don&apos;t like the app, all the more support it - the donation will be used to improve the app.</source>
+        <source>This is a free and open source application. If you like it, support the developers with a donation. </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsAbout.qml" line="72"/>
+        <source>And if you don’t like the application, all the more reason to support it - the donation will be used for the improving the application.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1056,7 +1060,7 @@ And if you don&apos;t like the app, all the more support it - the donation will
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsBackup.qml" line="80"/>
-        <source>It will help you instantly restore connection settings at the next installation</source>
+        <source>You can save your settings to a backup file to restore them the next time you install the application.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1150,7 +1154,7 @@ And if you don&apos;t like the app, all the more support it - the donation will
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsConnection.qml" line="100"/>
-        <source>Allows you to connect to some sites through a secure connection, and to others bypassing it</source>
+        <source>Allows you to choose which sites you want to use the VPN for.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1414,7 +1418,7 @@ And if you don&apos;t like the app, all the more support it - the donation will
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsServerProtocol.qml" line="117"/>
-        <source>All users with whom you shared a connection will no longer be able to connect to it</source>
+        <source>All users who you shared a connection with will no longer be able to connect to it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1800,27 +1804,27 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
 <context>
     <name>PageSetupWizardViewConfig</name>
     <message>
-        <location filename="../ui/qml/Pages2/PageSetupWizardViewConfig.qml" line="63"/>
+        <location filename="../ui/qml/Pages2/PageSetupWizardViewConfig.qml" line="59"/>
         <source>New connection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSetupWizardViewConfig.qml" line="90"/>
+        <location filename="../ui/qml/Pages2/PageSetupWizardViewConfig.qml" line="86"/>
         <source>Do not use connection code from public sources. It could be created to intercept your data.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSetupWizardViewConfig.qml" line="105"/>
+        <location filename="../ui/qml/Pages2/PageSetupWizardViewConfig.qml" line="101"/>
         <source>Collapse content</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSetupWizardViewConfig.qml" line="105"/>
+        <location filename="../ui/qml/Pages2/PageSetupWizardViewConfig.qml" line="101"/>
         <source>Show content</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSetupWizardViewConfig.qml" line="148"/>
+        <location filename="../ui/qml/Pages2/PageSetupWizardViewConfig.qml" line="144"/>
         <source>Connect</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1853,6 +1857,7 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../ui/qml/Pages2/PageShare.qml" line="190"/>
         <location filename="../ui/qml/Pages2/PageShare.qml" line="191"/>
         <source>Server</source>
         <translation type="unfinished"></translation>
@@ -1902,11 +1907,6 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
         <source>Access to server management. The user with whom you share full access to the connection will be able to add and remove your protocols and services to the servers, as well as change settings.</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../ui/qml/Pages2/PageShare.qml" line="190"/>
-        <source>Servers</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="../ui/qml/Pages2/PageShare.qml" line="251"/>
         <location filename="../ui/qml/Pages2/PageShare.qml" line="252"/>
@@ -2627,7 +2627,7 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Components/ShareConnectionDrawer.qml" line="250"/>
+        <location filename="../ui/qml/Components/ShareConnectionDrawer.qml" line="251"/>
         <source>To read the QR code in the Amnezia app, select &quot;Add server&quot; → &quot;I have data to connect&quot; → &quot;QR code, key or settings file&quot;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2719,7 +2719,7 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
 <context>
     <name>VpnConnection</name>
     <message>
-        <location filename="../vpnconnection.cpp" line="405"/>
+        <location filename="../vpnconnection.cpp" line="406"/>
         <source>Mbps</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/client/translations/amneziavpn_zh_CN.ts b/client/translations/amneziavpn_zh_CN.ts
index e9d73b46..32d2d742 100644
--- a/client/translations/amneziavpn_zh_CN.ts
+++ b/client/translations/amneziavpn_zh_CN.ts
@@ -4,7 +4,7 @@
 <context>
     <name>AmneziaApplication</name>
     <message>
-        <location filename="../amnezia_application.cpp" line="300"/>
+        <location filename="../amnezia_application.cpp" line="302"/>
         <source>Split tunneling for WireGuard is not implemented, the option was disabled</source>
         <translation type="unfinished">未启用选项，还未实现基于WireGuard协议的VPN分流</translation>
     </message>
@@ -30,9 +30,6 @@
         <location filename="../ui/controllers/connectionController.cpp" line="80"/>
         <location filename="../ui/controllers/connectionController.cpp" line="94"/>
         <location filename="../ui/controllers/connectionController.cpp" line="100"/>
-        <location filename="../ui/controllers/connectionController.cpp" line="80"/>
-        <location filename="../ui/controllers/connectionController.cpp" line="94"/>
-        <location filename="../ui/controllers/connectionController.cpp" line="100"/>
         <source>Connect</source>
         <translation type="unfinished">连接</translation>
     </message>
@@ -133,7 +130,7 @@
 <context>
     <name>ImportController</name>
     <message>
-        <location filename="../ui/controllers/importController.cpp" line="375"/>
+        <location filename="../ui/controllers/importController.cpp" line="429"/>
         <source>Scanned %1 of %2.</source>
         <translation type="unfinished">扫描 %1 of %2.</translation>
     </message>
@@ -174,22 +171,22 @@ Already installed containers were found on the server. All installed containers
 在服务上发现已经安装协议并添加到应用程序</translation>
     </message>
     <message>
-        <location filename="../ui/controllers/installController.cpp" line="263"/>
+        <location filename="../ui/controllers/installController.cpp" line="264"/>
         <source>Settings updated successfully</source>
         <translation type="unfinished">配置更新成功</translation>
     </message>
     <message>
-        <location filename="../ui/controllers/installController.cpp" line="278"/>
+        <location filename="../ui/controllers/installController.cpp" line="279"/>
         <source>Server &apos;%1&apos; was removed</source>
         <translation type="unfinished">已移除服务器 &apos;%1&apos;</translation>
     </message>
     <message>
-        <location filename="../ui/controllers/installController.cpp" line="288"/>
+        <location filename="../ui/controllers/installController.cpp" line="289"/>
         <source>All containers from server &apos;%1&apos; have been removed</source>
         <translation type="unfinished">服务器 &apos;%1&apos; 的所有容器已移除</translation>
     </message>
     <message>
-        <location filename="../ui/controllers/installController.cpp" line="305"/>
+        <location filename="../ui/controllers/installController.cpp" line="306"/>
         <source>%1 has been removed from the server &apos;%2&apos;</source>
         <translation type="unfinished">%1 已从服务器 &apos;%2&apos; 上移除</translation>
     </message>
@@ -210,12 +207,12 @@ Already installed containers were found on the server. All installed containers
         <translation type="obsolete"> 协议已从</translation>
     </message>
     <message>
-        <location filename="../ui/controllers/installController.cpp" line="451"/>
+        <location filename="../ui/controllers/installController.cpp" line="452"/>
         <source>Please login as the user</source>
         <translation type="unfinished">请以用户身份登录</translation>
     </message>
     <message>
-        <location filename="../ui/controllers/installController.cpp" line="478"/>
+        <location filename="../ui/controllers/installController.cpp" line="479"/>
         <source>Server added successfully</source>
         <translation type="unfinished">服务器添加成功</translation>
     </message>
@@ -587,8 +584,12 @@ Already installed containers were found on the server. All installed containers
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="363"/>
+        <source>All users who you shared a connection with will no longer be able to connect to it.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>All users with whom you shared a connection will no longer be able to connect to it</source>
-        <translation type="unfinished">与您共享连接的所有用户将无法再连接到此链接</translation>
+        <translation type="obsolete">与您共享连接的所有用户将无法再连接到此链接</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="364"/>
@@ -633,14 +634,18 @@ Already installed containers were found on the server. All installed containers
         <source>Remove %1 from server?</source>
         <translation type="unfinished">从服务器移除 %1 ?</translation>
     </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageProtocolRaw.qml" line="177"/>
+        <source>All users who you shared a connection with will no longer be able to connect to it.</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source> from server?</source>
         <translation type="obsolete"> 从服务器</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageProtocolRaw.qml" line="177"/>
         <source>All users with whom you shared a connection will no longer be able to connect to it</source>
-        <translation type="unfinished">与您共享连接的所有用户将无法再连接到此链接</translation>
+        <translation type="obsolete">与您共享连接的所有用户将无法再连接到此链接</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageProtocolRaw.qml" line="178"/>
@@ -907,12 +912,21 @@ Already installed containers were found on the server. All installed containers
         <translation type="unfinished">捐款</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsAbout.qml" line="71"/>
         <source>This is a free and open source application. If you like it, support the developers with a donation.
 And if you don&apos;t like the app, all the more support it - the donation will be used to improve the app.</source>
-        <translation type="unfinished">这是一个免费且开源的应用软件。如果您喜欢它，请捐助支持我们继续研发。
+        <translation type="obsolete">这是一个免费且开源的应用软件。如果您喜欢它，请捐助支持我们继续研发。
 如果您不喜欢，请捐助支持我们改进它。</translation>
     </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsAbout.qml" line="71"/>
+        <source>This is a free and open source application. If you like it, support the developers with a donation. </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsAbout.qml" line="72"/>
+        <source>And if you don’t like the application, all the more reason to support it - the donation will be used for the improving the application.</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsAbout.qml" line="82"/>
         <source>Card on Patreon</source>
@@ -1085,9 +1099,13 @@ And if you don&apos;t like the app, all the more support it - the donation will
         <translation type="unfinished">配置备份</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsBackup.qml" line="80"/>
         <source>It will help you instantly restore connection settings at the next installation</source>
-        <translation type="unfinished">帮助您在下次安装时立即恢复连接设置</translation>
+        <translation type="obsolete">帮助您在下次安装时立即恢复连接设置</translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsBackup.qml" line="80"/>
+        <source>You can save your settings to a backup file to restore them the next time you install the application.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsBackup.qml" line="89"/>
@@ -1184,8 +1202,12 @@ And if you don&apos;t like the app, all the more support it - the donation will
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsConnection.qml" line="100"/>
+        <source>Allows you to choose which sites you want to use the VPN for.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Allows you to connect to some sites through a secure connection, and to others bypassing it</source>
-        <translation type="unfinished">使用VPN访问指定网站，其他的则绕过</translation>
+        <translation type="obsolete">使用VPN访问指定网站，其他的则绕过</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsConnection.qml" line="113"/>
@@ -1441,6 +1463,11 @@ And if you don&apos;t like the app, all the more support it - the donation will
         <source>Remove </source>
         <translation type="unfinished">移除</translation>
     </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsServerProtocol.qml" line="117"/>
+        <source>All users who you shared a connection with will no longer be able to connect to it.</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source> from server?</source>
         <translation type="obsolete"> 从服务器</translation>
@@ -1451,9 +1478,8 @@ And if you don&apos;t like the app, all the more support it - the donation will
         <translation type="unfinished">从服务器移除 %1 ?</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsServerProtocol.qml" line="117"/>
         <source>All users with whom you shared a connection will no longer be able to connect to it</source>
-        <translation type="unfinished">与您共享连接的所有用户将无法再连接到此链接</translation>
+        <translation type="obsolete">与您共享连接的所有用户将无法再连接到此链接</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsServerProtocol.qml" line="118"/>
@@ -1839,27 +1865,27 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
 <context>
     <name>PageSetupWizardViewConfig</name>
     <message>
-        <location filename="../ui/qml/Pages2/PageSetupWizardViewConfig.qml" line="63"/>
+        <location filename="../ui/qml/Pages2/PageSetupWizardViewConfig.qml" line="59"/>
         <source>New connection</source>
         <translation type="unfinished">新连接</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSetupWizardViewConfig.qml" line="90"/>
+        <location filename="../ui/qml/Pages2/PageSetupWizardViewConfig.qml" line="86"/>
         <source>Do not use connection code from public sources. It could be created to intercept your data.</source>
         <translation type="unfinished">请勿使用公共来源的连接代码。它可以被创建来拦截您的数据。</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSetupWizardViewConfig.qml" line="105"/>
+        <location filename="../ui/qml/Pages2/PageSetupWizardViewConfig.qml" line="101"/>
         <source>Collapse content</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSetupWizardViewConfig.qml" line="105"/>
+        <location filename="../ui/qml/Pages2/PageSetupWizardViewConfig.qml" line="101"/>
         <source>Show content</source>
         <translation type="unfinished">展示内容</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSetupWizardViewConfig.qml" line="148"/>
+        <location filename="../ui/qml/Pages2/PageSetupWizardViewConfig.qml" line="144"/>
         <source>Connect</source>
         <translation type="unfinished">连接</translation>
     </message>
@@ -1921,11 +1947,11 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
         <translation type="obsolete">获得服务器完整授权</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageShare.qml" line="190"/>
         <source>Servers</source>
-        <translation type="unfinished">服务器</translation>
+        <translation type="obsolete">服务器</translation>
     </message>
     <message>
+        <location filename="../ui/qml/Pages2/PageShare.qml" line="190"/>
         <location filename="../ui/qml/Pages2/PageShare.qml" line="191"/>
         <source>Server</source>
         <translation type="unfinished">服务器</translation>
@@ -2678,7 +2704,7 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
         <translation type="obsolete">展示内容</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Components/ShareConnectionDrawer.qml" line="250"/>
+        <location filename="../ui/qml/Components/ShareConnectionDrawer.qml" line="251"/>
         <source>To read the QR code in the Amnezia app, select &quot;Add server&quot; → &quot;I have data to connect&quot; → &quot;QR code, key or settings file&quot;</source>
         <translation type="unfinished">要读取 Amnezia 应用程序中的二维码，请选择“添加服务器”→“我有数据要连接”→“二维码、密钥或配置文件”</translation>
     </message>
@@ -2770,7 +2796,7 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
 <context>
     <name>VpnConnection</name>
     <message>
-        <location filename="../vpnconnection.cpp" line="405"/>
+        <location filename="../vpnconnection.cpp" line="406"/>
         <source>Mbps</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/client/ui/models/containers_model.cpp b/client/ui/models/containers_model.cpp
index 6cf855a6..0c99041e 100644
--- a/client/ui/models/containers_model.cpp
+++ b/client/ui/models/containers_model.cpp
@@ -228,6 +228,11 @@ bool ContainersModel::isAnyContainerInstalled()
     return false;
 }
 
+void ContainersModel::updateContainersConfig()
+{
+    m_containers = m_settings->containers(m_currentlyProcessedServerIndex);
+}
+
 QHash<int, QByteArray> ContainersModel::roleNames() const
 {
     QHash<int, QByteArray> roles;
diff --git a/client/ui/models/containers_model.h b/client/ui/models/containers_model.h
index 2cc41cbf..cc549bb3 100644
--- a/client/ui/models/containers_model.h
+++ b/client/ui/models/containers_model.h
@@ -65,6 +65,8 @@ public slots:
 
     bool isAnyContainerInstalled();
 
+    void updateContainersConfig();
+
 protected:
     QHash<int, QByteArray> roleNames() const override;
 
diff --git a/client/vpnconnection.cpp b/client/vpnconnection.cpp
index 1cff01e6..46e8be60 100644
--- a/client/vpnconnection.cpp
+++ b/client/vpnconnection.cpp
@@ -323,6 +323,7 @@ void VpnConnection::connectToVpn(int serverIndex, const ServerCredentials &crede
     ErrorCode e = ErrorCode::NoError;
 
     m_vpnConfiguration = createVpnConfiguration(serverIndex, credentials, container, containerConfig, &e);
+    emit newVpnConfigurationCreated();
     if (e) {
         emit connectionStateChanged(Vpn::ConnectionState::Error);
         return;
diff --git a/client/vpnconnection.h b/client/vpnconnection.h
index 20ee14fa..f6b2343c 100644
--- a/client/vpnconnection.h
+++ b/client/vpnconnection.h
@@ -79,6 +79,8 @@ signals:
 
     void serviceIsNotReady();
 
+    void newVpnConfigurationCreated();
+
 protected slots:
     void onBytesChanged(quint64 receivedBytes, quint64 sentBytes);
     void onConnectionStateChanged(Vpn::ConnectionState state);

From 5d59a1a10e19764bff4afc0f2e2e8a48c2972ece Mon Sep 17 00:00:00 2001
From: "vladimir.kuznetsov" <nethiuswork@gmail.com>
Date: Tue, 10 Oct 2023 12:50:41 +0500
Subject: [PATCH 208/278] fixed an error when after the first connection with
 admin config the container model was not updated

---
 client/amnezia_application.cpp          |  2 +
 client/translations/amneziavpn_ru.ts    | 42 +++++++--------
 client/translations/amneziavpn_zh_CN.ts | 71 +++++++++++++++++--------
 client/ui/models/containers_model.cpp   |  5 ++
 client/ui/models/containers_model.h     |  2 +
 client/vpnconnection.cpp                |  1 +
 client/vpnconnection.h                  |  2 +
 7 files changed, 83 insertions(+), 42 deletions(-)

diff --git a/client/amnezia_application.cpp b/client/amnezia_application.cpp
index d8039d9b..b8af9438 100644
--- a/client/amnezia_application.cpp
+++ b/client/amnezia_application.cpp
@@ -279,6 +279,8 @@ void AmneziaApplication::initModels()
 {
     m_containersModel.reset(new ContainersModel(m_settings, this));
     m_engine->rootContext()->setContextProperty("ContainersModel", m_containersModel.get());
+    connect(m_vpnConnection.get(), &VpnConnection::newVpnConfigurationCreated, m_containersModel.get(),
+            &ContainersModel::updateContainersConfig);
 
     m_serversModel.reset(new ServersModel(m_settings, this));
     m_engine->rootContext()->setContextProperty("ServersModel", m_serversModel.get());
diff --git a/client/translations/amneziavpn_ru.ts b/client/translations/amneziavpn_ru.ts
index 2f36f748..0e1d65df 100644
--- a/client/translations/amneziavpn_ru.ts
+++ b/client/translations/amneziavpn_ru.ts
@@ -4,7 +4,7 @@
 <context>
     <name>AmneziaApplication</name>
     <message>
-        <location filename="../amnezia_application.cpp" line="300"/>
+        <location filename="../amnezia_application.cpp" line="302"/>
         <source>Split tunneling for WireGuard is not implemented, the option was disabled</source>
         <translation type="unfinished"></translation>
     </message>
@@ -130,7 +130,7 @@
 <context>
     <name>ImportController</name>
     <message>
-        <location filename="../ui/controllers/importController.cpp" line="375"/>
+        <location filename="../ui/controllers/importController.cpp" line="429"/>
         <source>Scanned %1 of %2.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -471,7 +471,7 @@ Already installed containers were found on the server. All installed containers
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="363"/>
-        <source>All users with whom you shared a connection will no longer be able to connect to it</source>
+        <source>All users who you shared a connection with will no longer be able to connect to it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -519,7 +519,7 @@ Already installed containers were found on the server. All installed containers
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageProtocolRaw.qml" line="177"/>
-        <source>All users with whom you shared a connection will no longer be able to connect to it</source>
+        <source>All users who you shared a connection with will no longer be able to connect to it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -791,8 +791,12 @@ Already installed containers were found on the server. All installed containers
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsAbout.qml" line="71"/>
-        <source>This is a free and open source application. If you like it, support the developers with a donation.
-And if you don&apos;t like the app, all the more support it - the donation will be used to improve the app.</source>
+        <source>This is a free and open source application. If you like it, support the developers with a donation. </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsAbout.qml" line="72"/>
+        <source>And if you don’t like the application, all the more reason to support it - the donation will be used for the improving the application.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -968,7 +972,7 @@ And if you don&apos;t like the app, all the more support it - the donation will
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsBackup.qml" line="80"/>
-        <source>It will help you instantly restore connection settings at the next installation</source>
+        <source>You can save your settings to a backup file to restore them the next time you install the application.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1062,7 +1066,7 @@ And if you don&apos;t like the app, all the more support it - the donation will
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsConnection.qml" line="100"/>
-        <source>Allows you to connect to some sites through a secure connection, and to others bypassing it</source>
+        <source>Allows you to choose which sites you want to use the VPN for.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1326,7 +1330,7 @@ And if you don&apos;t like the app, all the more support it - the donation will
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsServerProtocol.qml" line="117"/>
-        <source>All users with whom you shared a connection will no longer be able to connect to it</source>
+        <source>All users who you shared a connection with will no longer be able to connect to it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1712,27 +1716,27 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
 <context>
     <name>PageSetupWizardViewConfig</name>
     <message>
-        <location filename="../ui/qml/Pages2/PageSetupWizardViewConfig.qml" line="63"/>
+        <location filename="../ui/qml/Pages2/PageSetupWizardViewConfig.qml" line="59"/>
         <source>New connection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSetupWizardViewConfig.qml" line="90"/>
+        <location filename="../ui/qml/Pages2/PageSetupWizardViewConfig.qml" line="86"/>
         <source>Do not use connection code from public sources. It could be created to intercept your data.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSetupWizardViewConfig.qml" line="105"/>
+        <location filename="../ui/qml/Pages2/PageSetupWizardViewConfig.qml" line="101"/>
         <source>Collapse content</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSetupWizardViewConfig.qml" line="105"/>
+        <location filename="../ui/qml/Pages2/PageSetupWizardViewConfig.qml" line="101"/>
         <source>Show content</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSetupWizardViewConfig.qml" line="148"/>
+        <location filename="../ui/qml/Pages2/PageSetupWizardViewConfig.qml" line="144"/>
         <source>Connect</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1765,6 +1769,7 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../ui/qml/Pages2/PageShare.qml" line="190"/>
         <location filename="../ui/qml/Pages2/PageShare.qml" line="191"/>
         <source>Server</source>
         <translation type="unfinished"></translation>
@@ -1814,11 +1819,6 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
         <source>Access to server management. The user with whom you share full access to the connection will be able to add and remove your protocols and services to the servers, as well as change settings.</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../ui/qml/Pages2/PageShare.qml" line="190"/>
-        <source>Servers</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="../ui/qml/Pages2/PageShare.qml" line="251"/>
         <location filename="../ui/qml/Pages2/PageShare.qml" line="252"/>
@@ -2533,7 +2533,7 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Components/ShareConnectionDrawer.qml" line="250"/>
+        <location filename="../ui/qml/Components/ShareConnectionDrawer.qml" line="251"/>
         <source>To read the QR code in the Amnezia app, select &quot;Add server&quot; → &quot;I have data to connect&quot; → &quot;QR code, key or settings file&quot;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2617,7 +2617,7 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
 <context>
     <name>VpnConnection</name>
     <message>
-        <location filename="../vpnconnection.cpp" line="405"/>
+        <location filename="../vpnconnection.cpp" line="406"/>
         <source>Mbps</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/client/translations/amneziavpn_zh_CN.ts b/client/translations/amneziavpn_zh_CN.ts
index c2376be0..645d281f 100644
--- a/client/translations/amneziavpn_zh_CN.ts
+++ b/client/translations/amneziavpn_zh_CN.ts
@@ -4,7 +4,7 @@
 <context>
     <name>AmneziaApplication</name>
     <message>
-        <location filename="../amnezia_application.cpp" line="300"/>
+        <location filename="../amnezia_application.cpp" line="302"/>
         <source>Split tunneling for WireGuard is not implemented, the option was disabled</source>
         <translation type="unfinished">未启用选项，还未实现基于WireGuard协议的VPN分流</translation>
     </message>
@@ -130,7 +130,7 @@
 <context>
     <name>ImportController</name>
     <message>
-        <location filename="../ui/controllers/importController.cpp" line="375"/>
+        <location filename="../ui/controllers/importController.cpp" line="429"/>
         <source>Scanned %1 of %2.</source>
         <translation type="unfinished">扫描 %1 of %2.</translation>
     </message>
@@ -496,8 +496,12 @@ Already installed containers were found on the server. All installed containers
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="363"/>
+        <source>All users who you shared a connection with will no longer be able to connect to it.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>All users with whom you shared a connection will no longer be able to connect to it</source>
-        <translation type="unfinished">与您共享连接的所有用户将无法再连接到此链接</translation>
+        <translation type="obsolete">与您共享连接的所有用户将无法再连接到此链接</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="364"/>
@@ -542,14 +546,18 @@ Already installed containers were found on the server. All installed containers
         <source>Remove %1 from server?</source>
         <translation type="unfinished">从服务器移除 %1 ?</translation>
     </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageProtocolRaw.qml" line="177"/>
+        <source>All users who you shared a connection with will no longer be able to connect to it.</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source> from server?</source>
         <translation type="obsolete"> 从服务器</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageProtocolRaw.qml" line="177"/>
         <source>All users with whom you shared a connection will no longer be able to connect to it</source>
-        <translation type="unfinished">与您共享连接的所有用户将无法再连接到此链接</translation>
+        <translation type="obsolete">与您共享连接的所有用户将无法再连接到此链接</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageProtocolRaw.qml" line="178"/>
@@ -816,12 +824,21 @@ Already installed containers were found on the server. All installed containers
         <translation type="unfinished">捐款</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsAbout.qml" line="71"/>
         <source>This is a free and open source application. If you like it, support the developers with a donation.
 And if you don&apos;t like the app, all the more support it - the donation will be used to improve the app.</source>
-        <translation type="unfinished">这是一个免费且开源的应用软件。如果您喜欢它，请捐助支持我们继续研发。
+        <translation type="obsolete">这是一个免费且开源的应用软件。如果您喜欢它，请捐助支持我们继续研发。
 如果您不喜欢，请捐助支持我们改进它。</translation>
     </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsAbout.qml" line="71"/>
+        <source>This is a free and open source application. If you like it, support the developers with a donation. </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsAbout.qml" line="72"/>
+        <source>And if you don’t like the application, all the more reason to support it - the donation will be used for the improving the application.</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsAbout.qml" line="82"/>
         <source>Card on Patreon</source>
@@ -994,9 +1011,13 @@ And if you don&apos;t like the app, all the more support it - the donation will
         <translation type="unfinished">配置备份</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsBackup.qml" line="80"/>
         <source>It will help you instantly restore connection settings at the next installation</source>
-        <translation type="unfinished">帮助您在下次安装时立即恢复连接设置</translation>
+        <translation type="obsolete">帮助您在下次安装时立即恢复连接设置</translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsBackup.qml" line="80"/>
+        <source>You can save your settings to a backup file to restore them the next time you install the application.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsBackup.qml" line="89"/>
@@ -1093,8 +1114,12 @@ And if you don&apos;t like the app, all the more support it - the donation will
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsConnection.qml" line="100"/>
+        <source>Allows you to choose which sites you want to use the VPN for.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Allows you to connect to some sites through a secure connection, and to others bypassing it</source>
-        <translation type="unfinished">使用VPN访问指定网站，其他的则绕过</translation>
+        <translation type="obsolete">使用VPN访问指定网站，其他的则绕过</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsConnection.qml" line="113"/>
@@ -1350,6 +1375,11 @@ And if you don&apos;t like the app, all the more support it - the donation will
         <source>Remove </source>
         <translation type="unfinished">移除</translation>
     </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsServerProtocol.qml" line="117"/>
+        <source>All users who you shared a connection with will no longer be able to connect to it.</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source> from server?</source>
         <translation type="obsolete"> 从服务器</translation>
@@ -1360,9 +1390,8 @@ And if you don&apos;t like the app, all the more support it - the donation will
         <translation type="unfinished">从服务器移除 %1 ?</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsServerProtocol.qml" line="117"/>
         <source>All users with whom you shared a connection will no longer be able to connect to it</source>
-        <translation type="unfinished">与您共享连接的所有用户将无法再连接到此链接</translation>
+        <translation type="obsolete">与您共享连接的所有用户将无法再连接到此链接</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsServerProtocol.qml" line="118"/>
@@ -1748,27 +1777,27 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
 <context>
     <name>PageSetupWizardViewConfig</name>
     <message>
-        <location filename="../ui/qml/Pages2/PageSetupWizardViewConfig.qml" line="63"/>
+        <location filename="../ui/qml/Pages2/PageSetupWizardViewConfig.qml" line="59"/>
         <source>New connection</source>
         <translation type="unfinished">新连接</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSetupWizardViewConfig.qml" line="90"/>
+        <location filename="../ui/qml/Pages2/PageSetupWizardViewConfig.qml" line="86"/>
         <source>Do not use connection code from public sources. It could be created to intercept your data.</source>
         <translation type="unfinished">请勿使用公共来源的连接代码。它可以被创建来拦截您的数据。</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSetupWizardViewConfig.qml" line="105"/>
+        <location filename="../ui/qml/Pages2/PageSetupWizardViewConfig.qml" line="101"/>
         <source>Collapse content</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSetupWizardViewConfig.qml" line="105"/>
+        <location filename="../ui/qml/Pages2/PageSetupWizardViewConfig.qml" line="101"/>
         <source>Show content</source>
         <translation type="unfinished">展示内容</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSetupWizardViewConfig.qml" line="148"/>
+        <location filename="../ui/qml/Pages2/PageSetupWizardViewConfig.qml" line="144"/>
         <source>Connect</source>
         <translation type="unfinished">连接</translation>
     </message>
@@ -1830,11 +1859,11 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
         <translation type="obsolete">获得服务器完整授权</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageShare.qml" line="190"/>
         <source>Servers</source>
-        <translation type="unfinished">服务器</translation>
+        <translation type="obsolete">服务器</translation>
     </message>
     <message>
+        <location filename="../ui/qml/Pages2/PageShare.qml" line="190"/>
         <location filename="../ui/qml/Pages2/PageShare.qml" line="191"/>
         <source>Server</source>
         <translation type="unfinished">服务器</translation>
@@ -2581,7 +2610,7 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
         <translation type="obsolete">展示内容</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Components/ShareConnectionDrawer.qml" line="250"/>
+        <location filename="../ui/qml/Components/ShareConnectionDrawer.qml" line="251"/>
         <source>To read the QR code in the Amnezia app, select &quot;Add server&quot; → &quot;I have data to connect&quot; → &quot;QR code, key or settings file&quot;</source>
         <translation type="unfinished">要读取 Amnezia 应用程序中的二维码，请选择“添加服务器”→“我有数据要连接”→“二维码、密钥或配置文件”</translation>
     </message>
@@ -2665,7 +2694,7 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
 <context>
     <name>VpnConnection</name>
     <message>
-        <location filename="../vpnconnection.cpp" line="405"/>
+        <location filename="../vpnconnection.cpp" line="406"/>
         <source>Mbps</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/client/ui/models/containers_model.cpp b/client/ui/models/containers_model.cpp
index 6cf855a6..0c99041e 100644
--- a/client/ui/models/containers_model.cpp
+++ b/client/ui/models/containers_model.cpp
@@ -228,6 +228,11 @@ bool ContainersModel::isAnyContainerInstalled()
     return false;
 }
 
+void ContainersModel::updateContainersConfig()
+{
+    m_containers = m_settings->containers(m_currentlyProcessedServerIndex);
+}
+
 QHash<int, QByteArray> ContainersModel::roleNames() const
 {
     QHash<int, QByteArray> roles;
diff --git a/client/ui/models/containers_model.h b/client/ui/models/containers_model.h
index 2cc41cbf..cc549bb3 100644
--- a/client/ui/models/containers_model.h
+++ b/client/ui/models/containers_model.h
@@ -65,6 +65,8 @@ public slots:
 
     bool isAnyContainerInstalled();
 
+    void updateContainersConfig();
+
 protected:
     QHash<int, QByteArray> roleNames() const override;
 
diff --git a/client/vpnconnection.cpp b/client/vpnconnection.cpp
index 1cff01e6..46e8be60 100644
--- a/client/vpnconnection.cpp
+++ b/client/vpnconnection.cpp
@@ -323,6 +323,7 @@ void VpnConnection::connectToVpn(int serverIndex, const ServerCredentials &crede
     ErrorCode e = ErrorCode::NoError;
 
     m_vpnConfiguration = createVpnConfiguration(serverIndex, credentials, container, containerConfig, &e);
+    emit newVpnConfigurationCreated();
     if (e) {
         emit connectionStateChanged(Vpn::ConnectionState::Error);
         return;
diff --git a/client/vpnconnection.h b/client/vpnconnection.h
index 20ee14fa..f6b2343c 100644
--- a/client/vpnconnection.h
+++ b/client/vpnconnection.h
@@ -79,6 +79,8 @@ signals:
 
     void serviceIsNotReady();
 
+    void newVpnConfigurationCreated();
+
 protected slots:
     void onBytesChanged(quint64 receivedBytes, quint64 sentBytes);
     void onConnectionStateChanged(Vpn::ConnectionState state);

From fa06dbbd291712c5fa1aba2f32fabf03e45a01e1 Mon Sep 17 00:00:00 2001
From: Mykola Baibuz <mykola.baibuz@gmail.com>
Date: Tue, 10 Oct 2023 08:52:36 -0400
Subject: [PATCH 209/278] Bump Android verion

---
 client/android/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/android/build.gradle b/client/android/build.gradle
index cfc53460..49e378a0 100644
--- a/client/android/build.gradle
+++ b/client/android/build.gradle
@@ -138,8 +138,8 @@ android {
         resConfig "en"
         minSdkVersion = 24
         targetSdkVersion = 34
-        versionCode 32 // Change to a higher number
-        versionName "3.0.9" // Change to a higher number
+        versionCode 36 // Change to a higher number
+        versionName "4.0.8" // Change to a higher number
 
         javaCompileOptions.annotationProcessorOptions.arguments = [
             "room.schemaLocation": "${qtAndroidDir}/schemas".toString()

From d92729d346e14a7ee8ad3ba646202605d9642789 Mon Sep 17 00:00:00 2001
From: pokamest <pokamest@gmail.com>
Date: Wed, 11 Oct 2023 15:30:55 +0100
Subject: [PATCH 210/278] Fix install_docker.sh

---
 client/server_scripts/install_docker.sh | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/client/server_scripts/install_docker.sh b/client/server_scripts/install_docker.sh
index d8284dfd..e780dac5 100644
--- a/client/server_scripts/install_docker.sh
+++ b/client/server_scripts/install_docker.sh
@@ -5,9 +5,9 @@ else echo "Packet manager not found"; exit 1; fi;\
 echo "Dist: $dist, Packet manager: $pm, Docker pkg: $docker_pkg";\
 if [ "$dist" = "debian" ]; then export DEBIAN_FRONTEND=noninteractive; fi;\
 if ! command -v sudo > /dev/null 2>&1; then $pm update -yq; $pm install -yq sudo; fi;\
-if ! command -v fuser > /dev/null 2>&1; then $pm install -yq psmisc; fi;\
-if ! command -v lsof > /dev/null 2>&1; then $pm install -yq lsof; fi;\
-if ! command -v docker > /dev/null 2>&1; then $pm update -yq; $pm install -yq $docker_pkg;\
+if ! command -v fuser > /dev/null 2>&1; then sudo $pm install -yq psmisc; fi;\
+if ! command -v lsof > /dev/null 2>&1; then sudo $pm install -yq lsof; fi;\
+if ! command -v docker > /dev/null 2>&1; then sudo $pm update -yq; sudo $pm install -yq $docker_pkg;\
   if [ "$dist" = "fedora" ] || [ "$dist" = "debian" ]; then sudo systemctl enable docker && sudo systemctl start docker; fi;\
 fi;\
 if [ "$dist" = "debian" ]; then \
@@ -17,4 +17,3 @@ if [ "$dist" = "debian" ]; then \
 fi;\
 if ! command -v sudo > /dev/null 2>&1; then echo "Failed to install Docker";exit 1;fi;\
 docker --version
-

From 10435cea69b369fc6c85b633582b6e34ffa6b698 Mon Sep 17 00:00:00 2001
From: pokamest <pokamest@gmail.com>
Date: Thu, 12 Oct 2023 01:15:05 +0100
Subject: [PATCH 211/278] Tiny refactoring and text fixes

---
 .../configurators/wireguard_configurator.cpp  |  2 +-
 client/core/scripts_registry.cpp              |  4 +-
 client/core/scripts_registry.h                |  2 +-
 client/resources.qrc                          | 10 ++--
 .../{amnezia_wireguard => awg}/Dockerfile     |  0
 .../configure_container.sh                    |  0
 .../run_container.sh                          |  0
 .../{amnezia_wireguard => awg}/start.sh       |  0
 .../{amnezia_wireguard => awg}/template.conf  |  0
 client/translations/amneziavpn_ru.ts          | 28 ++++-------
 client/translations/amneziavpn_zh_CN.ts       | 48 +++++++++++--------
 client/ui/qml/Pages2/PageSettings.qml         |  2 +
 .../ui/qml/Pages2/PageSettingsConnection.qml  |  9 ++--
 .../qml/Pages2/PageSettingsSplitTunneling.qml |  6 +--
 deploy/build_windows.bat                      |  2 +-
 15 files changed, 58 insertions(+), 55 deletions(-)
 rename client/server_scripts/{amnezia_wireguard => awg}/Dockerfile (100%)
 rename client/server_scripts/{amnezia_wireguard => awg}/configure_container.sh (100%)
 rename client/server_scripts/{amnezia_wireguard => awg}/run_container.sh (100%)
 rename client/server_scripts/{amnezia_wireguard => awg}/start.sh (100%)
 rename client/server_scripts/{amnezia_wireguard => awg}/template.conf (100%)

diff --git a/client/configurators/wireguard_configurator.cpp b/client/configurators/wireguard_configurator.cpp
index a526e109..e22c8282 100644
--- a/client/configurators/wireguard_configurator.cpp
+++ b/client/configurators/wireguard_configurator.cpp
@@ -28,7 +28,7 @@ WireguardConfigurator::WireguardConfigurator(std::shared_ptr<Settings> settings,
                                                  : amnezia::protocols::wireguard::serverPublicKeyPath;
     m_serverPskKeyPath = m_isAwg ? amnezia::protocols::awg::serverPskKeyPath
                                               : amnezia::protocols::wireguard::serverPskKeyPath;
-    m_configTemplate = m_isAwg ? ProtocolScriptType::amnezia_wireguard_template
+    m_configTemplate = m_isAwg ? ProtocolScriptType::awg_template
                                             : ProtocolScriptType::wireguard_template;
 
     m_protocolName = m_isAwg ? config_key::awg : config_key::wireguard;
diff --git a/client/core/scripts_registry.cpp b/client/core/scripts_registry.cpp
index 82ae1fce..f209a2b1 100644
--- a/client/core/scripts_registry.cpp
+++ b/client/core/scripts_registry.cpp
@@ -11,7 +11,7 @@ QString amnezia::scriptFolder(amnezia::DockerContainer container)
     case DockerContainer::Cloak: return QLatin1String("openvpn_cloak");
     case DockerContainer::ShadowSocks: return QLatin1String("openvpn_shadowsocks");
     case DockerContainer::WireGuard: return QLatin1String("wireguard");
-    case DockerContainer::Awg: return QLatin1String("amnezia_wireguard");
+    case DockerContainer::Awg: return QLatin1String("awg");
     case DockerContainer::Ipsec: return QLatin1String("ipsec");
 
     case DockerContainer::TorWebSite: return QLatin1String("website_tor");
@@ -46,7 +46,7 @@ QString amnezia::scriptName(ProtocolScriptType type)
     case ProtocolScriptType::container_startup: return QLatin1String("start.sh");
     case ProtocolScriptType::openvpn_template: return QLatin1String("template.ovpn");
     case ProtocolScriptType::wireguard_template: return QLatin1String("template.conf");
-    case ProtocolScriptType::amnezia_wireguard_template: return QLatin1String("template.conf");
+    case ProtocolScriptType::awg_template: return QLatin1String("template.conf");
     }
 }
 
diff --git a/client/core/scripts_registry.h b/client/core/scripts_registry.h
index 5c7a1b6a..02fc94fd 100644
--- a/client/core/scripts_registry.h
+++ b/client/core/scripts_registry.h
@@ -27,7 +27,7 @@ enum ProtocolScriptType {
     container_startup,
     openvpn_template,
     wireguard_template,
-    amnezia_wireguard_template
+    awg_template
 };
 
 
diff --git a/client/resources.qrc b/client/resources.qrc
index 1b639266..4c63383c 100644
--- a/client/resources.qrc
+++ b/client/resources.qrc
@@ -217,10 +217,10 @@
         <file>ui/qml/Controls2/TopCloseButtonType.qml</file>
         <file>images/controls/x-circle.svg</file>
         <file>ui/qml/Pages2/PageProtocolAwgSettings.qml</file>
-        <file>server_scripts/amnezia_wireguard/template.conf</file>
-        <file>server_scripts/amnezia_wireguard/start.sh</file>
-        <file>server_scripts/amnezia_wireguard/configure_container.sh</file>
-        <file>server_scripts/amnezia_wireguard/run_container.sh</file>
-        <file>server_scripts/amnezia_wireguard/Dockerfile</file>
+        <file>server_scripts/awg/template.conf</file>
+        <file>server_scripts/awg/start.sh</file>
+        <file>server_scripts/awg/configure_container.sh</file>
+        <file>server_scripts/awg/run_container.sh</file>
+        <file>server_scripts/awg/Dockerfile</file>
     </qresource>
 </RCC>
diff --git a/client/server_scripts/amnezia_wireguard/Dockerfile b/client/server_scripts/awg/Dockerfile
similarity index 100%
rename from client/server_scripts/amnezia_wireguard/Dockerfile
rename to client/server_scripts/awg/Dockerfile
diff --git a/client/server_scripts/amnezia_wireguard/configure_container.sh b/client/server_scripts/awg/configure_container.sh
similarity index 100%
rename from client/server_scripts/amnezia_wireguard/configure_container.sh
rename to client/server_scripts/awg/configure_container.sh
diff --git a/client/server_scripts/amnezia_wireguard/run_container.sh b/client/server_scripts/awg/run_container.sh
similarity index 100%
rename from client/server_scripts/amnezia_wireguard/run_container.sh
rename to client/server_scripts/awg/run_container.sh
diff --git a/client/server_scripts/amnezia_wireguard/start.sh b/client/server_scripts/awg/start.sh
similarity index 100%
rename from client/server_scripts/amnezia_wireguard/start.sh
rename to client/server_scripts/awg/start.sh
diff --git a/client/server_scripts/amnezia_wireguard/template.conf b/client/server_scripts/awg/template.conf
similarity index 100%
rename from client/server_scripts/amnezia_wireguard/template.conf
rename to client/server_scripts/awg/template.conf
diff --git a/client/translations/amneziavpn_ru.ts b/client/translations/amneziavpn_ru.ts
index 27cb25e2..c46bebd9 100644
--- a/client/translations/amneziavpn_ru.ts
+++ b/client/translations/amneziavpn_ru.ts
@@ -1149,7 +1149,12 @@ Already installed containers were found on the server. All installed containers
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsConnection.qml" line="99"/>
-        <source>Split site tunneling</source>
+        <source>Split tunneling</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsConnection.qml" line="113"/>
+        <source>App-based split tunneling</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1157,11 +1162,6 @@ Already installed containers were found on the server. All installed containers
         <source>Allows you to choose which sites you want to use the VPN for.</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../ui/qml/Pages2/PageSettingsConnection.qml" line="113"/>
-        <source>Separate application tunneling</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsConnection.qml" line="114"/>
         <source>Allows you to use the VPN only for certain applications</source>
@@ -1444,17 +1444,17 @@ Already installed containers were found on the server. All installed containers
     <name>PageSettingsSplitTunneling</name>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="49"/>
-        <source>Only the addresses in the list must be opened via VPN</source>
+        <source>Addresses from the list should be accessed via VPN</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="54"/>
-        <source>Addresses from the list should never be opened via VPN</source>
+        <source>Addresses from the list should not be accessed via VPN</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="84"/>
-        <source>Split site tunneling</source>
+        <source>Split tunneling</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -2542,16 +2542,6 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
         <source>error 0x%1: %2</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../3rd/wireguard-tools/contrib/highlighter/gui/highlight.cpp" line="39"/>
-        <source>WireGuard Configuration Highlighter</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../3rd/wireguard-tools/contrib/highlighter/gui/highlight.cpp" line="82"/>
-        <source>&amp;Randomize colors</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>SelectLanguageDrawer</name>
diff --git a/client/translations/amneziavpn_zh_CN.ts b/client/translations/amneziavpn_zh_CN.ts
index 32d2d742..b4855a72 100644
--- a/client/translations/amneziavpn_zh_CN.ts
+++ b/client/translations/amneziavpn_zh_CN.ts
@@ -1197,8 +1197,17 @@ And if you don&apos;t like the app, all the more support it - the donation will
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsConnection.qml" line="99"/>
+        <source>Split tunneling</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsConnection.qml" line="113"/>
+        <source>App-based split tunneling</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Split site tunneling</source>
-        <translation type="unfinished">网站级VPN分流</translation>
+        <translation type="obsolete">网站级VPN分流</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsConnection.qml" line="100"/>
@@ -1210,9 +1219,8 @@ And if you don&apos;t like the app, all the more support it - the donation will
         <translation type="obsolete">使用VPN访问指定网站，其他的则绕过</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsConnection.qml" line="113"/>
         <source>Separate application tunneling</source>
-        <translation type="unfinished">应用级VPN分流</translation>
+        <translation type="obsolete">应用级VPN分流</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsConnection.qml" line="114"/>
@@ -1503,19 +1511,31 @@ And if you don&apos;t like the app, all the more support it - the donation will
 <context>
     <name>PageSettingsSplitTunneling</name>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="49"/>
         <source>Only the addresses in the list must be opened via VPN</source>
-        <translation type="unfinished">仅列表中的地址须通过VPN访问</translation>
+        <translation type="obsolete">仅列表中的地址须通过VPN访问</translation>
+    </message>
+    <message>
+        <source>Addresses from the list should never be opened via VPN</source>
+        <translation type="obsolete">勿通过VPN访问列表中的地址</translation>
+    </message>
+    <message>
+        <source>Split site tunneling</source>
+        <translation type="obsolete">网站级VPN分流</translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="49"/>
+        <source>Addresses from the list should be accessed via VPN</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="54"/>
-        <source>Addresses from the list should never be opened via VPN</source>
-        <translation type="unfinished">勿通过VPN访问列表中的地址</translation>
+        <source>Addresses from the list should not be accessed via VPN</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="84"/>
-        <source>Split site tunneling</source>
-        <translation type="unfinished">网站级VPN分流</translation>
+        <source>Split tunneling</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="120"/>
@@ -2615,16 +2635,6 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
         <source>error 0x%1: %2</source>
         <translation type="unfinished">错误 0x%1: %2</translation>
     </message>
-    <message>
-        <location filename="../3rd/wireguard-tools/contrib/highlighter/gui/highlight.cpp" line="39"/>
-        <source>WireGuard Configuration Highlighter</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../3rd/wireguard-tools/contrib/highlighter/gui/highlight.cpp" line="82"/>
-        <source>&amp;Randomize colors</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>SelectLanguageDrawer</name>
diff --git a/client/ui/qml/Pages2/PageSettings.qml b/client/ui/qml/Pages2/PageSettings.qml
index a806d472..d90f3ec8 100644
--- a/client/ui/qml/Pages2/PageSettings.qml
+++ b/client/ui/qml/Pages2/PageSettings.qml
@@ -95,6 +95,7 @@ PageType {
             DividerType {}
 
             LabelWithButtonType {
+                id: about
                 Layout.fillWidth: true
 
                 text: qsTr("About AmneziaVPN")
@@ -110,6 +111,7 @@ PageType {
 
             LabelWithButtonType {
                 Layout.fillWidth: true
+                Layout.preferredHeight: about.height
 
                 text: qsTr("Close application")
                 leftImageSource: "qrc:/images/controls/x-circle.svg"
diff --git a/client/ui/qml/Pages2/PageSettingsConnection.qml b/client/ui/qml/Pages2/PageSettingsConnection.qml
index 374e1ce4..b5343d24 100644
--- a/client/ui/qml/Pages2/PageSettingsConnection.qml
+++ b/client/ui/qml/Pages2/PageSettingsConnection.qml
@@ -96,8 +96,8 @@ PageType {
             LabelWithButtonType {
                 Layout.fillWidth: true
 
-                text: qsTr("Split site tunneling")
-                descriptionText: qsTr("Allows you to choose which sites you want to use the VPN for.")
+                text: qsTr("Site-based split tunneling")
+                descriptionText: qsTr("Allows you to select which sites you want to access through the VPN")
                 rightImageSource: "qrc:/images/controls/chevron-right.svg"
 
                 clickedFunction: function() {
@@ -109,8 +109,9 @@ PageType {
 
             LabelWithButtonType {
                 Layout.fillWidth: true
+                visible: false
 
-                text: qsTr("Separate application tunneling")
+                text: qsTr("App-based split tunneling")
                 descriptionText: qsTr("Allows you to use the VPN only for certain applications")
                 rightImageSource: "qrc:/images/controls/chevron-right.svg"
 
@@ -118,7 +119,7 @@ PageType {
                 }
             }
 
-            DividerType {}
+            // DividerType {}
         }
     }
 }
diff --git a/client/ui/qml/Pages2/PageSettingsSplitTunneling.qml b/client/ui/qml/Pages2/PageSettingsSplitTunneling.qml
index b79d5d22..45f2dae9 100644
--- a/client/ui/qml/Pages2/PageSettingsSplitTunneling.qml
+++ b/client/ui/qml/Pages2/PageSettingsSplitTunneling.qml
@@ -46,12 +46,12 @@ PageType {
 
     QtObject {
         id: onlyForwardSites
-        property string name: qsTr("Only the addresses in the list must be opened via VPN")
+        property string name: qsTr("Addresses from the list should be accessed via VPN")
         property int type: routeMode.onlyForwardSites
     }
     QtObject {
         id: allExceptSites
-        property string name: qsTr("Addresses from the list should never be opened via VPN")
+        property string name: qsTr("Addresses from the list should not be accessed via VPN")
         property int type: routeMode.allExceptSites
     }
 
@@ -81,7 +81,7 @@ PageType {
                 Layout.fillWidth: true
                 Layout.leftMargin: 16
 
-                headerText: qsTr("Split site tunneling")
+                headerText: qsTr("Split tunneling")
             }
 
             SwitcherType {
diff --git a/deploy/build_windows.bat b/deploy/build_windows.bat
index c4b7b8cf..7ac37f14 100644
--- a/deploy/build_windows.bat
+++ b/deploy/build_windows.bat
@@ -47,7 +47,7 @@ cd %PROJECT_DIR%
 call "%QT_BIN_DIR:"=%\qt-cmake" . -B %WORK_DIR%
 
 cd %WORK_DIR%
-cmake --build . --config release
+cmake --build . --config release -- /p:UseMultiToolTask=true /m
 if %errorlevel% neq 0 exit /b %errorlevel%
 
 cmake --build . --target clean

From a4624c7377c975e14957dc41b34345240d2d0c15 Mon Sep 17 00:00:00 2001
From: "vladimir.kuznetsov" <nethiuswork@gmail.com>
Date: Thu, 12 Oct 2023 10:57:13 +0500
Subject: [PATCH 212/278] removed the close button for the app for mobile
 platforms

---
 client/ui/qml/Pages2/PageSettings.qml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/client/ui/qml/Pages2/PageSettings.qml b/client/ui/qml/Pages2/PageSettings.qml
index a806d472..387f5ffa 100644
--- a/client/ui/qml/Pages2/PageSettings.qml
+++ b/client/ui/qml/Pages2/PageSettings.qml
@@ -109,6 +109,7 @@ PageType {
             DividerType {}
 
             LabelWithButtonType {
+                visible: GC.isMobile()
                 Layout.fillWidth: true
 
                 text: qsTr("Close application")
@@ -120,7 +121,9 @@ PageType {
                 }
             }
 
-            DividerType {}
+            DividerType {
+                visible: GC.isMobile()
+            }
         }
     }
 }

From d1f66cbf4d64549a340d682b5f1d3da361160479 Mon Sep 17 00:00:00 2001
From: ronoaer <ronoaer@gmail.com>
Date: Thu, 12 Oct 2023 16:26:37 +0800
Subject: [PATCH 213/278] updated translations for branch
 feature/amnezia-wireguard-client-impl

---
 client/translations/amneziavpn_ru.ts          |   29 +-
 client/translations/amneziavpn_zh_CN.ts       | 1061 +++++++++--------
 client/ui/controllers/sitesController.cpp     |    2 +-
 client/ui/qml/Pages2/PageProtocolRaw.qml      |    2 +-
 .../ui/qml/Pages2/PageSettingsApplication.qml |    2 +-
 5 files changed, 550 insertions(+), 546 deletions(-)

diff --git a/client/translations/amneziavpn_ru.ts b/client/translations/amneziavpn_ru.ts
index c46bebd9..ac099552 100644
--- a/client/translations/amneziavpn_ru.ts
+++ b/client/translations/amneziavpn_ru.ts
@@ -592,7 +592,7 @@ Already installed containers were found on the server. All installed containers
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageProtocolRaw.qml" line="130"/>
-        <source>Connection options </source>
+        <source>Connection options %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -860,12 +860,12 @@ Already installed containers were found on the server. All installed containers
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettings.qml" line="100"/>
+        <location filename="../ui/qml/Pages2/PageSettings.qml" line="101"/>
         <source>About AmneziaVPN</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettings.qml" line="114"/>
+        <location filename="../ui/qml/Pages2/PageSettings.qml" line="116"/>
         <source>Close application</source>
         <translation type="unfinished"></translation>
     </message>
@@ -977,12 +977,7 @@ Already installed containers were found on the server. All installed containers
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="73"/>
-        <source>Launch the application every time </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="73"/>
-        <source> starts</source>
+        <source>Launch the application every time %1 starts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1149,21 +1144,21 @@ Already installed containers were found on the server. All installed containers
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsConnection.qml" line="99"/>
-        <source>Split tunneling</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Pages2/PageSettingsConnection.qml" line="113"/>
-        <source>App-based split tunneling</source>
+        <source>Site-based split tunneling</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsConnection.qml" line="100"/>
-        <source>Allows you to choose which sites you want to use the VPN for.</source>
+        <source>Allows you to select which sites you want to access through the VPN</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsConnection.qml" line="114"/>
+        <source>App-based split tunneling</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsConnection.qml" line="115"/>
         <source>Allows you to use the VPN only for certain applications</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2651,7 +2646,7 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
     </message>
     <message>
         <location filename="../ui/controllers/sitesController.cpp" line="100"/>
-        <source>The JSON data is not an array in file: </source>
+        <source>The JSON data is not an array in file: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/client/translations/amneziavpn_zh_CN.ts b/client/translations/amneziavpn_zh_CN.ts
index b4855a72..7a08682c 100644
--- a/client/translations/amneziavpn_zh_CN.ts
+++ b/client/translations/amneziavpn_zh_CN.ts
@@ -6,7 +6,7 @@
     <message>
         <location filename="../amnezia_application.cpp" line="302"/>
         <source>Split tunneling for WireGuard is not implemented, the option was disabled</source>
-        <translation type="unfinished">未启用选项，还未实现基于WireGuard协议的VPN分流</translation>
+        <translation>未启用选项，还未实现基于WireGuard协议的VPN分离</translation>
     </message>
 </context>
 <context>
@@ -14,13 +14,13 @@
     <message>
         <location filename="../platforms/android/android_controller.cpp" line="236"/>
         <source>AmneziaVPN</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <location filename="../platforms/android/android_controller.cpp" line="239"/>
         <source>VPN Connected</source>
         <extracomment>Refers to the app - which is currently running the background and waiting</extracomment>
-        <translation type="unfinished">VPN已连接</translation>
+        <translation>VPN已连接</translation>
     </message>
 </context>
 <context>
@@ -31,38 +31,38 @@
         <location filename="../ui/controllers/connectionController.cpp" line="94"/>
         <location filename="../ui/controllers/connectionController.cpp" line="100"/>
         <source>Connect</source>
-        <translation type="unfinished">连接</translation>
+        <translation>连接</translation>
     </message>
     <message>
         <location filename="../ui/controllers/connectionController.cpp" line="38"/>
         <source>VPN Protocols is not installed.
  Please install VPN container at first</source>
-        <translation type="unfinished">不存在VPN协议，请先安装</translation>
+        <translation>请先安装VPN协议</translation>
     </message>
     <message>
         <location filename="../ui/controllers/connectionController.cpp" line="61"/>
         <source>Connection...</source>
-        <translation type="unfinished">连接中</translation>
+        <translation>连接中</translation>
     </message>
     <message>
         <location filename="../ui/controllers/connectionController.cpp" line="66"/>
         <source>Connected</source>
-        <translation type="unfinished">已连接</translation>
+        <translation>已连接</translation>
     </message>
     <message>
         <location filename="../ui/controllers/connectionController.cpp" line="75"/>
         <source>Reconnection...</source>
-        <translation type="unfinished">重连中</translation>
+        <translation>重连中</translation>
     </message>
     <message>
         <location filename="../ui/controllers/connectionController.cpp" line="85"/>
         <source>Disconnection...</source>
-        <translation type="unfinished">断开中</translation>
+        <translation>断开中</translation>
     </message>
     <message>
         <location filename="../ui/controllers/connectionController.cpp" line="111"/>
         <source>Settings updated successfully, Reconnnection...</source>
-        <translation type="unfinished">配置已更新，重连中</translation>
+        <translation>配置已更新，重连中</translation>
     </message>
 </context>
 <context>
@@ -70,17 +70,17 @@
     <message>
         <location filename="../ui/qml/Components/ConnectionTypeSelectionDrawer.qml" line="31"/>
         <source>Connection data</source>
-        <translation type="unfinished">连接数据</translation>
+        <translation>连接方式</translation>
     </message>
     <message>
         <location filename="../ui/qml/Components/ConnectionTypeSelectionDrawer.qml" line="40"/>
         <source>Server IP, login and password</source>
-        <translation type="unfinished">服务器IP，用户名和密码</translation>
+        <translation>服务器IP，用户名和密码</translation>
     </message>
     <message>
         <location filename="../ui/qml/Components/ConnectionTypeSelectionDrawer.qml" line="54"/>
         <source>QR code, key or configuration file</source>
-        <translation type="unfinished">二维码，授权码或者配置文件</translation>
+        <translation>二维码，授权码或者配置文件</translation>
     </message>
 </context>
 <context>
@@ -88,22 +88,22 @@
     <message>
         <location filename="../ui/qml/Controls2/ContextMenuType.qml" line="9"/>
         <source>C&amp;ut</source>
-        <translation type="unfinished">剪切</translation>
+        <translation>剪切</translation>
     </message>
     <message>
         <location filename="../ui/qml/Controls2/ContextMenuType.qml" line="15"/>
         <source>&amp;Copy</source>
-        <translation type="unfinished">拷贝</translation>
+        <translation>拷贝</translation>
     </message>
     <message>
         <location filename="../ui/qml/Controls2/ContextMenuType.qml" line="21"/>
         <source>&amp;Paste</source>
-        <translation type="unfinished">粘贴</translation>
+        <translation>粘贴</translation>
     </message>
     <message>
         <location filename="../ui/qml/Controls2/ContextMenuType.qml" line="28"/>
         <source>&amp;SelectAll</source>
-        <translation type="unfinished">全选</translation>
+        <translation>全选</translation>
     </message>
 </context>
 <context>
@@ -111,7 +111,7 @@
     <message>
         <location filename="../ui/controllers/exportController.cpp" line="34"/>
         <source>Access error!</source>
-        <translation type="unfinished">访问错误</translation>
+        <translation>访问错误</translation>
     </message>
 </context>
 <context>
@@ -119,12 +119,12 @@
     <message>
         <location filename="../ui/qml/Components/HomeContainersListView.qml" line="58"/>
         <source>The selected protocol is not supported on the current platform</source>
-        <translation type="unfinished">当前平台不支持所选协议</translation>
+        <translation>当前平台不支持所选协议</translation>
     </message>
     <message>
         <location filename="../ui/qml/Components/HomeContainersListView.qml" line="76"/>
         <source>Reconnect via VPN Procotol: </source>
-        <translation type="unfinished">重连基于VPN协议: </translation>
+        <translation>重连VPN基于协议: </translation>
     </message>
 </context>
 <context>
@@ -132,7 +132,7 @@
     <message>
         <location filename="../ui/controllers/importController.cpp" line="429"/>
         <source>Scanned %1 of %2.</source>
-        <translation type="unfinished">扫描 %1 of %2.</translation>
+        <translation>扫描 %1 of %2.</translation>
     </message>
 </context>
 <context>
@@ -149,46 +149,46 @@
         <location filename="../ui/controllers/installController.cpp" line="110"/>
         <location filename="../ui/controllers/installController.cpp" line="161"/>
         <source>%1 installed successfully. </source>
-        <translation type="unfinished">%1 安装成功。</translation>
+        <translation>%1 安装成功。</translation>
     </message>
     <message>
         <location filename="../ui/controllers/installController.cpp" line="112"/>
         <location filename="../ui/controllers/installController.cpp" line="163"/>
         <source>%1 is already installed on the server. </source>
-        <translation type="unfinished">服务器上已经安装 %1。</translation>
+        <translation>服务器上已经安装 %1。</translation>
     </message>
     <message>
         <location filename="../ui/controllers/installController.cpp" line="115"/>
         <source>
 Added containers that were already installed on the server</source>
-        <translation type="unfinished"></translation>
+        <translation>添加已安装在服务器上的容器</translation>
     </message>
     <message>
         <location filename="../ui/controllers/installController.cpp" line="182"/>
         <source>
 Already installed containers were found on the server. All installed containers have been added to the application</source>
-        <translation type="unfinished">
-在服务上发现已经安装协议并添加到应用程序</translation>
+        <translation>
+在服务上发现已经安装协议并添加至应用</translation>
     </message>
     <message>
         <location filename="../ui/controllers/installController.cpp" line="264"/>
         <source>Settings updated successfully</source>
-        <translation type="unfinished">配置更新成功</translation>
+        <translation>配置更新成功</translation>
     </message>
     <message>
         <location filename="../ui/controllers/installController.cpp" line="279"/>
         <source>Server &apos;%1&apos; was removed</source>
-        <translation type="unfinished">已移除服务器 &apos;%1&apos;</translation>
+        <translation>已移除服务器 &apos;%1&apos;</translation>
     </message>
     <message>
         <location filename="../ui/controllers/installController.cpp" line="289"/>
         <source>All containers from server &apos;%1&apos; have been removed</source>
-        <translation type="unfinished">服务器 &apos;%1&apos; 的所有容器已移除</translation>
+        <translation>服务器 &apos;%1&apos; 的所有容器已移除</translation>
     </message>
     <message>
         <location filename="../ui/controllers/installController.cpp" line="306"/>
         <source>%1 has been removed from the server &apos;%2&apos;</source>
-        <translation type="unfinished">%1 已从服务器 &apos;%2&apos; 上移除</translation>
+        <translation>%1 已从服务器 &apos;%2&apos; 上移除</translation>
     </message>
     <message>
         <source>1% has been removed from the server &apos;%2&apos;</source>
@@ -209,12 +209,12 @@ Already installed containers were found on the server. All installed containers
     <message>
         <location filename="../ui/controllers/installController.cpp" line="452"/>
         <source>Please login as the user</source>
-        <translation type="unfinished">请以用户身份登录</translation>
+        <translation>请以用户身份登录</translation>
     </message>
     <message>
         <location filename="../ui/controllers/installController.cpp" line="479"/>
         <source>Server added successfully</source>
-        <translation type="unfinished">服务器添加成功</translation>
+        <translation>增加服务器成功</translation>
     </message>
 </context>
 <context>
@@ -222,17 +222,17 @@ Already installed containers were found on the server. All installed containers
     <message>
         <location filename="../3rd/qtkeychain/TestAppExample/keychainclass.cpp" line="22"/>
         <source>Read key failed: %1</source>
-        <translation type="unfinished">获取授权码失败: %1</translation>
+        <translation>获取授权码失败: %1</translation>
     </message>
     <message>
         <location filename="../3rd/qtkeychain/TestAppExample/keychainclass.cpp" line="37"/>
         <source>Write key failed: %1</source>
-        <translation type="unfinished">写入授权码失败: %1</translation>
+        <translation>写入授权码失败: %1</translation>
     </message>
     <message>
         <location filename="../3rd/qtkeychain/TestAppExample/keychainclass.cpp" line="54"/>
         <source>Delete key failed: %1</source>
-        <translation type="unfinished">删除授权码失败: %1</translation>
+        <translation>删除授权码失败: %1</translation>
     </message>
 </context>
 <context>
@@ -241,27 +241,27 @@ Already installed containers were found on the server. All installed containers
         <location filename="../ui/notificationhandler.cpp" line="68"/>
         <location filename="../ui/notificationhandler.cpp" line="75"/>
         <source>AmneziaVPN</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <location filename="../ui/notificationhandler.cpp" line="69"/>
         <source>VPN Connected</source>
-        <translation type="unfinished">已连接到VPN</translation>
+        <translation>已连接到VPN</translation>
     </message>
     <message>
         <location filename="../ui/notificationhandler.cpp" line="76"/>
         <source>VPN Disconnected</source>
-        <translation type="unfinished">已从VPN断开</translation>
+        <translation>已从VPN断开</translation>
     </message>
     <message>
         <location filename="../ui/notificationhandler.cpp" line="99"/>
         <source>AmneziaVPN notification</source>
-        <translation type="unfinished">AmneziaVPN 提示</translation>
+        <translation>AmneziaVPN 提示</translation>
     </message>
     <message>
         <location filename="../ui/notificationhandler.cpp" line="100"/>
         <source>Unsecured network detected: </source>
-        <translation type="unfinished">发现不安全网络</translation>
+        <translation>发现不安全网络</translation>
     </message>
 </context>
 <context>
@@ -269,12 +269,12 @@ Already installed containers were found on the server. All installed containers
     <message>
         <location filename="../ui/qml/Pages2/PageDeinstalling.qml" line="62"/>
         <source>Removing services from %1</source>
-        <translation type="unfinished">正从 %1 移除服务</translation>
+        <translation>正从 %1 移除服务</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageDeinstalling.qml" line="87"/>
         <source>Usually it takes no more than 5 minutes</source>
-        <translation type="unfinished">通常5分钟之内完成</translation>
+        <translation>大约5分钟之内完成</translation>
     </message>
 </context>
 <context>
@@ -282,12 +282,12 @@ Already installed containers were found on the server. All installed containers
     <message>
         <location filename="../ui/qml/Pages2/PageHome.qml" line="344"/>
         <source>VPN protocol</source>
-        <translation type="unfinished">VPN协议</translation>
+        <translation>VPN协议</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageHome.qml" line="388"/>
         <source>Servers</source>
-        <translation type="unfinished">服务器</translation>
+        <translation>服务器</translation>
     </message>
 </context>
 <context>
@@ -295,87 +295,87 @@ Already installed containers were found on the server. All installed containers
     <message>
         <location filename="../ui/qml/Pages2/PageProtocolAwgSettings.qml" line="76"/>
         <source>AmneziaWG settings</source>
-        <translation type="unfinished"></translation>
+        <translation>AmneziaWG 配置</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageProtocolAwgSettings.qml" line="84"/>
         <source>Port</source>
-        <translation type="unfinished">端口</translation>
+        <translation>端口</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageProtocolAwgSettings.qml" line="103"/>
         <source>Junk packet count</source>
-        <translation type="unfinished"></translation>
+        <translation>垃圾包数量</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageProtocolAwgSettings.qml" line="126"/>
         <source>Junk packet minimum size</source>
-        <translation type="unfinished"></translation>
+        <translation>垃圾包最小值</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageProtocolAwgSettings.qml" line="144"/>
         <source>Junk packet maximum size</source>
-        <translation type="unfinished"></translation>
+        <translation>垃圾包最大值</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageProtocolAwgSettings.qml" line="162"/>
         <source>Init packet junk size</source>
-        <translation type="unfinished"></translation>
+        <translation>初始化垃圾包大小</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageProtocolAwgSettings.qml" line="180"/>
         <source>Response packet junk size</source>
-        <translation type="unfinished"></translation>
+        <translation>响应垃圾包大小</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageProtocolAwgSettings.qml" line="198"/>
         <source>Init packet magic header</source>
-        <translation type="unfinished"></translation>
+        <translation>初始化数据包魔数头</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageProtocolAwgSettings.qml" line="216"/>
         <source>Response packet magic header</source>
-        <translation type="unfinished"></translation>
+        <translation>响应包魔数头</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageProtocolAwgSettings.qml" line="234"/>
         <source>Transport packet magic header</source>
-        <translation type="unfinished"></translation>
+        <translation>传输包魔数头</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageProtocolAwgSettings.qml" line="252"/>
         <source>Underload packet magic header</source>
-        <translation type="unfinished"></translation>
+        <translation>低负载数据包魔数头</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageProtocolAwgSettings.qml" line="275"/>
         <source>Remove AmneziaWG</source>
-        <translation type="unfinished"></translation>
+        <translation>移除AmneziaWG</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageProtocolAwgSettings.qml" line="278"/>
         <source>Remove AmneziaWG from server?</source>
-        <translation type="unfinished"></translation>
+        <translation>从服务上移除AmneziaWG？</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageProtocolAwgSettings.qml" line="279"/>
         <source>All users who you shared a connection with will no longer be able to connect to it.</source>
-        <translation type="unfinished"></translation>
+        <translation>使用此共享连接的所有用户，将无法再连接它。</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageProtocolAwgSettings.qml" line="280"/>
         <source>Continue</source>
-        <translation type="unfinished">继续</translation>
+        <translation>继续</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageProtocolAwgSettings.qml" line="281"/>
         <source>Cancel</source>
-        <translation type="unfinished">取消</translation>
+        <translation>取消</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageProtocolAwgSettings.qml" line="311"/>
         <source>Save and Restart Amnezia</source>
-        <translation type="unfinished">保存并重启Amnezia</translation>
+        <translation>保存并重启Amnezia</translation>
     </message>
 </context>
 <context>
@@ -383,28 +383,28 @@ Already installed containers were found on the server. All installed containers
     <message>
         <location filename="../ui/qml/Pages2/PageProtocolCloakSettings.qml" line="74"/>
         <source>Cloak settings</source>
-        <translation type="unfinished">Cloak 配置</translation>
+        <translation>Cloak 配置</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageProtocolCloakSettings.qml" line="81"/>
         <source>Disguised as traffic from</source>
-        <translation type="unfinished">伪装流量来自</translation>
+        <translation>伪装流量为</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageProtocolCloakSettings.qml" line="103"/>
         <source>Port</source>
-        <translation type="unfinished">端口</translation>
+        <translation>端口</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageProtocolCloakSettings.qml" line="120"/>
         <location filename="../ui/qml/Pages2/PageProtocolCloakSettings.qml" line="121"/>
         <source>Cipher</source>
-        <translation type="unfinished">解码</translation>
+        <translation>加密算法</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageProtocolCloakSettings.qml" line="159"/>
         <source>Save and Restart Amnezia</source>
-        <translation type="unfinished">保存并重启Amnezia</translation>
+        <translation>保存并重启Amnezia</translation>
     </message>
 </context>
 <context>
@@ -412,180 +412,180 @@ Already installed containers were found on the server. All installed containers
     <message>
         <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="76"/>
         <source>OpenVPN settings</source>
-        <translation type="unfinished">OpenVPN 配置</translation>
+        <translation>OpenVPN 配置</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="83"/>
         <source>VPN Addresses Subnet</source>
-        <translation type="unfinished">VPN子网掩码</translation>
+        <translation>VPN子网掩码</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="97"/>
         <source>Network protocol</source>
-        <translation type="unfinished">网络协议</translation>
+        <translation>网络协议</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="126"/>
         <source>Port</source>
-        <translation type="unfinished">端口</translation>
+        <translation>端口</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="144"/>
         <source>Auto-negotiate encryption</source>
-        <translation type="unfinished">自动协商加密</translation>
+        <translation>自定义加密方式</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="161"/>
         <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="162"/>
         <source>Hash</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="170"/>
         <source>SHA512</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="171"/>
         <source>SHA384</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="172"/>
         <source>SHA256</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="173"/>
         <source>SHA3-512</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="174"/>
         <source>SHA3-384</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="175"/>
         <source>SHA3-256</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="176"/>
         <source>whirlpool</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="177"/>
         <source>BLAKE2b512</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="178"/>
         <source>BLAKE2s256</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="179"/>
         <source>SHA1</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="207"/>
         <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="208"/>
         <source>Cipher</source>
-        <translation type="unfinished">解码</translation>
+        <translation></translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="216"/>
         <source>AES-256-GCM</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="217"/>
         <source>AES-192-GCM</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="218"/>
         <source>AES-128-GCM</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="219"/>
         <source>AES-256-CBC</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="220"/>
         <source>AES-192-CBC</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="221"/>
         <source>AES-128-CBC</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="222"/>
         <source>ChaCha20-Poly1305</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="223"/>
         <source>ARIA-256-CBC</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="224"/>
         <source>CAMELLIA-256-CBC</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="225"/>
         <source>none</source>
-        <translation type="unfinished"></translation>
+        <translation>无</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="258"/>
         <source>TLS auth</source>
-        <translation type="unfinished">TLS认证</translation>
+        <translation>TLS认证</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="273"/>
         <source>Block DNS requests outside of VPN</source>
-        <translation type="unfinished">阻止VPN外的DNS请求</translation>
+        <translation>阻止VPN外的DNS请求</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="292"/>
         <source>Additional client configuration commands</source>
-        <translation type="unfinished">附加客户端配置命令</translation>
+        <translation>附加客户端配置命令</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="308"/>
         <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="340"/>
         <source>Commands:</source>
-        <translation type="unfinished">命令:</translation>
+        <translation>命令:</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="324"/>
         <source>Additional server configuration commands</source>
-        <translation type="unfinished">附加服务器端配置命令</translation>
+        <translation>附加服务器端配置命令</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="359"/>
         <source>Remove OpenVPN</source>
-        <translation type="unfinished">移除OpenVPN</translation>
+        <translation>移除OpenVPN</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="362"/>
         <source>Remove OpenVpn from server?</source>
-        <translation type="unfinished">从服务器移除OpenVPN吗?</translation>
+        <translation>从服务器移除OpenVPN吗?</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="363"/>
         <source>All users who you shared a connection with will no longer be able to connect to it.</source>
-        <translation type="unfinished"></translation>
+        <translation>使用此共享连接的所有用户，将无法再连接它。</translation>
     </message>
     <message>
         <source>All users with whom you shared a connection will no longer be able to connect to it</source>
@@ -594,17 +594,17 @@ Already installed containers were found on the server. All installed containers
     <message>
         <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="364"/>
         <source>Continue</source>
-        <translation type="unfinished">继续</translation>
+        <translation>继续</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="365"/>
         <source>Cancel</source>
-        <translation type="unfinished">取消</translation>
+        <translation>取消</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="384"/>
         <source>Save and Restart Amnezia</source>
-        <translation type="unfinished">保存并重启Amnezia</translation>
+        <translation>保存并重启Amnezia</translation>
     </message>
 </context>
 <context>
@@ -612,32 +612,36 @@ Already installed containers were found on the server. All installed containers
     <message>
         <location filename="../ui/qml/Pages2/PageProtocolRaw.qml" line="38"/>
         <source> settings</source>
-        <translation type="unfinished"> 配置</translation>
+        <translation> 配置</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageProtocolRaw.qml" line="78"/>
         <source>Show connection options</source>
-        <translation type="unfinished">展示连接选项</translation>
+        <translation>显示连接选项</translation>
+    </message>
+    <message>
+        <source>Connection options </source>
+        <translation type="obsolete">连接选项 </translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageProtocolRaw.qml" line="130"/>
-        <source>Connection options </source>
-        <translation type="unfinished">连接选项</translation>
+        <source>Connection options %1</source>
+        <translation>%1 连接选项</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageProtocolRaw.qml" line="172"/>
         <source>Remove </source>
-        <translation type="unfinished">移除</translation>
+        <translation>移除 </translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageProtocolRaw.qml" line="176"/>
         <source>Remove %1 from server?</source>
-        <translation type="unfinished">从服务器移除 %1 ?</translation>
+        <translation>从服务器移除 %1 ?</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageProtocolRaw.qml" line="177"/>
         <source>All users who you shared a connection with will no longer be able to connect to it.</source>
-        <translation type="unfinished"></translation>
+        <translation>使用此共享连接的所有用户，将无法再连接它。</translation>
     </message>
     <message>
         <source> from server?</source>
@@ -650,12 +654,12 @@ Already installed containers were found on the server. All installed containers
     <message>
         <location filename="../ui/qml/Pages2/PageProtocolRaw.qml" line="178"/>
         <source>Continue</source>
-        <translation type="unfinished">继续</translation>
+        <translation>继续</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageProtocolRaw.qml" line="179"/>
         <source>Cancel</source>
-        <translation type="unfinished">取消</translation>
+        <translation>取消</translation>
     </message>
 </context>
 <context>
@@ -663,23 +667,23 @@ Already installed containers were found on the server. All installed containers
     <message>
         <location filename="../ui/qml/Pages2/PageProtocolShadowSocksSettings.qml" line="74"/>
         <source>ShadowSocks settings</source>
-        <translation type="unfinished">ShadowSocks 配置</translation>
+        <translation>ShadowSocks 配置</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageProtocolShadowSocksSettings.qml" line="81"/>
         <source>Port</source>
-        <translation type="unfinished">端口</translation>
+        <translation>端口</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageProtocolShadowSocksSettings.qml" line="98"/>
         <location filename="../ui/qml/Pages2/PageProtocolShadowSocksSettings.qml" line="99"/>
         <source>Cipher</source>
-        <translation type="unfinished">解码</translation>
+        <translation>加密算法</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageProtocolShadowSocksSettings.qml" line="137"/>
         <source>Save and Restart Amnezia</source>
-        <translation type="unfinished">保存并重启Amnezia</translation>
+        <translation>保存并重启Amnezia</translation>
     </message>
 </context>
 <context>
@@ -688,22 +692,23 @@ Already installed containers were found on the server. All installed containers
         <location filename="../ui/qml/Pages2/PageServiceDnsSettings.qml" line="52"/>
         <source>A DNS service is installed on your server, and it is only accessible via VPN.
 </source>
-        <translation type="unfinished">您的服务器上安装了DNS服务，并且只能通过VPN访问。</translation>
+        <translation>您的服务器已安装DNS服务，仅能通过VPN访问。
+</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageServiceDnsSettings.qml" line="53"/>
         <source>The DNS address is the same as the address of your server. You can configure DNS in the settings, under the connections tab.</source>
-        <translation type="unfinished">DNS地址与您的服务器地址相同。您可以在连接选项卡下的设置中配置 DNS</translation>
+        <translation>其地址与您的服务器地址相同。您可以在 设置 连接 中进行配置。</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageServiceDnsSettings.qml" line="62"/>
         <source>Remove </source>
-        <translation type="unfinished">移除</translation>
+        <translation>移除</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageServiceDnsSettings.qml" line="66"/>
         <source>Remove %1 from server?</source>
-        <translation type="unfinished">从服务器移除 %1 ?</translation>
+        <translation>从服务器移除 %1 ?</translation>
     </message>
     <message>
         <source> from server?</source>
@@ -712,12 +717,12 @@ Already installed containers were found on the server. All installed containers
     <message>
         <location filename="../ui/qml/Pages2/PageServiceDnsSettings.qml" line="67"/>
         <source>Continue</source>
-        <translation type="unfinished">继续</translation>
+        <translation>继续</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageServiceDnsSettings.qml" line="68"/>
         <source>Cancel</source>
-        <translation type="unfinished">取消</translation>
+        <translation>取消</translation>
     </message>
 </context>
 <context>
@@ -725,17 +730,17 @@ Already installed containers were found on the server. All installed containers
     <message>
         <location filename="../ui/qml/Pages2/PageServiceSftpSettings.qml" line="22"/>
         <source>Settings updated successfully</source>
-        <translation type="unfinished">配置更新成功</translation>
+        <translation>配置更新成功</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageServiceSftpSettings.qml" line="83"/>
         <source>SFTP settings</source>
-        <translation type="unfinished">SFTP 配置</translation>
+        <translation>SFTP 配置</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageServiceSftpSettings.qml" line="90"/>
         <source>Host</source>
-        <translation type="unfinished">主机</translation>
+        <translation>主机</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageServiceSftpSettings.qml" line="100"/>
@@ -743,69 +748,69 @@ Already installed containers were found on the server. All installed containers
         <location filename="../ui/qml/Pages2/PageServiceSftpSettings.qml" line="134"/>
         <location filename="../ui/qml/Pages2/PageServiceSftpSettings.qml" line="151"/>
         <source>Copied</source>
-        <translation type="unfinished">拷贝</translation>
+        <translation>拷贝</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageServiceSftpSettings.qml" line="107"/>
         <source>Port</source>
-        <translation type="unfinished">端口</translation>
+        <translation>端口</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageServiceSftpSettings.qml" line="124"/>
         <source>Login</source>
-        <translation type="unfinished">用户</translation>
+        <translation>用户</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageServiceSftpSettings.qml" line="141"/>
         <source>Password</source>
-        <translation type="unfinished">密码</translation>
+        <translation>密码</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageServiceSftpSettings.qml" line="183"/>
         <source>Mount folder on device</source>
-        <translation type="unfinished">在设备上挂载文件夹</translation>
+        <translation>挂载文件夹</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageServiceSftpSettings.qml" line="208"/>
         <source>In order to mount remote SFTP folder as local drive, perform following steps: &lt;br&gt;</source>
-        <translation type="unfinished">要将远程 SFTP 文件夹安装为本地驱动器，请执行以下步骤: &lt;br&gt;</translation>
+        <translation>为将远程 SFTP 文件夹挂载到本地，请执行以下步骤: &lt;br&gt;</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageServiceSftpSettings.qml" line="210"/>
         <location filename="../ui/qml/Pages2/PageServiceSftpSettings.qml" line="213"/>
         <source>&lt;br&gt;1. Install the latest version of </source>
-        <translation type="unfinished">&lt;br&gt;1. 安装最新版的 </translation>
+        <translation>&lt;br&gt;1. 安装最新版的 </translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageServiceSftpSettings.qml" line="211"/>
         <location filename="../ui/qml/Pages2/PageServiceSftpSettings.qml" line="214"/>
         <source>&lt;br&gt;2. Install the latest version of </source>
-        <translation type="unfinished">&lt;br&gt;2. 安装最新版的 </translation>
+        <translation>&lt;br&gt;2. 安装最新版的 </translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageServiceSftpSettings.qml" line="242"/>
         <source>Detailed instructions</source>
-        <translation type="unfinished">详细说明</translation>
+        <translation>详细说明</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageServiceSftpSettings.qml" line="260"/>
         <source>Remove SFTP and all data stored there</source>
-        <translation type="unfinished">移除SFTP和其本地所有数据</translation>
+        <translation>移除SFTP和其本地所有数据</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageServiceSftpSettings.qml" line="263"/>
         <source>Remove SFTP and all data stored there?</source>
-        <translation type="unfinished">移除SFTP和其本地所有数据?</translation>
+        <translation>移除SFTP和其本地所有数据？</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageServiceSftpSettings.qml" line="264"/>
         <source>Continue</source>
-        <translation type="unfinished">继续</translation>
+        <translation>继续</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageServiceSftpSettings.qml" line="265"/>
         <source>Cancel</source>
-        <translation type="unfinished">取消</translation>
+        <translation>取消</translation>
     </message>
 </context>
 <context>
@@ -813,57 +818,57 @@ Already installed containers were found on the server. All installed containers
     <message>
         <location filename="../ui/qml/Pages2/PageServiceTorWebsiteSettings.qml" line="23"/>
         <source>Settings updated successfully</source>
-        <translation type="unfinished">配置更新成功</translation>
+        <translation>配置更新成功</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageServiceTorWebsiteSettings.qml" line="60"/>
         <source>Tor website settings</source>
-        <translation type="unfinished">Tor网站配置</translation>
+        <translation>Tor网站配置</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageServiceTorWebsiteSettings.qml" line="67"/>
         <source>Website address</source>
-        <translation type="unfinished">网址</translation>
+        <translation>网址</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageServiceTorWebsiteSettings.qml" line="82"/>
         <source>Copied</source>
-        <translation type="unfinished">拷贝</translation>
+        <translation>已拷贝</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageServiceTorWebsiteSettings.qml" line="106"/>
         <source>Use &lt;a href=&quot;https://www.torproject.org/download/&quot; style=&quot;color: #FBB26A;&quot;&gt;Tor Browser&lt;/a&gt; to open this url.</source>
-        <translation type="unfinished">用 &lt;a href=&quot;https://www.torproject.org/download/&quot; style=&quot;color: #FBB26A;&quot;&gt;Tor 浏览器&lt;/a&gt; 打开上面网址</translation>
+        <translation>用 &lt;a href=&quot;https://www.torproject.org/download/&quot; style=&quot;color: #FBB26A;&quot;&gt;Tor 浏览器&lt;/a&gt; 打开上面网址</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageServiceTorWebsiteSettings.qml" line="115"/>
         <source>After installation it takes several minutes while your onion site will become available in the Tor Network.</source>
-        <translation type="unfinished">安装几分钟后,洋葱站点才会在 Tor 网络中生效。</translation>
+        <translation>完成安装几分钟后,洋葱站点才会在 Tor 网络中生效。</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageServiceTorWebsiteSettings.qml" line="124"/>
         <source>When configuring WordPress set the domain as this onion address.</source>
-        <translation type="unfinished">配置 WordPress 时，将域设置为此洋葱地址。</translation>
+        <translation>配置 WordPress 时，将域设置为此洋葱地址。</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageServiceTorWebsiteSettings.qml" line="138"/>
         <source>Remove website</source>
-        <translation type="unfinished">移除网站</translation>
+        <translation>移除网站</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageServiceTorWebsiteSettings.qml" line="141"/>
         <source>The site with all data will be removed from the tor network.</source>
-        <translation type="unfinished">网站及其所有数据将从 Tor 网络中删除</translation>
+        <translation>网站及其所有数据将从 Tor 网络中删除</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageServiceTorWebsiteSettings.qml" line="142"/>
         <source>Continue</source>
-        <translation type="unfinished">继续</translation>
+        <translation>继续</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageServiceTorWebsiteSettings.qml" line="143"/>
         <source>Cancel</source>
-        <translation type="unfinished">取消</translation>
+        <translation>取消</translation>
     </message>
 </context>
 <context>
@@ -871,37 +876,37 @@ Already installed containers were found on the server. All installed containers
     <message>
         <location filename="../ui/qml/Pages2/PageSettings.qml" line="37"/>
         <source>Settings</source>
-        <translation type="unfinished">设置</translation>
+        <translation>设置</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettings.qml" line="44"/>
         <source>Servers</source>
-        <translation type="unfinished">服务器</translation>
+        <translation>服务器</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettings.qml" line="58"/>
         <source>Connection</source>
-        <translation type="unfinished">连接</translation>
+        <translation>连接</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettings.qml" line="72"/>
         <source>Application</source>
-        <translation type="unfinished">应用</translation>
+        <translation>应用</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettings.qml" line="86"/>
         <source>Backup</source>
-        <translation type="unfinished">备份</translation>
+        <translation>备份</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettings.qml" line="100"/>
+        <location filename="../ui/qml/Pages2/PageSettings.qml" line="101"/>
         <source>About AmneziaVPN</source>
-        <translation type="unfinished">关于</translation>
+        <translation>关于</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettings.qml" line="114"/>
+        <location filename="../ui/qml/Pages2/PageSettings.qml" line="116"/>
         <source>Close application</source>
-        <translation type="unfinished"></translation>
+        <translation>关闭应用</translation>
     </message>
 </context>
 <context>
@@ -909,7 +914,7 @@ Already installed containers were found on the server. All installed containers
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsAbout.qml" line="56"/>
         <source>Support the project with a donation</source>
-        <translation type="unfinished">捐款</translation>
+        <translation>捐款</translation>
     </message>
     <message>
         <source>This is a free and open source application. If you like it, support the developers with a donation.
@@ -920,82 +925,83 @@ And if you don&apos;t like the app, all the more support it - the donation will
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsAbout.qml" line="71"/>
         <source>This is a free and open source application. If you like it, support the developers with a donation. </source>
-        <translation type="unfinished"></translation>
+        <translation>这是一个免费且开源的软件。如果您喜欢它，请捐助开发者们。
+</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsAbout.qml" line="72"/>
         <source>And if you don’t like the application, all the more reason to support it - the donation will be used for the improving the application.</source>
-        <translation type="unfinished"></translation>
+        <translation>如果您不喜欢，请捐助支持我们改进它。</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsAbout.qml" line="82"/>
         <source>Card on Patreon</source>
-        <translation type="unfinished">Patreon订阅</translation>
+        <translation>Patreon订阅</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsAbout.qml" line="85"/>
         <source>https://www.patreon.com/amneziavpn</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsAbout.qml" line="102"/>
         <source>Show other methods on Github</source>
-        <translation type="unfinished">其他捐款途径</translation>
+        <translation>其他捐款途径</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsAbout.qml" line="113"/>
         <source>Contacts</source>
-        <translation type="unfinished">联系方式</translation>
+        <translation>联系方式</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsAbout.qml" line="120"/>
         <source>Telegram group</source>
-        <translation type="unfinished">电报群</translation>
+        <translation>电报群</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsAbout.qml" line="121"/>
         <source>To discuss features</source>
-        <translation type="unfinished">用于功能讨论</translation>
+        <translation>用于功能讨论</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsAbout.qml" line="125"/>
         <source>https://t.me/amnezia_vpn_en</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsAbout.qml" line="134"/>
         <source>Mail</source>
-        <translation type="unfinished">邮件</translation>
+        <translation>邮件</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsAbout.qml" line="135"/>
         <source>For reviews and bug reports</source>
-        <translation type="unfinished">用于评论和提交软件的缺陷</translation>
+        <translation>用于评论和提交软件的缺陷</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsAbout.qml" line="147"/>
         <source>Github</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsAbout.qml" line="151"/>
         <source>https://github.com/amnezia-vpn/amnezia-client</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsAbout.qml" line="160"/>
         <source>Website</source>
-        <translation type="unfinished">官网</translation>
+        <translation>官网</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsAbout.qml" line="164"/>
         <source>https://amnezia.org</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsAbout.qml" line="192"/>
         <source>Check for updates</source>
-        <translation type="unfinished">更新</translation>
+        <translation>检查更新</translation>
     </message>
 </context>
 <context>
@@ -1003,82 +1009,85 @@ And if you don&apos;t like the app, all the more support it - the donation will
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="43"/>
         <source>Application</source>
-        <translation type="unfinished">应用</translation>
+        <translation>应用</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="52"/>
         <source>Allow application screenshots</source>
-        <translation type="unfinished"></translation>
+        <translation>允许截屏</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="72"/>
         <source>Auto start</source>
-        <translation type="unfinished">自动运行</translation>
+        <translation>自动运行</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="73"/>
         <source>Launch the application every time </source>
-        <translation type="unfinished">总是在系统 </translation>
+        <translation type="obsolete">总是在系统 </translation>
+    </message>
+    <message>
+        <source> starts</source>
+        <translation type="obsolete"> 启动时自动运行运用程序</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="73"/>
-        <source> starts</source>
-        <translation type="unfinished"> 启动时自动运行运用程序</translation>
+        <source>Launch the application every time %1 starts</source>
+        <translation>运行应用软件在%1系统启动时</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="93"/>
         <source>Start minimized</source>
-        <translation type="unfinished">最小化</translation>
+        <translation>最小化</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="94"/>
         <source>Launch application minimized</source>
-        <translation type="unfinished">开启应用程序时窗口最小化</translation>
+        <translation>开启应用软件时窗口最小化</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="111"/>
         <source>Language</source>
-        <translation type="unfinished">语言</translation>
+        <translation>语言</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="130"/>
         <source>Logging</source>
-        <translation type="unfinished">日志</translation>
+        <translation>日志</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="131"/>
         <source>Enabled</source>
-        <translation type="unfinished">开启</translation>
+        <translation>开启</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="131"/>
         <source>Disabled</source>
-        <translation type="unfinished">禁用</translation>
+        <translation>禁用</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="144"/>
         <source>Reset settings and remove all data from the application</source>
-        <translation type="unfinished">重置并清理应用的所有数据</translation>
+        <translation>重置并清理应用的所有数据</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="148"/>
         <source>Reset settings and remove all data from the application?</source>
-        <translation type="unfinished">重置并清理应用的所有数据？</translation>
+        <translation>重置并清理应用的所有数据？</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="149"/>
         <source>All settings will be reset to default. All installed AmneziaVPN services will still remain on the server.</source>
-        <translation type="unfinished">所有配置恢复为默认值。在服务器上保留所有已安装的AmneziaVPN服务。</translation>
+        <translation>所有配置恢复为默认值。服务器已安装的AmneziaVPN服务将被保留。</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="150"/>
         <source>Continue</source>
-        <translation type="unfinished">继续</translation>
+        <translation>继续</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="151"/>
         <source>Cancel</source>
-        <translation type="unfinished">取消</translation>
+        <translation>取消</translation>
     </message>
 </context>
 <context>
@@ -1086,17 +1095,17 @@ And if you don&apos;t like the app, all the more support it - the donation will
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsBackup.qml" line="27"/>
         <source>Settings restored from backup file</source>
-        <translation type="unfinished">从备份文件还原配置</translation>
+        <translation>从备份文件还原配置</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsBackup.qml" line="66"/>
         <source>Backup</source>
-        <translation type="unfinished">备份</translation>
+        <translation>备份</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsBackup.qml" line="73"/>
         <source>Configuration backup</source>
-        <translation type="unfinished">配置备份</translation>
+        <translation>备份设置</translation>
     </message>
     <message>
         <source>It will help you instantly restore connection settings at the next installation</source>
@@ -1105,53 +1114,53 @@ And if you don&apos;t like the app, all the more support it - the donation will
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsBackup.qml" line="80"/>
         <source>You can save your settings to a backup file to restore them the next time you install the application.</source>
-        <translation type="unfinished"></translation>
+        <translation>您可以将配置信息备份到文件中，以便在下次安装应用软件时恢复配置</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsBackup.qml" line="89"/>
         <source>Make a backup</source>
-        <translation type="unfinished">进行备份</translation>
+        <translation>进行备份</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsBackup.qml" line="96"/>
         <source>Save backup file</source>
-        <translation type="unfinished">保存备份</translation>
+        <translation>保存备份</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsBackup.qml" line="97"/>
         <location filename="../ui/qml/Pages2/PageSettingsBackup.qml" line="125"/>
         <source>Backup files (*.backup)</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsBackup.qml" line="121"/>
         <source>Restore from backup</source>
-        <translation type="unfinished">从备份还原</translation>
+        <translation>从备份还原</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsBackup.qml" line="124"/>
         <source>Open backup file</source>
-        <translation type="unfinished">打开备份文件</translation>
+        <translation>打开备份文件</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsBackup.qml" line="135"/>
         <source>Import settings from a backup file?</source>
-        <translation type="unfinished">从备份文件导入设置？</translation>
+        <translation>从备份文件导入设置？</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsBackup.qml" line="136"/>
         <source>All current settings will be reset</source>
-        <translation type="unfinished">当前所有设置将重置</translation>
+        <translation>当前所有设置将重置</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsBackup.qml" line="137"/>
         <source>Continue</source>
-        <translation type="unfinished">继续</translation>
+        <translation>继续</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsBackup.qml" line="138"/>
         <source>Cancel</source>
-        <translation type="unfinished">取消</translation>
+        <translation>取消</translation>
     </message>
 </context>
 <context>
@@ -1159,17 +1168,17 @@ And if you don&apos;t like the app, all the more support it - the donation will
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsConnection.qml" line="41"/>
         <source>Connection</source>
-        <translation type="unfinished">连接</translation>
+        <translation>连接</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsConnection.qml" line="50"/>
         <source>Auto connect</source>
-        <translation type="unfinished">自动连接</translation>
+        <translation>自动连接</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsConnection.qml" line="51"/>
         <source>Connect to VPN on app start</source>
-        <translation type="unfinished">应用开启时连接VPN</translation>
+        <translation>应用开启时连接VPN</translation>
     </message>
     <message>
         <source>Use AmneziaDNS if installed on the server</source>
@@ -1178,42 +1187,42 @@ And if you don&apos;t like the app, all the more support it - the donation will
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsConnection.qml" line="69"/>
         <source>Use AmneziaDNS</source>
-        <translation type="unfinished">使用AmneziaDNS</translation>
+        <translation>使用AmneziaDNS</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsConnection.qml" line="70"/>
         <source>If AmneziaDNS is installed on the server</source>
-        <translation type="unfinished">如其已安装至服务器上</translation>
+        <translation>如果已在服务器安装AmneziaDNS</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsConnection.qml" line="85"/>
         <source>DNS servers</source>
-        <translation type="unfinished">DNS服务器列表</translation>
+        <translation>DNS服务器</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsConnection.qml" line="86"/>
         <source>If AmneziaDNS is not used or installed</source>
-        <translation type="unfinished">如果未使用或未安装AmneziaDNS</translation>
+        <translation>如果未使用或未安装AmneziaDNS</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsConnection.qml" line="99"/>
-        <source>Split tunneling</source>
-        <translation type="unfinished"></translation>
+        <source>Site-based split tunneling</source>
+        <translation>基于网站的隧道分离</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsConnection.qml" line="113"/>
+        <location filename="../ui/qml/Pages2/PageSettingsConnection.qml" line="100"/>
+        <source>Allows you to select which sites you want to access through the VPN</source>
+        <translation>配置想要通过VPN访问网站</translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsConnection.qml" line="114"/>
         <source>App-based split tunneling</source>
-        <translation type="unfinished"></translation>
+        <translation>基于应用的隧道分离</translation>
     </message>
     <message>
         <source>Split site tunneling</source>
         <translation type="obsolete">网站级VPN分流</translation>
     </message>
-    <message>
-        <location filename="../ui/qml/Pages2/PageSettingsConnection.qml" line="100"/>
-        <source>Allows you to choose which sites you want to use the VPN for.</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Allows you to connect to some sites through a secure connection, and to others bypassing it</source>
         <translation type="obsolete">使用VPN访问指定网站，其他的则绕过</translation>
@@ -1223,9 +1232,9 @@ And if you don&apos;t like the app, all the more support it - the donation will
         <translation type="obsolete">应用级VPN分流</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsConnection.qml" line="114"/>
+        <location filename="../ui/qml/Pages2/PageSettingsConnection.qml" line="115"/>
         <source>Allows you to use the VPN only for certain applications</source>
-        <translation type="unfinished">仅限指定应用使用VPN</translation>
+        <translation>仅指定应用使用VPN</translation>
     </message>
 </context>
 <context>
@@ -1233,57 +1242,57 @@ And if you don&apos;t like the app, all the more support it - the donation will
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsDns.qml" line="45"/>
         <source>DNS servers</source>
-        <translation type="unfinished">DNS服务器</translation>
+        <translation>DNS服务器</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsDns.qml" line="49"/>
         <source>If AmneziaDNS is not used or installed</source>
-        <translation type="unfinished">如果未使用或未安装Amnezia DNS</translation>
+        <translation>如果未使用或未安装AmneziaDNS</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsDns.qml" line="56"/>
         <source>Primary DNS</source>
-        <translation type="unfinished">首选 DNS</translation>
+        <translation>首选 DNS</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsDns.qml" line="68"/>
         <source>Secondary DNS</source>
-        <translation type="unfinished">备用 DNS</translation>
+        <translation>备用 DNS</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsDns.qml" line="86"/>
         <source>Restore default</source>
-        <translation type="unfinished">恢复默认配置</translation>
+        <translation>恢复默认配置</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsDns.qml" line="89"/>
         <source>Restore default DNS settings?</source>
-        <translation type="unfinished">是否恢复默认DNS配置？</translation>
+        <translation>是否恢复默认DNS配置？</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsDns.qml" line="90"/>
         <source>Continue</source>
-        <translation type="unfinished">继续</translation>
+        <translation>继续</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsDns.qml" line="91"/>
         <source>Cancel</source>
-        <translation type="unfinished">取消</translation>
+        <translation>取消</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsDns.qml" line="99"/>
         <source>Settings have been reset</source>
-        <translation type="unfinished">已重置</translation>
+        <translation>已重置</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsDns.qml" line="111"/>
         <source>Save</source>
-        <translation type="unfinished">保存</translation>
+        <translation>保存</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsDns.qml" line="120"/>
         <source>Settings saved</source>
-        <translation type="unfinished">配置已保存</translation>
+        <translation>配置已保存</translation>
     </message>
 </context>
 <context>
@@ -1291,57 +1300,57 @@ And if you don&apos;t like the app, all the more support it - the donation will
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsLogging.qml" line="47"/>
         <source>Logging</source>
-        <translation type="unfinished">日志</translation>
+        <translation>日志</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsLogging.qml" line="54"/>
         <source>Save logs</source>
-        <translation type="unfinished">记录日志</translation>
+        <translation>记录日志</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsLogging.qml" line="86"/>
         <source>Open folder with logs</source>
-        <translation type="unfinished">打开日志文件夹</translation>
+        <translation>打开日志文件夹</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsLogging.qml" line="108"/>
         <source>Save</source>
-        <translation type="unfinished">保存</translation>
+        <translation>保存</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsLogging.qml" line="109"/>
         <source>Logs files (*.log)</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsLogging.qml" line="126"/>
         <source>Save logs to file</source>
-        <translation type="unfinished">保存日志到文件</translation>
+        <translation>保存日志到文件</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsLogging.qml" line="144"/>
         <source>Clear logs?</source>
-        <translation type="unfinished">清除日志？</translation>
+        <translation>清理日志？</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsLogging.qml" line="145"/>
         <source>Continue</source>
-        <translation type="unfinished">继续</translation>
+        <translation>继续</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsLogging.qml" line="146"/>
         <source>Cancel</source>
-        <translation type="unfinished">取消</translation>
+        <translation>取消</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsLogging.qml" line="153"/>
         <source>Logs have been cleaned up</source>
-        <translation type="unfinished">已清理日志</translation>
+        <translation>日志已清理</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsLogging.qml" line="166"/>
         <source>Clear logs</source>
-        <translation type="unfinished">清理日志</translation>
+        <translation>清理日志</translation>
     </message>
 </context>
 <context>
@@ -1349,27 +1358,27 @@ And if you don&apos;t like the app, all the more support it - the donation will
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsServerData.qml" line="23"/>
         <source>All installed containers have been added to the application</source>
-        <translation type="unfinished">所有已安装的容器已添加到应用程序中</translation>
+        <translation>所有已安装的容器，已被添加到应用软件</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsServerData.qml" line="25"/>
         <source>No new installed containers found</source>
-        <translation type="unfinished">未找到新安装的容器</translation>
+        <translation>未发现新安装的容器</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsServerData.qml" line="87"/>
         <source>Clear Amnezia cache</source>
-        <translation type="unfinished">清除 Amnezia 缓存</translation>
+        <translation>清除 Amnezia 缓存</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsServerData.qml" line="88"/>
         <source>May be needed when changing other settings</source>
-        <translation type="unfinished">更改其他设置时可能需要</translation>
+        <translation>更改其他设置时可能需要缓存</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsServerData.qml" line="91"/>
         <source>Clear cached profiles?</source>
-        <translation type="unfinished">清除缓存的配置文件？</translation>
+        <translation>清除缓存？</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsServerData.qml" line="92"/>
@@ -1381,54 +1390,54 @@ And if you don&apos;t like the app, all the more support it - the donation will
         <location filename="../ui/qml/Pages2/PageSettingsServerData.qml" line="140"/>
         <location filename="../ui/qml/Pages2/PageSettingsServerData.qml" line="171"/>
         <source>Continue</source>
-        <translation type="unfinished">继续</translation>
+        <translation>继续</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsServerData.qml" line="94"/>
         <location filename="../ui/qml/Pages2/PageSettingsServerData.qml" line="141"/>
         <location filename="../ui/qml/Pages2/PageSettingsServerData.qml" line="172"/>
         <source>Cancel</source>
-        <translation type="unfinished">取消</translation>
+        <translation>取消</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsServerData.qml" line="117"/>
         <source>Check the server for previously installed Amnezia services</source>
-        <translation type="unfinished">检查服务器上是否存在 Amnezia 服务</translation>
+        <translation>检查服务器上，是否存在之前安装的 Amnezia 服务</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsServerData.qml" line="118"/>
         <source>Add them to the application if they were not displayed</source>
-        <translation type="unfinished">如果存在且未被显示，则添加到应用程序里</translation>
+        <translation>如果存在且未显示，则添加到应用软件</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsServerData.qml" line="134"/>
         <source>Remove server from application</source>
-        <translation type="unfinished">移除本地服务器信息</translation>
+        <translation>移除本地服务器信息</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsServerData.qml" line="138"/>
         <source>Remove server?</source>
-        <translation type="unfinished">移除本地服务器信息?</translation>
+        <translation>移除本地服务器信息?</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsServerData.qml" line="139"/>
         <source>All installed AmneziaVPN services will still remain on the server.</source>
-        <translation type="unfinished">所有已安装的 AmneziaVPN 服务仍将保留在服务器上。</translation>
+        <translation>所有已安装的 AmneziaVPN 服务仍将保留在服务器上。</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsServerData.qml" line="165"/>
         <source>Clear server from Amnezia software</source>
-        <translation type="unfinished">移除Amnezia中服务器信息</translation>
+        <translation>清理Amnezia中服务器信息</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsServerData.qml" line="169"/>
         <source>Clear server from Amnezia software?</source>
-        <translation type="unfinished">从Amnezia中清除服务器?</translation>
+        <translation>清理Amnezia中服务器信息</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsServerData.qml" line="170"/>
         <source>All containers will be deleted on the server. This means that configuration files, keys and certificates will be deleted.</source>
-        <translation type="unfinished">服务器上的所有容器都将被删除。这意味着配置文件、密钥和证书将被删除。</translation>
+        <translation>服务器上的所有容器都将被删除。配置文件、密钥和证书也将被删除。</translation>
     </message>
 </context>
 <context>
@@ -1436,27 +1445,27 @@ And if you don&apos;t like the app, all the more support it - the donation will
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsServerInfo.qml" line="102"/>
         <source>Server name</source>
-        <translation type="unfinished">服务器名称</translation>
+        <translation>服务器名</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsServerInfo.qml" line="110"/>
         <source>Save</source>
-        <translation type="unfinished">保存</translation>
+        <translation>保存</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsServerInfo.qml" line="137"/>
         <source>Protocols</source>
-        <translation type="unfinished">协议</translation>
+        <translation>协议</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsServerInfo.qml" line="143"/>
         <source>Services</source>
-        <translation type="unfinished">服务</translation>
+        <translation>服务</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsServerInfo.qml" line="147"/>
         <source>Data</source>
-        <translation type="unfinished">数据</translation>
+        <translation>数据</translation>
     </message>
 </context>
 <context>
@@ -1464,17 +1473,17 @@ And if you don&apos;t like the app, all the more support it - the donation will
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsServerProtocol.qml" line="38"/>
         <source> settings</source>
-        <translation type="unfinished">配置</translation>
+        <translation>配置</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsServerProtocol.qml" line="112"/>
         <source>Remove </source>
-        <translation type="unfinished">移除</translation>
+        <translation>移除</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsServerProtocol.qml" line="117"/>
         <source>All users who you shared a connection with will no longer be able to connect to it.</source>
-        <translation type="unfinished"></translation>
+        <translation>使用此共享连接的所有用户，将无法再连接它。</translation>
     </message>
     <message>
         <source> from server?</source>
@@ -1483,7 +1492,7 @@ And if you don&apos;t like the app, all the more support it - the donation will
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsServerProtocol.qml" line="116"/>
         <source>Remove %1 from server?</source>
-        <translation type="unfinished">从服务器移除 %1 ?</translation>
+        <translation>从服务器移除 %1 ?</translation>
     </message>
     <message>
         <source>All users with whom you shared a connection will no longer be able to connect to it</source>
@@ -1492,12 +1501,12 @@ And if you don&apos;t like the app, all the more support it - the donation will
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsServerProtocol.qml" line="118"/>
         <source>Continue</source>
-        <translation type="unfinished">继续</translation>
+        <translation>继续</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsServerProtocol.qml" line="119"/>
         <source>Cancel</source>
-        <translation type="unfinished">取消</translation>
+        <translation>取消</translation>
     </message>
 </context>
 <context>
@@ -1505,7 +1514,7 @@ And if you don&apos;t like the app, all the more support it - the donation will
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsServersList.qml" line="37"/>
         <source>Servers</source>
-        <translation type="unfinished">服务器</translation>
+        <translation>服务器</translation>
     </message>
 </context>
 <context>
@@ -1525,90 +1534,90 @@ And if you don&apos;t like the app, all the more support it - the donation will
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="49"/>
         <source>Addresses from the list should be accessed via VPN</source>
-        <translation type="unfinished"></translation>
+        <translation>仅使用VPN访问</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="54"/>
         <source>Addresses from the list should not be accessed via VPN</source>
-        <translation type="unfinished"></translation>
+        <translation>不使用VPN访问</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="84"/>
         <source>Split tunneling</source>
-        <translation type="unfinished"></translation>
+        <translation>隧道分离</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="120"/>
         <source>Mode</source>
-        <translation type="unfinished">方式</translation>
+        <translation>规则</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="198"/>
         <source>Remove </source>
-        <translation type="unfinished">移除 </translation>
+        <translation>移除 </translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="199"/>
         <source>Continue</source>
-        <translation type="unfinished">继续</translation>
+        <translation>继续</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="200"/>
         <source>Cancel</source>
-        <translation type="unfinished">取消</translation>
+        <translation>取消</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="238"/>
         <source>Site or IP</source>
-        <translation type="unfinished">网址或IP地址</translation>
+        <translation>网站或IP地址</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="282"/>
         <source>Import/Export Sites</source>
-        <translation type="unfinished">导入/导出网址</translation>
+        <translation>导入/导出网站</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="288"/>
         <source>Import</source>
-        <translation type="unfinished">导入</translation>
+        <translation>导入</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="300"/>
         <source>Save site list</source>
-        <translation type="unfinished">保存网址</translation>
+        <translation>保存网址</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="307"/>
         <source>Save sites</source>
-        <translation type="unfinished">保存网址</translation>
+        <translation>保存网址</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="308"/>
         <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="375"/>
         <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="390"/>
         <source>Sites files (*.json)</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="365"/>
         <source>Import a list of sites</source>
-        <translation type="unfinished">导入网址列表</translation>
+        <translation>导入网址列表</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="371"/>
         <source>Replace site list</source>
-        <translation type="unfinished">替换网址列表</translation>
+        <translation>替换网址列表</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="374"/>
         <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="389"/>
         <source>Open sites file</source>
-        <translation type="unfinished">打开网址文件</translation>
+        <translation>打开网址文件</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="386"/>
         <source>Add imported sites to existing ones</source>
-        <translation type="unfinished">将导入的网址添加到现有网址中</translation>
+        <translation>将导入的网址添加到现有网址中</translation>
     </message>
 </context>
 <context>
@@ -1616,45 +1625,45 @@ And if you don&apos;t like the app, all the more support it - the donation will
     <message>
         <location filename="../ui/qml/Pages2/PageSetupWizardConfigSource.qml" line="50"/>
         <source>Server connection</source>
-        <translation type="unfinished">服务器连接</translation>
+        <translation>服务器连接</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSetupWizardConfigSource.qml" line="51"/>
         <source>Do not use connection code from public sources. It may have been created to intercept your data.
 
 It&apos;s okay as long as it&apos;s from someone you trust.</source>
-        <translation type="unfinished">请勿使用公共来源的连接代码。它可能是为了拦截您的数据而创建的。
-最好是来源可信。</translation>
+        <translation>请勿使用公共来源的连接码。它可能是为了拦截您的数据而创建的。
+请确保连接码来源可信。</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSetupWizardConfigSource.qml" line="61"/>
         <source>What do you have?</source>
-        <translation type="unfinished"></translation>
+        <translation>你用什么方式创建连接？</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSetupWizardConfigSource.qml" line="68"/>
         <source>File with connection settings or backup</source>
-        <translation type="unfinished">包含连接配置或备份的文件</translation>
+        <translation>包含连接配置或备份的文件</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSetupWizardConfigSource.qml" line="68"/>
         <source>File with connection settings</source>
-        <translation type="unfinished">包含连接配置的文件</translation>
+        <translation>包含连接配置的文件</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSetupWizardConfigSource.qml" line="75"/>
         <source>Open config file</source>
-        <translation type="unfinished">打开配置文件</translation>
+        <translation>打开配置文件</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSetupWizardConfigSource.qml" line="95"/>
         <source>QR-code</source>
-        <translation type="unfinished">二维码</translation>
+        <translation>二维码</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSetupWizardConfigSource.qml" line="114"/>
         <source>Key as text</source>
-        <translation type="unfinished">授权码文本</translation>
+        <translation>授权码文本</translation>
     </message>
 </context>
 <context>
@@ -1662,52 +1671,52 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
     <message>
         <location filename="../ui/qml/Pages2/PageSetupWizardCredentials.qml" line="44"/>
         <source>Server connection</source>
-        <translation type="unfinished">服务器连接</translation>
+        <translation>连接服务器</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSetupWizardCredentials.qml" line="51"/>
         <source>Server IP address [:port]</source>
-        <translation type="unfinished">服务器IP [:端口]</translation>
+        <translation>服务器IP [:端口]</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSetupWizardCredentials.qml" line="52"/>
         <source>255.255.255.255:88</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSetupWizardCredentials.qml" line="66"/>
         <source>Login to connect via SSH</source>
-        <translation type="unfinished">用户名</translation>
+        <translation>ssh账号</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSetupWizardCredentials.qml" line="76"/>
         <source>Password / SSH private key</source>
-        <translation type="unfinished">密码 或者 私钥</translation>
+        <translation>密码 或 私钥</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSetupWizardCredentials.qml" line="90"/>
         <source>Continue</source>
-        <translation type="unfinished">继续</translation>
+        <translation>继续</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSetupWizardCredentials.qml" line="117"/>
         <source>Ip address cannot be empty</source>
-        <translation type="unfinished">IP不能为空</translation>
+        <translation>IP不能为空</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSetupWizardCredentials.qml" line="120"/>
         <source>Enter the address in the format 255.255.255.255:88</source>
-        <translation type="unfinished">按照这种格式输入 255.255.255.255:88</translation>
+        <translation>按照这种格式输入 255.255.255.255:88</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSetupWizardCredentials.qml" line="124"/>
         <source>Login cannot be empty</source>
-        <translation type="unfinished">用户名不能为空</translation>
+        <translation>账号不能为空</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSetupWizardCredentials.qml" line="128"/>
         <source>Password/private key cannot be empty</source>
-        <translation type="unfinished">密码或者私钥不能为空</translation>
+        <translation>密码或私钥不能为空</translation>
     </message>
 </context>
 <context>
@@ -1715,27 +1724,27 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
     <message>
         <location filename="../ui/qml/Pages2/PageSetupWizardEasy.qml" line="67"/>
         <source>What is the level of internet control in your region?</source>
-        <translation type="unfinished">您所在地区的互联网控制力度如何？</translation>
+        <translation>您所在地区的互联网管控力度如何？</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSetupWizardEasy.qml" line="137"/>
         <source>Set up a VPN yourself</source>
-        <translation type="unfinished">自己架设VPN</translation>
+        <translation>自己架设VPN</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSetupWizardEasy.qml" line="138"/>
         <source>I want to choose a VPN protocol</source>
-        <translation type="unfinished">我想选择VPN协议</translation>
+        <translation>我想选择VPN协议</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSetupWizardEasy.qml" line="157"/>
         <source>Continue</source>
-        <translation type="unfinished">继续</translation>
+        <translation>继续</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSetupWizardEasy.qml" line="197"/>
         <source>Set up later</source>
-        <translation type="unfinished">稍后设置</translation>
+        <translation>稍后设置</translation>
     </message>
 </context>
 <context>
@@ -1744,32 +1753,32 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
         <location filename="../ui/qml/Pages2/PageSetupWizardInstalling.qml" line="21"/>
         <location filename="../ui/qml/Pages2/PageSetupWizardInstalling.qml" line="67"/>
         <source>Usually it takes no more than 5 minutes</source>
-        <translation type="unfinished">通常不超过5分钟</translation>
+        <translation>通常不超过5分钟</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSetupWizardInstalling.qml" line="57"/>
         <source>The server has already been added to the application</source>
-        <translation type="unfinished">服务器已添加到应用程序中</translation>
+        <translation>服务器已添加到应用软件中</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSetupWizardInstalling.qml" line="62"/>
         <source>Amnesia has detected that your server is currently </source>
-        <translation type="unfinished">Amnezia 检测到您的服务器当前</translation>
+        <translation>Amnezia 检测到您的服务器当前</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSetupWizardInstalling.qml" line="63"/>
         <source>busy installing other software. Amnesia installation </source>
-        <translation type="unfinished">正安装其他软件。Amnezia安装</translation>
+        <translation>正安装其他软件。Amnezia安装</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSetupWizardInstalling.qml" line="64"/>
         <source>will pause until the server finishes installing other software</source>
-        <translation type="unfinished">将暂停，直到服务器完成安装其他软件。</translation>
+        <translation>将暂停，直到其他软件安装完成。</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSetupWizardInstalling.qml" line="121"/>
         <source>Installing</source>
-        <translation type="unfinished">安装中</translation>
+        <translation>安装中</translation>
     </message>
 </context>
 <context>
@@ -1777,32 +1786,32 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
     <message>
         <location filename="../ui/qml/Pages2/PageSetupWizardProtocolSettings.qml" line="75"/>
         <source>Installing %1</source>
-        <translation type="unfinished">正在安装 %1</translation>
+        <translation>正在安装 %1</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSetupWizardProtocolSettings.qml" line="93"/>
         <source>More detailed</source>
-        <translation type="unfinished">更多细节</translation>
+        <translation>更多细节</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSetupWizardProtocolSettings.qml" line="183"/>
         <source>Close</source>
-        <translation type="unfinished">关闭</translation>
+        <translation>关闭</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSetupWizardProtocolSettings.qml" line="198"/>
         <source>Network protocol</source>
-        <translation type="unfinished">网络协议</translation>
+        <translation>网络协议</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSetupWizardProtocolSettings.qml" line="214"/>
         <source>Port</source>
-        <translation type="unfinished">端口</translation>
+        <translation>端口</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSetupWizardProtocolSettings.qml" line="230"/>
         <source>Install</source>
-        <translation type="unfinished">安装</translation>
+        <translation>安装</translation>
     </message>
 </context>
 <context>
@@ -1810,12 +1819,12 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
     <message>
         <location filename="../ui/qml/Pages2/PageSetupWizardProtocols.qml" line="73"/>
         <source>VPN protocol</source>
-        <translation type="unfinished">VPN 协议</translation>
+        <translation>VPN 协议</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSetupWizardProtocols.qml" line="74"/>
         <source>Choose the one with the highest priority for you. Later, you can install other protocols and additional services, such as DNS proxy and SFTP.</source>
-        <translation type="unfinished">选择最适合您的一项。稍后，您可以安装其他协议和附加服务，例如 DNS 代理和 SFTP。</translation>
+        <translation>选择你认为优先级最高的一项。稍后，您可以安装其他协议和附加服务，例如 DNS 代理和 SFTP。</translation>
     </message>
 </context>
 <context>
@@ -1823,7 +1832,7 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
     <message>
         <location filename="../ui/qml/Pages2/PageSetupWizardQrReader.qml" line="37"/>
         <source>Point the camera at the QR code and hold for a couple of seconds. </source>
-        <translation type="unfinished">将相机对准二维码并按住几秒钟</translation>
+        <translation>将相机对准二维码并按住几秒钟</translation>
     </message>
 </context>
 <context>
@@ -1831,27 +1840,27 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
     <message>
         <location filename="../ui/qml/Pages2/PageSetupWizardStart.qml" line="54"/>
         <source>Settings restored from backup file</source>
-        <translation type="unfinished">从备份文件还原配置</translation>
+        <translation>从备份文件还原配置</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSetupWizardStart.qml" line="105"/>
         <source>Free service for creating a personal VPN on your server.</source>
-        <translation type="unfinished"></translation>
+        <translation>在您的服务器上架设私人免费VPN服务。</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSetupWizardStart.qml" line="106"/>
         <source> Helps you access blocked content without revealing your privacy, even to VPN providers.</source>
-        <translation type="unfinished"></translation>
+        <translation>帮助您访问受限内容，保护您的隐私，即使是VPN提供商也无法获取。</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSetupWizardStart.qml" line="115"/>
         <source>I have the data to connect</source>
-        <translation type="unfinished"></translation>
+        <translation>我有连接配置</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSetupWizardStart.qml" line="135"/>
         <source>I have nothing</source>
-        <translation type="unfinished"></translation>
+        <translation>我没有</translation>
     </message>
 </context>
 <context>
@@ -1859,27 +1868,27 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
     <message>
         <location filename="../ui/qml/Pages2/PageSetupWizardTextKey.qml" line="39"/>
         <source>Connection key</source>
-        <translation type="unfinished">连接授权码</translation>
+        <translation>连接授权码</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSetupWizardTextKey.qml" line="40"/>
         <source>A line that starts with vpn://...</source>
-        <translation type="unfinished">以 vpn://... 开始的行</translation>
+        <translation>以 vpn://... 开始的行</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSetupWizardTextKey.qml" line="51"/>
         <source>Key</source>
-        <translation type="unfinished">授权码</translation>
+        <translation>授权码</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSetupWizardTextKey.qml" line="53"/>
         <source>Insert</source>
-        <translation type="unfinished">插入</translation>
+        <translation>插入</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSetupWizardTextKey.qml" line="71"/>
         <source>Continue</source>
-        <translation type="unfinished">继续</translation>
+        <translation>继续</translation>
     </message>
 </context>
 <context>
@@ -1887,27 +1896,27 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
     <message>
         <location filename="../ui/qml/Pages2/PageSetupWizardViewConfig.qml" line="59"/>
         <source>New connection</source>
-        <translation type="unfinished">新连接</translation>
+        <translation>新连接</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSetupWizardViewConfig.qml" line="86"/>
         <source>Do not use connection code from public sources. It could be created to intercept your data.</source>
-        <translation type="unfinished">请勿使用公共来源的连接代码。它可以被创建来拦截您的数据。</translation>
+        <translation>请勿使用公共来源的连接码。它可以被创建来拦截您的数据。</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSetupWizardViewConfig.qml" line="101"/>
         <source>Collapse content</source>
-        <translation type="unfinished"></translation>
+        <translation>折叠内容</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSetupWizardViewConfig.qml" line="101"/>
         <source>Show content</source>
-        <translation type="unfinished">展示内容</translation>
+        <translation>显示内容</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSetupWizardViewConfig.qml" line="144"/>
         <source>Connect</source>
-        <translation type="unfinished">连接</translation>
+        <translation>连接</translation>
     </message>
 </context>
 <context>
@@ -1915,52 +1924,52 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
     <message>
         <location filename="../ui/qml/Pages2/PageShare.qml" line="48"/>
         <source>Save OpenVPN config</source>
-        <translation type="unfinished">保存OpenVPN配置</translation>
+        <translation>保存OpenVPN配置</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageShare.qml" line="55"/>
         <source>Save WireGuard config</source>
-        <translation type="unfinished">保存WireGuard配置</translation>
+        <translation>保存WireGuard配置</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageShare.qml" line="86"/>
         <source>For the AmneziaVPN app</source>
-        <translation type="unfinished">AmneziaVPN 应用</translation>
+        <translation>AmneziaVPN 应用</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageShare.qml" line="91"/>
         <source>OpenVpn native format</source>
-        <translation type="unfinished">OpenVPN原生格式</translation>
+        <translation>OpenVPN原生格式</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageShare.qml" line="96"/>
         <source>WireGuard native format</source>
-        <translation type="unfinished">WireGuard原生格式</translation>
+        <translation>WireGuard原生格式</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageShare.qml" line="121"/>
         <source>VPN Access</source>
-        <translation type="unfinished">访问VPN</translation>
+        <translation>访问VPN</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageShare.qml" line="146"/>
         <source>Connection</source>
-        <translation type="unfinished">连接</translation>
+        <translation>连接</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageShare.qml" line="158"/>
         <source>Full access</source>
-        <translation type="unfinished">完整授权</translation>
+        <translation>完全访问</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageShare.qml" line="174"/>
         <source>VPN access without the ability to manage the server</source>
-        <translation type="unfinished">无权控制服务器</translation>
+        <translation>访问VPN，但没有权限管理服务。</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageShare.qml" line="175"/>
         <source>Access to server management. The user with whom you share full access to the connection will be able to add and remove your protocols and services to the servers, as well as change settings.</source>
-        <translation type="unfinished"></translation>
+        <translation>除访问VPN外，用户还能添加和删除协议、服务以及更改配置信息</translation>
     </message>
     <message>
         <source>Full access to server</source>
@@ -1974,22 +1983,22 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
         <location filename="../ui/qml/Pages2/PageShare.qml" line="190"/>
         <location filename="../ui/qml/Pages2/PageShare.qml" line="191"/>
         <source>Server</source>
-        <translation type="unfinished">服务器</translation>
+        <translation>服务器</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageShare.qml" line="221"/>
         <source>Accessing </source>
-        <translation type="unfinished">访问</translation>
+        <translation>访问</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageShare.qml" line="222"/>
         <source>File with accessing settings to </source>
-        <translation type="unfinished"></translation>
+        <translation>访问配置文件的内容为:</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageShare.qml" line="310"/>
         <source>File with connection settings to </source>
-        <translation type="unfinished">连接配置文件的内容为:</translation>
+        <translation>连接配置文件的内容为:</translation>
     </message>
     <message>
         <source>Protocols</source>
@@ -1999,23 +2008,23 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
         <location filename="../ui/qml/Pages2/PageShare.qml" line="251"/>
         <location filename="../ui/qml/Pages2/PageShare.qml" line="252"/>
         <source>Protocol</source>
-        <translation type="unfinished">协议</translation>
+        <translation>协议</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageShare.qml" line="309"/>
         <source>Connection to </source>
-        <translation type="unfinished">连接到</translation>
+        <translation>连接到</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageShare.qml" line="343"/>
         <location filename="../ui/qml/Pages2/PageShare.qml" line="344"/>
         <source>Connection format</source>
-        <translation type="unfinished">连接方式</translation>
+        <translation>连接格式</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageShare.qml" line="382"/>
         <source>Share</source>
-        <translation type="unfinished">共享</translation>
+        <translation>共享</translation>
     </message>
 </context>
 <context>
@@ -2023,7 +2032,7 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
     <message>
         <location filename="../ui/qml/Controls2/PopupType.qml" line="68"/>
         <source>Close</source>
-        <translation type="unfinished">关闭</translation>
+        <translation>关闭</translation>
     </message>
 </context>
 <context>
@@ -2031,38 +2040,38 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
     <message>
         <location filename="../3rd/qtkeychain/keychain_win.cpp" line="104"/>
         <source>Password entry not found</source>
-        <translation type="unfinished">没有密码输入</translation>
+        <translation>未发现秘密</translation>
     </message>
     <message>
         <location filename="../3rd/qtkeychain/keychain_win.cpp" line="108"/>
         <source>Could not decrypt data</source>
-        <translation type="unfinished">不能加密数据</translation>
+        <translation>数据无法加密</translation>
     </message>
     <message>
         <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="552"/>
         <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="560"/>
         <source>Unknown error</source>
-        <translation type="unfinished">位置错误</translation>
+        <translation>未知错误</translation>
     </message>
     <message>
         <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="578"/>
         <source>Could not open wallet: %1; %2</source>
-        <translation type="unfinished">无法打开钱包: %1; %2</translation>
+        <translation>无法打开钱包: %1; %2</translation>
     </message>
     <message>
         <location filename="../3rd/qtkeychain/keychain_haiku.cpp" line="177"/>
         <source>Password not found</source>
-        <translation type="unfinished">未发现密码</translation>
+        <translation>未发现密码</translation>
     </message>
     <message>
         <location filename="../3rd/qtkeychain/keychain_android.cpp" line="173"/>
         <source>Could not open keystore</source>
-        <translation type="unfinished">无法打开密钥库</translation>
+        <translation>无法打开密钥库</translation>
     </message>
     <message>
         <location filename="../3rd/qtkeychain/keychain_android.cpp" line="179"/>
         <source>Could not remove private key from keystore</source>
-        <translation type="unfinished">无法从密钥库中删除私钥</translation>
+        <translation>无法从密钥库中删除私钥</translation>
     </message>
 </context>
 <context>
@@ -2070,12 +2079,12 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
     <message>
         <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="265"/>
         <source>Unknown error</source>
-        <translation type="unfinished">未知错误</translation>
+        <translation>未知错误</translation>
     </message>
     <message>
         <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="509"/>
         <source>Access to keychain denied</source>
-        <translation type="unfinished">访问钥匙串被拒绝</translation>
+        <translation>访问钥匙串被拒绝</translation>
     </message>
 </context>
 <context>
@@ -2083,27 +2092,27 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
     <message>
         <location filename="../3rd/qtkeychain/plaintextstore.cpp" line="65"/>
         <source>Could not store data in settings: access error</source>
-        <translation type="unfinished">无法在配置中存储数据：访问错误</translation>
+        <translation>无法在配置中存储数据：访问错误</translation>
     </message>
     <message>
         <location filename="../3rd/qtkeychain/plaintextstore.cpp" line="67"/>
         <source>Could not store data in settings: format error</source>
-        <translation type="unfinished">无法在陪置中存储数据：格式错误</translation>
+        <translation>无法在陪置中存储数据：格式错误</translation>
     </message>
     <message>
         <location filename="../3rd/qtkeychain/plaintextstore.cpp" line="85"/>
         <source>Could not delete data from settings: access error</source>
-        <translation type="unfinished">无法在配置中删除数据：访问错误</translation>
+        <translation>无法在配置中删除数据：访问错误</translation>
     </message>
     <message>
         <location filename="../3rd/qtkeychain/plaintextstore.cpp" line="87"/>
         <source>Could not delete data from settings: format error</source>
-        <translation type="unfinished">无法在配置中删除数据：格式错误</translation>
+        <translation>无法在配置中删除数据：格式错误</translation>
     </message>
     <message>
         <location filename="../3rd/qtkeychain/plaintextstore.cpp" line="104"/>
         <source>Entry not found</source>
-        <translation type="unfinished">未找到条目</translation>
+        <translation>未找到条目</translation>
     </message>
 </context>
 <context>
@@ -2111,80 +2120,80 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
     <message>
         <location filename="../3rd/qtkeychain/keychain_win.cpp" line="32"/>
         <source>Password entry not found</source>
-        <translation type="unfinished">没有密码输入</translation>
+        <translation>未发现密码</translation>
     </message>
     <message>
         <location filename="../3rd/qtkeychain/keychain_win.cpp" line="36"/>
         <location filename="../3rd/qtkeychain/keychain_win.cpp" line="139"/>
         <source>Could not decrypt data</source>
-        <translation type="unfinished">不能加密数据</translation>
+        <translation>数据无法加密</translation>
     </message>
     <message>
         <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="178"/>
         <source>D-Bus is not running</source>
-        <translation type="unfinished"></translation>
+        <translation>D-Bus未运行</translation>
     </message>
     <message>
         <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="187"/>
         <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="197"/>
         <source>Unknown error</source>
-        <translation type="unfinished"></translation>
+        <translation>未知错误</translation>
     </message>
     <message>
         <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="286"/>
         <source>No keychain service available</source>
-        <translation type="unfinished"></translation>
+        <translation>没有有效的钥匙串服务</translation>
     </message>
     <message>
         <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="288"/>
         <source>Could not open wallet: %1; %2</source>
-        <translation type="unfinished">无法打开钱包: %1; %2</translation>
+        <translation>无法打开钱包: %1; %2</translation>
     </message>
     <message>
         <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="333"/>
         <source>Access to keychain denied</source>
-        <translation type="unfinished">访问钥匙串被拒绝</translation>
+        <translation>访问钥匙串被拒绝</translation>
     </message>
     <message>
         <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="354"/>
         <source>Could not determine data type: %1; %2</source>
-        <translation type="unfinished"></translation>
+        <translation>无法确定数据类型: %1； %2</translation>
     </message>
     <message>
         <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="363"/>
         <location filename="../3rd/qtkeychain/keychain_android.cpp" line="52"/>
         <source>Entry not found</source>
-        <translation type="unfinished"></translation>
+        <translation>未找到记录</translation>
     </message>
     <message>
         <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="372"/>
         <source>Unsupported entry type &apos;Map&apos;</source>
-        <translation type="unfinished"></translation>
+        <translation>不支持的记录类型 &apos;Map&apos;</translation>
     </message>
     <message>
         <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="375"/>
         <source>Unknown kwallet entry type &apos;%1&apos;</source>
-        <translation type="unfinished"></translation>
+        <translation>未知钱包类型 &apos;%1&apos;</translation>
     </message>
     <message>
         <location filename="../3rd/qtkeychain/keychain_haiku.cpp" line="96"/>
         <source>Password not found</source>
-        <translation type="unfinished">未发现密码</translation>
+        <translation>未发现密码</translation>
     </message>
     <message>
         <location filename="../3rd/qtkeychain/keychain_android.cpp" line="60"/>
         <source>Could not open keystore</source>
-        <translation type="unfinished">无法打开密钥库</translation>
+        <translation>无法打开密钥库</translation>
     </message>
     <message>
         <location filename="../3rd/qtkeychain/keychain_android.cpp" line="68"/>
         <source>Could not retrieve private key from keystore</source>
-        <translation type="unfinished">无法从密钥存储库中检索私钥</translation>
+        <translation>无法从密钥存储库中检索私钥</translation>
     </message>
     <message>
         <location filename="../3rd/qtkeychain/keychain_android.cpp" line="75"/>
         <source>Could not create decryption cipher</source>
-        <translation type="unfinished">无法创建解密密码</translation>
+        <translation>无法创建解密算法</translation>
     </message>
 </context>
 <context>
@@ -2192,73 +2201,73 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
     <message>
         <location filename="../3rd/qtkeychain/keychain_win.cpp" line="78"/>
         <source>Credential size exceeds maximum size of %1</source>
-        <translation type="unfinished"></translation>
+        <translation>证书大小超过上限，最大为: %1</translation>
     </message>
     <message>
         <location filename="../3rd/qtkeychain/keychain_win.cpp" line="87"/>
         <source>Credential key exceeds maximum size of %1</source>
-        <translation type="unfinished"></translation>
+        <translation>凭证密钥大小超过上限，最大为: %1</translation>
     </message>
     <message>
         <location filename="../3rd/qtkeychain/keychain_win.cpp" line="92"/>
         <source>Writing credentials failed: Win32 error code %1</source>
-        <translation type="unfinished"></translation>
+        <translation>写入凭证失败，Win32错误码: %1</translation>
     </message>
     <message>
         <location filename="../3rd/qtkeychain/keychain_win.cpp" line="162"/>
         <source>Encryption failed</source>
-        <translation type="unfinished"></translation>
+        <translation>加密失败</translation>
     </message>
     <message>
         <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="415"/>
         <source>D-Bus is not running</source>
-        <translation type="unfinished"></translation>
+        <translation>D-Bus未运行</translation>
     </message>
     <message>
         <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="425"/>
         <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="452"/>
         <source>Unknown error</source>
-        <translation type="unfinished"></translation>
+        <translation>未知错误</translation>
     </message>
     <message>
         <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="468"/>
         <source>Could not open wallet: %1; %2</source>
-        <translation type="unfinished">无法打开钱包: %1; %2</translation>
+        <translation>无法打开钱包: %1; %2</translation>
     </message>
     <message>
         <location filename="../3rd/qtkeychain/keychain_haiku.cpp" line="144"/>
         <source>Password not found</source>
-        <translation type="unfinished">未发现密码</translation>
+        <translation>未发现密码</translation>
     </message>
     <message>
         <location filename="../3rd/qtkeychain/keychain_android.cpp" line="95"/>
         <source>Could not open keystore</source>
-        <translation type="unfinished">无法打开密钥库</translation>
+        <translation>无法打开密钥库</translation>
     </message>
     <message>
         <location filename="../3rd/qtkeychain/keychain_android.cpp" line="124"/>
         <source>Could not create private key generator</source>
-        <translation type="unfinished">无法创建私钥生成器</translation>
+        <translation>无法创建私钥生成器</translation>
     </message>
     <message>
         <location filename="../3rd/qtkeychain/keychain_android.cpp" line="131"/>
         <source>Could not generate new private key</source>
-        <translation type="unfinished">无法生成新的私钥</translation>
+        <translation>无法生成新的私钥</translation>
     </message>
     <message>
         <location filename="../3rd/qtkeychain/keychain_android.cpp" line="139"/>
         <source>Could not retrieve private key from keystore</source>
-        <translation type="unfinished">无法从密钥库检索私钥</translation>
+        <translation>无法从密钥库检索私钥</translation>
     </message>
     <message>
         <location filename="../3rd/qtkeychain/keychain_android.cpp" line="147"/>
         <source>Could not create encryption cipher</source>
-        <translation type="unfinished">无法创建加密密码</translation>
+        <translation>无法创建加密密码</translation>
     </message>
     <message>
         <location filename="../3rd/qtkeychain/keychain_android.cpp" line="155"/>
         <source>Could not encrypt data</source>
-        <translation type="unfinished">无法加密数据</translation>
+        <translation>无法加密数据</translation>
     </message>
 </context>
 <context>
@@ -2266,374 +2275,374 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
     <message>
         <location filename="../protocols/protocols_defs.cpp" line="76"/>
         <source>Sftp service</source>
-        <translation type="unfinished">Sftp 服务</translation>
+        <translation>Sftp 服务</translation>
     </message>
     <message>
         <location filename="../core/errorstrings.cpp" line="9"/>
         <source>No error</source>
-        <translation type="unfinished">没有错误</translation>
+        <translation>没有错误</translation>
     </message>
     <message>
         <location filename="../core/errorstrings.cpp" line="10"/>
         <source>Unknown Error</source>
-        <translation type="unfinished">位置错误</translation>
+        <translation>未知错误</translation>
     </message>
     <message>
         <location filename="../core/errorstrings.cpp" line="11"/>
         <source>Function not implemented</source>
-        <translation type="unfinished">功能未实现</translation>
+        <translation>功能未实现</translation>
     </message>
     <message>
         <location filename="../core/errorstrings.cpp" line="14"/>
         <source>Server check failed</source>
-        <translation type="unfinished">服务器检测失败</translation>
+        <translation>服务器检测失败</translation>
     </message>
     <message>
         <location filename="../core/errorstrings.cpp" line="15"/>
         <source>Server port already used. Check for another software</source>
-        <translation type="unfinished">检测服务器该端口是否被其他软件被占用</translation>
+        <translation>检测服务器该端口是否被其他软件被占用</translation>
     </message>
     <message>
         <location filename="../core/errorstrings.cpp" line="16"/>
         <source>Server error: Docker container missing</source>
-        <translation type="unfinished">Server error: Docker容器丢失</translation>
+        <translation>服务器错误: Docker容器丢失</translation>
     </message>
     <message>
         <location filename="../core/errorstrings.cpp" line="17"/>
         <source>Server error: Docker failed</source>
-        <translation type="unfinished">Server error: Docker失败</translation>
+        <translation>服务器错误: Docker失败</translation>
     </message>
     <message>
         <location filename="../core/errorstrings.cpp" line="18"/>
         <source>Installation canceled by user</source>
-        <translation type="unfinished">用户取消安装</translation>
+        <translation>用户取消安装</translation>
     </message>
     <message>
         <location filename="../core/errorstrings.cpp" line="19"/>
         <source>The user does not have permission to use sudo</source>
-        <translation type="unfinished">用户没有root权限</translation>
+        <translation>用户没有root权限</translation>
     </message>
     <message>
         <location filename="../core/errorstrings.cpp" line="22"/>
         <source>Ssh request was denied</source>
-        <translation type="unfinished">ssh请求被拒绝</translation>
+        <translation>ssh请求被拒绝</translation>
     </message>
     <message>
         <location filename="../core/errorstrings.cpp" line="23"/>
         <source>Ssh request was interrupted</source>
-        <translation type="unfinished">ssh请求中断</translation>
+        <translation>ssh请求中断</translation>
     </message>
     <message>
         <location filename="../core/errorstrings.cpp" line="24"/>
         <source>Ssh internal error</source>
-        <translation type="unfinished">ssh内部错误</translation>
+        <translation>ssh内部错误</translation>
     </message>
     <message>
         <location filename="../core/errorstrings.cpp" line="25"/>
         <source>Invalid private key or invalid passphrase entered</source>
-        <translation type="unfinished">输入的私钥或密码无效</translation>
+        <translation>输入的私钥或密码无效</translation>
     </message>
     <message>
         <location filename="../core/errorstrings.cpp" line="26"/>
         <source>The selected private key format is not supported, use openssh ED25519 key types or PEM key types</source>
-        <translation type="unfinished">不支持所选私钥格式，请使用 openssh ED25519 密钥类型或 PEM 密钥类型</translation>
+        <translation>不支持所选私钥格式，请使用 openssh ED25519 密钥类型或 PEM 密钥类型</translation>
     </message>
     <message>
         <location filename="../core/errorstrings.cpp" line="27"/>
         <source>Timeout connecting to server</source>
-        <translation type="unfinished">连接服务器超时</translation>
+        <translation>连接服务器超时</translation>
     </message>
     <message>
         <location filename="../core/errorstrings.cpp" line="30"/>
         <source>Sftp error: End-of-file encountered</source>
-        <translation type="unfinished">Sftp错误: 遇到文件结尾</translation>
+        <translation>Sftp错误: End-of-file encountered</translation>
     </message>
     <message>
         <location filename="../core/errorstrings.cpp" line="31"/>
         <source>Sftp error: File does not exist</source>
-        <translation type="unfinished">Sftp错误: 文件不存在</translation>
+        <translation>Sftp错误: 文件不存在</translation>
     </message>
     <message>
         <location filename="../core/errorstrings.cpp" line="32"/>
         <source>Sftp error: Permission denied</source>
-        <translation type="unfinished">Sftp错误: 权限受限</translation>
+        <translation>Sftp错误: 权限不足</translation>
     </message>
     <message>
         <location filename="../core/errorstrings.cpp" line="33"/>
         <source>Sftp error: Generic failure</source>
-        <translation type="unfinished">Sftp错误: 一般失败</translation>
+        <translation>Sftp错误: 一般失败</translation>
     </message>
     <message>
         <location filename="../core/errorstrings.cpp" line="34"/>
         <source>Sftp error: Garbage received from server</source>
-        <translation type="unfinished">Sftp错误: 从服务器收到垃圾信息</translation>
+        <translation>Sftp错误: 从服务器收到垃圾信息</translation>
     </message>
     <message>
         <location filename="../core/errorstrings.cpp" line="35"/>
         <source>Sftp error: No connection has been set up</source>
-        <translation type="unfinished"></translation>
+        <translation>Sftp 错误: 未建立连接</translation>
     </message>
     <message>
         <location filename="../core/errorstrings.cpp" line="36"/>
         <source>Sftp error: There was a connection, but we lost it</source>
-        <translation type="unfinished"></translation>
+        <translation>Sftp 错误: 已有连接丢失</translation>
     </message>
     <message>
         <location filename="../core/errorstrings.cpp" line="37"/>
         <source>Sftp error: Operation not supported by libssh yet</source>
-        <translation type="unfinished"></translation>
+        <translation>Sftp error: libssh不支持该操作</translation>
     </message>
     <message>
         <location filename="../core/errorstrings.cpp" line="38"/>
         <source>Sftp error: Invalid file handle</source>
-        <translation type="unfinished"></translation>
+        <translation>Sftp error: 无效的文件句柄</translation>
     </message>
     <message>
         <location filename="../core/errorstrings.cpp" line="39"/>
         <source>Sftp error: No such file or directory path exists</source>
-        <translation type="unfinished"></translation>
+        <translation>Sftp 错误: 文件夹或文件不存在</translation>
     </message>
     <message>
         <location filename="../core/errorstrings.cpp" line="40"/>
         <source>Sftp error: An attempt to create an already existing file or directory has been made</source>
-        <translation type="unfinished"></translation>
+        <translation>Sftp 错误: 文件或目录已存在</translation>
     </message>
     <message>
         <location filename="../core/errorstrings.cpp" line="41"/>
         <source>Sftp error: Write-protected filesystem</source>
-        <translation type="unfinished"></translation>
+        <translation>Sftp 错误: 文件系统写保护</translation>
     </message>
     <message>
         <location filename="../core/errorstrings.cpp" line="42"/>
         <source>Sftp error: No media was in remote drive</source>
-        <translation type="unfinished"></translation>
+        <translation>Sftp 错误: 远程驱动器中没有媒介</translation>
     </message>
     <message>
         <location filename="../core/errorstrings.cpp" line="45"/>
         <source>Failed to save config to disk</source>
-        <translation type="unfinished">配置保存到磁盘失败</translation>
+        <translation>配置保存到磁盘失败</translation>
     </message>
     <message>
         <location filename="../core/errorstrings.cpp" line="46"/>
         <source>OpenVPN config missing</source>
-        <translation type="unfinished">OpenVPN配置丢失</translation>
+        <translation>OpenVPN配置丢失</translation>
     </message>
     <message>
         <location filename="../core/errorstrings.cpp" line="47"/>
         <source>OpenVPN management server error</source>
-        <translation type="unfinished">OpenVPN 管理服务器错误</translation>
+        <translation>OpenVPN 管理服务器错误</translation>
     </message>
     <message>
         <location filename="../core/errorstrings.cpp" line="50"/>
         <source>OpenVPN executable missing</source>
-        <translation type="unfinished">OpenVPN 可执行文件丢失</translation>
+        <translation>OpenVPN 可执行文件丢失</translation>
     </message>
     <message>
         <location filename="../core/errorstrings.cpp" line="51"/>
         <source>ShadowSocks (ss-local) executable missing</source>
-        <translation type="unfinished">ShadowSocks (ss-local) 执行文件丢失</translation>
+        <translation>ShadowSocks (ss-local) 执行文件丢失</translation>
     </message>
     <message>
         <location filename="../core/errorstrings.cpp" line="52"/>
         <source>Cloak (ck-client) executable missing</source>
-        <translation type="unfinished">Cloak (ck-client) 执行文件丢失</translation>
+        <translation>Cloak (ck-client) 执行文件丢失</translation>
     </message>
     <message>
         <location filename="../core/errorstrings.cpp" line="53"/>
         <source>Amnezia helper service error</source>
-        <translation type="unfinished">Amnezia 帮助服务错误</translation>
+        <translation>Amnezia 服务连接失败</translation>
     </message>
     <message>
         <location filename="../core/errorstrings.cpp" line="54"/>
         <source>OpenSSL failed</source>
-        <translation type="unfinished">OpenSSL失败</translation>
+        <translation>OpenSSL错误</translation>
     </message>
     <message>
         <location filename="../core/errorstrings.cpp" line="57"/>
         <source>Can&apos;t connect: another VPN connection is active</source>
-        <translation type="unfinished">无法连接：另一个VPN连接处于活动状态</translation>
+        <translation>无法连接：另一个VPN连接处于活跃状态</translation>
     </message>
     <message>
         <location filename="../core/errorstrings.cpp" line="58"/>
         <source>Can&apos;t setup OpenVPN TAP network adapter</source>
-        <translation type="unfinished">无法设置 OpenVPN TAP 网络适配器</translation>
+        <translation>无法设置 OpenVPN TAP 网络适配器</translation>
     </message>
     <message>
         <location filename="../core/errorstrings.cpp" line="59"/>
         <source>VPN pool error: no available addresses</source>
-        <translation type="unfinished">VPN 池错误：没有可用地址</translation>
+        <translation>VPN 池错误：没有可用地址</translation>
     </message>
     <message>
         <location filename="../core/errorstrings.cpp" line="61"/>
         <source>The config does not contain any containers and credentiaks for connecting to the server</source>
-        <translation type="unfinished">该配置不包含任何用于连接到服务器的容器和凭据。</translation>
+        <translation>该配置不包含任何用于连接到服务器的容器和凭据。</translation>
     </message>
     <message>
         <location filename="../core/errorstrings.cpp" line="65"/>
         <source>Internal error</source>
-        <translation type="unfinished">内部错误</translation>
+        <translation>内部错误</translation>
     </message>
     <message>
         <location filename="../containers/containers_defs.cpp" line="88"/>
         <source>IPsec</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <location filename="../containers/containers_defs.cpp" line="90"/>
         <location filename="../containers/containers_defs.cpp" line="137"/>
         <source>Website in Tor network</source>
-        <translation type="unfinished">在 Tor 网络中架设网站</translation>
+        <translation>在 Tor 网络中架设网站</translation>
     </message>
     <message>
         <location filename="../containers/containers_defs.cpp" line="91"/>
         <source>Amnezia DNS</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <location filename="../containers/containers_defs.cpp" line="93"/>
         <source>Sftp file sharing service</source>
-        <translation type="unfinished">SFTP文件共享服务</translation>
+        <translation>SFTP文件共享服务</translation>
     </message>
     <message>
         <location filename="../containers/containers_defs.cpp" line="99"/>
         <source>OpenVPN is the most popular VPN protocol, with flexible configuration options. It uses its own security protocol with SSL/TLS for key exchange.</source>
-        <translation type="unfinished">OpenVPN 是最流行的 VPN 协议，具有灵活的配置选项。它使用自己的安全协议与 SSL/TLS 进行密钥交换。</translation>
+        <translation>OpenVPN 是最流行的 VPN 协议，具有灵活的配置选项。它使用自己的安全协议与 SSL/TLS 进行密钥交换。</translation>
     </message>
     <message>
         <location filename="../containers/containers_defs.cpp" line="102"/>
         <source>ShadowSocks - masks VPN traffic, making it similar to normal web traffic, but is recognised by analysis systems in some highly censored regions.</source>
-        <translation type="unfinished">ShadowSocks - 混淆 VPN 流量，使其与正常的 Web 流量相似，但在一些审查力度高的地区可以被分析系统识别。</translation>
+        <translation>ShadowSocks - 混淆 VPN 流量，使其与正常的 Web 流量相似，但在一些审查力度高的地区可以被分析系统识别。</translation>
     </message>
     <message>
         <location filename="../containers/containers_defs.cpp" line="105"/>
         <source>OpenVPN over Cloak - OpenVPN with VPN masquerading as web traffic and protection against active-probbing detection. Ideal for bypassing blocking in regions with the highest levels of censorship.</source>
-        <translation type="unfinished">OpenVPN over Cloak - OpenVPN 与 VPN 具有伪装成网络流量和防止主动探测检测的保护。非常适合绕过审查力度特别强的地区的封锁。</translation>
+        <translation>OpenVPN over Cloak - OpenVPN 与 VPN 具有伪装成网络流量和防止主动探测检测的保护。非常适合绕过审查力度特别强的地区的封锁。</translation>
     </message>
     <message>
         <location filename="../containers/containers_defs.cpp" line="109"/>
         <location filename="../containers/containers_defs.cpp" line="112"/>
         <source>WireGuard - New popular VPN protocol with high performance, high speed and low power consumption. Recommended for regions with low levels of censorship.</source>
-        <translation type="unfinished">WireGuard - 新型流行的VPN协议，具有高性能、高速度和低功耗。建议用于审查力度较低的地区</translation>
+        <translation>WireGuard - 新型流行的VPN协议，具有高性能、高速度和低功耗。建议用于审查力度较低的地区</translation>
     </message>
     <message>
         <location filename="../containers/containers_defs.cpp" line="115"/>
         <source>IKEv2 -  Modern stable protocol, a bit faster than others, restores connection after signal loss. It has native support on the latest versions of Android and iOS.</source>
-        <translation type="unfinished">IKEv2 - 现代稳定协议，相比其他协议较快一些，在信号丢失后恢复连接。Android 和 iOS最新版原生支持。</translation>
+        <translation>IKEv2 - 现代稳定协议，相比其他协议较快一些，在信号丢失后恢复连接。Android 和 iOS最新版原生支持。</translation>
     </message>
     <message>
         <location filename="../containers/containers_defs.cpp" line="118"/>
         <source>Deploy a WordPress site on the Tor network in two clicks.</source>
-        <translation type="unfinished">只需点击两次即可架设 WordPress 网站到 Tor 网络</translation>
+        <translation>只需点击两次即可架设 WordPress 网站到 Tor 网络</translation>
     </message>
     <message>
         <location filename="../containers/containers_defs.cpp" line="120"/>
         <source>Replace the current DNS server with your own. This will increase your privacy level.</source>
-        <translation type="unfinished">将当前的 DNS 服务器替换为您自己的。这将提高您的隐私级别。</translation>
+        <translation>将当前的 DNS 服务器替换为您自己的。这将提高您的隐私保护级别。</translation>
     </message>
     <message>
         <location filename="../containers/containers_defs.cpp" line="123"/>
         <source>Creates a file vault on your server to securely store and transfer files.</source>
-        <translation type="unfinished">在您的服务器上创建文件库以安全地存储和传输文件</translation>
+        <translation>在您的服务器上创建文件仓库，以便安全地存储和传输文件</translation>
     </message>
     <message>
         <location filename="../containers/containers_defs.cpp" line="128"/>
         <source>OpenVPN container</source>
-        <translation type="unfinished">OpenVPN容器</translation>
+        <translation>OpenVPN容器</translation>
     </message>
     <message>
         <location filename="../containers/containers_defs.cpp" line="129"/>
         <source>Container with OpenVpn and ShadowSocks</source>
-        <translation type="unfinished">带有 OpenVpn 和 ShadowSocks 的容器</translation>
+        <translation>含 OpenVpn 和 ShadowSocks 的容器</translation>
     </message>
     <message>
         <location filename="../containers/containers_defs.cpp" line="131"/>
         <source>Container with OpenVpn and ShadowSocks protocols configured with traffic masking by Cloak plugin</source>
-        <translation type="unfinished">具有 OpenVpn 和 ShadowSocks 协议的容器，通过 Cloak 插件配置混淆流量</translation>
+        <translation>含 OpenVpn 和 ShadowSocks 协议的容器，通过 Cloak 插件配置混淆流量</translation>
     </message>
     <message>
         <location filename="../containers/containers_defs.cpp" line="133"/>
         <source>WireGuard container</source>
-        <translation type="unfinished">WireGuard 容器</translation>
+        <translation>WireGuard 容器</translation>
     </message>
     <message>
         <location filename="../containers/containers_defs.cpp" line="134"/>
         <source>AmneziaWG container</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <location filename="../containers/containers_defs.cpp" line="135"/>
         <source>IPsec container</source>
-        <translation type="unfinished">IPsec 容器</translation>
+        <translation>IPsec 容器</translation>
     </message>
     <message>
         <location filename="../containers/containers_defs.cpp" line="138"/>
         <source>DNS Service</source>
-        <translation type="unfinished">DNS 服务</translation>
+        <translation>DNS 服务</translation>
     </message>
     <message>
         <location filename="../containers/containers_defs.cpp" line="140"/>
         <source>Sftp file sharing service - is secure FTP service</source>
-        <translation type="unfinished">Sftp 文件共享服务 - 安全的 FTP 服务</translation>
+        <translation>Sftp 文件共享服务 - 安全的 FTP 服务</translation>
     </message>
     <message>
         <location filename="../3rd/qtkeychain/libsecret.cpp" line="119"/>
         <source>Entry not found</source>
-        <translation type="unfinished">未找到记录</translation>
+        <translation>未找到记录</translation>
     </message>
     <message>
         <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="225"/>
         <source>Access to keychain denied</source>
-        <translation type="unfinished">访问钥匙串被拒绝</translation>
+        <translation>访问钥匙串被拒绝</translation>
     </message>
     <message>
         <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="227"/>
         <source>No keyring daemon</source>
-        <translation type="unfinished">没有密钥环守护进程</translation>
+        <translation>没有密钥环守护进程</translation>
     </message>
     <message>
         <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="229"/>
         <source>Already unlocked</source>
-        <translation type="unfinished">已经解锁</translation>
+        <translation>已经解锁</translation>
     </message>
     <message>
         <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="231"/>
         <source>No such keyring</source>
-        <translation type="unfinished">没有这样的密钥环</translation>
+        <translation>没有这样的密钥环</translation>
     </message>
     <message>
         <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="233"/>
         <source>Bad arguments</source>
-        <translation type="unfinished">错误参数</translation>
+        <translation>错误参数</translation>
     </message>
     <message>
         <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="235"/>
         <source>I/O error</source>
-        <translation type="unfinished">I/O错误</translation>
+        <translation>I/O错误</translation>
     </message>
     <message>
         <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="237"/>
         <source>Cancelled</source>
-        <translation type="unfinished">已取消</translation>
+        <translation>已取消</translation>
     </message>
     <message>
         <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="239"/>
         <source>Keyring already exists</source>
-        <translation type="unfinished">密匙环已经存在</translation>
+        <translation>密匙环已经存在</translation>
     </message>
     <message>
         <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="241"/>
         <source>No match</source>
-        <translation type="unfinished">不匹配</translation>
+        <translation>不匹配</translation>
     </message>
     <message>
         <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="246"/>
         <source>Unknown error</source>
-        <translation type="unfinished">未知错误</translation>
+        <translation>未知错误</translation>
     </message>
     <message>
         <location filename="../3rd/qtkeychain/keychain_haiku.cpp" line="72"/>
         <source>error 0x%1: %2</source>
-        <translation type="unfinished">错误 0x%1: %2</translation>
+        <translation>错误 0x%1: %2</translation>
     </message>
 </context>
 <context>
@@ -2641,7 +2650,7 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
     <message>
         <location filename="../ui/qml/Components/SelectLanguageDrawer.qml" line="49"/>
         <source>Choose language</source>
-        <translation type="unfinished">选择语言</translation>
+        <translation>选择语言</translation>
     </message>
 </context>
 <context>
@@ -2649,13 +2658,13 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
     <message>
         <location filename="../settings.cpp" line="26"/>
         <source>Server #1</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <location filename="../settings.cpp" line="202"/>
         <location filename="../settings.cpp" line="209"/>
         <source>Server</source>
-        <translation type="unfinished">服务器</translation>
+        <translation>服务器</translation>
     </message>
 </context>
 <context>
@@ -2663,22 +2672,22 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
     <message>
         <location filename="../ui/controllers/settingsController.cpp" line="25"/>
         <source>Software version</source>
-        <translation type="unfinished">软件版本</translation>
+        <translation>软件版本</translation>
     </message>
     <message>
         <location filename="../ui/controllers/settingsController.cpp" line="121"/>
         <source>Backup file is corrupted</source>
-        <translation type="unfinished">备份文件已损坏</translation>
+        <translation>备份文件已损坏</translation>
     </message>
     <message>
         <location filename="../ui/controllers/settingsController.cpp" line="136"/>
         <source>All settings have been reset to default values</source>
-        <translation type="unfinished">所配置恢复为默认值</translation>
+        <translation>所配置恢复为默认值</translation>
     </message>
     <message>
         <location filename="../ui/controllers/settingsController.cpp" line="142"/>
         <source>Cached profiles cleared</source>
-        <translation type="unfinished">缓存的配置文件已清除</translation>
+        <translation>缓存的配置文件已清除</translation>
     </message>
 </context>
 <context>
@@ -2687,27 +2696,27 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
         <location filename="../ui/qml/Components/ShareConnectionDrawer.qml" line="27"/>
         <location filename="../ui/qml/Components/ShareConnectionDrawer.qml" line="35"/>
         <source>Save AmneziaVPN config</source>
-        <translation type="unfinished">保存配置</translation>
+        <translation>保存配置</translation>
     </message>
     <message>
         <location filename="../ui/qml/Components/ShareConnectionDrawer.qml" line="71"/>
         <source>Share</source>
-        <translation type="unfinished">共享</translation>
+        <translation>共享</translation>
     </message>
     <message>
         <location filename="../ui/qml/Components/ShareConnectionDrawer.qml" line="104"/>
         <source>Copy</source>
-        <translation type="unfinished">拷贝</translation>
+        <translation>拷贝</translation>
     </message>
     <message>
         <location filename="../ui/qml/Components/ShareConnectionDrawer.qml" line="111"/>
         <source>Copied</source>
-        <translation type="unfinished">已拷贝</translation>
+        <translation>已拷贝</translation>
     </message>
     <message>
         <location filename="../ui/qml/Components/ShareConnectionDrawer.qml" line="126"/>
         <source>Show connection settings</source>
-        <translation type="unfinished"></translation>
+        <translation>显示连接配置</translation>
     </message>
     <message>
         <source>Show content</source>
@@ -2716,7 +2725,7 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
     <message>
         <location filename="../ui/qml/Components/ShareConnectionDrawer.qml" line="251"/>
         <source>To read the QR code in the Amnezia app, select &quot;Add server&quot; → &quot;I have data to connect&quot; → &quot;QR code, key or settings file&quot;</source>
-        <translation type="unfinished">要读取 Amnezia 应用程序中的二维码，请选择“添加服务器”→“我有数据要连接”→“二维码、密钥或配置文件”</translation>
+        <translation>要应用二维码到 Amnezia，请底部工具栏点击“+”→“连接方式”→“二维码、授权码或配置文件”</translation>
     </message>
 </context>
 <context>
@@ -2724,42 +2733,42 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
     <message>
         <location filename="../ui/controllers/sitesController.cpp" line="24"/>
         <source>Hostname not look like ip adress or domain name</source>
-        <translation type="unfinished"></translation>
+        <translation>请输入有效的域名或IP地址</translation>
     </message>
     <message>
         <location filename="../ui/controllers/sitesController.cpp" line="67"/>
         <source>New site added: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>已经添加新网站: %1</translation>
     </message>
     <message>
         <location filename="../ui/controllers/sitesController.cpp" line="80"/>
         <source>Site removed: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>已移除网站: %1</translation>
     </message>
     <message>
         <location filename="../ui/controllers/sitesController.cpp" line="88"/>
         <source>Can&apos;t open file: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>无法打开文件: %1</translation>
     </message>
     <message>
         <location filename="../ui/controllers/sitesController.cpp" line="95"/>
         <source>Failed to parse JSON data from file: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>JSON解析失败，文件: %1</translation>
     </message>
     <message>
         <location filename="../ui/controllers/sitesController.cpp" line="100"/>
-        <source>The JSON data is not an array in file: </source>
-        <translation type="unfinished"></translation>
+        <source>The JSON data is not an array in file: %1</source>
+        <translation>文件中的JSON数据不是一个数组，文件: %1</translation>
     </message>
     <message>
         <location filename="../ui/controllers/sitesController.cpp" line="131"/>
         <source>Import completed</source>
-        <translation type="unfinished"></translation>
+        <translation>完成导入</translation>
     </message>
     <message>
         <location filename="../ui/controllers/sitesController.cpp" line="150"/>
         <source>Export completed</source>
-        <translation type="unfinished"></translation>
+        <translation>完成导出</translation>
     </message>
 </context>
 <context>
@@ -2768,31 +2777,31 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
         <location filename="../ui/systemtray_notificationhandler.cpp" line="28"/>
         <location filename="../ui/systemtray_notificationhandler.cpp" line="60"/>
         <source>Show</source>
-        <translation type="unfinished">界面</translation>
+        <translation>显示</translation>
     </message>
     <message>
         <location filename="../ui/systemtray_notificationhandler.cpp" line="32"/>
         <location filename="../ui/systemtray_notificationhandler.cpp" line="61"/>
         <source>Connect</source>
-        <translation type="unfinished">连接</translation>
+        <translation>连接</translation>
     </message>
     <message>
         <location filename="../ui/systemtray_notificationhandler.cpp" line="33"/>
         <location filename="../ui/systemtray_notificationhandler.cpp" line="62"/>
         <source>Disconnect</source>
-        <translation type="unfinished">断开</translation>
+        <translation>断开</translation>
     </message>
     <message>
         <location filename="../ui/systemtray_notificationhandler.cpp" line="37"/>
         <location filename="../ui/systemtray_notificationhandler.cpp" line="63"/>
         <source>Visit Website</source>
-        <translation type="unfinished">官网</translation>
+        <translation>官网</translation>
     </message>
     <message>
         <location filename="../ui/systemtray_notificationhandler.cpp" line="41"/>
         <location filename="../ui/systemtray_notificationhandler.cpp" line="64"/>
         <source>Quit</source>
-        <translation type="unfinished">退出</translation>
+        <translation>退出</translation>
     </message>
 </context>
 <context>
@@ -2800,7 +2809,7 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
     <message>
         <location filename="../ui/qml/Controls2/TextFieldWithHeaderType.qml" line="105"/>
         <source>The field can&apos;t be empty</source>
-        <translation type="unfinished"></translation>
+        <translation>输入不能为空</translation>
     </message>
 </context>
 <context>
@@ -2808,7 +2817,7 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
     <message>
         <location filename="../vpnconnection.cpp" line="406"/>
         <source>Mbps</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
 </context>
 <context>
@@ -2816,42 +2825,42 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
     <message>
         <location filename="../protocols/vpnprotocol.cpp" line="130"/>
         <source>Unknown</source>
-        <translation type="unfinished">未知</translation>
+        <translation>未知</translation>
     </message>
     <message>
         <location filename="../protocols/vpnprotocol.cpp" line="131"/>
         <source>Disconnected</source>
-        <translation type="unfinished">断开连接</translation>
+        <translation>连接已断开</translation>
     </message>
     <message>
         <location filename="../protocols/vpnprotocol.cpp" line="132"/>
         <source>Preparing</source>
-        <translation type="unfinished">准备中</translation>
+        <translation>准备中</translation>
     </message>
     <message>
         <location filename="../protocols/vpnprotocol.cpp" line="133"/>
         <source>Connecting...</source>
-        <translation type="unfinished">连接中</translation>
+        <translation>连接中</translation>
     </message>
     <message>
         <location filename="../protocols/vpnprotocol.cpp" line="134"/>
         <source>Connected</source>
-        <translation type="unfinished">已连接</translation>
+        <translation>已连接</translation>
     </message>
     <message>
         <location filename="../protocols/vpnprotocol.cpp" line="135"/>
         <source>Disconnecting...</source>
-        <translation type="unfinished">断开中</translation>
+        <translation>断开中</translation>
     </message>
     <message>
         <location filename="../protocols/vpnprotocol.cpp" line="136"/>
         <source>Reconnecting...</source>
-        <translation type="unfinished">重连中</translation>
+        <translation>重连中</translation>
     </message>
     <message>
         <location filename="../protocols/vpnprotocol.cpp" line="137"/>
         <source>Error</source>
-        <translation type="unfinished">错误</translation>
+        <translation>错误</translation>
     </message>
 </context>
 <context>
@@ -2859,32 +2868,32 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
     <message>
         <location filename="../containers/containers_defs.cpp" line="245"/>
         <source>Low</source>
-        <translation type="unfinished">低</translation>
+        <translation>低</translation>
     </message>
     <message>
         <location filename="../containers/containers_defs.cpp" line="246"/>
         <source>High</source>
-        <translation type="unfinished">高</translation>
+        <translation>高</translation>
     </message>
     <message>
         <location filename="../containers/containers_defs.cpp" line="247"/>
         <source>Medium</source>
-        <translation type="unfinished">中</translation>
+        <translation>中</translation>
     </message>
     <message>
         <location filename="../containers/containers_defs.cpp" line="255"/>
         <source>I just want to increase the level of privacy</source>
-        <translation type="unfinished">我只是想提高隐私级别</translation>
+        <translation>我只是想提高隐私保护级别</translation>
     </message>
     <message>
         <location filename="../containers/containers_defs.cpp" line="256"/>
         <source>Many foreign websites and VPN providers are blocked</source>
-        <translation type="unfinished">大多国外网站和VPN提供商被屏蔽</translation>
+        <translation>大多国外网站和VPN提供商被屏蔽</translation>
     </message>
     <message>
         <location filename="../containers/containers_defs.cpp" line="257"/>
         <source>Some foreign sites are blocked, but VPN providers are not blocked</source>
-        <translation type="unfinished">一些国外网站被屏蔽，但VPN提供商未被屏蔽</translation>
+        <translation>一些国外网站被屏蔽，但VPN提供商未被屏蔽</translation>
     </message>
 </context>
 <context>
@@ -2892,12 +2901,12 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
     <message>
         <location filename="../ui/qml/main2.qml" line="172"/>
         <source>Private key passphrase</source>
-        <translation type="unfinished">私钥密码</translation>
+        <translation>私钥密码</translation>
     </message>
     <message>
         <location filename="../ui/qml/main2.qml" line="191"/>
         <source>Save</source>
-        <translation type="unfinished">保存</translation>
+        <translation>保存</translation>
     </message>
 </context>
 </TS>
diff --git a/client/ui/controllers/sitesController.cpp b/client/ui/controllers/sitesController.cpp
index 4d0391be..8c420899 100644
--- a/client/ui/controllers/sitesController.cpp
+++ b/client/ui/controllers/sitesController.cpp
@@ -97,7 +97,7 @@ void SitesController::importSites(const QString &fileName, bool replaceExisting)
     }
 
     if (!jsonDocument.isArray()) {
-        emit errorOccurred(tr("The JSON data is not an array in file: ").arg(fileName));
+        emit errorOccurred(tr("The JSON data is not an array in file: %1").arg(fileName));
         return;
     }
 
diff --git a/client/ui/qml/Pages2/PageProtocolRaw.qml b/client/ui/qml/Pages2/PageProtocolRaw.qml
index 2324c091..f0959143 100644
--- a/client/ui/qml/Pages2/PageProtocolRaw.qml
+++ b/client/ui/qml/Pages2/PageProtocolRaw.qml
@@ -127,7 +127,7 @@ PageType {
                                         Layout.fillWidth: true
                                         Layout.topMargin: 16
 
-                                        headerText: qsTr("Connection options ") + protocolName
+                                        headerText: qsTr("Connection options %1").arg(protocolName)
                                     }
 
                                     TextArea {
diff --git a/client/ui/qml/Pages2/PageSettingsApplication.qml b/client/ui/qml/Pages2/PageSettingsApplication.qml
index c5536fdb..49e3a5d9 100644
--- a/client/ui/qml/Pages2/PageSettingsApplication.qml
+++ b/client/ui/qml/Pages2/PageSettingsApplication.qml
@@ -70,7 +70,7 @@ PageType {
                 Layout.margins: 16
 
                 text: qsTr("Auto start")
-                descriptionText: qsTr("Launch the application every time ") + Qt.platform.os + qsTr(" starts")
+                descriptionText: qsTr("Launch the application every time %1 starts").arg(Qt.platform.os)
 
                 checked: SettingsController.isAutoStartEnabled()
                 onCheckedChanged: {

From 7c8399ce88d92fa17c1a05b8b3926f1ef0821280 Mon Sep 17 00:00:00 2001
From: pokamest <pokamest@gmail.com>
Date: Thu, 12 Oct 2023 13:57:58 +0100
Subject: [PATCH 214/278] Fix awg description

---
 client/containers/containers_defs.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/containers/containers_defs.cpp b/client/containers/containers_defs.cpp
index fd13bfe0..2fcff6a7 100644
--- a/client/containers/containers_defs.cpp
+++ b/client/containers/containers_defs.cpp
@@ -109,8 +109,8 @@ QMap<DockerContainer, QString> ContainerProps::containerDescriptions()
                QObject::tr("WireGuard - New popular VPN protocol with high performance, high speed and low power "
                            "consumption. Recommended for regions with low levels of censorship.") },
             { DockerContainer::Awg,
-               QObject::tr("WireGuard - New popular VPN protocol with high performance, high speed and low power "
-                           "consumption. Recommended for regions with low levels of censorship.") },
+               QObject::tr("AmneziaWG - Special protocol from Amnezia, based on WireGuard. It's fast like WireGuard, but very resistant to blockages. "
+                         "Recommended for regions with high levels of censorship.") },
              { DockerContainer::Ipsec,
                QObject::tr("IKEv2 -  Modern stable protocol, a bit faster than others, restores connection after "
                            "signal loss. It has native support on the latest versions of Android and iOS.") },

From 3836836c72645797fb0f1896555fcde5e8087bc2 Mon Sep 17 00:00:00 2001
From: pokamest <pokamest@gmail.com>
Date: Sat, 14 Oct 2023 02:15:49 +0100
Subject: [PATCH 215/278] Change easySetupOrder

---
 client/containers/containers_defs.cpp | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/client/containers/containers_defs.cpp b/client/containers/containers_defs.cpp
index 2fcff6a7..4bd3b0ef 100644
--- a/client/containers/containers_defs.cpp
+++ b/client/containers/containers_defs.cpp
@@ -233,8 +233,8 @@ bool ContainerProps::isEasySetupContainer(DockerContainer container)
 {
     switch (container) {
     case DockerContainer::WireGuard: return true;
+    case DockerContainer::Awg: return true;
     case DockerContainer::Cloak: return true;
-    case DockerContainer::OpenVpn: return true;
     default: return false;
     }
 }
@@ -243,8 +243,8 @@ QString ContainerProps::easySetupHeader(DockerContainer container)
 {
     switch (container) {
     case DockerContainer::WireGuard: return tr("Low");
-    case DockerContainer::Cloak: return tr("High");
-    case DockerContainer::OpenVpn: return tr("Medium");
+    case DockerContainer::Awg: return tr("Medium or High");
+    case DockerContainer::Cloak: return tr("Extreme");
     default: return "";
     }
 }
@@ -252,9 +252,9 @@ QString ContainerProps::easySetupHeader(DockerContainer container)
 QString ContainerProps::easySetupDescription(DockerContainer container)
 {
     switch (container) {
-    case DockerContainer::WireGuard: return tr("I just want to increase the level of privacy");
-    case DockerContainer::Cloak: return tr("Many foreign websites and VPN providers are blocked");
-    case DockerContainer::OpenVpn: return tr("Some foreign sites are blocked, but VPN providers are not blocked");
+    case DockerContainer::WireGuard: return tr("I just want to increase the level of my privacy.");
+    case DockerContainer::Awg: return tr("I want to bypass censorship. This option recommended in most cases.");
+    case DockerContainer::Cloak: return tr("Most VPN protocols are blocked. Recommended if other options are not working.");
     default: return "";
     }
 }
@@ -262,9 +262,9 @@ QString ContainerProps::easySetupDescription(DockerContainer container)
 int ContainerProps::easySetupOrder(DockerContainer container)
 {
     switch (container) {
-    case DockerContainer::WireGuard: return 1;
-    case DockerContainer::Cloak: return 3;
-    case DockerContainer::OpenVpn: return 2;
+    case DockerContainer::WireGuard: return 3;
+    case DockerContainer::Awg: return 2;
+    case DockerContainer::Cloak: return 1;
     default: return 0;
     }
 }

From 8163e5143495f0856e11178e60507d84240cef46 Mon Sep 17 00:00:00 2001
From: "vladimir.kuznetsov" <nethiuswork@gmail.com>
Date: Sat, 14 Oct 2023 16:52:22 +0500
Subject: [PATCH 216/278] fixes on page split tunneling according to the design
 layout

---
 client/translations/amneziavpn_ru.ts          |  4 +--
 client/translations/amneziavpn_zh_CN.ts       |  4 +--
 .../ui/qml/Controls2/LabelWithButtonType.qml  | 21 +++++++++++++---
 .../ui/qml/Pages2/PageSettingsConnection.qml  | 12 +++++++--
 .../qml/Pages2/PageSettingsSplitTunneling.qml | 25 ++++++++++++++++---
 5 files changed, 53 insertions(+), 13 deletions(-)

diff --git a/client/translations/amneziavpn_ru.ts b/client/translations/amneziavpn_ru.ts
index 0e1d65df..153c2569 100644
--- a/client/translations/amneziavpn_ru.ts
+++ b/client/translations/amneziavpn_ru.ts
@@ -130,7 +130,7 @@
 <context>
     <name>ImportController</name>
     <message>
-        <location filename="../ui/controllers/importController.cpp" line="429"/>
+        <location filename="../ui/controllers/importController.cpp" line="375"/>
         <source>Scanned %1 of %2.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -777,7 +777,7 @@ Already installed containers were found on the server. All installed containers
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettings.qml" line="114"/>
+        <location filename="../ui/qml/Pages2/PageSettings.qml" line="115"/>
         <source>Close application</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/client/translations/amneziavpn_zh_CN.ts b/client/translations/amneziavpn_zh_CN.ts
index 645d281f..4f566201 100644
--- a/client/translations/amneziavpn_zh_CN.ts
+++ b/client/translations/amneziavpn_zh_CN.ts
@@ -130,7 +130,7 @@
 <context>
     <name>ImportController</name>
     <message>
-        <location filename="../ui/controllers/importController.cpp" line="429"/>
+        <location filename="../ui/controllers/importController.cpp" line="375"/>
         <source>Scanned %1 of %2.</source>
         <translation type="unfinished">扫描 %1 of %2.</translation>
     </message>
@@ -811,7 +811,7 @@ Already installed containers were found on the server. All installed containers
         <translation type="unfinished">关于</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettings.qml" line="114"/>
+        <location filename="../ui/qml/Pages2/PageSettings.qml" line="115"/>
         <source>Close application</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/client/ui/qml/Controls2/LabelWithButtonType.qml b/client/ui/qml/Controls2/LabelWithButtonType.qml
index 6bc45a8c..8b85d591 100644
--- a/client/ui/qml/Controls2/LabelWithButtonType.qml
+++ b/client/ui/qml/Controls2/LabelWithButtonType.qml
@@ -20,7 +20,9 @@ Item {
     property bool isLeftImageHoverEnabled: true //todo separete this qml file to 3
 
     property string textColor: "#d7d8db"
+    property string textDisabledColor: "#878B91"
     property string descriptionColor: "#878B91"
+    property string descriptionDisabledColor: "#494B50"
     property real textOpacity: 1.0
 
     property string rightImageColor: "#d7d8db"
@@ -71,7 +73,14 @@ Item {
 
             ListItemTitleType {
                 text: root.text
-                color: root.descriptionOnTop ? root.descriptionColor : root.textColor
+                color: {
+                    if (root.enabled) {
+                        return root.descriptionOnTop ? root.descriptionColor : root.textColor
+                    } else {
+                        return root.descriptionOnTop ? root.descriptionDisabledColor : root.textDisabledColor
+                    }
+                }
+
                 maximumLineCount: root.textMaximumLineCount
                 elide: root.textElide
 
@@ -96,7 +105,13 @@ Item {
                 id: description
 
                 text: root.descriptionText
-                color: root.descriptionOnTop ? root.textColor : root.descriptionColor
+                color: {
+                    if (root.enabled) {
+                        return root.descriptionOnTop ? root.textColor : root.descriptionColor
+                    } else {
+                        return root.descriptionOnTop ? root.textDisabledColor : root.descriptionDisabledColor
+                    }
+                }
 
                 opacity: root.textOpacity
 
@@ -157,7 +172,7 @@ Item {
     MouseArea {
         anchors.fill: parent
         cursorShape: Qt.PointingHandCursor
-        hoverEnabled: true
+        hoverEnabled: root.enabled
 
         onEntered: {
             if (rightImageSource) {
diff --git a/client/ui/qml/Pages2/PageSettingsConnection.qml b/client/ui/qml/Pages2/PageSettingsConnection.qml
index 374e1ce4..76dbdff6 100644
--- a/client/ui/qml/Pages2/PageSettingsConnection.qml
+++ b/client/ui/qml/Pages2/PageSettingsConnection.qml
@@ -94,6 +94,8 @@ PageType {
             DividerType {}
 
             LabelWithButtonType {
+                visible: !GC.isMobile()
+
                 Layout.fillWidth: true
 
                 text: qsTr("Split site tunneling")
@@ -105,9 +107,13 @@ PageType {
                 }
             }
 
-            DividerType {}
+            DividerType {
+                visible: !GC.isMobile()
+            }
 
             LabelWithButtonType {
+                visible: !GC.isMobile()
+
                 Layout.fillWidth: true
 
                 text: qsTr("Separate application tunneling")
@@ -118,7 +124,9 @@ PageType {
                 }
             }
 
-            DividerType {}
+            DividerType {
+                visible: !GC.isMobile()
+            }
         }
     }
 }
diff --git a/client/ui/qml/Pages2/PageSettingsSplitTunneling.qml b/client/ui/qml/Pages2/PageSettingsSplitTunneling.qml
index b79d5d22..f90c6719 100644
--- a/client/ui/qml/Pages2/PageSettingsSplitTunneling.qml
+++ b/client/ui/qml/Pages2/PageSettingsSplitTunneling.qml
@@ -20,6 +20,10 @@ import "../Components"
 PageType {
     id: root
 
+    property bool pageEnabled: {
+        return !ConnectionController.isConnected
+    }
+
     Connections {
         target: SitesController
 
@@ -78,6 +82,8 @@ PageType {
 
         RowLayout {
             HeaderType {
+                enabled: root.pageEnabled
+
                 Layout.fillWidth: true
                 Layout.leftMargin: 16
 
@@ -89,6 +95,8 @@ PageType {
 
                 property int lastActiveRouteMode: routeMode.onlyForwardSites
 
+                enabled: root.pageEnabled
+
                 Layout.fillWidth: true
                 Layout.rightMargin: 16
 
@@ -115,7 +123,7 @@ PageType {
 
             drawerHeight: 0.4375
 
-            enabled: switcher.checked
+            enabled: switcher.checked && root.pageEnabled
 
             headerText: qsTr("Mode")
 
@@ -155,9 +163,9 @@ PageType {
     FlickableType {
         anchors.top: header.bottom
         anchors.topMargin: 16
-        contentHeight: col.implicitHeight + connectButton.implicitHeight + connectButton.anchors.bottomMargin + connectButton.anchors.topMargin
+        contentHeight: col.implicitHeight + addSiteButton.implicitHeight + addSiteButton.anchors.bottomMargin + addSiteButton.anchors.topMargin
 
-        enabled: switcher.checked
+        enabled: switcher.checked && root.pageEnabled
 
         Column {
             id: col
@@ -221,8 +229,17 @@ PageType {
         }
     }
 
+    Rectangle {
+        anchors.fill: addSiteButton
+        anchors.bottomMargin: -24
+        color: "#0E0E11"
+        opacity: 0.8
+    }
+
     RowLayout {
-        id: connectButton
+        id: addSiteButton
+
+        enabled: root.pageEnabled
 
         anchors.bottom: parent.bottom
         anchors.left: parent.left

From ffc9e5823a7aa897e43d3b2d0690e7814b6c2a0f Mon Sep 17 00:00:00 2001
From: "vladimir.kuznetsov" <nethiuswork@gmail.com>
Date: Sat, 14 Oct 2023 18:21:49 +0500
Subject: [PATCH 217/278] text corrections

---
 client/containers/containers_defs.cpp         |  88 ++++--
 client/translations/amneziavpn_ru.ts          | 231 ++++++++++------
 client/translations/amneziavpn_zh_CN.ts       | 255 +++++++++++++-----
 .../ConnectionTypeSelectionDrawer.qml         |   9 +-
 .../Pages2/PageServiceTorWebsiteSettings.qml  |   2 +-
 .../PageSetupWizardProtocolSettings.qml       |  23 +-
 client/ui/qml/Pages2/PageShare.qml            |   2 +-
 7 files changed, 411 insertions(+), 199 deletions(-)

diff --git a/client/containers/containers_defs.cpp b/client/containers/containers_defs.cpp
index 4bd3b0ef..1c79874c 100644
--- a/client/containers/containers_defs.cpp
+++ b/client/containers/containers_defs.cpp
@@ -108,9 +108,10 @@ QMap<DockerContainer, QString> ContainerProps::containerDescriptions()
              { DockerContainer::WireGuard,
                QObject::tr("WireGuard - New popular VPN protocol with high performance, high speed and low power "
                            "consumption. Recommended for regions with low levels of censorship.") },
-            { DockerContainer::Awg,
-               QObject::tr("AmneziaWG - Special protocol from Amnezia, based on WireGuard. It's fast like WireGuard, but very resistant to blockages. "
-                         "Recommended for regions with high levels of censorship.") },
+             { DockerContainer::Awg,
+               QObject::tr("AmneziaWG - Special protocol from Amnezia, based on WireGuard. It's fast like WireGuard, "
+                           "but very resistant to blockages. "
+                           "Recommended for regions with high levels of censorship.") },
              { DockerContainer::Ipsec,
                QObject::tr("IKEv2 -  Modern stable protocol, a bit faster than others, restores connection after "
                            "signal loss. It has native support on the latest versions of Android and iOS.") },
@@ -125,19 +126,73 @@ QMap<DockerContainer, QString> ContainerProps::containerDescriptions()
 
 QMap<DockerContainer, QString> ContainerProps::containerDetailedDescriptions()
 {
-    return { { DockerContainer::OpenVpn, QObject::tr("OpenVPN container") },
-             { DockerContainer::ShadowSocks, QObject::tr("Container with OpenVpn and ShadowSocks") },
-             { DockerContainer::Cloak,
-               QObject::tr("Container with OpenVpn and ShadowSocks protocols "
-                           "configured with traffic masking by Cloak plugin") },
-             { DockerContainer::WireGuard, QObject::tr("WireGuard container") },
-             { DockerContainer::WireGuard, QObject::tr("AmneziaWG container") },
-             { DockerContainer::Ipsec, QObject::tr("IPsec container") },
+    return {
+        { DockerContainer::OpenVpn,
+          QObject::tr(
+                  "The time-tested most popular VPN protocol.\n\n"
+                  "Uses a proprietary security protocol with SSL/TLS for encryption and key exchange and supports "
+                  "various authentication methods, making it suitable for a variety of devices and operating "
+                  "systems.\n\n"
+                  "* Normal power consumption on mobile devices\n"
+                  "* Flexible customisation to suit user needs to work with different operating systems and devices.\n"
+                  "* Recognised by DPI analysis systems and therefore susceptible to blocking.\n"
+                  "* Can operate over both TCP and UDP network protocols.") },
+        { DockerContainer::ShadowSocks,
+          QObject::tr("Based on the SOCKS5 proxy protocol, which protects the connection using the AEAD cipher - "
+                      "roughly along the same lines as SSH tunnelling. A Shadowsocks connection is difficult to "
+                      "identify because it is virtually identical to a normal HTTPS connection.\n\n"
+                      "However, some traffic analysis systems can still recognise a ShadowSocks connection, so in "
+                      "countries with high levels of censorship we recommend using OpenVPN in conjunction with Cloak.\n"
+                      "* Average power consumption on mobile devices (higher than OpenVPN).\n"
+                      "* It is possible to configure the encryption protocol.\n"
+                      "* Recognised by some DPI analysis systems\n"
+                      "* Works only via TCP network protocol\n") },
+        { DockerContainer::Cloak,
+          QObject::tr("This is a combination of the OpenVPN protocol and the Cloak plugin designed specifically for "
+                      "blocking protection.\n\n"
+                      "OpenVPN provides a secure VPN connection by encrypting all Internet traffic between the client "
+                      "and the server.\n\n"
+                      "Cloak protects OpenVPN from detection and blocking. \n\n"
+                      "Cloak can modify packet metadata so that it completely masks VPN traffic as normal web traffic, "
+                      "and also protects the VPN from detection by Active Probing. This makes it very resistant to "
+                      "being detected\n\n"
+                      "Immediately after receiving the first data packet, Cloak authenticates the incoming connection. "
+                      "If authentication fails, the plugin masks the server as a fake website and your VPN becomes "
+                      "invisible to analysis systems.\n\n"
+                      "If there is a high level of Internet censorship in your region, we advise you to use only "
+                      "OpenVPN over Cloak from the first connection\n"
+                      "* High power consumption on mobile devices\n"
+                      "* Flexible settings\n"
+                      "* Not recognised by DPI analysis systems\n"
+                      "* Works via TCP network protocol\n") },
+        { DockerContainer::WireGuard,
+          QObject::tr("A relatively new popular VPN protocol with a simplified architecture.\n"
+                      "Provides stable VPN connection, high performance on all devices. Uses hard-coded encryption "
+                      "settings. WireGuard compared to OpenVPN has lower latency and better data transfer throughput.\n"
 
-             { DockerContainer::TorWebSite, QObject::tr("Website in Tor network") },
-             { DockerContainer::Dns, QObject::tr("DNS Service") },
-             //{DockerContainer::FileShare, QObject::tr("SMB file sharing service - is Window file sharing protocol")},
-             { DockerContainer::Sftp, QObject::tr("Sftp file sharing service - is secure FTP service") } };
+                      "* Low power consumption on mobile devices.\n"
+                      "* Minimum number of settings.\n"
+                      "* Easily recognised by DPI analysis systems, susceptible to blocking.\n"
+                      "* Works via UDP network protocol.\n") },
+        { DockerContainer::Awg, QObject::tr("AmneziaWG container") },
+        { DockerContainer::Ipsec,
+          QObject::tr("A modern stable protocol.\n\n"
+
+                      "IKEv2 with IPSec encryption layer. Transmits data over fixed UDP ports 500 and 4500 protecting "
+                      "them with strong 3DES and AES crypto algorithms. Allows very fast switching between networks "
+                      "and devices. Due to its security, stability and speed, IKEv2 is currently one of the best VPN "
+                      "solutions for mobile devices. Vulnerable to detection and blocking.\n"
+
+                      "* Low power consumption, on mobile devices\n"
+                      "* Minimal configuration.\n"
+                      "* Recognised by DPI analysis systems.\n"
+                      "* Works only over UDP network protocol\n") },
+
+        { DockerContainer::TorWebSite, QObject::tr("Website in Tor network") },
+        { DockerContainer::Dns, QObject::tr("DNS Service") },
+        //{DockerContainer::FileShare, QObject::tr("SMB file sharing service - is Window file sharing protocol")},
+        { DockerContainer::Sftp, QObject::tr("Sftp file sharing service - is secure FTP service") }
+    };
 }
 
 amnezia::ServiceType ContainerProps::containerService(DockerContainer c)
@@ -254,7 +309,8 @@ QString ContainerProps::easySetupDescription(DockerContainer container)
     switch (container) {
     case DockerContainer::WireGuard: return tr("I just want to increase the level of my privacy.");
     case DockerContainer::Awg: return tr("I want to bypass censorship. This option recommended in most cases.");
-    case DockerContainer::Cloak: return tr("Most VPN protocols are blocked. Recommended if other options are not working.");
+    case DockerContainer::Cloak:
+        return tr("Most VPN protocols are blocked. Recommended if other options are not working.");
     default: return "";
     }
 }
diff --git a/client/translations/amneziavpn_ru.ts b/client/translations/amneziavpn_ru.ts
index 8a2ffffc..94ce0b3a 100644
--- a/client/translations/amneziavpn_ru.ts
+++ b/client/translations/amneziavpn_ru.ts
@@ -68,17 +68,22 @@
 <context>
     <name>ConnectionTypeSelectionDrawer</name>
     <message>
-        <location filename="../ui/qml/Components/ConnectionTypeSelectionDrawer.qml" line="31"/>
-        <source>Connection data</source>
+        <location filename="../ui/qml/Components/ConnectionTypeSelectionDrawer.qml" line="30"/>
+        <source>Add server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Components/ConnectionTypeSelectionDrawer.qml" line="40"/>
+        <location filename="../ui/qml/Components/ConnectionTypeSelectionDrawer.qml" line="31"/>
+        <source>Select data type</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Components/ConnectionTypeSelectionDrawer.qml" line="39"/>
         <source>Server IP, login and password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Components/ConnectionTypeSelectionDrawer.qml" line="54"/>
+        <location filename="../ui/qml/Components/ConnectionTypeSelectionDrawer.qml" line="53"/>
         <source>QR code, key or configuration file</source>
         <translation type="unfinished"></translation>
     </message>
@@ -130,7 +135,7 @@
 <context>
     <name>ImportController</name>
     <message>
-        <location filename="../ui/controllers/importController.cpp" line="375"/>
+        <location filename="../ui/controllers/importController.cpp" line="429"/>
         <source>Scanned %1 of %2.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -808,7 +813,7 @@ Already installed containers were found on the server. All installed containers
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageServiceTorWebsiteSettings.qml" line="124"/>
-        <source>When configuring WordPress set the domain as this onion address.</source>
+        <source>When configuring WordPress set the this address as domain.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -865,7 +870,7 @@ Already installed containers were found on the server. All installed containers
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettings.qml" line="115"/>
+        <location filename="../ui/qml/Pages2/PageSettings.qml" line="117"/>
         <source>Close application</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1143,22 +1148,22 @@ Already installed containers were found on the server. All installed containers
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsConnection.qml" line="99"/>
+        <location filename="../ui/qml/Pages2/PageSettingsConnection.qml" line="101"/>
         <source>Site-based split tunneling</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsConnection.qml" line="100"/>
+        <location filename="../ui/qml/Pages2/PageSettingsConnection.qml" line="102"/>
         <source>Allows you to select which sites you want to access through the VPN</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsConnection.qml" line="114"/>
+        <location filename="../ui/qml/Pages2/PageSettingsConnection.qml" line="120"/>
         <source>App-based split tunneling</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsConnection.qml" line="115"/>
+        <location filename="../ui/qml/Pages2/PageSettingsConnection.qml" line="121"/>
         <source>Allows you to use the VPN only for certain applications</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1438,90 +1443,90 @@ Already installed containers were found on the server. All installed containers
 <context>
     <name>PageSettingsSplitTunneling</name>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="49"/>
+        <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="53"/>
         <source>Addresses from the list should be accessed via VPN</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="54"/>
+        <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="58"/>
         <source>Addresses from the list should not be accessed via VPN</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="84"/>
+        <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="90"/>
         <source>Split tunneling</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="120"/>
+        <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="128"/>
         <source>Mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="198"/>
+        <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="206"/>
         <source>Remove </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="199"/>
+        <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="207"/>
         <source>Continue</source>
         <translation type="unfinished">Продолжить</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="200"/>
+        <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="208"/>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="238"/>
+        <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="255"/>
         <source>Site or IP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="282"/>
+        <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="299"/>
         <source>Import/Export Sites</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="288"/>
+        <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="305"/>
         <source>Import</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="300"/>
+        <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="317"/>
         <source>Save site list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="307"/>
+        <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="324"/>
         <source>Save sites</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="308"/>
-        <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="375"/>
-        <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="390"/>
+        <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="325"/>
+        <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="392"/>
+        <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="407"/>
         <source>Sites files (*.json)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="365"/>
+        <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="382"/>
         <source>Import a list of sites</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="371"/>
+        <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="388"/>
         <source>Replace site list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="374"/>
-        <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="389"/>
+        <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="391"/>
+        <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="406"/>
         <source>Open sites file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="386"/>
+        <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="403"/>
         <source>Add imported sites to existing ones</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1699,22 +1704,22 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSetupWizardProtocolSettings.qml" line="183"/>
+        <location filename="../ui/qml/Pages2/PageSetupWizardProtocolSettings.qml" line="192"/>
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSetupWizardProtocolSettings.qml" line="198"/>
+        <location filename="../ui/qml/Pages2/PageSetupWizardProtocolSettings.qml" line="207"/>
         <source>Network protocol</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSetupWizardProtocolSettings.qml" line="214"/>
+        <location filename="../ui/qml/Pages2/PageSetupWizardProtocolSettings.qml" line="223"/>
         <source>Port</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSetupWizardProtocolSettings.qml" line="230"/>
+        <location filename="../ui/qml/Pages2/PageSetupWizardProtocolSettings.qml" line="239"/>
         <source>Install</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1851,6 +1856,11 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
         <source>VPN access without the ability to manage the server</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageShare.qml" line="175"/>
+        <source>Access to server management. The user with whom you share full access to the connection will be able to add and remove your protocols and services to the server, as well as change settings.</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location filename="../ui/qml/Pages2/PageShare.qml" line="190"/>
         <location filename="../ui/qml/Pages2/PageShare.qml" line="191"/>
@@ -1897,11 +1907,6 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
         <source>Full access</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../ui/qml/Pages2/PageShare.qml" line="175"/>
-        <source>Access to server management. The user with whom you share full access to the connection will be able to add and remove your protocols and services to the servers, as well as change settings.</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="../ui/qml/Pages2/PageShare.qml" line="251"/>
         <location filename="../ui/qml/Pages2/PageShare.qml" line="252"/>
@@ -2376,7 +2381,74 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../containers/containers_defs.cpp" line="138"/>
+        <location filename="../containers/containers_defs.cpp" line="131"/>
+        <source>The time-tested most popular VPN protocol.
+
+Uses a proprietary security protocol with SSL/TLS for encryption and key exchange and supports various authentication methods, making it suitable for a variety of devices and operating systems.
+
+* Normal power consumption on mobile devices
+* Flexible customisation to suit user needs to work with different operating systems and devices.
+* Recognised by DPI analysis systems and therefore susceptible to blocking.
+* Can operate over both TCP and UDP network protocols.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../containers/containers_defs.cpp" line="141"/>
+        <source>Based on the SOCKS5 proxy protocol, which protects the connection using the AEAD cipher - roughly along the same lines as SSH tunnelling. A Shadowsocks connection is difficult to identify because it is virtually identical to a normal HTTPS connection.
+
+However, some traffic analysis systems can still recognise a ShadowSocks connection, so in countries with high levels of censorship we recommend using OpenVPN in conjunction with Cloak.
+* Average power consumption on mobile devices (higher than OpenVPN).
+* It is possible to configure the encryption protocol.
+* Recognised by some DPI analysis systems
+* Works only via TCP network protocol
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../containers/containers_defs.cpp" line="151"/>
+        <source>This is a combination of the OpenVPN protocol and the Cloak plugin designed specifically for blocking protection.
+
+OpenVPN provides a secure VPN connection by encrypting all Internet traffic between the client and the server.
+
+Cloak protects OpenVPN from detection and blocking. 
+
+Cloak can modify packet metadata so that it completely masks VPN traffic as normal web traffic, and also protects the VPN from detection by Active Probing. This makes it very resistant to being detected
+
+Immediately after receiving the first data packet, Cloak authenticates the incoming connection. If authentication fails, the plugin masks the server as a fake website and your VPN becomes invisible to analysis systems.
+
+If there is a high level of Internet censorship in your region, we advise you to use only OpenVPN over Cloak from the first connection
+* High power consumption on mobile devices
+* Flexible settings
+* Not recognised by DPI analysis systems
+* Works via TCP network protocol
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../containers/containers_defs.cpp" line="169"/>
+        <source>A relatively new popular VPN protocol with a simplified architecture.
+Provides stable VPN connection, high performance on all devices. Uses hard-coded encryption settings. WireGuard compared to OpenVPN has lower latency and better data transfer throughput.
+* Low power consumption on mobile devices.
+* Minimum number of settings.
+* Easily recognised by DPI analysis systems, susceptible to blocking.
+* Works via UDP network protocol.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../containers/containers_defs.cpp" line="179"/>
+        <source>A modern stable protocol.
+
+IKEv2 with IPSec encryption layer. Transmits data over fixed UDP ports 500 and 4500 protecting them with strong 3DES and AES crypto algorithms. Allows very fast switching between networks and devices. Due to its security, stability and speed, IKEv2 is currently one of the best VPN solutions for mobile devices. Vulnerable to detection and blocking.
+* Low power consumption, on mobile devices
+* Minimal configuration.
+* Recognised by DPI analysis systems.
+* Works only over UDP network protocol
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../containers/containers_defs.cpp" line="192"/>
         <source>DNS Service</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2387,7 +2459,7 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
     </message>
     <message>
         <location filename="../containers/containers_defs.cpp" line="90"/>
-        <location filename="../containers/containers_defs.cpp" line="137"/>
+        <location filename="../containers/containers_defs.cpp" line="191"/>
         <source>Website in Tor network</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2413,62 +2485,41 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
     </message>
     <message>
         <location filename="../containers/containers_defs.cpp" line="109"/>
-        <location filename="../containers/containers_defs.cpp" line="112"/>
         <source>WireGuard - New popular VPN protocol with high performance, high speed and low power consumption. Recommended for regions with low levels of censorship.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../containers/containers_defs.cpp" line="115"/>
+        <location filename="../containers/containers_defs.cpp" line="112"/>
+        <source>AmneziaWG - Special protocol from Amnezia, based on WireGuard. It&apos;s fast like WireGuard, but very resistant to blockages. Recommended for regions with high levels of censorship.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../containers/containers_defs.cpp" line="116"/>
         <source>IKEv2 -  Modern stable protocol, a bit faster than others, restores connection after signal loss. It has native support on the latest versions of Android and iOS.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../containers/containers_defs.cpp" line="118"/>
+        <location filename="../containers/containers_defs.cpp" line="119"/>
         <source>Deploy a WordPress site on the Tor network in two clicks.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../containers/containers_defs.cpp" line="120"/>
+        <location filename="../containers/containers_defs.cpp" line="121"/>
         <source>Replace the current DNS server with your own. This will increase your privacy level.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../containers/containers_defs.cpp" line="123"/>
+        <location filename="../containers/containers_defs.cpp" line="124"/>
         <source>Creates a file vault on your server to securely store and transfer files.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../containers/containers_defs.cpp" line="128"/>
-        <source>OpenVPN container</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../containers/containers_defs.cpp" line="129"/>
-        <source>Container with OpenVpn and ShadowSocks</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../containers/containers_defs.cpp" line="131"/>
-        <source>Container with OpenVpn and ShadowSocks protocols configured with traffic masking by Cloak plugin</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../containers/containers_defs.cpp" line="133"/>
-        <source>WireGuard container</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../containers/containers_defs.cpp" line="134"/>
+        <location filename="../containers/containers_defs.cpp" line="177"/>
         <source>AmneziaWG container</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../containers/containers_defs.cpp" line="135"/>
-        <source>IPsec container</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../containers/containers_defs.cpp" line="140"/>
+        <location filename="../containers/containers_defs.cpp" line="194"/>
         <source>Sftp file sharing service - is secure FTP service</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2537,6 +2588,16 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
         <source>error 0x%1: %2</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../3rd/wireguard-tools/contrib/highlighter/gui/highlight.cpp" line="39"/>
+        <source>WireGuard Configuration Highlighter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../3rd/wireguard-tools/contrib/highlighter/gui/highlight.cpp" line="82"/>
+        <source>&amp;Randomize colors</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SelectLanguageDrawer</name>
@@ -2755,33 +2816,33 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
 <context>
     <name>amnezia::ContainerProps</name>
     <message>
-        <location filename="../containers/containers_defs.cpp" line="245"/>
+        <location filename="../containers/containers_defs.cpp" line="300"/>
         <source>Low</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../containers/containers_defs.cpp" line="246"/>
-        <source>High</source>
+        <location filename="../containers/containers_defs.cpp" line="301"/>
+        <source>Medium or High</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../containers/containers_defs.cpp" line="247"/>
-        <source>Medium</source>
+        <location filename="../containers/containers_defs.cpp" line="302"/>
+        <source>Extreme</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../containers/containers_defs.cpp" line="256"/>
-        <source>Many foreign websites and VPN providers are blocked</source>
+        <location filename="../containers/containers_defs.cpp" line="310"/>
+        <source>I just want to increase the level of my privacy.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../containers/containers_defs.cpp" line="257"/>
-        <source>Some foreign sites are blocked, but VPN providers are not blocked</source>
+        <location filename="../containers/containers_defs.cpp" line="311"/>
+        <source>I want to bypass censorship. This option recommended in most cases.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../containers/containers_defs.cpp" line="255"/>
-        <source>I just want to increase the level of privacy</source>
+        <location filename="../containers/containers_defs.cpp" line="313"/>
+        <source>Most VPN protocols are blocked. Recommended if other options are not working.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/client/translations/amneziavpn_zh_CN.ts b/client/translations/amneziavpn_zh_CN.ts
index e60f0d8b..359655f8 100644
--- a/client/translations/amneziavpn_zh_CN.ts
+++ b/client/translations/amneziavpn_zh_CN.ts
@@ -68,17 +68,26 @@
 <context>
     <name>ConnectionTypeSelectionDrawer</name>
     <message>
-        <location filename="../ui/qml/Components/ConnectionTypeSelectionDrawer.qml" line="31"/>
         <source>Connection data</source>
-        <translation>连接方式</translation>
+        <translation type="vanished">连接方式</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Components/ConnectionTypeSelectionDrawer.qml" line="40"/>
+        <location filename="../ui/qml/Components/ConnectionTypeSelectionDrawer.qml" line="30"/>
+        <source>Add server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Components/ConnectionTypeSelectionDrawer.qml" line="31"/>
+        <source>Select data type</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Components/ConnectionTypeSelectionDrawer.qml" line="39"/>
         <source>Server IP, login and password</source>
         <translation>服务器IP，用户名和密码</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Components/ConnectionTypeSelectionDrawer.qml" line="54"/>
+        <location filename="../ui/qml/Components/ConnectionTypeSelectionDrawer.qml" line="53"/>
         <source>QR code, key or configuration file</source>
         <translation>二维码，授权码或者配置文件</translation>
     </message>
@@ -130,7 +139,7 @@
 <context>
     <name>ImportController</name>
     <message>
-        <location filename="../ui/controllers/importController.cpp" line="375"/>
+        <location filename="../ui/controllers/importController.cpp" line="429"/>
         <source>Scanned %1 of %2.</source>
         <translation>扫描 %1 of %2.</translation>
     </message>
@@ -847,8 +856,12 @@ Already installed containers were found on the server. All installed containers
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageServiceTorWebsiteSettings.qml" line="124"/>
+        <source>When configuring WordPress set the this address as domain.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>When configuring WordPress set the domain as this onion address.</source>
-        <translation>配置 WordPress 时，将域设置为此洋葱地址。</translation>
+        <translation type="vanished">配置 WordPress 时，将域设置为此洋葱地址。</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageServiceTorWebsiteSettings.qml" line="138"/>
@@ -904,7 +917,7 @@ Already installed containers were found on the server. All installed containers
         <translation>关于</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettings.qml" line="115"/>
+        <location filename="../ui/qml/Pages2/PageSettings.qml" line="117"/>
         <source>Close application</source>
         <translation>关闭应用</translation>
     </message>
@@ -1205,17 +1218,17 @@ And if you don&apos;t like the app, all the more support it - the donation will
         <translation>如果未使用或未安装AmneziaDNS</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsConnection.qml" line="99"/>
+        <location filename="../ui/qml/Pages2/PageSettingsConnection.qml" line="101"/>
         <source>Site-based split tunneling</source>
         <translation>基于网站的隧道分离</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsConnection.qml" line="100"/>
+        <location filename="../ui/qml/Pages2/PageSettingsConnection.qml" line="102"/>
         <source>Allows you to select which sites you want to access through the VPN</source>
         <translation>配置想要通过VPN访问网站</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsConnection.qml" line="114"/>
+        <location filename="../ui/qml/Pages2/PageSettingsConnection.qml" line="120"/>
         <source>App-based split tunneling</source>
         <translation>基于应用的隧道分离</translation>
     </message>
@@ -1232,7 +1245,7 @@ And if you don&apos;t like the app, all the more support it - the donation will
         <translation type="obsolete">应用级VPN分流</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsConnection.qml" line="115"/>
+        <location filename="../ui/qml/Pages2/PageSettingsConnection.qml" line="121"/>
         <source>Allows you to use the VPN only for certain applications</source>
         <translation>仅指定应用使用VPN</translation>
     </message>
@@ -1532,90 +1545,90 @@ And if you don&apos;t like the app, all the more support it - the donation will
         <translation type="obsolete">网站级VPN分流</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="49"/>
+        <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="53"/>
         <source>Addresses from the list should be accessed via VPN</source>
         <translation>仅使用VPN访问</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="54"/>
+        <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="58"/>
         <source>Addresses from the list should not be accessed via VPN</source>
         <translation>不使用VPN访问</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="84"/>
+        <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="90"/>
         <source>Split tunneling</source>
         <translation>隧道分离</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="120"/>
+        <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="128"/>
         <source>Mode</source>
         <translation>规则</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="198"/>
+        <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="206"/>
         <source>Remove </source>
         <translation>移除 </translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="199"/>
+        <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="207"/>
         <source>Continue</source>
         <translation>继续</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="200"/>
+        <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="208"/>
         <source>Cancel</source>
         <translation>取消</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="238"/>
+        <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="255"/>
         <source>Site or IP</source>
         <translation>网站或IP地址</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="282"/>
+        <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="299"/>
         <source>Import/Export Sites</source>
         <translation>导入/导出网站</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="288"/>
+        <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="305"/>
         <source>Import</source>
         <translation>导入</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="300"/>
+        <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="317"/>
         <source>Save site list</source>
         <translation>保存网址</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="307"/>
+        <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="324"/>
         <source>Save sites</source>
         <translation>保存网址</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="308"/>
-        <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="375"/>
-        <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="390"/>
+        <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="325"/>
+        <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="392"/>
+        <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="407"/>
         <source>Sites files (*.json)</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="365"/>
+        <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="382"/>
         <source>Import a list of sites</source>
         <translation>导入网址列表</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="371"/>
+        <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="388"/>
         <source>Replace site list</source>
         <translation>替换网址列表</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="374"/>
-        <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="389"/>
+        <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="391"/>
+        <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="406"/>
         <source>Open sites file</source>
         <translation>打开网址文件</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="386"/>
+        <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="403"/>
         <source>Add imported sites to existing ones</source>
         <translation>将导入的网址添加到现有网址中</translation>
     </message>
@@ -1794,22 +1807,22 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
         <translation>更多细节</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSetupWizardProtocolSettings.qml" line="183"/>
+        <location filename="../ui/qml/Pages2/PageSetupWizardProtocolSettings.qml" line="192"/>
         <source>Close</source>
         <translation>关闭</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSetupWizardProtocolSettings.qml" line="198"/>
+        <location filename="../ui/qml/Pages2/PageSetupWizardProtocolSettings.qml" line="207"/>
         <source>Network protocol</source>
         <translation>网络协议</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSetupWizardProtocolSettings.qml" line="214"/>
+        <location filename="../ui/qml/Pages2/PageSetupWizardProtocolSettings.qml" line="223"/>
         <source>Port</source>
         <translation>端口</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSetupWizardProtocolSettings.qml" line="230"/>
+        <location filename="../ui/qml/Pages2/PageSetupWizardProtocolSettings.qml" line="239"/>
         <source>Install</source>
         <translation>安装</translation>
     </message>
@@ -1968,8 +1981,12 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageShare.qml" line="175"/>
+        <source>Access to server management. The user with whom you share full access to the connection will be able to add and remove your protocols and services to the server, as well as change settings.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Access to server management. The user with whom you share full access to the connection will be able to add and remove your protocols and services to the servers, as well as change settings.</source>
-        <translation>除访问VPN外，用户还能添加和删除协议、服务以及更改配置信息</translation>
+        <translation type="vanished">除访问VPN外，用户还能添加和删除协议、服务以及更改配置信息</translation>
     </message>
     <message>
         <source>Full access to server</source>
@@ -2489,7 +2506,7 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
     </message>
     <message>
         <location filename="../containers/containers_defs.cpp" line="90"/>
-        <location filename="../containers/containers_defs.cpp" line="137"/>
+        <location filename="../containers/containers_defs.cpp" line="191"/>
         <source>Website in Tor network</source>
         <translation>在 Tor 网络中架设网站</translation>
     </message>
@@ -2520,67 +2537,133 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
     </message>
     <message>
         <location filename="../containers/containers_defs.cpp" line="109"/>
-        <location filename="../containers/containers_defs.cpp" line="112"/>
         <source>WireGuard - New popular VPN protocol with high performance, high speed and low power consumption. Recommended for regions with low levels of censorship.</source>
         <translation>WireGuard - 新型流行的VPN协议，具有高性能、高速度和低功耗。建议用于审查力度较低的地区</translation>
     </message>
     <message>
-        <location filename="../containers/containers_defs.cpp" line="115"/>
+        <location filename="../containers/containers_defs.cpp" line="112"/>
+        <source>AmneziaWG - Special protocol from Amnezia, based on WireGuard. It&apos;s fast like WireGuard, but very resistant to blockages. Recommended for regions with high levels of censorship.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../containers/containers_defs.cpp" line="116"/>
         <source>IKEv2 -  Modern stable protocol, a bit faster than others, restores connection after signal loss. It has native support on the latest versions of Android and iOS.</source>
         <translation>IKEv2 - 现代稳定协议，相比其他协议较快一些，在信号丢失后恢复连接。Android 和 iOS最新版原生支持。</translation>
     </message>
     <message>
-        <location filename="../containers/containers_defs.cpp" line="118"/>
+        <location filename="../containers/containers_defs.cpp" line="119"/>
         <source>Deploy a WordPress site on the Tor network in two clicks.</source>
         <translation>只需点击两次即可架设 WordPress 网站到 Tor 网络</translation>
     </message>
     <message>
-        <location filename="../containers/containers_defs.cpp" line="120"/>
+        <location filename="../containers/containers_defs.cpp" line="121"/>
         <source>Replace the current DNS server with your own. This will increase your privacy level.</source>
         <translation>将当前的 DNS 服务器替换为您自己的。这将提高您的隐私保护级别。</translation>
     </message>
     <message>
-        <location filename="../containers/containers_defs.cpp" line="123"/>
+        <location filename="../containers/containers_defs.cpp" line="124"/>
         <source>Creates a file vault on your server to securely store and transfer files.</source>
         <translation>在您的服务器上创建文件仓库，以便安全地存储和传输文件</translation>
     </message>
-    <message>
-        <location filename="../containers/containers_defs.cpp" line="128"/>
-        <source>OpenVPN container</source>
-        <translation>OpenVPN容器</translation>
-    </message>
-    <message>
-        <location filename="../containers/containers_defs.cpp" line="129"/>
-        <source>Container with OpenVpn and ShadowSocks</source>
-        <translation>含 OpenVpn 和 ShadowSocks 的容器</translation>
-    </message>
     <message>
         <location filename="../containers/containers_defs.cpp" line="131"/>
+        <source>The time-tested most popular VPN protocol.
+
+Uses a proprietary security protocol with SSL/TLS for encryption and key exchange and supports various authentication methods, making it suitable for a variety of devices and operating systems.
+
+* Normal power consumption on mobile devices
+* Flexible customisation to suit user needs to work with different operating systems and devices.
+* Recognised by DPI analysis systems and therefore susceptible to blocking.
+* Can operate over both TCP and UDP network protocols.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../containers/containers_defs.cpp" line="141"/>
+        <source>Based on the SOCKS5 proxy protocol, which protects the connection using the AEAD cipher - roughly along the same lines as SSH tunnelling. A Shadowsocks connection is difficult to identify because it is virtually identical to a normal HTTPS connection.
+
+However, some traffic analysis systems can still recognise a ShadowSocks connection, so in countries with high levels of censorship we recommend using OpenVPN in conjunction with Cloak.
+* Average power consumption on mobile devices (higher than OpenVPN).
+* It is possible to configure the encryption protocol.
+* Recognised by some DPI analysis systems
+* Works only via TCP network protocol
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../containers/containers_defs.cpp" line="151"/>
+        <source>This is a combination of the OpenVPN protocol and the Cloak plugin designed specifically for blocking protection.
+
+OpenVPN provides a secure VPN connection by encrypting all Internet traffic between the client and the server.
+
+Cloak protects OpenVPN from detection and blocking. 
+
+Cloak can modify packet metadata so that it completely masks VPN traffic as normal web traffic, and also protects the VPN from detection by Active Probing. This makes it very resistant to being detected
+
+Immediately after receiving the first data packet, Cloak authenticates the incoming connection. If authentication fails, the plugin masks the server as a fake website and your VPN becomes invisible to analysis systems.
+
+If there is a high level of Internet censorship in your region, we advise you to use only OpenVPN over Cloak from the first connection
+* High power consumption on mobile devices
+* Flexible settings
+* Not recognised by DPI analysis systems
+* Works via TCP network protocol
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../containers/containers_defs.cpp" line="169"/>
+        <source>A relatively new popular VPN protocol with a simplified architecture.
+Provides stable VPN connection, high performance on all devices. Uses hard-coded encryption settings. WireGuard compared to OpenVPN has lower latency and better data transfer throughput.
+* Low power consumption on mobile devices.
+* Minimum number of settings.
+* Easily recognised by DPI analysis systems, susceptible to blocking.
+* Works via UDP network protocol.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../containers/containers_defs.cpp" line="179"/>
+        <source>A modern stable protocol.
+
+IKEv2 with IPSec encryption layer. Transmits data over fixed UDP ports 500 and 4500 protecting them with strong 3DES and AES crypto algorithms. Allows very fast switching between networks and devices. Due to its security, stability and speed, IKEv2 is currently one of the best VPN solutions for mobile devices. Vulnerable to detection and blocking.
+* Low power consumption, on mobile devices
+* Minimal configuration.
+* Recognised by DPI analysis systems.
+* Works only over UDP network protocol
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>OpenVPN container</source>
+        <translation type="vanished">OpenVPN容器</translation>
+    </message>
+    <message>
+        <source>Container with OpenVpn and ShadowSocks</source>
+        <translation type="vanished">含 OpenVpn 和 ShadowSocks 的容器</translation>
+    </message>
+    <message>
         <source>Container with OpenVpn and ShadowSocks protocols configured with traffic masking by Cloak plugin</source>
-        <translation>含 OpenVpn 和 ShadowSocks 协议的容器，通过 Cloak 插件配置混淆流量</translation>
+        <translation type="vanished">含 OpenVpn 和 ShadowSocks 协议的容器，通过 Cloak 插件配置混淆流量</translation>
     </message>
     <message>
-        <location filename="../containers/containers_defs.cpp" line="133"/>
         <source>WireGuard container</source>
-        <translation>WireGuard 容器</translation>
+        <translation type="vanished">WireGuard 容器</translation>
     </message>
     <message>
-        <location filename="../containers/containers_defs.cpp" line="134"/>
+        <location filename="../containers/containers_defs.cpp" line="177"/>
         <source>AmneziaWG container</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../containers/containers_defs.cpp" line="135"/>
         <source>IPsec container</source>
-        <translation>IPsec 容器</translation>
+        <translation type="vanished">IPsec 容器</translation>
     </message>
     <message>
-        <location filename="../containers/containers_defs.cpp" line="138"/>
+        <location filename="../containers/containers_defs.cpp" line="192"/>
         <source>DNS Service</source>
         <translation>DNS 服务</translation>
     </message>
     <message>
-        <location filename="../containers/containers_defs.cpp" line="140"/>
+        <location filename="../containers/containers_defs.cpp" line="194"/>
         <source>Sftp file sharing service - is secure FTP service</source>
         <translation>Sftp 文件共享服务 - 安全的 FTP 服务</translation>
     </message>
@@ -2644,6 +2727,16 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
         <source>error 0x%1: %2</source>
         <translation>错误 0x%1: %2</translation>
     </message>
+    <message>
+        <location filename="../3rd/wireguard-tools/contrib/highlighter/gui/highlight.cpp" line="39"/>
+        <source>WireGuard Configuration Highlighter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../3rd/wireguard-tools/contrib/highlighter/gui/highlight.cpp" line="82"/>
+        <source>&amp;Randomize colors</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SelectLanguageDrawer</name>
@@ -2866,34 +2959,54 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
 <context>
     <name>amnezia::ContainerProps</name>
     <message>
-        <location filename="../containers/containers_defs.cpp" line="245"/>
+        <location filename="../containers/containers_defs.cpp" line="300"/>
         <source>Low</source>
         <translation>低</translation>
     </message>
     <message>
-        <location filename="../containers/containers_defs.cpp" line="246"/>
+        <location filename="../containers/containers_defs.cpp" line="301"/>
+        <source>Medium or High</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../containers/containers_defs.cpp" line="302"/>
+        <source>Extreme</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../containers/containers_defs.cpp" line="310"/>
+        <source>I just want to increase the level of my privacy.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../containers/containers_defs.cpp" line="311"/>
+        <source>I want to bypass censorship. This option recommended in most cases.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../containers/containers_defs.cpp" line="313"/>
+        <source>Most VPN protocols are blocked. Recommended if other options are not working.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>High</source>
-        <translation>高</translation>
+        <translation type="vanished">高</translation>
     </message>
     <message>
-        <location filename="../containers/containers_defs.cpp" line="247"/>
         <source>Medium</source>
-        <translation>中</translation>
+        <translation type="vanished">中</translation>
     </message>
     <message>
-        <location filename="../containers/containers_defs.cpp" line="255"/>
         <source>I just want to increase the level of privacy</source>
-        <translation>我只是想提高隐私保护级别</translation>
+        <translation type="vanished">我只是想提高隐私保护级别</translation>
     </message>
     <message>
-        <location filename="../containers/containers_defs.cpp" line="256"/>
         <source>Many foreign websites and VPN providers are blocked</source>
-        <translation>大多国外网站和VPN提供商被屏蔽</translation>
+        <translation type="vanished">大多国外网站和VPN提供商被屏蔽</translation>
     </message>
     <message>
-        <location filename="../containers/containers_defs.cpp" line="257"/>
         <source>Some foreign sites are blocked, but VPN providers are not blocked</source>
-        <translation>一些国外网站被屏蔽，但VPN提供商未被屏蔽</translation>
+        <translation type="vanished">一些国外网站被屏蔽，但VPN提供商未被屏蔽</translation>
     </message>
 </context>
 <context>
diff --git a/client/ui/qml/Components/ConnectionTypeSelectionDrawer.qml b/client/ui/qml/Components/ConnectionTypeSelectionDrawer.qml
index ecde1554..6128c652 100644
--- a/client/ui/qml/Components/ConnectionTypeSelectionDrawer.qml
+++ b/client/ui/qml/Components/ConnectionTypeSelectionDrawer.qml
@@ -20,16 +20,15 @@ DrawerType {
         anchors.right: parent.right
         spacing: 0
 
-        Header2TextType {
+        Header2Type {
             Layout.fillWidth: true
             Layout.topMargin: 24
             Layout.rightMargin: 16
             Layout.leftMargin: 16
-            Layout.bottomMargin: 32
-            Layout.alignment: Qt.AlignHCenter
+            Layout.bottomMargin: 16
 
-            text: qsTr("Connection data")
-            wrapMode: Text.WordWrap
+            headerText: qsTr("Add server")
+            descriptionText: qsTr("Select data type")
         }
 
         LabelWithButtonType {
diff --git a/client/ui/qml/Pages2/PageServiceTorWebsiteSettings.qml b/client/ui/qml/Pages2/PageServiceTorWebsiteSettings.qml
index 04d7076c..0d5baa3d 100644
--- a/client/ui/qml/Pages2/PageServiceTorWebsiteSettings.qml
+++ b/client/ui/qml/Pages2/PageServiceTorWebsiteSettings.qml
@@ -121,7 +121,7 @@ PageType {
                 Layout.leftMargin: 16
                 Layout.rightMargin: 16
 
-                text: qsTr("When configuring WordPress set the domain as this onion address.")
+                text: qsTr("When configuring WordPress set the this address as domain.")
             }
 
             BasicButtonType {
diff --git a/client/ui/qml/Pages2/PageSetupWizardProtocolSettings.qml b/client/ui/qml/Pages2/PageSetupWizardProtocolSettings.qml
index 7535464a..2b97f044 100644
--- a/client/ui/qml/Pages2/PageSetupWizardProtocolSettings.qml
+++ b/client/ui/qml/Pages2/PageSetupWizardProtocolSettings.qml
@@ -144,33 +144,16 @@ PageType {
                                         headerText: name
                                     }
 
-                                    TextField {
-                                        implicitWidth: parent.width
+                                    ParagraphTextType {
                                         Layout.fillWidth: true
                                         Layout.topMargin: 16
                                         Layout.bottomMargin: 16
 
-                                        padding: 0
-                                        leftPadding: 0
-                                        height: 24
-
-                                        color: "#D7D8DB"
-
-                                        font.pixelSize: 16
-                                        font.weight: Font.Medium
-                                        font.family: "PT Root UI VF"
-
                                         text: detailedDescription
-
-                                        wrapMode: Text.WordWrap
-
-                                        readOnly: true
-                                        background: Rectangle {
-                                            anchors.fill: parent
-                                            color: "transparent"
-                                        }
+                                        textFormat: Text.MarkdownText
                                     }
 
+
                                     Rectangle {
                                         Layout.fillHeight: true
                                         color: "transparent"
diff --git a/client/ui/qml/Pages2/PageShare.qml b/client/ui/qml/Pages2/PageShare.qml
index a92d3e51..aa04a1fe 100644
--- a/client/ui/qml/Pages2/PageShare.qml
+++ b/client/ui/qml/Pages2/PageShare.qml
@@ -172,7 +172,7 @@ PageType {
                 Layout.bottomMargin: 24
 
                 text: accessTypeSelector.currentIndex === 0 ? qsTr("VPN access without the ability to manage the server") :
-                                                              qsTr("Access to server management. The user with whom you share full access to the connection will be able to add and remove your protocols and services to the servers, as well as change settings.")
+                                                              qsTr("Access to server management. The user with whom you share full access to the connection will be able to add and remove your protocols and services to the server, as well as change settings.")
                 color: "#878B91"
             }
 

From 3ac09181c6065afd40f5e281a20249b866058439 Mon Sep 17 00:00:00 2001
From: pokamest <pokamest@gmail.com>
Date: Sat, 14 Oct 2023 15:55:07 +0100
Subject: [PATCH 218/278] Text lables fixes

---
 .../qml/Components/ConnectionTypeSelectionDrawer.qml   |  6 +++---
 client/ui/qml/Pages2/PageSetupWizardCredentials.qml    | 10 +++++++++-
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/client/ui/qml/Components/ConnectionTypeSelectionDrawer.qml b/client/ui/qml/Components/ConnectionTypeSelectionDrawer.qml
index ecde1554..81ccd245 100644
--- a/client/ui/qml/Components/ConnectionTypeSelectionDrawer.qml
+++ b/client/ui/qml/Components/ConnectionTypeSelectionDrawer.qml
@@ -28,7 +28,7 @@ DrawerType {
             Layout.bottomMargin: 32
             Layout.alignment: Qt.AlignHCenter
 
-            text: qsTr("Connection data")
+            text: qsTr("Add new connection")
             wrapMode: Text.WordWrap
         }
 
@@ -37,7 +37,7 @@ DrawerType {
             Layout.fillWidth: true
             Layout.topMargin: 16
 
-            text: qsTr("Server IP, login and password")
+            text: qsTr("Configure your server")
             rightImageSource: "qrc:/images/controls/chevron-right.svg"
 
             clickedFunction: function() {
@@ -51,7 +51,7 @@ DrawerType {
         LabelWithButtonType {
             Layout.fillWidth: true
 
-            text: qsTr("QR code, key or configuration file")
+            text: qsTr("Open QR code, key or config file")
             rightImageSource: "qrc:/images/controls/chevron-right.svg"
 
             clickedFunction: function() {
diff --git a/client/ui/qml/Pages2/PageSetupWizardCredentials.qml b/client/ui/qml/Pages2/PageSetupWizardCredentials.qml
index bc24c196..5c32b0c5 100644
--- a/client/ui/qml/Pages2/PageSetupWizardCredentials.qml
+++ b/client/ui/qml/Pages2/PageSetupWizardCredentials.qml
@@ -41,7 +41,7 @@ PageType {
             HeaderType {
                 Layout.fillWidth: true
 
-                headerText: qsTr("Server connection")
+                headerText: qsTr("Configure your server")
             }
 
             TextFieldWithHeaderType {
@@ -107,6 +107,14 @@ PageType {
                     PageController.goToPage(PageEnum.PageSetupWizardEasy)
                 }
             }
+
+            LabelTextType {
+                Layout.fillWidth: true
+                Layout.topMargin: 12
+
+                text: qsTr("All data you enter will remain strictly confidential
+and will not be shared or disclosed to the Amnezia or any third parties")
+            }
         }
     }
 

From b6d2030041d2924bd1b661bda1af846be65c6022 Mon Sep 17 00:00:00 2001
From: pokamest <pokamest@gmail.com>
Date: Sat, 14 Oct 2023 15:55:52 +0100
Subject: [PATCH 219/278] Ru translation

---
 client/translations/amneziavpn_ru.ts | 1076 +++++++++++++-------------
 1 file changed, 559 insertions(+), 517 deletions(-)

diff --git a/client/translations/amneziavpn_ru.ts b/client/translations/amneziavpn_ru.ts
index ac099552..d2ad31b7 100644
--- a/client/translations/amneziavpn_ru.ts
+++ b/client/translations/amneziavpn_ru.ts
@@ -6,7 +6,7 @@
     <message>
         <location filename="../amnezia_application.cpp" line="302"/>
         <source>Split tunneling for WireGuard is not implemented, the option was disabled</source>
-        <translation type="unfinished"></translation>
+        <translation>Раздельное туннелирование для &quot;Wireguard&quot; не реализовано,опция отключена</translation>
     </message>
 </context>
 <context>
@@ -14,13 +14,13 @@
     <message>
         <location filename="../platforms/android/android_controller.cpp" line="236"/>
         <source>AmneziaVPN</source>
-        <translation type="unfinished"></translation>
+        <translation>AmneziaVPN</translation>
     </message>
     <message>
         <location filename="../platforms/android/android_controller.cpp" line="239"/>
         <source>VPN Connected</source>
         <extracomment>Refers to the app - which is currently running the background and waiting</extracomment>
-        <translation type="unfinished"></translation>
+        <translation>VPN Подключен</translation>
     </message>
 </context>
 <context>
@@ -29,27 +29,28 @@
         <location filename="../ui/controllers/connectionController.cpp" line="38"/>
         <source>VPN Protocols is not installed.
  Please install VPN container at first</source>
-        <translation type="unfinished"></translation>
+        <translation>VPN протоколы не установлены.
+ Пожалуйста, установите протокол</translation>
     </message>
     <message>
         <location filename="../ui/controllers/connectionController.cpp" line="61"/>
         <source>Connection...</source>
-        <translation type="unfinished"></translation>
+        <translation>Подключение...</translation>
     </message>
     <message>
         <location filename="../ui/controllers/connectionController.cpp" line="66"/>
         <source>Connected</source>
-        <translation type="unfinished"></translation>
+        <translation>Подключено</translation>
     </message>
     <message>
         <location filename="../ui/controllers/connectionController.cpp" line="111"/>
         <source>Settings updated successfully, Reconnnection...</source>
-        <translation type="unfinished"></translation>
+        <translation>Настройки успешно обновлены. Подключение...</translation>
     </message>
     <message>
         <location filename="../ui/controllers/connectionController.cpp" line="75"/>
         <source>Reconnection...</source>
-        <translation type="unfinished"></translation>
+        <translation>Переподключение...</translation>
     </message>
     <message>
         <location filename="../ui/controllers/connectionController.h" line="58"/>
@@ -57,29 +58,41 @@
         <location filename="../ui/controllers/connectionController.cpp" line="94"/>
         <location filename="../ui/controllers/connectionController.cpp" line="100"/>
         <source>Connect</source>
-        <translation type="unfinished"></translation>
+        <translation>Подключиться</translation>
     </message>
     <message>
         <location filename="../ui/controllers/connectionController.cpp" line="85"/>
         <source>Disconnection...</source>
-        <translation type="unfinished"></translation>
+        <translation>Отключение...</translation>
     </message>
 </context>
 <context>
     <name>ConnectionTypeSelectionDrawer</name>
     <message>
-        <location filename="../ui/qml/Components/ConnectionTypeSelectionDrawer.qml" line="31"/>
         <source>Connection data</source>
+        <translation type="vanished">Данные для подлкючения</translation>
+    </message>
+    <message>
+        <source>Server IP, login and password</source>
+        <translation type="vanished">IP сервера, логин и пароль</translation>
+    </message>
+    <message>
+        <source>QR code, key or configuration file</source>
+        <translation type="vanished">QR-код, ключ, файл настроек или бекап</translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Components/ConnectionTypeSelectionDrawer.qml" line="31"/>
+        <source>Add new connection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../ui/qml/Components/ConnectionTypeSelectionDrawer.qml" line="40"/>
-        <source>Server IP, login and password</source>
+        <source>Configure your server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../ui/qml/Components/ConnectionTypeSelectionDrawer.qml" line="54"/>
-        <source>QR code, key or configuration file</source>
+        <source>Open QR code, key or config file</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -88,22 +101,22 @@
     <message>
         <location filename="../ui/qml/Controls2/ContextMenuType.qml" line="9"/>
         <source>C&amp;ut</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Вырезать</translation>
     </message>
     <message>
         <location filename="../ui/qml/Controls2/ContextMenuType.qml" line="15"/>
         <source>&amp;Copy</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Копировать</translation>
     </message>
     <message>
         <location filename="../ui/qml/Controls2/ContextMenuType.qml" line="21"/>
         <source>&amp;Paste</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Вставить</translation>
     </message>
     <message>
         <location filename="../ui/qml/Controls2/ContextMenuType.qml" line="28"/>
         <source>&amp;SelectAll</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;ВыбратьВсе</translation>
     </message>
 </context>
 <context>
@@ -111,7 +124,7 @@
     <message>
         <location filename="../ui/controllers/exportController.cpp" line="34"/>
         <source>Access error!</source>
-        <translation type="unfinished"></translation>
+        <translation>Ошибка доступа!</translation>
     </message>
 </context>
 <context>
@@ -119,12 +132,12 @@
     <message>
         <location filename="../ui/qml/Components/HomeContainersListView.qml" line="58"/>
         <source>The selected protocol is not supported on the current platform</source>
-        <translation type="unfinished"></translation>
+        <translation>Выбранный протокол не поддерживается на данном устройстве</translation>
     </message>
     <message>
         <location filename="../ui/qml/Components/HomeContainersListView.qml" line="76"/>
         <source>Reconnect via VPN Procotol: </source>
-        <translation type="unfinished"></translation>
+        <translation>Переподключение через VPN протокол: </translation>
     </message>
 </context>
 <context>
@@ -132,7 +145,7 @@
     <message>
         <location filename="../ui/controllers/importController.cpp" line="429"/>
         <source>Scanned %1 of %2.</source>
-        <translation type="unfinished"></translation>
+        <translation>Отсканировано %1 из%2.</translation>
     </message>
 </context>
 <context>
@@ -141,55 +154,57 @@
         <location filename="../ui/controllers/installController.cpp" line="110"/>
         <location filename="../ui/controllers/installController.cpp" line="161"/>
         <source>%1 installed successfully. </source>
-        <translation type="unfinished"></translation>
+        <translation>%1 успешно установлен. </translation>
     </message>
     <message>
         <location filename="../ui/controllers/installController.cpp" line="112"/>
         <location filename="../ui/controllers/installController.cpp" line="163"/>
         <source>%1 is already installed on the server. </source>
-        <translation type="unfinished"></translation>
+        <translation>%1 уже установлен на сервер. </translation>
     </message>
     <message>
         <location filename="../ui/controllers/installController.cpp" line="115"/>
         <source>
 Added containers that were already installed on the server</source>
-        <translation type="unfinished"></translation>
+        <translation>
+В приложение добавлены обнаруженные на сервере протоклы и сервисы</translation>
     </message>
     <message>
         <location filename="../ui/controllers/installController.cpp" line="182"/>
         <source>
 Already installed containers were found on the server. All installed containers have been added to the application</source>
-        <translation type="unfinished"></translation>
+        <translation>
+На сервере обнаружены установленные протоколы и сервисы, все они добавлены в приложение</translation>
     </message>
     <message>
         <location filename="../ui/controllers/installController.cpp" line="264"/>
         <source>Settings updated successfully</source>
-        <translation type="unfinished"></translation>
+        <translation>Настройки успешно обновлены</translation>
     </message>
     <message>
         <location filename="../ui/controllers/installController.cpp" line="279"/>
         <source>Server &apos;%1&apos; was removed</source>
-        <translation type="unfinished"></translation>
+        <translation>Сервер &apos;%1&apos; был удален</translation>
     </message>
     <message>
         <location filename="../ui/controllers/installController.cpp" line="289"/>
         <source>All containers from server &apos;%1&apos; have been removed</source>
-        <translation type="unfinished"></translation>
+        <translation>Все протоклы и сервисы были удалены с сервера &apos;%1&apos;</translation>
     </message>
     <message>
         <location filename="../ui/controllers/installController.cpp" line="306"/>
         <source>%1 has been removed from the server &apos;%2&apos;</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 был удален с сервера &apos;%2&apos;</translation>
     </message>
     <message>
         <location filename="../ui/controllers/installController.cpp" line="452"/>
         <source>Please login as the user</source>
-        <translation type="unfinished"></translation>
+        <translation>Пожалуйста, войдите в систему от имени пользователя</translation>
     </message>
     <message>
         <location filename="../ui/controllers/installController.cpp" line="479"/>
         <source>Server added successfully</source>
-        <translation type="unfinished"></translation>
+        <translation>Сервер успешно добавлен</translation>
     </message>
 </context>
 <context>
@@ -197,17 +212,17 @@ Already installed containers were found on the server. All installed containers
     <message>
         <location filename="../3rd/qtkeychain/TestAppExample/keychainclass.cpp" line="22"/>
         <source>Read key failed: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Не удалось считать ключ: %1</translation>
     </message>
     <message>
         <location filename="../3rd/qtkeychain/TestAppExample/keychainclass.cpp" line="37"/>
         <source>Write key failed: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Не удалось записать ключ: %1</translation>
     </message>
     <message>
         <location filename="../3rd/qtkeychain/TestAppExample/keychainclass.cpp" line="54"/>
         <source>Delete key failed: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Не удалось удалить ключ: %1</translation>
     </message>
 </context>
 <context>
@@ -216,27 +231,27 @@ Already installed containers were found on the server. All installed containers
         <location filename="../ui/notificationhandler.cpp" line="68"/>
         <location filename="../ui/notificationhandler.cpp" line="75"/>
         <source>AmneziaVPN</source>
-        <translation type="unfinished"></translation>
+        <translation>AmneziaVPN</translation>
     </message>
     <message>
         <location filename="../ui/notificationhandler.cpp" line="69"/>
         <source>VPN Connected</source>
-        <translation type="unfinished"></translation>
+        <translation>VPN Подключен</translation>
     </message>
     <message>
         <location filename="../ui/notificationhandler.cpp" line="76"/>
         <source>VPN Disconnected</source>
-        <translation type="unfinished"></translation>
+        <translation>VPN Выключен</translation>
     </message>
     <message>
         <location filename="../ui/notificationhandler.cpp" line="99"/>
         <source>AmneziaVPN notification</source>
-        <translation type="unfinished"></translation>
+        <translation>Уведомление AmneziaVPN</translation>
     </message>
     <message>
         <location filename="../ui/notificationhandler.cpp" line="100"/>
         <source>Unsecured network detected: </source>
-        <translation type="unfinished"></translation>
+        <translation>Обнаружена незащищенная сеть: </translation>
     </message>
 </context>
 <context>
@@ -244,12 +259,12 @@ Already installed containers were found on the server. All installed containers
     <message>
         <location filename="../ui/qml/Pages2/PageDeinstalling.qml" line="62"/>
         <source>Removing services from %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Удаление сервисов c %1</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageDeinstalling.qml" line="87"/>
         <source>Usually it takes no more than 5 minutes</source>
-        <translation type="unfinished"></translation>
+        <translation>Обычно это занимает не более 5 минут</translation>
     </message>
 </context>
 <context>
@@ -257,12 +272,12 @@ Already installed containers were found on the server. All installed containers
     <message>
         <location filename="../ui/qml/Pages2/PageHome.qml" line="344"/>
         <source>VPN protocol</source>
-        <translation type="unfinished"></translation>
+        <translation>VPN протокол</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageHome.qml" line="388"/>
         <source>Servers</source>
-        <translation type="unfinished"></translation>
+        <translation>Серверы</translation>
     </message>
 </context>
 <context>
@@ -270,87 +285,87 @@ Already installed containers were found on the server. All installed containers
     <message>
         <location filename="../ui/qml/Pages2/PageProtocolAwgSettings.qml" line="76"/>
         <source>AmneziaWG settings</source>
-        <translation type="unfinished"></translation>
+        <translation>AmneziaWG настройки</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageProtocolAwgSettings.qml" line="84"/>
         <source>Port</source>
-        <translation type="unfinished"></translation>
+        <translation>Порт</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageProtocolAwgSettings.qml" line="103"/>
         <source>Junk packet count</source>
-        <translation type="unfinished"></translation>
+        <translation>Junk packet count</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageProtocolAwgSettings.qml" line="126"/>
         <source>Junk packet minimum size</source>
-        <translation type="unfinished"></translation>
+        <translation>Junk packet minimum size</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageProtocolAwgSettings.qml" line="144"/>
         <source>Junk packet maximum size</source>
-        <translation type="unfinished"></translation>
+        <translation>Junk packet maximum size</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageProtocolAwgSettings.qml" line="162"/>
         <source>Init packet junk size</source>
-        <translation type="unfinished"></translation>
+        <translation>Init packet junk size</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageProtocolAwgSettings.qml" line="180"/>
         <source>Response packet junk size</source>
-        <translation type="unfinished"></translation>
+        <translation>Response packet junk size</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageProtocolAwgSettings.qml" line="198"/>
         <source>Init packet magic header</source>
-        <translation type="unfinished"></translation>
+        <translation>Init packet magic header</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageProtocolAwgSettings.qml" line="216"/>
         <source>Response packet magic header</source>
-        <translation type="unfinished"></translation>
+        <translation>Response packet magic header</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageProtocolAwgSettings.qml" line="234"/>
         <source>Transport packet magic header</source>
-        <translation type="unfinished"></translation>
+        <translation>Transport packet magic header</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageProtocolAwgSettings.qml" line="252"/>
         <source>Underload packet magic header</source>
-        <translation type="unfinished"></translation>
+        <translation>Underload packet magic header</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageProtocolAwgSettings.qml" line="275"/>
         <source>Remove AmneziaWG</source>
-        <translation type="unfinished"></translation>
+        <translation>Remove AmneziaWG</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageProtocolAwgSettings.qml" line="278"/>
         <source>Remove AmneziaWG from server?</source>
-        <translation type="unfinished"></translation>
+        <translation>Удалить AmneziaWG с сервера?</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageProtocolAwgSettings.qml" line="279"/>
         <source>All users who you shared a connection with will no longer be able to connect to it.</source>
-        <translation type="unfinished"></translation>
+        <translation>Все пользователи, которым вы поделились VPN с этим протоколом, больше не смогут к нему подключаться.</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageProtocolAwgSettings.qml" line="280"/>
         <source>Continue</source>
-        <translation type="unfinished">Продолжить</translation>
+        <translation>Продолжить</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageProtocolAwgSettings.qml" line="281"/>
         <source>Cancel</source>
-        <translation type="unfinished"></translation>
+        <translation>Отменить</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageProtocolAwgSettings.qml" line="311"/>
         <source>Save and Restart Amnezia</source>
-        <translation type="unfinished"></translation>
+        <translation>Сохранить и пререзагрузить Amnezia</translation>
     </message>
 </context>
 <context>
@@ -358,28 +373,28 @@ Already installed containers were found on the server. All installed containers
     <message>
         <location filename="../ui/qml/Pages2/PageProtocolCloakSettings.qml" line="74"/>
         <source>Cloak settings</source>
-        <translation type="unfinished"></translation>
+        <translation>Настройки Cloak</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageProtocolCloakSettings.qml" line="81"/>
         <source>Disguised as traffic from</source>
-        <translation type="unfinished"></translation>
+        <translation>Замаскировать трафик под</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageProtocolCloakSettings.qml" line="103"/>
         <source>Port</source>
-        <translation type="unfinished"></translation>
+        <translation>Port</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageProtocolCloakSettings.qml" line="120"/>
         <location filename="../ui/qml/Pages2/PageProtocolCloakSettings.qml" line="121"/>
         <source>Cipher</source>
-        <translation type="unfinished"></translation>
+        <translation>Cipher</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageProtocolCloakSettings.qml" line="159"/>
         <source>Save and Restart Amnezia</source>
-        <translation type="unfinished"></translation>
+        <translation>Сохранить и перезагрузить Amnezia</translation>
     </message>
 </context>
 <context>
@@ -387,195 +402,195 @@ Already installed containers were found on the server. All installed containers
     <message>
         <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="76"/>
         <source>OpenVPN settings</source>
-        <translation type="unfinished"></translation>
+        <translation>Настройки OpenVPN</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="83"/>
         <source>VPN Addresses Subnet</source>
-        <translation type="unfinished"></translation>
+        <translation>VPN Адреса Подсеть</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="97"/>
         <source>Network protocol</source>
-        <translation type="unfinished"></translation>
+        <translation>Сетевой протокол</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="126"/>
         <source>Port</source>
-        <translation type="unfinished"></translation>
+        <translation>Порт</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="144"/>
         <source>Auto-negotiate encryption</source>
-        <translation type="unfinished"></translation>
+        <translation>Шифрование с автоматическим согласованием</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="161"/>
         <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="162"/>
         <source>Hash</source>
-        <translation type="unfinished"></translation>
+        <translation>Хэш</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="170"/>
         <source>SHA512</source>
-        <translation type="unfinished"></translation>
+        <translation>SHA512</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="171"/>
         <source>SHA384</source>
-        <translation type="unfinished"></translation>
+        <translation>SHA384</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="172"/>
         <source>SHA256</source>
-        <translation type="unfinished"></translation>
+        <translation>SHA256</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="173"/>
         <source>SHA3-512</source>
-        <translation type="unfinished"></translation>
+        <translation>SHA3-512</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="174"/>
         <source>SHA3-384</source>
-        <translation type="unfinished"></translation>
+        <translation>SHA3-384</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="175"/>
         <source>SHA3-256</source>
-        <translation type="unfinished"></translation>
+        <translation>SHA3-256</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="176"/>
         <source>whirlpool</source>
-        <translation type="unfinished"></translation>
+        <translation>whirlpool</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="177"/>
         <source>BLAKE2b512</source>
-        <translation type="unfinished"></translation>
+        <translation>BLAKE2b512</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="178"/>
         <source>BLAKE2s256</source>
-        <translation type="unfinished"></translation>
+        <translation>BLAKE2s256</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="179"/>
         <source>SHA1</source>
-        <translation type="unfinished"></translation>
+        <translation>SHA1</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="207"/>
         <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="208"/>
         <source>Cipher</source>
-        <translation type="unfinished"></translation>
+        <translation>Шифрованаие</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="216"/>
         <source>AES-256-GCM</source>
-        <translation type="unfinished"></translation>
+        <translation>AES-256-GCM</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="217"/>
         <source>AES-192-GCM</source>
-        <translation type="unfinished"></translation>
+        <translation>AES-192-GCM</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="218"/>
         <source>AES-128-GCM</source>
-        <translation type="unfinished"></translation>
+        <translation>AES-128-GCM</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="219"/>
         <source>AES-256-CBC</source>
-        <translation type="unfinished"></translation>
+        <translation>AES-256-CBC</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="220"/>
         <source>AES-192-CBC</source>
-        <translation type="unfinished"></translation>
+        <translation>AES-192-CBC</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="221"/>
         <source>AES-128-CBC</source>
-        <translation type="unfinished"></translation>
+        <translation>AES-128-CBC</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="222"/>
         <source>ChaCha20-Poly1305</source>
-        <translation type="unfinished"></translation>
+        <translation>ChaCha20-Poly1305</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="223"/>
         <source>ARIA-256-CBC</source>
-        <translation type="unfinished"></translation>
+        <translation>ARIA-256-CBC</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="224"/>
         <source>CAMELLIA-256-CBC</source>
-        <translation type="unfinished"></translation>
+        <translation>CAMELLIA-256-CBC</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="225"/>
         <source>none</source>
-        <translation type="unfinished"></translation>
+        <translation>none</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="258"/>
         <source>TLS auth</source>
-        <translation type="unfinished"></translation>
+        <translation>TLS авторизация</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="273"/>
         <source>Block DNS requests outside of VPN</source>
-        <translation type="unfinished"></translation>
+        <translation>Блокировать DNS запросы за пределами VPN</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="292"/>
         <source>Additional client configuration commands</source>
-        <translation type="unfinished"></translation>
+        <translation>Дополнительные команды конфигурации клиента</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="308"/>
         <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="340"/>
         <source>Commands:</source>
-        <translation type="unfinished"></translation>
+        <translation>Commands:</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="324"/>
         <source>Additional server configuration commands</source>
-        <translation type="unfinished"></translation>
+        <translation>Дополнительные команды конфигурации сервера</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="359"/>
         <source>Remove OpenVPN</source>
-        <translation type="unfinished"></translation>
+        <translation>Удалить OpenVPN</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="362"/>
         <source>Remove OpenVpn from server?</source>
-        <translation type="unfinished"></translation>
+        <translation>Удалить OpenVpn с сервера?</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="363"/>
         <source>All users who you shared a connection with will no longer be able to connect to it.</source>
-        <translation type="unfinished"></translation>
+        <translation>Все пользователи, которым вы поделились VPN, больше не смогут к нему подключаться.</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="364"/>
         <source>Continue</source>
-        <translation type="unfinished">Продолжить</translation>
+        <translation>Продолжить</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="365"/>
         <source>Cancel</source>
-        <translation type="unfinished"></translation>
+        <translation>Отменить</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="384"/>
         <source>Save and Restart Amnezia</source>
-        <translation type="unfinished"></translation>
+        <translation>Сохранить и перезагрузить</translation>
     </message>
 </context>
 <context>
@@ -583,42 +598,42 @@ Already installed containers were found on the server. All installed containers
     <message>
         <location filename="../ui/qml/Pages2/PageProtocolRaw.qml" line="38"/>
         <source> settings</source>
-        <translation type="unfinished"></translation>
+        <translation> настройки</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageProtocolRaw.qml" line="78"/>
         <source>Show connection options</source>
-        <translation type="unfinished"></translation>
+        <translation>Показать параметры подключения</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageProtocolRaw.qml" line="130"/>
         <source>Connection options %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Параметры подключения %1</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageProtocolRaw.qml" line="172"/>
         <source>Remove </source>
-        <translation type="unfinished"></translation>
+        <translation>Удалить </translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageProtocolRaw.qml" line="176"/>
         <source>Remove %1 from server?</source>
-        <translation type="unfinished"></translation>
+        <translation>Удалить %1 с сервера?</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageProtocolRaw.qml" line="177"/>
         <source>All users who you shared a connection with will no longer be able to connect to it.</source>
-        <translation type="unfinished"></translation>
+        <translation>Все пользователи, которым вы поделились VPN с этим протоколом больше не смогут к нему подключаться.</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageProtocolRaw.qml" line="178"/>
         <source>Continue</source>
-        <translation type="unfinished">Продолжить</translation>
+        <translation>Продолжить</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageProtocolRaw.qml" line="179"/>
         <source>Cancel</source>
-        <translation type="unfinished"></translation>
+        <translation>Отменить</translation>
     </message>
 </context>
 <context>
@@ -626,23 +641,23 @@ Already installed containers were found on the server. All installed containers
     <message>
         <location filename="../ui/qml/Pages2/PageProtocolShadowSocksSettings.qml" line="74"/>
         <source>ShadowSocks settings</source>
-        <translation type="unfinished"></translation>
+        <translation>Настройки ShadowSocks</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageProtocolShadowSocksSettings.qml" line="81"/>
         <source>Port</source>
-        <translation type="unfinished"></translation>
+        <translation>Порт</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageProtocolShadowSocksSettings.qml" line="98"/>
         <location filename="../ui/qml/Pages2/PageProtocolShadowSocksSettings.qml" line="99"/>
         <source>Cipher</source>
-        <translation type="unfinished"></translation>
+        <translation>Шифрование</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageProtocolShadowSocksSettings.qml" line="137"/>
         <source>Save and Restart Amnezia</source>
-        <translation type="unfinished"></translation>
+        <translation>Сохранить и перезагрузить Amnezia</translation>
     </message>
 </context>
 <context>
@@ -658,32 +673,33 @@ Already installed containers were found on the server. All installed containers
         <location filename="../ui/qml/Pages2/PageServiceDnsSettings.qml" line="52"/>
         <source>A DNS service is installed on your server, and it is only accessible via VPN.
 </source>
-        <translation type="unfinished"></translation>
+        <translation>На вашем сервере устанавливается DNS-сервис, доступ к нему возможен только через VPN.
+</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageServiceDnsSettings.qml" line="53"/>
         <source>The DNS address is the same as the address of your server. You can configure DNS in the settings, under the connections tab.</source>
-        <translation type="unfinished"></translation>
+        <translation>Адрес DNS совпадает с адресом вашего сервера. Настроить DNS можно в настройках, во вкладке &quot;Соединения&quot;.</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageServiceDnsSettings.qml" line="62"/>
         <source>Remove </source>
-        <translation type="unfinished"></translation>
+        <translation>Удалить </translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageServiceDnsSettings.qml" line="66"/>
         <source>Remove %1 from server?</source>
-        <translation type="unfinished"></translation>
+        <translation>Удалить %1 с сервера?</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageServiceDnsSettings.qml" line="67"/>
         <source>Continue</source>
-        <translation type="unfinished">Продолжить</translation>
+        <translation>Продолжить</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageServiceDnsSettings.qml" line="68"/>
         <source>Cancel</source>
-        <translation type="unfinished"></translation>
+        <translation>Отменить</translation>
     </message>
 </context>
 <context>
@@ -691,17 +707,17 @@ Already installed containers were found on the server. All installed containers
     <message>
         <location filename="../ui/qml/Pages2/PageServiceSftpSettings.qml" line="22"/>
         <source>Settings updated successfully</source>
-        <translation type="unfinished"></translation>
+        <translation>Настройки успешно обновлены</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageServiceSftpSettings.qml" line="83"/>
         <source>SFTP settings</source>
-        <translation type="unfinished"></translation>
+        <translation>Настройки SFTP</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageServiceSftpSettings.qml" line="90"/>
         <source>Host</source>
-        <translation type="unfinished"></translation>
+        <translation>Хост</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageServiceSftpSettings.qml" line="100"/>
@@ -709,69 +725,69 @@ Already installed containers were found on the server. All installed containers
         <location filename="../ui/qml/Pages2/PageServiceSftpSettings.qml" line="134"/>
         <location filename="../ui/qml/Pages2/PageServiceSftpSettings.qml" line="151"/>
         <source>Copied</source>
-        <translation type="unfinished"></translation>
+        <translation>Скопировано</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageServiceSftpSettings.qml" line="107"/>
         <source>Port</source>
-        <translation type="unfinished"></translation>
+        <translation>Порт</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageServiceSftpSettings.qml" line="124"/>
         <source>Login</source>
-        <translation type="unfinished"></translation>
+        <translation>Логин</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageServiceSftpSettings.qml" line="141"/>
         <source>Password</source>
-        <translation type="unfinished"></translation>
+        <translation>Пароль</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageServiceSftpSettings.qml" line="183"/>
         <source>Mount folder on device</source>
-        <translation type="unfinished"></translation>
+        <translation>Смонтировать папку на вашем устройстве</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageServiceSftpSettings.qml" line="208"/>
         <source>In order to mount remote SFTP folder as local drive, perform following steps: &lt;br&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>Чтобы смонтировать SFTP-папку как локальный диск на вашем устройстве, выполните следующие действия</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageServiceSftpSettings.qml" line="210"/>
         <location filename="../ui/qml/Pages2/PageServiceSftpSettings.qml" line="213"/>
         <source>&lt;br&gt;1. Install the latest version of </source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;br&gt;1. Установите последнюю версию </translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageServiceSftpSettings.qml" line="211"/>
         <location filename="../ui/qml/Pages2/PageServiceSftpSettings.qml" line="214"/>
         <source>&lt;br&gt;2. Install the latest version of </source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;br&gt;2. Установите последнюю версию </translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageServiceSftpSettings.qml" line="242"/>
         <source>Detailed instructions</source>
-        <translation type="unfinished"></translation>
+        <translation>Подробные инструкции</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageServiceSftpSettings.qml" line="260"/>
         <source>Remove SFTP and all data stored there</source>
-        <translation type="unfinished"></translation>
+        <translation>Удалите SFTP-хранилище со всеми данными</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageServiceSftpSettings.qml" line="263"/>
         <source>Remove SFTP and all data stored there?</source>
-        <translation type="unfinished"></translation>
+        <translation>Удалить SFTP-хранилище и все хранящиеся на нем  данные?</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageServiceSftpSettings.qml" line="264"/>
         <source>Continue</source>
-        <translation type="unfinished">Продолжить</translation>
+        <translation>Продолжить</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageServiceSftpSettings.qml" line="265"/>
         <source>Cancel</source>
-        <translation type="unfinished"></translation>
+        <translation>Отменить</translation>
     </message>
 </context>
 <context>
@@ -779,57 +795,57 @@ Already installed containers were found on the server. All installed containers
     <message>
         <location filename="../ui/qml/Pages2/PageServiceTorWebsiteSettings.qml" line="23"/>
         <source>Settings updated successfully</source>
-        <translation type="unfinished"></translation>
+        <translation>Настройки успешно обновлены</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageServiceTorWebsiteSettings.qml" line="60"/>
         <source>Tor website settings</source>
-        <translation type="unfinished"></translation>
+        <translation>Настройки сайта в сети Тоr</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageServiceTorWebsiteSettings.qml" line="67"/>
         <source>Website address</source>
-        <translation type="unfinished"></translation>
+        <translation>Адрес сайта</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageServiceTorWebsiteSettings.qml" line="82"/>
         <source>Copied</source>
-        <translation type="unfinished"></translation>
+        <translation>Скопировано</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageServiceTorWebsiteSettings.qml" line="106"/>
         <source>Use &lt;a href=&quot;https://www.torproject.org/download/&quot; style=&quot;color: #FBB26A;&quot;&gt;Tor Browser&lt;/a&gt; to open this url.</source>
-        <translation type="unfinished"></translation>
+        <translation>Используйте &lt;a href=&quot;https://www.torproject.org/download/&quot; style=&quot;color: #FBB26A;&quot;&gt;Tor Browser&lt;/a&gt; для открытия этой ссылки.</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageServiceTorWebsiteSettings.qml" line="115"/>
         <source>After installation it takes several minutes while your onion site will become available in the Tor Network.</source>
-        <translation type="unfinished"></translation>
+        <translation>Через несколько минут после установки  ваш Onion сайт станет доступен в сети Tor.</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageServiceTorWebsiteSettings.qml" line="124"/>
         <source>When configuring WordPress set the domain as this onion address.</source>
-        <translation type="unfinished"></translation>
+        <translation>При настройке WordPress, укажите этот адрес в качестве домена.</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageServiceTorWebsiteSettings.qml" line="138"/>
         <source>Remove website</source>
-        <translation type="unfinished"></translation>
+        <translation>Удалить сайт</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageServiceTorWebsiteSettings.qml" line="141"/>
         <source>The site with all data will be removed from the tor network.</source>
-        <translation type="unfinished"></translation>
+        <translation>Сайт со всеми данными будет удален из сети tor.</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageServiceTorWebsiteSettings.qml" line="142"/>
         <source>Continue</source>
-        <translation type="unfinished">Продолжить</translation>
+        <translation>Продолжить</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageServiceTorWebsiteSettings.qml" line="143"/>
         <source>Cancel</source>
-        <translation type="unfinished"></translation>
+        <translation>Отменить</translation>
     </message>
 </context>
 <context>
@@ -837,37 +853,37 @@ Already installed containers were found on the server. All installed containers
     <message>
         <location filename="../ui/qml/Pages2/PageSettings.qml" line="37"/>
         <source>Settings</source>
-        <translation type="unfinished"></translation>
+        <translation>Настройки</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettings.qml" line="44"/>
         <source>Servers</source>
-        <translation type="unfinished"></translation>
+        <translation>Серверы</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettings.qml" line="58"/>
         <source>Connection</source>
-        <translation type="unfinished"></translation>
+        <translation>Соединение</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettings.qml" line="72"/>
         <source>Application</source>
-        <translation type="unfinished"></translation>
+        <translation>Приложение</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettings.qml" line="86"/>
         <source>Backup</source>
-        <translation type="unfinished"></translation>
+        <translation>Резервное копирование</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettings.qml" line="101"/>
         <source>About AmneziaVPN</source>
-        <translation type="unfinished"></translation>
+        <translation>Об AmneziaVPN</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettings.qml" line="116"/>
         <source>Close application</source>
-        <translation type="unfinished"></translation>
+        <translation>Закрыть приложение</translation>
     </message>
 </context>
 <context>
@@ -875,87 +891,87 @@ Already installed containers were found on the server. All installed containers
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsAbout.qml" line="56"/>
         <source>Support the project with a donation</source>
-        <translation type="unfinished"></translation>
+        <translation>Поддержите проект донатами</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsAbout.qml" line="71"/>
         <source>This is a free and open source application. If you like it, support the developers with a donation. </source>
-        <translation type="unfinished"></translation>
+        <translation>Это бесплатное приложение с открытым исходным кодом. Если, оно вам нравится - поддержите разработчиков пожертвованием. </translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsAbout.qml" line="72"/>
         <source>And if you don’t like the application, all the more reason to support it - the donation will be used for the improving the application.</source>
-        <translation type="unfinished"></translation>
+        <translation>А, если оно вам не нравится, тем более поддержите-пожертвование пойдет на улучшение приложения.</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsAbout.qml" line="82"/>
         <source>Card on Patreon</source>
-        <translation type="unfinished"></translation>
+        <translation>Картой на Patreon</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsAbout.qml" line="85"/>
         <source>https://www.patreon.com/amneziavpn</source>
-        <translation type="unfinished"></translation>
+        <translation>https://www.patreon.com/amneziavpn</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsAbout.qml" line="102"/>
         <source>Show other methods on Github</source>
-        <translation type="unfinished"></translation>
+        <translation>Показать другие способы на Github</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsAbout.qml" line="113"/>
         <source>Contacts</source>
-        <translation type="unfinished"></translation>
+        <translation>Контакты</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsAbout.qml" line="120"/>
         <source>Telegram group</source>
-        <translation type="unfinished"></translation>
+        <translation>Группа в Telegram</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsAbout.qml" line="121"/>
         <source>To discuss features</source>
-        <translation type="unfinished"></translation>
+        <translation>Для обсуждений</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsAbout.qml" line="125"/>
         <source>https://t.me/amnezia_vpn_en</source>
-        <translation type="unfinished"></translation>
+        <translation>https://t.me/amnezia_vpn</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsAbout.qml" line="134"/>
         <source>Mail</source>
-        <translation type="unfinished"></translation>
+        <translation>Почта</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsAbout.qml" line="135"/>
         <source>For reviews and bug reports</source>
-        <translation type="unfinished"></translation>
+        <translation>Для отзывов и сообщений об ошибках</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsAbout.qml" line="147"/>
         <source>Github</source>
-        <translation type="unfinished"></translation>
+        <translation>Github</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsAbout.qml" line="151"/>
         <source>https://github.com/amnezia-vpn/amnezia-client</source>
-        <translation type="unfinished"></translation>
+        <translation>https://github.com/amnezia-vpn/amnezia-client</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsAbout.qml" line="160"/>
         <source>Website</source>
-        <translation type="unfinished"></translation>
+        <translation>Веб-сайт</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsAbout.qml" line="164"/>
         <source>https://amnezia.org</source>
-        <translation type="unfinished"></translation>
+        <translation>https://amnezia.org</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsAbout.qml" line="192"/>
         <source>Check for updates</source>
-        <translation type="unfinished"></translation>
+        <translation>Проверить обновления</translation>
     </message>
 </context>
 <context>
@@ -963,77 +979,77 @@ Already installed containers were found on the server. All installed containers
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="43"/>
         <source>Application</source>
-        <translation type="unfinished"></translation>
+        <translation>Приложение</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="52"/>
         <source>Allow application screenshots</source>
-        <translation type="unfinished"></translation>
+        <translation>Разрешить скриншоты</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="72"/>
         <source>Auto start</source>
-        <translation type="unfinished"></translation>
+        <translation>Авто-запуск</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="73"/>
         <source>Launch the application every time %1 starts</source>
-        <translation type="unfinished"></translation>
+        <translation>Запускать приложение при каждом включении %1</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="93"/>
         <source>Start minimized</source>
-        <translation type="unfinished"></translation>
+        <translation>Запуск в свернутом виде</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="94"/>
         <source>Launch application minimized</source>
-        <translation type="unfinished"></translation>
+        <translation>Запуск приложения в свернутом виде</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="111"/>
         <source>Language</source>
-        <translation type="unfinished"></translation>
+        <translation>Язык</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="130"/>
         <source>Logging</source>
-        <translation type="unfinished"></translation>
+        <translation>Логирование</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="131"/>
         <source>Enabled</source>
-        <translation type="unfinished"></translation>
+        <translation>Включено</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="131"/>
         <source>Disabled</source>
-        <translation type="unfinished"></translation>
+        <translation>Отключено</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="144"/>
         <source>Reset settings and remove all data from the application</source>
-        <translation type="unfinished"></translation>
+        <translation>Сбросить настройки и удалить все данные из приложения</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="148"/>
         <source>Reset settings and remove all data from the application?</source>
-        <translation type="unfinished"></translation>
+        <translation>Сбросить настройки и удалить все данные из приложения?</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="149"/>
         <source>All settings will be reset to default. All installed AmneziaVPN services will still remain on the server.</source>
-        <translation type="unfinished"></translation>
+        <translation>Все данные из приложения будут удалены Все установленные сервисы AmneziaVPN останутся на сервере.</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="150"/>
         <source>Continue</source>
-        <translation type="unfinished">Продолжить</translation>
+        <translation>Продолжить</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="151"/>
         <source>Cancel</source>
-        <translation type="unfinished"></translation>
+        <translation>Отменить</translation>
     </message>
 </context>
 <context>
@@ -1041,68 +1057,68 @@ Already installed containers were found on the server. All installed containers
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsBackup.qml" line="66"/>
         <source>Backup</source>
-        <translation type="unfinished"></translation>
+        <translation>Резервное копирование</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsBackup.qml" line="27"/>
         <source>Settings restored from backup file</source>
-        <translation type="unfinished"></translation>
+        <translation>Восстановление настроек из бэкап файла</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsBackup.qml" line="73"/>
         <source>Configuration backup</source>
-        <translation type="unfinished"></translation>
+        <translation>Бэкап конфигурация</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsBackup.qml" line="80"/>
         <source>You can save your settings to a backup file to restore them the next time you install the application.</source>
-        <translation type="unfinished"></translation>
+        <translation>Поможет мгновенно восстановить настройки соединений при следующей установке.</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsBackup.qml" line="89"/>
         <source>Make a backup</source>
-        <translation type="unfinished"></translation>
+        <translation>Сделать бэкап</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsBackup.qml" line="96"/>
         <source>Save backup file</source>
-        <translation type="unfinished"></translation>
+        <translation>Сохранить бэкап файл</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsBackup.qml" line="97"/>
         <location filename="../ui/qml/Pages2/PageSettingsBackup.qml" line="125"/>
         <source>Backup files (*.backup)</source>
-        <translation type="unfinished"></translation>
+        <translation>Файлы резервного копирования (*.backup)</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsBackup.qml" line="121"/>
         <source>Restore from backup</source>
-        <translation type="unfinished"></translation>
+        <translation>Восстановить из бэкапа</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsBackup.qml" line="124"/>
         <source>Open backup file</source>
-        <translation type="unfinished"></translation>
+        <translation>Открыть бэкап файл</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsBackup.qml" line="135"/>
         <source>Import settings from a backup file?</source>
-        <translation type="unfinished"></translation>
+        <translation>Импортировать настройки из бэкап файла?</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsBackup.qml" line="136"/>
         <source>All current settings will be reset</source>
-        <translation type="unfinished"></translation>
+        <translation>Все текущие настройки будут сброшены</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsBackup.qml" line="137"/>
         <source>Continue</source>
-        <translation type="unfinished">Продолжить</translation>
+        <translation>Продолжить</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsBackup.qml" line="138"/>
         <source>Cancel</source>
-        <translation type="unfinished"></translation>
+        <translation>Отменить</translation>
     </message>
 </context>
 <context>
@@ -1110,57 +1126,57 @@ Already installed containers were found on the server. All installed containers
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsConnection.qml" line="41"/>
         <source>Connection</source>
-        <translation type="unfinished"></translation>
+        <translation>Подключение</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsConnection.qml" line="50"/>
         <source>Auto connect</source>
-        <translation type="unfinished"></translation>
+        <translation>Автоподключение</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsConnection.qml" line="51"/>
         <source>Connect to VPN on app start</source>
-        <translation type="unfinished"></translation>
+        <translation>Подключение к VPN при запуске приложения</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsConnection.qml" line="69"/>
         <source>Use AmneziaDNS</source>
-        <translation type="unfinished"></translation>
+        <translation>Использовать Amnezia DNS</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsConnection.qml" line="70"/>
         <source>If AmneziaDNS is installed on the server</source>
-        <translation type="unfinished"></translation>
+        <translation>Если он уставновлен на сервере</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsConnection.qml" line="85"/>
         <source>DNS servers</source>
-        <translation type="unfinished"></translation>
+        <translation>DNS сервер</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsConnection.qml" line="86"/>
         <source>If AmneziaDNS is not used or installed</source>
-        <translation type="unfinished"></translation>
+        <translation>Эти серверы будут использоваться, если не включен AmneziaDNS</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsConnection.qml" line="99"/>
         <source>Site-based split tunneling</source>
-        <translation type="unfinished"></translation>
+        <translation>Раздельное туннелирование сайтов</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsConnection.qml" line="100"/>
         <source>Allows you to select which sites you want to access through the VPN</source>
-        <translation type="unfinished"></translation>
+        <translation>Позволяет подключаться к одним сайтам через VPN, а к другим в обход него</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsConnection.qml" line="114"/>
         <source>App-based split tunneling</source>
-        <translation type="unfinished"></translation>
+        <translation>Раздельное VPN-туннелирование приложений</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsConnection.qml" line="115"/>
         <source>Allows you to use the VPN only for certain applications</source>
-        <translation type="unfinished"></translation>
+        <translation>Позволяет использовать VPN только для определённых приложений</translation>
     </message>
 </context>
 <context>
@@ -1168,57 +1184,57 @@ Already installed containers were found on the server. All installed containers
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsDns.qml" line="45"/>
         <source>DNS servers</source>
-        <translation type="unfinished"></translation>
+        <translation>DNS сервер</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsDns.qml" line="49"/>
         <source>If AmneziaDNS is not used or installed</source>
-        <translation type="unfinished"></translation>
+        <translation>Эти адреса будут использоваться, если не включен или не установлен AmneziaDNS</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsDns.qml" line="56"/>
         <source>Primary DNS</source>
-        <translation type="unfinished"></translation>
+        <translation>Первичный DNS</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsDns.qml" line="68"/>
         <source>Secondary DNS</source>
-        <translation type="unfinished"></translation>
+        <translation>Вторичный DNS</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsDns.qml" line="86"/>
         <source>Restore default</source>
-        <translation type="unfinished"></translation>
+        <translation>Восстановить по умолчанию</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsDns.qml" line="89"/>
         <source>Restore default DNS settings?</source>
-        <translation type="unfinished"></translation>
+        <translation>Восстановить настройки DNS по умолчанию?</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsDns.qml" line="90"/>
         <source>Continue</source>
-        <translation type="unfinished">Продолжить</translation>
+        <translation>Продолжить</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsDns.qml" line="91"/>
         <source>Cancel</source>
-        <translation type="unfinished"></translation>
+        <translation>Отменить</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsDns.qml" line="99"/>
         <source>Settings have been reset</source>
-        <translation type="unfinished"></translation>
+        <translation>Настройки сброшены</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsDns.qml" line="111"/>
         <source>Save</source>
-        <translation type="unfinished"></translation>
+        <translation>Сохранить</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsDns.qml" line="120"/>
         <source>Settings saved</source>
-        <translation type="unfinished"></translation>
+        <translation>Сохранить настройки</translation>
     </message>
 </context>
 <context>
@@ -1226,57 +1242,57 @@ Already installed containers were found on the server. All installed containers
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsLogging.qml" line="47"/>
         <source>Logging</source>
-        <translation type="unfinished"></translation>
+        <translation>Логирование</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsLogging.qml" line="54"/>
         <source>Save logs</source>
-        <translation type="unfinished"></translation>
+        <translation>Сохранить логи</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsLogging.qml" line="86"/>
         <source>Open folder with logs</source>
-        <translation type="unfinished"></translation>
+        <translation>Открыть папку с логами</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsLogging.qml" line="108"/>
         <source>Save</source>
-        <translation type="unfinished"></translation>
+        <translation>Сохранить</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsLogging.qml" line="109"/>
         <source>Logs files (*.log)</source>
-        <translation type="unfinished"></translation>
+        <translation>Logs files (*.log)</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsLogging.qml" line="126"/>
         <source>Save logs to file</source>
-        <translation type="unfinished"></translation>
+        <translation>Сохранить логи в файл</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsLogging.qml" line="144"/>
         <source>Clear logs?</source>
-        <translation type="unfinished"></translation>
+        <translation>Очистить логи?</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsLogging.qml" line="145"/>
         <source>Continue</source>
-        <translation type="unfinished">Продолжить</translation>
+        <translation>Продолжить</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsLogging.qml" line="146"/>
         <source>Cancel</source>
-        <translation type="unfinished"></translation>
+        <translation>Отменить</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsLogging.qml" line="153"/>
         <source>Logs have been cleaned up</source>
-        <translation type="unfinished"></translation>
+        <translation>Логи удалены</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsLogging.qml" line="166"/>
         <source>Clear logs</source>
-        <translation type="unfinished"></translation>
+        <translation>Удалить логи</translation>
     </message>
 </context>
 <context>
@@ -1284,27 +1300,27 @@ Already installed containers were found on the server. All installed containers
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsServerData.qml" line="23"/>
         <source>All installed containers have been added to the application</source>
-        <translation type="unfinished"></translation>
+        <translation>Все установленные протоколы и сервисы были добавлены в приложение</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsServerData.qml" line="87"/>
         <source>Clear Amnezia cache</source>
-        <translation type="unfinished"></translation>
+        <translation>Очистить кэш Amnezia на сервере</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsServerData.qml" line="88"/>
         <source>May be needed when changing other settings</source>
-        <translation type="unfinished"></translation>
+        <translation>Может понадобиться при изменении других настроек</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsServerData.qml" line="91"/>
         <source>Clear cached profiles?</source>
-        <translation>Очистить закешированные профили</translation>
+        <translation>Удалить кэш Amnezia с сервера?</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsServerData.qml" line="25"/>
         <source>No new installed containers found</source>
-        <translation type="unfinished"></translation>
+        <translation>Новые установленные протоколы и сервисы не обнаружены</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsServerData.qml" line="92"/>
@@ -1323,47 +1339,47 @@ Already installed containers were found on the server. All installed containers
         <location filename="../ui/qml/Pages2/PageSettingsServerData.qml" line="141"/>
         <location filename="../ui/qml/Pages2/PageSettingsServerData.qml" line="172"/>
         <source>Cancel</source>
-        <translation type="unfinished"></translation>
+        <translation>Отменить</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsServerData.qml" line="117"/>
         <source>Check the server for previously installed Amnezia services</source>
-        <translation type="unfinished"></translation>
+        <translation>Проверка сервера на наличие ранее установленных сервисов Amnezia</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsServerData.qml" line="118"/>
         <source>Add them to the application if they were not displayed</source>
-        <translation type="unfinished"></translation>
+        <translation>Добавить их в приложение, если они не были отображены</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsServerData.qml" line="134"/>
         <source>Remove server from application</source>
-        <translation type="unfinished"></translation>
+        <translation>Удалить сервер из приложения</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsServerData.qml" line="138"/>
         <source>Remove server?</source>
-        <translation type="unfinished"></translation>
+        <translation>Удалить сервер?</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsServerData.qml" line="139"/>
         <source>All installed AmneziaVPN services will still remain on the server.</source>
-        <translation type="unfinished"></translation>
+        <translation>Все установленные сервисы и протоколы Amnezia всё ещё останутся на сервере.</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsServerData.qml" line="165"/>
         <source>Clear server from Amnezia software</source>
-        <translation type="unfinished"></translation>
+        <translation>Очистка сервера от протоколов и сервисов Amnezia</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsServerData.qml" line="169"/>
         <source>Clear server from Amnezia software?</source>
-        <translation type="unfinished"></translation>
+        <translation>Удалить все сервисы и протоколы Amnezia  с сервера?</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsServerData.qml" line="170"/>
         <source>All containers will be deleted on the server. This means that configuration files, keys and certificates will be deleted.</source>
-        <translation type="unfinished"></translation>
+        <translation>На сервере будут удалены все, что связанно с Amnezia: протоколы сервисы конфигурационные файлы, ключи и сертификаты.</translation>
     </message>
 </context>
 <context>
@@ -1371,27 +1387,27 @@ Already installed containers were found on the server. All installed containers
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsServerInfo.qml" line="102"/>
         <source>Server name</source>
-        <translation type="unfinished"></translation>
+        <translation>Имя сервера</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsServerInfo.qml" line="110"/>
         <source>Save</source>
-        <translation type="unfinished"></translation>
+        <translation>Сохранить</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsServerInfo.qml" line="137"/>
         <source>Protocols</source>
-        <translation type="unfinished"></translation>
+        <translation>Протоколы</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsServerInfo.qml" line="143"/>
         <source>Services</source>
-        <translation type="unfinished"></translation>
+        <translation>Сервисы</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsServerInfo.qml" line="147"/>
         <source>Data</source>
-        <translation type="unfinished"></translation>
+        <translation>Данные</translation>
     </message>
 </context>
 <context>
@@ -1399,32 +1415,32 @@ Already installed containers were found on the server. All installed containers
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsServerProtocol.qml" line="38"/>
         <source> settings</source>
-        <translation type="unfinished"></translation>
+        <translation> настройки</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsServerProtocol.qml" line="112"/>
         <source>Remove </source>
-        <translation type="unfinished"></translation>
+        <translation>Удалить </translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsServerProtocol.qml" line="116"/>
         <source>Remove %1 from server?</source>
-        <translation type="unfinished"></translation>
+        <translation>Удалить %1 с сервера?</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsServerProtocol.qml" line="117"/>
         <source>All users who you shared a connection with will no longer be able to connect to it.</source>
-        <translation type="unfinished"></translation>
+        <translation>Все пользователи, которым вы поделились VPN, больше не смогут к нему подключаться.</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsServerProtocol.qml" line="118"/>
         <source>Continue</source>
-        <translation type="unfinished">Продолжить</translation>
+        <translation>Продолжить</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsServerProtocol.qml" line="119"/>
         <source>Cancel</source>
-        <translation type="unfinished"></translation>
+        <translation>Отменить</translation>
     </message>
 </context>
 <context>
@@ -1432,7 +1448,7 @@ Already installed containers were found on the server. All installed containers
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsServersList.qml" line="37"/>
         <source>Servers</source>
-        <translation type="unfinished"></translation>
+        <translation>Серверы</translation>
     </message>
 </context>
 <context>
@@ -1440,90 +1456,90 @@ Already installed containers were found on the server. All installed containers
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="49"/>
         <source>Addresses from the list should be accessed via VPN</source>
-        <translation type="unfinished"></translation>
+        <translation>Только адреса из списка должны открываться через VPN</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="54"/>
         <source>Addresses from the list should not be accessed via VPN</source>
-        <translation type="unfinished"></translation>
+        <translation>Адреса из списка не должны открываться через VPN</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="84"/>
         <source>Split tunneling</source>
-        <translation type="unfinished"></translation>
+        <translation>Раздельно VPN-туннелирование</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="120"/>
         <source>Mode</source>
-        <translation type="unfinished"></translation>
+        <translation>Режим</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="198"/>
         <source>Remove </source>
-        <translation type="unfinished"></translation>
+        <translation>Удалить </translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="199"/>
         <source>Continue</source>
-        <translation type="unfinished">Продолжить</translation>
+        <translation>Продолжить</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="200"/>
         <source>Cancel</source>
-        <translation type="unfinished"></translation>
+        <translation>Отменить</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="238"/>
         <source>Site or IP</source>
-        <translation type="unfinished"></translation>
+        <translation>Сайт или IP</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="282"/>
         <source>Import/Export Sites</source>
-        <translation type="unfinished"></translation>
+        <translation>Импорт/экспорт Сайтов</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="288"/>
         <source>Import</source>
-        <translation type="unfinished"></translation>
+        <translation>Импорт</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="300"/>
         <source>Save site list</source>
-        <translation type="unfinished"></translation>
+        <translation>Сохранить список сайтов</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="307"/>
         <source>Save sites</source>
-        <translation type="unfinished"></translation>
+        <translation>Сохранить</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="308"/>
         <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="375"/>
         <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="390"/>
         <source>Sites files (*.json)</source>
-        <translation type="unfinished"></translation>
+        <translation>Sites files (*.json)</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="365"/>
         <source>Import a list of sites</source>
-        <translation type="unfinished"></translation>
+        <translation>Импортировать список с сайтами</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="371"/>
         <source>Replace site list</source>
-        <translation type="unfinished"></translation>
+        <translation>Заменить список сайтов</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="374"/>
         <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="389"/>
         <source>Open sites file</source>
-        <translation type="unfinished"></translation>
+        <translation>Открыть список с сайтами</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="386"/>
         <source>Add imported sites to existing ones</source>
-        <translation type="unfinished"></translation>
+        <translation>Добавление импортированных сайтов к существующим</translation>
     </message>
 </context>
 <context>
@@ -1531,44 +1547,46 @@ Already installed containers were found on the server. All installed containers
     <message>
         <location filename="../ui/qml/Pages2/PageSetupWizardConfigSource.qml" line="50"/>
         <source>Server connection</source>
-        <translation type="unfinished"></translation>
+        <translation>Подключение к серверу</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSetupWizardConfigSource.qml" line="51"/>
         <source>Do not use connection code from public sources. It may have been created to intercept your data.
 
 It&apos;s okay as long as it&apos;s from someone you trust.</source>
-        <translation type="unfinished"></translation>
+        <translation>Не используйте код подключения из публичных источников. Его могли создать, чтобы перехватывать ваши данные..
+
+Всё в порядке, если кодом поделился пользователь, которому вы доверяете.</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSetupWizardConfigSource.qml" line="61"/>
         <source>What do you have?</source>
-        <translation type="unfinished"></translation>
+        <translation>Выберете что у вас есть?</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSetupWizardConfigSource.qml" line="68"/>
         <source>File with connection settings</source>
-        <translation type="unfinished"></translation>
+        <translation>Файл с настройками подключения</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSetupWizardConfigSource.qml" line="68"/>
         <source>File with connection settings or backup</source>
-        <translation type="unfinished"></translation>
+        <translation>Файл с настройками подключения или бэкап</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSetupWizardConfigSource.qml" line="75"/>
         <source>Open config file</source>
-        <translation type="unfinished"></translation>
+        <translation>Открыть файл с конфигурацией</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSetupWizardConfigSource.qml" line="95"/>
         <source>QR-code</source>
-        <translation type="unfinished"></translation>
+        <translation>QR-код</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSetupWizardConfigSource.qml" line="114"/>
         <source>Key as text</source>
-        <translation type="unfinished"></translation>
+        <translation>Ключ в виде текста</translation>
     </message>
 </context>
 <context>
@@ -1576,52 +1594,52 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
     <message>
         <location filename="../ui/qml/Pages2/PageSetupWizardCredentials.qml" line="44"/>
         <source>Server connection</source>
-        <translation type="unfinished"></translation>
+        <translation>Подключение к серверу</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSetupWizardCredentials.qml" line="51"/>
         <source>Server IP address [:port]</source>
-        <translation type="unfinished"></translation>
+        <translation>Server IP address [:port]</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSetupWizardCredentials.qml" line="52"/>
         <source>255.255.255.255:88</source>
-        <translation type="unfinished"></translation>
+        <translation>255.255.255.255:88</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSetupWizardCredentials.qml" line="76"/>
         <source>Password / SSH private key</source>
-        <translation type="unfinished"></translation>
+        <translation>Password / SSH private key</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSetupWizardCredentials.qml" line="90"/>
         <source>Continue</source>
-        <translation type="unfinished">Продолжить</translation>
+        <translation>Продолжить</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSetupWizardCredentials.qml" line="120"/>
         <source>Enter the address in the format 255.255.255.255:88</source>
-        <translation type="unfinished"></translation>
+        <translation>Введите адрес в формате 255.255.255.255:88</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSetupWizardCredentials.qml" line="66"/>
         <source>Login to connect via SSH</source>
-        <translation type="unfinished"></translation>
+        <translation>Login to connect via SSH</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSetupWizardCredentials.qml" line="117"/>
         <source>Ip address cannot be empty</source>
-        <translation type="unfinished"></translation>
+        <translation>Поле Ip address не может быть пустым</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSetupWizardCredentials.qml" line="124"/>
         <source>Login cannot be empty</source>
-        <translation type="unfinished"></translation>
+        <translation>Поле Login не может быть пустым</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSetupWizardCredentials.qml" line="128"/>
         <source>Password/private key cannot be empty</source>
-        <translation type="unfinished"></translation>
+        <translation>Поле Password/private key не может быть пустым</translation>
     </message>
 </context>
 <context>
@@ -1629,27 +1647,27 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
     <message>
         <location filename="../ui/qml/Pages2/PageSetupWizardEasy.qml" line="67"/>
         <source>What is the level of internet control in your region?</source>
-        <translation type="unfinished"></translation>
+        <translation>Какой уровень контроля интеренета в вашем регионе?</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSetupWizardEasy.qml" line="137"/>
         <source>Set up a VPN yourself</source>
-        <translation type="unfinished"></translation>
+        <translation>Настроить VPN самостоятельно</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSetupWizardEasy.qml" line="138"/>
         <source>I want to choose a VPN protocol</source>
-        <translation type="unfinished"></translation>
+        <translation>Выбор VPN-протокола</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSetupWizardEasy.qml" line="157"/>
         <source>Continue</source>
-        <translation type="unfinished">Продолжить</translation>
+        <translation>Продолжить</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSetupWizardEasy.qml" line="197"/>
         <source>Set up later</source>
-        <translation type="unfinished"></translation>
+        <translation>Настроить позднее</translation>
     </message>
 </context>
 <context>
@@ -1657,33 +1675,33 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
     <message>
         <location filename="../ui/qml/Pages2/PageSetupWizardInstalling.qml" line="57"/>
         <source>The server has already been added to the application</source>
-        <translation type="unfinished"></translation>
+        <translation>Сервер уже был добавлен в приложение</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSetupWizardInstalling.qml" line="62"/>
         <source>Amnesia has detected that your server is currently </source>
-        <translation type="unfinished"></translation>
+        <translation>Amnesia обнаружила, что ваш сервер в настоящее время </translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSetupWizardInstalling.qml" line="63"/>
         <source>busy installing other software. Amnesia installation </source>
-        <translation type="unfinished"></translation>
+        <translation>занят установкой других протоколов или сервисов. Установка Amnesia </translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSetupWizardInstalling.qml" line="64"/>
         <source>will pause until the server finishes installing other software</source>
-        <translation type="unfinished"></translation>
+        <translation>будет приостановлена до тех пор, пока сервер не завершит установку</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSetupWizardInstalling.qml" line="121"/>
         <source>Installing</source>
-        <translation type="unfinished"></translation>
+        <translation>Установка</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSetupWizardInstalling.qml" line="21"/>
         <location filename="../ui/qml/Pages2/PageSetupWizardInstalling.qml" line="67"/>
         <source>Usually it takes no more than 5 minutes</source>
-        <translation type="unfinished"></translation>
+        <translation>Обычно это занимает не более 5 минут</translation>
     </message>
 </context>
 <context>
@@ -1691,32 +1709,32 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
     <message>
         <location filename="../ui/qml/Pages2/PageSetupWizardProtocolSettings.qml" line="75"/>
         <source>Installing %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Установка %1</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSetupWizardProtocolSettings.qml" line="93"/>
         <source>More detailed</source>
-        <translation type="unfinished"></translation>
+        <translation>Подробнее</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSetupWizardProtocolSettings.qml" line="183"/>
         <source>Close</source>
-        <translation type="unfinished"></translation>
+        <translation>Закрыть</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSetupWizardProtocolSettings.qml" line="198"/>
         <source>Network protocol</source>
-        <translation type="unfinished"></translation>
+        <translation>Сетевой протокол</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSetupWizardProtocolSettings.qml" line="214"/>
         <source>Port</source>
-        <translation type="unfinished"></translation>
+        <translation>Порт</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSetupWizardProtocolSettings.qml" line="230"/>
         <source>Install</source>
-        <translation type="unfinished"></translation>
+        <translation>Установка</translation>
     </message>
 </context>
 <context>
@@ -1724,12 +1742,12 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
     <message>
         <location filename="../ui/qml/Pages2/PageSetupWizardProtocols.qml" line="73"/>
         <source>VPN protocol</source>
-        <translation type="unfinished"></translation>
+        <translation>VPN протокол</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSetupWizardProtocols.qml" line="74"/>
         <source>Choose the one with the highest priority for you. Later, you can install other protocols and additional services, such as DNS proxy and SFTP.</source>
-        <translation type="unfinished"></translation>
+        <translation>Выберите протокол, который вам больше подходит . В дальнейшем можно установить другие протоколы и дополнительные сервисы, такие как DNS-прокси и SFTP.</translation>
     </message>
 </context>
 <context>
@@ -1737,7 +1755,7 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
     <message>
         <location filename="../ui/qml/Pages2/PageSetupWizardQrReader.qml" line="37"/>
         <source>Point the camera at the QR code and hold for a couple of seconds. </source>
-        <translation type="unfinished"></translation>
+        <translation>Наведите камеру на QR-код и удерживайте ее в течение нескольких секунд. </translation>
     </message>
 </context>
 <context>
@@ -1745,27 +1763,27 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
     <message>
         <location filename="../ui/qml/Pages2/PageSetupWizardStart.qml" line="54"/>
         <source>Settings restored from backup file</source>
-        <translation type="unfinished"></translation>
+        <translation>Восстановление настроек из бэкап файла</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSetupWizardStart.qml" line="105"/>
         <source>Free service for creating a personal VPN on your server.</source>
-        <translation type="unfinished"></translation>
+        <translation>Простое и бесплатное приложение для запуска self-hosted VPN с высокими требованиями к приватности.</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSetupWizardStart.qml" line="106"/>
         <source> Helps you access blocked content without revealing your privacy, even to VPN providers.</source>
-        <translation type="unfinished"></translation>
+        <translation> Помогает получить доступ к заблокированному контенту, не раскрывая вашу конфиденциальность даже провайдерам VPN.</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSetupWizardStart.qml" line="115"/>
         <source>I have the data to connect</source>
-        <translation type="unfinished"></translation>
+        <translation>У меня есть данные для подключения</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSetupWizardStart.qml" line="135"/>
         <source>I have nothing</source>
-        <translation type="unfinished"></translation>
+        <translation>У меня ничего нет</translation>
     </message>
 </context>
 <context>
@@ -1773,27 +1791,27 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
     <message>
         <location filename="../ui/qml/Pages2/PageSetupWizardTextKey.qml" line="39"/>
         <source>Connection key</source>
-        <translation type="unfinished"></translation>
+        <translation>Ключ для подключения</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSetupWizardTextKey.qml" line="40"/>
         <source>A line that starts with vpn://...</source>
-        <translation type="unfinished"></translation>
+        <translation>Строка, которая начинается с vpn://...</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSetupWizardTextKey.qml" line="51"/>
         <source>Key</source>
-        <translation type="unfinished"></translation>
+        <translation>Ключ</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSetupWizardTextKey.qml" line="53"/>
         <source>Insert</source>
-        <translation type="unfinished"></translation>
+        <translation>Вставка</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSetupWizardTextKey.qml" line="71"/>
         <source>Continue</source>
-        <translation type="unfinished">Продолжить</translation>
+        <translation>Продолжить</translation>
     </message>
 </context>
 <context>
@@ -1801,27 +1819,27 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
     <message>
         <location filename="../ui/qml/Pages2/PageSetupWizardViewConfig.qml" line="59"/>
         <source>New connection</source>
-        <translation type="unfinished"></translation>
+        <translation>Новое соединение</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSetupWizardViewConfig.qml" line="86"/>
         <source>Do not use connection code from public sources. It could be created to intercept your data.</source>
-        <translation type="unfinished"></translation>
+        <translation>Не используйте код подключения из публичных источников. Его могли создать, чтобы перехватывать ваши данные.</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSetupWizardViewConfig.qml" line="101"/>
         <source>Collapse content</source>
-        <translation type="unfinished"></translation>
+        <translation>Свернуть</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSetupWizardViewConfig.qml" line="101"/>
         <source>Show content</source>
-        <translation type="unfinished"></translation>
+        <translation>Показать содержимое ключа</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSetupWizardViewConfig.qml" line="144"/>
         <source>Connect</source>
-        <translation type="unfinished"></translation>
+        <translation>Подключиться</translation>
     </message>
 </context>
 <context>
@@ -1829,95 +1847,95 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
     <message>
         <location filename="../ui/qml/Pages2/PageShare.qml" line="91"/>
         <source>OpenVpn native format</source>
-        <translation type="unfinished"></translation>
+        <translation>OpenVpn нативный формат</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageShare.qml" line="96"/>
         <source>WireGuard native format</source>
-        <translation type="unfinished"></translation>
+        <translation>WireGuard нативный формат</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageShare.qml" line="121"/>
         <source>VPN Access</source>
-        <translation type="unfinished"></translation>
+        <translation>VPN-Доступ</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageShare.qml" line="146"/>
         <source>Connection</source>
-        <translation type="unfinished"></translation>
+        <translation>Соединение</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageShare.qml" line="174"/>
         <source>VPN access without the ability to manage the server</source>
-        <translation type="unfinished"></translation>
+        <translation>Доступ к VPN, без возможности управления сервером</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageShare.qml" line="190"/>
         <location filename="../ui/qml/Pages2/PageShare.qml" line="191"/>
         <source>Server</source>
-        <translation type="unfinished"></translation>
+        <translation>Сервер</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageShare.qml" line="221"/>
         <source>Accessing </source>
-        <translation type="unfinished"></translation>
+        <translation>Доступ </translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageShare.qml" line="222"/>
         <source>File with accessing settings to </source>
-        <translation type="unfinished"></translation>
+        <translation>Файл с настройками доступа к </translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageShare.qml" line="309"/>
         <source>Connection to </source>
-        <translation type="unfinished"></translation>
+        <translation>Подключение к </translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageShare.qml" line="310"/>
         <source>File with connection settings to </source>
-        <translation type="unfinished"></translation>
+        <translation>Файл с настройками доступа к </translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageShare.qml" line="48"/>
         <source>Save OpenVPN config</source>
-        <translation type="unfinished"></translation>
+        <translation>Сохранить OpenVPN config</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageShare.qml" line="55"/>
         <source>Save WireGuard config</source>
-        <translation type="unfinished"></translation>
+        <translation>Сохранить WireGuard config</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageShare.qml" line="86"/>
         <source>For the AmneziaVPN app</source>
-        <translation type="unfinished"></translation>
+        <translation>Для AmneziaVPN</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageShare.qml" line="158"/>
         <source>Full access</source>
-        <translation type="unfinished"></translation>
+        <translation>Полный доступ</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageShare.qml" line="175"/>
         <source>Access to server management. The user with whom you share full access to the connection will be able to add and remove your protocols and services to the servers, as well as change settings.</source>
-        <translation type="unfinished"></translation>
+        <translation>Доступ к управлению серверами. Пользователь, с которым вы поделились полным доступ к VPN, сможет добавлять и удалять ваши протоколы и сервисы на сервере, а также менять настройки.</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageShare.qml" line="251"/>
         <location filename="../ui/qml/Pages2/PageShare.qml" line="252"/>
         <source>Protocol</source>
-        <translation type="unfinished"></translation>
+        <translation>Протокол</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageShare.qml" line="343"/>
         <location filename="../ui/qml/Pages2/PageShare.qml" line="344"/>
         <source>Connection format</source>
-        <translation type="unfinished"></translation>
+        <translation>Формат подключения</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageShare.qml" line="382"/>
         <source>Share</source>
-        <translation type="unfinished"></translation>
+        <translation>Поделиться</translation>
     </message>
 </context>
 <context>
@@ -1925,7 +1943,7 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
     <message>
         <location filename="../ui/qml/Controls2/PopupType.qml" line="68"/>
         <source>Close</source>
-        <translation type="unfinished"></translation>
+        <translation>Закрыть</translation>
     </message>
 </context>
 <context>
@@ -1933,38 +1951,38 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
     <message>
         <location filename="../3rd/qtkeychain/keychain_win.cpp" line="104"/>
         <source>Password entry not found</source>
-        <translation type="unfinished"></translation>
+        <translation>Password entry not found</translation>
     </message>
     <message>
         <location filename="../3rd/qtkeychain/keychain_win.cpp" line="108"/>
         <source>Could not decrypt data</source>
-        <translation type="unfinished"></translation>
+        <translation>Could not decrypt data</translation>
     </message>
     <message>
         <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="552"/>
         <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="560"/>
         <source>Unknown error</source>
-        <translation type="unfinished"></translation>
+        <translation>Unknown error</translation>
     </message>
     <message>
         <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="578"/>
         <source>Could not open wallet: %1; %2</source>
-        <translation type="unfinished"></translation>
+        <translation>Could not open wallet: %1; %2</translation>
     </message>
     <message>
         <location filename="../3rd/qtkeychain/keychain_haiku.cpp" line="177"/>
         <source>Password not found</source>
-        <translation type="unfinished"></translation>
+        <translation>Password not found</translation>
     </message>
     <message>
         <location filename="../3rd/qtkeychain/keychain_android.cpp" line="173"/>
         <source>Could not open keystore</source>
-        <translation type="unfinished"></translation>
+        <translation>Could not open keystore</translation>
     </message>
     <message>
         <location filename="../3rd/qtkeychain/keychain_android.cpp" line="179"/>
         <source>Could not remove private key from keystore</source>
-        <translation type="unfinished"></translation>
+        <translation>Could not remove private key from keystore</translation>
     </message>
 </context>
 <context>
@@ -1972,12 +1990,12 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
     <message>
         <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="265"/>
         <source>Unknown error</source>
-        <translation type="unfinished"></translation>
+        <translation>Unknown error</translation>
     </message>
     <message>
         <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="509"/>
         <source>Access to keychain denied</source>
-        <translation type="unfinished"></translation>
+        <translation>Access to keychain denied</translation>
     </message>
 </context>
 <context>
@@ -1985,27 +2003,27 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
     <message>
         <location filename="../3rd/qtkeychain/plaintextstore.cpp" line="65"/>
         <source>Could not store data in settings: access error</source>
-        <translation type="unfinished"></translation>
+        <translation>Could not store data in settings: access error</translation>
     </message>
     <message>
         <location filename="../3rd/qtkeychain/plaintextstore.cpp" line="67"/>
         <source>Could not store data in settings: format error</source>
-        <translation type="unfinished"></translation>
+        <translation>Could not store data in settings: format error</translation>
     </message>
     <message>
         <location filename="../3rd/qtkeychain/plaintextstore.cpp" line="85"/>
         <source>Could not delete data from settings: access error</source>
-        <translation type="unfinished"></translation>
+        <translation>Could not delete data from settings: access error</translation>
     </message>
     <message>
         <location filename="../3rd/qtkeychain/plaintextstore.cpp" line="87"/>
         <source>Could not delete data from settings: format error</source>
-        <translation type="unfinished"></translation>
+        <translation>Could not delete data from settings: format error</translation>
     </message>
     <message>
         <location filename="../3rd/qtkeychain/plaintextstore.cpp" line="104"/>
         <source>Entry not found</source>
-        <translation type="unfinished"></translation>
+        <translation>Entry not found</translation>
     </message>
 </context>
 <context>
@@ -2013,80 +2031,80 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
     <message>
         <location filename="../3rd/qtkeychain/keychain_win.cpp" line="32"/>
         <source>Password entry not found</source>
-        <translation type="unfinished"></translation>
+        <translation>Password entry not found</translation>
     </message>
     <message>
         <location filename="../3rd/qtkeychain/keychain_win.cpp" line="36"/>
         <location filename="../3rd/qtkeychain/keychain_win.cpp" line="139"/>
         <source>Could not decrypt data</source>
-        <translation type="unfinished"></translation>
+        <translation>Could not decrypt data</translation>
     </message>
     <message>
         <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="178"/>
         <source>D-Bus is not running</source>
-        <translation type="unfinished"></translation>
+        <translation>D-Bus is not running</translation>
     </message>
     <message>
         <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="187"/>
         <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="197"/>
         <source>Unknown error</source>
-        <translation type="unfinished"></translation>
+        <translation>Unknown error</translation>
     </message>
     <message>
         <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="286"/>
         <source>No keychain service available</source>
-        <translation type="unfinished"></translation>
+        <translation>No keychain service available</translation>
     </message>
     <message>
         <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="288"/>
         <source>Could not open wallet: %1; %2</source>
-        <translation type="unfinished"></translation>
+        <translation>Could not open wallet: %1; %2</translation>
     </message>
     <message>
         <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="333"/>
         <source>Access to keychain denied</source>
-        <translation type="unfinished"></translation>
+        <translation>Access to keychain denied</translation>
     </message>
     <message>
         <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="354"/>
         <source>Could not determine data type: %1; %2</source>
-        <translation type="unfinished"></translation>
+        <translation>Could not determine data type: %1; %2</translation>
     </message>
     <message>
         <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="363"/>
         <location filename="../3rd/qtkeychain/keychain_android.cpp" line="52"/>
         <source>Entry not found</source>
-        <translation type="unfinished"></translation>
+        <translation>Entry not found</translation>
     </message>
     <message>
         <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="372"/>
         <source>Unsupported entry type &apos;Map&apos;</source>
-        <translation type="unfinished"></translation>
+        <translation>Unsupported entry type &apos;Map&apos;</translation>
     </message>
     <message>
         <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="375"/>
         <source>Unknown kwallet entry type &apos;%1&apos;</source>
-        <translation type="unfinished"></translation>
+        <translation>Unknown kwallet entry type &apos;%1&apos;</translation>
     </message>
     <message>
         <location filename="../3rd/qtkeychain/keychain_haiku.cpp" line="96"/>
         <source>Password not found</source>
-        <translation type="unfinished"></translation>
+        <translation>Password not found</translation>
     </message>
     <message>
         <location filename="../3rd/qtkeychain/keychain_android.cpp" line="60"/>
         <source>Could not open keystore</source>
-        <translation type="unfinished"></translation>
+        <translation>Could not open keystore</translation>
     </message>
     <message>
         <location filename="../3rd/qtkeychain/keychain_android.cpp" line="68"/>
         <source>Could not retrieve private key from keystore</source>
-        <translation type="unfinished"></translation>
+        <translation>Could not retrieve private key from keystore</translation>
     </message>
     <message>
         <location filename="../3rd/qtkeychain/keychain_android.cpp" line="75"/>
         <source>Could not create decryption cipher</source>
-        <translation type="unfinished"></translation>
+        <translation>Could not create decryption cipher</translation>
     </message>
 </context>
 <context>
@@ -2094,73 +2112,73 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
     <message>
         <location filename="../3rd/qtkeychain/keychain_win.cpp" line="78"/>
         <source>Credential size exceeds maximum size of %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Credential size exceeds maximum size of %1</translation>
     </message>
     <message>
         <location filename="../3rd/qtkeychain/keychain_win.cpp" line="87"/>
         <source>Credential key exceeds maximum size of %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Credential key exceeds maximum size of %1</translation>
     </message>
     <message>
         <location filename="../3rd/qtkeychain/keychain_win.cpp" line="92"/>
         <source>Writing credentials failed: Win32 error code %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Writing credentials failed: Win32 error code %1</translation>
     </message>
     <message>
         <location filename="../3rd/qtkeychain/keychain_win.cpp" line="162"/>
         <source>Encryption failed</source>
-        <translation type="unfinished"></translation>
+        <translation>Encryption failed</translation>
     </message>
     <message>
         <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="415"/>
         <source>D-Bus is not running</source>
-        <translation type="unfinished"></translation>
+        <translation>D-Bus is not running</translation>
     </message>
     <message>
         <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="425"/>
         <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="452"/>
         <source>Unknown error</source>
-        <translation type="unfinished"></translation>
+        <translation>Unknown error</translation>
     </message>
     <message>
         <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="468"/>
         <source>Could not open wallet: %1; %2</source>
-        <translation type="unfinished"></translation>
+        <translation>Could not open wallet: %1; %2</translation>
     </message>
     <message>
         <location filename="../3rd/qtkeychain/keychain_haiku.cpp" line="144"/>
         <source>Password not found</source>
-        <translation type="unfinished"></translation>
+        <translation>Password not found</translation>
     </message>
     <message>
         <location filename="../3rd/qtkeychain/keychain_android.cpp" line="95"/>
         <source>Could not open keystore</source>
-        <translation type="unfinished"></translation>
+        <translation>Could not open keystore</translation>
     </message>
     <message>
         <location filename="../3rd/qtkeychain/keychain_android.cpp" line="124"/>
         <source>Could not create private key generator</source>
-        <translation type="unfinished"></translation>
+        <translation>Could not create private key generator</translation>
     </message>
     <message>
         <location filename="../3rd/qtkeychain/keychain_android.cpp" line="131"/>
         <source>Could not generate new private key</source>
-        <translation type="unfinished"></translation>
+        <translation>Could not generate new private key</translation>
     </message>
     <message>
         <location filename="../3rd/qtkeychain/keychain_android.cpp" line="139"/>
         <source>Could not retrieve private key from keystore</source>
-        <translation type="unfinished"></translation>
+        <translation>Could not retrieve private key from keystore</translation>
     </message>
     <message>
         <location filename="../3rd/qtkeychain/keychain_android.cpp" line="147"/>
         <source>Could not create encryption cipher</source>
-        <translation type="unfinished"></translation>
+        <translation>Could not create encryption cipher</translation>
     </message>
     <message>
         <location filename="../3rd/qtkeychain/keychain_android.cpp" line="155"/>
         <source>Could not encrypt data</source>
-        <translation type="unfinished"></translation>
+        <translation>Could not encrypt data</translation>
     </message>
 </context>
 <context>
@@ -2168,374 +2186,378 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
     <message>
         <location filename="../core/errorstrings.cpp" line="9"/>
         <source>No error</source>
-        <translation type="unfinished"></translation>
+        <translation>No error</translation>
     </message>
     <message>
         <location filename="../core/errorstrings.cpp" line="10"/>
         <source>Unknown Error</source>
-        <translation type="unfinished"></translation>
+        <translation>Unknown Error</translation>
     </message>
     <message>
         <location filename="../core/errorstrings.cpp" line="11"/>
         <source>Function not implemented</source>
-        <translation type="unfinished"></translation>
+        <translation>Function not implemented</translation>
     </message>
     <message>
         <location filename="../core/errorstrings.cpp" line="14"/>
         <source>Server check failed</source>
-        <translation type="unfinished"></translation>
+        <translation>Server check failed</translation>
     </message>
     <message>
         <location filename="../core/errorstrings.cpp" line="15"/>
         <source>Server port already used. Check for another software</source>
-        <translation type="unfinished"></translation>
+        <translation>Server port already used. Check for another software</translation>
     </message>
     <message>
         <location filename="../core/errorstrings.cpp" line="16"/>
         <source>Server error: Docker container missing</source>
-        <translation type="unfinished"></translation>
+        <translation>Server error: Docker container missing</translation>
     </message>
     <message>
         <location filename="../core/errorstrings.cpp" line="17"/>
         <source>Server error: Docker failed</source>
-        <translation type="unfinished"></translation>
+        <translation>Server error: Docker failed</translation>
     </message>
     <message>
         <location filename="../core/errorstrings.cpp" line="18"/>
         <source>Installation canceled by user</source>
-        <translation type="unfinished"></translation>
+        <translation>Installation canceled by user</translation>
     </message>
     <message>
         <location filename="../core/errorstrings.cpp" line="19"/>
         <source>The user does not have permission to use sudo</source>
-        <translation type="unfinished"></translation>
+        <translation>The user does not have permission to use sudo</translation>
     </message>
     <message>
         <location filename="../core/errorstrings.cpp" line="22"/>
         <source>Ssh request was denied</source>
-        <translation type="unfinished"></translation>
+        <translation>Ssh request was denied</translation>
     </message>
     <message>
         <location filename="../core/errorstrings.cpp" line="23"/>
         <source>Ssh request was interrupted</source>
-        <translation type="unfinished"></translation>
+        <translation>Ssh request was interrupted</translation>
     </message>
     <message>
         <location filename="../core/errorstrings.cpp" line="24"/>
         <source>Ssh internal error</source>
-        <translation type="unfinished"></translation>
+        <translation>Ssh internal error</translation>
     </message>
     <message>
         <location filename="../core/errorstrings.cpp" line="25"/>
         <source>Invalid private key or invalid passphrase entered</source>
-        <translation type="unfinished"></translation>
+        <translation>Invalid private key or invalid passphrase entered</translation>
     </message>
     <message>
         <location filename="../core/errorstrings.cpp" line="26"/>
         <source>The selected private key format is not supported, use openssh ED25519 key types or PEM key types</source>
-        <translation type="unfinished"></translation>
+        <translation>The selected private key format is not supported, use openssh ED25519 key types or PEM key types</translation>
     </message>
     <message>
         <location filename="../core/errorstrings.cpp" line="27"/>
         <source>Timeout connecting to server</source>
-        <translation type="unfinished"></translation>
+        <translation>Timeout connecting to server</translation>
     </message>
     <message>
         <location filename="../core/errorstrings.cpp" line="30"/>
         <source>Sftp error: End-of-file encountered</source>
-        <translation type="unfinished"></translation>
+        <translation>Sftp error: End-of-file encountered</translation>
     </message>
     <message>
         <location filename="../core/errorstrings.cpp" line="31"/>
         <source>Sftp error: File does not exist</source>
-        <translation type="unfinished"></translation>
+        <translation>Sftp error: File does not exist</translation>
     </message>
     <message>
         <location filename="../core/errorstrings.cpp" line="32"/>
         <source>Sftp error: Permission denied</source>
-        <translation type="unfinished"></translation>
+        <translation>Sftp error: Permission denied</translation>
     </message>
     <message>
         <location filename="../core/errorstrings.cpp" line="33"/>
         <source>Sftp error: Generic failure</source>
-        <translation type="unfinished"></translation>
+        <translation>Sftp error: Generic failure</translation>
     </message>
     <message>
         <location filename="../core/errorstrings.cpp" line="34"/>
         <source>Sftp error: Garbage received from server</source>
-        <translation type="unfinished"></translation>
+        <translation>Sftp error: Garbage received from server</translation>
     </message>
     <message>
         <location filename="../core/errorstrings.cpp" line="35"/>
         <source>Sftp error: No connection has been set up</source>
-        <translation type="unfinished"></translation>
+        <translation>Sftp error: No connection has been set up</translation>
     </message>
     <message>
         <location filename="../core/errorstrings.cpp" line="36"/>
         <source>Sftp error: There was a connection, but we lost it</source>
-        <translation type="unfinished"></translation>
+        <translation>Sftp error: There was a connection, but we lost it</translation>
     </message>
     <message>
         <location filename="../core/errorstrings.cpp" line="37"/>
         <source>Sftp error: Operation not supported by libssh yet</source>
-        <translation type="unfinished"></translation>
+        <translation>Sftp error: Operation not supported by libssh yet</translation>
     </message>
     <message>
         <location filename="../core/errorstrings.cpp" line="38"/>
         <source>Sftp error: Invalid file handle</source>
-        <translation type="unfinished"></translation>
+        <translation>Sftp error: Invalid file handle</translation>
     </message>
     <message>
         <location filename="../core/errorstrings.cpp" line="39"/>
         <source>Sftp error: No such file or directory path exists</source>
-        <translation type="unfinished"></translation>
+        <translation>Sftp error: No such file or directory path exists</translation>
     </message>
     <message>
         <location filename="../core/errorstrings.cpp" line="40"/>
         <source>Sftp error: An attempt to create an already existing file or directory has been made</source>
-        <translation type="unfinished"></translation>
+        <translation>Sftp error: An attempt to create an already existing file or directory has been made</translation>
     </message>
     <message>
         <location filename="../core/errorstrings.cpp" line="41"/>
         <source>Sftp error: Write-protected filesystem</source>
-        <translation type="unfinished"></translation>
+        <translation>Sftp error: Write-protected filesystem</translation>
     </message>
     <message>
         <location filename="../core/errorstrings.cpp" line="42"/>
         <source>Sftp error: No media was in remote drive</source>
-        <translation type="unfinished"></translation>
+        <translation>Sftp error: No media was in remote drive</translation>
     </message>
     <message>
         <location filename="../core/errorstrings.cpp" line="45"/>
         <source>Failed to save config to disk</source>
-        <translation type="unfinished"></translation>
+        <translation>Failed to save config to disk</translation>
     </message>
     <message>
         <location filename="../core/errorstrings.cpp" line="46"/>
         <source>OpenVPN config missing</source>
-        <translation type="unfinished"></translation>
+        <translation>OpenVPN config missing</translation>
     </message>
     <message>
         <location filename="../core/errorstrings.cpp" line="47"/>
         <source>OpenVPN management server error</source>
-        <translation type="unfinished"></translation>
+        <translation>OpenVPN management server error</translation>
     </message>
     <message>
         <location filename="../core/errorstrings.cpp" line="50"/>
         <source>OpenVPN executable missing</source>
-        <translation type="unfinished"></translation>
+        <translation>OpenVPN executable missing</translation>
     </message>
     <message>
         <location filename="../core/errorstrings.cpp" line="51"/>
         <source>ShadowSocks (ss-local) executable missing</source>
-        <translation type="unfinished"></translation>
+        <translation>ShadowSocks (ss-local) executable missing</translation>
     </message>
     <message>
         <location filename="../core/errorstrings.cpp" line="52"/>
         <source>Cloak (ck-client) executable missing</source>
-        <translation type="unfinished"></translation>
+        <translation>Cloak (ck-client) executable missing</translation>
     </message>
     <message>
         <location filename="../core/errorstrings.cpp" line="53"/>
         <source>Amnezia helper service error</source>
-        <translation type="unfinished"></translation>
+        <translation>Amnezia helper service error</translation>
     </message>
     <message>
         <location filename="../core/errorstrings.cpp" line="54"/>
         <source>OpenSSL failed</source>
-        <translation type="unfinished"></translation>
+        <translation>OpenSSL failed</translation>
     </message>
     <message>
         <location filename="../core/errorstrings.cpp" line="57"/>
         <source>Can&apos;t connect: another VPN connection is active</source>
-        <translation type="unfinished"></translation>
+        <translation>Can&apos;t connect: another VPN connection is active</translation>
     </message>
     <message>
         <location filename="../core/errorstrings.cpp" line="58"/>
         <source>Can&apos;t setup OpenVPN TAP network adapter</source>
-        <translation type="unfinished"></translation>
+        <translation>Can&apos;t setup OpenVPN TAP network adapter</translation>
     </message>
     <message>
         <location filename="../core/errorstrings.cpp" line="59"/>
         <source>VPN pool error: no available addresses</source>
-        <translation type="unfinished"></translation>
+        <translation>VPN pool error: no available addresses</translation>
     </message>
     <message>
         <location filename="../core/errorstrings.cpp" line="61"/>
         <source>The config does not contain any containers and credentiaks for connecting to the server</source>
-        <translation type="unfinished"></translation>
+        <translation>The config does not contain any containers and credentiaks for connecting to the server</translation>
     </message>
     <message>
         <location filename="../core/errorstrings.cpp" line="65"/>
         <source>Internal error</source>
-        <translation type="unfinished"></translation>
+        <translation>Internal error</translation>
     </message>
     <message>
         <location filename="../containers/containers_defs.cpp" line="88"/>
         <source>IPsec</source>
-        <translation type="unfinished"></translation>
+        <translation>IPsec</translation>
     </message>
     <message>
         <location filename="../containers/containers_defs.cpp" line="138"/>
         <source>DNS Service</source>
-        <translation type="unfinished"></translation>
+        <translation>DNS Сервис</translation>
     </message>
     <message>
         <location filename="../containers/containers_defs.cpp" line="93"/>
         <source>Sftp file sharing service</source>
-        <translation type="unfinished"></translation>
+        <translation>Сервис обмена файлами Sftp</translation>
     </message>
     <message>
         <location filename="../containers/containers_defs.cpp" line="90"/>
         <location filename="../containers/containers_defs.cpp" line="137"/>
         <source>Website in Tor network</source>
-        <translation type="unfinished"></translation>
+        <translation>Веб-сайт в сети Tor</translation>
     </message>
     <message>
         <location filename="../containers/containers_defs.cpp" line="91"/>
         <source>Amnezia DNS</source>
-        <translation type="unfinished"></translation>
+        <translation>Amnezia DNS</translation>
     </message>
     <message>
         <location filename="../containers/containers_defs.cpp" line="99"/>
         <source>OpenVPN is the most popular VPN protocol, with flexible configuration options. It uses its own security protocol with SSL/TLS for key exchange.</source>
-        <translation type="unfinished"></translation>
+        <translation>OpenVPN - популярный VPN-протокол, с гибкой настройкой. Имеет собственный протокол безопасности с SSL/TLS для обмена ключами.</translation>
     </message>
     <message>
         <location filename="../containers/containers_defs.cpp" line="102"/>
         <source>ShadowSocks - masks VPN traffic, making it similar to normal web traffic, but is recognised by analysis systems in some highly censored regions.</source>
-        <translation type="unfinished"></translation>
+        <translation>ShadowSocks - маскирует VPN-трафик под обычный веб-трафик, но распознается системами анализа в некоторых регионах с высоким уровнем цензуры.</translation>
     </message>
     <message>
         <location filename="../containers/containers_defs.cpp" line="105"/>
         <source>OpenVPN over Cloak - OpenVPN with VPN masquerading as web traffic and protection against active-probbing detection. Ideal for bypassing blocking in regions with the highest levels of censorship.</source>
-        <translation type="unfinished"></translation>
+        <translation>OpenVPN over Cloak - OpenVPN с маскировкой VPN под web-трафик и защитой от обнаружения active-probbing. Подходит для регионов с самым высоким уровнем цензуры.</translation>
     </message>
     <message>
         <location filename="../containers/containers_defs.cpp" line="109"/>
-        <location filename="../containers/containers_defs.cpp" line="112"/>
         <source>WireGuard - New popular VPN protocol with high performance, high speed and low power consumption. Recommended for regions with low levels of censorship.</source>
+        <translation>WireGuard - Популярный VPN-протокол с высокой производительностью, высокой скоростью и низким энергопотреблением. Для регионов с низким уровнем цензуры.</translation>
+    </message>
+    <message>
+        <location filename="../containers/containers_defs.cpp" line="112"/>
+        <source>AmneziaWG - Special protocol from Amnezia, based on WireGuard. It&apos;s fast like WireGuard, but very resistant to blockages. Recommended for regions with high levels of censorship.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../containers/containers_defs.cpp" line="115"/>
         <source>IKEv2 -  Modern stable protocol, a bit faster than others, restores connection after signal loss. It has native support on the latest versions of Android and iOS.</source>
-        <translation type="unfinished"></translation>
+        <translation>IKEv2 Современный стабильный протокол, немного быстрее других восстанавливает соединение после потери сигнала. Имеет нативную поддержку последних версиий Android и iOS.</translation>
     </message>
     <message>
         <location filename="../containers/containers_defs.cpp" line="118"/>
         <source>Deploy a WordPress site on the Tor network in two clicks.</source>
-        <translation type="unfinished"></translation>
+        <translation>Разверните сайт на WordPress в сети Tor в два клика.</translation>
     </message>
     <message>
         <location filename="../containers/containers_defs.cpp" line="120"/>
         <source>Replace the current DNS server with your own. This will increase your privacy level.</source>
-        <translation type="unfinished"></translation>
+        <translation>Замените адрес DNS-сервера на собственный. Это повысит уровень конфиденциальности.</translation>
     </message>
     <message>
         <location filename="../containers/containers_defs.cpp" line="123"/>
         <source>Creates a file vault on your server to securely store and transfer files.</source>
-        <translation type="unfinished"></translation>
+        <translation>Создайте на сервере файловое хранилище для безопасного хранения и передачи файлов.</translation>
     </message>
     <message>
         <location filename="../containers/containers_defs.cpp" line="128"/>
         <source>OpenVPN container</source>
-        <translation type="unfinished"></translation>
+        <translation>OpenVPN протокол</translation>
     </message>
     <message>
         <location filename="../containers/containers_defs.cpp" line="129"/>
         <source>Container with OpenVpn and ShadowSocks</source>
-        <translation type="unfinished"></translation>
+        <translation>Связка протоколов OpenVPN и ShadowSocks</translation>
     </message>
     <message>
         <location filename="../containers/containers_defs.cpp" line="131"/>
         <source>Container with OpenVpn and ShadowSocks protocols configured with traffic masking by Cloak plugin</source>
-        <translation type="unfinished"></translation>
+        <translation>Протоколы OpenVpn и ShadowSocks, с плагином маскировки трафика Cloak</translation>
     </message>
     <message>
         <location filename="../containers/containers_defs.cpp" line="133"/>
         <source>WireGuard container</source>
-        <translation type="unfinished"></translation>
+        <translation>WireGuard протокол</translation>
     </message>
     <message>
         <location filename="../containers/containers_defs.cpp" line="134"/>
         <source>AmneziaWG container</source>
-        <translation type="unfinished"></translation>
+        <translation>AmneziaWG протокол</translation>
     </message>
     <message>
         <location filename="../containers/containers_defs.cpp" line="135"/>
         <source>IPsec container</source>
-        <translation type="unfinished"></translation>
+        <translation>IPsec протокол</translation>
     </message>
     <message>
         <location filename="../containers/containers_defs.cpp" line="140"/>
         <source>Sftp file sharing service - is secure FTP service</source>
-        <translation type="unfinished"></translation>
+        <translation>Сервис обмена файлами Sftp - безопасный FTP-сервис</translation>
     </message>
     <message>
         <location filename="../protocols/protocols_defs.cpp" line="76"/>
         <source>Sftp service</source>
-        <translation type="unfinished"></translation>
+        <translation>Сервис SFTP</translation>
     </message>
     <message>
         <location filename="../3rd/qtkeychain/libsecret.cpp" line="119"/>
         <source>Entry not found</source>
-        <translation type="unfinished"></translation>
+        <translation>Entry not found</translation>
     </message>
     <message>
         <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="225"/>
         <source>Access to keychain denied</source>
-        <translation type="unfinished"></translation>
+        <translation>Access to keychain denied</translation>
     </message>
     <message>
         <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="227"/>
         <source>No keyring daemon</source>
-        <translation type="unfinished"></translation>
+        <translation>No keyring daemon</translation>
     </message>
     <message>
         <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="229"/>
         <source>Already unlocked</source>
-        <translation type="unfinished"></translation>
+        <translation>Already unlocked</translation>
     </message>
     <message>
         <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="231"/>
         <source>No such keyring</source>
-        <translation type="unfinished"></translation>
+        <translation>No such keyring</translation>
     </message>
     <message>
         <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="233"/>
         <source>Bad arguments</source>
-        <translation type="unfinished"></translation>
+        <translation>Bad arguments</translation>
     </message>
     <message>
         <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="235"/>
         <source>I/O error</source>
-        <translation type="unfinished"></translation>
+        <translation>I/O error</translation>
     </message>
     <message>
         <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="237"/>
         <source>Cancelled</source>
-        <translation type="unfinished"></translation>
+        <translation>Cancelled</translation>
     </message>
     <message>
         <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="239"/>
         <source>Keyring already exists</source>
-        <translation type="unfinished"></translation>
+        <translation>Keyring already exists</translation>
     </message>
     <message>
         <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="241"/>
         <source>No match</source>
-        <translation type="unfinished"></translation>
+        <translation>No match</translation>
     </message>
     <message>
         <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="246"/>
         <source>Unknown error</source>
-        <translation type="unfinished"></translation>
+        <translation>Unknown error</translation>
     </message>
     <message>
         <location filename="../3rd/qtkeychain/keychain_haiku.cpp" line="72"/>
         <source>error 0x%1: %2</source>
-        <translation type="unfinished"></translation>
+        <translation>error 0x%1: %2</translation>
     </message>
 </context>
 <context>
@@ -2543,7 +2565,7 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
     <message>
         <location filename="../ui/qml/Components/SelectLanguageDrawer.qml" line="49"/>
         <source>Choose language</source>
-        <translation type="unfinished"></translation>
+        <translation>Выберете язык</translation>
     </message>
 </context>
 <context>
@@ -2551,13 +2573,13 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
     <message>
         <location filename="../settings.cpp" line="26"/>
         <source>Server #1</source>
-        <translation type="unfinished"></translation>
+        <translation>Server #1</translation>
     </message>
     <message>
         <location filename="../settings.cpp" line="202"/>
         <location filename="../settings.cpp" line="209"/>
         <source>Server</source>
-        <translation type="unfinished"></translation>
+        <translation>Server</translation>
     </message>
 </context>
 <context>
@@ -2565,22 +2587,22 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
     <message>
         <location filename="../ui/controllers/settingsController.cpp" line="25"/>
         <source>Software version</source>
-        <translation type="unfinished"></translation>
+        <translation>Версия ПО</translation>
     </message>
     <message>
         <location filename="../ui/controllers/settingsController.cpp" line="136"/>
         <source>All settings have been reset to default values</source>
-        <translation type="unfinished"></translation>
+        <translation>Все настройки были сброшены к значению &quot;По умолчанию&quot;</translation>
     </message>
     <message>
         <location filename="../ui/controllers/settingsController.cpp" line="142"/>
         <source>Cached profiles cleared</source>
-        <translation type="unfinished"></translation>
+        <translation>Кэш профиля очищен</translation>
     </message>
     <message>
         <location filename="../ui/controllers/settingsController.cpp" line="121"/>
         <source>Backup file is corrupted</source>
-        <translation type="unfinished"></translation>
+        <translation>Backup файл поврежден</translation>
     </message>
 </context>
 <context>
@@ -2589,32 +2611,32 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
         <location filename="../ui/qml/Components/ShareConnectionDrawer.qml" line="27"/>
         <location filename="../ui/qml/Components/ShareConnectionDrawer.qml" line="35"/>
         <source>Save AmneziaVPN config</source>
-        <translation type="unfinished"></translation>
+        <translation>Сохранить config AmneziaVPN</translation>
     </message>
     <message>
         <location filename="../ui/qml/Components/ShareConnectionDrawer.qml" line="71"/>
         <source>Share</source>
-        <translation type="unfinished"></translation>
+        <translation>Поделиться</translation>
     </message>
     <message>
         <location filename="../ui/qml/Components/ShareConnectionDrawer.qml" line="104"/>
         <source>Copy</source>
-        <translation type="unfinished"></translation>
+        <translation>Скопировать</translation>
     </message>
     <message>
         <location filename="../ui/qml/Components/ShareConnectionDrawer.qml" line="111"/>
         <source>Copied</source>
-        <translation type="unfinished"></translation>
+        <translation>Скопировано</translation>
     </message>
     <message>
         <location filename="../ui/qml/Components/ShareConnectionDrawer.qml" line="126"/>
         <source>Show connection settings</source>
-        <translation type="unfinished"></translation>
+        <translation>Показать настройки подключения</translation>
     </message>
     <message>
         <location filename="../ui/qml/Components/ShareConnectionDrawer.qml" line="251"/>
         <source>To read the QR code in the Amnezia app, select &quot;Add server&quot; → &quot;I have data to connect&quot; → &quot;QR code, key or settings file&quot;</source>
-        <translation type="unfinished"></translation>
+        <translation>Для считывания QR-кода в приложении Amnezia выберите &quot;Добавить сервер&quot; → &quot;У меня есть данные для подключения&quot; → &quot;QR-код, ключ или файл настроек&quot;</translation>
     </message>
 </context>
 <context>
@@ -2622,42 +2644,42 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
     <message>
         <location filename="../ui/controllers/sitesController.cpp" line="24"/>
         <source>Hostname not look like ip adress or domain name</source>
-        <translation type="unfinished"></translation>
+        <translation>Имя хоста не похоже на ip-адрес или доменное имя</translation>
     </message>
     <message>
         <location filename="../ui/controllers/sitesController.cpp" line="67"/>
         <source>New site added: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Добавлен новый сайт %1</translation>
     </message>
     <message>
         <location filename="../ui/controllers/sitesController.cpp" line="80"/>
         <source>Site removed: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Сайт удален %1</translation>
     </message>
     <message>
         <location filename="../ui/controllers/sitesController.cpp" line="88"/>
         <source>Can&apos;t open file: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Невозможно открыть файл: %1</translation>
     </message>
     <message>
         <location filename="../ui/controllers/sitesController.cpp" line="95"/>
         <source>Failed to parse JSON data from file: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Не удалось разобрать JSON-данные из файла: %1</translation>
     </message>
     <message>
         <location filename="../ui/controllers/sitesController.cpp" line="100"/>
         <source>The JSON data is not an array in file: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Данные JSON не являются массивом в файле: %1</translation>
     </message>
     <message>
         <location filename="../ui/controllers/sitesController.cpp" line="131"/>
         <source>Import completed</source>
-        <translation type="unfinished"></translation>
+        <translation>Импорт завершен</translation>
     </message>
     <message>
         <location filename="../ui/controllers/sitesController.cpp" line="150"/>
         <source>Export completed</source>
-        <translation type="unfinished"></translation>
+        <translation>Экспорт завершен</translation>
     </message>
 </context>
 <context>
@@ -2666,31 +2688,31 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
         <location filename="../ui/systemtray_notificationhandler.cpp" line="28"/>
         <location filename="../ui/systemtray_notificationhandler.cpp" line="60"/>
         <source>Show</source>
-        <translation type="unfinished"></translation>
+        <translation>Показать</translation>
     </message>
     <message>
         <location filename="../ui/systemtray_notificationhandler.cpp" line="32"/>
         <location filename="../ui/systemtray_notificationhandler.cpp" line="61"/>
         <source>Connect</source>
-        <translation type="unfinished"></translation>
+        <translation>Подключиться</translation>
     </message>
     <message>
         <location filename="../ui/systemtray_notificationhandler.cpp" line="33"/>
         <location filename="../ui/systemtray_notificationhandler.cpp" line="62"/>
         <source>Disconnect</source>
-        <translation type="unfinished"></translation>
+        <translation>Отключиться</translation>
     </message>
     <message>
         <location filename="../ui/systemtray_notificationhandler.cpp" line="37"/>
         <location filename="../ui/systemtray_notificationhandler.cpp" line="63"/>
         <source>Visit Website</source>
-        <translation type="unfinished"></translation>
+        <translation>Посетить сайт</translation>
     </message>
     <message>
         <location filename="../ui/systemtray_notificationhandler.cpp" line="41"/>
         <location filename="../ui/systemtray_notificationhandler.cpp" line="64"/>
         <source>Quit</source>
-        <translation type="unfinished"></translation>
+        <translation>Закрыть</translation>
     </message>
 </context>
 <context>
@@ -2698,7 +2720,7 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
     <message>
         <location filename="../ui/qml/Controls2/TextFieldWithHeaderType.qml" line="105"/>
         <source>The field can&apos;t be empty</source>
-        <translation type="unfinished"></translation>
+        <translation>Поле не может быть пустым</translation>
     </message>
 </context>
 <context>
@@ -2706,7 +2728,7 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
     <message>
         <location filename="../vpnconnection.cpp" line="406"/>
         <source>Mbps</source>
-        <translation type="unfinished"></translation>
+        <translation>Mbps</translation>
     </message>
 </context>
 <context>
@@ -2714,42 +2736,42 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
     <message>
         <location filename="../protocols/vpnprotocol.cpp" line="130"/>
         <source>Unknown</source>
-        <translation type="unfinished"></translation>
+        <translation>Неизвестный</translation>
     </message>
     <message>
         <location filename="../protocols/vpnprotocol.cpp" line="131"/>
         <source>Disconnected</source>
-        <translation type="unfinished"></translation>
+        <translation>Отключен</translation>
     </message>
     <message>
         <location filename="../protocols/vpnprotocol.cpp" line="132"/>
         <source>Preparing</source>
-        <translation type="unfinished"></translation>
+        <translation>Подготовка</translation>
     </message>
     <message>
         <location filename="../protocols/vpnprotocol.cpp" line="133"/>
         <source>Connecting...</source>
-        <translation type="unfinished"></translation>
+        <translation>Подключение...</translation>
     </message>
     <message>
         <location filename="../protocols/vpnprotocol.cpp" line="134"/>
         <source>Connected</source>
-        <translation type="unfinished"></translation>
+        <translation>Подключено</translation>
     </message>
     <message>
         <location filename="../protocols/vpnprotocol.cpp" line="135"/>
         <source>Disconnecting...</source>
-        <translation type="unfinished"></translation>
+        <translation>Отключение...</translation>
     </message>
     <message>
         <location filename="../protocols/vpnprotocol.cpp" line="136"/>
         <source>Reconnecting...</source>
-        <translation type="unfinished"></translation>
+        <translation>Переподключение...</translation>
     </message>
     <message>
         <location filename="../protocols/vpnprotocol.cpp" line="137"/>
         <source>Error</source>
-        <translation type="unfinished"></translation>
+        <translation>Ошибка</translation>
     </message>
 </context>
 <context>
@@ -2757,45 +2779,65 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
     <message>
         <location filename="../containers/containers_defs.cpp" line="245"/>
         <source>Low</source>
-        <translation type="unfinished"></translation>
+        <translation>Низкий</translation>
     </message>
     <message>
         <location filename="../containers/containers_defs.cpp" line="246"/>
-        <source>High</source>
+        <source>Medium or High</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../containers/containers_defs.cpp" line="247"/>
-        <source>Medium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../containers/containers_defs.cpp" line="256"/>
-        <source>Many foreign websites and VPN providers are blocked</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../containers/containers_defs.cpp" line="257"/>
-        <source>Some foreign sites are blocked, but VPN providers are not blocked</source>
+        <source>Extreme</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../containers/containers_defs.cpp" line="255"/>
-        <source>I just want to increase the level of privacy</source>
+        <source>I just want to increase the level of my privacy.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../containers/containers_defs.cpp" line="256"/>
+        <source>I want to bypass censorship. This option recommended in most cases.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../containers/containers_defs.cpp" line="257"/>
+        <source>Most VPN protocols are blocked. Recommended if other options are not working.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>High</source>
+        <translation type="vanished">Высокий</translation>
+    </message>
+    <message>
+        <source>Medium</source>
+        <translation type="vanished">Средний</translation>
+    </message>
+    <message>
+        <source>Many foreign websites and VPN providers are blocked</source>
+        <translation type="vanished">Многие иностранные сайты и VPN-провайдеры заблокированы</translation>
+    </message>
+    <message>
+        <source>Some foreign sites are blocked, but VPN providers are not blocked</source>
+        <translation type="vanished">Некоторые иностранные сайты заблокированы, но VPN-провайдеры не блокируются</translation>
+    </message>
+    <message>
+        <source>I just want to increase the level of privacy</source>
+        <translation type="vanished">Хочу просто повысить уровень приватности</translation>
+    </message>
 </context>
 <context>
     <name>main2</name>
     <message>
         <location filename="../ui/qml/main2.qml" line="172"/>
         <source>Private key passphrase</source>
-        <translation type="unfinished"></translation>
+        <translation>Кодовая фраза  для закрытого ключа</translation>
     </message>
     <message>
         <location filename="../ui/qml/main2.qml" line="191"/>
         <source>Save</source>
-        <translation type="unfinished"></translation>
+        <translation>Сохранить</translation>
     </message>
 </context>
 </TS>

From 384ce9853b92b99f060a566257f1e0b701f9272d Mon Sep 17 00:00:00 2001
From: ronoaer <ronoaer@gmail.com>
Date: Sat, 14 Oct 2023 23:00:31 +0800
Subject: [PATCH 220/278] added new drawer2type for replacing drawertype

---
 client/resources.qrc                          |   1 +
 .../ConnectionTypeSelectionDrawer.qml         |   2 +-
 client/ui/qml/Components/QuestionDrawer.qml   |   2 +-
 .../qml/Components/SelectLanguageDrawer.qml   |   2 +-
 .../qml/Components/ShareConnectionDrawer.qml  |  11 +-
 client/ui/qml/Controls2/Drawer2Type.qml       | 266 ++++++++++++++++++
 client/ui/qml/Controls2/DropDownType.qml      |   5 +-
 .../Pages2/PageProtocolOpenVpnSettings.qml    |   7 +-
 client/ui/qml/Pages2/PageProtocolRaw.qml      |  10 +-
 .../ui/qml/Pages2/PageServiceDnsSettings.qml  |   7 +-
 .../ui/qml/Pages2/PageServiceSftpSettings.qml |   7 +-
 .../Pages2/PageServiceTorWebsiteSettings.qml  |   7 +-
 .../ui/qml/Pages2/PageSettingsApplication.qml |   8 +-
 client/ui/qml/Pages2/PageSettingsBackup.qml   |   6 +-
 client/ui/qml/Pages2/PageSettingsDns.qml      |   7 +-
 client/ui/qml/Pages2/PageSettingsLogging.qml  |   7 +-
 .../ui/qml/Pages2/PageSettingsServerData.qml  |  12 +-
 .../ui/qml/Pages2/PageSettingsServerInfo.qml  |   6 +-
 .../qml/Pages2/PageSettingsServerProtocol.qml |   6 +-
 .../qml/Pages2/PageSettingsSplitTunneling.qml |  15 +-
 .../PageSetupWizardProtocolSettings.qml       |   4 +-
 client/ui/qml/Pages2/PageSetupWizardStart.qml |   3 +-
 client/ui/qml/Pages2/PageShare.qml            |   1 +
 client/ui/qml/Pages2/PageStart.qml            |   4 +-
 24 files changed, 350 insertions(+), 56 deletions(-)
 create mode 100644 client/ui/qml/Controls2/Drawer2Type.qml

diff --git a/client/resources.qrc b/client/resources.qrc
index f0494852..d7f8ff7a 100644
--- a/client/resources.qrc
+++ b/client/resources.qrc
@@ -216,5 +216,6 @@
         <file>ui/qml/Pages2/PageServiceDnsSettings.qml</file>
         <file>ui/qml/Controls2/TopCloseButtonType.qml</file>
         <file>images/controls/x-circle.svg</file>
+        <file>ui/qml/Controls2/Drawer2Type.qml</file>
     </qresource>
 </RCC>
diff --git a/client/ui/qml/Components/ConnectionTypeSelectionDrawer.qml b/client/ui/qml/Components/ConnectionTypeSelectionDrawer.qml
index ecde1554..a368d45c 100644
--- a/client/ui/qml/Components/ConnectionTypeSelectionDrawer.qml
+++ b/client/ui/qml/Components/ConnectionTypeSelectionDrawer.qml
@@ -8,7 +8,7 @@ import "../Controls2"
 import "../Controls2/TextTypes"
 import "../Config"
 
-DrawerType {
+Drawer2Type {
     id: root
 
     width: parent.width
diff --git a/client/ui/qml/Components/QuestionDrawer.qml b/client/ui/qml/Components/QuestionDrawer.qml
index a79f9140..06f4ae24 100644
--- a/client/ui/qml/Components/QuestionDrawer.qml
+++ b/client/ui/qml/Components/QuestionDrawer.qml
@@ -5,7 +5,7 @@ import QtQuick.Layouts
 import "../Controls2"
 import "../Controls2/TextTypes"
 
-DrawerType {
+Drawer2Type {
     id: root
 
     property string headerText
diff --git a/client/ui/qml/Components/SelectLanguageDrawer.qml b/client/ui/qml/Components/SelectLanguageDrawer.qml
index d318aab8..f27fce6c 100644
--- a/client/ui/qml/Components/SelectLanguageDrawer.qml
+++ b/client/ui/qml/Components/SelectLanguageDrawer.qml
@@ -5,7 +5,7 @@ import QtQuick.Layouts
 import "../Controls2"
 import "../Controls2/TextTypes"
 
-DrawerType {
+Drawer2Type {
     id: root
 
     width: parent.width
diff --git a/client/ui/qml/Components/ShareConnectionDrawer.qml b/client/ui/qml/Components/ShareConnectionDrawer.qml
index 1158dadc..cb74f42e 100644
--- a/client/ui/qml/Components/ShareConnectionDrawer.qml
+++ b/client/ui/qml/Components/ShareConnectionDrawer.qml
@@ -16,7 +16,7 @@ import "../Controls2/TextTypes"
 import "../Config"
 import "../Components"
 
-DrawerType {
+Drawer2Type {
     id: root
 
     property alias headerText: header.headerText
@@ -30,7 +30,7 @@ DrawerType {
     width: parent.width
     height: parent.height * 0.9
 
-    onClosed: {
+    onClose: {
         configExtension = ".vpn"
         configCaption = qsTr("Save AmneziaVPN config")
         configFileName = "amnezia_config"
@@ -126,13 +126,14 @@ DrawerType {
                     text: qsTr("Show connection settings")
 
                     onClicked: {
-                        configContentDrawer.visible = true
+                        configContentDrawer.open()
                     }
                 }
 
-                DrawerType {
+                Drawer2Type {
                     id: configContentDrawer
 
+                    parent: root
                     width: parent.width
                     height: parent.height * 0.9
 
@@ -145,7 +146,7 @@ DrawerType {
                         anchors.topMargin: 16
 
                         backButtonFunction: function() {
-                            configContentDrawer.visible = false
+                            configContentDrawer.close()
                         }
                     }
 
diff --git a/client/ui/qml/Controls2/Drawer2Type.qml b/client/ui/qml/Controls2/Drawer2Type.qml
new file mode 100644
index 00000000..eae28846
--- /dev/null
+++ b/client/ui/qml/Controls2/Drawer2Type.qml
@@ -0,0 +1,266 @@
+import QtQuick
+import QtQuick.Layouts
+import QtQuick.Controls
+import QtQuick.Shapes
+
+Item {
+    id: root
+
+    Connections {
+        target: PageController
+
+        function onForceCloseDrawer() {
+            root.state = "closed"
+        }
+    }
+
+    visible: false
+
+    parent: Overlay.overlay
+
+    signal close()
+
+    property bool needCloseButton: true
+
+    property string defaultColor: "#1C1D21"
+    property string borderColor: "#2C2D30"
+    property int collapsedHeight: 0
+
+    property bool needCollapsed: false
+
+
+    y: parent.height - root.height
+
+    state: "closed"
+
+    Rectangle {
+        id: draw2Background
+
+        anchors { left: root.left; right: root.right; top: root.top }
+        height: root.height
+        radius: 16
+        color: root.defaultColor
+        border.color: root.borderColor
+        border.width: 1
+
+        Rectangle {
+            width: parent.radius
+            height: parent.radius
+            anchors.bottom: parent.bottom
+            anchors.right: parent.right
+            anchors.left: parent.left
+            color: parent.color
+        }
+    }
+
+    MouseArea {
+        anchors.fill: parent
+        enabled: (root.state === "expanded" || root.state === "opened")
+        onClicked: {
+            if (root.state === "expanded") {
+                root.state = "collapsed"
+                return
+            }
+
+            if (root.state === "opened") {
+                root.state = "closed"
+                return
+            }
+        }
+    }
+
+    Drag.active: dragArea.drag.active
+
+    MouseArea {
+        id: dragArea
+
+        anchors.fill: parent
+        cursorShape: (root.state === "opened"  || root.state === "expanded") ? Qt.PointingHandCursor : Qt.ArrowCursor
+        hoverEnabled: true
+
+        drag.target: parent
+        drag.axis: Drag.YAxis
+        drag.maximumY: parent.height
+        drag.minimumY: parent.height - root.height
+
+        /** If drag area is released at any point other than min or max y, transition to the other state */
+        onReleased: {
+            if (root.state === "closed" && root.y < dragArea.drag.maximumY) {
+                root.state = "opened"
+                PageController.drawerOpen()
+                return
+            }
+
+            if (root.state === "opened" && root.y > dragArea.drag.minimumY) {
+                root.state = "closed"
+                PageController.drawerClose()
+                return
+            }
+
+            if (root.state === "collapsed" && root.y < dragArea.drag.maximumY) {
+                root.state = "expanded"
+                return
+            }
+            if (root.state === "expanded" && root.y > dragArea.drag.minimumY) {
+                root.state = "collapsed"
+                return
+            }
+        }
+
+        onClicked: {
+            if (root.state === "opened") {
+                root.state = "closed"
+            }
+
+            if (root.state == "expanded") {
+                root.state == "collapsed"
+            }
+        }
+    }
+
+    onStateChanged: {
+        if (root.state === "closed" || root.state === "collapsed") {
+            var initialPageNavigationBarColor = PageController.getInitialPageNavigationBarColor()
+            if (initialPageNavigationBarColor !== 0xFF1C1D21) {
+                PageController.updateNavigationBarColor(initialPageNavigationBarColor)
+            }
+
+            PageController.drawerClose()
+            return
+        }
+        if (root.state === "expanded" || root.state === "opened") {
+            if (PageController.getInitialPageNavigationBarColor() !== 0xFF1C1D21) {
+                PageController.updateNavigationBarColor(0xFF1C1D21)
+            }
+            PageController.drawerOpen()
+            return
+        }
+    }
+
+    /** Two states of buttonContent, great place to add any future animations for the drawer */
+    states: [
+        State {
+            name: "collapsed"
+            PropertyChanges {
+                target: root
+                y: root.height - collapsedHeight
+            }
+        },
+        State {
+            name: "expanded"
+            PropertyChanges {
+                target: root
+                y: dragArea.drag.minimumY
+            }
+        },
+
+        State {
+            name: "closed"
+            PropertyChanges {
+                target: root
+                y: parent.height
+            }
+        },
+
+        State {
+            name: "opend"
+            PropertyChanges {
+                target: root
+                y: dragArea.drag.minimumY
+            }
+        }
+    ]
+
+    transitions: [
+        Transition {
+            from: "collapsed"
+            to: "expanded"
+            PropertyAnimation {
+                target: root
+                properties: "y"
+                duration: 200
+            }
+        },
+        Transition {
+            from: "expanded"
+            to: "collapsed"
+            PropertyAnimation {
+                target: root
+                properties: "y"
+                duration: 200
+            }
+        },
+
+        Transition {
+            from: "opened"
+            to: "closed"
+            PropertyAnimation {
+                target: root
+                properties: "y"
+                duration: 200
+            }
+        },
+
+        Transition {
+            from: "closed"
+            to: "opened"
+            PropertyAnimation {
+                target: root
+                properties: "y"
+                duration: 200
+            }
+        }
+    ]
+
+    NumberAnimation {
+        id: animationVisible
+        target: root
+        property: "y"
+        from: parent.height
+        to: parent.height  - root.height
+        duration: 200
+    }
+
+    function open() {
+        if (root.visible && root.state !== "closed") {
+            return
+        }
+
+        root.state = "opened"
+        root.visible = true
+        root.y = parent.height - root.height
+
+        dragArea.drag.maximumY =  parent.height
+        dragArea.drag.minimumY =  parent.height - root.height
+
+
+        animationVisible.running = true
+
+        if (needCloseButton) {
+            PageController.drawerOpen()
+        }
+
+        if (PageController.getInitialPageNavigationBarColor() !== 0xFF1C1D21) {
+            PageController.updateNavigationBarColor(0xFF1C1D21)
+        }
+    }
+
+    function onClose() {
+        if (needCloseButton) {
+            PageController.drawerClose()
+        }
+
+        var initialPageNavigationBarColor = PageController.getInitialPageNavigationBarColor()
+        if (initialPageNavigationBarColor !== 0xFF1C1D21) {
+            PageController.updateNavigationBarColor(initialPageNavigationBarColor)
+        }
+
+        root.visible = false
+    }
+
+    onVisibleChanged: {
+        if (!visible) {
+            close()
+        }
+    }
+}
diff --git a/client/ui/qml/Controls2/DropDownType.qml b/client/ui/qml/Controls2/DropDownType.qml
index b91f0b7a..cab2ef4e 100644
--- a/client/ui/qml/Controls2/DropDownType.qml
+++ b/client/ui/qml/Controls2/DropDownType.qml
@@ -156,17 +156,20 @@ Item {
             if (rootButtonClickedFunction && typeof rootButtonClickedFunction === "function") {
                 rootButtonClickedFunction()
             } else {
-                menu.visible = true
+                menu.open()
             }
         }
     }
 
+    // Drawer2Type {
     DrawerType {
         id: menu
 
         width: parent.width
         height: parent.height * drawerHeight
 
+        // parent: root.parent.parent
+
         ColumnLayout {
             id: header
 
diff --git a/client/ui/qml/Pages2/PageProtocolOpenVpnSettings.qml b/client/ui/qml/Pages2/PageProtocolOpenVpnSettings.qml
index c8469dcb..f03cfc07 100644
--- a/client/ui/qml/Pages2/PageProtocolOpenVpnSettings.qml
+++ b/client/ui/qml/Pages2/PageProtocolOpenVpnSettings.qml
@@ -365,14 +365,14 @@ PageType {
                                 questionDrawer.noButtonText = qsTr("Cancel")
 
                                 questionDrawer.yesButtonFunction = function() {
-                                    questionDrawer.visible = false
+                                    questionDrawer.onClose()
                                     PageController.goToPage(PageEnum.PageDeinstalling)
                                     InstallController.removeCurrentlyProcessedContainer()
                                 }
                                 questionDrawer.noButtonFunction = function() {
-                                    questionDrawer.visible = false
+                                    questionDrawer.onClose()
                                 }
-                                questionDrawer.visible = true
+                                questionDrawer.open()
                             }
                         }
 
@@ -397,6 +397,7 @@ PageType {
 
         QuestionDrawer {
             id: questionDrawer
+            parent: root
         }
     }
 }
diff --git a/client/ui/qml/Pages2/PageProtocolRaw.qml b/client/ui/qml/Pages2/PageProtocolRaw.qml
index 2324c091..3e0fe5ab 100644
--- a/client/ui/qml/Pages2/PageProtocolRaw.qml
+++ b/client/ui/qml/Pages2/PageProtocolRaw.qml
@@ -90,8 +90,9 @@ PageType {
 
                         DividerType {}
 
-                        DrawerType {
+                        Drawer2Type {
                             id: configContentDrawer
+                            parent: root
 
                             width: parent.width
                             height: parent.height * 0.9
@@ -179,14 +180,14 @@ PageType {
                     questionDrawer.noButtonText = qsTr("Cancel")
 
                     questionDrawer.yesButtonFunction = function() {
-                        questionDrawer.visible = false
+                        questionDrawer.onClose()
                         PageController.goToPage(PageEnum.PageDeinstalling)
                         InstallController.removeCurrentlyProcessedContainer()
                     }
                     questionDrawer.noButtonFunction = function() {
-                        questionDrawer.visible = false
+                        questionDrawer.onClose()
                     }
-                    questionDrawer.visible = true
+                    questionDrawer.open()
                 }
 
                 MouseArea {
@@ -201,6 +202,7 @@ PageType {
 
         QuestionDrawer {
             id: questionDrawer
+            parent: root
         }
     }
 }
diff --git a/client/ui/qml/Pages2/PageServiceDnsSettings.qml b/client/ui/qml/Pages2/PageServiceDnsSettings.qml
index 10fe6f56..70aba8e2 100644
--- a/client/ui/qml/Pages2/PageServiceDnsSettings.qml
+++ b/client/ui/qml/Pages2/PageServiceDnsSettings.qml
@@ -68,14 +68,14 @@ PageType {
                     questionDrawer.noButtonText = qsTr("Cancel")
 
                     questionDrawer.yesButtonFunction = function() {
-                        questionDrawer.visible = false
+                        questionDrawer.onClose()
                         PageController.goToPage(PageEnum.PageDeinstalling)
                         InstallController.removeCurrentlyProcessedContainer()
                     }
                     questionDrawer.noButtonFunction = function() {
-                        questionDrawer.visible = false
+                        questionDrawer.onClose()
                     }
-                    questionDrawer.visible = true
+                    questionDrawer.open()
                 }
 
                 MouseArea {
@@ -89,6 +89,7 @@ PageType {
 
             QuestionDrawer {
                 id: questionDrawer
+                parent: root
             }
         }
     }
diff --git a/client/ui/qml/Pages2/PageServiceSftpSettings.qml b/client/ui/qml/Pages2/PageServiceSftpSettings.qml
index 61ba663d..0af47cdd 100644
--- a/client/ui/qml/Pages2/PageServiceSftpSettings.qml
+++ b/client/ui/qml/Pages2/PageServiceSftpSettings.qml
@@ -265,14 +265,14 @@ PageType {
                                 questionDrawer.noButtonText = qsTr("Cancel")
 
                                 questionDrawer.yesButtonFunction = function() {
-                                    questionDrawer.visible = false
+                                    questionDrawer.onClose()
                                     PageController.goToPage(PageEnum.PageDeinstalling)
                                     InstallController.removeCurrentlyProcessedContainer()
                                 }
                                 questionDrawer.noButtonFunction = function() {
-                                    questionDrawer.visible = false
+                                    questionDrawer.onClose()
                                 }
-                                questionDrawer.visible = true
+                                questionDrawer.open()
                             }
                         }
                     }
@@ -282,6 +282,7 @@ PageType {
 
         QuestionDrawer {
             id: questionDrawer
+            parent: root
         }
     }
 }
diff --git a/client/ui/qml/Pages2/PageServiceTorWebsiteSettings.qml b/client/ui/qml/Pages2/PageServiceTorWebsiteSettings.qml
index 04d7076c..deff35eb 100644
--- a/client/ui/qml/Pages2/PageServiceTorWebsiteSettings.qml
+++ b/client/ui/qml/Pages2/PageServiceTorWebsiteSettings.qml
@@ -143,20 +143,21 @@ PageType {
                     questionDrawer.noButtonText = qsTr("Cancel")
 
                     questionDrawer.yesButtonFunction = function() {
-                        questionDrawer.visible = false
+                        questionDrawer.onClose()
                         PageController.goToPage(PageEnum.PageDeinstalling)
                         InstallController.removeCurrentlyProcessedContainer()
                     }
                     questionDrawer.noButtonFunction = function() {
-                        questionDrawer.visible = false
+                        questionDrawer.onClose()
                     }
-                    questionDrawer.visible = true
+                    questionDrawer.open()
                 }
             }
         }
 
         QuestionDrawer {
             id: questionDrawer
+            parent: root
         }
     }
 }
diff --git a/client/ui/qml/Pages2/PageSettingsApplication.qml b/client/ui/qml/Pages2/PageSettingsApplication.qml
index c5536fdb..225e2b14 100644
--- a/client/ui/qml/Pages2/PageSettingsApplication.qml
+++ b/client/ui/qml/Pages2/PageSettingsApplication.qml
@@ -119,6 +119,7 @@ PageType {
 
             SelectLanguageDrawer {
                 id: selectLanguageDrawer
+                parent: root
             }
 
 
@@ -151,14 +152,14 @@ PageType {
                     questionDrawer.noButtonText = qsTr("Cancel")
 
                     questionDrawer.yesButtonFunction = function() {
-                        questionDrawer.visible = false
+                        questionDrawer.onClose()
                         SettingsController.clearSettings()
                         PageController.replaceStartPage()
                     }
                     questionDrawer.noButtonFunction = function() {
-                        questionDrawer.visible = false
+                        questionDrawer.onClose()
                     }
-                    questionDrawer.visible = true
+                    questionDrawer.open()
                 }
             }
 
@@ -166,6 +167,7 @@ PageType {
 
             QuestionDrawer {
                 id: questionDrawer
+                parent: root
             }
         }
     }
diff --git a/client/ui/qml/Pages2/PageSettingsBackup.qml b/client/ui/qml/Pages2/PageSettingsBackup.qml
index 96214893..61370dab 100644
--- a/client/ui/qml/Pages2/PageSettingsBackup.qml
+++ b/client/ui/qml/Pages2/PageSettingsBackup.qml
@@ -138,15 +138,15 @@ PageType {
         questionDrawer.noButtonText = qsTr("Cancel")
 
         questionDrawer.yesButtonFunction = function() {
-            questionDrawer.visible = false
+            questionDrawer.onClose()
             PageController.showBusyIndicator(true)
             SettingsController.restoreAppConfig(filePath)
             PageController.showBusyIndicator(false)
         }
         questionDrawer.noButtonFunction = function() {
-            questionDrawer.visible = false
+            questionDrawer.onClose()
         }
-        questionDrawer.visible = true
+        questionDrawer.open()
     }
 
     QuestionDrawer {
diff --git a/client/ui/qml/Pages2/PageSettingsDns.qml b/client/ui/qml/Pages2/PageSettingsDns.qml
index 58ec0783..917c6992 100644
--- a/client/ui/qml/Pages2/PageSettingsDns.qml
+++ b/client/ui/qml/Pages2/PageSettingsDns.qml
@@ -91,7 +91,7 @@ PageType {
                     questionDrawer.noButtonText = qsTr("Cancel")
 
                     questionDrawer.yesButtonFunction = function() {
-                        questionDrawer.visible = false
+                        questionDrawer.onClose()
                         SettingsController.primaryDns = "1.1.1.1"
                         primaryDns.textFieldText = SettingsController.primaryDns
                         SettingsController.secondaryDns = "1.0.0.1"
@@ -99,9 +99,9 @@ PageType {
                         PageController.showNotificationMessage(qsTr("Settings have been reset"))
                     }
                     questionDrawer.noButtonFunction = function() {
-                        questionDrawer.visible = false
+                        questionDrawer.onClose()
                     }
-                    questionDrawer.visible = true
+                    questionDrawer.open()
                 }
             }
 
@@ -123,6 +123,7 @@ PageType {
         }
         QuestionDrawer {
             id: questionDrawer
+            parent: root
         }
     }
 }
diff --git a/client/ui/qml/Pages2/PageSettingsLogging.qml b/client/ui/qml/Pages2/PageSettingsLogging.qml
index 4141f51f..1532d1dc 100644
--- a/client/ui/qml/Pages2/PageSettingsLogging.qml
+++ b/client/ui/qml/Pages2/PageSettingsLogging.qml
@@ -146,16 +146,16 @@ PageType {
                             questionDrawer.noButtonText = qsTr("Cancel")
 
                             questionDrawer.yesButtonFunction = function() {
-                                questionDrawer.visible = false
+                                questionDrawer.onClose()
                                 PageController.showBusyIndicator(true)
                                 SettingsController.clearLogs()
                                 PageController.showBusyIndicator(false)
                                 PageController.showNotificationMessage(qsTr("Logs have been cleaned up"))
                             }
                             questionDrawer.noButtonFunction = function() {
-                                questionDrawer.visible = false
+                                questionDrawer.onClose()
                             }
-                            questionDrawer.visible = true
+                            questionDrawer.open()
                         }
                     }
 
@@ -171,6 +171,7 @@ PageType {
 
             QuestionDrawer {
                 id: questionDrawer
+                parent: root
             }
         }
     }
diff --git a/client/ui/qml/Pages2/PageSettingsServerData.qml b/client/ui/qml/Pages2/PageSettingsServerData.qml
index 3eb07ce9..c90e66b3 100644
--- a/client/ui/qml/Pages2/PageSettingsServerData.qml
+++ b/client/ui/qml/Pages2/PageSettingsServerData.qml
@@ -94,15 +94,15 @@ PageType {
                     questionDrawer.noButtonText = qsTr("Cancel")
 
                     questionDrawer.yesButtonFunction = function() {
-                        questionDrawer.visible = false
+                        questionDrawer.onClose()
                         PageController.showBusyIndicator(true)
                         SettingsController.clearCachedProfiles()
                         PageController.showBusyIndicator(false)
                     }
                     questionDrawer.noButtonFunction = function() {
-                        questionDrawer.visible = false
+                        questionDrawer.onClose()
                     }
-                    questionDrawer.visible = true
+                    questionDrawer.open()
                 }
             }
 
@@ -172,7 +172,7 @@ PageType {
                     questionDrawer.noButtonText = qsTr("Cancel")
 
                     questionDrawer.yesButtonFunction = function() {
-                        questionDrawer.visible = false
+                        questionDrawer.onClose()
                         PageController.goToPage(PageEnum.PageDeinstalling)
                         if (ServersModel.isDefaultServerCurrentlyProcessed() && ConnectionController.isConnected) {
                             ConnectionController.closeConnection()
@@ -180,9 +180,9 @@ PageType {
                         InstallController.removeAllContainers()
                     }
                     questionDrawer.noButtonFunction = function() {
-                        questionDrawer.visible = false
+                        questionDrawer.onClose()
                     }
-                    questionDrawer.visible = true
+                    questionDrawer.open()
                 }
             }
 
diff --git a/client/ui/qml/Pages2/PageSettingsServerInfo.qml b/client/ui/qml/Pages2/PageSettingsServerInfo.qml
index e2e7868c..d534b509 100644
--- a/client/ui/qml/Pages2/PageSettingsServerInfo.qml
+++ b/client/ui/qml/Pages2/PageSettingsServerInfo.qml
@@ -71,13 +71,14 @@ PageType {
                     }
 
                     actionButtonFunction: function() {
-                        serverNameEditDrawer.visible = true
+                        serverNameEditDrawer.open()
                     }
                 }
 
-                DrawerType {
+                Drawer2Type {
                     id: serverNameEditDrawer
 
+                    parent: root
                     width: root.width
                     height: root.height * 0.35
 
@@ -95,6 +96,7 @@ PageType {
                         anchors.leftMargin: 16
                         anchors.rightMargin: 16
 
+
                         TextFieldWithHeaderType {
                             id: serverName
 
diff --git a/client/ui/qml/Pages2/PageSettingsServerProtocol.qml b/client/ui/qml/Pages2/PageSettingsServerProtocol.qml
index 30758da4..594e4520 100644
--- a/client/ui/qml/Pages2/PageSettingsServerProtocol.qml
+++ b/client/ui/qml/Pages2/PageSettingsServerProtocol.qml
@@ -119,14 +119,14 @@ PageType {
                     questionDrawer.noButtonText = qsTr("Cancel")
 
                     questionDrawer.yesButtonFunction = function() {
-                        questionDrawer.visible = false
+                        questionDrawer.onClose()
                         PageController.goToPage(PageEnum.PageDeinstalling)
                         InstallController.removeCurrentlyProcessedContainer()
                     }
                     questionDrawer.noButtonFunction = function() {
-                        questionDrawer.visible = false
+                        questionDrawer.onClose()
                     }
-                    questionDrawer.visible = true
+                    questionDrawer.open()
                 }
 
                 MouseArea {
diff --git a/client/ui/qml/Pages2/PageSettingsSplitTunneling.qml b/client/ui/qml/Pages2/PageSettingsSplitTunneling.qml
index b79d5d22..406fae66 100644
--- a/client/ui/qml/Pages2/PageSettingsSplitTunneling.qml
+++ b/client/ui/qml/Pages2/PageSettingsSplitTunneling.qml
@@ -200,13 +200,13 @@ PageType {
                                 questionDrawer.noButtonText = qsTr("Cancel")
 
                                 questionDrawer.yesButtonFunction = function() {
-                                    questionDrawer.visible = false
+                                    questionDrawer.onClose()
                                     SitesController.removeSite(index)
                                 }
                                 questionDrawer.noButtonFunction = function() {
-                                    questionDrawer.visible = false
+                                    questionDrawer.onClose()
                                 }
-                                questionDrawer.visible = true
+                                questionDrawer.open()
                             }
                         }
 
@@ -214,6 +214,7 @@ PageType {
 
                         QuestionDrawer {
                             id: questionDrawer
+                            parent: root
                         }
                     }
                 }
@@ -259,12 +260,14 @@ PageType {
         }
     }
 
-    DrawerType {
+    Drawer2Type {
         id: moreActionsDrawer
 
         width: parent.width
         height: parent.height * 0.4375
 
+        parent: root
+
         FlickableType {
             anchors.fill: parent
             contentHeight: moreActionsDrawerContent.height
@@ -324,12 +327,14 @@ PageType {
         }
     }
 
-    DrawerType {
+    Drawer2Type {
         id: importSitesDrawer
 
         width: parent.width
         height: parent.height * 0.4375
 
+        parent: root
+
         BackButtonType {
             id: importSitesDrawerBackButton
 
diff --git a/client/ui/qml/Pages2/PageSetupWizardProtocolSettings.qml b/client/ui/qml/Pages2/PageSetupWizardProtocolSettings.qml
index 7535464a..794ec90b 100644
--- a/client/ui/qml/Pages2/PageSetupWizardProtocolSettings.qml
+++ b/client/ui/qml/Pages2/PageSetupWizardProtocolSettings.qml
@@ -97,12 +97,14 @@ PageType {
                             }
                         }
 
-                        DrawerType {
+                        Drawer2Type {
                             id: showDetailsDrawer
 
                             width: parent.width
                             height: parent.height * 0.9
 
+                            parent: root
+
                             BackButtonType {
                                 id: showDetailsBackButton
 
diff --git a/client/ui/qml/Pages2/PageSetupWizardStart.qml b/client/ui/qml/Pages2/PageSetupWizardStart.qml
index 9f5e57a5..17aa860f 100644
--- a/client/ui/qml/Pages2/PageSetupWizardStart.qml
+++ b/client/ui/qml/Pages2/PageSetupWizardStart.qml
@@ -115,7 +115,7 @@ PageType {
                 text: qsTr("I have the data to connect")
 
                 onClicked: {
-                    connectionTypeSelection.visible = true
+                    connectionTypeSelection.open()
                 }
             }
 
@@ -140,6 +140,7 @@ PageType {
 
         ConnectionTypeSelectionDrawer {
             id: connectionTypeSelection
+            parent: root
         }
     }
 
diff --git a/client/ui/qml/Pages2/PageShare.qml b/client/ui/qml/Pages2/PageShare.qml
index 2fa5e4a1..6c641ea6 100644
--- a/client/ui/qml/Pages2/PageShare.qml
+++ b/client/ui/qml/Pages2/PageShare.qml
@@ -371,6 +371,7 @@ PageType {
 
             ShareConnectionDrawer {
                 id: shareConnectionDrawer
+                parent: root
             }
 
             BasicButtonType {
diff --git a/client/ui/qml/Pages2/PageStart.qml b/client/ui/qml/Pages2/PageStart.qml
index 4af774fa..923d1e79 100644
--- a/client/ui/qml/Pages2/PageStart.qml
+++ b/client/ui/qml/Pages2/PageStart.qml
@@ -135,6 +135,8 @@ PageType {
             var pagePath = PageController.getPagePath(PageEnum.PageHome)
             ServersModel.currentlyProcessedIndex = ServersModel.defaultIndex
             tabBarStackView.push(pagePath, { "objectName" : pagePath })
+
+            connectionTypeSelection.parent = tabBarStackView
         }
 
         onWidthChanged: {
@@ -243,7 +245,7 @@ PageType {
     ConnectionTypeSelectionDrawer {
         id: connectionTypeSelection
 
-        onAboutToHide: {
+        onClose: function() {
             tabBar.setCurrentIndex(tabBar.previousIndex)
         }
     }

From 512ac74ee6f1201344fc2b89ce2244e36c758428 Mon Sep 17 00:00:00 2001
From: "vladimir.kuznetsov" <nethiuswork@gmail.com>
Date: Sat, 14 Oct 2023 20:59:03 +0500
Subject: [PATCH 221/278] temporarily disabled the drawer close button

---
 client/protocols/protocols_defs.cpp     |  2 +-
 client/translations/amneziavpn_ru.ts    |  8 ++++----
 client/translations/amneziavpn_zh_CN.ts |  8 ++++----
 client/ui/qml/Pages2/PageStart.qml      | 25 +++++++++++++------------
 4 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/client/protocols/protocols_defs.cpp b/client/protocols/protocols_defs.cpp
index b7f6b1d8..5964bd87 100644
--- a/client/protocols/protocols_defs.cpp
+++ b/client/protocols/protocols_defs.cpp
@@ -66,7 +66,7 @@ QMap<amnezia::Proto, QString> ProtocolProps::protocolHumanNames()
              { Proto::ShadowSocks, "ShadowSocks" },
              { Proto::Cloak, "Cloak" },
              { Proto::WireGuard, "WireGuard" },
-             { Proto::WireGuard, "AmneziaWG" },
+             { Proto::Awg, "AmneziaWG" },
              { Proto::Ikev2, "IKEv2" },
              { Proto::L2tp, "L2TP" },
 
diff --git a/client/translations/amneziavpn_ru.ts b/client/translations/amneziavpn_ru.ts
index 94ce0b3a..73a7dead 100644
--- a/client/translations/amneziavpn_ru.ts
+++ b/client/translations/amneziavpn_ru.ts
@@ -1704,22 +1704,22 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSetupWizardProtocolSettings.qml" line="192"/>
+        <location filename="../ui/qml/Pages2/PageSetupWizardProtocolSettings.qml" line="166"/>
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSetupWizardProtocolSettings.qml" line="207"/>
+        <location filename="../ui/qml/Pages2/PageSetupWizardProtocolSettings.qml" line="181"/>
         <source>Network protocol</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSetupWizardProtocolSettings.qml" line="223"/>
+        <location filename="../ui/qml/Pages2/PageSetupWizardProtocolSettings.qml" line="197"/>
         <source>Port</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSetupWizardProtocolSettings.qml" line="239"/>
+        <location filename="../ui/qml/Pages2/PageSetupWizardProtocolSettings.qml" line="213"/>
         <source>Install</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/client/translations/amneziavpn_zh_CN.ts b/client/translations/amneziavpn_zh_CN.ts
index 359655f8..2e772823 100644
--- a/client/translations/amneziavpn_zh_CN.ts
+++ b/client/translations/amneziavpn_zh_CN.ts
@@ -1807,22 +1807,22 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
         <translation>更多细节</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSetupWizardProtocolSettings.qml" line="192"/>
+        <location filename="../ui/qml/Pages2/PageSetupWizardProtocolSettings.qml" line="166"/>
         <source>Close</source>
         <translation>关闭</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSetupWizardProtocolSettings.qml" line="207"/>
+        <location filename="../ui/qml/Pages2/PageSetupWizardProtocolSettings.qml" line="181"/>
         <source>Network protocol</source>
         <translation>网络协议</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSetupWizardProtocolSettings.qml" line="223"/>
+        <location filename="../ui/qml/Pages2/PageSetupWizardProtocolSettings.qml" line="197"/>
         <source>Port</source>
         <translation>端口</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSetupWizardProtocolSettings.qml" line="239"/>
+        <location filename="../ui/qml/Pages2/PageSetupWizardProtocolSettings.qml" line="213"/>
         <source>Install</source>
         <translation>安装</translation>
     </message>
diff --git a/client/ui/qml/Pages2/PageStart.qml b/client/ui/qml/Pages2/PageStart.qml
index 4af774fa..ab02ace4 100644
--- a/client/ui/qml/Pages2/PageStart.qml
+++ b/client/ui/qml/Pages2/PageStart.qml
@@ -44,9 +44,9 @@ PageType {
             tabBar.enabled = !visible
         }
 
-        function onShowTopCloseButton(visible) {
-            topCloseButton.visible = visible
-        }
+//        function onShowTopCloseButton(visible) {
+//            topCloseButton.visible = visible
+//        }
 
         function onEnableTabBar(enabled) {
             tabBar.enabled = enabled
@@ -137,10 +137,10 @@ PageType {
             tabBarStackView.push(pagePath, { "objectName" : pagePath })
         }
 
-        onWidthChanged: {
-            topCloseButton.x = tabBarStackView.x + tabBarStackView.width -
-                    topCloseButton.buttonWidth - topCloseButton.rightPadding
-        }
+//        onWidthChanged: {
+//            topCloseButton.x = tabBarStackView.x + tabBarStackView.width -
+//                    topCloseButton.buttonWidth - topCloseButton.rightPadding
+//        }
     }
 
     TabBar {
@@ -234,11 +234,12 @@ PageType {
         z: 1
     }
 
-    TopCloseButtonType {
-        id: topCloseButton
-        x: tabBarStackView.width - topCloseButton.buttonWidth - topCloseButton.rightPadding
-        z: 1
-    }
+//    TopCloseButtonType {
+//        id: topCloseButton
+
+//        x: tabBarStackView.width - topCloseButton.buttonWidth - topCloseButton.rightPadding
+//        z: 1
+//    }
 
     ConnectionTypeSelectionDrawer {
         id: connectionTypeSelection

From 8885f580b29ef6424df1793aecd8f48a6daefb42 Mon Sep 17 00:00:00 2001
From: "vladimir.kuznetsov" <nethiuswork@gmail.com>
Date: Sat, 14 Oct 2023 21:18:38 +0500
Subject: [PATCH 222/278] added notification after saving backup and logs files

---
 client/ui/qml/Pages2/PageSettingsBackup.qml  | 1 +
 client/ui/qml/Pages2/PageSettingsLogging.qml | 1 +
 2 files changed, 2 insertions(+)

diff --git a/client/ui/qml/Pages2/PageSettingsBackup.qml b/client/ui/qml/Pages2/PageSettingsBackup.qml
index 96214893..81be0465 100644
--- a/client/ui/qml/Pages2/PageSettingsBackup.qml
+++ b/client/ui/qml/Pages2/PageSettingsBackup.qml
@@ -103,6 +103,7 @@ PageType {
                         PageController.showBusyIndicator(true)
                         SettingsController.backupAppConfig(fileName)
                         PageController.showBusyIndicator(false)
+                        PageController.showNotificationMessage(qsTr("Backup file saved"))
                     }
                 }
             }
diff --git a/client/ui/qml/Pages2/PageSettingsLogging.qml b/client/ui/qml/Pages2/PageSettingsLogging.qml
index 4141f51f..840c41d4 100644
--- a/client/ui/qml/Pages2/PageSettingsLogging.qml
+++ b/client/ui/qml/Pages2/PageSettingsLogging.qml
@@ -115,6 +115,7 @@ PageType {
                                 PageController.showBusyIndicator(true)
                                 SettingsController.exportLogsFile(fileName)
                                 PageController.showBusyIndicator(false)
+                                PageController.showNotificationMessage(qsTr("Logs file saved"))
                             }
                         }
                     }

From f65e4066e3911c1f28b1b6a2973e8f01327880db Mon Sep 17 00:00:00 2001
From: pokamest <pokamest@gmail.com>
Date: Sat, 14 Oct 2023 23:59:46 +0100
Subject: [PATCH 223/278] ui fixes

---
 client/CMakeLists.txt                         |   1 -
 client/translations/amneziavpn_ru.ts          | 164 +++++++++---------
 client/translations/amneziavpn_zh_CN.ts       | 127 ++++++++------
 .../ConnectionTypeSelectionDrawer.qml         |   5 +-
 client/ui/qml/Config/GlobalConfig.qml         |  12 ++
 .../ui/qml/Pages2/PageServiceSftpSettings.qml |  20 +--
 .../Pages2/PageServiceTorWebsiteSettings.qml  |  16 +-
 client/ui/qml/Pages2/PageSettings.qml         |   4 +-
 .../ui/qml/Pages2/PageSettingsConnection.qml  |   1 -
 9 files changed, 171 insertions(+), 179 deletions(-)

diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt
index bcefd30f..6c4f1ae4 100644
--- a/client/CMakeLists.txt
+++ b/client/CMakeLists.txt
@@ -74,7 +74,6 @@ qt6_add_resources(QRC ${I18NQRC} ${CMAKE_CURRENT_BINARY_DIR}/translations.qrc)
 # -- i18n end
 
 if(IOS)
-    #execute_process(COMMAND bash ${CMAKE_CURRENT_LIST_DIR}/scripts/run-build-cloak.sh)
     execute_process(COMMAND bash ${CMAKE_CURRENT_LIST_DIR}/ios/scripts/openvpn.sh args
         WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR})
 endif()
diff --git a/client/translations/amneziavpn_ru.ts b/client/translations/amneziavpn_ru.ts
index df2e53eb..a6c0464d 100644
--- a/client/translations/amneziavpn_ru.ts
+++ b/client/translations/amneziavpn_ru.ts
@@ -70,23 +70,18 @@
     <name>ConnectionTypeSelectionDrawer</name>
     <message>
         <location filename="../ui/qml/Components/ConnectionTypeSelectionDrawer.qml" line="30"/>
-        <source>Add server</source>
-        <translation type="unfinished"></translation>
+        <source>Add new connection</source>
+        <translation>Добавить новое соединение</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Components/ConnectionTypeSelectionDrawer.qml" line="31"/>
-        <source>Select data type</source>
-        <translation type="unfinished"></translation>
+        <location filename="../ui/qml/Components/ConnectionTypeSelectionDrawer.qml" line="38"/>
+        <source>Configure your server</source>
+        <translation>Настроить ваш сервер</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Components/ConnectionTypeSelectionDrawer.qml" line="39"/>
-        <source>Server IP, login and password</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/qml/Components/ConnectionTypeSelectionDrawer.qml" line="53"/>
-        <source>QR code, key or configuration file</source>
-        <translation type="unfinished"></translation>
+        <location filename="../ui/qml/Components/ConnectionTypeSelectionDrawer.qml" line="52"/>
+        <source>Open config file, key or QR code</source>
+        <translation>Открыть файл конфига, ключ или QR код</translation>
     </message>
 </context>
 <context>
@@ -736,49 +731,49 @@ Already installed containers were found on the server. All installed containers
         <translation>Пароль</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageServiceSftpSettings.qml" line="183"/>
+        <location filename="../ui/qml/Pages2/PageServiceSftpSettings.qml" line="171"/>
         <source>Mount folder on device</source>
         <translation>Смонтировать папку на вашем устройстве</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageServiceSftpSettings.qml" line="208"/>
+        <location filename="../ui/qml/Pages2/PageServiceSftpSettings.qml" line="196"/>
         <source>In order to mount remote SFTP folder as local drive, perform following steps: &lt;br&gt;</source>
         <translation>Чтобы смонтировать SFTP-папку как локальный диск на вашем устройстве, выполните следующие действия</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageServiceSftpSettings.qml" line="210"/>
-        <location filename="../ui/qml/Pages2/PageServiceSftpSettings.qml" line="213"/>
+        <location filename="../ui/qml/Pages2/PageServiceSftpSettings.qml" line="198"/>
+        <location filename="../ui/qml/Pages2/PageServiceSftpSettings.qml" line="201"/>
         <source>&lt;br&gt;1. Install the latest version of </source>
         <translation>&lt;br&gt;1. Установите последнюю версию </translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageServiceSftpSettings.qml" line="211"/>
-        <location filename="../ui/qml/Pages2/PageServiceSftpSettings.qml" line="214"/>
+        <location filename="../ui/qml/Pages2/PageServiceSftpSettings.qml" line="199"/>
+        <location filename="../ui/qml/Pages2/PageServiceSftpSettings.qml" line="202"/>
         <source>&lt;br&gt;2. Install the latest version of </source>
         <translation>&lt;br&gt;2. Установите последнюю версию </translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageServiceSftpSettings.qml" line="242"/>
+        <location filename="../ui/qml/Pages2/PageServiceSftpSettings.qml" line="230"/>
         <source>Detailed instructions</source>
         <translation>Подробные инструкции</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageServiceSftpSettings.qml" line="260"/>
+        <location filename="../ui/qml/Pages2/PageServiceSftpSettings.qml" line="248"/>
         <source>Remove SFTP and all data stored there</source>
         <translation>Удалите SFTP-хранилище со всеми данными</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageServiceSftpSettings.qml" line="263"/>
+        <location filename="../ui/qml/Pages2/PageServiceSftpSettings.qml" line="251"/>
         <source>Remove SFTP and all data stored there?</source>
         <translation>Удалить SFTP-хранилище и все хранящиеся на нем  данные?</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageServiceSftpSettings.qml" line="264"/>
+        <location filename="../ui/qml/Pages2/PageServiceSftpSettings.qml" line="252"/>
         <source>Continue</source>
         <translation>Продолжить</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageServiceSftpSettings.qml" line="265"/>
+        <location filename="../ui/qml/Pages2/PageServiceSftpSettings.qml" line="253"/>
         <source>Cancel</source>
         <translation>Отменить</translation>
     </message>
@@ -806,37 +801,41 @@ Already installed containers were found on the server. All installed containers
         <translation>Скопировано</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageServiceTorWebsiteSettings.qml" line="106"/>
+        <location filename="../ui/qml/Pages2/PageServiceTorWebsiteSettings.qml" line="94"/>
         <source>Use &lt;a href=&quot;https://www.torproject.org/download/&quot; style=&quot;color: #FBB26A;&quot;&gt;Tor Browser&lt;/a&gt; to open this url.</source>
         <translation>Используйте &lt;a href=&quot;https://www.torproject.org/download/&quot; style=&quot;color: #FBB26A;&quot;&gt;Tor Browser&lt;/a&gt; для открытия этой ссылки.</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageServiceTorWebsiteSettings.qml" line="115"/>
+        <location filename="../ui/qml/Pages2/PageServiceTorWebsiteSettings.qml" line="103"/>
         <source>After installation it takes several minutes while your onion site will become available in the Tor Network.</source>
         <translation>Через несколько минут после установки  ваш Onion сайт станет доступен в сети Tor.</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageServiceTorWebsiteSettings.qml" line="124"/>
-        <source>When configuring WordPress set the this address as domain.</source>
-        <translation type="unfinished"></translation>
+        <location filename="../ui/qml/Pages2/PageServiceTorWebsiteSettings.qml" line="112"/>
+        <source>When configuring WordPress set the this onion address as domain.</source>
+        <translation>При настройке WordPress укажите этот onion адрес в качестве домена.</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageServiceTorWebsiteSettings.qml" line="138"/>
+        <source>When configuring WordPress set the this address as domain.</source>
+        <translation type="vanished">При настройке WordPress укажите этот onion адрес в качестве домена.</translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageServiceTorWebsiteSettings.qml" line="126"/>
         <source>Remove website</source>
         <translation>Удалить сайт</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageServiceTorWebsiteSettings.qml" line="141"/>
+        <location filename="../ui/qml/Pages2/PageServiceTorWebsiteSettings.qml" line="129"/>
         <source>The site with all data will be removed from the tor network.</source>
         <translation>Сайт со всеми данными будет удален из сети tor.</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageServiceTorWebsiteSettings.qml" line="142"/>
+        <location filename="../ui/qml/Pages2/PageServiceTorWebsiteSettings.qml" line="130"/>
         <source>Continue</source>
         <translation>Продолжить</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageServiceTorWebsiteSettings.qml" line="143"/>
+        <location filename="../ui/qml/Pages2/PageServiceTorWebsiteSettings.qml" line="131"/>
         <source>Cancel</source>
         <translation>Отменить</translation>
     </message>
@@ -1079,37 +1078,42 @@ Already installed containers were found on the server. All installed containers
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsBackup.qml" line="97"/>
-        <location filename="../ui/qml/Pages2/PageSettingsBackup.qml" line="125"/>
+        <location filename="../ui/qml/Pages2/PageSettingsBackup.qml" line="126"/>
         <source>Backup files (*.backup)</source>
         <translation>Файлы резервного копирования (*.backup)</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsBackup.qml" line="121"/>
+        <location filename="../ui/qml/Pages2/PageSettingsBackup.qml" line="106"/>
+        <source>Backup file saved</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsBackup.qml" line="122"/>
         <source>Restore from backup</source>
         <translation>Восстановить из бэкапа</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsBackup.qml" line="124"/>
+        <location filename="../ui/qml/Pages2/PageSettingsBackup.qml" line="125"/>
         <source>Open backup file</source>
         <translation>Открыть бэкап файл</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsBackup.qml" line="135"/>
+        <location filename="../ui/qml/Pages2/PageSettingsBackup.qml" line="136"/>
         <source>Import settings from a backup file?</source>
         <translation>Импортировать настройки из бэкап файла?</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsBackup.qml" line="136"/>
+        <location filename="../ui/qml/Pages2/PageSettingsBackup.qml" line="137"/>
         <source>All current settings will be reset</source>
         <translation>Все текущие настройки будут сброшены</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsBackup.qml" line="137"/>
+        <location filename="../ui/qml/Pages2/PageSettingsBackup.qml" line="138"/>
         <source>Continue</source>
         <translation>Продолжить</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsBackup.qml" line="138"/>
+        <location filename="../ui/qml/Pages2/PageSettingsBackup.qml" line="139"/>
         <source>Cancel</source>
         <translation>Отменить</translation>
     </message>
@@ -1162,12 +1166,12 @@ Already installed containers were found on the server. All installed containers
         <translation>Позволяет подключаться к одним сайтам через VPN, а к другим в обход него</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsConnection.qml" line="120"/>
+        <location filename="../ui/qml/Pages2/PageSettingsConnection.qml" line="119"/>
         <source>App-based split tunneling</source>
         <translation>Раздельное VPN-туннелирование приложений</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsConnection.qml" line="121"/>
+        <location filename="../ui/qml/Pages2/PageSettingsConnection.qml" line="120"/>
         <source>Allows you to use the VPN only for certain applications</source>
         <translation>Позволяет использовать VPN только для определённых приложений</translation>
     </message>
@@ -1258,32 +1262,37 @@ Already installed containers were found on the server. All installed containers
         <translation>Logs files (*.log)</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsLogging.qml" line="126"/>
+        <location filename="../ui/qml/Pages2/PageSettingsLogging.qml" line="118"/>
+        <source>Logs file saved</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsLogging.qml" line="127"/>
         <source>Save logs to file</source>
         <translation>Сохранить логи в файл</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsLogging.qml" line="144"/>
+        <location filename="../ui/qml/Pages2/PageSettingsLogging.qml" line="145"/>
         <source>Clear logs?</source>
         <translation>Очистить логи?</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsLogging.qml" line="145"/>
+        <location filename="../ui/qml/Pages2/PageSettingsLogging.qml" line="146"/>
         <source>Continue</source>
         <translation>Продолжить</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsLogging.qml" line="146"/>
+        <location filename="../ui/qml/Pages2/PageSettingsLogging.qml" line="147"/>
         <source>Cancel</source>
         <translation>Отменить</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsLogging.qml" line="153"/>
+        <location filename="../ui/qml/Pages2/PageSettingsLogging.qml" line="154"/>
         <source>Logs have been cleaned up</source>
         <translation>Логи удалены</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsLogging.qml" line="166"/>
+        <location filename="../ui/qml/Pages2/PageSettingsLogging.qml" line="167"/>
         <source>Clear logs</source>
         <translation>Удалить логи</translation>
     </message>
@@ -1585,9 +1594,8 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
 <context>
     <name>PageSetupWizardCredentials</name>
     <message>
-        <location filename="../ui/qml/Pages2/PageSetupWizardCredentials.qml" line="44"/>
         <source>Server connection</source>
-        <translation>Подключение к серверу</translation>
+        <translation type="vanished">Подключение к серверу</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSetupWizardCredentials.qml" line="51"/>
@@ -1610,7 +1618,13 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
         <translation>Продолжить</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSetupWizardCredentials.qml" line="120"/>
+        <location filename="../ui/qml/Pages2/PageSetupWizardCredentials.qml" line="115"/>
+        <source>All data you enter will remain strictly confidential
+and will not be shared or disclosed to the Amnezia or any third parties</source>
+        <translation>Все данные, которые вы вводите, останутся строго конфиденциальными и не будут переданы или раскрыты Amnezia или каким-либо третьим сторонам</translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSetupWizardCredentials.qml" line="128"/>
         <source>Enter the address in the format 255.255.255.255:88</source>
         <translation>Введите адрес в формате 255.255.255.255:88</translation>
     </message>
@@ -1620,17 +1634,22 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
         <translation>Login to connect via SSH</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSetupWizardCredentials.qml" line="117"/>
+        <location filename="../ui/qml/Pages2/PageSetupWizardCredentials.qml" line="44"/>
+        <source>Configure your server</source>
+        <translation>Настроить ваш сервер</translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSetupWizardCredentials.qml" line="125"/>
         <source>Ip address cannot be empty</source>
         <translation>Поле Ip address не может быть пустым</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSetupWizardCredentials.qml" line="124"/>
+        <location filename="../ui/qml/Pages2/PageSetupWizardCredentials.qml" line="132"/>
         <source>Login cannot be empty</source>
         <translation>Поле Login не может быть пустым</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSetupWizardCredentials.qml" line="128"/>
+        <location filename="../ui/qml/Pages2/PageSetupWizardCredentials.qml" line="136"/>
         <source>Password/private key cannot be empty</source>
         <translation>Поле Password/private key не может быть пустым</translation>
     </message>
@@ -1865,7 +1884,7 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
     <message>
         <location filename="../ui/qml/Pages2/PageShare.qml" line="175"/>
         <source>Access to server management. The user with whom you share full access to the connection will be able to add and remove your protocols and services to the server, as well as change settings.</source>
-        <translation type="unfinished"></translation>
+        <translation>Доступ к управлению сервером. Пользователь, с которым вы делитесь полным доступом к соединению, сможет добавлять и удалять ваши протоколы и службы на сервере, а также изменять настройки.</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageShare.qml" line="190"/>
@@ -2499,11 +2518,6 @@ IKEv2 with IPSec encryption layer. Transmits data over fixed UDP ports 500 and 4
         <source>AmneziaWG - Special protocol from Amnezia, based on WireGuard. It&apos;s fast like WireGuard, but very resistant to blockages. Recommended for regions with high levels of censorship.</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../containers/containers_defs.cpp" line="112"/>
-        <source>AmneziaWG - Special protocol from Amnezia, based on WireGuard. It&apos;s fast like WireGuard, but very resistant to blockages. Recommended for regions with high levels of censorship.</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="../containers/containers_defs.cpp" line="116"/>
         <source>IKEv2 -  Modern stable protocol, a bit faster than others, restores connection after signal loss. It has native support on the latest versions of Android and iOS.</source>
@@ -2599,16 +2613,6 @@ IKEv2 with IPSec encryption layer. Transmits data over fixed UDP ports 500 and 4
         <source>error 0x%1: %2</source>
         <translation>error 0x%1: %2</translation>
     </message>
-    <message>
-        <location filename="../3rd/wireguard-tools/contrib/highlighter/gui/highlight.cpp" line="39"/>
-        <source>WireGuard Configuration Highlighter</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../3rd/wireguard-tools/contrib/highlighter/gui/highlight.cpp" line="82"/>
-        <source>&amp;Randomize colors</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>SelectLanguageDrawer</name>
@@ -2834,37 +2838,27 @@ IKEv2 with IPSec encryption layer. Transmits data over fixed UDP ports 500 and 4
     <message>
         <location filename="../containers/containers_defs.cpp" line="301"/>
         <source>Medium or High</source>
-        <translation type="unfinished"></translation>
+        <translation>Спедний или Высокий</translation>
     </message>
     <message>
         <location filename="../containers/containers_defs.cpp" line="302"/>
         <source>Extreme</source>
-        <translation type="unfinished"></translation>
+        <translation>Экстремальный</translation>
     </message>
     <message>
         <location filename="../containers/containers_defs.cpp" line="310"/>
         <source>I just want to increase the level of my privacy.</source>
-        <translation type="unfinished"></translation>
+        <translation>Я просто хочу повысить уровень своей приватности.</translation>
     </message>
     <message>
         <location filename="../containers/containers_defs.cpp" line="311"/>
         <source>I want to bypass censorship. This option recommended in most cases.</source>
-        <translation type="unfinished"></translation>
+        <translation>Я хочу обойти блокировки. Этот вариант рекомендуется в большинстве случаев.</translation>
     </message>
     <message>
         <location filename="../containers/containers_defs.cpp" line="313"/>
         <source>Most VPN protocols are blocked. Recommended if other options are not working.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../containers/containers_defs.cpp" line="256"/>
-        <source>I want to bypass censorship. This option recommended in most cases.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../containers/containers_defs.cpp" line="257"/>
-        <source>Most VPN protocols are blocked. Recommended if other options are not working.</source>
-        <translation type="unfinished"></translation>
+        <translation>Большинство VPN протоколов заблокированы. Рекомендуется, если другие варианты не работают.</translation>
     </message>
     <message>
         <source>High</source>
diff --git a/client/translations/amneziavpn_zh_CN.ts b/client/translations/amneziavpn_zh_CN.ts
index 2e772823..85af4694 100644
--- a/client/translations/amneziavpn_zh_CN.ts
+++ b/client/translations/amneziavpn_zh_CN.ts
@@ -73,23 +73,26 @@
     </message>
     <message>
         <location filename="../ui/qml/Components/ConnectionTypeSelectionDrawer.qml" line="30"/>
-        <source>Add server</source>
+        <source>Add new connection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Components/ConnectionTypeSelectionDrawer.qml" line="31"/>
-        <source>Select data type</source>
+        <location filename="../ui/qml/Components/ConnectionTypeSelectionDrawer.qml" line="38"/>
+        <source>Configure your server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Components/ConnectionTypeSelectionDrawer.qml" line="52"/>
+        <source>Open config file, key or QR code</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Components/ConnectionTypeSelectionDrawer.qml" line="39"/>
         <source>Server IP, login and password</source>
-        <translation>服务器IP，用户名和密码</translation>
+        <translation type="vanished">服务器IP，用户名和密码</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Components/ConnectionTypeSelectionDrawer.qml" line="53"/>
         <source>QR code, key or configuration file</source>
-        <translation>二维码，授权码或者配置文件</translation>
+        <translation type="vanished">二维码，授权码或者配置文件</translation>
     </message>
 </context>
 <context>
@@ -775,49 +778,49 @@ Already installed containers were found on the server. All installed containers
         <translation>密码</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageServiceSftpSettings.qml" line="183"/>
+        <location filename="../ui/qml/Pages2/PageServiceSftpSettings.qml" line="171"/>
         <source>Mount folder on device</source>
         <translation>挂载文件夹</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageServiceSftpSettings.qml" line="208"/>
+        <location filename="../ui/qml/Pages2/PageServiceSftpSettings.qml" line="196"/>
         <source>In order to mount remote SFTP folder as local drive, perform following steps: &lt;br&gt;</source>
         <translation>为将远程 SFTP 文件夹挂载到本地，请执行以下步骤: &lt;br&gt;</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageServiceSftpSettings.qml" line="210"/>
-        <location filename="../ui/qml/Pages2/PageServiceSftpSettings.qml" line="213"/>
+        <location filename="../ui/qml/Pages2/PageServiceSftpSettings.qml" line="198"/>
+        <location filename="../ui/qml/Pages2/PageServiceSftpSettings.qml" line="201"/>
         <source>&lt;br&gt;1. Install the latest version of </source>
         <translation>&lt;br&gt;1. 安装最新版的 </translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageServiceSftpSettings.qml" line="211"/>
-        <location filename="../ui/qml/Pages2/PageServiceSftpSettings.qml" line="214"/>
+        <location filename="../ui/qml/Pages2/PageServiceSftpSettings.qml" line="199"/>
+        <location filename="../ui/qml/Pages2/PageServiceSftpSettings.qml" line="202"/>
         <source>&lt;br&gt;2. Install the latest version of </source>
         <translation>&lt;br&gt;2. 安装最新版的 </translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageServiceSftpSettings.qml" line="242"/>
+        <location filename="../ui/qml/Pages2/PageServiceSftpSettings.qml" line="230"/>
         <source>Detailed instructions</source>
         <translation>详细说明</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageServiceSftpSettings.qml" line="260"/>
+        <location filename="../ui/qml/Pages2/PageServiceSftpSettings.qml" line="248"/>
         <source>Remove SFTP and all data stored there</source>
         <translation>移除SFTP和其本地所有数据</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageServiceSftpSettings.qml" line="263"/>
+        <location filename="../ui/qml/Pages2/PageServiceSftpSettings.qml" line="251"/>
         <source>Remove SFTP and all data stored there?</source>
         <translation>移除SFTP和其本地所有数据？</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageServiceSftpSettings.qml" line="264"/>
+        <location filename="../ui/qml/Pages2/PageServiceSftpSettings.qml" line="252"/>
         <source>Continue</source>
         <translation>继续</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageServiceSftpSettings.qml" line="265"/>
+        <location filename="../ui/qml/Pages2/PageServiceSftpSettings.qml" line="253"/>
         <source>Cancel</source>
         <translation>取消</translation>
     </message>
@@ -845,18 +848,18 @@ Already installed containers were found on the server. All installed containers
         <translation>已拷贝</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageServiceTorWebsiteSettings.qml" line="106"/>
+        <location filename="../ui/qml/Pages2/PageServiceTorWebsiteSettings.qml" line="94"/>
         <source>Use &lt;a href=&quot;https://www.torproject.org/download/&quot; style=&quot;color: #FBB26A;&quot;&gt;Tor Browser&lt;/a&gt; to open this url.</source>
         <translation>用 &lt;a href=&quot;https://www.torproject.org/download/&quot; style=&quot;color: #FBB26A;&quot;&gt;Tor 浏览器&lt;/a&gt; 打开上面网址</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageServiceTorWebsiteSettings.qml" line="115"/>
+        <location filename="../ui/qml/Pages2/PageServiceTorWebsiteSettings.qml" line="103"/>
         <source>After installation it takes several minutes while your onion site will become available in the Tor Network.</source>
         <translation>完成安装几分钟后,洋葱站点才会在 Tor 网络中生效。</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageServiceTorWebsiteSettings.qml" line="124"/>
-        <source>When configuring WordPress set the this address as domain.</source>
+        <location filename="../ui/qml/Pages2/PageServiceTorWebsiteSettings.qml" line="112"/>
+        <source>When configuring WordPress set the this onion address as domain.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -864,22 +867,22 @@ Already installed containers were found on the server. All installed containers
         <translation type="vanished">配置 WordPress 时，将域设置为此洋葱地址。</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageServiceTorWebsiteSettings.qml" line="138"/>
+        <location filename="../ui/qml/Pages2/PageServiceTorWebsiteSettings.qml" line="126"/>
         <source>Remove website</source>
         <translation>移除网站</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageServiceTorWebsiteSettings.qml" line="141"/>
+        <location filename="../ui/qml/Pages2/PageServiceTorWebsiteSettings.qml" line="129"/>
         <source>The site with all data will be removed from the tor network.</source>
         <translation>网站及其所有数据将从 Tor 网络中删除</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageServiceTorWebsiteSettings.qml" line="142"/>
+        <location filename="../ui/qml/Pages2/PageServiceTorWebsiteSettings.qml" line="130"/>
         <source>Continue</source>
         <translation>继续</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageServiceTorWebsiteSettings.qml" line="143"/>
+        <location filename="../ui/qml/Pages2/PageServiceTorWebsiteSettings.qml" line="131"/>
         <source>Cancel</source>
         <translation>取消</translation>
     </message>
@@ -1141,37 +1144,42 @@ And if you don&apos;t like the app, all the more support it - the donation will
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsBackup.qml" line="97"/>
-        <location filename="../ui/qml/Pages2/PageSettingsBackup.qml" line="125"/>
+        <location filename="../ui/qml/Pages2/PageSettingsBackup.qml" line="126"/>
         <source>Backup files (*.backup)</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsBackup.qml" line="121"/>
+        <location filename="../ui/qml/Pages2/PageSettingsBackup.qml" line="106"/>
+        <source>Backup file saved</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsBackup.qml" line="122"/>
         <source>Restore from backup</source>
         <translation>从备份还原</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsBackup.qml" line="124"/>
+        <location filename="../ui/qml/Pages2/PageSettingsBackup.qml" line="125"/>
         <source>Open backup file</source>
         <translation>打开备份文件</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsBackup.qml" line="135"/>
+        <location filename="../ui/qml/Pages2/PageSettingsBackup.qml" line="136"/>
         <source>Import settings from a backup file?</source>
         <translation>从备份文件导入设置？</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsBackup.qml" line="136"/>
+        <location filename="../ui/qml/Pages2/PageSettingsBackup.qml" line="137"/>
         <source>All current settings will be reset</source>
         <translation>当前所有设置将重置</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsBackup.qml" line="137"/>
+        <location filename="../ui/qml/Pages2/PageSettingsBackup.qml" line="138"/>
         <source>Continue</source>
         <translation>继续</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsBackup.qml" line="138"/>
+        <location filename="../ui/qml/Pages2/PageSettingsBackup.qml" line="139"/>
         <source>Cancel</source>
         <translation>取消</translation>
     </message>
@@ -1228,7 +1236,7 @@ And if you don&apos;t like the app, all the more support it - the donation will
         <translation>配置想要通过VPN访问网站</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsConnection.qml" line="120"/>
+        <location filename="../ui/qml/Pages2/PageSettingsConnection.qml" line="119"/>
         <source>App-based split tunneling</source>
         <translation>基于应用的隧道分离</translation>
     </message>
@@ -1245,7 +1253,7 @@ And if you don&apos;t like the app, all the more support it - the donation will
         <translation type="obsolete">应用级VPN分流</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsConnection.qml" line="121"/>
+        <location filename="../ui/qml/Pages2/PageSettingsConnection.qml" line="120"/>
         <source>Allows you to use the VPN only for certain applications</source>
         <translation>仅指定应用使用VPN</translation>
     </message>
@@ -1336,32 +1344,37 @@ And if you don&apos;t like the app, all the more support it - the donation will
         <translation></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsLogging.qml" line="126"/>
+        <location filename="../ui/qml/Pages2/PageSettingsLogging.qml" line="118"/>
+        <source>Logs file saved</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsLogging.qml" line="127"/>
         <source>Save logs to file</source>
         <translation>保存日志到文件</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsLogging.qml" line="144"/>
+        <location filename="../ui/qml/Pages2/PageSettingsLogging.qml" line="145"/>
         <source>Clear logs?</source>
         <translation>清理日志？</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsLogging.qml" line="145"/>
+        <location filename="../ui/qml/Pages2/PageSettingsLogging.qml" line="146"/>
         <source>Continue</source>
         <translation>继续</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsLogging.qml" line="146"/>
+        <location filename="../ui/qml/Pages2/PageSettingsLogging.qml" line="147"/>
         <source>Cancel</source>
         <translation>取消</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsLogging.qml" line="153"/>
+        <location filename="../ui/qml/Pages2/PageSettingsLogging.qml" line="154"/>
         <source>Logs have been cleaned up</source>
         <translation>日志已清理</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsLogging.qml" line="166"/>
+        <location filename="../ui/qml/Pages2/PageSettingsLogging.qml" line="167"/>
         <source>Clear logs</source>
         <translation>清理日志</translation>
     </message>
@@ -1682,9 +1695,13 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
 <context>
     <name>PageSetupWizardCredentials</name>
     <message>
-        <location filename="../ui/qml/Pages2/PageSetupWizardCredentials.qml" line="44"/>
         <source>Server connection</source>
-        <translation>连接服务器</translation>
+        <translation type="vanished">连接服务器</translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSetupWizardCredentials.qml" line="44"/>
+        <source>Configure your server</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSetupWizardCredentials.qml" line="51"/>
@@ -1712,22 +1729,28 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
         <translation>继续</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSetupWizardCredentials.qml" line="117"/>
+        <location filename="../ui/qml/Pages2/PageSetupWizardCredentials.qml" line="115"/>
+        <source>All data you enter will remain strictly confidential
+and will not be shared or disclosed to the Amnezia or any third parties</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSetupWizardCredentials.qml" line="125"/>
         <source>Ip address cannot be empty</source>
         <translation>IP不能为空</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSetupWizardCredentials.qml" line="120"/>
+        <location filename="../ui/qml/Pages2/PageSetupWizardCredentials.qml" line="128"/>
         <source>Enter the address in the format 255.255.255.255:88</source>
         <translation>按照这种格式输入 255.255.255.255:88</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSetupWizardCredentials.qml" line="124"/>
+        <location filename="../ui/qml/Pages2/PageSetupWizardCredentials.qml" line="132"/>
         <source>Login cannot be empty</source>
         <translation>账号不能为空</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSetupWizardCredentials.qml" line="128"/>
+        <location filename="../ui/qml/Pages2/PageSetupWizardCredentials.qml" line="136"/>
         <source>Password/private key cannot be empty</source>
         <translation>密码或私钥不能为空</translation>
     </message>
@@ -2727,16 +2750,6 @@ IKEv2 with IPSec encryption layer. Transmits data over fixed UDP ports 500 and 4
         <source>error 0x%1: %2</source>
         <translation>错误 0x%1: %2</translation>
     </message>
-    <message>
-        <location filename="../3rd/wireguard-tools/contrib/highlighter/gui/highlight.cpp" line="39"/>
-        <source>WireGuard Configuration Highlighter</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../3rd/wireguard-tools/contrib/highlighter/gui/highlight.cpp" line="82"/>
-        <source>&amp;Randomize colors</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>SelectLanguageDrawer</name>
diff --git a/client/ui/qml/Components/ConnectionTypeSelectionDrawer.qml b/client/ui/qml/Components/ConnectionTypeSelectionDrawer.qml
index ccffe21f..1f7b2f29 100644
--- a/client/ui/qml/Components/ConnectionTypeSelectionDrawer.qml
+++ b/client/ui/qml/Components/ConnectionTypeSelectionDrawer.qml
@@ -27,8 +27,7 @@ DrawerType {
             Layout.leftMargin: 16
             Layout.bottomMargin: 16
 
-            headerText: qsTr("Add server")
-            descriptionText: qsTr("Select data type")
+            headerText: qsTr("Add new connection")
         }
 
         LabelWithButtonType {
@@ -50,7 +49,7 @@ DrawerType {
         LabelWithButtonType {
             Layout.fillWidth: true
 
-            text: qsTr("Open QR code, key or config file")
+            text: qsTr("Open config file, key or QR code")
             rightImageSource: "qrc:/images/controls/chevron-right.svg"
 
             clickedFunction: function() {
diff --git a/client/ui/qml/Config/GlobalConfig.qml b/client/ui/qml/Config/GlobalConfig.qml
index a9edd543..0855101c 100644
--- a/client/ui/qml/Config/GlobalConfig.qml
+++ b/client/ui/qml/Config/GlobalConfig.qml
@@ -26,4 +26,16 @@ Item {
         }
         return false
     }
+
+    TextEdit{
+        id: clipboard
+        visible: false
+    }
+
+    function copyToClipBoard(text) {
+        clipboard.text = text
+        clipboard.selectAll()
+        clipboard.copy()
+        clipboard.select(0, 0)
+    }
 }
diff --git a/client/ui/qml/Pages2/PageServiceSftpSettings.qml b/client/ui/qml/Pages2/PageServiceSftpSettings.qml
index 61ba663d..b12302dd 100644
--- a/client/ui/qml/Pages2/PageServiceSftpSettings.qml
+++ b/client/ui/qml/Pages2/PageServiceSftpSettings.qml
@@ -96,7 +96,7 @@ PageType {
                             rightImageColor: "#D7D8DB"
 
                             clickedFunction: function() {
-                                col.copyToClipBoard(descriptionText)
+                                GC.copyToClipBoard(descriptionText)
                                 PageController.showNotificationMessage(qsTr("Copied"))
                             }
                         }
@@ -113,7 +113,7 @@ PageType {
                             rightImageColor: "#D7D8DB"
 
                             clickedFunction: function() {
-                                col.copyToClipBoard(descriptionText)
+                                GC.copyToClipBoard(descriptionText)
                                 PageController.showNotificationMessage(qsTr("Copied"))
                             }
                         }
@@ -130,7 +130,7 @@ PageType {
                             rightImageColor: "#D7D8DB"
 
                             clickedFunction: function() {
-                                col.copyToClipBoard(descriptionText)
+                                GC.copyToClipBoard(descriptionText)
                                 PageController.showNotificationMessage(qsTr("Copied"))
                             }
                         }
@@ -147,23 +147,11 @@ PageType {
                             rightImageColor: "#D7D8DB"
 
                             clickedFunction: function() {
-                                col.copyToClipBoard(descriptionText)
+                                GC.copyToClipBoard(descriptionText)
                                 PageController.showNotificationMessage(qsTr("Copied"))
                             }
                         }
 
-                        TextEdit{
-                            id: clipboard
-                            visible: false
-                        }
-
-                        function copyToClipBoard(text) {
-                            clipboard.text = text
-                            clipboard.selectAll()
-                            clipboard.copy()
-                            clipboard.select(0, 0)
-                        }
-
                         BasicButtonType {
                             visible: !GC.isMobile()
 
diff --git a/client/ui/qml/Pages2/PageServiceTorWebsiteSettings.qml b/client/ui/qml/Pages2/PageServiceTorWebsiteSettings.qml
index 0d5baa3d..3bfa5bb0 100644
--- a/client/ui/qml/Pages2/PageServiceTorWebsiteSettings.qml
+++ b/client/ui/qml/Pages2/PageServiceTorWebsiteSettings.qml
@@ -78,23 +78,11 @@ PageType {
                 rightImageColor: "#D7D8DB"
 
                 clickedFunction: function() {
-                    content.copyToClipBoard(descriptionText)
+                    GC.copyToClipBoard(descriptionText)
                     PageController.showNotificationMessage(qsTr("Copied"))
                 }
             }
 
-            TextEdit{
-                id: clipboard
-                visible: false
-            }
-
-            function copyToClipBoard(text) {
-                clipboard.text = text
-                clipboard.selectAll()
-                clipboard.copy()
-                clipboard.select(0, 0)
-            }
-
             ParagraphTextType {
                 Layout.fillWidth: true
                 Layout.topMargin: 40
@@ -121,7 +109,7 @@ PageType {
                 Layout.leftMargin: 16
                 Layout.rightMargin: 16
 
-                text: qsTr("When configuring WordPress set the this address as domain.")
+                text: qsTr("When configuring WordPress set the this onion address as domain.")
             }
 
             BasicButtonType {
diff --git a/client/ui/qml/Pages2/PageSettings.qml b/client/ui/qml/Pages2/PageSettings.qml
index e0ae7195..92575dda 100644
--- a/client/ui/qml/Pages2/PageSettings.qml
+++ b/client/ui/qml/Pages2/PageSettings.qml
@@ -110,7 +110,7 @@ PageType {
             DividerType {}
 
             LabelWithButtonType {
-                visible: GC.isMobile()
+                visible: GC.isDesktop()
                 Layout.fillWidth: true
                 Layout.preferredHeight: about.height
 
@@ -124,7 +124,7 @@ PageType {
             }
 
             DividerType {
-                visible: GC.isMobile()
+                visible: GC.isDesktop()
             }
         }
     }
diff --git a/client/ui/qml/Pages2/PageSettingsConnection.qml b/client/ui/qml/Pages2/PageSettingsConnection.qml
index 6890c7c7..7f0262f9 100644
--- a/client/ui/qml/Pages2/PageSettingsConnection.qml
+++ b/client/ui/qml/Pages2/PageSettingsConnection.qml
@@ -115,7 +115,6 @@ PageType {
                 visible: !GC.isMobile()
 
                 Layout.fillWidth: true
-                visible: false
 
                 text: qsTr("App-based split tunneling")
                 descriptionText: qsTr("Allows you to use the VPN only for certain applications")

From c7cd8e4c8042eaa6005fedb47459f263e6efff7b Mon Sep 17 00:00:00 2001
From: pokamest <pokamest@gmail.com>
Date: Sun, 15 Oct 2023 02:30:42 +0100
Subject: [PATCH 224/278] Minor ui fixes and refactoring

---
 client/containers/containers_defs.cpp         | 19 +----
 client/containers/containers_defs.h           |  1 -
 client/core/scripts_registry.cpp              |  1 -
 client/protocols/protocols_defs.cpp           | 14 ++--
 client/protocols/protocols_defs.h             |  1 -
 client/translations/amneziavpn_ru.ts          | 80 ++++++++++---------
 client/translations/amneziavpn_zh_CN.ts       | 78 ++++++++++--------
 client/ui/controllers/installController.cpp   |  4 +-
 client/ui/models/protocols_model.cpp          |  9 +--
 .../qml/Pages2/PageSetupWizardInstalling.qml  |  4 +-
 10 files changed, 103 insertions(+), 108 deletions(-)

diff --git a/client/containers/containers_defs.cpp b/client/containers/containers_defs.cpp
index 1c79874c..d4f45ada 100644
--- a/client/containers/containers_defs.cpp
+++ b/client/containers/containers_defs.cpp
@@ -89,7 +89,6 @@ QMap<DockerContainer, QString> ContainerProps::containerHumanNames()
 
              { DockerContainer::TorWebSite, QObject::tr("Website in Tor network") },
              { DockerContainer::Dns, QObject::tr("Amnezia DNS") },
-             //{DockerContainer::FileShare, QObject::tr("SMB file sharing service")},
              { DockerContainer::Sftp, QObject::tr("Sftp file sharing service") } };
 }
 
@@ -119,7 +118,6 @@ QMap<DockerContainer, QString> ContainerProps::containerDescriptions()
              { DockerContainer::TorWebSite, QObject::tr("Deploy a WordPress site on the Tor network in two clicks.") },
              { DockerContainer::Dns,
                QObject::tr("Replace the current DNS server with your own. This will increase your privacy level.") },
-             //{DockerContainer::FileShare, QObject::tr("SMB file sharing service - is Window file sharing protocol")},
              { DockerContainer::Sftp,
                QObject::tr("Creates a file vault on your server to securely store and transfer files.") } };
 }
@@ -190,27 +188,13 @@ QMap<DockerContainer, QString> ContainerProps::containerDetailedDescriptions()
 
         { DockerContainer::TorWebSite, QObject::tr("Website in Tor network") },
         { DockerContainer::Dns, QObject::tr("DNS Service") },
-        //{DockerContainer::FileShare, QObject::tr("SMB file sharing service - is Window file sharing protocol")},
         { DockerContainer::Sftp, QObject::tr("Sftp file sharing service - is secure FTP service") }
     };
 }
 
 amnezia::ServiceType ContainerProps::containerService(DockerContainer c)
 {
-    switch (c) {
-    case DockerContainer::None: return ServiceType::None;
-    case DockerContainer::OpenVpn: return ServiceType::Vpn;
-    case DockerContainer::Cloak: return ServiceType::Vpn;
-    case DockerContainer::ShadowSocks: return ServiceType::Vpn;
-    case DockerContainer::WireGuard: return ServiceType::Vpn;
-    case DockerContainer::Awg: return ServiceType::Vpn;
-    case DockerContainer::Ipsec: return ServiceType::Vpn;
-    case DockerContainer::TorWebSite: return ServiceType::Other;
-    case DockerContainer::Dns: return ServiceType::Other;
-    // case DockerContainer::FileShare :    return ServiceType::Other;
-    case DockerContainer::Sftp: return ServiceType::Other;
-    default: return ServiceType::Other;
-    }
+    return ProtocolProps::protocolService(defaultProtocol(c));
 }
 
 Proto ContainerProps::defaultProtocol(DockerContainer c)
@@ -226,7 +210,6 @@ Proto ContainerProps::defaultProtocol(DockerContainer c)
 
     case DockerContainer::TorWebSite: return Proto::TorWebSite;
     case DockerContainer::Dns: return Proto::Dns;
-    // case DockerContainer::FileShare :    return Protocol::FileShare;
     case DockerContainer::Sftp: return Proto::Sftp;
     default: return Proto::Any;
     }
diff --git a/client/containers/containers_defs.h b/client/containers/containers_defs.h
index ce8a2683..b9cb760d 100644
--- a/client/containers/containers_defs.h
+++ b/client/containers/containers_defs.h
@@ -26,7 +26,6 @@ namespace amnezia
             // non-vpn
             TorWebSite,
             Dns,
-            // FileShare,
             Sftp
         };
         Q_ENUM_NS(DockerContainer)
diff --git a/client/core/scripts_registry.cpp b/client/core/scripts_registry.cpp
index f209a2b1..61ae8962 100644
--- a/client/core/scripts_registry.cpp
+++ b/client/core/scripts_registry.cpp
@@ -16,7 +16,6 @@ QString amnezia::scriptFolder(amnezia::DockerContainer container)
 
     case DockerContainer::TorWebSite: return QLatin1String("website_tor");
     case DockerContainer::Dns: return QLatin1String("dns");
-    // case DockerContainer::FileShare: return QLatin1String("file_share");
     case DockerContainer::Sftp: return QLatin1String("sftp");
     default: return "";
     }
diff --git a/client/protocols/protocols_defs.cpp b/client/protocols/protocols_defs.cpp
index 5964bd87..b3823a11 100644
--- a/client/protocols/protocols_defs.cpp
+++ b/client/protocols/protocols_defs.cpp
@@ -72,7 +72,6 @@ QMap<amnezia::Proto, QString> ProtocolProps::protocolHumanNames()
 
              { Proto::TorWebSite, "Website in Tor network" },
              { Proto::Dns, "DNS Service" },
-             { Proto::FileShare, "File Sharing Service" },
              { Proto::Sftp, QObject::tr("Sftp service") } };
 }
 
@@ -90,9 +89,11 @@ amnezia::ServiceType ProtocolProps::protocolService(Proto p)
     case Proto::ShadowSocks: return ServiceType::Vpn;
     case Proto::WireGuard: return ServiceType::Vpn;
     case Proto::Awg: return ServiceType::Vpn;
+    case Proto::Ikev2: return ServiceType::Vpn;
+
     case Proto::TorWebSite: return ServiceType::Other;
     case Proto::Dns: return ServiceType::Other;
-    case Proto::FileShare: return ServiceType::Other;
+    case Proto::Sftp: return ServiceType::Other;
     default: return ServiceType::Other;
     }
 }
@@ -111,7 +112,6 @@ int ProtocolProps::defaultPort(Proto p)
 
     case Proto::TorWebSite: return -1;
     case Proto::Dns: return 53;
-    case Proto::FileShare: return 139;
     case Proto::Sftp: return 222;
     default: return -1;
     }
@@ -129,10 +129,10 @@ bool ProtocolProps::defaultPortChangeable(Proto p)
     case Proto::Ikev2: return false;
     case Proto::L2tp: return false;
 
-    case Proto::TorWebSite: return true;
+    case Proto::TorWebSite: return false;
     case Proto::Dns: return false;
-    case Proto::FileShare: return false;
-    default: return -1;
+    case Proto::Sftp: return true;
+    default: return false;
     }
 }
 
@@ -150,7 +150,6 @@ TransportProto ProtocolProps::defaultTransportProto(Proto p)
     // non-vpn
     case Proto::TorWebSite: return TransportProto::Tcp;
     case Proto::Dns: return TransportProto::Udp;
-    case Proto::FileShare: return TransportProto::Udp;
     case Proto::Sftp: return TransportProto::Tcp;
     }
 }
@@ -169,7 +168,6 @@ bool ProtocolProps::defaultTransportProtoChangeable(Proto p)
     // non-vpn
     case Proto::TorWebSite: return false;
     case Proto::Dns: return false;
-    case Proto::FileShare: return false;
     case Proto::Sftp: return false;
     default: return false;
     }
diff --git a/client/protocols/protocols_defs.h b/client/protocols/protocols_defs.h
index d6af132b..ed2ed313 100644
--- a/client/protocols/protocols_defs.h
+++ b/client/protocols/protocols_defs.h
@@ -195,7 +195,6 @@ namespace amnezia
             // non-vpn
             TorWebSite,
             Dns,
-            FileShare,
             Sftp
         };
         Q_ENUM_NS(Proto)
diff --git a/client/translations/amneziavpn_ru.ts b/client/translations/amneziavpn_ru.ts
index a6c0464d..d3eef897 100644
--- a/client/translations/amneziavpn_ru.ts
+++ b/client/translations/amneziavpn_ru.ts
@@ -165,32 +165,32 @@ Already installed containers were found on the server. All installed containers
 На сервере обнаружены установленные протоколы и сервисы, все они добавлены в приложение</translation>
     </message>
     <message>
-        <location filename="../ui/controllers/installController.cpp" line="264"/>
+        <location filename="../ui/controllers/installController.cpp" line="266"/>
         <source>Settings updated successfully</source>
         <translation>Настройки успешно обновлены</translation>
     </message>
     <message>
-        <location filename="../ui/controllers/installController.cpp" line="279"/>
+        <location filename="../ui/controllers/installController.cpp" line="281"/>
         <source>Server &apos;%1&apos; was removed</source>
         <translation>Сервер &apos;%1&apos; был удален</translation>
     </message>
     <message>
-        <location filename="../ui/controllers/installController.cpp" line="289"/>
+        <location filename="../ui/controllers/installController.cpp" line="291"/>
         <source>All containers from server &apos;%1&apos; have been removed</source>
         <translation>Все протоклы и сервисы были удалены с сервера &apos;%1&apos;</translation>
     </message>
     <message>
-        <location filename="../ui/controllers/installController.cpp" line="306"/>
+        <location filename="../ui/controllers/installController.cpp" line="308"/>
         <source>%1 has been removed from the server &apos;%2&apos;</source>
         <translation>%1 был удален с сервера &apos;%2&apos;</translation>
     </message>
     <message>
-        <location filename="../ui/controllers/installController.cpp" line="452"/>
+        <location filename="../ui/controllers/installController.cpp" line="454"/>
         <source>Please login as the user</source>
         <translation>Пожалуйста, войдите в систему от имени пользователя</translation>
     </message>
     <message>
-        <location filename="../ui/controllers/installController.cpp" line="479"/>
+        <location filename="../ui/controllers/installController.cpp" line="481"/>
         <source>Server added successfully</source>
         <translation>Сервер успешно добавлен</translation>
     </message>
@@ -1690,14 +1690,22 @@ and will not be shared or disclosed to the Amnezia or any third parties</source>
         <translation>Сервер уже был добавлен в приложение</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSetupWizardInstalling.qml" line="62"/>
         <source>Amnesia has detected that your server is currently </source>
-        <translation>Amnesia обнаружила, что ваш сервер в настоящее время </translation>
+        <translation type="vanished">Amnesia обнаружила, что ваш сервер в настоящее время </translation>
+    </message>
+    <message>
+        <source>busy installing other software. Amnesia installation </source>
+        <translation type="vanished">занят установкой других протоколов или сервисов. Установка Amnesia </translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSetupWizardInstalling.qml" line="62"/>
+        <source>Amnezia has detected that your server is currently </source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSetupWizardInstalling.qml" line="63"/>
-        <source>busy installing other software. Amnesia installation </source>
-        <translation>занят установкой других протоколов или сервисов. Установка Amnesia </translation>
+        <source>busy installing other software. Amnezia installation </source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSetupWizardInstalling.qml" line="64"/>
@@ -2406,7 +2414,7 @@ and will not be shared or disclosed to the Amnezia or any third parties</source>
         <translation>IPsec</translation>
     </message>
     <message>
-        <location filename="../containers/containers_defs.cpp" line="131"/>
+        <location filename="../containers/containers_defs.cpp" line="129"/>
         <source>The time-tested most popular VPN protocol.
 
 Uses a proprietary security protocol with SSL/TLS for encryption and key exchange and supports various authentication methods, making it suitable for a variety of devices and operating systems.
@@ -2418,7 +2426,7 @@ Uses a proprietary security protocol with SSL/TLS for encryption and key exchang
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../containers/containers_defs.cpp" line="141"/>
+        <location filename="../containers/containers_defs.cpp" line="139"/>
         <source>Based on the SOCKS5 proxy protocol, which protects the connection using the AEAD cipher - roughly along the same lines as SSH tunnelling. A Shadowsocks connection is difficult to identify because it is virtually identical to a normal HTTPS connection.
 
 However, some traffic analysis systems can still recognise a ShadowSocks connection, so in countries with high levels of censorship we recommend using OpenVPN in conjunction with Cloak.
@@ -2430,7 +2438,7 @@ However, some traffic analysis systems can still recognise a ShadowSocks connect
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../containers/containers_defs.cpp" line="151"/>
+        <location filename="../containers/containers_defs.cpp" line="149"/>
         <source>This is a combination of the OpenVPN protocol and the Cloak plugin designed specifically for blocking protection.
 
 OpenVPN provides a secure VPN connection by encrypting all Internet traffic between the client and the server.
@@ -2450,7 +2458,7 @@ If there is a high level of Internet censorship in your region, we advise you to
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../containers/containers_defs.cpp" line="169"/>
+        <location filename="../containers/containers_defs.cpp" line="167"/>
         <source>A relatively new popular VPN protocol with a simplified architecture.
 Provides stable VPN connection, high performance on all devices. Uses hard-coded encryption settings. WireGuard compared to OpenVPN has lower latency and better data transfer throughput.
 * Low power consumption on mobile devices.
@@ -2461,7 +2469,7 @@ Provides stable VPN connection, high performance on all devices. Uses hard-coded
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../containers/containers_defs.cpp" line="179"/>
+        <location filename="../containers/containers_defs.cpp" line="177"/>
         <source>A modern stable protocol.
 
 IKEv2 with IPSec encryption layer. Transmits data over fixed UDP ports 500 and 4500 protecting them with strong 3DES and AES crypto algorithms. Allows very fast switching between networks and devices. Due to its security, stability and speed, IKEv2 is currently one of the best VPN solutions for mobile devices. Vulnerable to detection and blocking.
@@ -2473,18 +2481,18 @@ IKEv2 with IPSec encryption layer. Transmits data over fixed UDP ports 500 and 4
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../containers/containers_defs.cpp" line="192"/>
+        <location filename="../containers/containers_defs.cpp" line="190"/>
         <source>DNS Service</source>
         <translation>DNS Сервис</translation>
     </message>
     <message>
-        <location filename="../containers/containers_defs.cpp" line="93"/>
+        <location filename="../containers/containers_defs.cpp" line="92"/>
         <source>Sftp file sharing service</source>
         <translation>Сервис обмена файлами Sftp</translation>
     </message>
     <message>
         <location filename="../containers/containers_defs.cpp" line="90"/>
-        <location filename="../containers/containers_defs.cpp" line="191"/>
+        <location filename="../containers/containers_defs.cpp" line="189"/>
         <source>Website in Tor network</source>
         <translation>Веб-сайт в сети Tor</translation>
     </message>
@@ -2494,62 +2502,62 @@ IKEv2 with IPSec encryption layer. Transmits data over fixed UDP ports 500 and 4
         <translation>Amnezia DNS</translation>
     </message>
     <message>
-        <location filename="../containers/containers_defs.cpp" line="99"/>
+        <location filename="../containers/containers_defs.cpp" line="98"/>
         <source>OpenVPN is the most popular VPN protocol, with flexible configuration options. It uses its own security protocol with SSL/TLS for key exchange.</source>
         <translation>OpenVPN - популярный VPN-протокол, с гибкой настройкой. Имеет собственный протокол безопасности с SSL/TLS для обмена ключами.</translation>
     </message>
     <message>
-        <location filename="../containers/containers_defs.cpp" line="102"/>
+        <location filename="../containers/containers_defs.cpp" line="101"/>
         <source>ShadowSocks - masks VPN traffic, making it similar to normal web traffic, but is recognised by analysis systems in some highly censored regions.</source>
         <translation>ShadowSocks - маскирует VPN-трафик под обычный веб-трафик, но распознается системами анализа в некоторых регионах с высоким уровнем цензуры.</translation>
     </message>
     <message>
-        <location filename="../containers/containers_defs.cpp" line="105"/>
+        <location filename="../containers/containers_defs.cpp" line="104"/>
         <source>OpenVPN over Cloak - OpenVPN with VPN masquerading as web traffic and protection against active-probbing detection. Ideal for bypassing blocking in regions with the highest levels of censorship.</source>
         <translation>OpenVPN over Cloak - OpenVPN с маскировкой VPN под web-трафик и защитой от обнаружения active-probbing. Подходит для регионов с самым высоким уровнем цензуры.</translation>
     </message>
     <message>
-        <location filename="../containers/containers_defs.cpp" line="109"/>
+        <location filename="../containers/containers_defs.cpp" line="108"/>
         <source>WireGuard - New popular VPN protocol with high performance, high speed and low power consumption. Recommended for regions with low levels of censorship.</source>
         <translation>WireGuard - Популярный VPN-протокол с высокой производительностью, высокой скоростью и низким энергопотреблением. Для регионов с низким уровнем цензуры.</translation>
     </message>
     <message>
-        <location filename="../containers/containers_defs.cpp" line="112"/>
+        <location filename="../containers/containers_defs.cpp" line="111"/>
         <source>AmneziaWG - Special protocol from Amnezia, based on WireGuard. It&apos;s fast like WireGuard, but very resistant to blockages. Recommended for regions with high levels of censorship.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../containers/containers_defs.cpp" line="116"/>
+        <location filename="../containers/containers_defs.cpp" line="115"/>
         <source>IKEv2 -  Modern stable protocol, a bit faster than others, restores connection after signal loss. It has native support on the latest versions of Android and iOS.</source>
         <translation>IKEv2 Современный стабильный протокол, немного быстрее других восстанавливает соединение после потери сигнала. Имеет нативную поддержку последних версиий Android и iOS.</translation>
     </message>
     <message>
-        <location filename="../containers/containers_defs.cpp" line="119"/>
+        <location filename="../containers/containers_defs.cpp" line="118"/>
         <source>Deploy a WordPress site on the Tor network in two clicks.</source>
         <translation>Разверните сайт на WordPress в сети Tor в два клика.</translation>
     </message>
     <message>
-        <location filename="../containers/containers_defs.cpp" line="121"/>
+        <location filename="../containers/containers_defs.cpp" line="120"/>
         <source>Replace the current DNS server with your own. This will increase your privacy level.</source>
         <translation>Замените адрес DNS-сервера на собственный. Это повысит уровень конфиденциальности.</translation>
     </message>
     <message>
-        <location filename="../containers/containers_defs.cpp" line="124"/>
+        <location filename="../containers/containers_defs.cpp" line="122"/>
         <source>Creates a file vault on your server to securely store and transfer files.</source>
         <translation>Создайте на сервере файловое хранилище для безопасного хранения и передачи файлов.</translation>
     </message>
     <message>
-        <location filename="../containers/containers_defs.cpp" line="177"/>
+        <location filename="../containers/containers_defs.cpp" line="175"/>
         <source>AmneziaWG container</source>
         <translation>AmneziaWG протокол</translation>
     </message>
     <message>
-        <location filename="../containers/containers_defs.cpp" line="194"/>
+        <location filename="../containers/containers_defs.cpp" line="191"/>
         <source>Sftp file sharing service - is secure FTP service</source>
         <translation>Сервис обмена файлами Sftp - безопасный FTP-сервис</translation>
     </message>
     <message>
-        <location filename="../protocols/protocols_defs.cpp" line="76"/>
+        <location filename="../protocols/protocols_defs.cpp" line="75"/>
         <source>Sftp service</source>
         <translation>Сервис SFTP</translation>
     </message>
@@ -2831,32 +2839,32 @@ IKEv2 with IPSec encryption layer. Transmits data over fixed UDP ports 500 and 4
 <context>
     <name>amnezia::ContainerProps</name>
     <message>
-        <location filename="../containers/containers_defs.cpp" line="300"/>
+        <location filename="../containers/containers_defs.cpp" line="283"/>
         <source>Low</source>
         <translation>Низкий</translation>
     </message>
     <message>
-        <location filename="../containers/containers_defs.cpp" line="301"/>
+        <location filename="../containers/containers_defs.cpp" line="284"/>
         <source>Medium or High</source>
         <translation>Спедний или Высокий</translation>
     </message>
     <message>
-        <location filename="../containers/containers_defs.cpp" line="302"/>
+        <location filename="../containers/containers_defs.cpp" line="285"/>
         <source>Extreme</source>
         <translation>Экстремальный</translation>
     </message>
     <message>
-        <location filename="../containers/containers_defs.cpp" line="310"/>
+        <location filename="../containers/containers_defs.cpp" line="293"/>
         <source>I just want to increase the level of my privacy.</source>
         <translation>Я просто хочу повысить уровень своей приватности.</translation>
     </message>
     <message>
-        <location filename="../containers/containers_defs.cpp" line="311"/>
+        <location filename="../containers/containers_defs.cpp" line="294"/>
         <source>I want to bypass censorship. This option recommended in most cases.</source>
         <translation>Я хочу обойти блокировки. Этот вариант рекомендуется в большинстве случаев.</translation>
     </message>
     <message>
-        <location filename="../containers/containers_defs.cpp" line="313"/>
+        <location filename="../containers/containers_defs.cpp" line="296"/>
         <source>Most VPN protocols are blocked. Recommended if other options are not working.</source>
         <translation>Большинство VPN протоколов заблокированы. Рекомендуется, если другие варианты не работают.</translation>
     </message>
diff --git a/client/translations/amneziavpn_zh_CN.ts b/client/translations/amneziavpn_zh_CN.ts
index 85af4694..be519a91 100644
--- a/client/translations/amneziavpn_zh_CN.ts
+++ b/client/translations/amneziavpn_zh_CN.ts
@@ -183,22 +183,22 @@ Already installed containers were found on the server. All installed containers
 在服务上发现已经安装协议并添加至应用</translation>
     </message>
     <message>
-        <location filename="../ui/controllers/installController.cpp" line="264"/>
+        <location filename="../ui/controllers/installController.cpp" line="266"/>
         <source>Settings updated successfully</source>
         <translation>配置更新成功</translation>
     </message>
     <message>
-        <location filename="../ui/controllers/installController.cpp" line="279"/>
+        <location filename="../ui/controllers/installController.cpp" line="281"/>
         <source>Server &apos;%1&apos; was removed</source>
         <translation>已移除服务器 &apos;%1&apos;</translation>
     </message>
     <message>
-        <location filename="../ui/controllers/installController.cpp" line="289"/>
+        <location filename="../ui/controllers/installController.cpp" line="291"/>
         <source>All containers from server &apos;%1&apos; have been removed</source>
         <translation>服务器 &apos;%1&apos; 的所有容器已移除</translation>
     </message>
     <message>
-        <location filename="../ui/controllers/installController.cpp" line="306"/>
+        <location filename="../ui/controllers/installController.cpp" line="308"/>
         <source>%1 has been removed from the server &apos;%2&apos;</source>
         <translation>%1 已从服务器 &apos;%2&apos; 上移除</translation>
     </message>
@@ -219,12 +219,12 @@ Already installed containers were found on the server. All installed containers
         <translation type="obsolete"> 协议已从</translation>
     </message>
     <message>
-        <location filename="../ui/controllers/installController.cpp" line="452"/>
+        <location filename="../ui/controllers/installController.cpp" line="454"/>
         <source>Please login as the user</source>
         <translation>请以用户身份登录</translation>
     </message>
     <message>
-        <location filename="../ui/controllers/installController.cpp" line="479"/>
+        <location filename="../ui/controllers/installController.cpp" line="481"/>
         <source>Server added successfully</source>
         <translation>增加服务器成功</translation>
     </message>
@@ -1798,13 +1798,21 @@ and will not be shared or disclosed to the Amnezia or any third parties</source>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSetupWizardInstalling.qml" line="62"/>
-        <source>Amnesia has detected that your server is currently </source>
-        <translation>Amnezia 检测到您的服务器当前</translation>
+        <source>Amnezia has detected that your server is currently </source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSetupWizardInstalling.qml" line="63"/>
+        <source>busy installing other software. Amnezia installation </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Amnesia has detected that your server is currently </source>
+        <translation type="vanished">Amnezia 检测到您的服务器当前</translation>
+    </message>
+    <message>
         <source>busy installing other software. Amnesia installation </source>
-        <translation>正安装其他软件。Amnezia安装</translation>
+        <translation type="vanished">正安装其他软件。Amnezia安装</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSetupWizardInstalling.qml" line="64"/>
@@ -2313,7 +2321,7 @@ and will not be shared or disclosed to the Amnezia or any third parties</source>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../protocols/protocols_defs.cpp" line="76"/>
+        <location filename="../protocols/protocols_defs.cpp" line="75"/>
         <source>Sftp service</source>
         <translation>Sftp 服务</translation>
     </message>
@@ -2529,7 +2537,7 @@ and will not be shared or disclosed to the Amnezia or any third parties</source>
     </message>
     <message>
         <location filename="../containers/containers_defs.cpp" line="90"/>
-        <location filename="../containers/containers_defs.cpp" line="191"/>
+        <location filename="../containers/containers_defs.cpp" line="189"/>
         <source>Website in Tor network</source>
         <translation>在 Tor 网络中架设网站</translation>
     </message>
@@ -2539,57 +2547,57 @@ and will not be shared or disclosed to the Amnezia or any third parties</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../containers/containers_defs.cpp" line="93"/>
+        <location filename="../containers/containers_defs.cpp" line="92"/>
         <source>Sftp file sharing service</source>
         <translation>SFTP文件共享服务</translation>
     </message>
     <message>
-        <location filename="../containers/containers_defs.cpp" line="99"/>
+        <location filename="../containers/containers_defs.cpp" line="98"/>
         <source>OpenVPN is the most popular VPN protocol, with flexible configuration options. It uses its own security protocol with SSL/TLS for key exchange.</source>
         <translation>OpenVPN 是最流行的 VPN 协议，具有灵活的配置选项。它使用自己的安全协议与 SSL/TLS 进行密钥交换。</translation>
     </message>
     <message>
-        <location filename="../containers/containers_defs.cpp" line="102"/>
+        <location filename="../containers/containers_defs.cpp" line="101"/>
         <source>ShadowSocks - masks VPN traffic, making it similar to normal web traffic, but is recognised by analysis systems in some highly censored regions.</source>
         <translation>ShadowSocks - 混淆 VPN 流量，使其与正常的 Web 流量相似，但在一些审查力度高的地区可以被分析系统识别。</translation>
     </message>
     <message>
-        <location filename="../containers/containers_defs.cpp" line="105"/>
+        <location filename="../containers/containers_defs.cpp" line="104"/>
         <source>OpenVPN over Cloak - OpenVPN with VPN masquerading as web traffic and protection against active-probbing detection. Ideal for bypassing blocking in regions with the highest levels of censorship.</source>
         <translation>OpenVPN over Cloak - OpenVPN 与 VPN 具有伪装成网络流量和防止主动探测检测的保护。非常适合绕过审查力度特别强的地区的封锁。</translation>
     </message>
     <message>
-        <location filename="../containers/containers_defs.cpp" line="109"/>
+        <location filename="../containers/containers_defs.cpp" line="108"/>
         <source>WireGuard - New popular VPN protocol with high performance, high speed and low power consumption. Recommended for regions with low levels of censorship.</source>
         <translation>WireGuard - 新型流行的VPN协议，具有高性能、高速度和低功耗。建议用于审查力度较低的地区</translation>
     </message>
     <message>
-        <location filename="../containers/containers_defs.cpp" line="112"/>
+        <location filename="../containers/containers_defs.cpp" line="111"/>
         <source>AmneziaWG - Special protocol from Amnezia, based on WireGuard. It&apos;s fast like WireGuard, but very resistant to blockages. Recommended for regions with high levels of censorship.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../containers/containers_defs.cpp" line="116"/>
+        <location filename="../containers/containers_defs.cpp" line="115"/>
         <source>IKEv2 -  Modern stable protocol, a bit faster than others, restores connection after signal loss. It has native support on the latest versions of Android and iOS.</source>
         <translation>IKEv2 - 现代稳定协议，相比其他协议较快一些，在信号丢失后恢复连接。Android 和 iOS最新版原生支持。</translation>
     </message>
     <message>
-        <location filename="../containers/containers_defs.cpp" line="119"/>
+        <location filename="../containers/containers_defs.cpp" line="118"/>
         <source>Deploy a WordPress site on the Tor network in two clicks.</source>
         <translation>只需点击两次即可架设 WordPress 网站到 Tor 网络</translation>
     </message>
     <message>
-        <location filename="../containers/containers_defs.cpp" line="121"/>
+        <location filename="../containers/containers_defs.cpp" line="120"/>
         <source>Replace the current DNS server with your own. This will increase your privacy level.</source>
         <translation>将当前的 DNS 服务器替换为您自己的。这将提高您的隐私保护级别。</translation>
     </message>
     <message>
-        <location filename="../containers/containers_defs.cpp" line="124"/>
+        <location filename="../containers/containers_defs.cpp" line="122"/>
         <source>Creates a file vault on your server to securely store and transfer files.</source>
         <translation>在您的服务器上创建文件仓库，以便安全地存储和传输文件</translation>
     </message>
     <message>
-        <location filename="../containers/containers_defs.cpp" line="131"/>
+        <location filename="../containers/containers_defs.cpp" line="129"/>
         <source>The time-tested most popular VPN protocol.
 
 Uses a proprietary security protocol with SSL/TLS for encryption and key exchange and supports various authentication methods, making it suitable for a variety of devices and operating systems.
@@ -2601,7 +2609,7 @@ Uses a proprietary security protocol with SSL/TLS for encryption and key exchang
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../containers/containers_defs.cpp" line="141"/>
+        <location filename="../containers/containers_defs.cpp" line="139"/>
         <source>Based on the SOCKS5 proxy protocol, which protects the connection using the AEAD cipher - roughly along the same lines as SSH tunnelling. A Shadowsocks connection is difficult to identify because it is virtually identical to a normal HTTPS connection.
 
 However, some traffic analysis systems can still recognise a ShadowSocks connection, so in countries with high levels of censorship we recommend using OpenVPN in conjunction with Cloak.
@@ -2613,7 +2621,7 @@ However, some traffic analysis systems can still recognise a ShadowSocks connect
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../containers/containers_defs.cpp" line="151"/>
+        <location filename="../containers/containers_defs.cpp" line="149"/>
         <source>This is a combination of the OpenVPN protocol and the Cloak plugin designed specifically for blocking protection.
 
 OpenVPN provides a secure VPN connection by encrypting all Internet traffic between the client and the server.
@@ -2633,7 +2641,7 @@ If there is a high level of Internet censorship in your region, we advise you to
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../containers/containers_defs.cpp" line="169"/>
+        <location filename="../containers/containers_defs.cpp" line="167"/>
         <source>A relatively new popular VPN protocol with a simplified architecture.
 Provides stable VPN connection, high performance on all devices. Uses hard-coded encryption settings. WireGuard compared to OpenVPN has lower latency and better data transfer throughput.
 * Low power consumption on mobile devices.
@@ -2644,7 +2652,7 @@ Provides stable VPN connection, high performance on all devices. Uses hard-coded
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../containers/containers_defs.cpp" line="179"/>
+        <location filename="../containers/containers_defs.cpp" line="177"/>
         <source>A modern stable protocol.
 
 IKEv2 with IPSec encryption layer. Transmits data over fixed UDP ports 500 and 4500 protecting them with strong 3DES and AES crypto algorithms. Allows very fast switching between networks and devices. Due to its security, stability and speed, IKEv2 is currently one of the best VPN solutions for mobile devices. Vulnerable to detection and blocking.
@@ -2672,7 +2680,7 @@ IKEv2 with IPSec encryption layer. Transmits data over fixed UDP ports 500 and 4
         <translation type="vanished">WireGuard 容器</translation>
     </message>
     <message>
-        <location filename="../containers/containers_defs.cpp" line="177"/>
+        <location filename="../containers/containers_defs.cpp" line="175"/>
         <source>AmneziaWG container</source>
         <translation></translation>
     </message>
@@ -2681,12 +2689,12 @@ IKEv2 with IPSec encryption layer. Transmits data over fixed UDP ports 500 and 4
         <translation type="vanished">IPsec 容器</translation>
     </message>
     <message>
-        <location filename="../containers/containers_defs.cpp" line="192"/>
+        <location filename="../containers/containers_defs.cpp" line="190"/>
         <source>DNS Service</source>
         <translation>DNS 服务</translation>
     </message>
     <message>
-        <location filename="../containers/containers_defs.cpp" line="194"/>
+        <location filename="../containers/containers_defs.cpp" line="191"/>
         <source>Sftp file sharing service - is secure FTP service</source>
         <translation>Sftp 文件共享服务 - 安全的 FTP 服务</translation>
     </message>
@@ -2972,32 +2980,32 @@ IKEv2 with IPSec encryption layer. Transmits data over fixed UDP ports 500 and 4
 <context>
     <name>amnezia::ContainerProps</name>
     <message>
-        <location filename="../containers/containers_defs.cpp" line="300"/>
+        <location filename="../containers/containers_defs.cpp" line="283"/>
         <source>Low</source>
         <translation>低</translation>
     </message>
     <message>
-        <location filename="../containers/containers_defs.cpp" line="301"/>
+        <location filename="../containers/containers_defs.cpp" line="284"/>
         <source>Medium or High</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../containers/containers_defs.cpp" line="302"/>
+        <location filename="../containers/containers_defs.cpp" line="285"/>
         <source>Extreme</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../containers/containers_defs.cpp" line="310"/>
+        <location filename="../containers/containers_defs.cpp" line="293"/>
         <source>I just want to increase the level of my privacy.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../containers/containers_defs.cpp" line="311"/>
+        <location filename="../containers/containers_defs.cpp" line="294"/>
         <source>I want to bypass censorship. This option recommended in most cases.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../containers/containers_defs.cpp" line="313"/>
+        <location filename="../containers/containers_defs.cpp" line="296"/>
         <source>Most VPN protocols are blocked. Recommended if other options are not working.</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/client/ui/controllers/installController.cpp b/client/ui/controllers/installController.cpp
index 34917cac..6eec9c6b 100644
--- a/client/ui/controllers/installController.cpp
+++ b/client/ui/controllers/installController.cpp
@@ -183,7 +183,9 @@ void InstallController::installContainer(DockerContainer container, QJsonObject
                                 "All installed containers have been added to the application");
         }
 
-        m_containersModel->setData(m_containersModel->index(0, 0), container, ContainersModel::Roles::IsDefaultRole);
+        if (ContainerProps::containerService(container) == ServiceType::Vpn) {
+            m_containersModel->setData(m_containersModel->index(0, 0), container, ContainersModel::Roles::IsDefaultRole);
+        }
         emit installContainerFinished(finishMessage, ContainerProps::containerService(container) == ServiceType::Other);
         return;
     }
diff --git a/client/ui/models/protocols_model.cpp b/client/ui/models/protocols_model.cpp
index 8c999470..5826025e 100644
--- a/client/ui/models/protocols_model.cpp
+++ b/client/ui/models/protocols_model.cpp
@@ -78,12 +78,11 @@ PageLoader::PageEnum ProtocolsModel::protocolPage(Proto protocol) const
     case Proto::ShadowSocks: return PageLoader::PageEnum::PageProtocolShadowSocksSettings;
     case Proto::WireGuard: return PageLoader::PageEnum::PageProtocolWireGuardSettings;
     case Proto::Ikev2: return PageLoader::PageEnum::PageProtocolIKev2Settings;
-    case Proto::L2tp: return PageLoader::PageEnum::PageProtocolOpenVpnSettings;
+    case Proto::L2tp: return PageLoader::PageEnum::PageProtocolIKev2Settings;
     // non-vpn
-    case Proto::TorWebSite: return PageLoader::PageEnum::PageProtocolOpenVpnSettings;
-    case Proto::Dns: return PageLoader::PageEnum::PageProtocolOpenVpnSettings;
-    case Proto::FileShare: return PageLoader::PageEnum::PageProtocolOpenVpnSettings;
-    case Proto::Sftp: return PageLoader::PageEnum::PageProtocolOpenVpnSettings;
+    case Proto::TorWebSite: return PageLoader::PageEnum::PageServiceTorWebsiteSettings;
+    case Proto::Dns: return PageLoader::PageEnum::PageServiceDnsSettings;
+    case Proto::Sftp: return PageLoader::PageEnum::PageServiceSftpSettings;
     default: return PageLoader::PageEnum::PageProtocolOpenVpnSettings;
     }
 }
diff --git a/client/ui/qml/Pages2/PageSetupWizardInstalling.qml b/client/ui/qml/Pages2/PageSetupWizardInstalling.qml
index 84f6be89..bd1fd7e6 100644
--- a/client/ui/qml/Pages2/PageSetupWizardInstalling.qml
+++ b/client/ui/qml/Pages2/PageSetupWizardInstalling.qml
@@ -59,8 +59,8 @@ PageType {
 
         function onServerIsBusy(isBusy) {
             if (isBusy) {
-                root.progressBarText = qsTr("Amnesia has detected that your server is currently ") +
-                                       qsTr("busy installing other software. Amnesia installation ") +
+                root.progressBarText = qsTr("Amnezia has detected that your server is currently ") +
+                                       qsTr("busy installing other software. Amnezia installation ") +
                                        qsTr("will pause until the server finishes installing other software")
                 root.isTimerRunning = false
             } else {

From 8c1835950bf64ebdf188769359bc908d501ba6d1 Mon Sep 17 00:00:00 2001
From: ronoaer <ronoaer@gmail.com>
Date: Sun, 15 Oct 2023 15:17:04 +0800
Subject: [PATCH 225/278] added transparent-background, for blocking clicked
 event

---
 .../ConnectionTypeSelectionDrawer.qml         |  5 +-
 client/ui/qml/Components/QuestionDrawer.qml   |  7 +-
 .../qml/Components/SelectLanguageDrawer.qml   |  6 +-
 .../qml/Components/ShareConnectionDrawer.qml  | 16 ++++-
 client/ui/qml/Controls2/Drawer2Type.qml       | 64 ++++++++++++++-----
 client/ui/qml/Controls2/DropDownType.qml      | 17 +++--
 .../qml/Pages2/PageProtocolCloakSettings.qml  |  2 +
 .../Pages2/PageProtocolOpenVpnSettings.qml    |  4 ++
 client/ui/qml/Pages2/PageProtocolRaw.qml      |  5 +-
 .../PageProtocolShadowSocksSettings.qml       |  2 +
 .../ui/qml/Pages2/PageSettingsServerData.qml  |  8 ++-
 .../ui/qml/Pages2/PageSettingsServerInfo.qml  |  5 +-
 .../qml/Pages2/PageSettingsSplitTunneling.qml | 14 +++-
 .../PageSetupWizardProtocolSettings.qml       |  7 +-
 client/ui/qml/Pages2/PageShare.qml            |  6 ++
 15 files changed, 134 insertions(+), 34 deletions(-)

diff --git a/client/ui/qml/Components/ConnectionTypeSelectionDrawer.qml b/client/ui/qml/Components/ConnectionTypeSelectionDrawer.qml
index a368d45c..ac04e444 100644
--- a/client/ui/qml/Components/ConnectionTypeSelectionDrawer.qml
+++ b/client/ui/qml/Components/ConnectionTypeSelectionDrawer.qml
@@ -12,9 +12,12 @@ Drawer2Type {
     id: root
 
     width: parent.width
-    height: parent.height * 0.4375
+    height: parent.height
+    contentHeight: parent.height * 0.4375
 
     ColumnLayout {
+        parent: root.contentParent
+
         anchors.top: parent.top
         anchors.left: parent.left
         anchors.right: parent.right
diff --git a/client/ui/qml/Components/QuestionDrawer.qml b/client/ui/qml/Components/QuestionDrawer.qml
index 06f4ae24..edc8df9e 100644
--- a/client/ui/qml/Components/QuestionDrawer.qml
+++ b/client/ui/qml/Components/QuestionDrawer.qml
@@ -17,9 +17,12 @@ Drawer2Type {
     property var noButtonFunction
 
     width: parent.width
-    height: parent.height * 0.5
+    height: parent.height
+    contentHeight: parent.height * 0.5
 
     ColumnLayout {
+        parent: root.contentParent
+
         anchors.top: parent.top
         anchors.left: parent.left
         anchors.right: parent.right
@@ -27,6 +30,8 @@ Drawer2Type {
         anchors.rightMargin: 16
         anchors.leftMargin: 16
 
+        // visible: false
+
         spacing: 8
 
         Header2TextType {
diff --git a/client/ui/qml/Components/SelectLanguageDrawer.qml b/client/ui/qml/Components/SelectLanguageDrawer.qml
index f27fce6c..e6fdc2b5 100644
--- a/client/ui/qml/Components/SelectLanguageDrawer.qml
+++ b/client/ui/qml/Components/SelectLanguageDrawer.qml
@@ -9,11 +9,14 @@ Drawer2Type {
     id: root
 
     width: parent.width
-    height: parent.height * 0.9
+    height: parent.height
+    contentHeight: parent.height * 0.9
 
     ColumnLayout {
         id: backButton
 
+        parent: root.contentParent
+
         anchors.top: parent.top
         anchors.left: parent.left
         anchors.right: parent.right
@@ -28,6 +31,7 @@ Drawer2Type {
     }
 
     FlickableType {
+        parent: root.contentParent
         anchors.top: backButton.bottom
         anchors.left: parent.left
         anchors.right: parent.right
diff --git a/client/ui/qml/Components/ShareConnectionDrawer.qml b/client/ui/qml/Components/ShareConnectionDrawer.qml
index cb74f42e..22c567a8 100644
--- a/client/ui/qml/Components/ShareConnectionDrawer.qml
+++ b/client/ui/qml/Components/ShareConnectionDrawer.qml
@@ -28,7 +28,8 @@ Drawer2Type {
     property string configFileName: "amnezia_config.vpn"
 
     width: parent.width
-    height: parent.height * 0.9
+    height: parent.height
+    contentHeight: parent.height * 0.9
 
     onClose: {
         configExtension = ".vpn"
@@ -41,6 +42,9 @@ Drawer2Type {
 
         Header2Type {
             id: header
+
+            parent: root.contentParent
+
             anchors.top: parent.top
             anchors.left: parent.left
             anchors.right: parent.right
@@ -50,6 +54,8 @@ Drawer2Type {
         }
 
         FlickableType {
+            parent: root.contentParent
+
             anchors.top: header.bottom
             anchors.bottom: parent.bottom
             contentHeight: content.height + 32
@@ -135,11 +141,15 @@ Drawer2Type {
 
                     parent: root
                     width: parent.width
-                    height: parent.height * 0.9
+                    height: parent.height
+
+                    contentHeight: parent.height * 0.9
 
                     BackButtonType {
                         id: backButton
 
+                        parent: configContentDrawer.contentParent
+
                         anchors.top: parent.top
                         anchors.left: parent.left
                         anchors.right: parent.right
@@ -151,6 +161,8 @@ Drawer2Type {
                     }
 
                     FlickableType {
+                        parent: configContentDrawer.contentParent
+
                         anchors.top: backButton.bottom
                         anchors.left: parent.left
                         anchors.right: parent.right
diff --git a/client/ui/qml/Controls2/Drawer2Type.qml b/client/ui/qml/Controls2/Drawer2Type.qml
index eae28846..3f877900 100644
--- a/client/ui/qml/Controls2/Drawer2Type.qml
+++ b/client/ui/qml/Controls2/Drawer2Type.qml
@@ -16,8 +16,6 @@ Item {
 
     visible: false
 
-    parent: Overlay.overlay
-
     signal close()
 
     property bool needCloseButton: true
@@ -27,7 +25,10 @@ Item {
     property int collapsedHeight: 0
 
     property bool needCollapsed: false
-
+    property double scaely
+    property int contentHeight: 0
+    property Item contentParent: contentArea
+    // property bool inContentArea: false
 
     y: parent.height - root.height
 
@@ -37,23 +38,49 @@ Item {
         id: draw2Background
 
         anchors { left: root.left; right: root.right; top: root.top }
-        height: root.height
+        height: root.parent.height
+        width: parent.width
         radius: 16
-        color: root.defaultColor
-        border.color: root.borderColor
+        color:  "transparent"
+        border.color: "transparent" //"green"
         border.width: 1
+        visible: true
 
         Rectangle {
-            width: parent.radius
-            height: parent.radius
-            anchors.bottom: parent.bottom
+            id: semiArea
+            anchors.top: parent.top
+            height: parent.height - contentHeight
             anchors.right: parent.right
             anchors.left: parent.left
-            color: parent.color
+            visible: true
+            color: "transparent"
+        }
+
+        Rectangle {
+            id: contentArea
+            anchors.top: semiArea.bottom
+            height: contentHeight
+            radius: 16
+            color: root.defaultColor
+            border.width: 1
+            border.color: root.borderColor
+            width: parent.width
+            visible: true
+
+            Rectangle {
+                width: parent.radius
+                height: parent.radius
+                anchors.bottom: parent.bottom
+                anchors.right: parent.right
+                anchors.left: parent.left
+                color: parent.color
+            }
         }
     }
 
+
     MouseArea {
+        id: fullArea
         anchors.fill: parent
         enabled: (root.state === "expanded" || root.state === "opened")
         onClicked: {
@@ -75,6 +102,7 @@ Item {
         id: dragArea
 
         anchors.fill: parent
+
         cursorShape: (root.state === "opened"  || root.state === "expanded") ? Qt.PointingHandCursor : Qt.ArrowCursor
         hoverEnabled: true
 
@@ -108,12 +136,14 @@ Item {
         }
 
         onClicked: {
-            if (root.state === "opened") {
-                root.state = "closed"
+            if (root.state === "expanded") {
+                root.state = "collapsed"
+                return
             }
 
-            if (root.state == "expanded") {
-                root.state == "collapsed"
+            if (root.state === "opened") {
+                root.state = "closed"
+                return
             }
         }
     }
@@ -217,7 +247,7 @@ Item {
         target: root
         property: "y"
         from: parent.height
-        to: parent.height  - root.height
+        to: 0
         duration: 200
     }
 
@@ -226,9 +256,11 @@ Item {
             return
         }
 
+        root.y = 0
         root.state = "opened"
         root.visible = true
-        root.y = parent.height - root.height
+        root.height = parent.height
+        contentArea.height = contentHeight
 
         dragArea.drag.maximumY =  parent.height
         dragArea.drag.minimumY =  parent.height - root.height
diff --git a/client/ui/qml/Controls2/DropDownType.qml b/client/ui/qml/Controls2/DropDownType.qml
index cab2ef4e..83518bef 100644
--- a/client/ui/qml/Controls2/DropDownType.qml
+++ b/client/ui/qml/Controls2/DropDownType.qml
@@ -40,6 +40,8 @@ Item {
 
     property alias menuVisible: menu.visible
 
+    property Item drawerParent: root
+
     implicitWidth: rootButtonContent.implicitWidth
     implicitHeight: rootButtonContent.implicitHeight
 
@@ -161,18 +163,21 @@ Item {
         }
     }
 
-    // Drawer2Type {
-    DrawerType {
+    //DrawerType {
+    Drawer2Type {
         id: menu
 
-        width: parent.width
-        height: parent.height * drawerHeight
+        parent: drawerParent
 
-        // parent: root.parent.parent
+        width: parent.width
+        height: parent.height
+        contentHeight: parent.height * drawerHeight
 
         ColumnLayout {
             id: header
 
+            parent: menu.contentParent
+
             anchors.top: parent.top
             anchors.left: parent.left
             anchors.right: parent.right
@@ -187,6 +192,8 @@ Item {
         }
 
         FlickableType {
+            parent: menu.contentParent
+
             anchors.top: header.bottom
             anchors.topMargin: 16
             contentHeight: col.implicitHeight
diff --git a/client/ui/qml/Pages2/PageProtocolCloakSettings.qml b/client/ui/qml/Pages2/PageProtocolCloakSettings.qml
index 78e666a7..b0f36971 100644
--- a/client/ui/qml/Pages2/PageProtocolCloakSettings.qml
+++ b/client/ui/qml/Pages2/PageProtocolCloakSettings.qml
@@ -117,6 +117,8 @@ PageType {
                             Layout.fillWidth: true
                             Layout.topMargin: 16
 
+                            drawerParent: root
+
                             descriptionText: qsTr("Cipher")
                             headerText: qsTr("Cipher")
 
diff --git a/client/ui/qml/Pages2/PageProtocolOpenVpnSettings.qml b/client/ui/qml/Pages2/PageProtocolOpenVpnSettings.qml
index f03cfc07..2861ece3 100644
--- a/client/ui/qml/Pages2/PageProtocolOpenVpnSettings.qml
+++ b/client/ui/qml/Pages2/PageProtocolOpenVpnSettings.qml
@@ -156,6 +156,8 @@ PageType {
                             Layout.fillWidth: true
                             Layout.topMargin: 20
 
+                            drawerParent: root
+
                             enabled: !autoNegotiateEncryprionSwitcher.checked
 
                             descriptionText: qsTr("Hash")
@@ -202,6 +204,8 @@ PageType {
                             Layout.fillWidth: true
                             Layout.topMargin: 16
 
+                            drawerParent: root
+
                             enabled: !autoNegotiateEncryprionSwitcher.checked
 
                             descriptionText: qsTr("Cipher")
diff --git a/client/ui/qml/Pages2/PageProtocolRaw.qml b/client/ui/qml/Pages2/PageProtocolRaw.qml
index 3e0fe5ab..f2a17686 100644
--- a/client/ui/qml/Pages2/PageProtocolRaw.qml
+++ b/client/ui/qml/Pages2/PageProtocolRaw.qml
@@ -95,11 +95,14 @@ PageType {
                             parent: root
 
                             width: parent.width
-                            height: parent.height * 0.9
+                            height: parent.height
+                            contentHeight: parent.height * 0.9
 
                             BackButtonType {
                                 id: backButton
 
+                                parent: configContentDrawer.contentParent
+
                                 anchors.top: parent.top
                                 anchors.left: parent.left
                                 anchors.right: parent.right
diff --git a/client/ui/qml/Pages2/PageProtocolShadowSocksSettings.qml b/client/ui/qml/Pages2/PageProtocolShadowSocksSettings.qml
index 2453281f..75853d1f 100644
--- a/client/ui/qml/Pages2/PageProtocolShadowSocksSettings.qml
+++ b/client/ui/qml/Pages2/PageProtocolShadowSocksSettings.qml
@@ -95,6 +95,8 @@ PageType {
                             Layout.fillWidth: true
                             Layout.topMargin: 20
 
+                            drawerParent: root
+
                             descriptionText: qsTr("Cipher")
                             headerText: qsTr("Cipher")
 
diff --git a/client/ui/qml/Pages2/PageSettingsServerData.qml b/client/ui/qml/Pages2/PageSettingsServerData.qml
index c90e66b3..5e3f1939 100644
--- a/client/ui/qml/Pages2/PageSettingsServerData.qml
+++ b/client/ui/qml/Pages2/PageSettingsServerData.qml
@@ -141,7 +141,7 @@ PageType {
                     questionDrawer.noButtonText = qsTr("Cancel")
 
                     questionDrawer.yesButtonFunction = function() {
-                        questionDrawer.visible = false
+                        questionDrawer.close()
                         PageController.showBusyIndicator(true)
                         if (ServersModel.isDefaultServerCurrentlyProcessed() && ConnectionController.isConnected) {
                             ConnectionController.closeConnection()
@@ -150,9 +150,9 @@ PageType {
                         PageController.showBusyIndicator(false)
                     }
                     questionDrawer.noButtonFunction = function() {
-                        questionDrawer.visible = false
+                        questionDrawer.close()
                     }
-                    questionDrawer.visible = true
+                    questionDrawer.open()
                 }
             }
 
@@ -192,6 +192,8 @@ PageType {
 
             QuestionDrawer {
                 id: questionDrawer
+
+                parent: root
             }
         }
     }
diff --git a/client/ui/qml/Pages2/PageSettingsServerInfo.qml b/client/ui/qml/Pages2/PageSettingsServerInfo.qml
index d534b509..f6d569dd 100644
--- a/client/ui/qml/Pages2/PageSettingsServerInfo.qml
+++ b/client/ui/qml/Pages2/PageSettingsServerInfo.qml
@@ -80,7 +80,8 @@ PageType {
 
                     parent: root
                     width: root.width
-                    height: root.height * 0.35
+                    height: root.height // * 0.35
+                    contentHeight: root.height * 0.35
 
                     onVisibleChanged: {
                         if (serverNameEditDrawer.visible) {
@@ -89,6 +90,8 @@ PageType {
                     }
 
                     ColumnLayout {
+                        parent: serverNameEditDrawer.contentParent
+
                         anchors.top: parent.top
                         anchors.left: parent.left
                         anchors.right: parent.right
diff --git a/client/ui/qml/Pages2/PageSettingsSplitTunneling.qml b/client/ui/qml/Pages2/PageSettingsSplitTunneling.qml
index 406fae66..a88c576b 100644
--- a/client/ui/qml/Pages2/PageSettingsSplitTunneling.qml
+++ b/client/ui/qml/Pages2/PageSettingsSplitTunneling.qml
@@ -108,6 +108,8 @@ PageType {
         DropDownType {
             id: selector
 
+            drawerParent: root
+
             Layout.fillWidth: true
             Layout.topMargin: 32
             Layout.leftMargin: 16
@@ -264,11 +266,14 @@ PageType {
         id: moreActionsDrawer
 
         width: parent.width
-        height: parent.height * 0.4375
+        height: parent.height
+        contentHeight: parent.height * 0.4375
 
         parent: root
 
         FlickableType {
+            parent: moreActionsDrawer.contentParent
+
             anchors.fill: parent
             contentHeight: moreActionsDrawerContent.height
             ColumnLayout {
@@ -331,13 +336,16 @@ PageType {
         id: importSitesDrawer
 
         width: parent.width
-        height: parent.height * 0.4375
+        height: parent.height
+        contentHeight: parent.height * 0.4375
 
         parent: root
 
         BackButtonType {
             id: importSitesDrawerBackButton
 
+            parent: importSitesDrawer.contentParent
+
             anchors.top: parent.top
             anchors.left: parent.left
             anchors.right: parent.right
@@ -349,6 +357,8 @@ PageType {
         }
 
         FlickableType {
+            parent: importSitesDrawer.contentParent
+
             anchors.top: importSitesDrawerBackButton.bottom
             anchors.left: parent.left
             anchors.right: parent.right
diff --git a/client/ui/qml/Pages2/PageSetupWizardProtocolSettings.qml b/client/ui/qml/Pages2/PageSetupWizardProtocolSettings.qml
index 794ec90b..6cdda364 100644
--- a/client/ui/qml/Pages2/PageSetupWizardProtocolSettings.qml
+++ b/client/ui/qml/Pages2/PageSetupWizardProtocolSettings.qml
@@ -101,13 +101,16 @@ PageType {
                             id: showDetailsDrawer
 
                             width: parent.width
-                            height: parent.height * 0.9
+                            height: parent.height
+                            contentHeight: parent.height * 0.9
 
                             parent: root
 
                             BackButtonType {
                                 id: showDetailsBackButton
 
+                                parent: showDetailsDrawer.contentParent
+
                                 anchors.top: parent.top
                                 anchors.left: parent.left
                                 anchors.right: parent.right
@@ -119,6 +122,8 @@ PageType {
                             }
 
                             FlickableType {
+                                parent: showDetailsDrawer.contentParent
+
                                 anchors.top: showDetailsBackButton.bottom
                                 anchors.left: parent.left
                                 anchors.right: parent.right
diff --git a/client/ui/qml/Pages2/PageShare.qml b/client/ui/qml/Pages2/PageShare.qml
index 6c641ea6..96399153 100644
--- a/client/ui/qml/Pages2/PageShare.qml
+++ b/client/ui/qml/Pages2/PageShare.qml
@@ -179,6 +179,8 @@ PageType {
             DropDownType {
                 id: serverSelector
 
+                drawerParent: root
+
                 signal severSelectorIndexChanged
                 property int currentIndex: 0
 
@@ -241,6 +243,8 @@ PageType {
             DropDownType {
                 id: protocolSelector
 
+                drawerParent: root
+
                 visible: accessTypeSelector.currentIndex === 0
 
                 Layout.fillWidth: true
@@ -330,6 +334,8 @@ PageType {
             DropDownType {
                 id: exportTypeSelector
 
+                drawerParent: root
+
                 property int currentIndex: 0
 
                 Layout.fillWidth: true

From a75bd07cd8b604bbe5f6894ac8e861f57efe8df5 Mon Sep 17 00:00:00 2001
From: ronoaer <ronoaer@gmail.com>
Date: Sun, 15 Oct 2023 15:54:05 +0800
Subject: [PATCH 226/278] fixed the clicked event

---
 client/ui/qml/Controls2/Drawer2Type.qml | 170 +++++++++++++-----------
 1 file changed, 89 insertions(+), 81 deletions(-)

diff --git a/client/ui/qml/Controls2/Drawer2Type.qml b/client/ui/qml/Controls2/Drawer2Type.qml
index 3f877900..2f10ec5d 100644
--- a/client/ui/qml/Controls2/Drawer2Type.qml
+++ b/client/ui/qml/Controls2/Drawer2Type.qml
@@ -34,6 +34,8 @@ Item {
 
     state: "closed"
 
+    Drag.active: dragArea.drag.active
+
     Rectangle {
         id: draw2Background
 
@@ -46,104 +48,110 @@ Item {
         border.width: 1
         visible: true
 
-        Rectangle {
-            id: semiArea
-            anchors.top: parent.top
-            height: parent.height - contentHeight
-            anchors.right: parent.right
-            anchors.left: parent.left
-            visible: true
-            color: "transparent"
-        }
+        MouseArea {
+            id: fullArea
+            anchors.fill: parent
+            enabled: (root.state === "expanded" || root.state === "opened")
+            onClicked: {
+                if (root.state === "expanded") {
+                    root.state = "collapsed"
+                    return
+                }
 
-        Rectangle {
-            id: contentArea
-            anchors.top: semiArea.bottom
-            height: contentHeight
-            radius: 16
-            color: root.defaultColor
-            border.width: 1
-            border.color: root.borderColor
-            width: parent.width
-            visible: true
+                if (root.state === "opened") {
+                    root.state = "closed"
+                    return
+                }
+            }
 
             Rectangle {
-                width: parent.radius
-                height: parent.radius
-                anchors.bottom: parent.bottom
+                id: semiArea
+                anchors.top: parent.top
+                height: parent.height - contentHeight
                 anchors.right: parent.right
                 anchors.left: parent.left
-                color: parent.color
-            }
-        }
-    }
-
-
-    MouseArea {
-        id: fullArea
-        anchors.fill: parent
-        enabled: (root.state === "expanded" || root.state === "opened")
-        onClicked: {
-            if (root.state === "expanded") {
-                root.state = "collapsed"
-                return
+                visible: true
+                color: "transparent"
             }
 
-            if (root.state === "opened") {
-                root.state = "closed"
-                return
-            }
-        }
-    }
+            Rectangle {
+                id: contentArea
 
-    Drag.active: dragArea.drag.active
+                anchors.top: semiArea.bottom
+                height: contentHeight
+                radius: 16
+                color: root.defaultColor
+                border.width: 1
+                border.color: root.borderColor
+                width: parent.width
+                visible: true
 
-    MouseArea {
-        id: dragArea
+                Rectangle {
+                    width: parent.radius
+                    height: parent.radius
+                    anchors.bottom: parent.bottom
+                    anchors.right: parent.right
+                    anchors.left: parent.left
+                    color: parent.color
+                }
 
-        anchors.fill: parent
+                MouseArea {
+                    id: dragArea
 
-        cursorShape: (root.state === "opened"  || root.state === "expanded") ? Qt.PointingHandCursor : Qt.ArrowCursor
-        hoverEnabled: true
+                    anchors.fill: parent
 
-        drag.target: parent
-        drag.axis: Drag.YAxis
-        drag.maximumY: parent.height
-        drag.minimumY: parent.height - root.height
+                    cursorShape: (root.state === "opened"  || root.state === "expanded") ? Qt.PointingHandCursor : Qt.ArrowCursor
+                    hoverEnabled: true
 
-        /** If drag area is released at any point other than min or max y, transition to the other state */
-        onReleased: {
-            if (root.state === "closed" && root.y < dragArea.drag.maximumY) {
-                root.state = "opened"
-                PageController.drawerOpen()
-                return
-            }
+                    drag.target: root
+                    drag.axis: Drag.YAxis
+                    drag.maximumY: root.height
+                    drag.minimumY: root.height - root.height
 
-            if (root.state === "opened" && root.y > dragArea.drag.minimumY) {
-                root.state = "closed"
-                PageController.drawerClose()
-                return
-            }
+                    /** If drag area is released at any point other than min or max y, transition to the other state */
+                    onReleased: {
+                        if (root.state === "closed" && root.y < dragArea.drag.maximumY) {
+                            root.state = "opened"
+                            PageController.drawerOpen()
+                            return
+                        }
 
-            if (root.state === "collapsed" && root.y < dragArea.drag.maximumY) {
-                root.state = "expanded"
-                return
-            }
-            if (root.state === "expanded" && root.y > dragArea.drag.minimumY) {
-                root.state = "collapsed"
-                return
-            }
-        }
+                        if (root.state === "opened" && root.y > dragArea.drag.minimumY) {
+                            root.state = "closed"
+                            PageController.drawerClose()
+                            return
+                        }
 
-        onClicked: {
-            if (root.state === "expanded") {
-                root.state = "collapsed"
-                return
-            }
+                        if (root.state === "collapsed" && root.y < dragArea.drag.maximumY) {
+                            root.state = "expanded"
+                            return
+                        }
+                        if (root.state === "expanded" && root.y > dragArea.drag.minimumY) {
+                            root.state = "collapsed"
+                            return
+                        }
+                    }
 
-            if (root.state === "opened") {
-                root.state = "closed"
-                return
+                    onClicked: {
+                        if (root.state === "expanded") {
+                            root.state = "collapsed"
+                            return
+                        }
+
+                        if (root.state === "opened") {
+                            root.state = "closed"
+                            return
+                        }
+                    }
+
+//                    onEntered: {
+//                        fullArea.enabled = false
+//                    }
+
+//                    onExited: {
+//                        fullArea.enabled = true
+//                    }
+                }
             }
         }
     }

From d0f83584313d60c4c0507b60d5d78118ffb9cbdf Mon Sep 17 00:00:00 2001
From: ronoaer <ronoaer@gmail.com>
Date: Sun, 15 Oct 2023 17:29:22 +0800
Subject: [PATCH 227/278] removed invalid code, and fixed top button
 hidden-shown

---
 client/ui/qml/Controls2/Drawer2Type.qml       | 67 +++++++++----------
 .../Pages2/PageProtocolOpenVpnSettings.qml    |  4 +-
 client/ui/qml/Pages2/PageProtocolRaw.qml      |  4 +-
 .../ui/qml/Pages2/PageServiceDnsSettings.qml  |  4 +-
 .../ui/qml/Pages2/PageServiceSftpSettings.qml |  4 +-
 .../Pages2/PageServiceTorWebsiteSettings.qml  |  4 +-
 .../ui/qml/Pages2/PageSettingsApplication.qml |  4 +-
 client/ui/qml/Pages2/PageSettingsBackup.qml   |  4 +-
 client/ui/qml/Pages2/PageSettingsDns.qml      |  4 +-
 client/ui/qml/Pages2/PageSettingsLogging.qml  |  4 +-
 .../ui/qml/Pages2/PageSettingsServerData.qml  |  8 +--
 .../qml/Pages2/PageSettingsServerProtocol.qml |  4 +-
 .../qml/Pages2/PageSettingsSplitTunneling.qml |  4 +-
 client/ui/qml/Pages2/PageStart.qml            |  2 +-
 14 files changed, 58 insertions(+), 63 deletions(-)

diff --git a/client/ui/qml/Controls2/Drawer2Type.qml b/client/ui/qml/Controls2/Drawer2Type.qml
index 2f10ec5d..2daae742 100644
--- a/client/ui/qml/Controls2/Drawer2Type.qml
+++ b/client/ui/qml/Controls2/Drawer2Type.qml
@@ -14,9 +14,9 @@ Item {
         }
     }
 
-    visible: false
+    signal closed
 
-    signal close()
+    visible: false
 
     property bool needCloseButton: true
 
@@ -28,7 +28,6 @@ Item {
     property double scaely
     property int contentHeight: 0
     property Item contentParent: contentArea
-    // property bool inContentArea: false
 
     y: parent.height - root.height
 
@@ -44,7 +43,7 @@ Item {
         width: parent.width
         radius: 16
         color:  "transparent"
-        border.color: "transparent" //"green"
+        border.color: "transparent"
         border.width: 1
         visible: true
 
@@ -52,6 +51,8 @@ Item {
             id: fullArea
             anchors.fill: parent
             enabled: (root.state === "expanded" || root.state === "opened")
+            hoverEnabled: true
+
             onClicked: {
                 if (root.state === "expanded") {
                     root.state = "collapsed"
@@ -65,7 +66,7 @@ Item {
             }
 
             Rectangle {
-                id: semiArea
+                id: placeAreaHolder
                 anchors.top: parent.top
                 height: parent.height - contentHeight
                 anchors.right: parent.right
@@ -77,7 +78,7 @@ Item {
             Rectangle {
                 id: contentArea
 
-                anchors.top: semiArea.bottom
+                anchors.top: placeAreaHolder.bottom
                 height: contentHeight
                 radius: 16
                 color: root.defaultColor
@@ -112,13 +113,13 @@ Item {
                     onReleased: {
                         if (root.state === "closed" && root.y < dragArea.drag.maximumY) {
                             root.state = "opened"
-                            PageController.drawerOpen()
+                            // PageController.drawerOpen()
                             return
                         }
 
                         if (root.state === "opened" && root.y > dragArea.drag.minimumY) {
                             root.state = "closed"
-                            PageController.drawerClose()
+                            // PageController.drawerClose()
                             return
                         }
 
@@ -134,23 +135,17 @@ Item {
 
                     onClicked: {
                         if (root.state === "expanded") {
+                            // PageController.drawerOpen()
                             root.state = "collapsed"
                             return
                         }
 
                         if (root.state === "opened") {
+                            // PageController.drawerClose()
                             root.state = "closed"
                             return
                         }
                     }
-
-//                    onEntered: {
-//                        fullArea.enabled = false
-//                    }
-
-//                    onExited: {
-//                        fullArea.enabled = true
-//                    }
                 }
             }
         }
@@ -163,14 +158,23 @@ Item {
                 PageController.updateNavigationBarColor(initialPageNavigationBarColor)
             }
 
-            PageController.drawerClose()
+            if (needCloseButton) {
+                PageController.drawerClose()
+            }
+
+            closed()
+
             return
         }
         if (root.state === "expanded" || root.state === "opened") {
             if (PageController.getInitialPageNavigationBarColor() !== 0xFF1C1D21) {
                 PageController.updateNavigationBarColor(0xFF1C1D21)
             }
-            PageController.drawerOpen()
+
+            if (needCloseButton) {
+                PageController.drawerOpen()
+            }
+
             return
         }
     }
@@ -275,31 +279,22 @@ Item {
 
 
         animationVisible.running = true
-
-        if (needCloseButton) {
-            PageController.drawerOpen()
-        }
-
-        if (PageController.getInitialPageNavigationBarColor() !== 0xFF1C1D21) {
-            PageController.updateNavigationBarColor(0xFF1C1D21)
-        }
     }
 
-    function onClose() {
-        if (needCloseButton) {
-            PageController.drawerClose()
-        }
-
-        var initialPageNavigationBarColor = PageController.getInitialPageNavigationBarColor()
-        if (initialPageNavigationBarColor !== 0xFF1C1D21) {
-            PageController.updateNavigationBarColor(initialPageNavigationBarColor)
-        }
-
+    function close() {
         root.visible = false
+        root.state = "closed"
     }
 
     onVisibleChanged: {
+        // e.g cancel, ......
         if (!visible) {
+            if (root.state === "opened") {
+                if (needCloseButton) {
+                    PageController.drawerClose()
+                }
+            }
+
             close()
         }
     }
diff --git a/client/ui/qml/Pages2/PageProtocolOpenVpnSettings.qml b/client/ui/qml/Pages2/PageProtocolOpenVpnSettings.qml
index 2861ece3..3e75474b 100644
--- a/client/ui/qml/Pages2/PageProtocolOpenVpnSettings.qml
+++ b/client/ui/qml/Pages2/PageProtocolOpenVpnSettings.qml
@@ -369,12 +369,12 @@ PageType {
                                 questionDrawer.noButtonText = qsTr("Cancel")
 
                                 questionDrawer.yesButtonFunction = function() {
-                                    questionDrawer.onClose()
+                                    questionDrawer.close()
                                     PageController.goToPage(PageEnum.PageDeinstalling)
                                     InstallController.removeCurrentlyProcessedContainer()
                                 }
                                 questionDrawer.noButtonFunction = function() {
-                                    questionDrawer.onClose()
+                                    questionDrawer.close()
                                 }
                                 questionDrawer.open()
                             }
diff --git a/client/ui/qml/Pages2/PageProtocolRaw.qml b/client/ui/qml/Pages2/PageProtocolRaw.qml
index f2a17686..23f192c7 100644
--- a/client/ui/qml/Pages2/PageProtocolRaw.qml
+++ b/client/ui/qml/Pages2/PageProtocolRaw.qml
@@ -183,12 +183,12 @@ PageType {
                     questionDrawer.noButtonText = qsTr("Cancel")
 
                     questionDrawer.yesButtonFunction = function() {
-                        questionDrawer.onClose()
+                        questionDrawer.close()
                         PageController.goToPage(PageEnum.PageDeinstalling)
                         InstallController.removeCurrentlyProcessedContainer()
                     }
                     questionDrawer.noButtonFunction = function() {
-                        questionDrawer.onClose()
+                        questionDrawer.close()
                     }
                     questionDrawer.open()
                 }
diff --git a/client/ui/qml/Pages2/PageServiceDnsSettings.qml b/client/ui/qml/Pages2/PageServiceDnsSettings.qml
index 70aba8e2..9ad3b289 100644
--- a/client/ui/qml/Pages2/PageServiceDnsSettings.qml
+++ b/client/ui/qml/Pages2/PageServiceDnsSettings.qml
@@ -68,12 +68,12 @@ PageType {
                     questionDrawer.noButtonText = qsTr("Cancel")
 
                     questionDrawer.yesButtonFunction = function() {
-                        questionDrawer.onClose()
+                        questionDrawer.close()
                         PageController.goToPage(PageEnum.PageDeinstalling)
                         InstallController.removeCurrentlyProcessedContainer()
                     }
                     questionDrawer.noButtonFunction = function() {
-                        questionDrawer.onClose()
+                        questionDrawer.close()
                     }
                     questionDrawer.open()
                 }
diff --git a/client/ui/qml/Pages2/PageServiceSftpSettings.qml b/client/ui/qml/Pages2/PageServiceSftpSettings.qml
index 0af47cdd..189267af 100644
--- a/client/ui/qml/Pages2/PageServiceSftpSettings.qml
+++ b/client/ui/qml/Pages2/PageServiceSftpSettings.qml
@@ -265,12 +265,12 @@ PageType {
                                 questionDrawer.noButtonText = qsTr("Cancel")
 
                                 questionDrawer.yesButtonFunction = function() {
-                                    questionDrawer.onClose()
+                                    questionDrawer.close()
                                     PageController.goToPage(PageEnum.PageDeinstalling)
                                     InstallController.removeCurrentlyProcessedContainer()
                                 }
                                 questionDrawer.noButtonFunction = function() {
-                                    questionDrawer.onClose()
+                                    questionDrawer.close()
                                 }
                                 questionDrawer.open()
                             }
diff --git a/client/ui/qml/Pages2/PageServiceTorWebsiteSettings.qml b/client/ui/qml/Pages2/PageServiceTorWebsiteSettings.qml
index deff35eb..b69f5f63 100644
--- a/client/ui/qml/Pages2/PageServiceTorWebsiteSettings.qml
+++ b/client/ui/qml/Pages2/PageServiceTorWebsiteSettings.qml
@@ -143,12 +143,12 @@ PageType {
                     questionDrawer.noButtonText = qsTr("Cancel")
 
                     questionDrawer.yesButtonFunction = function() {
-                        questionDrawer.onClose()
+                        questionDrawer.close()
                         PageController.goToPage(PageEnum.PageDeinstalling)
                         InstallController.removeCurrentlyProcessedContainer()
                     }
                     questionDrawer.noButtonFunction = function() {
-                        questionDrawer.onClose()
+                        questionDrawer.close()
                     }
                     questionDrawer.open()
                 }
diff --git a/client/ui/qml/Pages2/PageSettingsApplication.qml b/client/ui/qml/Pages2/PageSettingsApplication.qml
index 225e2b14..bd602636 100644
--- a/client/ui/qml/Pages2/PageSettingsApplication.qml
+++ b/client/ui/qml/Pages2/PageSettingsApplication.qml
@@ -152,12 +152,12 @@ PageType {
                     questionDrawer.noButtonText = qsTr("Cancel")
 
                     questionDrawer.yesButtonFunction = function() {
-                        questionDrawer.onClose()
+                        questionDrawer.close()
                         SettingsController.clearSettings()
                         PageController.replaceStartPage()
                     }
                     questionDrawer.noButtonFunction = function() {
-                        questionDrawer.onClose()
+                        questionDrawer.close()
                     }
                     questionDrawer.open()
                 }
diff --git a/client/ui/qml/Pages2/PageSettingsBackup.qml b/client/ui/qml/Pages2/PageSettingsBackup.qml
index 61370dab..1fb160a1 100644
--- a/client/ui/qml/Pages2/PageSettingsBackup.qml
+++ b/client/ui/qml/Pages2/PageSettingsBackup.qml
@@ -138,13 +138,13 @@ PageType {
         questionDrawer.noButtonText = qsTr("Cancel")
 
         questionDrawer.yesButtonFunction = function() {
-            questionDrawer.onClose()
+            questionDrawer.close()
             PageController.showBusyIndicator(true)
             SettingsController.restoreAppConfig(filePath)
             PageController.showBusyIndicator(false)
         }
         questionDrawer.noButtonFunction = function() {
-            questionDrawer.onClose()
+            questionDrawer.close()
         }
         questionDrawer.open()
     }
diff --git a/client/ui/qml/Pages2/PageSettingsDns.qml b/client/ui/qml/Pages2/PageSettingsDns.qml
index 917c6992..553eeacd 100644
--- a/client/ui/qml/Pages2/PageSettingsDns.qml
+++ b/client/ui/qml/Pages2/PageSettingsDns.qml
@@ -91,7 +91,7 @@ PageType {
                     questionDrawer.noButtonText = qsTr("Cancel")
 
                     questionDrawer.yesButtonFunction = function() {
-                        questionDrawer.onClose()
+                        questionDrawer.close()
                         SettingsController.primaryDns = "1.1.1.1"
                         primaryDns.textFieldText = SettingsController.primaryDns
                         SettingsController.secondaryDns = "1.0.0.1"
@@ -99,7 +99,7 @@ PageType {
                         PageController.showNotificationMessage(qsTr("Settings have been reset"))
                     }
                     questionDrawer.noButtonFunction = function() {
-                        questionDrawer.onClose()
+                        questionDrawer.close()
                     }
                     questionDrawer.open()
                 }
diff --git a/client/ui/qml/Pages2/PageSettingsLogging.qml b/client/ui/qml/Pages2/PageSettingsLogging.qml
index 1532d1dc..9b9899ab 100644
--- a/client/ui/qml/Pages2/PageSettingsLogging.qml
+++ b/client/ui/qml/Pages2/PageSettingsLogging.qml
@@ -146,14 +146,14 @@ PageType {
                             questionDrawer.noButtonText = qsTr("Cancel")
 
                             questionDrawer.yesButtonFunction = function() {
-                                questionDrawer.onClose()
+                                questionDrawer.close()
                                 PageController.showBusyIndicator(true)
                                 SettingsController.clearLogs()
                                 PageController.showBusyIndicator(false)
                                 PageController.showNotificationMessage(qsTr("Logs have been cleaned up"))
                             }
                             questionDrawer.noButtonFunction = function() {
-                                questionDrawer.onClose()
+                                questionDrawer.close()
                             }
                             questionDrawer.open()
                         }
diff --git a/client/ui/qml/Pages2/PageSettingsServerData.qml b/client/ui/qml/Pages2/PageSettingsServerData.qml
index 5e3f1939..b130eef9 100644
--- a/client/ui/qml/Pages2/PageSettingsServerData.qml
+++ b/client/ui/qml/Pages2/PageSettingsServerData.qml
@@ -94,13 +94,13 @@ PageType {
                     questionDrawer.noButtonText = qsTr("Cancel")
 
                     questionDrawer.yesButtonFunction = function() {
-                        questionDrawer.onClose()
+                        questionDrawer.close()
                         PageController.showBusyIndicator(true)
                         SettingsController.clearCachedProfiles()
                         PageController.showBusyIndicator(false)
                     }
                     questionDrawer.noButtonFunction = function() {
-                        questionDrawer.onClose()
+                        questionDrawer.close()
                     }
                     questionDrawer.open()
                 }
@@ -172,7 +172,7 @@ PageType {
                     questionDrawer.noButtonText = qsTr("Cancel")
 
                     questionDrawer.yesButtonFunction = function() {
-                        questionDrawer.onClose()
+                        questionDrawer.close()
                         PageController.goToPage(PageEnum.PageDeinstalling)
                         if (ServersModel.isDefaultServerCurrentlyProcessed() && ConnectionController.isConnected) {
                             ConnectionController.closeConnection()
@@ -180,7 +180,7 @@ PageType {
                         InstallController.removeAllContainers()
                     }
                     questionDrawer.noButtonFunction = function() {
-                        questionDrawer.onClose()
+                        questionDrawer.close()
                     }
                     questionDrawer.open()
                 }
diff --git a/client/ui/qml/Pages2/PageSettingsServerProtocol.qml b/client/ui/qml/Pages2/PageSettingsServerProtocol.qml
index 594e4520..d1c8b22b 100644
--- a/client/ui/qml/Pages2/PageSettingsServerProtocol.qml
+++ b/client/ui/qml/Pages2/PageSettingsServerProtocol.qml
@@ -119,12 +119,12 @@ PageType {
                     questionDrawer.noButtonText = qsTr("Cancel")
 
                     questionDrawer.yesButtonFunction = function() {
-                        questionDrawer.onClose()
+                        questionDrawer.close()
                         PageController.goToPage(PageEnum.PageDeinstalling)
                         InstallController.removeCurrentlyProcessedContainer()
                     }
                     questionDrawer.noButtonFunction = function() {
-                        questionDrawer.onClose()
+                        questionDrawer.close()
                     }
                     questionDrawer.open()
                 }
diff --git a/client/ui/qml/Pages2/PageSettingsSplitTunneling.qml b/client/ui/qml/Pages2/PageSettingsSplitTunneling.qml
index a88c576b..5bbd1003 100644
--- a/client/ui/qml/Pages2/PageSettingsSplitTunneling.qml
+++ b/client/ui/qml/Pages2/PageSettingsSplitTunneling.qml
@@ -202,11 +202,11 @@ PageType {
                                 questionDrawer.noButtonText = qsTr("Cancel")
 
                                 questionDrawer.yesButtonFunction = function() {
-                                    questionDrawer.onClose()
+                                    questionDrawer.close()
                                     SitesController.removeSite(index)
                                 }
                                 questionDrawer.noButtonFunction = function() {
-                                    questionDrawer.onClose()
+                                    questionDrawer.close()
                                 }
                                 questionDrawer.open()
                             }
diff --git a/client/ui/qml/Pages2/PageStart.qml b/client/ui/qml/Pages2/PageStart.qml
index 923d1e79..55795465 100644
--- a/client/ui/qml/Pages2/PageStart.qml
+++ b/client/ui/qml/Pages2/PageStart.qml
@@ -245,7 +245,7 @@ PageType {
     ConnectionTypeSelectionDrawer {
         id: connectionTypeSelection
 
-        onClose: function() {
+        onClosed: {
             tabBar.setCurrentIndex(tabBar.previousIndex)
         }
     }

From 29b4966119a57bb4631bb8ea289a5a27444471d6 Mon Sep 17 00:00:00 2001
From: ronoaer <ronoaer@gmail.com>
Date: Sun, 15 Oct 2023 17:34:35 +0800
Subject: [PATCH 228/278] shown ConnectionTypeSelectionDrawer on  top level
 alway

---
 client/ui/qml/Pages2/PageStart.qml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/client/ui/qml/Pages2/PageStart.qml b/client/ui/qml/Pages2/PageStart.qml
index 55795465..8afad392 100644
--- a/client/ui/qml/Pages2/PageStart.qml
+++ b/client/ui/qml/Pages2/PageStart.qml
@@ -245,6 +245,8 @@ PageType {
     ConnectionTypeSelectionDrawer {
         id: connectionTypeSelection
 
+        z: 1
+
         onClosed: {
             tabBar.setCurrentIndex(tabBar.previousIndex)
         }

From 6d05b6845edbe1b32de680c4c5dd57f3d822e13d Mon Sep 17 00:00:00 2001
From: pokamest <pokamest@gmail.com>
Date: Sun, 15 Oct 2023 10:53:09 +0100
Subject: [PATCH 229/278] VPN protocol descriptions updated

---
 client/containers/containers_defs.cpp   |  97 ++++++++-----
 client/translations/amneziavpn_ru.ts    | 175 +++++++++++++-----------
 client/translations/amneziavpn_zh_CN.ts |  95 +++++++------
 3 files changed, 211 insertions(+), 156 deletions(-)

diff --git a/client/containers/containers_defs.cpp b/client/containers/containers_defs.cpp
index d4f45ada..b6f1b111 100644
--- a/client/containers/containers_defs.cpp
+++ b/client/containers/containers_defs.cpp
@@ -127,24 +127,30 @@ QMap<DockerContainer, QString> ContainerProps::containerDetailedDescriptions()
     return {
         { DockerContainer::OpenVpn,
           QObject::tr(
-                  "The time-tested most popular VPN protocol.\n\n"
-                  "Uses a proprietary security protocol with SSL/TLS for encryption and key exchange and supports "
-                  "various authentication methods, making it suitable for a variety of devices and operating "
-                  "systems.\n\n"
-                  "* Normal power consumption on mobile devices\n"
-                  "* Flexible customisation to suit user needs to work with different operating systems and devices.\n"
-                  "* Recognised by DPI analysis systems and therefore susceptible to blocking.\n"
-                  "* Can operate over both TCP and UDP network protocols.") },
+                      "OpenVPN stands as one of the most popular and time-tested VPN protocols available.\n"
+                      "It employs its unique security protocol, "
+                      "leveraging the strength of SSL/TLS for encryption and key exchange. "
+                      "Furthermore, OpenVPN's support for a multitude of authentication methods makes it versatile and adaptable, "
+                      "catering to a wide range of devices and operating systems. "
+                      "Due to its open-source nature, OpenVPN benefits from extensive scrutiny by the global community, "
+                      "which continually reinforces its security. "
+                      "With a strong balance of performance, security, and compatibility, "
+                      "OpenVPN remains a top choice for privacy-conscious individuals and businesses alike.\n\n"
+                      "* Available in the AmneziaVPN across all platforms\n"
+                      "* Normal power consumption on mobile devices\n"
+                      "* Flexible customisation to suit user needs to work with different operating systems and devices\n"
+                      "* Recognised by DPI analysis systems and therefore susceptible to blocking\n"
+                      "* Can operate over both TCP and UDP network protocols.") },
         { DockerContainer::ShadowSocks,
-          QObject::tr("Based on the SOCKS5 proxy protocol, which protects the connection using the AEAD cipher - "
-                      "roughly along the same lines as SSH tunnelling. A Shadowsocks connection is difficult to "
-                      "identify because it is virtually identical to a normal HTTPS connection.\n\n"
-                      "However, some traffic analysis systems can still recognise a ShadowSocks connection, so in "
-                      "countries with high levels of censorship we recommend using OpenVPN in conjunction with Cloak.\n"
-                      "* Average power consumption on mobile devices (higher than OpenVPN).\n"
-                      "* It is possible to configure the encryption protocol.\n"
-                      "* Recognised by some DPI analysis systems\n"
-                      "* Works only via TCP network protocol\n") },
+          QObject::tr("Shadowsocks, inspired by the SOCKS5 protocol, safeguards the connection using the AEAD cipher. "
+                      "Although Shadowsocks is designed to be discreet and challenging to identify, it isn't identical to a standard HTTPS connection."
+                      "However, certain traffic analysis systems might still detect a Shadowsocks connection. "
+                      "Due to limited support in Amnezia, it's recommended to use AmneziaWG protocol.\n\n"
+                      "* Available in the AmneziaVPN only on desktop platforms\n"
+                      "* Normal power consumption on mobile devices\n\n"
+                      "* Configurable encryption protocol\n"
+                      "* Detectable by some DPI systems\n"
+                      "* Works over TCP network protocol.") },
         { DockerContainer::Cloak,
           QObject::tr("This is a combination of the OpenVPN protocol and the Cloak plugin designed specifically for "
                       "blocking protection.\n\n"
@@ -157,34 +163,53 @@ QMap<DockerContainer, QString> ContainerProps::containerDetailedDescriptions()
                       "Immediately after receiving the first data packet, Cloak authenticates the incoming connection. "
                       "If authentication fails, the plugin masks the server as a fake website and your VPN becomes "
                       "invisible to analysis systems.\n\n"
-                      "If there is a high level of Internet censorship in your region, we advise you to use only "
-                      "OpenVPN over Cloak from the first connection\n"
+                      "If there is a extreme level of Internet censorship in your region, we advise you to use only "
+                      "OpenVPN over Cloak from the first connection\n\n"
+                      "* Available in the AmneziaVPN across all platforms\n"
                       "* High power consumption on mobile devices\n"
                       "* Flexible settings\n"
                       "* Not recognised by DPI analysis systems\n"
-                      "* Works via TCP network protocol\n") },
+                      "* Works over TCP network protocol, 443 port.\n") },
         { DockerContainer::WireGuard,
           QObject::tr("A relatively new popular VPN protocol with a simplified architecture.\n"
                       "Provides stable VPN connection, high performance on all devices. Uses hard-coded encryption "
                       "settings. WireGuard compared to OpenVPN has lower latency and better data transfer throughput.\n"
-
-                      "* Low power consumption on mobile devices.\n"
-                      "* Minimum number of settings.\n"
-                      "* Easily recognised by DPI analysis systems, susceptible to blocking.\n"
-                      "* Works via UDP network protocol.\n") },
-        { DockerContainer::Awg, QObject::tr("AmneziaWG container") },
+                      "WireGuard is very susceptible to blocking due to its distinct packet signatures. "
+                      "Unlike some other VPN protocols that employ obfuscation techniques, "
+                      "the consistent signature patterns of WireGuard packets can be more easily identified and "
+                      "thus blocked by advanced Deep Packet Inspection (DPI) systems and other network monitoring tools.\n\n"
+                      "* Available in the AmneziaVPN across all platforms\n"
+                      "* Low power consumption\n"
+                      "* Minimum number of settings\n"
+                      "* Easily recognised by DPI analysis systems, susceptible to blocking\n"
+                      "* Works over UDP network protocol.") },
+        { DockerContainer::Awg,
+          QObject::tr("A modern iteration of the popular VPN protocol, "
+                      "AmneziaWG builds upon the foundation set by WireGuard, "
+                      "retaining its simplified architecture and high-performance capabilities across devices.\n"
+                      "While WireGuard is known for its efficiency, "
+                      "it had issues with being easily detected due to its distinct packet signatures. "
+                      "AmneziaWG solves this problem by using better obfuscation methods, "
+                      "making its traffic blend in with regular internet traffic.\n"
+                      "This means that AmneziaWG keeps the fast performance of the original "
+                      "while adding an extra layer of stealth, "
+                      "making it a great choice for those wanting a fast and discreet VPN connection.\n\n"
+                      "* Available in the AmneziaVPN across all platforms\n"
+                      "* Low power consumption\n"
+                      "* Minimum number of settings\n"
+                      "* Not recognised by DPI analysis systems, resistant to blocking\n"
+                      "* Works over UDP network protocol.") },
         { DockerContainer::Ipsec,
-          QObject::tr("A modern stable protocol.\n\n"
-
-                      "IKEv2 with IPSec encryption layer. Transmits data over fixed UDP ports 500 and 4500 protecting "
-                      "them with strong 3DES and AES crypto algorithms. Allows very fast switching between networks "
-                      "and devices. Due to its security, stability and speed, IKEv2 is currently one of the best VPN "
-                      "solutions for mobile devices. Vulnerable to detection and blocking.\n"
-
+          QObject::tr("IKEv2, paired with the IPSec encryption layer, stands as a modern and stable VPN protocol.\n"
+                      "One of its distinguishing features is its ability to swiftly switch between networks and devices, "
+                      "making it particularly adaptive in dynamic network environments. \n"
+                      "While it offers a blend of security, stability, and speed, "
+                      "it's essential to note that IKEv2 can be easily detected and is susceptible to blocking.\n\n"
+                      "* Available in the AmneziaVPN only on Windows\n"
                       "* Low power consumption, on mobile devices\n"
-                      "* Minimal configuration.\n"
-                      "* Recognised by DPI analysis systems.\n"
-                      "* Works only over UDP network protocol\n") },
+                      "* Minimal configuration\n"
+                      "* Recognised by DPI analysis systems\n"
+                      "* Works over UDP network protocol, ports 500 and 4500.") },
 
         { DockerContainer::TorWebSite, QObject::tr("Website in Tor network") },
         { DockerContainer::Dns, QObject::tr("DNS Service") },
diff --git a/client/translations/amneziavpn_ru.ts b/client/translations/amneziavpn_ru.ts
index d3eef897..7ba02dcb 100644
--- a/client/translations/amneziavpn_ru.ts
+++ b/client/translations/amneziavpn_ru.ts
@@ -2414,74 +2414,7 @@ and will not be shared or disclosed to the Amnezia or any third parties</source>
         <translation>IPsec</translation>
     </message>
     <message>
-        <location filename="../containers/containers_defs.cpp" line="129"/>
-        <source>The time-tested most popular VPN protocol.
-
-Uses a proprietary security protocol with SSL/TLS for encryption and key exchange and supports various authentication methods, making it suitable for a variety of devices and operating systems.
-
-* Normal power consumption on mobile devices
-* Flexible customisation to suit user needs to work with different operating systems and devices.
-* Recognised by DPI analysis systems and therefore susceptible to blocking.
-* Can operate over both TCP and UDP network protocols.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../containers/containers_defs.cpp" line="139"/>
-        <source>Based on the SOCKS5 proxy protocol, which protects the connection using the AEAD cipher - roughly along the same lines as SSH tunnelling. A Shadowsocks connection is difficult to identify because it is virtually identical to a normal HTTPS connection.
-
-However, some traffic analysis systems can still recognise a ShadowSocks connection, so in countries with high levels of censorship we recommend using OpenVPN in conjunction with Cloak.
-* Average power consumption on mobile devices (higher than OpenVPN).
-* It is possible to configure the encryption protocol.
-* Recognised by some DPI analysis systems
-* Works only via TCP network protocol
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../containers/containers_defs.cpp" line="149"/>
-        <source>This is a combination of the OpenVPN protocol and the Cloak plugin designed specifically for blocking protection.
-
-OpenVPN provides a secure VPN connection by encrypting all Internet traffic between the client and the server.
-
-Cloak protects OpenVPN from detection and blocking. 
-
-Cloak can modify packet metadata so that it completely masks VPN traffic as normal web traffic, and also protects the VPN from detection by Active Probing. This makes it very resistant to being detected
-
-Immediately after receiving the first data packet, Cloak authenticates the incoming connection. If authentication fails, the plugin masks the server as a fake website and your VPN becomes invisible to analysis systems.
-
-If there is a high level of Internet censorship in your region, we advise you to use only OpenVPN over Cloak from the first connection
-* High power consumption on mobile devices
-* Flexible settings
-* Not recognised by DPI analysis systems
-* Works via TCP network protocol
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../containers/containers_defs.cpp" line="167"/>
-        <source>A relatively new popular VPN protocol with a simplified architecture.
-Provides stable VPN connection, high performance on all devices. Uses hard-coded encryption settings. WireGuard compared to OpenVPN has lower latency and better data transfer throughput.
-* Low power consumption on mobile devices.
-* Minimum number of settings.
-* Easily recognised by DPI analysis systems, susceptible to blocking.
-* Works via UDP network protocol.
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../containers/containers_defs.cpp" line="177"/>
-        <source>A modern stable protocol.
-
-IKEv2 with IPSec encryption layer. Transmits data over fixed UDP ports 500 and 4500 protecting them with strong 3DES and AES crypto algorithms. Allows very fast switching between networks and devices. Due to its security, stability and speed, IKEv2 is currently one of the best VPN solutions for mobile devices. Vulnerable to detection and blocking.
-* Low power consumption, on mobile devices
-* Minimal configuration.
-* Recognised by DPI analysis systems.
-* Works only over UDP network protocol
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../containers/containers_defs.cpp" line="190"/>
+        <location filename="../containers/containers_defs.cpp" line="216"/>
         <source>DNS Service</source>
         <translation>DNS Сервис</translation>
     </message>
@@ -2492,7 +2425,7 @@ IKEv2 with IPSec encryption layer. Transmits data over fixed UDP ports 500 and 4
     </message>
     <message>
         <location filename="../containers/containers_defs.cpp" line="90"/>
-        <location filename="../containers/containers_defs.cpp" line="189"/>
+        <location filename="../containers/containers_defs.cpp" line="215"/>
         <source>Website in Tor network</source>
         <translation>Веб-сайт в сети Tor</translation>
     </message>
@@ -2547,12 +2480,96 @@ IKEv2 with IPSec encryption layer. Transmits data over fixed UDP ports 500 and 4
         <translation>Создайте на сервере файловое хранилище для безопасного хранения и передачи файлов.</translation>
     </message>
     <message>
-        <location filename="../containers/containers_defs.cpp" line="175"/>
-        <source>AmneziaWG container</source>
-        <translation>AmneziaWG протокол</translation>
+        <location filename="../containers/containers_defs.cpp" line="129"/>
+        <source>OpenVPN stands as one of the most popular and time-tested VPN protocols available.
+It employs its unique security protocol, leveraging the strength of SSL/TLS for encryption and key exchange. Furthermore, OpenVPN&apos;s support for a multitude of authentication methods makes it versatile and adaptable, catering to a wide range of devices and operating systems. Due to its open-source nature, OpenVPN benefits from extensive scrutiny by the global community, which continually reinforces its security. With a strong balance of performance, security, and compatibility, OpenVPN remains a top choice for privacy-conscious individuals and businesses alike.
+
+* Available in the AmneziaVPN across all platforms
+* Normal power consumption on mobile devices
+* Flexible customisation to suit user needs to work with different operating systems and devices
+* Recognised by DPI analysis systems and therefore susceptible to blocking
+* Can operate over both TCP and UDP network protocols.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../containers/containers_defs.cpp" line="191"/>
+        <location filename="../containers/containers_defs.cpp" line="145"/>
+        <source>Shadowsocks, inspired by the SOCKS5 protocol, safeguards the connection using the AEAD cipher. Although Shadowsocks is designed to be discreet and challenging to identify, it isn&apos;t identical to a standard HTTPS connection.However, certain traffic analysis systems might still detect a Shadowsocks connection. Due to limited support in Amnezia, it&apos;s recommended to use AmneziaWG protocol.
+
+* Available in the AmneziaVPN only on desktop platforms
+* Normal power consumption on mobile devices
+
+* Configurable encryption protocol
+* Detectable by some DPI systems
+* Works over TCP network protocol.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../containers/containers_defs.cpp" line="155"/>
+        <source>This is a combination of the OpenVPN protocol and the Cloak plugin designed specifically for blocking protection.
+
+OpenVPN provides a secure VPN connection by encrypting all Internet traffic between the client and the server.
+
+Cloak protects OpenVPN from detection and blocking. 
+
+Cloak can modify packet metadata so that it completely masks VPN traffic as normal web traffic, and also protects the VPN from detection by Active Probing. This makes it very resistant to being detected
+
+Immediately after receiving the first data packet, Cloak authenticates the incoming connection. If authentication fails, the plugin masks the server as a fake website and your VPN becomes invisible to analysis systems.
+
+If there is a extreme level of Internet censorship in your region, we advise you to use only OpenVPN over Cloak from the first connection
+
+* Available in the AmneziaVPN across all platforms
+* High power consumption on mobile devices
+* Flexible settings
+* Not recognised by DPI analysis systems
+* Works over TCP network protocol, 443 port.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../containers/containers_defs.cpp" line="174"/>
+        <source>A relatively new popular VPN protocol with a simplified architecture.
+Provides stable VPN connection, high performance on all devices. Uses hard-coded encryption settings. WireGuard compared to OpenVPN has lower latency and better data transfer throughput.
+WireGuard is very susceptible to blocking due to its distinct packet signatures. Unlike some other VPN protocols that employ obfuscation techniques, the consistent signature patterns of WireGuard packets can be more easily identified and thus blocked by advanced Deep Packet Inspection (DPI) systems and other network monitoring tools.
+
+* Available in the AmneziaVPN across all platforms
+* Low power consumption
+* Minimum number of settings
+* Easily recognised by DPI analysis systems, susceptible to blocking
+* Works over UDP network protocol.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../containers/containers_defs.cpp" line="187"/>
+        <source>A modern iteration of the popular VPN protocol, AmneziaWG builds upon the foundation set by WireGuard, retaining its simplified architecture and high-performance capabilities across devices.
+While WireGuard is known for its efficiency, it had issues with being easily detected due to its distinct packet signatures. AmneziaWG solves this problem by using better obfuscation methods, making its traffic blend in with regular internet traffic.
+This means that AmneziaWG keeps the fast performance of the original while adding an extra layer of stealth, making it a great choice for those wanting a fast and discreet VPN connection.
+
+* Available in the AmneziaVPN across all platforms
+* Low power consumption
+* Minimum number of settings
+* Not recognised by DPI analysis systems, resistant to blocking
+* Works over UDP network protocol.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../containers/containers_defs.cpp" line="203"/>
+        <source>A modern stable protocol.
+
+IKEv2 with IPSec encryption layer. Transmits data over fixed UDP ports 500 and 4500 protecting them with strong 3DES and AES crypto algorithms. Allows very fast switching between networks and devices. Due to its security, stability and speed, IKEv2 is currently one of the best VPN solutions for mobile devices. Vulnerable to detection and blocking.
+
+* Available in the AmneziaVPN only on Windows
+* Low power consumption, on mobile devices
+* Minimal configuration
+* Recognised by DPI analysis systems
+* Works over UDP network protocol</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>AmneziaWG container</source>
+        <translation type="vanished">AmneziaWG протокол</translation>
+    </message>
+    <message>
+        <location filename="../containers/containers_defs.cpp" line="217"/>
         <source>Sftp file sharing service - is secure FTP service</source>
         <translation>Сервис обмена файлами Sftp - безопасный FTP-сервис</translation>
     </message>
@@ -2839,32 +2856,32 @@ IKEv2 with IPSec encryption layer. Transmits data over fixed UDP ports 500 and 4
 <context>
     <name>amnezia::ContainerProps</name>
     <message>
-        <location filename="../containers/containers_defs.cpp" line="283"/>
+        <location filename="../containers/containers_defs.cpp" line="309"/>
         <source>Low</source>
         <translation>Низкий</translation>
     </message>
     <message>
-        <location filename="../containers/containers_defs.cpp" line="284"/>
+        <location filename="../containers/containers_defs.cpp" line="310"/>
         <source>Medium or High</source>
         <translation>Спедний или Высокий</translation>
     </message>
     <message>
-        <location filename="../containers/containers_defs.cpp" line="285"/>
+        <location filename="../containers/containers_defs.cpp" line="311"/>
         <source>Extreme</source>
         <translation>Экстремальный</translation>
     </message>
     <message>
-        <location filename="../containers/containers_defs.cpp" line="293"/>
+        <location filename="../containers/containers_defs.cpp" line="319"/>
         <source>I just want to increase the level of my privacy.</source>
         <translation>Я просто хочу повысить уровень своей приватности.</translation>
     </message>
     <message>
-        <location filename="../containers/containers_defs.cpp" line="294"/>
+        <location filename="../containers/containers_defs.cpp" line="320"/>
         <source>I want to bypass censorship. This option recommended in most cases.</source>
         <translation>Я хочу обойти блокировки. Этот вариант рекомендуется в большинстве случаев.</translation>
     </message>
     <message>
-        <location filename="../containers/containers_defs.cpp" line="296"/>
+        <location filename="../containers/containers_defs.cpp" line="322"/>
         <source>Most VPN protocols are blocked. Recommended if other options are not working.</source>
         <translation>Большинство VPN протоколов заблокированы. Рекомендуется, если другие варианты не работают.</translation>
     </message>
diff --git a/client/translations/amneziavpn_zh_CN.ts b/client/translations/amneziavpn_zh_CN.ts
index be519a91..d68981c4 100644
--- a/client/translations/amneziavpn_zh_CN.ts
+++ b/client/translations/amneziavpn_zh_CN.ts
@@ -2537,7 +2537,7 @@ and will not be shared or disclosed to the Amnezia or any third parties</source>
     </message>
     <message>
         <location filename="../containers/containers_defs.cpp" line="90"/>
-        <location filename="../containers/containers_defs.cpp" line="189"/>
+        <location filename="../containers/containers_defs.cpp" line="215"/>
         <source>Website in Tor network</source>
         <translation>在 Tor 网络中架设网站</translation>
     </message>
@@ -2598,30 +2598,30 @@ and will not be shared or disclosed to the Amnezia or any third parties</source>
     </message>
     <message>
         <location filename="../containers/containers_defs.cpp" line="129"/>
-        <source>The time-tested most popular VPN protocol.
-
-Uses a proprietary security protocol with SSL/TLS for encryption and key exchange and supports various authentication methods, making it suitable for a variety of devices and operating systems.
+        <source>OpenVPN stands as one of the most popular and time-tested VPN protocols available.
+It employs its unique security protocol, leveraging the strength of SSL/TLS for encryption and key exchange. Furthermore, OpenVPN&apos;s support for a multitude of authentication methods makes it versatile and adaptable, catering to a wide range of devices and operating systems. Due to its open-source nature, OpenVPN benefits from extensive scrutiny by the global community, which continually reinforces its security. With a strong balance of performance, security, and compatibility, OpenVPN remains a top choice for privacy-conscious individuals and businesses alike.
 
+* Available in the AmneziaVPN across all platforms
 * Normal power consumption on mobile devices
-* Flexible customisation to suit user needs to work with different operating systems and devices.
-* Recognised by DPI analysis systems and therefore susceptible to blocking.
+* Flexible customisation to suit user needs to work with different operating systems and devices
+* Recognised by DPI analysis systems and therefore susceptible to blocking
 * Can operate over both TCP and UDP network protocols.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../containers/containers_defs.cpp" line="139"/>
-        <source>Based on the SOCKS5 proxy protocol, which protects the connection using the AEAD cipher - roughly along the same lines as SSH tunnelling. A Shadowsocks connection is difficult to identify because it is virtually identical to a normal HTTPS connection.
+        <location filename="../containers/containers_defs.cpp" line="145"/>
+        <source>Shadowsocks, inspired by the SOCKS5 protocol, safeguards the connection using the AEAD cipher. Although Shadowsocks is designed to be discreet and challenging to identify, it isn&apos;t identical to a standard HTTPS connection.However, certain traffic analysis systems might still detect a Shadowsocks connection. Due to limited support in Amnezia, it&apos;s recommended to use AmneziaWG protocol.
 
-However, some traffic analysis systems can still recognise a ShadowSocks connection, so in countries with high levels of censorship we recommend using OpenVPN in conjunction with Cloak.
-* Average power consumption on mobile devices (higher than OpenVPN).
-* It is possible to configure the encryption protocol.
-* Recognised by some DPI analysis systems
-* Works only via TCP network protocol
-</source>
+* Available in the AmneziaVPN only on desktop platforms
+* Normal power consumption on mobile devices
+
+* Configurable encryption protocol
+* Detectable by some DPI systems
+* Works over TCP network protocol.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../containers/containers_defs.cpp" line="149"/>
+        <location filename="../containers/containers_defs.cpp" line="155"/>
         <source>This is a combination of the OpenVPN protocol and the Cloak plugin designed specifically for blocking protection.
 
 OpenVPN provides a secure VPN connection by encrypting all Internet traffic between the client and the server.
@@ -2632,35 +2632,53 @@ Cloak can modify packet metadata so that it completely masks VPN traffic as norm
 
 Immediately after receiving the first data packet, Cloak authenticates the incoming connection. If authentication fails, the plugin masks the server as a fake website and your VPN becomes invisible to analysis systems.
 
-If there is a high level of Internet censorship in your region, we advise you to use only OpenVPN over Cloak from the first connection
+If there is a extreme level of Internet censorship in your region, we advise you to use only OpenVPN over Cloak from the first connection
+
+* Available in the AmneziaVPN across all platforms
 * High power consumption on mobile devices
 * Flexible settings
 * Not recognised by DPI analysis systems
-* Works via TCP network protocol
+* Works over TCP network protocol, 443 port.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../containers/containers_defs.cpp" line="167"/>
+        <location filename="../containers/containers_defs.cpp" line="174"/>
         <source>A relatively new popular VPN protocol with a simplified architecture.
 Provides stable VPN connection, high performance on all devices. Uses hard-coded encryption settings. WireGuard compared to OpenVPN has lower latency and better data transfer throughput.
-* Low power consumption on mobile devices.
-* Minimum number of settings.
-* Easily recognised by DPI analysis systems, susceptible to blocking.
-* Works via UDP network protocol.
-</source>
+WireGuard is very susceptible to blocking due to its distinct packet signatures. Unlike some other VPN protocols that employ obfuscation techniques, the consistent signature patterns of WireGuard packets can be more easily identified and thus blocked by advanced Deep Packet Inspection (DPI) systems and other network monitoring tools.
+
+* Available in the AmneziaVPN across all platforms
+* Low power consumption
+* Minimum number of settings
+* Easily recognised by DPI analysis systems, susceptible to blocking
+* Works over UDP network protocol.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../containers/containers_defs.cpp" line="177"/>
+        <location filename="../containers/containers_defs.cpp" line="187"/>
+        <source>A modern iteration of the popular VPN protocol, AmneziaWG builds upon the foundation set by WireGuard, retaining its simplified architecture and high-performance capabilities across devices.
+While WireGuard is known for its efficiency, it had issues with being easily detected due to its distinct packet signatures. AmneziaWG solves this problem by using better obfuscation methods, making its traffic blend in with regular internet traffic.
+This means that AmneziaWG keeps the fast performance of the original while adding an extra layer of stealth, making it a great choice for those wanting a fast and discreet VPN connection.
+
+* Available in the AmneziaVPN across all platforms
+* Low power consumption
+* Minimum number of settings
+* Not recognised by DPI analysis systems, resistant to blocking
+* Works over UDP network protocol.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../containers/containers_defs.cpp" line="203"/>
         <source>A modern stable protocol.
 
 IKEv2 with IPSec encryption layer. Transmits data over fixed UDP ports 500 and 4500 protecting them with strong 3DES and AES crypto algorithms. Allows very fast switching between networks and devices. Due to its security, stability and speed, IKEv2 is currently one of the best VPN solutions for mobile devices. Vulnerable to detection and blocking.
+
+* Available in the AmneziaVPN only on Windows
 * Low power consumption, on mobile devices
-* Minimal configuration.
-* Recognised by DPI analysis systems.
-* Works only over UDP network protocol
-</source>
+* Minimal configuration
+* Recognised by DPI analysis systems
+* Works over UDP network protocol</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -2679,22 +2697,17 @@ IKEv2 with IPSec encryption layer. Transmits data over fixed UDP ports 500 and 4
         <source>WireGuard container</source>
         <translation type="vanished">WireGuard 容器</translation>
     </message>
-    <message>
-        <location filename="../containers/containers_defs.cpp" line="175"/>
-        <source>AmneziaWG container</source>
-        <translation></translation>
-    </message>
     <message>
         <source>IPsec container</source>
         <translation type="vanished">IPsec 容器</translation>
     </message>
     <message>
-        <location filename="../containers/containers_defs.cpp" line="190"/>
+        <location filename="../containers/containers_defs.cpp" line="216"/>
         <source>DNS Service</source>
         <translation>DNS 服务</translation>
     </message>
     <message>
-        <location filename="../containers/containers_defs.cpp" line="191"/>
+        <location filename="../containers/containers_defs.cpp" line="217"/>
         <source>Sftp file sharing service - is secure FTP service</source>
         <translation>Sftp 文件共享服务 - 安全的 FTP 服务</translation>
     </message>
@@ -2980,32 +2993,32 @@ IKEv2 with IPSec encryption layer. Transmits data over fixed UDP ports 500 and 4
 <context>
     <name>amnezia::ContainerProps</name>
     <message>
-        <location filename="../containers/containers_defs.cpp" line="283"/>
+        <location filename="../containers/containers_defs.cpp" line="309"/>
         <source>Low</source>
         <translation>低</translation>
     </message>
     <message>
-        <location filename="../containers/containers_defs.cpp" line="284"/>
+        <location filename="../containers/containers_defs.cpp" line="310"/>
         <source>Medium or High</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../containers/containers_defs.cpp" line="285"/>
+        <location filename="../containers/containers_defs.cpp" line="311"/>
         <source>Extreme</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../containers/containers_defs.cpp" line="293"/>
+        <location filename="../containers/containers_defs.cpp" line="319"/>
         <source>I just want to increase the level of my privacy.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../containers/containers_defs.cpp" line="294"/>
+        <location filename="../containers/containers_defs.cpp" line="320"/>
         <source>I want to bypass censorship. This option recommended in most cases.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../containers/containers_defs.cpp" line="296"/>
+        <location filename="../containers/containers_defs.cpp" line="322"/>
         <source>Most VPN protocols are blocked. Recommended if other options are not working.</source>
         <translation type="unfinished"></translation>
     </message>

From 4c81cdb4a2397ab9a0dc1e45975feca75ca0155b Mon Sep 17 00:00:00 2001
From: pokamest <pokamest@gmail.com>
Date: Sun, 15 Oct 2023 12:29:41 +0100
Subject: [PATCH 230/278] Update translation

---
 client/translations/amneziavpn_ru.ts | 58 ++++++++++++++--------------
 1 file changed, 29 insertions(+), 29 deletions(-)

diff --git a/client/translations/amneziavpn_ru.ts b/client/translations/amneziavpn_ru.ts
index d2ad31b7..3d7766a3 100644
--- a/client/translations/amneziavpn_ru.ts
+++ b/client/translations/amneziavpn_ru.ts
@@ -340,7 +340,7 @@ Already installed containers were found on the server. All installed containers
     <message>
         <location filename="../ui/qml/Pages2/PageProtocolAwgSettings.qml" line="275"/>
         <source>Remove AmneziaWG</source>
-        <translation>Remove AmneziaWG</translation>
+        <translation>Удалить AmneziaWG</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageProtocolAwgSettings.qml" line="278"/>
@@ -350,7 +350,7 @@ Already installed containers were found on the server. All installed containers
     <message>
         <location filename="../ui/qml/Pages2/PageProtocolAwgSettings.qml" line="279"/>
         <source>All users who you shared a connection with will no longer be able to connect to it.</source>
-        <translation>Все пользователи, которым вы поделились VPN с этим протоколом, больше не смогут к нему подключаться.</translation>
+        <translation>Все пользователи, с которыми вы поделились этим VPN-протоколом, больше не смогут к нему подключаться.</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageProtocolAwgSettings.qml" line="280"/>
@@ -383,13 +383,13 @@ Already installed containers were found on the server. All installed containers
     <message>
         <location filename="../ui/qml/Pages2/PageProtocolCloakSettings.qml" line="103"/>
         <source>Port</source>
-        <translation>Port</translation>
+        <translation>Порт</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageProtocolCloakSettings.qml" line="120"/>
         <location filename="../ui/qml/Pages2/PageProtocolCloakSettings.qml" line="121"/>
         <source>Cipher</source>
-        <translation>Cipher</translation>
+        <translation>Шифрование</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageProtocolCloakSettings.qml" line="159"/>
@@ -484,7 +484,7 @@ Already installed containers were found on the server. All installed containers
         <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="207"/>
         <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="208"/>
         <source>Cipher</source>
-        <translation>Шифрованаие</translation>
+        <translation>Шифрование</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="216"/>
@@ -575,7 +575,7 @@ Already installed containers were found on the server. All installed containers
     <message>
         <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="363"/>
         <source>All users who you shared a connection with will no longer be able to connect to it.</source>
-        <translation>Все пользователи, которым вы поделились VPN, больше не смогут к нему подключаться.</translation>
+        <translation>Все пользователи, с которыми вы поделились этим VPN-протоколом, больше не смогут к нему подключаться.</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="364"/>
@@ -623,7 +623,7 @@ Already installed containers were found on the server. All installed containers
     <message>
         <location filename="../ui/qml/Pages2/PageProtocolRaw.qml" line="177"/>
         <source>All users who you shared a connection with will no longer be able to connect to it.</source>
-        <translation>Все пользователи, которым вы поделились VPN с этим протоколом больше не смогут к нему подключаться.</translation>
+        <translation>Все пользователи, с которыми вы поделились этим VPN-протоколом, больше не смогут к нему подключаться.</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageProtocolRaw.qml" line="178"/>
@@ -679,7 +679,7 @@ Already installed containers were found on the server. All installed containers
     <message>
         <location filename="../ui/qml/Pages2/PageServiceDnsSettings.qml" line="53"/>
         <source>The DNS address is the same as the address of your server. You can configure DNS in the settings, under the connections tab.</source>
-        <translation>Адрес DNS совпадает с адресом вашего сервера. Настроить DNS можно в настройках, во вкладке &quot;Соединения&quot;.</translation>
+        <translation>Адрес DNS совпадает с адресом вашего сервера. Настроить DNS можно во вкладке &quot;Соединения&quot; настроек приложения</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageServiceDnsSettings.qml" line="62"/>
@@ -772,7 +772,7 @@ Already installed containers were found on the server. All installed containers
     <message>
         <location filename="../ui/qml/Pages2/PageServiceSftpSettings.qml" line="260"/>
         <source>Remove SFTP and all data stored there</source>
-        <translation>Удалите SFTP-хранилище со всеми данными</translation>
+        <translation>Удалить SFTP-хранилище со всеми данными</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageServiceSftpSettings.qml" line="263"/>
@@ -820,7 +820,7 @@ Already installed containers were found on the server. All installed containers
     <message>
         <location filename="../ui/qml/Pages2/PageServiceTorWebsiteSettings.qml" line="115"/>
         <source>After installation it takes several minutes while your onion site will become available in the Tor Network.</source>
-        <translation>Через несколько минут после установки  ваш Onion сайт станет доступен в сети Tor.</translation>
+        <translation>Через несколько минут после установки ваш Onion сайт станет доступен в сети Tor.</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageServiceTorWebsiteSettings.qml" line="124"/>
@@ -835,7 +835,7 @@ Already installed containers were found on the server. All installed containers
     <message>
         <location filename="../ui/qml/Pages2/PageServiceTorWebsiteSettings.qml" line="141"/>
         <source>The site with all data will be removed from the tor network.</source>
-        <translation>Сайт со всеми данными будет удален из сети tor.</translation>
+        <translation>Сайт со всеми данными будет удален из сети Tor.</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageServiceTorWebsiteSettings.qml" line="142"/>
@@ -891,7 +891,7 @@ Already installed containers were found on the server. All installed containers
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsAbout.qml" line="56"/>
         <source>Support the project with a donation</source>
-        <translation>Поддержите проект донатами</translation>
+        <translation>Поддержите проект пожертвованием</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsAbout.qml" line="71"/>
@@ -999,12 +999,12 @@ Already installed containers were found on the server. All installed containers
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="93"/>
         <source>Start minimized</source>
-        <translation>Запуск в свернутом виде</translation>
+        <translation>Запускать в свернутом виде</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="94"/>
         <source>Launch application minimized</source>
-        <translation>Запуск приложения в свернутом виде</translation>
+        <translation>Запускать приложение в свернутом виде</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="111"/>
@@ -1039,7 +1039,7 @@ Already installed containers were found on the server. All installed containers
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="149"/>
         <source>All settings will be reset to default. All installed AmneziaVPN services will still remain on the server.</source>
-        <translation>Все данные из приложения будут удалены Все установленные сервисы AmneziaVPN останутся на сервере.</translation>
+        <translation>Все данные из приложения будут удалены, все установленные сервисы AmneziaVPN останутся на сервере.</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="150"/>
@@ -1267,7 +1267,7 @@ Already installed containers were found on the server. All installed containers
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsLogging.qml" line="126"/>
         <source>Save logs to file</source>
-        <translation>Сохранить логи в файл</translation>
+        <translation>Сохранять логи в файл</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsLogging.qml" line="144"/>
@@ -1344,7 +1344,7 @@ Already installed containers were found on the server. All installed containers
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsServerData.qml" line="117"/>
         <source>Check the server for previously installed Amnezia services</source>
-        <translation>Проверка сервера на наличие ранее установленных сервисов Amnezia</translation>
+        <translation>Проверить сервер на наличие ранее установленных сервисов Amnezia</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsServerData.qml" line="118"/>
@@ -1369,7 +1369,7 @@ Already installed containers were found on the server. All installed containers
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsServerData.qml" line="165"/>
         <source>Clear server from Amnezia software</source>
-        <translation>Очистка сервера от протоколов и сервисов Amnezia</translation>
+        <translation>Очистить сервер от протоколов и сервисов Amnezia</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsServerData.qml" line="169"/>
@@ -1379,7 +1379,7 @@ Already installed containers were found on the server. All installed containers
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsServerData.qml" line="170"/>
         <source>All containers will be deleted on the server. This means that configuration files, keys and certificates will be deleted.</source>
-        <translation>На сервере будут удалены все, что связанно с Amnezia: протоколы сервисы конфигурационные файлы, ключи и сертификаты.</translation>
+        <translation>На сервере будут удалены все данные, связанные с Amnezia: протоколы, сервисы, конфигурационные файлы, ключи и сертификаты.</translation>
     </message>
 </context>
 <context>
@@ -1466,7 +1466,7 @@ Already installed containers were found on the server. All installed containers
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="84"/>
         <source>Split tunneling</source>
-        <translation>Раздельно VPN-туннелирование</translation>
+        <translation>Раздельное VPN-туннелирование</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="120"/>
@@ -1539,7 +1539,7 @@ Already installed containers were found on the server. All installed containers
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="386"/>
         <source>Add imported sites to existing ones</source>
-        <translation>Добавление импортированных сайтов к существующим</translation>
+        <translation>Добавить импортированные сайты к существующим</translation>
     </message>
 </context>
 <context>
@@ -1561,7 +1561,7 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
     <message>
         <location filename="../ui/qml/Pages2/PageSetupWizardConfigSource.qml" line="61"/>
         <source>What do you have?</source>
-        <translation>Выберете что у вас есть?</translation>
+        <translation>Выберете что у вас есть</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSetupWizardConfigSource.qml" line="68"/>
@@ -1657,7 +1657,7 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
     <message>
         <location filename="../ui/qml/Pages2/PageSetupWizardEasy.qml" line="138"/>
         <source>I want to choose a VPN protocol</source>
-        <translation>Выбор VPN-протокола</translation>
+        <translation>Выбрать VPN-протокол</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSetupWizardEasy.qml" line="157"/>
@@ -1709,7 +1709,7 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
     <message>
         <location filename="../ui/qml/Pages2/PageSetupWizardProtocolSettings.qml" line="75"/>
         <source>Installing %1</source>
-        <translation>Установка %1</translation>
+        <translation>Установить %1</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSetupWizardProtocolSettings.qml" line="93"/>
@@ -1734,7 +1734,7 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
     <message>
         <location filename="../ui/qml/Pages2/PageSetupWizardProtocolSettings.qml" line="230"/>
         <source>Install</source>
-        <translation>Установка</translation>
+        <translation>Установить</translation>
     </message>
 </context>
 <context>
@@ -1747,7 +1747,7 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
     <message>
         <location filename="../ui/qml/Pages2/PageSetupWizardProtocols.qml" line="74"/>
         <source>Choose the one with the highest priority for you. Later, you can install other protocols and additional services, such as DNS proxy and SFTP.</source>
-        <translation>Выберите протокол, который вам больше подходит . В дальнейшем можно установить другие протоколы и дополнительные сервисы, такие как DNS-прокси и SFTP.</translation>
+        <translation>Выберите протокол, который вам больше подходит. В дальнейшем можно установить другие протоколы и дополнительные сервисы, такие как DNS-прокси, TOR-сайт и SFTP.</translation>
     </message>
 </context>
 <context>
@@ -1806,7 +1806,7 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
     <message>
         <location filename="../ui/qml/Pages2/PageSetupWizardTextKey.qml" line="53"/>
         <source>Insert</source>
-        <translation>Вставка</translation>
+        <translation>Вставить</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSetupWizardTextKey.qml" line="71"/>
@@ -2452,7 +2452,7 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
     <message>
         <location filename="../containers/containers_defs.cpp" line="120"/>
         <source>Replace the current DNS server with your own. This will increase your privacy level.</source>
-        <translation>Замените адрес DNS-сервера на собственный. Это повысит уровень конфиденциальности.</translation>
+        <translation>Замените DNS-сервер на Amnezia DNS. Это повысит уровень конфиденциальности.</translation>
     </message>
     <message>
         <location filename="../containers/containers_defs.cpp" line="123"/>
@@ -2565,7 +2565,7 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
     <message>
         <location filename="../ui/qml/Components/SelectLanguageDrawer.qml" line="49"/>
         <source>Choose language</source>
-        <translation>Выберете язык</translation>
+        <translation>Выберите язык</translation>
     </message>
 </context>
 <context>

From 5f5435c6458fc879fe9ee99333c1ab8a47fac4fd Mon Sep 17 00:00:00 2001
From: pokamest <pokamest@gmail.com>
Date: Sun, 15 Oct 2023 12:41:01 +0100
Subject: [PATCH 231/278] Updated ru ts

---
 client/translations/amneziavpn_ru.ts    | 44 ++++++++++++-------------
 client/translations/amneziavpn_zh_CN.ts | 26 +++++++--------
 2 files changed, 35 insertions(+), 35 deletions(-)

diff --git a/client/translations/amneziavpn_ru.ts b/client/translations/amneziavpn_ru.ts
index 6f80bfc3..7bb59a7e 100644
--- a/client/translations/amneziavpn_ru.ts
+++ b/client/translations/amneziavpn_ru.ts
@@ -2414,7 +2414,20 @@ and will not be shared or disclosed to the Amnezia or any third parties</source>
         <translation>IPsec</translation>
     </message>
     <message>
-        <location filename="../containers/containers_defs.cpp" line="216"/>
+        <location filename="../containers/containers_defs.cpp" line="203"/>
+        <source>IKEv2, paired with the IPSec encryption layer, stands as a modern and stable VPN protocol.
+One of its distinguishing features is its ability to swiftly switch between networks and devices, making it particularly adaptive in dynamic network environments. 
+While it offers a blend of security, stability, and speed, it&apos;s essential to note that IKEv2 can be easily detected and is susceptible to blocking.
+
+* Available in the AmneziaVPN only on Windows
+* Low power consumption, on mobile devices
+* Minimal configuration
+* Recognised by DPI analysis systems
+* Works over UDP network protocol, ports 500 and 4500.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../containers/containers_defs.cpp" line="215"/>
         <source>DNS Service</source>
         <translation>DNS Сервис</translation>
     </message>
@@ -2425,7 +2438,7 @@ and will not be shared or disclosed to the Amnezia or any third parties</source>
     </message>
     <message>
         <location filename="../containers/containers_defs.cpp" line="90"/>
-        <location filename="../containers/containers_defs.cpp" line="215"/>
+        <location filename="../containers/containers_defs.cpp" line="214"/>
         <source>Website in Tor network</source>
         <translation>Веб-сайт в сети Tor</translation>
     </message>
@@ -2551,25 +2564,12 @@ This means that AmneziaWG keeps the fast performance of the original while addin
 * Works over UDP network protocol.</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../containers/containers_defs.cpp" line="203"/>
-        <source>A modern stable protocol.
-
-IKEv2 with IPSec encryption layer. Transmits data over fixed UDP ports 500 and 4500 protecting them with strong 3DES and AES crypto algorithms. Allows very fast switching between networks and devices. Due to its security, stability and speed, IKEv2 is currently one of the best VPN solutions for mobile devices. Vulnerable to detection and blocking.
-
-* Available in the AmneziaVPN only on Windows
-* Low power consumption, on mobile devices
-* Minimal configuration
-* Recognised by DPI analysis systems
-* Works over UDP network protocol</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>AmneziaWG container</source>
         <translation type="vanished">AmneziaWG протокол</translation>
     </message>
     <message>
-        <location filename="../containers/containers_defs.cpp" line="217"/>
+        <location filename="../containers/containers_defs.cpp" line="216"/>
         <source>Sftp file sharing service - is secure FTP service</source>
         <translation>Сервис обмена файлами Sftp - безопасный FTP-сервис</translation>
     </message>
@@ -2856,32 +2856,32 @@ IKEv2 with IPSec encryption layer. Transmits data over fixed UDP ports 500 and 4
 <context>
     <name>amnezia::ContainerProps</name>
     <message>
-        <location filename="../containers/containers_defs.cpp" line="309"/>
+        <location filename="../containers/containers_defs.cpp" line="308"/>
         <source>Low</source>
         <translation>Низкий</translation>
     </message>
     <message>
-        <location filename="../containers/containers_defs.cpp" line="310"/>
+        <location filename="../containers/containers_defs.cpp" line="309"/>
         <source>Medium or High</source>
         <translation>Спедний или Высокий</translation>
     </message>
     <message>
-        <location filename="../containers/containers_defs.cpp" line="311"/>
+        <location filename="../containers/containers_defs.cpp" line="310"/>
         <source>Extreme</source>
         <translation>Экстремальный</translation>
     </message>
     <message>
-        <location filename="../containers/containers_defs.cpp" line="319"/>
+        <location filename="../containers/containers_defs.cpp" line="318"/>
         <source>I just want to increase the level of my privacy.</source>
         <translation>Я просто хочу повысить уровень своей приватности.</translation>
     </message>
     <message>
-        <location filename="../containers/containers_defs.cpp" line="320"/>
+        <location filename="../containers/containers_defs.cpp" line="319"/>
         <source>I want to bypass censorship. This option recommended in most cases.</source>
         <translation>Я хочу обойти блокировки. Этот вариант рекомендуется в большинстве случаев.</translation>
     </message>
     <message>
-        <location filename="../containers/containers_defs.cpp" line="322"/>
+        <location filename="../containers/containers_defs.cpp" line="321"/>
         <source>Most VPN protocols are blocked. Recommended if other options are not working.</source>
         <translation>Большинство VPN протоколов заблокированы. Рекомендуется, если другие варианты не работают.</translation>
     </message>
diff --git a/client/translations/amneziavpn_zh_CN.ts b/client/translations/amneziavpn_zh_CN.ts
index d68981c4..576112de 100644
--- a/client/translations/amneziavpn_zh_CN.ts
+++ b/client/translations/amneziavpn_zh_CN.ts
@@ -2537,7 +2537,7 @@ and will not be shared or disclosed to the Amnezia or any third parties</source>
     </message>
     <message>
         <location filename="../containers/containers_defs.cpp" line="90"/>
-        <location filename="../containers/containers_defs.cpp" line="215"/>
+        <location filename="../containers/containers_defs.cpp" line="214"/>
         <source>Website in Tor network</source>
         <translation>在 Tor 网络中架设网站</translation>
     </message>
@@ -2670,15 +2670,15 @@ This means that AmneziaWG keeps the fast performance of the original while addin
     </message>
     <message>
         <location filename="../containers/containers_defs.cpp" line="203"/>
-        <source>A modern stable protocol.
-
-IKEv2 with IPSec encryption layer. Transmits data over fixed UDP ports 500 and 4500 protecting them with strong 3DES and AES crypto algorithms. Allows very fast switching between networks and devices. Due to its security, stability and speed, IKEv2 is currently one of the best VPN solutions for mobile devices. Vulnerable to detection and blocking.
+        <source>IKEv2, paired with the IPSec encryption layer, stands as a modern and stable VPN protocol.
+One of its distinguishing features is its ability to swiftly switch between networks and devices, making it particularly adaptive in dynamic network environments. 
+While it offers a blend of security, stability, and speed, it&apos;s essential to note that IKEv2 can be easily detected and is susceptible to blocking.
 
 * Available in the AmneziaVPN only on Windows
 * Low power consumption, on mobile devices
 * Minimal configuration
 * Recognised by DPI analysis systems
-* Works over UDP network protocol</source>
+* Works over UDP network protocol, ports 500 and 4500.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -2702,12 +2702,12 @@ IKEv2 with IPSec encryption layer. Transmits data over fixed UDP ports 500 and 4
         <translation type="vanished">IPsec 容器</translation>
     </message>
     <message>
-        <location filename="../containers/containers_defs.cpp" line="216"/>
+        <location filename="../containers/containers_defs.cpp" line="215"/>
         <source>DNS Service</source>
         <translation>DNS 服务</translation>
     </message>
     <message>
-        <location filename="../containers/containers_defs.cpp" line="217"/>
+        <location filename="../containers/containers_defs.cpp" line="216"/>
         <source>Sftp file sharing service - is secure FTP service</source>
         <translation>Sftp 文件共享服务 - 安全的 FTP 服务</translation>
     </message>
@@ -2993,32 +2993,32 @@ IKEv2 with IPSec encryption layer. Transmits data over fixed UDP ports 500 and 4
 <context>
     <name>amnezia::ContainerProps</name>
     <message>
-        <location filename="../containers/containers_defs.cpp" line="309"/>
+        <location filename="../containers/containers_defs.cpp" line="308"/>
         <source>Low</source>
         <translation>低</translation>
     </message>
     <message>
-        <location filename="../containers/containers_defs.cpp" line="310"/>
+        <location filename="../containers/containers_defs.cpp" line="309"/>
         <source>Medium or High</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../containers/containers_defs.cpp" line="311"/>
+        <location filename="../containers/containers_defs.cpp" line="310"/>
         <source>Extreme</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../containers/containers_defs.cpp" line="319"/>
+        <location filename="../containers/containers_defs.cpp" line="318"/>
         <source>I just want to increase the level of my privacy.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../containers/containers_defs.cpp" line="320"/>
+        <location filename="../containers/containers_defs.cpp" line="319"/>
         <source>I want to bypass censorship. This option recommended in most cases.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../containers/containers_defs.cpp" line="322"/>
+        <location filename="../containers/containers_defs.cpp" line="321"/>
         <source>Most VPN protocols are blocked. Recommended if other options are not working.</source>
         <translation type="unfinished"></translation>
     </message>

From a01ba5909c965324beab6e0e365d6aef0378f09d Mon Sep 17 00:00:00 2001
From: pokamest <pokamest@gmail.com>
Date: Sun, 15 Oct 2023 12:53:44 +0100
Subject: [PATCH 232/278] Version bump

---
 CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index af4ae898..85d7d0ce 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.25.0 FATAL_ERROR)
 
 set(PROJECT AmneziaVPN)
 
-project(${PROJECT} VERSION 4.0.8.1
+project(${PROJECT} VERSION 4.0.8.2
         DESCRIPTION "AmneziaVPN"
         HOMEPAGE_URL "https://amnezia.org/"
 )

From cb5c09d9679753785ecf3159e23a66bd877c9773 Mon Sep 17 00:00:00 2001
From: ronoaer <ronoaer@gmail.com>
Date: Sun, 15 Oct 2023 21:29:01 +0800
Subject: [PATCH 233/278] adapted questionDrawer

---
 client/ui/qml/Components/QuestionDrawer.qml         | 3 ++-
 client/ui/qml/Components/ShareConnectionDrawer.qml  | 2 +-
 client/ui/qml/Pages2/PageSettingsBackup.qml         | 1 +
 client/ui/qml/Pages2/PageSettingsServerData.qml     | 2 ++
 client/ui/qml/Pages2/PageSettingsServerProtocol.qml | 1 +
 5 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/client/ui/qml/Components/QuestionDrawer.qml b/client/ui/qml/Components/QuestionDrawer.qml
index edc8df9e..72067f97 100644
--- a/client/ui/qml/Components/QuestionDrawer.qml
+++ b/client/ui/qml/Components/QuestionDrawer.qml
@@ -15,10 +15,11 @@ Drawer2Type {
 
     property var yesButtonFunction
     property var noButtonFunction
+    property real drawerHeight: 0.5
 
     width: parent.width
     height: parent.height
-    contentHeight: parent.height * 0.5
+    contentHeight: parent.height * drawerHeight
 
     ColumnLayout {
         parent: root.contentParent
diff --git a/client/ui/qml/Components/ShareConnectionDrawer.qml b/client/ui/qml/Components/ShareConnectionDrawer.qml
index 22c567a8..ae0df0e2 100644
--- a/client/ui/qml/Components/ShareConnectionDrawer.qml
+++ b/client/ui/qml/Components/ShareConnectionDrawer.qml
@@ -31,7 +31,7 @@ Drawer2Type {
     height: parent.height
     contentHeight: parent.height * 0.9
 
-    onClose: {
+    onClosed: {
         configExtension = ".vpn"
         configCaption = qsTr("Save AmneziaVPN config")
         configFileName = "amnezia_config"
diff --git a/client/ui/qml/Pages2/PageSettingsBackup.qml b/client/ui/qml/Pages2/PageSettingsBackup.qml
index 1fb160a1..2caaf914 100644
--- a/client/ui/qml/Pages2/PageSettingsBackup.qml
+++ b/client/ui/qml/Pages2/PageSettingsBackup.qml
@@ -151,5 +151,6 @@ PageType {
 
     QuestionDrawer {
         id: questionDrawer
+        parent: root
     }
 }
diff --git a/client/ui/qml/Pages2/PageSettingsServerData.qml b/client/ui/qml/Pages2/PageSettingsServerData.qml
index b130eef9..2e401c67 100644
--- a/client/ui/qml/Pages2/PageSettingsServerData.qml
+++ b/client/ui/qml/Pages2/PageSettingsServerData.qml
@@ -193,6 +193,8 @@ PageType {
             QuestionDrawer {
                 id: questionDrawer
 
+                drawerHeight: 0.8
+
                 parent: root
             }
         }
diff --git a/client/ui/qml/Pages2/PageSettingsServerProtocol.qml b/client/ui/qml/Pages2/PageSettingsServerProtocol.qml
index d1c8b22b..a518167c 100644
--- a/client/ui/qml/Pages2/PageSettingsServerProtocol.qml
+++ b/client/ui/qml/Pages2/PageSettingsServerProtocol.qml
@@ -141,6 +141,7 @@ PageType {
 
         QuestionDrawer {
             id: questionDrawer
+            parent: root
         }
     }
 }

From 7bd1340190abd10964731d66228ba671b3f87aaf Mon Sep 17 00:00:00 2001
From: "vladimir.kuznetsov" <nethiuswork@gmail.com>
Date: Sun, 15 Oct 2023 20:41:49 +0500
Subject: [PATCH 234/278] fixed display of sites on page split tunneling

---
 client/amnezia_application.cpp                |  2 +-
 client/translations/amneziavpn_ru.ts          | 44 ++++++++++++-------
 client/translations/amneziavpn_zh_CN.ts       | 44 ++++++++++++-------
 client/ui/models/sites_model.cpp              | 22 +++++++++-
 client/ui/models/sites_model.h                |  4 ++
 .../ui/qml/Pages2/PageSettingsConnection.qml  |  2 +-
 .../qml/Pages2/PageSettingsSplitTunneling.qml | 15 ++-----
 7 files changed, 85 insertions(+), 48 deletions(-)

diff --git a/client/amnezia_application.cpp b/client/amnezia_application.cpp
index 4e6bce2b..229aa7b8 100644
--- a/client/amnezia_application.cpp
+++ b/client/amnezia_application.cpp
@@ -297,7 +297,7 @@ void AmneziaApplication::initModels()
     connect(m_containersModel.get(), &ContainersModel::defaultContainerChanged, this, [this]() {
         if (m_containersModel->getDefaultContainer() == DockerContainer::WireGuard
             && m_sitesModel->getRouteMode() != Settings::RouteMode::VpnAllSites) {
-            m_sitesModel->setRouteMode(Settings::RouteMode::VpnAllSites);
+            m_sitesModel->toggleSplitTunneling(false);
             emit m_pageController->showNotificationMessage(
                     tr("Split tunneling for WireGuard is not implemented, the option was disabled"));
         }
diff --git a/client/translations/amneziavpn_ru.ts b/client/translations/amneziavpn_ru.ts
index d3eef897..14973fbd 100644
--- a/client/translations/amneziavpn_ru.ts
+++ b/client/translations/amneziavpn_ru.ts
@@ -1471,75 +1471,75 @@ Already installed containers were found on the server. All installed containers
         <translation>Раздельно VPN-туннелирование</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="128"/>
+        <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="121"/>
         <source>Mode</source>
         <translation>Режим</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="206"/>
+        <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="199"/>
         <source>Remove </source>
         <translation>Удалить </translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="207"/>
+        <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="200"/>
         <source>Continue</source>
         <translation>Продолжить</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="208"/>
+        <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="201"/>
         <source>Cancel</source>
         <translation>Отменить</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="255"/>
+        <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="248"/>
         <source>Site or IP</source>
         <translation>Сайт или IP</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="299"/>
+        <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="292"/>
         <source>Import/Export Sites</source>
         <translation>Импорт/экспорт Сайтов</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="305"/>
+        <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="298"/>
         <source>Import</source>
         <translation>Импорт</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="317"/>
+        <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="310"/>
         <source>Save site list</source>
         <translation>Сохранить список сайтов</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="324"/>
+        <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="317"/>
         <source>Save sites</source>
         <translation>Сохранить</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="325"/>
-        <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="392"/>
-        <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="407"/>
+        <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="318"/>
+        <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="385"/>
+        <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="400"/>
         <source>Sites files (*.json)</source>
         <translation>Sites files (*.json)</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="382"/>
+        <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="375"/>
         <source>Import a list of sites</source>
         <translation>Импортировать список с сайтами</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="388"/>
+        <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="381"/>
         <source>Replace site list</source>
         <translation>Заменить список сайтов</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="391"/>
-        <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="406"/>
+        <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="384"/>
+        <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="399"/>
         <source>Open sites file</source>
         <translation>Открыть список с сайтами</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="403"/>
+        <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="396"/>
         <source>Add imported sites to existing ones</source>
         <translation>Добавление импортированных сайтов к существующим</translation>
     </message>
@@ -2621,6 +2621,16 @@ IKEv2 with IPSec encryption layer. Transmits data over fixed UDP ports 500 and 4
         <source>error 0x%1: %2</source>
         <translation>error 0x%1: %2</translation>
     </message>
+    <message>
+        <location filename="../3rd/wireguard-tools/contrib/highlighter/gui/highlight.cpp" line="39"/>
+        <source>WireGuard Configuration Highlighter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../3rd/wireguard-tools/contrib/highlighter/gui/highlight.cpp" line="82"/>
+        <source>&amp;Randomize colors</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SelectLanguageDrawer</name>
diff --git a/client/translations/amneziavpn_zh_CN.ts b/client/translations/amneziavpn_zh_CN.ts
index be519a91..b439deaa 100644
--- a/client/translations/amneziavpn_zh_CN.ts
+++ b/client/translations/amneziavpn_zh_CN.ts
@@ -1573,75 +1573,75 @@ And if you don&apos;t like the app, all the more support it - the donation will
         <translation>隧道分离</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="128"/>
+        <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="121"/>
         <source>Mode</source>
         <translation>规则</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="206"/>
+        <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="199"/>
         <source>Remove </source>
         <translation>移除 </translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="207"/>
+        <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="200"/>
         <source>Continue</source>
         <translation>继续</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="208"/>
+        <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="201"/>
         <source>Cancel</source>
         <translation>取消</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="255"/>
+        <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="248"/>
         <source>Site or IP</source>
         <translation>网站或IP地址</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="299"/>
+        <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="292"/>
         <source>Import/Export Sites</source>
         <translation>导入/导出网站</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="305"/>
+        <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="298"/>
         <source>Import</source>
         <translation>导入</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="317"/>
+        <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="310"/>
         <source>Save site list</source>
         <translation>保存网址</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="324"/>
+        <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="317"/>
         <source>Save sites</source>
         <translation>保存网址</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="325"/>
-        <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="392"/>
-        <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="407"/>
+        <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="318"/>
+        <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="385"/>
+        <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="400"/>
         <source>Sites files (*.json)</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="382"/>
+        <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="375"/>
         <source>Import a list of sites</source>
         <translation>导入网址列表</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="388"/>
+        <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="381"/>
         <source>Replace site list</source>
         <translation>替换网址列表</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="391"/>
-        <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="406"/>
+        <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="384"/>
+        <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="399"/>
         <source>Open sites file</source>
         <translation>打开网址文件</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="403"/>
+        <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="396"/>
         <source>Add imported sites to existing ones</source>
         <translation>将导入的网址添加到现有网址中</translation>
     </message>
@@ -2758,6 +2758,16 @@ IKEv2 with IPSec encryption layer. Transmits data over fixed UDP ports 500 and 4
         <source>error 0x%1: %2</source>
         <translation>错误 0x%1: %2</translation>
     </message>
+    <message>
+        <location filename="../3rd/wireguard-tools/contrib/highlighter/gui/highlight.cpp" line="39"/>
+        <source>WireGuard Configuration Highlighter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../3rd/wireguard-tools/contrib/highlighter/gui/highlight.cpp" line="82"/>
+        <source>&amp;Randomize colors</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SelectLanguageDrawer</name>
diff --git a/client/ui/models/sites_model.cpp b/client/ui/models/sites_model.cpp
index 5fd9a38b..1e0f1692 100644
--- a/client/ui/models/sites_model.cpp
+++ b/client/ui/models/sites_model.cpp
@@ -3,7 +3,13 @@
 SitesModel::SitesModel(std::shared_ptr<Settings> settings, QObject *parent)
     : QAbstractListModel(parent), m_settings(settings)
 {
-    m_currentRouteMode = m_settings->routeMode();
+    auto routeMode = m_settings->routeMode();
+    if (routeMode == Settings::RouteMode::VpnAllSites) {
+        m_isSplitTunnelingEnabled = false;
+        m_currentRouteMode = Settings::RouteMode::VpnOnlyForwardSites;
+    } else {
+        m_currentRouteMode = routeMode;
+    }
     fillSites();
 }
 
@@ -93,6 +99,20 @@ void SitesModel::setRouteMode(int routeMode)
     emit routeModeChanged();
 }
 
+bool SitesModel::isSplitTunnelingEnabled()
+{
+    return m_isSplitTunnelingEnabled;
+}
+
+void SitesModel::toggleSplitTunneling(bool enabled)
+{
+    if (enabled) {
+        setRouteMode(m_currentRouteMode);
+    } else {
+        m_settings->setRouteMode(Settings::RouteMode::VpnAllSites);
+    }
+}
+
 QVector<QPair<QString, QString> > SitesModel::getCurrentSites()
 {
     return m_sites;
diff --git a/client/ui/models/sites_model.h b/client/ui/models/sites_model.h
index 70def0ec..ad16b7a3 100644
--- a/client/ui/models/sites_model.h
+++ b/client/ui/models/sites_model.h
@@ -31,6 +31,9 @@ public slots:
     int getRouteMode();
     void setRouteMode(int routeMode);
 
+    bool isSplitTunnelingEnabled();
+    void toggleSplitTunneling(bool enabled);
+
     QVector<QPair<QString, QString>> getCurrentSites();
 
 signals:
@@ -44,6 +47,7 @@ private:
 
     std::shared_ptr<Settings> m_settings;
 
+    bool m_isSplitTunnelingEnabled;
     Settings::RouteMode m_currentRouteMode;
 
     QVector<QPair<QString, QString>> m_sites;
diff --git a/client/ui/qml/Pages2/PageSettingsConnection.qml b/client/ui/qml/Pages2/PageSettingsConnection.qml
index 7f0262f9..b5b1bd97 100644
--- a/client/ui/qml/Pages2/PageSettingsConnection.qml
+++ b/client/ui/qml/Pages2/PageSettingsConnection.qml
@@ -112,7 +112,7 @@ PageType {
             }
 
             LabelWithButtonType {
-                visible: !GC.isMobile()
+                visible: false//!GC.isMobile()
 
                 Layout.fillWidth: true
 
diff --git a/client/ui/qml/Pages2/PageSettingsSplitTunneling.qml b/client/ui/qml/Pages2/PageSettingsSplitTunneling.qml
index cc4973f1..d7f77871 100644
--- a/client/ui/qml/Pages2/PageSettingsSplitTunneling.qml
+++ b/client/ui/qml/Pages2/PageSettingsSplitTunneling.qml
@@ -93,22 +93,15 @@ PageType {
             SwitcherType {
                 id: switcher
 
-                property int lastActiveRouteMode: routeMode.onlyForwardSites
-
                 enabled: root.pageEnabled
 
                 Layout.fillWidth: true
                 Layout.rightMargin: 16
 
-                checked: SitesModel.routeMode !== routeMode.allSites
-                onToggled: {
-                    if (checked) {
-                        SitesModel.routeMode = lastActiveRouteMode
-                    } else {
-                        lastActiveRouteMode = SitesModel.routeMode
-                        selector.text = root.routeModesModel[getRouteModesModelIndex()].name
-                        SitesModel.routeMode = routeMode.allSites
-                    }
+                checked: SitesModel.isSplitTunnelingEnabled()
+                onToggled: {                    
+                    SitesModel.toggleSplitTunneling(checked)
+                    selector.text = root.routeModesModel[getRouteModesModelIndex()].name
                 }
             }
         }

From 2a4a01a4bec1e73dbfd7a9be6fc1cacfa0ede2b8 Mon Sep 17 00:00:00 2001
From: "vladimir.kuznetsov" <nethiuswork@gmail.com>
Date: Mon, 16 Oct 2023 13:28:37 +0500
Subject: [PATCH 235/278] removed split site tunneling page blocking when
 switcher is turned off

---
 client/ui/qml/Pages2/PageSettingsSplitTunneling.qml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/ui/qml/Pages2/PageSettingsSplitTunneling.qml b/client/ui/qml/Pages2/PageSettingsSplitTunneling.qml
index d7f77871..873ae997 100644
--- a/client/ui/qml/Pages2/PageSettingsSplitTunneling.qml
+++ b/client/ui/qml/Pages2/PageSettingsSplitTunneling.qml
@@ -116,7 +116,7 @@ PageType {
 
             drawerHeight: 0.4375
 
-            enabled: switcher.checked && root.pageEnabled
+            enabled: root.pageEnabled
 
             headerText: qsTr("Mode")
 
@@ -158,7 +158,7 @@ PageType {
         anchors.topMargin: 16
         contentHeight: col.implicitHeight + addSiteButton.implicitHeight + addSiteButton.anchors.bottomMargin + addSiteButton.anchors.topMargin
 
-        enabled: switcher.checked && root.pageEnabled
+        enabled: root.pageEnabled
 
         Column {
             id: col

From 221d45f564d10347e50b612813c60e38eee6168c Mon Sep 17 00:00:00 2001
From: "vladimir.kuznetsov" <nethiuswork@gmail.com>
Date: Mon, 16 Oct 2023 13:32:56 +0500
Subject: [PATCH 236/278] fixed pageSettingsDns width

---
 client/ui/qml/Pages2/PageSettingsDns.qml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/client/ui/qml/Pages2/PageSettingsDns.qml b/client/ui/qml/Pages2/PageSettingsDns.qml
index 58ec0783..5670464f 100644
--- a/client/ui/qml/Pages2/PageSettingsDns.qml
+++ b/client/ui/qml/Pages2/PageSettingsDns.qml
@@ -46,6 +46,7 @@ PageType {
             }
 
             ParagraphTextType {
+                Layout.fillWidth: true
                 text: qsTr("If AmneziaDNS is not used or installed")
             }
 

From 8e0eef3316c5f0ed90cd044dea514c4b284821a6 Mon Sep 17 00:00:00 2001
From: "vladimir.kuznetsov" <nethiuswork@gmail.com>
Date: Mon, 16 Oct 2023 13:40:43 +0500
Subject: [PATCH 237/278] fixed selection of default container after installing
 a new container

---
 client/ui/controllers/installController.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/ui/controllers/installController.cpp b/client/ui/controllers/installController.cpp
index 6eec9c6b..bb10d39c 100644
--- a/client/ui/controllers/installController.cpp
+++ b/client/ui/controllers/installController.cpp
@@ -184,7 +184,7 @@ void InstallController::installContainer(DockerContainer container, QJsonObject
         }
 
         if (ContainerProps::containerService(container) == ServiceType::Vpn) {
-            m_containersModel->setData(m_containersModel->index(0, 0), container, ContainersModel::Roles::IsDefaultRole);
+            m_containersModel->setData(m_containersModel->index(container), true, ContainersModel::Roles::IsDefaultRole);
         }
         emit installContainerFinished(finishMessage, ContainerProps::containerService(container) == ServiceType::Other);
         return;

From cdb18de305771e6a5c2f6e1c48ad1ab1db0392f7 Mon Sep 17 00:00:00 2001
From: "vladimir.kuznetsov" <nethiuswork@gmail.com>
Date: Mon, 16 Oct 2023 13:43:27 +0500
Subject: [PATCH 238/278] brought back the ability to share wireguard native
 format configs

---
 client/ui/qml/Pages2/PageShare.qml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/ui/qml/Pages2/PageShare.qml b/client/ui/qml/Pages2/PageShare.qml
index aa04a1fe..25aad3de 100644
--- a/client/ui/qml/Pages2/PageShare.qml
+++ b/client/ui/qml/Pages2/PageShare.qml
@@ -320,7 +320,7 @@ PageType {
 
                         if (index === ContainerProps.containerFromString("amnezia-openvpn")) {
                             root.connectionTypesModel.push(openVpnConnectionFormat)
-                        } else if (index === ContainerProps.containerFromString("amnezia-awg")) {
+                        } else if (index === ContainerProps.containerFromString("amnezia-wireguard")) {
                             root.connectionTypesModel.push(wireGuardConnectionFormat)
                         }
                     }

From e01b1db706501d499f29c7f832d8791db2cd3f45 Mon Sep 17 00:00:00 2001
From: "vladimir.kuznetsov" <nethiuswork@gmail.com>
Date: Mon, 16 Oct 2023 14:34:03 +0500
Subject: [PATCH 239/278] text corrections

---
 client/translations/amneziavpn_ru.ts          | 38 +++++++++++++------
 client/translations/amneziavpn_zh_CN.ts       | 38 +++++++++++++------
 .../ui/qml/Pages2/PageSettingsApplication.qml |  2 +-
 3 files changed, 53 insertions(+), 25 deletions(-)

diff --git a/client/translations/amneziavpn_ru.ts b/client/translations/amneziavpn_ru.ts
index 7bb59a7e..8d9e5e92 100644
--- a/client/translations/amneziavpn_ru.ts
+++ b/client/translations/amneziavpn_ru.ts
@@ -984,9 +984,13 @@ Already installed containers were found on the server. All installed containers
         <translation>Авто-запуск</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="73"/>
         <source>Launch the application every time %1 starts</source>
-        <translation>Запускать приложение при каждом включении %1</translation>
+        <translation type="vanished">Запускать приложение при каждом включении %1</translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="73"/>
+        <source>Launch the application every time the device is starts</source>
+        <translation>Запускать приложение при каждом включении устройства</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="93"/>
@@ -1184,52 +1188,52 @@ Already installed containers were found on the server. All installed containers
         <translation>DNS сервер</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsDns.qml" line="49"/>
+        <location filename="../ui/qml/Pages2/PageSettingsDns.qml" line="50"/>
         <source>If AmneziaDNS is not used or installed</source>
         <translation>Эти адреса будут использоваться, если не включен или не установлен AmneziaDNS</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsDns.qml" line="56"/>
+        <location filename="../ui/qml/Pages2/PageSettingsDns.qml" line="57"/>
         <source>Primary DNS</source>
         <translation>Первичный DNS</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsDns.qml" line="68"/>
+        <location filename="../ui/qml/Pages2/PageSettingsDns.qml" line="69"/>
         <source>Secondary DNS</source>
         <translation>Вторичный DNS</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsDns.qml" line="86"/>
+        <location filename="../ui/qml/Pages2/PageSettingsDns.qml" line="87"/>
         <source>Restore default</source>
         <translation>Восстановить по умолчанию</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsDns.qml" line="89"/>
+        <location filename="../ui/qml/Pages2/PageSettingsDns.qml" line="90"/>
         <source>Restore default DNS settings?</source>
         <translation>Восстановить настройки DNS по умолчанию?</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsDns.qml" line="90"/>
+        <location filename="../ui/qml/Pages2/PageSettingsDns.qml" line="91"/>
         <source>Continue</source>
         <translation>Продолжить</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsDns.qml" line="91"/>
+        <location filename="../ui/qml/Pages2/PageSettingsDns.qml" line="92"/>
         <source>Cancel</source>
         <translation>Отменить</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsDns.qml" line="99"/>
+        <location filename="../ui/qml/Pages2/PageSettingsDns.qml" line="100"/>
         <source>Settings have been reset</source>
         <translation>Настройки сброшены</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsDns.qml" line="111"/>
+        <location filename="../ui/qml/Pages2/PageSettingsDns.qml" line="112"/>
         <source>Save</source>
         <translation>Сохранить</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsDns.qml" line="120"/>
+        <location filename="../ui/qml/Pages2/PageSettingsDns.qml" line="121"/>
         <source>Settings saved</source>
         <translation>Сохранить настройки</translation>
     </message>
@@ -2638,6 +2642,16 @@ This means that AmneziaWG keeps the fast performance of the original while addin
         <source>error 0x%1: %2</source>
         <translation>error 0x%1: %2</translation>
     </message>
+    <message>
+        <location filename="../3rd/wireguard-tools/contrib/highlighter/gui/highlight.cpp" line="39"/>
+        <source>WireGuard Configuration Highlighter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../3rd/wireguard-tools/contrib/highlighter/gui/highlight.cpp" line="82"/>
+        <source>&amp;Randomize colors</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SelectLanguageDrawer</name>
diff --git a/client/translations/amneziavpn_zh_CN.ts b/client/translations/amneziavpn_zh_CN.ts
index 576112de..60e03307 100644
--- a/client/translations/amneziavpn_zh_CN.ts
+++ b/client/translations/amneziavpn_zh_CN.ts
@@ -1046,9 +1046,13 @@ And if you don&apos;t like the app, all the more support it - the donation will
         <translation type="obsolete"> 启动时自动运行运用程序</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="73"/>
         <source>Launch the application every time %1 starts</source>
-        <translation>运行应用软件在%1系统启动时</translation>
+        <translation type="vanished">运行应用软件在%1系统启动时</translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="73"/>
+        <source>Launch the application every time the device is starts</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="93"/>
@@ -1266,52 +1270,52 @@ And if you don&apos;t like the app, all the more support it - the donation will
         <translation>DNS服务器</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsDns.qml" line="49"/>
+        <location filename="../ui/qml/Pages2/PageSettingsDns.qml" line="50"/>
         <source>If AmneziaDNS is not used or installed</source>
         <translation>如果未使用或未安装AmneziaDNS</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsDns.qml" line="56"/>
+        <location filename="../ui/qml/Pages2/PageSettingsDns.qml" line="57"/>
         <source>Primary DNS</source>
         <translation>首选 DNS</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsDns.qml" line="68"/>
+        <location filename="../ui/qml/Pages2/PageSettingsDns.qml" line="69"/>
         <source>Secondary DNS</source>
         <translation>备用 DNS</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsDns.qml" line="86"/>
+        <location filename="../ui/qml/Pages2/PageSettingsDns.qml" line="87"/>
         <source>Restore default</source>
         <translation>恢复默认配置</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsDns.qml" line="89"/>
+        <location filename="../ui/qml/Pages2/PageSettingsDns.qml" line="90"/>
         <source>Restore default DNS settings?</source>
         <translation>是否恢复默认DNS配置？</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsDns.qml" line="90"/>
+        <location filename="../ui/qml/Pages2/PageSettingsDns.qml" line="91"/>
         <source>Continue</source>
         <translation>继续</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsDns.qml" line="91"/>
+        <location filename="../ui/qml/Pages2/PageSettingsDns.qml" line="92"/>
         <source>Cancel</source>
         <translation>取消</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsDns.qml" line="99"/>
+        <location filename="../ui/qml/Pages2/PageSettingsDns.qml" line="100"/>
         <source>Settings have been reset</source>
         <translation>已重置</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsDns.qml" line="111"/>
+        <location filename="../ui/qml/Pages2/PageSettingsDns.qml" line="112"/>
         <source>Save</source>
         <translation>保存</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSettingsDns.qml" line="120"/>
+        <location filename="../ui/qml/Pages2/PageSettingsDns.qml" line="121"/>
         <source>Settings saved</source>
         <translation>配置已保存</translation>
     </message>
@@ -2771,6 +2775,16 @@ While it offers a blend of security, stability, and speed, it&apos;s essential t
         <source>error 0x%1: %2</source>
         <translation>错误 0x%1: %2</translation>
     </message>
+    <message>
+        <location filename="../3rd/wireguard-tools/contrib/highlighter/gui/highlight.cpp" line="39"/>
+        <source>WireGuard Configuration Highlighter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../3rd/wireguard-tools/contrib/highlighter/gui/highlight.cpp" line="82"/>
+        <source>&amp;Randomize colors</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SelectLanguageDrawer</name>
diff --git a/client/ui/qml/Pages2/PageSettingsApplication.qml b/client/ui/qml/Pages2/PageSettingsApplication.qml
index 49e3a5d9..05e468f0 100644
--- a/client/ui/qml/Pages2/PageSettingsApplication.qml
+++ b/client/ui/qml/Pages2/PageSettingsApplication.qml
@@ -70,7 +70,7 @@ PageType {
                 Layout.margins: 16
 
                 text: qsTr("Auto start")
-                descriptionText: qsTr("Launch the application every time %1 starts").arg(Qt.platform.os)
+                descriptionText: qsTr("Launch the application every time the device is starts")
 
                 checked: SettingsController.isAutoStartEnabled()
                 onCheckedChanged: {

From 9cf5590371876be5f084fbbc1622f60455f803a3 Mon Sep 17 00:00:00 2001
From: "vladimir.kuznetsov" <nethiuswork@gmail.com>
Date: Mon, 16 Oct 2023 15:17:09 +0500
Subject: [PATCH 240/278] disabled split site tunneling for awg

---
 client/amnezia_application.cpp                  | 15 +++++++++------
 client/translations/amneziavpn_ru.ts            |  8 ++++++--
 client/translations/amneziavpn_zh_CN.ts         |  8 ++++++--
 client/ui/models/sites_model.cpp                |  1 +
 client/ui/qml/Pages2/PageSettingsConnection.qml |  2 +-
 5 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/client/amnezia_application.cpp b/client/amnezia_application.cpp
index 904ffaa6..da00dae7 100644
--- a/client/amnezia_application.cpp
+++ b/client/amnezia_application.cpp
@@ -139,7 +139,8 @@ void AmneziaApplication::init()
             &ConnectionController::openConnection);
     connect(m_notificationHandler.get(), &NotificationHandler::disconnectRequested, m_connectionController.get(),
             &ConnectionController::closeConnection);
-    connect(this, &AmneziaApplication::translationsUpdated, m_notificationHandler.get(),  &NotificationHandler::onTranslationsUpdated);
+    connect(this, &AmneziaApplication::translationsUpdated, m_notificationHandler.get(),
+            &NotificationHandler::onTranslationsUpdated);
 
     m_engine->load(url);
     m_systemController->setQmlRoot(m_engine->rootObjects().value(0));
@@ -226,14 +227,13 @@ void AmneziaApplication::loadTranslator()
     updateTranslator(locale);
 }
 
-
 void AmneziaApplication::updateTranslator(const QLocale &locale)
 {
     if (!m_translator->isEmpty()) {
         QCoreApplication::removeTranslator(m_translator.get());
     }
 
-    QString strFileName = QString(":/translations/amneziavpn")+QLatin1String("_")+locale.name()+".qm";
+    QString strFileName = QString(":/translations/amneziavpn") + QLatin1String("_") + locale.name() + ".qm";
     if (m_translator->load(strFileName)) {
         if (QCoreApplication::installTranslator(m_translator.get())) {
             m_settings->setAppLanguage(locale);
@@ -295,11 +295,13 @@ void AmneziaApplication::initModels()
     m_sitesModel.reset(new SitesModel(m_settings, this));
     m_engine->rootContext()->setContextProperty("SitesModel", m_sitesModel.get());
     connect(m_containersModel.get(), &ContainersModel::defaultContainerChanged, this, [this]() {
-        if (m_containersModel->getDefaultContainer() == DockerContainer::WireGuard
+        if ((m_containersModel->getDefaultContainer() == DockerContainer::WireGuard
+             || m_containersModel->getDefaultContainer() == DockerContainer::Awg)
             && m_sitesModel->isSplitTunnelingEnabled()) {
             m_sitesModel->toggleSplitTunneling(false);
             emit m_pageController->showNotificationMessage(
-                    tr("Split tunneling for WireGuard is not implemented, the option was disabled"));
+                    tr("Split tunneling for %1 is not implemented, the option was disabled")
+                            .arg(ContainerProps::containerHumanNames().value(m_containersModel->getDefaultContainer())));
         }
     });
 
@@ -335,7 +337,8 @@ void AmneziaApplication::initControllers()
     m_connectionController.reset(new ConnectionController(m_serversModel, m_containersModel, m_vpnConnection));
     m_engine->rootContext()->setContextProperty("ConnectionController", m_connectionController.get());
 
-    connect(this, &AmneziaApplication::translationsUpdated, m_connectionController.get(), &ConnectionController::onTranslationsUpdated);
+    connect(this, &AmneziaApplication::translationsUpdated, m_connectionController.get(),
+            &ConnectionController::onTranslationsUpdated);
 
     m_pageController.reset(new PageController(m_serversModel, m_settings));
     m_engine->rootContext()->setContextProperty("PageController", m_pageController.get());
diff --git a/client/translations/amneziavpn_ru.ts b/client/translations/amneziavpn_ru.ts
index de026ce1..acb7ac09 100644
--- a/client/translations/amneziavpn_ru.ts
+++ b/client/translations/amneziavpn_ru.ts
@@ -4,9 +4,13 @@
 <context>
     <name>AmneziaApplication</name>
     <message>
-        <location filename="../amnezia_application.cpp" line="302"/>
         <source>Split tunneling for WireGuard is not implemented, the option was disabled</source>
-        <translation>Раздельное туннелирование для &quot;Wireguard&quot; не реализовано,опция отключена</translation>
+        <translation type="vanished">Раздельное туннелирование для &quot;Wireguard&quot; не реализовано,опция отключена</translation>
+    </message>
+    <message>
+        <location filename="../amnezia_application.cpp" line="303"/>
+        <source>Split tunneling for %1 is not implemented, the option was disabled</source>
+        <translation>Раздельное туннелирование для %1 не реализовано, опция отключена</translation>
     </message>
 </context>
 <context>
diff --git a/client/translations/amneziavpn_zh_CN.ts b/client/translations/amneziavpn_zh_CN.ts
index 77879a50..658a2c15 100644
--- a/client/translations/amneziavpn_zh_CN.ts
+++ b/client/translations/amneziavpn_zh_CN.ts
@@ -4,9 +4,13 @@
 <context>
     <name>AmneziaApplication</name>
     <message>
-        <location filename="../amnezia_application.cpp" line="302"/>
         <source>Split tunneling for WireGuard is not implemented, the option was disabled</source>
-        <translation>未启用选项，还未实现基于WireGuard协议的VPN分离</translation>
+        <translation type="vanished">未启用选项，还未实现基于WireGuard协议的VPN分离</translation>
+    </message>
+    <message>
+        <location filename="../amnezia_application.cpp" line="303"/>
+        <source>Split tunneling for %1 is not implemented, the option was disabled</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
diff --git a/client/ui/models/sites_model.cpp b/client/ui/models/sites_model.cpp
index 1e0f1692..61748bfc 100644
--- a/client/ui/models/sites_model.cpp
+++ b/client/ui/models/sites_model.cpp
@@ -111,6 +111,7 @@ void SitesModel::toggleSplitTunneling(bool enabled)
     } else {
         m_settings->setRouteMode(Settings::RouteMode::VpnAllSites);
     }
+    m_isSplitTunnelingEnabled = enabled;
 }
 
 QVector<QPair<QString, QString> > SitesModel::getCurrentSites()
diff --git a/client/ui/qml/Pages2/PageSettingsConnection.qml b/client/ui/qml/Pages2/PageSettingsConnection.qml
index b5b1bd97..f6ecafd7 100644
--- a/client/ui/qml/Pages2/PageSettingsConnection.qml
+++ b/client/ui/qml/Pages2/PageSettingsConnection.qml
@@ -125,7 +125,7 @@ PageType {
             }
 
             DividerType {
-                visible: !GC.isMobile()
+                visible: false//!GC.isMobile()
             }
         }
     }

From 7cc0f39d3ca12fd05fde3d7b6c06030d66e01c55 Mon Sep 17 00:00:00 2001
From: ronoaer <ronoaer@gmail.com>
Date: Mon, 16 Oct 2023 22:21:01 +0800
Subject: [PATCH 241/278] adapted pagehome by new custom drawer type

---
 client/resources.qrc                          |   1 +
 .../qml/Components/HomeContainersListView.qml |   2 +-
 .../ui/qml/Components/HomeRootMenuButton.qml  | 140 ++++++++++
 client/ui/qml/Controls2/Drawer2Type.qml       |  68 +----
 client/ui/qml/Controls2/DropDownType.qml      |   9 +-
 client/ui/qml/Pages2/PageHome.qml             | 242 +++---------------
 6 files changed, 194 insertions(+), 268 deletions(-)
 create mode 100644 client/ui/qml/Components/HomeRootMenuButton.qml

diff --git a/client/resources.qrc b/client/resources.qrc
index d7f8ff7a..ac6e5a6d 100644
--- a/client/resources.qrc
+++ b/client/resources.qrc
@@ -217,5 +217,6 @@
         <file>ui/qml/Controls2/TopCloseButtonType.qml</file>
         <file>images/controls/x-circle.svg</file>
         <file>ui/qml/Controls2/Drawer2Type.qml</file>
+        <file>ui/qml/Components/HomeRootMenuButton.qml</file>
     </qresource>
 </RCC>
diff --git a/client/ui/qml/Components/HomeContainersListView.qml b/client/ui/qml/Components/HomeContainersListView.qml
index 86a755c1..1436c747 100644
--- a/client/ui/qml/Components/HomeContainersListView.qml
+++ b/client/ui/qml/Components/HomeContainersListView.qml
@@ -69,7 +69,7 @@ ListView {
                         isDefault = true
 
                         menuContent.currentIndex = index
-                        containersDropDown.menuVisible = false
+                        containersDropDown.menu.state = "closed"
 
 
                         if (needReconnected &&
diff --git a/client/ui/qml/Components/HomeRootMenuButton.qml b/client/ui/qml/Components/HomeRootMenuButton.qml
new file mode 100644
index 00000000..b2ca98dc
--- /dev/null
+++ b/client/ui/qml/Components/HomeRootMenuButton.qml
@@ -0,0 +1,140 @@
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+
+import "../Controls2/TextTypes"
+import "../Controls2"
+
+Item {
+    id: root
+
+    property string text
+    property int textMaximumLineCount: 2
+    property int textElide: Qt.ElideRight
+
+    property string descriptionText
+
+    property var clickedFunction
+
+    property string rightImageSource
+
+    property string textColor: "#d7d8db"
+    property string descriptionColor: "#878B91"
+    property real textOpacity: 1.0
+
+    property string rightImageColor: "#d7d8db"
+
+    property bool descriptionOnTop: false
+
+    property string defaultServerHostName
+    property string defaultContainerName
+
+    implicitWidth: content.implicitWidth + content.anchors.topMargin + content.anchors.bottomMargin
+    implicitHeight: content.implicitHeight + content.anchors.leftMargin + content.anchors.rightMargin
+
+    ColumnLayout {
+        id: content
+
+        anchors.right: parent.right
+        anchors.left: parent.left
+        anchors.bottom: parent.bottom
+
+        RowLayout {
+            Layout.topMargin: 24
+            Layout.leftMargin: 24
+            Layout.rightMargin: 24
+            Layout.alignment: Qt.AlignHCenter | Qt.AlignVCenter
+
+            Header1TextType {
+                Layout.maximumWidth: root.width - 48 - 18 - 12 // todo
+
+                maximumLineCount: 2
+                elide: Qt.ElideRight
+
+                text: root.text
+                Layout.alignment: Qt.AlignLeft
+            }
+
+
+            ImageButtonType {
+                id: rightImage
+
+                hoverEnabled: false
+                image: rightImageSource
+                imageColor: rightImageColor
+                visible: rightImageSource ? true : false
+
+//                implicitSize: 18
+//                backGroudRadius: 5
+                horizontalPadding: 0
+                padding: 0
+                spacing: 0
+
+
+                Rectangle {
+                    id: rightImageBackground
+                    anchors.fill: parent
+                    radius: 16
+                    color: "transparent"
+
+                    Behavior on color {
+                        PropertyAnimation { duration: 200 }
+                    }
+                }
+            }
+        }
+
+        LabelTextType {
+            Layout.bottomMargin: 44
+            Layout.alignment: Qt.AlignHCenter | Qt.AlignVCenter
+
+            text: {
+                var description = ""
+                if (ServersModel.isDefaultServerHasWriteAccess()) {
+                    if (SettingsController.isAmneziaDnsEnabled()
+                            && ContainersModel.isAmneziaDnsContainerInstalled(ServersModel.getDefaultServerIndex())) {
+                        description += "Amnezia DNS | "
+                    }
+                } else {
+                    if (ServersModel.isDefaultServerConfigContainsAmneziaDns()) {
+                        description += "Amnezia DNS | "
+                    }
+                }
+
+                description += root.defaultContainerName + " | " + root.defaultServerHostName
+                return description
+            }
+        }
+    }
+
+
+    MouseArea {
+        anchors.fill: parent
+        cursorShape: Qt.PointingHandCursor
+        hoverEnabled: true
+
+        onEntered: {
+            rightImageBackground.color = rightImage.hoveredColor
+
+            root.textOpacity = 0.8
+        }
+
+        onExited: {
+            rightImageBackground.color = rightImage.defaultColor
+
+            root.textOpacity = 1
+        }
+
+        onPressedChanged: {
+            rightImageBackground.color = pressed ? rightImage.pressedColor : entered ? rightImage.hoveredColor : rightImage.defaultColor
+
+            root.textOpacity = 0.7
+        }
+
+        onClicked: {
+            if (clickedFunction && typeof clickedFunction === "function") {
+                clickedFunction()
+            }
+        }
+    }
+}
diff --git a/client/ui/qml/Controls2/Drawer2Type.qml b/client/ui/qml/Controls2/Drawer2Type.qml
index 2daae742..3f3cf54b 100644
--- a/client/ui/qml/Controls2/Drawer2Type.qml
+++ b/client/ui/qml/Controls2/Drawer2Type.qml
@@ -22,10 +22,9 @@ Item {
 
     property string defaultColor: "#1C1D21"
     property string borderColor: "#2C2D30"
-    property int collapsedHeight: 0
 
     property bool needCollapsed: false
-    property double scaely
+
     property int contentHeight: 0
     property Item contentParent: contentArea
 
@@ -50,15 +49,10 @@ Item {
         MouseArea {
             id: fullArea
             anchors.fill: parent
-            enabled: (root.state === "expanded" || root.state === "opened")
+            enabled: (root.state === "opened")
             hoverEnabled: true
 
             onClicked: {
-                if (root.state === "expanded") {
-                    root.state = "collapsed"
-                    return
-                }
-
                 if (root.state === "opened") {
                     root.state = "closed"
                     return
@@ -101,7 +95,7 @@ Item {
 
                     anchors.fill: parent
 
-                    cursorShape: (root.state === "opened"  || root.state === "expanded") ? Qt.PointingHandCursor : Qt.ArrowCursor
+                    cursorShape: (root.state === "opened") ? Qt.PointingHandCursor : Qt.ArrowCursor
                     hoverEnabled: true
 
                     drag.target: root
@@ -113,35 +107,17 @@ Item {
                     onReleased: {
                         if (root.state === "closed" && root.y < dragArea.drag.maximumY) {
                             root.state = "opened"
-                            // PageController.drawerOpen()
                             return
                         }
 
                         if (root.state === "opened" && root.y > dragArea.drag.minimumY) {
                             root.state = "closed"
-                            // PageController.drawerClose()
-                            return
-                        }
-
-                        if (root.state === "collapsed" && root.y < dragArea.drag.maximumY) {
-                            root.state = "expanded"
-                            return
-                        }
-                        if (root.state === "expanded" && root.y > dragArea.drag.minimumY) {
-                            root.state = "collapsed"
                             return
                         }
                     }
 
                     onClicked: {
-                        if (root.state === "expanded") {
-                            // PageController.drawerOpen()
-                            root.state = "collapsed"
-                            return
-                        }
-
                         if (root.state === "opened") {
-                            // PageController.drawerClose()
                             root.state = "closed"
                             return
                         }
@@ -152,7 +128,7 @@ Item {
     }
 
     onStateChanged: {
-        if (root.state === "closed" || root.state === "collapsed") {
+        if (root.state === "closed") {
             var initialPageNavigationBarColor = PageController.getInitialPageNavigationBarColor()
             if (initialPageNavigationBarColor !== 0xFF1C1D21) {
                 PageController.updateNavigationBarColor(initialPageNavigationBarColor)
@@ -166,7 +142,7 @@ Item {
 
             return
         }
-        if (root.state === "expanded" || root.state === "opened") {
+        if (root.state === "opened") {
             if (PageController.getInitialPageNavigationBarColor() !== 0xFF1C1D21) {
                 PageController.updateNavigationBarColor(0xFF1C1D21)
             }
@@ -181,21 +157,6 @@ Item {
 
     /** Two states of buttonContent, great place to add any future animations for the drawer */
     states: [
-        State {
-            name: "collapsed"
-            PropertyChanges {
-                target: root
-                y: root.height - collapsedHeight
-            }
-        },
-        State {
-            name: "expanded"
-            PropertyChanges {
-                target: root
-                y: dragArea.drag.minimumY
-            }
-        },
-
         State {
             name: "closed"
             PropertyChanges {
@@ -214,25 +175,6 @@ Item {
     ]
 
     transitions: [
-        Transition {
-            from: "collapsed"
-            to: "expanded"
-            PropertyAnimation {
-                target: root
-                properties: "y"
-                duration: 200
-            }
-        },
-        Transition {
-            from: "expanded"
-            to: "collapsed"
-            PropertyAnimation {
-                target: root
-                properties: "y"
-                duration: 200
-            }
-        },
-
         Transition {
             from: "opened"
             to: "closed"
diff --git a/client/ui/qml/Controls2/DropDownType.qml b/client/ui/qml/Controls2/DropDownType.qml
index 83518bef..0506bdc7 100644
--- a/client/ui/qml/Controls2/DropDownType.qml
+++ b/client/ui/qml/Controls2/DropDownType.qml
@@ -42,6 +42,8 @@ Item {
 
     property Item drawerParent: root
 
+    property Drawer2Type menu: menu
+
     implicitWidth: rootButtonContent.implicitWidth
     implicitHeight: rootButtonContent.implicitHeight
 
@@ -157,13 +159,12 @@ Item {
         onClicked: {
             if (rootButtonClickedFunction && typeof rootButtonClickedFunction === "function") {
                 rootButtonClickedFunction()
-            } else {
-                menu.open()
             }
+
+            menu.open()
         }
     }
 
-    //DrawerType {
     Drawer2Type {
         id: menu
 
@@ -186,7 +187,7 @@ Item {
             BackButtonType {
                 backButtonImage: root.headerBackButtonImage
                 backButtonFunction: function() {
-                    root.menuVisible = false
+                    menu.state = "closed"
                 }
             }
         }
diff --git a/client/ui/qml/Pages2/PageHome.qml b/client/ui/qml/Pages2/PageHome.qml
index 519c17a5..dafa3bdc 100644
--- a/client/ui/qml/Pages2/PageHome.qml
+++ b/client/ui/qml/Pages2/PageHome.qml
@@ -30,13 +30,13 @@ PageType {
         target: PageController
 
         function onRestorePageHomeState(isContainerInstalled) {
-            buttonContent.state = "expanded"
+            menu.close()
             if (isContainerInstalled) {
                 containersDropDown.menuVisible = true
             }
         }
         function onForceCloseDrawer() {
-            buttonContent.state = "collapsed"
+            menu.close()
         }
     }
 
@@ -69,79 +69,27 @@ PageType {
             }
         }
 
-        collapsedServerMenuDescription.text = description + root.defaultContainerName + " | " + root.defaultServerHostName
+        // collapsedServerMenuDescription.text = description + root.defaultContainerName + " | " + root.defaultServerHostName
         expandedServersMenuDescription.text = description + root.defaultServerHostName
     }
 
-    Component.onCompleted: updateDescriptions()
-
-    MouseArea {
-        anchors.fill: parent
-        enabled: buttonContent.state === "expanded"
-        onClicked: {
-            buttonContent.state = "collapsed"
-        }
+    Component.onCompleted: {
+        updateDescriptions()
     }
 
     Item {
         anchors.fill: parent
-        anchors.bottomMargin: buttonContent.collapsedHeight
+        anchors.bottomMargin: defaultServerInfo.implicitHeight
 
         ConnectButton {
             anchors.centerIn: parent
         }
     }
 
-    MouseArea {
-        id: dragArea
-
-        anchors.fill: buttonBackground
-        cursorShape: buttonContent.state === "collapsed" ? Qt.PointingHandCursor : Qt.ArrowCursor
-        hoverEnabled: true
-
-        drag.target: buttonContent
-        drag.axis: Drag.YAxis
-        drag.maximumY: root.height - buttonContent.collapsedHeight
-        drag.minimumY: root.height - root.height * 0.9
-
-        /** If drag area is released at any point other than min or max y, transition to the other state */
-        onReleased: {
-            if (buttonContent.state === "collapsed" && buttonContent.y < dragArea.drag.maximumY) {
-                buttonContent.state = "expanded"
-                return
-            }
-            if (buttonContent.state === "expanded" && buttonContent.y > dragArea.drag.minimumY) {
-                buttonContent.state = "collapsed"
-                return
-            }
-        }
-
-        onEntered: {
-            collapsedButtonChevron.backgroundColor = collapsedButtonChevron.hoveredColor
-            collapsedButtonHeader.opacity = 0.8
-        }
-        onExited: {
-            collapsedButtonChevron.backgroundColor = collapsedButtonChevron.defaultColor
-            collapsedButtonHeader.opacity = 1
-        }
-        onPressedChanged: {
-            collapsedButtonChevron.backgroundColor = pressed ? collapsedButtonChevron.pressedColor : entered ? collapsedButtonChevron.hoveredColor : collapsedButtonChevron.defaultColor
-            collapsedButtonHeader.opacity = 0.7
-        }
-
-
-        onClicked: {
-            if (buttonContent.state === "collapsed") {
-                buttonContent.state = "expanded"
-            }
-        }
-    }
-
     Rectangle {
         id: buttonBackground
+        anchors.fill: defaultServerInfo
 
-        anchors { left: buttonContent.left; right: buttonContent.right; top: buttonContent.top }
-        height: root.height
         radius: 16
         color: root.defaultColor
         border.color: root.borderColor
@@ -157,151 +105,40 @@ PageType {
         }
     }
 
-    ColumnLayout {
-        id: buttonContent
+    HomeRootMenuButton {
+        id: defaultServerInfo
+        anchors.right: parent.right
+        anchors.left: parent.left
+        anchors.bottom: parent.bottom
 
-        /** Initial height of button content */
-        property int collapsedHeight: 0
-        /** True when expanded objects should be visible */
-        property bool expandedVisibility: buttonContent.state === "expanded" || (buttonContent.state === "collapsed" && dragArea.drag.active === true)
-        /** True when collapsed objects should be visible */
-        property bool collapsedVisibility: buttonContent.state === "collapsed" && dragArea.drag.active === false
+        text: root.defaultServerName
+        rightImageSource: "qrc:/images/controls/chevron-down.svg"
 
-        Drag.active: dragArea.drag.active
-        anchors.right: root.right
-        anchors.left: root.left
-        y: root.height - buttonContent.height
+        defaultContainerName: root.defaultContainerName
+        defaultServerHostName: root.defaultServerHostName
 
-        Component.onCompleted: {
-            buttonContent.state = "collapsed"
+        clickedFunction: function() {
+             menu.open()
         }
+    }
 
-        /** Set once based on first implicit height change once all children are layed out */
-        onImplicitHeightChanged: {
-            if (buttonContent.state === "collapsed" && collapsedHeight == 0) {
-                collapsedHeight = implicitHeight
-            }
-        }
+    Drawer2Type {
+        id: menu
+        parent: root
 
-        onStateChanged: {
-            if (buttonContent.state === "collapsed") {
-                var initialPageNavigationBarColor = PageController.getInitialPageNavigationBarColor()
-                if (initialPageNavigationBarColor !== 0xFF1C1D21) {
-                    PageController.updateNavigationBarColor(initialPageNavigationBarColor)
-                }
-                PageController.drawerClose()
-                return
-            }
-            if (buttonContent.state === "expanded") {
-                if (PageController.getInitialPageNavigationBarColor() !== 0xFF1C1D21) {
-                    PageController.updateNavigationBarColor(0xFF1C1D21)
-                }
-                PageController.drawerOpen()
-                return
-            }
-        }
+        width: parent.width
+        height: parent.height
+        contentHeight: parent.height * 0.9
 
-        /** Two states of buttonContent, great place to add any future animations for the drawer */
-        states: [
-            State {
-                name: "collapsed"
-                PropertyChanges {
-                    target: buttonContent
-                    y: root.height - collapsedHeight
-                }
-            },
-            State {
-                name: "expanded"
-                PropertyChanges {
-                    target: buttonContent
-                    y: dragArea.drag.minimumY
-
-                }
-            }
-        ]
-
-        transitions: [
-            Transition {
-                from: "collapsed"
-                to: "expanded"
-                PropertyAnimation {
-                    target: buttonContent
-                    properties: "y"
-                    duration: 200
-                }
-            },
-            Transition {
-                from: "expanded"
-                to: "collapsed"
-                PropertyAnimation {
-                    target: buttonContent
-                    properties: "y"
-                    duration: 200
-                }
-            }
-        ]
-
-        RowLayout {
-            Layout.topMargin: 24
-            Layout.leftMargin: 24
-            Layout.rightMargin: 24
-            Layout.alignment: Qt.AlignHCenter | Qt.AlignVCenter
-            visible: buttonContent.collapsedVisibility
-
-            spacing: 0
-
-            Header1TextType {
-                id: collapsedButtonHeader
-                Layout.maximumWidth: buttonContent.width - 48 - 18 - 12 // todo
-
-                maximumLineCount: 2
-                elide: Qt.ElideRight
-
-                text: root.defaultServerName
-                horizontalAlignment: Qt.AlignHCenter
-
-                Behavior on opacity {
-                    PropertyAnimation { duration: 200 }
-                }
-            }
-
-            ImageButtonType {
-                id: collapsedButtonChevron
-
-                Layout.leftMargin: 8
-
-                hoverEnabled: false
-                image: "qrc:/images/controls/chevron-down.svg"
-                imageColor: "#d7d8db"
-
-                icon.width: 18
-                icon.height: 18
-                backgroundRadius: 16
-                horizontalPadding: 4
-                topPadding: 4
-                bottomPadding: 3
-
-                onClicked: {
-                    if (buttonContent.state === "collapsed") {
-                        buttonContent.state = "expanded"
-                    }
-                }
-            }
-        }
-
-        LabelTextType {
-            id: collapsedServerMenuDescription
-            Layout.bottomMargin: 44
-            Layout.alignment: Qt.AlignHCenter | Qt.AlignVCenter
-            visible: buttonContent.collapsedVisibility
-        }
 
         ColumnLayout {
             id: serversMenuHeader
 
-            Layout.alignment: Qt.AlignTop | Qt.AlignHCenter
-            Layout.fillWidth: true
-            visible: buttonContent.expandedVisibility
+            parent: menu.contentParent
+
+            anchors.top: parent.top
+            anchors.right: parent.right
+            anchors.left: parent.left
 
             Header1TextType {
                 Layout.fillWidth: true
@@ -330,6 +167,8 @@ PageType {
                 DropDownType {
                     id: containersDropDown
 
+                    drawerParent: root
+
                     rootButtonImageColor: "#0E0E11"
                     rootButtonBackgroundColor: "#D7D8DB"
                     rootButtonBackgroundHoveredColor: Qt.rgba(215, 216, 219, 0.8)
@@ -383,7 +222,6 @@ PageType {
                 Layout.topMargin: 48
                 Layout.leftMargin: 16
                 Layout.rightMargin: 16
-                visible: buttonContent.expandedVisibility
 
                 headerText: qsTr("Servers")
             }
@@ -391,12 +229,16 @@ PageType {
 
         Flickable {
             id: serversContainer
-            Layout.alignment: Qt.AlignTop | Qt.AlignHCenter
-            Layout.fillWidth: true
-            Layout.topMargin: 16
+
+            parent: menu.contentParent
+
+            anchors.top: serversMenuHeader.bottom
+            anchors.right: parent.right
+            anchors.left: parent.left
+            anchors.bottom: parent.bottom
+            anchors.topMargin: 16
             contentHeight: col.implicitHeight
-            implicitHeight: root.height - (root.height * 0.1) - serversMenuHeader.implicitHeight - 52 //todo 52 is tabbar height
-            visible: buttonContent.expandedVisibility
+
             clip: true
 
             ScrollBar.vertical: ScrollBar {
@@ -500,7 +342,7 @@ PageType {
                                     onClicked: function() {
                                         ServersModel.currentlyProcessedIndex = index
                                         PageController.goToPage(PageEnum.PageSettingsServerInfo)
-                                        buttonContent.state = "collapsed"
+                                        menu.close()
                                     }
                                 }
                             }

From 36ba3758db6b3f16e4c5dc11e8e8f581177a33ca Mon Sep 17 00:00:00 2001
From: pokamest <pokamest@gmail.com>
Date: Mon, 16 Oct 2023 15:27:26 +0100
Subject: [PATCH 242/278] Translation updates

---
 client/translations/amneziavpn_ru.ts    | 101 ++++++++++++++++--------
 client/translations/amneziavpn_zh_CN.ts |  10 ---
 2 files changed, 70 insertions(+), 41 deletions(-)

diff --git a/client/translations/amneziavpn_ru.ts b/client/translations/amneziavpn_ru.ts
index 8d9e5e92..857d390f 100644
--- a/client/translations/amneziavpn_ru.ts
+++ b/client/translations/amneziavpn_ru.ts
@@ -611,7 +611,7 @@ Already installed containers were found on the server. All installed containers
     <message>
         <location filename="../ui/qml/Pages2/PageProtocolRaw.qml" line="177"/>
         <source>All users who you shared a connection with will no longer be able to connect to it.</source>
-        <translation>Все пользователи, с которыми вы поделились этим VPN-протоколом, больше не смогут к нему подключаться.</translation>
+        <translation type="unfinished">Все пользователи, с которыми вы поделились этим VPN-протоколом, больше не смогут к нему подключаться.</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageProtocolRaw.qml" line="178"/>
@@ -765,7 +765,7 @@ Already installed containers were found on the server. All installed containers
     <message>
         <location filename="../ui/qml/Pages2/PageServiceSftpSettings.qml" line="251"/>
         <source>Remove SFTP and all data stored there?</source>
-        <translation>Удалить SFTP-хранилище и все хранящиеся на нем  данные?</translation>
+        <translation>Удалить SFTP-хранилище и все хранящиеся на нем данные?</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageServiceSftpSettings.qml" line="252"/>
@@ -983,14 +983,10 @@ Already installed containers were found on the server. All installed containers
         <source>Auto start</source>
         <translation>Авто-запуск</translation>
     </message>
-    <message>
-        <source>Launch the application every time %1 starts</source>
-        <translation type="vanished">Запускать приложение при каждом включении %1</translation>
-    </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="73"/>
         <source>Launch the application every time the device is starts</source>
-        <translation>Запускать приложение при каждом включении устройства</translation>
+        <translation>Запускать приложение при каждом включении</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="93"/>
@@ -1089,7 +1085,7 @@ Already installed containers were found on the server. All installed containers
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsBackup.qml" line="106"/>
         <source>Backup file saved</source>
-        <translation type="unfinished"></translation>
+        <translation>Бэкап файл сохранен</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsBackup.qml" line="122"/>
@@ -1248,7 +1244,7 @@ Already installed containers were found on the server. All installed containers
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsLogging.qml" line="54"/>
         <source>Save logs</source>
-        <translation>Сохранить логи</translation>
+        <translation>Сохранять логи</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsLogging.qml" line="86"/>
@@ -1268,7 +1264,7 @@ Already installed containers were found on the server. All installed containers
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsLogging.qml" line="118"/>
         <source>Logs file saved</source>
-        <translation type="unfinished"></translation>
+        <translation>Файл с логами сохранен</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsLogging.qml" line="127"/>
@@ -1704,12 +1700,12 @@ and will not be shared or disclosed to the Amnezia or any third parties</source>
     <message>
         <location filename="../ui/qml/Pages2/PageSetupWizardInstalling.qml" line="62"/>
         <source>Amnezia has detected that your server is currently </source>
-        <translation type="unfinished"></translation>
+        <translation>Amnezia обнаружила, что ваш сервер в настоящее время </translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSetupWizardInstalling.qml" line="63"/>
         <source>busy installing other software. Amnezia installation </source>
-        <translation type="unfinished"></translation>
+        <translation>занят установкой другого программного обеспечения. Установка Amnezia </translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSetupWizardInstalling.qml" line="64"/>
@@ -2428,7 +2424,15 @@ While it offers a blend of security, stability, and speed, it&apos;s essential t
 * Minimal configuration
 * Recognised by DPI analysis systems
 * Works over UDP network protocol, ports 500 and 4500.</source>
-        <translation type="unfinished"></translation>
+        <translation>IKEv2 в сочетании с уровнем шифрования IPSec это современный и стабильный протокол VPN.
+Он может быстро переключаться между сетями и устройствами, что делает его особенно адаптивным в динамичных сетевых средах. 
+Несмотря на сочетание безопасности, стабильности и скорости, необходимо отметить, что IKEv2 легко обнаруживается и подвержен блокировке.
+
+* Доступно в AmneziaVPN только для Windows.
+* Низкое энергопотребление, на мобильных устройствах
+* Минимальная конфигурация
+* Распознается системами DPI-анализа
+* Работает по сетевому протоколу UDP, порты 500 и 4500.</translation>
     </message>
     <message>
         <location filename="../containers/containers_defs.cpp" line="215"/>
@@ -2474,7 +2478,7 @@ While it offers a blend of security, stability, and speed, it&apos;s essential t
     <message>
         <location filename="../containers/containers_defs.cpp" line="111"/>
         <source>AmneziaWG - Special protocol from Amnezia, based on WireGuard. It&apos;s fast like WireGuard, but very resistant to blockages. Recommended for regions with high levels of censorship.</source>
-        <translation type="unfinished"></translation>
+        <translation>AmneziaWG - Специальный протокол от Amnezia, основанный на протоколе WireGuard. Он такой же быстрый, как WireGuard, но очень устойчив к блокировкам. Рекомендуется для регионов с высоким уровнем цензуры.</translation>
     </message>
     <message>
         <location filename="../containers/containers_defs.cpp" line="115"/>
@@ -2506,7 +2510,14 @@ It employs its unique security protocol, leveraging the strength of SSL/TLS for
 * Flexible customisation to suit user needs to work with different operating systems and devices
 * Recognised by DPI analysis systems and therefore susceptible to blocking
 * Can operate over both TCP and UDP network protocols.</source>
-        <translation type="unfinished"></translation>
+        <translation>OpenVPN однин из самых популярных и проверенных временем VPN-протоколов.
+В нем используется уникальный протокол безопасности, опирающийся на протокол SSL/TLS для шифрования и обмена ключами. Кроме того, поддержка OpenVPN множества методов аутентификации делает его универсальным и адаптируемым к широкому спектру устройств и операционных систем. Благодаря открытому исходному коду OpenVPN подвергается тщательному анализу со стороны мирового сообщества, что постоянно повышает его безопасность. Благодаря оптимальному соотношению производительности, безопасности и совместимости OpenVPN остается лучшим выбором как для частных лиц, так и для компаний, заботящихся о конфиденциальности.
+
+* Доступность AmneziaVPN для всех платформ
+* Нормальное энергопотребление на мобильных устройствах
+* Гибкая настройка под нужды пользователя для работы с различными операционными системами и устройствами
+* Распознается системами DPI-анализа и поэтому подвержен блокировке
+* Может работать по сетевым протоколам TCP и UDP.</translation>
     </message>
     <message>
         <location filename="../containers/containers_defs.cpp" line="145"/>
@@ -2518,7 +2529,12 @@ It employs its unique security protocol, leveraging the strength of SSL/TLS for
 * Configurable encryption protocol
 * Detectable by some DPI systems
 * Works over TCP network protocol.</source>
-        <translation type="unfinished"></translation>
+        <translation>Shadowsocks, создан на основе протокола SOCKS5, защищает соединение с помощью шифра AEAD. Несмотря на то, что протокол Shadowsocks разработан таким образом, чтобы быть незаметным и сложным для идентификации, он не идентичен стандартному HTTPS-соединению. Однако некоторые системы анализа трафика все же могут обнаружить соединение Shadowsocks. В связи с ограниченной поддержкой в Amnezia рекомендуется использовать протокол AmneziaWG, или OpenVPN over Cloak.
+
+* Доступен в AmneziaVPN только на ПК ноутбуках.
+* Настраиваемый протокол шифрования
+* Обнаруживается некоторыми DPI-системами
+* Работает по сетевому протоколу TCP.</translation>
     </message>
     <message>
         <location filename="../containers/containers_defs.cpp" line="155"/>
@@ -2540,7 +2556,24 @@ If there is a extreme level of Internet censorship in your region, we advise you
 * Not recognised by DPI analysis systems
 * Works over TCP network protocol, 443 port.
 </source>
-        <translation type="unfinished"></translation>
+        <translation>OpenVPN over Cloak - это комбинация протокола OpenVPN и плагина Cloak, разработанного специально для защиты от блокировок.
+
+OpenVPN обеспечивает безопасное VPN-соединение за счет шифрования всего интернет-трафика между клиентом и сервером.
+
+Cloak защищает OpenVPN от обнаружения и блокировок. 
+
+Cloak может изменять метаданные пакетов. Он полностью маскирует VPN-трафик под обычный веб-трафик, а также защищает VPN от обнаружения с помощью Active Probing. Это делает ее очень устойчивой к обнаружению
+
+Сразу же после получения первого пакета данных Cloak проверяет подлинность входящего соединения. Если аутентификация не проходит, плагин маскирует сервер под поддельный сайт, и ваша VPN становится невидимой для аналитических систем.
+
+Если в вашем регионе существует экстремальный уровень цензуры в Интернете, мы советуем вам при первом подключении использовать только OpenVPN через Cloak
+
+* Доступность AmneziaVPN на всех платформах
+* Высокое энергопотребление на мобильных устройствах
+* Гибкие настройки
+* Не распознается системами DPI-анализа
+* Работает по сетевому протоколу TCP, 443 порт.
+</translation>
     </message>
     <message>
         <location filename="../containers/containers_defs.cpp" line="174"/>
@@ -2553,7 +2586,15 @@ WireGuard is very susceptible to blocking due to its distinct packet signatures.
 * Minimum number of settings
 * Easily recognised by DPI analysis systems, susceptible to blocking
 * Works over UDP network protocol.</source>
-        <translation type="unfinished"></translation>
+        <translation>WireGuard - относительно новый популярный VPN-протокол с упрощенной архитектурой.
+Обеспечивает стабильное VPN-соединение, высокую производительность на всех устройствах. Использует жестко заданные настройки шифрования. WireGuard по сравнению с OpenVPN имеет меньшую задержку и лучшую пропускную способность при передаче данных.
+WireGuard очень восприимчив к блокированию из-за особенностей сигнатур пакетов. В отличие от некоторых других VPN-протоколов, использующих методы обфускации, последовательные сигнатуры пакетов WireGuard легче выявляются и, соответственно, блокируются современными системами глубокой проверки пакетов (DPI) и другими средствами сетевого мониторинга.
+
+* Доступность AmneziaVPN для всех платформ
+* Низкое энергопотребление
+* Минимальное количество настроек
+* Легко распознается системами DPI-анализа, подвержен блокировке
+* Работает по сетевому протоколу UDP.</translation>
     </message>
     <message>
         <location filename="../containers/containers_defs.cpp" line="187"/>
@@ -2566,7 +2607,15 @@ This means that AmneziaWG keeps the fast performance of the original while addin
 * Minimum number of settings
 * Not recognised by DPI analysis systems, resistant to blocking
 * Works over UDP network protocol.</source>
-        <translation type="unfinished"></translation>
+        <translation>AmneziaWG - усовершенствованная версия популярного VPN-протокола Wireguard. AmneziaWG опирается на фундамент, заложенный WireGuard, сохраняя упрощенную архитектуру и высокопроизводительные возможности работы на разных устройствах.
+Хотя WireGuard известен своей эффективностью, у него были проблемы с обнаружением из-за характерных сигнатур пакетов. AmneziaWG решает эту проблему за счет использования более совершенных методов обфускации, благодаря чему его трафик сливается с обычным интернет-трафиком.
+Таким образом, AmneziaWG сохраняет высокую производительность оригинала, добавляя при этом дополнительный уровень скрытности, что делает его отличным выбором для тех, кому нужно быстрое и незаметное VPN-соединение.
+
+* Доступность AmneziaVPN на всех платформах
+* Низкое энергопотребление
+* Минимальное количество настроек
+* Не распознается системами DPI-анализа, устойчив к блокировке
+* Работает по сетевому протоколу UDP.</translation>
     </message>
     <message>
         <source>AmneziaWG container</source>
@@ -2642,16 +2691,6 @@ This means that AmneziaWG keeps the fast performance of the original while addin
         <source>error 0x%1: %2</source>
         <translation>error 0x%1: %2</translation>
     </message>
-    <message>
-        <location filename="../3rd/wireguard-tools/contrib/highlighter/gui/highlight.cpp" line="39"/>
-        <source>WireGuard Configuration Highlighter</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../3rd/wireguard-tools/contrib/highlighter/gui/highlight.cpp" line="82"/>
-        <source>&amp;Randomize colors</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>SelectLanguageDrawer</name>
@@ -2877,7 +2916,7 @@ This means that AmneziaWG keeps the fast performance of the original while addin
     <message>
         <location filename="../containers/containers_defs.cpp" line="309"/>
         <source>Medium or High</source>
-        <translation>Спедний или Высокий</translation>
+        <translation>Средний или Высокий</translation>
     </message>
     <message>
         <location filename="../containers/containers_defs.cpp" line="310"/>
@@ -2925,7 +2964,7 @@ This means that AmneziaWG keeps the fast performance of the original while addin
     <message>
         <location filename="../ui/qml/main2.qml" line="172"/>
         <source>Private key passphrase</source>
-        <translation>Кодовая фраза  для закрытого ключа</translation>
+        <translation>Кодовая фраза для закрытого ключа</translation>
     </message>
     <message>
         <location filename="../ui/qml/main2.qml" line="191"/>
diff --git a/client/translations/amneziavpn_zh_CN.ts b/client/translations/amneziavpn_zh_CN.ts
index 60e03307..b908bf56 100644
--- a/client/translations/amneziavpn_zh_CN.ts
+++ b/client/translations/amneziavpn_zh_CN.ts
@@ -2775,16 +2775,6 @@ While it offers a blend of security, stability, and speed, it&apos;s essential t
         <source>error 0x%1: %2</source>
         <translation>错误 0x%1: %2</translation>
     </message>
-    <message>
-        <location filename="../3rd/wireguard-tools/contrib/highlighter/gui/highlight.cpp" line="39"/>
-        <source>WireGuard Configuration Highlighter</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../3rd/wireguard-tools/contrib/highlighter/gui/highlight.cpp" line="82"/>
-        <source>&amp;Randomize colors</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>SelectLanguageDrawer</name>

From 9eb23e38bd9b31cc50794312bd7cbd8793fdce3a Mon Sep 17 00:00:00 2001
From: "vladimir.kuznetsov" <nethiuswork@gmail.com>
Date: Mon, 16 Oct 2023 22:57:12 +0500
Subject: [PATCH 243/278] disabled the ability to change the protocol/server
 when a vpn connection is active

---
 client/translations/amneziavpn_ru.ts          | 13 ++++++--
 client/translations/amneziavpn_zh_CN.ts       | 13 ++++++--
 .../qml/Components/HomeContainersListView.qml | 30 +++++++------------
 client/ui/qml/Controls2/CardType.qml          |  2 ++
 client/ui/qml/Pages2/PageHome.qml             |  6 ++++
 5 files changed, 41 insertions(+), 23 deletions(-)

diff --git a/client/translations/amneziavpn_ru.ts b/client/translations/amneziavpn_ru.ts
index 8d9e5e92..ad2ebfbe 100644
--- a/client/translations/amneziavpn_ru.ts
+++ b/client/translations/amneziavpn_ru.ts
@@ -119,13 +119,17 @@
     <name>HomeContainersListView</name>
     <message>
         <location filename="../ui/qml/Components/HomeContainersListView.qml" line="58"/>
+        <source>Unable change protocol while there is an active connection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Components/HomeContainersListView.qml" line="69"/>
         <source>The selected protocol is not supported on the current platform</source>
         <translation>Выбранный протокол не поддерживается на данном устройстве</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Components/HomeContainersListView.qml" line="76"/>
         <source>Reconnect via VPN Procotol: </source>
-        <translation>Переподключение через VPN протокол: </translation>
+        <translation type="vanished">Переподключение через VPN протокол: </translation>
     </message>
 </context>
 <context>
@@ -267,6 +271,11 @@ Already installed containers were found on the server. All installed containers
         <source>Servers</source>
         <translation>Серверы</translation>
     </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageHome.qml" line="480"/>
+        <source>Unable change server while there is an active connection</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PageProtocolAwgSettings</name>
diff --git a/client/translations/amneziavpn_zh_CN.ts b/client/translations/amneziavpn_zh_CN.ts
index 60e03307..0def921b 100644
--- a/client/translations/amneziavpn_zh_CN.ts
+++ b/client/translations/amneziavpn_zh_CN.ts
@@ -130,13 +130,17 @@
     <name>HomeContainersListView</name>
     <message>
         <location filename="../ui/qml/Components/HomeContainersListView.qml" line="58"/>
+        <source>Unable change protocol while there is an active connection</source>
+        <translation>Невозможно изменить протокол при наличии активного соединения</translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Components/HomeContainersListView.qml" line="69"/>
         <source>The selected protocol is not supported on the current platform</source>
         <translation>当前平台不支持所选协议</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Components/HomeContainersListView.qml" line="76"/>
         <source>Reconnect via VPN Procotol: </source>
-        <translation>重连VPN基于协议: </translation>
+        <translation type="vanished">重连VPN基于协议: </translation>
     </message>
 </context>
 <context>
@@ -301,6 +305,11 @@ Already installed containers were found on the server. All installed containers
         <source>Servers</source>
         <translation>服务器</translation>
     </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageHome.qml" line="480"/>
+        <source>Unable change server while there is an active connection</source>
+        <translation>Невозможно изменить сервер при наличии активного соединения</translation>
+    </message>
 </context>
 <context>
     <name>PageProtocolAwgSettings</name>
diff --git a/client/ui/qml/Components/HomeContainersListView.qml b/client/ui/qml/Components/HomeContainersListView.qml
index 2304427f..f05b90d6 100644
--- a/client/ui/qml/Components/HomeContainersListView.qml
+++ b/client/ui/qml/Components/HomeContainersListView.qml
@@ -50,34 +50,26 @@ ListView {
                 imageSource: "qrc:/images/controls/download.svg"
                 showImage: !isInstalled
 
-                checkable: isInstalled
+                checkable: isInstalled && !ConnectionController.isConnected && isSupported
                 checked: isDefault
 
-                onPressed: function(mouse) {
-                    if (!isSupported) {
-                        PageController.showErrorMessage(qsTr("The selected protocol is not supported on the current platform"))
-                    }
-                }
-
                 onClicked: {
-                    if (checked) {
-                        var needReconnected = false
-                        if (!isDefault) {
-                            needReconnected = true
-                        }
+                    if (ConnectionController.isConnected && isInstalled) {
+                        PageController.showNotificationMessage(qsTr("Unable change protocol while there is an active connection"))
+                        return
+                    }
 
+                    if (checked) {
                         isDefault = true
 
                         menuContent.currentIndex = index
                         containersDropDown.menuVisible = false
-
-
-                        if (needReconnected && (ConnectionController.isConnected || ConnectionController.isConnectionInProgress)) {
-                            PageController.showNotificationMessage(qsTr("Reconnect via VPN Procotol: ") + name)
-                            PageController.goToPageHome()
-                            ConnectionController.openConnection()
-                        }
                     } else {
+                        if (!isSupported && isInstalled) {
+                            PageController.showErrorMessage(qsTr("The selected protocol is not supported on the current platform"))
+                            return
+                        }
+
                         ContainersModel.setCurrentlyProcessedContainerIndex(proxyContainersModel.mapToSource(index))
                         InstallController.setShouldCreateServer(false)
                         PageController.goToPage(PageEnum.PageSetupWizardProtocolSettings)
diff --git a/client/ui/qml/Controls2/CardType.qml b/client/ui/qml/Controls2/CardType.qml
index 8429acb8..32f89122 100644
--- a/client/ui/qml/Controls2/CardType.qml
+++ b/client/ui/qml/Controls2/CardType.qml
@@ -81,6 +81,7 @@ RadioButton {
 
         Text {
             text: root.headerText
+            wrapMode: Text.WordWrap
             color: "#D7D8DB"
             font.pixelSize: 25
             font.weight: 700
@@ -110,6 +111,7 @@ RadioButton {
 
         Text {
             text: root.footerText
+            wrapMode: Text.WordWrap
             visible: root.footerText !== ""
             color: "#878B91"
             font.pixelSize: 13
diff --git a/client/ui/qml/Pages2/PageHome.qml b/client/ui/qml/Pages2/PageHome.qml
index 519c17a5..d89d6be1 100644
--- a/client/ui/qml/Pages2/PageHome.qml
+++ b/client/ui/qml/Pages2/PageHome.qml
@@ -471,10 +471,16 @@ PageType {
                                     }
 
                                     checked: index === serversMenuContent.currentIndex
+                                    checkable: !ConnectionController.isConnected
 
                                     ButtonGroup.group: serversRadioButtonGroup
 
                                     onClicked: {
+                                        if (ConnectionController.isConnected) {
+                                            PageController.showNotificationMessage(qsTr("Unable change server while there is an active connection"))
+                                            return
+                                        }
+
                                         serversMenuContent.currentIndex = index
 
                                         ServersModel.currentlyProcessedIndex = index

From 5369e68267828ce243e32b1aca70a0de218e34f1 Mon Sep 17 00:00:00 2001
From: ronoaer <ronoaer@gmail.com>
Date: Tue, 17 Oct 2023 14:30:59 +0800
Subject: [PATCH 244/278] updated Chinese translations for updating source
 strings

---
 client/translations/amneziavpn_zh_CN.ts | 105 ++++++++++++++++++------
 1 file changed, 80 insertions(+), 25 deletions(-)

diff --git a/client/translations/amneziavpn_zh_CN.ts b/client/translations/amneziavpn_zh_CN.ts
index b908bf56..e1f8a13a 100644
--- a/client/translations/amneziavpn_zh_CN.ts
+++ b/client/translations/amneziavpn_zh_CN.ts
@@ -74,17 +74,17 @@
     <message>
         <location filename="../ui/qml/Components/ConnectionTypeSelectionDrawer.qml" line="30"/>
         <source>Add new connection</source>
-        <translation type="unfinished"></translation>
+        <translation>添加新连接</translation>
     </message>
     <message>
         <location filename="../ui/qml/Components/ConnectionTypeSelectionDrawer.qml" line="38"/>
         <source>Configure your server</source>
-        <translation type="unfinished"></translation>
+        <translation>配置您的服务器</translation>
     </message>
     <message>
         <location filename="../ui/qml/Components/ConnectionTypeSelectionDrawer.qml" line="52"/>
         <source>Open config file, key or QR code</source>
-        <translation type="unfinished"></translation>
+        <translation>配置文件，授权码或二维码</translation>
     </message>
     <message>
         <source>Server IP, login and password</source>
@@ -860,7 +860,7 @@ Already installed containers were found on the server. All installed containers
     <message>
         <location filename="../ui/qml/Pages2/PageServiceTorWebsiteSettings.qml" line="112"/>
         <source>When configuring WordPress set the this onion address as domain.</source>
-        <translation type="unfinished"></translation>
+        <translation>配置 WordPress 时，将此洋葱地址设置为域。</translation>
     </message>
     <message>
         <source>When configuring WordPress set the domain as this onion address.</source>
@@ -1052,7 +1052,7 @@ And if you don&apos;t like the app, all the more support it - the donation will
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="73"/>
         <source>Launch the application every time the device is starts</source>
-        <translation type="unfinished"></translation>
+        <translation>每次设备启动时启动应用程序</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="93"/>
@@ -1155,7 +1155,7 @@ And if you don&apos;t like the app, all the more support it - the donation will
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsBackup.qml" line="106"/>
         <source>Backup file saved</source>
-        <translation type="unfinished"></translation>
+        <translation>备份文件已保存</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsBackup.qml" line="122"/>
@@ -1350,7 +1350,7 @@ And if you don&apos;t like the app, all the more support it - the donation will
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsLogging.qml" line="118"/>
         <source>Logs file saved</source>
-        <translation type="unfinished"></translation>
+        <translation>日志文件已保存</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsLogging.qml" line="127"/>
@@ -1705,7 +1705,7 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
     <message>
         <location filename="../ui/qml/Pages2/PageSetupWizardCredentials.qml" line="44"/>
         <source>Configure your server</source>
-        <translation type="unfinished"></translation>
+        <translation>配置服务器</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSetupWizardCredentials.qml" line="51"/>
@@ -1720,7 +1720,7 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
     <message>
         <location filename="../ui/qml/Pages2/PageSetupWizardCredentials.qml" line="66"/>
         <source>Login to connect via SSH</source>
-        <translation>ssh账号</translation>
+        <translation>用户</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSetupWizardCredentials.qml" line="76"/>
@@ -1736,7 +1736,8 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
         <location filename="../ui/qml/Pages2/PageSetupWizardCredentials.qml" line="115"/>
         <source>All data you enter will remain strictly confidential
 and will not be shared or disclosed to the Amnezia or any third parties</source>
-        <translation type="unfinished"></translation>
+        <translation>您输入的所有数据将严格保密
+不会向 Amnezia 或任何第三方分享或披露</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSetupWizardCredentials.qml" line="125"/>
@@ -1803,12 +1804,12 @@ and will not be shared or disclosed to the Amnezia or any third parties</source>
     <message>
         <location filename="../ui/qml/Pages2/PageSetupWizardInstalling.qml" line="62"/>
         <source>Amnezia has detected that your server is currently </source>
-        <translation type="unfinished"></translation>
+        <translation>Amnezia 检测到您的服务器当前</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSetupWizardInstalling.qml" line="63"/>
         <source>busy installing other software. Amnezia installation </source>
-        <translation type="unfinished"></translation>
+        <translation>正安装其他软件。Amnezia安装</translation>
     </message>
     <message>
         <source>Amnesia has detected that your server is currently </source>
@@ -2017,7 +2018,7 @@ and will not be shared or disclosed to the Amnezia or any third parties</source>
     <message>
         <location filename="../ui/qml/Pages2/PageShare.qml" line="175"/>
         <source>Access to server management. The user with whom you share full access to the connection will be able to add and remove your protocols and services to the server, as well as change settings.</source>
-        <translation type="unfinished"></translation>
+        <translation>除访问VPN外，用户还能添加和删除协议、服务以及更改配置信息</translation>
     </message>
     <message>
         <source>Access to server management. The user with whom you share full access to the connection will be able to add and remove your protocols and services to the servers, as well as change settings.</source>
@@ -2578,7 +2579,7 @@ and will not be shared or disclosed to the Amnezia or any third parties</source>
     <message>
         <location filename="../containers/containers_defs.cpp" line="111"/>
         <source>AmneziaWG - Special protocol from Amnezia, based on WireGuard. It&apos;s fast like WireGuard, but very resistant to blockages. Recommended for regions with high levels of censorship.</source>
-        <translation type="unfinished"></translation>
+        <translation>AmneziaWG - Amnezia 的特殊协议，基于 WireGuard。它的速度像 WireGuard 一样快，但非常抗堵塞。推荐用于审查较严的地区。</translation>
     </message>
     <message>
         <location filename="../containers/containers_defs.cpp" line="115"/>
@@ -2610,7 +2611,14 @@ It employs its unique security protocol, leveraging the strength of SSL/TLS for
 * Flexible customisation to suit user needs to work with different operating systems and devices
 * Recognised by DPI analysis systems and therefore susceptible to blocking
 * Can operate over both TCP and UDP network protocols.</source>
-        <translation type="unfinished"></translation>
+        <translation>OpenVPN 是最流行且经过时间考验的 VPN 协议之一。
+它采用其独特的安全协议，利用 SSL/TLS 的优势进行加密和密钥交换。此外，OpenVPN 支持多种身份验证方法，使其具有多功能性和适应性，可适应各种设备和操作系统。由于其开源性质，OpenVPN 受益于全球社区的广泛审查，这不断增强了其安全性。凭借性能、安全性和兼容性的强大平衡，OpenVPN 仍然是注重隐私的个人和企业的首选。
+
+* 可在所有平台的 AmneziaVPN 中使用
+* 移动设备的正常功耗
+* 灵活定制，满足用户使用不同操作系统和设备的需求
+* 被DPI分析系统识别，因此容易被阻塞
+* 可以通过 TCP 和 UDP 网络协议运行</translation>
     </message>
     <message>
         <location filename="../containers/containers_defs.cpp" line="145"/>
@@ -2622,7 +2630,14 @@ It employs its unique security protocol, leveraging the strength of SSL/TLS for
 * Configurable encryption protocol
 * Detectable by some DPI systems
 * Works over TCP network protocol.</source>
-        <translation type="unfinished"></translation>
+        <translation>Shadowsocks 受到 SOCKS5 协议的启发，使用 AEAD 密码保护连接。尽管 Shadowsocks 设计得谨慎且难以识别，但它与标准 HTTPS 连接并不相同。但是，某些流量分析系统可能仍会检测到 Shadowsocks 连接。由于Amnezia支持有限，建议使用AmneziaWG协议。
+
+* 仅在桌面平台上的 AmneziaVPN 中可用
+* 移动设备的正常功耗
+
+* 可配置的加密协议
+* 可以被某些 DPI 系统检测到
+* 通过 TCP 网络协议工作。</translation>
     </message>
     <message>
         <location filename="../containers/containers_defs.cpp" line="155"/>
@@ -2644,7 +2659,23 @@ If there is a extreme level of Internet censorship in your region, we advise you
 * Not recognised by DPI analysis systems
 * Works over TCP network protocol, 443 port.
 </source>
-        <translation type="unfinished"></translation>
+        <translation>这是 OpenVPN 协议和专门用于阻止保护的 Cloak 插件的组合。
+
+OpenVPN 通过加密客户端和服务器之间的所有 Internet 流量来提供安全的 VPN 连接。
+
+Cloak 可保护 OpenVPN 免遭检测和阻止。
+
+Cloak 可以修改数据包元数据，以便将 VPN 流量完全屏蔽为正常 Web 流量，并且还可以保护 VPN 免受主动探测的检测。这使得它非常难以被发现
+
+收到第一个数据包后，Cloak 立即对传入连接进行身份验证。如果身份验证失败，该插件会将服务器伪装成虚假网站，并且您的 VPN 对分析系统来说将变得不可见。
+
+如果您所在地区的互联网审查非常严格，我们建议您在第一次连接时仅使用 OpenVPN over Cloak
+
+* 可在所有平台的 AmneziaVPN 中使用
+* 移动设备功耗高
+* 配置灵活
+* 不被 DPI 分析系统识别
+* 通过 TCP 网络协议、443 端口工作。</translation>
     </message>
     <message>
         <location filename="../containers/containers_defs.cpp" line="174"/>
@@ -2657,7 +2688,15 @@ WireGuard is very susceptible to blocking due to its distinct packet signatures.
 * Minimum number of settings
 * Easily recognised by DPI analysis systems, susceptible to blocking
 * Works over UDP network protocol.</source>
-        <translation type="unfinished"></translation>
+        <translation>一种相对较新的流行 VPN 协议，具有简化的架构。
+在所有设备上提供稳定的 VPN 连接和高性能。使用硬编码的加密设置。 WireGuard 与 OpenVPN 相比具有更低的延迟和更好的数据传输吞吐量。
+由于其独特的数据包签名，WireGuard 非常容易受到阻塞。与其他一些采用混淆技术的 VPN 协议不同，WireGuard 数据包的一致签名模式可以更容易地被高级深度数据包检测 (DPI) 系统和其他网络监控工具识别并阻止。
+
+* 可在所有平台的 AmneziaVPN 中使用
+* 低功耗
+* 配置简单
+* 容易被DPI分析系统识别，容易被阻塞
+* 通过 UDP 网络协议工作。</translation>
     </message>
     <message>
         <location filename="../containers/containers_defs.cpp" line="187"/>
@@ -2670,7 +2709,15 @@ This means that AmneziaWG keeps the fast performance of the original while addin
 * Minimum number of settings
 * Not recognised by DPI analysis systems, resistant to blocking
 * Works over UDP network protocol.</source>
-        <translation type="unfinished"></translation>
+        <translation>AmneziaWG 是流行 VPN 协议的现代迭代，它建立在 WireGuard 的基础上，保留了其简化的架构和跨设备的高性能功能。
+虽然 WireGuard 以其高效而闻名，但由于其独特的数据包签名，它存在容易被检测到的问题。 AmneziaWG 通过使用更好的混淆方法解决了这个问题，使其流量与常规互联网流量融合在一起。
+这意味着 AmneziaWG 保留了原始版本的快速性能，同时添加了额外的隐秘层，使其成为那些想要快速且谨慎的 VPN 连接的人的绝佳选择。
+
+* 可在所有平台的 AmneziaVPN 中使用
+* 低功耗
+* 配置简单
+* 不被DPI分析系统识别，抗阻塞
+* 通过 UDP 网络协议工作。</translation>
     </message>
     <message>
         <location filename="../containers/containers_defs.cpp" line="203"/>
@@ -2683,7 +2730,15 @@ While it offers a blend of security, stability, and speed, it&apos;s essential t
 * Minimal configuration
 * Recognised by DPI analysis systems
 * Works over UDP network protocol, ports 500 and 4500.</source>
-        <translation type="unfinished"></translation>
+        <translation>IKEv2 与 IPSec 加密层配合使用，是一种现代且稳定的 VPN 协议。
+其显着特征之一是能够在网络和设备之间快速切换，使其特别适应动态网络环境。
+虽然 IKEv2 兼具安全性、稳定性和速度，但必须注意的是，IKEv2 很容易被检测到，并且容易受到阻止。
+
+* 仅在 Windows 上的 AmneziaVPN 中可用
+* 低功耗，在移动设备上
+* 最低配置
+* 获得DPI分析系统认可
+* 通过 UDP 网络协议、端口 500 和 4500 工作。</translation>
     </message>
     <message>
         <source>OpenVPN container</source>
@@ -3004,27 +3059,27 @@ While it offers a blend of security, stability, and speed, it&apos;s essential t
     <message>
         <location filename="../containers/containers_defs.cpp" line="309"/>
         <source>Medium or High</source>
-        <translation type="unfinished"></translation>
+        <translation>中或高</translation>
     </message>
     <message>
         <location filename="../containers/containers_defs.cpp" line="310"/>
         <source>Extreme</source>
-        <translation type="unfinished"></translation>
+        <translation>极度</translation>
     </message>
     <message>
         <location filename="../containers/containers_defs.cpp" line="318"/>
         <source>I just want to increase the level of my privacy.</source>
-        <translation type="unfinished"></translation>
+        <translation>只是想提高隐私保护级别。</translation>
     </message>
     <message>
         <location filename="../containers/containers_defs.cpp" line="319"/>
         <source>I want to bypass censorship. This option recommended in most cases.</source>
-        <translation type="unfinished"></translation>
+        <translation>想要绕过审查制度。大多数情况下推荐使用此选项。</translation>
     </message>
     <message>
         <location filename="../containers/containers_defs.cpp" line="321"/>
         <source>Most VPN protocols are blocked. Recommended if other options are not working.</source>
-        <translation type="unfinished"></translation>
+        <translation>大多数 VPN 协议都被阻止。如果其他选项不起作用，推荐此选项。</translation>
     </message>
     <message>
         <source>High</source>

From 03171e474331eec48be2717851a77359663c3139 Mon Sep 17 00:00:00 2001
From: ronoaer <ronoaer@gmail.com>
Date: Tue, 17 Oct 2023 19:34:34 +0800
Subject: [PATCH 245/278] update background color and drag-effect, moved
 dulicated code

---
 .../qml/Components/HomeContainersListView.qml |  2 +-
 client/ui/qml/Controls2/Drawer2Type.qml       | 27 ++++++++++---------
 client/ui/qml/Controls2/DropDownType.qml      |  2 +-
 3 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/client/ui/qml/Components/HomeContainersListView.qml b/client/ui/qml/Components/HomeContainersListView.qml
index 1436c747..c6c4125a 100644
--- a/client/ui/qml/Components/HomeContainersListView.qml
+++ b/client/ui/qml/Components/HomeContainersListView.qml
@@ -69,7 +69,7 @@ ListView {
                         isDefault = true
 
                         menuContent.currentIndex = index
-                        containersDropDown.menu.state = "closed"
+                        containersDropDown.menu.close()
 
 
                         if (needReconnected &&
diff --git a/client/ui/qml/Controls2/Drawer2Type.qml b/client/ui/qml/Controls2/Drawer2Type.qml
index 3f3cf54b..fcd773a8 100644
--- a/client/ui/qml/Controls2/Drawer2Type.qml
+++ b/client/ui/qml/Controls2/Drawer2Type.qml
@@ -10,7 +10,7 @@ Item {
         target: PageController
 
         function onForceCloseDrawer() {
-            root.state = "closed"
+            close()
         }
     }
 
@@ -32,8 +32,6 @@ Item {
 
     state: "closed"
 
-    Drag.active: dragArea.drag.active
-
     Rectangle {
         id: draw2Background
 
@@ -41,7 +39,7 @@ Item {
         height: root.parent.height
         width: parent.width
         radius: 16
-        color:  "transparent"
+        color:  "#90000000"
         border.color: "transparent"
         border.width: 1
         visible: true
@@ -54,6 +52,7 @@ Item {
 
             onClicked: {
                 if (root.state === "opened") {
+                    draw2Background.color = "transparent"
                     root.state = "closed"
                     return
                 }
@@ -61,14 +60,16 @@ Item {
 
             Rectangle {
                 id: placeAreaHolder
-                anchors.top: parent.top
                 height: parent.height - contentHeight
                 anchors.right: parent.right
                 anchors.left: parent.left
                 visible: true
                 color: "transparent"
+
+                Drag.active: dragArea.drag.active
             }
 
+
             Rectangle {
                 id: contentArea
 
@@ -98,27 +99,27 @@ Item {
                     cursorShape: (root.state === "opened") ? Qt.PointingHandCursor : Qt.ArrowCursor
                     hoverEnabled: true
 
-                    drag.target: root
+                    drag.target: placeAreaHolder
                     drag.axis: Drag.YAxis
                     drag.maximumY: root.height
                     drag.minimumY: root.height - root.height
 
                     /** If drag area is released at any point other than min or max y, transition to the other state */
                     onReleased: {
-                        if (root.state === "closed" && root.y < dragArea.drag.maximumY) {
+                        if (root.state === "closed" && placeAreaHolder.y < dragArea.drag.maximumY) {
                             root.state = "opened"
                             return
                         }
 
-                        if (root.state === "opened" && root.y > dragArea.drag.minimumY) {
-                            root.state = "closed"
+                        if (root.state === "opened" && placeAreaHolder.y > dragArea.drag.minimumY) {
+                            close()
                             return
                         }
                     }
 
                     onClicked: {
                         if (root.state === "opened") {
-                            root.state = "closed"
+                            close()
                             return
                         }
                     }
@@ -209,22 +210,24 @@ Item {
         if (root.visible && root.state !== "closed") {
             return
         }
+        draw2Background.color = "#90000000"
 
         root.y = 0
         root.state = "opened"
         root.visible = true
         root.height = parent.height
         contentArea.height = contentHeight
+        placeAreaHolder.height =  parent.height - contentHeight
+        placeAreaHolder.y = parent.height - root.height
 
         dragArea.drag.maximumY =  parent.height
         dragArea.drag.minimumY =  parent.height - root.height
 
-
         animationVisible.running = true
     }
 
     function close() {
-        root.visible = false
+        draw2Background.color = "transparent"
         root.state = "closed"
     }
 
diff --git a/client/ui/qml/Controls2/DropDownType.qml b/client/ui/qml/Controls2/DropDownType.qml
index 0506bdc7..c666408a 100644
--- a/client/ui/qml/Controls2/DropDownType.qml
+++ b/client/ui/qml/Controls2/DropDownType.qml
@@ -187,7 +187,7 @@ Item {
             BackButtonType {
                 backButtonImage: root.headerBackButtonImage
                 backButtonFunction: function() {
-                    menu.state = "closed"
+                    menu.close()
                 }
             }
         }

From 61ddfe01a10f3149711e8405a2218264ea8ee534 Mon Sep 17 00:00:00 2001
From: pokamest <pokamest@gmail.com>
Date: Tue, 17 Oct 2023 06:39:49 -0700
Subject: [PATCH 246/278] macos build script updated [no ci]

---
 deploy/build_macos.sh | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/deploy/build_macos.sh b/deploy/build_macos.sh
index 700198e7..13214d6d 100755
--- a/deploy/build_macos.sh
+++ b/deploy/build_macos.sh
@@ -96,16 +96,16 @@ if [ "${MAC_CERT_PW+x}" ]; then
   security find-identity -p codesigning
 
   echo "Signing App bundle..."
-  /usr/bin/codesign --deep --force --verbose --timestamp -o runtime --sign "Developer ID Application: Privacy Technologies OU (X7UJ388FXK)" $BUNDLE_DIR
+  /usr/bin/codesign --deep --force --verbose --timestamp -o runtime --sign "$MAC_SIGNER_ID" $BUNDLE_DIR
   /usr/bin/codesign --verify -vvvv $BUNDLE_DIR || true
   spctl -a -vvvv $BUNDLE_DIR || true
 
   if [ "${NOTARIZE_APP+x}" ]; then
     echo "Notarizing App bundle..."
     /usr/bin/ditto -c -k --keepParent $BUNDLE_DIR $PROJECT_DIR/Bundle_to_notarize.zip
-    xcrun altool --notarize-app -f $PROJECT_DIR/Bundle_to_notarize.zip -t osx --primary-bundle-id "$APP_DOMAIN" -u "$APPLE_DEV_EMAIL" -p $APPLE_DEV_PASSWORD
+    xcrun notarytool submit $PROJECT_DIR/Bundle_to_notarize.zip --apple-id $APPLE_DEV_EMAIL --team-id $MAC_TEAM_ID --password $APPLE_DEV_PASSWORD
     rm $PROJECT_DIR/Bundle_to_notarize.zip
-    sleep 600
+    sleep 300
     xcrun stapler staple $BUNDLE_DIR
     xcrun stapler validate $BUNDLE_DIR
     spctl -a -vvvv $BUNDLE_DIR || true
@@ -130,15 +130,15 @@ $QIF_BIN_DIR/binarycreator --offline-only -v -c $BUILD_DIR/installer/config/maco
 if [ "${MAC_CERT_PW+x}" ]; then
   echo "Signing installer bundle..."
   security unlock-keychain -p $TEMP_PASS $KEYCHAIN
-  /usr/bin/codesign --deep --force --verbose --timestamp -o runtime --sign "Developer ID Application: Privacy Technologies OU (X7UJ388FXK)" $INSTALLER_BUNDLE_DIR
+  /usr/bin/codesign --deep --force --verbose --timestamp -o runtime --sign "$MAC_SIGNER_ID" $INSTALLER_BUNDLE_DIR
   /usr/bin/codesign --verify -vvvv $INSTALLER_BUNDLE_DIR || true
 
   if [ "${NOTARIZE_APP+x}" ]; then
     echo "Notarizing installer bundle..."
     /usr/bin/ditto -c -k --keepParent $INSTALLER_BUNDLE_DIR $PROJECT_DIR/Installer_bundle_to_notarize.zip
-    xcrun altool --notarize-app -f $PROJECT_DIR/Installer_bundle_to_notarize.zip -t osx --primary-bundle-id "$APP_DOMAIN" -u "$APPLE_DEV_EMAIL" -p $APPLE_DEV_PASSWORD
+    xcrun notarytool submit $PROJECT_DIR/Installer_bundle_to_notarize.zip --apple-id $APPLE_DEV_EMAIL --team-id $MAC_TEAM_ID --password $APPLE_DEV_PASSWORD
     rm $PROJECT_DIR/Installer_bundle_to_notarize.zip
-    sleep 600
+    sleep 300
     xcrun stapler staple $INSTALLER_BUNDLE_DIR
     xcrun stapler validate $INSTALLER_BUNDLE_DIR
     spctl -a -vvvv $INSTALLER_BUNDLE_DIR || true
@@ -151,13 +151,13 @@ hdiutil create -volname AmneziaVPN -srcfolder $BUILD_DIR/installer/$APP_NAME.app
 if [ "${MAC_CERT_PW+x}" ]; then
   echo "Signing DMG installer..."
   security unlock-keychain -p $TEMP_PASS $KEYCHAIN
-  /usr/bin/codesign --deep --force --verbose --timestamp -o runtime --sign "Developer ID Application: Privacy Technologies OU (X7UJ388FXK)" $DMG_FILENAME
+  /usr/bin/codesign --deep --force --verbose --timestamp -o runtime --sign "$MAC_SIGNER_ID" $DMG_FILENAME
   /usr/bin/codesign --verify -vvvv $DMG_FILENAME || true
 
   if [ "${NOTARIZE_APP+x}" ]; then
     echo "Notarizing DMG installer..."
-    xcrun altool --notarize-app -f $DMG_FILENAME -t osx --primary-bundle-id $APP_DOMAIN -u $APPLE_DEV_EMAIL -p $APPLE_DEV_PASSWORD
-    sleep 600
+    xcrun notarytool submit $DMG_FILENAME --apple-id $APPLE_DEV_EMAIL --team-id $MAC_TEAM_ID --password $APPLE_DEV_PASSWORD
+    sleep 300
     xcrun stapler staple $DMG_FILENAME
     xcrun stapler validate $DMG_FILENAME
   fi

From 94304b5777a6e74546f6aaa3f1d61126a019f940 Mon Sep 17 00:00:00 2001
From: pokamest <pokamest@gmail.com>
Date: Tue, 17 Oct 2023 14:47:31 +0100
Subject: [PATCH 247/278] Version bump

---
 CMakeLists.txt                                  | 2 +-
 client/ui/qml/Pages2/PageSettingsConnection.qml | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 85d7d0ce..028aacd3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.25.0 FATAL_ERROR)
 
 set(PROJECT AmneziaVPN)
 
-project(${PROJECT} VERSION 4.0.8.2
+project(${PROJECT} VERSION 4.0.8.3
         DESCRIPTION "AmneziaVPN"
         HOMEPAGE_URL "https://amnezia.org/"
 )
diff --git a/client/ui/qml/Pages2/PageSettingsConnection.qml b/client/ui/qml/Pages2/PageSettingsConnection.qml
index 7f0262f9..565ae7db 100644
--- a/client/ui/qml/Pages2/PageSettingsConnection.qml
+++ b/client/ui/qml/Pages2/PageSettingsConnection.qml
@@ -94,7 +94,7 @@ PageType {
             DividerType {}
 
             LabelWithButtonType {
-                visible: !GC.isMobile()
+                visible: GC.isDesktop()
 
                 Layout.fillWidth: true
 
@@ -108,11 +108,11 @@ PageType {
             }
 
             DividerType {
-                visible: !GC.isMobile()
+                visible: GC.isDesktop()
             }
 
             LabelWithButtonType {
-                visible: !GC.isMobile()
+                visible: false
 
                 Layout.fillWidth: true
 
@@ -125,7 +125,7 @@ PageType {
             }
 
             DividerType {
-                visible: !GC.isMobile()
+                visible: false
             }
         }
     }

From a83cd29f725136094bfb5d8855b9167b761bb125 Mon Sep 17 00:00:00 2001
From: ronoaer <ronoaer@gmail.com>
Date: Tue, 17 Oct 2023 22:00:19 +0800
Subject: [PATCH 248/278] fixed the cursorShape, and some minor issues

---
 client/ui/qml/Controls2/Drawer2Type.qml | 47 ++++++++++++++-----------
 1 file changed, 27 insertions(+), 20 deletions(-)

diff --git a/client/ui/qml/Controls2/Drawer2Type.qml b/client/ui/qml/Controls2/Drawer2Type.qml
index fcd773a8..988b4172 100644
--- a/client/ui/qml/Controls2/Drawer2Type.qml
+++ b/client/ui/qml/Controls2/Drawer2Type.qml
@@ -28,15 +28,13 @@ Item {
     property int contentHeight: 0
     property Item contentParent: contentArea
 
-    y: parent.height - root.height
-
     state: "closed"
 
     Rectangle {
         id: draw2Background
 
-        anchors { left: root.left; right: root.right; top: root.top }
-        height: root.parent.height
+        anchors.fill: parent
+        height: parent.height
         width: parent.width
         radius: 16
         color:  "#90000000"
@@ -45,15 +43,14 @@ Item {
         visible: true
 
         MouseArea {
-            id: fullArea
+            id: fullMouseArea
             anchors.fill: parent
             enabled: (root.state === "opened")
             hoverEnabled: true
 
             onClicked: {
                 if (root.state === "opened") {
-                    draw2Background.color = "transparent"
-                    root.state = "closed"
+                    close()
                     return
                 }
             }
@@ -106,15 +103,17 @@ Item {
 
                     /** If drag area is released at any point other than min or max y, transition to the other state */
                     onReleased: {
-                        if (root.state === "closed" && placeAreaHolder.y < dragArea.drag.maximumY) {
+                        if (root.state === "closed" && placeAreaHolder.y < root.height * 0.9) {
                             root.state = "opened"
                             return
                         }
 
-                        if (root.state === "opened" && placeAreaHolder.y > dragArea.drag.minimumY) {
+                        if (root.state === "opened" && placeAreaHolder.y > (root.height - root.height * 0.9)) {
                             close()
                             return
                         }
+
+                        placeAreaHolder.y = 0
                     }
 
                     onClicked: {
@@ -161,15 +160,15 @@ Item {
         State {
             name: "closed"
             PropertyChanges {
-                target: root
+                target: placeAreaHolder
                 y: parent.height
             }
         },
 
         State {
-            name: "opend"
+            name: "opened"
             PropertyChanges {
-                target: root
+                target: placeAreaHolder
                 y: dragArea.drag.minimumY
             }
         }
@@ -180,7 +179,7 @@ Item {
             from: "opened"
             to: "closed"
             PropertyAnimation {
-                target: root
+                target: placeAreaHolder
                 properties: "y"
                 duration: 200
             }
@@ -190,7 +189,7 @@ Item {
             from: "closed"
             to: "opened"
             PropertyAnimation {
-                target: root
+                target: placeAreaHolder
                 properties: "y"
                 duration: 200
             }
@@ -199,7 +198,7 @@ Item {
 
     NumberAnimation {
         id: animationVisible
-        target: root
+        target: placeAreaHolder
         property: "y"
         from: parent.height
         to: 0
@@ -212,21 +211,29 @@ Item {
         }
         draw2Background.color = "#90000000"
 
+        fullMouseArea.visible = true
+        dragArea.visible = true
+
         root.y = 0
         root.state = "opened"
         root.visible = true
         root.height = parent.height
-        contentArea.height = contentHeight
-        placeAreaHolder.height =  parent.height - contentHeight
-        placeAreaHolder.y = parent.height - root.height
 
-        dragArea.drag.maximumY =  parent.height
-        dragArea.drag.minimumY =  parent.height - root.height
+        contentArea.height = contentHeight
+
+        placeAreaHolder.height =  root.height - contentHeight
+        placeAreaHolder.y = root.height - root.height
+
+        dragArea.drag.maximumY =  root.height
+        dragArea.drag.minimumY =  0
 
         animationVisible.running = true
     }
 
     function close() {
+        fullMouseArea.visible = false
+        dragArea.visible = false
+
         draw2Background.color = "transparent"
         root.state = "closed"
     }

From 160d88f002ee612ec93e15d09e0b963ef5bcf646 Mon Sep 17 00:00:00 2001
From: lunardunno <126363523+lunardunno@users.noreply.github.com>
Date: Tue, 17 Oct 2023 21:26:50 +0400
Subject: [PATCH 249/278] Restoring autostart and enable docker for CentOS 7

---
 client/server_scripts/install_docker.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/server_scripts/install_docker.sh b/client/server_scripts/install_docker.sh
index e780dac5..58f92540 100644
--- a/client/server_scripts/install_docker.sh
+++ b/client/server_scripts/install_docker.sh
@@ -8,7 +8,7 @@ if ! command -v sudo > /dev/null 2>&1; then $pm update -yq; $pm install -yq sudo
 if ! command -v fuser > /dev/null 2>&1; then sudo $pm install -yq psmisc; fi;\
 if ! command -v lsof > /dev/null 2>&1; then sudo $pm install -yq lsof; fi;\
 if ! command -v docker > /dev/null 2>&1; then sudo $pm update -yq; sudo $pm install -yq $docker_pkg;\
-  if [ "$dist" = "fedora" ] || [ "$dist" = "debian" ]; then sudo systemctl enable docker && sudo systemctl start docker; fi;\
+  if [ "$dist" = "fedora" ] || [ "$dist" = "centos" ] || [ "$dist" = "debian" ]; then sudo systemctl enable docker && sudo systemctl start docker; fi;\
 fi;\
 if [ "$dist" = "debian" ]; then \
   docker_service=$(systemctl list-units --full --all | grep docker.service | grep -v inactive | grep -v dead | grep -v failed);\

From 2f0c1eeecc11165c1928a6b07e75859e6ec4e629 Mon Sep 17 00:00:00 2001
From: "vladimir.kuznetsov" <nethiuswork@gmail.com>
Date: Wed, 18 Oct 2023 00:36:40 +0500
Subject: [PATCH 250/278] fixed selection of default container after installing
 a new server

---
 client/amnezia_application.cpp              | 2 ++
 client/ui/controllers/installController.cpp | 2 ++
 client/ui/models/servers_model.cpp          | 2 +-
 client/ui/models/servers_model.h            | 2 +-
 client/ui/qml/Components/ConnectButton.qml  | 1 +
 5 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/client/amnezia_application.cpp b/client/amnezia_application.cpp
index 4e6bce2b..bbd48c96 100644
--- a/client/amnezia_application.cpp
+++ b/client/amnezia_application.cpp
@@ -286,6 +286,8 @@ void AmneziaApplication::initModels()
     m_engine->rootContext()->setContextProperty("ServersModel", m_serversModel.get());
     connect(m_serversModel.get(), &ServersModel::currentlyProcessedServerIndexChanged, m_containersModel.get(),
             &ContainersModel::setCurrentlyProcessedServerIndex);
+    connect(m_serversModel.get(), &ServersModel::defaultServerIndexChanged, m_containersModel.get(),
+            &ContainersModel::setCurrentlyProcessedServerIndex);
 
     m_languageModel.reset(new LanguageModel(m_settings, this));
     m_engine->rootContext()->setContextProperty("LanguageModel", m_languageModel.get());
diff --git a/client/ui/controllers/installController.cpp b/client/ui/controllers/installController.cpp
index bb10d39c..db2f9409 100644
--- a/client/ui/controllers/installController.cpp
+++ b/client/ui/controllers/installController.cpp
@@ -475,6 +475,8 @@ void InstallController::addEmptyServer()
     server.insert(config_key::port, m_currentlyInstalledServerCredentials.port);
     server.insert(config_key::description, m_settings->nextAvailableServerName());
 
+    server.insert(config_key::defaultContainer, ContainerProps::containerToString(DockerContainer::None));
+
     m_serversModel->addServer(server);
     m_serversModel->setDefaultServerIndex(m_serversModel->getServersCount() - 1);
 
diff --git a/client/ui/models/servers_model.cpp b/client/ui/models/servers_model.cpp
index 7eea94e5..a2a28630 100644
--- a/client/ui/models/servers_model.cpp
+++ b/client/ui/models/servers_model.cpp
@@ -96,7 +96,7 @@ void ServersModel::setDefaultServerIndex(const int index)
 {
     m_settings->setDefaultServer(index);
     m_defaultServerIndex = m_settings->defaultServerIndex();
-    emit defaultServerIndexChanged();
+    emit defaultServerIndexChanged(m_defaultServerIndex);
 }
 
 const int ServersModel::getDefaultServerIndex()
diff --git a/client/ui/models/servers_model.h b/client/ui/models/servers_model.h
index d7b15844..ad1d5a83 100644
--- a/client/ui/models/servers_model.h
+++ b/client/ui/models/servers_model.h
@@ -64,7 +64,7 @@ protected:
 
 signals:
     void currentlyProcessedServerIndexChanged(const int index);
-    void defaultServerIndexChanged();
+    void defaultServerIndexChanged(const int index);
     void defaultServerNameChanged();
 
 private:
diff --git a/client/ui/qml/Components/ConnectButton.qml b/client/ui/qml/Components/ConnectButton.qml
index 76e83da5..c2ec186d 100644
--- a/client/ui/qml/Components/ConnectButton.qml
+++ b/client/ui/qml/Components/ConnectButton.qml
@@ -142,6 +142,7 @@ Button {
             PageController.setTriggeredBtConnectButton(true)
 
             ServersModel.currentlyProcessedIndex = ServersModel.getDefaultServerIndex()
+            InstallController.setShouldCreateServer(false)
             PageController.goToPage(PageEnum.PageSetupWizardEasy)
 
             return

From 4b64bfaec029aca8355ed627aeaa8356ba243706 Mon Sep 17 00:00:00 2001
From: "vladimir.kuznetsov" <nethiuswork@gmail.com>
Date: Wed, 18 Oct 2023 00:37:15 +0500
Subject: [PATCH 251/278] fixed questionDrawer height

---
 client/translations/amneziavpn_ru.ts        | 14 ++++++++++++--
 client/translations/amneziavpn_zh_CN.ts     | 14 ++++++++++++--
 client/ui/qml/Components/QuestionDrawer.qml |  4 +++-
 3 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/client/translations/amneziavpn_ru.ts b/client/translations/amneziavpn_ru.ts
index 1617413a..4d3ae6c9 100644
--- a/client/translations/amneziavpn_ru.ts
+++ b/client/translations/amneziavpn_ru.ts
@@ -4,7 +4,7 @@
 <context>
     <name>AmneziaApplication</name>
     <message>
-        <location filename="../amnezia_application.cpp" line="302"/>
+        <location filename="../amnezia_application.cpp" line="304"/>
         <source>Split tunneling for WireGuard is not implemented, the option was disabled</source>
         <translation>Раздельное туннелирование для &quot;Wireguard&quot; не реализовано,опция отключена</translation>
     </message>
@@ -194,7 +194,7 @@ Already installed containers were found on the server. All installed containers
         <translation>Пожалуйста, войдите в систему от имени пользователя</translation>
     </message>
     <message>
-        <location filename="../ui/controllers/installController.cpp" line="481"/>
+        <location filename="../ui/controllers/installController.cpp" line="483"/>
         <source>Server added successfully</source>
         <translation>Сервер успешно добавлен</translation>
     </message>
@@ -2700,6 +2700,16 @@ This means that AmneziaWG keeps the fast performance of the original while addin
         <source>error 0x%1: %2</source>
         <translation>error 0x%1: %2</translation>
     </message>
+    <message>
+        <location filename="../3rd/wireguard-tools/contrib/highlighter/gui/highlight.cpp" line="39"/>
+        <source>WireGuard Configuration Highlighter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../3rd/wireguard-tools/contrib/highlighter/gui/highlight.cpp" line="82"/>
+        <source>&amp;Randomize colors</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SelectLanguageDrawer</name>
diff --git a/client/translations/amneziavpn_zh_CN.ts b/client/translations/amneziavpn_zh_CN.ts
index 09198c9c..ae25e41c 100644
--- a/client/translations/amneziavpn_zh_CN.ts
+++ b/client/translations/amneziavpn_zh_CN.ts
@@ -4,7 +4,7 @@
 <context>
     <name>AmneziaApplication</name>
     <message>
-        <location filename="../amnezia_application.cpp" line="302"/>
+        <location filename="../amnezia_application.cpp" line="304"/>
         <source>Split tunneling for WireGuard is not implemented, the option was disabled</source>
         <translation>未启用选项，还未实现基于WireGuard协议的VPN分离</translation>
     </message>
@@ -228,7 +228,7 @@ Already installed containers were found on the server. All installed containers
         <translation>请以用户身份登录</translation>
     </message>
     <message>
-        <location filename="../ui/controllers/installController.cpp" line="481"/>
+        <location filename="../ui/controllers/installController.cpp" line="483"/>
         <source>Server added successfully</source>
         <translation>增加服务器成功</translation>
     </message>
@@ -2839,6 +2839,16 @@ While it offers a blend of security, stability, and speed, it&apos;s essential t
         <source>error 0x%1: %2</source>
         <translation>错误 0x%1: %2</translation>
     </message>
+    <message>
+        <location filename="../3rd/wireguard-tools/contrib/highlighter/gui/highlight.cpp" line="39"/>
+        <source>WireGuard Configuration Highlighter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../3rd/wireguard-tools/contrib/highlighter/gui/highlight.cpp" line="82"/>
+        <source>&amp;Randomize colors</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SelectLanguageDrawer</name>
diff --git a/client/ui/qml/Components/QuestionDrawer.qml b/client/ui/qml/Components/QuestionDrawer.qml
index a79f9140..16cdcb39 100644
--- a/client/ui/qml/Components/QuestionDrawer.qml
+++ b/client/ui/qml/Components/QuestionDrawer.qml
@@ -17,9 +17,11 @@ DrawerType {
     property var noButtonFunction
 
     width: parent.width
-    height: parent.height * 0.5
+    height: content.implicitHeight + 32
 
     ColumnLayout {
+        id: content
+
         anchors.top: parent.top
         anchors.left: parent.left
         anchors.right: parent.right

From a46e55d5c2b938f06ddd03e510e6f9470a538504 Mon Sep 17 00:00:00 2001
From: "vladimir.kuznetsov" <nethiuswork@gmail.com>
Date: Wed, 18 Oct 2023 01:11:41 +0500
Subject: [PATCH 252/278] added a dash for drawerType

---
 client/translations/amneziavpn_ru.ts    |  6 +++---
 client/translations/amneziavpn_zh_CN.ts |  6 +++---
 client/ui/qml/Controls2/DrawerType.qml  | 14 ++++++++++++++
 client/ui/qml/Pages2/PageHome.qml       | 14 ++++++++++++--
 4 files changed, 32 insertions(+), 8 deletions(-)

diff --git a/client/translations/amneziavpn_ru.ts b/client/translations/amneziavpn_ru.ts
index 4d3ae6c9..db27afbc 100644
--- a/client/translations/amneziavpn_ru.ts
+++ b/client/translations/amneziavpn_ru.ts
@@ -262,17 +262,17 @@ Already installed containers were found on the server. All installed containers
 <context>
     <name>PageHome</name>
     <message>
-        <location filename="../ui/qml/Pages2/PageHome.qml" line="344"/>
+        <location filename="../ui/qml/Pages2/PageHome.qml" line="354"/>
         <source>VPN protocol</source>
         <translation>VPN протокол</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageHome.qml" line="388"/>
+        <location filename="../ui/qml/Pages2/PageHome.qml" line="398"/>
         <source>Servers</source>
         <translation>Серверы</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageHome.qml" line="480"/>
+        <location filename="../ui/qml/Pages2/PageHome.qml" line="490"/>
         <source>Unable change server while there is an active connection</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/client/translations/amneziavpn_zh_CN.ts b/client/translations/amneziavpn_zh_CN.ts
index ae25e41c..59bef770 100644
--- a/client/translations/amneziavpn_zh_CN.ts
+++ b/client/translations/amneziavpn_zh_CN.ts
@@ -296,17 +296,17 @@ Already installed containers were found on the server. All installed containers
 <context>
     <name>PageHome</name>
     <message>
-        <location filename="../ui/qml/Pages2/PageHome.qml" line="344"/>
+        <location filename="../ui/qml/Pages2/PageHome.qml" line="354"/>
         <source>VPN protocol</source>
         <translation>VPN协议</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageHome.qml" line="388"/>
+        <location filename="../ui/qml/Pages2/PageHome.qml" line="398"/>
         <source>Servers</source>
         <translation>服务器</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageHome.qml" line="480"/>
+        <location filename="../ui/qml/Pages2/PageHome.qml" line="490"/>
         <source>Unable change server while there is an active connection</source>
         <translation>Невозможно изменить сервер при наличии активного соединения</translation>
     </message>
diff --git a/client/ui/qml/Controls2/DrawerType.qml b/client/ui/qml/Controls2/DrawerType.qml
index 72765d78..830f59f9 100644
--- a/client/ui/qml/Controls2/DrawerType.qml
+++ b/client/ui/qml/Controls2/DrawerType.qml
@@ -1,6 +1,8 @@
 import QtQuick
 import QtQuick.Controls
 
+import "../Config"
+
 Drawer {
     id: drawer
     property bool needCloseButton: true
@@ -39,6 +41,18 @@ Drawer {
 
         border.color: "#2C2D30"
         border.width: 1
+
+        Rectangle {
+            visible: GC.isMobile()
+
+            anchors.top: parent.top
+            anchors.horizontalCenter: parent.horizontalCenter
+            anchors.topMargin: 10
+
+            width: 20
+            height: 2
+            color: "#2C2D30"
+        }
     }
 
     Overlay.modal: Rectangle {
diff --git a/client/ui/qml/Pages2/PageHome.qml b/client/ui/qml/Pages2/PageHome.qml
index d89d6be1..3a71adac 100644
--- a/client/ui/qml/Pages2/PageHome.qml
+++ b/client/ui/qml/Pages2/PageHome.qml
@@ -241,8 +241,18 @@ PageType {
             }
         ]
 
+        DividerType {
+            Layout.topMargin: 10
+            Layout.fillWidth: false
+            Layout.preferredWidth: 20
+            Layout.preferredHeight: 2
+            Layout.alignment: Qt.AlignHCenter | Qt.AlignVCenter
+
+            visible: GC.isMobile() && (buttonContent.collapsedVisibility || buttonContent.expandedVisibility)
+        }
+
         RowLayout {
-            Layout.topMargin: 24
+            Layout.topMargin: 14
             Layout.leftMargin: 24
             Layout.rightMargin: 24
             Layout.alignment: Qt.AlignHCenter | Qt.AlignVCenter
@@ -305,7 +315,7 @@ PageType {
 
             Header1TextType {
                 Layout.fillWidth: true
-                Layout.topMargin: 24
+                Layout.topMargin: 14
                 Layout.leftMargin: 16
                 Layout.rightMargin: 16
 

From f5f72f87a6246ee320aa027348e18edfae97cacc Mon Sep 17 00:00:00 2001
From: "vladimir.kuznetsov" <nethiuswork@gmail.com>
Date: Wed, 18 Oct 2023 12:17:24 +0500
Subject: [PATCH 253/278] fixed switcher status display for page split site
 tunneling

---
 client/ui/models/sites_model.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/client/ui/models/sites_model.cpp b/client/ui/models/sites_model.cpp
index 1e0f1692..5f4afe1a 100644
--- a/client/ui/models/sites_model.cpp
+++ b/client/ui/models/sites_model.cpp
@@ -8,6 +8,7 @@ SitesModel::SitesModel(std::shared_ptr<Settings> settings, QObject *parent)
         m_isSplitTunnelingEnabled = false;
         m_currentRouteMode = Settings::RouteMode::VpnOnlyForwardSites;
     } else {
+        m_isSplitTunnelingEnabled = true;
         m_currentRouteMode = routeMode;
     }
     fillSites();

From c461e00c5c378e5ed6ade5291b2233947a94fe60 Mon Sep 17 00:00:00 2001
From: ronoaer <ronoaer@gmail.com>
Date: Wed, 18 Oct 2023 16:17:57 +0800
Subject: [PATCH 254/278] keeping parent's cusorshape and Drawer2Type's
 close-animation

---
 client/ui/qml/Controls2/Drawer2Type.qml | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/client/ui/qml/Controls2/Drawer2Type.qml b/client/ui/qml/Controls2/Drawer2Type.qml
index 988b4172..b34390ac 100644
--- a/client/ui/qml/Controls2/Drawer2Type.qml
+++ b/client/ui/qml/Controls2/Drawer2Type.qml
@@ -183,6 +183,12 @@ Item {
                 properties: "y"
                 duration: 200
             }
+
+            onRunningChanged: {
+                if (!running) {
+                    visibledMouseArea(false)
+                }
+            }
         },
 
         Transition {
@@ -211,8 +217,7 @@ Item {
         }
         draw2Background.color = "#90000000"
 
-        fullMouseArea.visible = true
-        dragArea.visible = true
+        visibledMouseArea(true)
 
         root.y = 0
         root.state = "opened"
@@ -231,9 +236,6 @@ Item {
     }
 
     function close() {
-        fullMouseArea.visible = false
-        dragArea.visible = false
-
         draw2Background.color = "transparent"
         root.state = "closed"
     }
@@ -250,4 +252,9 @@ Item {
             close()
         }
     }
+
+    function visibledMouseArea(visbile) {
+        fullMouseArea.visible = visbile
+        dragArea.visible = visbile
+    }
 }

From e16c425f875d209f4f35fe7f94714b46593352e0 Mon Sep 17 00:00:00 2001
From: pokamest <pokamest@gmail.com>
Date: Wed, 18 Oct 2023 12:04:39 +0100
Subject: [PATCH 255/278] PageHome.qml fix

---
 CMakeLists.txt                          |  2 +-
 client/translations/amneziavpn_ru.ts    | 10 ----------
 client/translations/amneziavpn_zh_CN.ts | 10 ----------
 client/ui/qml/Pages2/PageHome.qml       |  2 +-
 4 files changed, 2 insertions(+), 22 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 028aacd3..68de51fb 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.25.0 FATAL_ERROR)
 
 set(PROJECT AmneziaVPN)
 
-project(${PROJECT} VERSION 4.0.8.3
+project(${PROJECT} VERSION 4.0.8.4
         DESCRIPTION "AmneziaVPN"
         HOMEPAGE_URL "https://amnezia.org/"
 )
diff --git a/client/translations/amneziavpn_ru.ts b/client/translations/amneziavpn_ru.ts
index db27afbc..a26758b7 100644
--- a/client/translations/amneziavpn_ru.ts
+++ b/client/translations/amneziavpn_ru.ts
@@ -2700,16 +2700,6 @@ This means that AmneziaWG keeps the fast performance of the original while addin
         <source>error 0x%1: %2</source>
         <translation>error 0x%1: %2</translation>
     </message>
-    <message>
-        <location filename="../3rd/wireguard-tools/contrib/highlighter/gui/highlight.cpp" line="39"/>
-        <source>WireGuard Configuration Highlighter</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../3rd/wireguard-tools/contrib/highlighter/gui/highlight.cpp" line="82"/>
-        <source>&amp;Randomize colors</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>SelectLanguageDrawer</name>
diff --git a/client/translations/amneziavpn_zh_CN.ts b/client/translations/amneziavpn_zh_CN.ts
index 59bef770..a10fb449 100644
--- a/client/translations/amneziavpn_zh_CN.ts
+++ b/client/translations/amneziavpn_zh_CN.ts
@@ -2839,16 +2839,6 @@ While it offers a blend of security, stability, and speed, it&apos;s essential t
         <source>error 0x%1: %2</source>
         <translation>错误 0x%1: %2</translation>
     </message>
-    <message>
-        <location filename="../3rd/wireguard-tools/contrib/highlighter/gui/highlight.cpp" line="39"/>
-        <source>WireGuard Configuration Highlighter</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../3rd/wireguard-tools/contrib/highlighter/gui/highlight.cpp" line="82"/>
-        <source>&amp;Randomize colors</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>SelectLanguageDrawer</name>
diff --git a/client/ui/qml/Pages2/PageHome.qml b/client/ui/qml/Pages2/PageHome.qml
index 3a71adac..cc49e4f0 100644
--- a/client/ui/qml/Pages2/PageHome.qml
+++ b/client/ui/qml/Pages2/PageHome.qml
@@ -248,7 +248,7 @@ PageType {
             Layout.preferredHeight: 2
             Layout.alignment: Qt.AlignHCenter | Qt.AlignVCenter
 
-            visible: GC.isMobile() && (buttonContent.collapsedVisibility || buttonContent.expandedVisibility)
+            visible: (buttonContent.collapsedVisibility || buttonContent.expandedVisibility)
         }
 
         RowLayout {

From e2ae341ba96b375e381b2a6346563e5a1dddd0a2 Mon Sep 17 00:00:00 2001
From: pokamest <pokamest@gmail.com>
Date: Wed, 18 Oct 2023 14:01:06 +0100
Subject: [PATCH 256/278] AndroidManifest fix

---
 client/android/AndroidManifest.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/client/android/AndroidManifest.xml b/client/android/AndroidManifest.xml
index 4ec807e9..1115b74d 100644
--- a/client/android/AndroidManifest.xml
+++ b/client/android/AndroidManifest.xml
@@ -45,6 +45,7 @@
             android:label="-- %%INSERT_APP_NAME%% --"
             android:screenOrientation="unspecified"
             android:launchMode="singleInstance"
+            android:windowSoftInputMode="adjustResize"
             android:exported="true">
     
 <!--            android:theme="@style/splashScreenTheme"-->

From 79e1761c1f476e2608ad2c93ff024f829509dce5 Mon Sep 17 00:00:00 2001
From: "vladimir.kuznetsov" <nethiuswork@gmail.com>
Date: Thu, 19 Oct 2023 01:14:09 +0500
Subject: [PATCH 257/278] added generation of random values for awg parameters

---
 client/core/servercontroller.cpp            | 37 +++++++--------------
 client/translations/amneziavpn_ru.ts        | 34 ++++++++++++-------
 client/translations/amneziavpn_zh_CN.ts     | 34 ++++++++++++-------
 client/ui/controllers/installController.cpp | 31 +++++++++++++++++
 4 files changed, 87 insertions(+), 49 deletions(-)

diff --git a/client/core/servercontroller.cpp b/client/core/servercontroller.cpp
index 60691759..443cd5a3 100644
--- a/client/core/servercontroller.cpp
+++ b/client/core/servercontroller.cpp
@@ -337,7 +337,7 @@ bool ServerController::isReinstallContainerRequired(DockerContainer container, c
             != newProtoConfig.value(config_key::port).toString(protocols::shadowsocks::defaultPort))
             return true;
     }
-    
+
     if (container == DockerContainer::Awg) {
         return true;
     }
@@ -490,8 +490,7 @@ ServerController::Vars ServerController::genVarsForScript(const ServerCredential
     const QJsonObject &cloakConfig = config.value(ProtocolProps::protoToString(Proto::Cloak)).toObject();
     const QJsonObject &ssConfig = config.value(ProtocolProps::protoToString(Proto::ShadowSocks)).toObject();
     const QJsonObject &wireguarConfig = config.value(ProtocolProps::protoToString(Proto::WireGuard)).toObject();
-    const QJsonObject &amneziaWireguarConfig =
-        config.value(ProtocolProps::protoToString(Proto::Awg)).toObject();
+    const QJsonObject &amneziaWireguarConfig = config.value(ProtocolProps::protoToString(Proto::Awg)).toObject();
     const QJsonObject &sftpConfig = config.value(ProtocolProps::protoToString(Proto::Sftp)).toObject();
 
     Vars vars;
@@ -591,33 +590,21 @@ ServerController::Vars ServerController::genVarsForScript(const ServerCredential
     // Amnezia wireguard vars
     vars.append({ { "$AWG_SERVER_PORT",
                     amneziaWireguarConfig.value(config_key::port).toString(protocols::awg::defaultPort) } });
-    vars.append({ { "$JUNK_PACKET_COUNT",
-                    amneziaWireguarConfig.value(config_key::junkPacketCount)
-                            .toString(protocols::awg::defaultJunkPacketCount) } });
-    vars.append({ { "$JUNK_PACKET_MIN_SIZE",
-                    amneziaWireguarConfig.value(config_key::junkPacketMinSize)
-                            .toString(protocols::awg::defaultJunkPacketMinSize) } });
-    vars.append({ { "$JUNK_PACKET_MAX_SIZE",
-                    amneziaWireguarConfig.value(config_key::junkPacketMaxSize)
-                            .toString(protocols::awg::defaultJunkPacketMaxSize) } });
-    vars.append({ { "$INIT_PACKET_JUNK_SIZE",
-                    amneziaWireguarConfig.value(config_key::initPacketJunkSize)
-                            .toString(protocols::awg::defaultInitPacketJunkSize) } });
+
+    vars.append({ { "$JUNK_PACKET_COUNT", amneziaWireguarConfig.value(config_key::junkPacketCount).toString() } });
+    vars.append({ { "$JUNK_PACKET_MIN_SIZE", amneziaWireguarConfig.value(config_key::junkPacketMinSize).toString() } });
+    vars.append({ { "$JUNK_PACKET_MAX_SIZE", amneziaWireguarConfig.value(config_key::junkPacketMaxSize).toString() } });
+    vars.append({ { "$INIT_PACKET_JUNK_SIZE", amneziaWireguarConfig.value(config_key::initPacketJunkSize).toString() } });
     vars.append({ { "$RESPONSE_PACKET_JUNK_SIZE",
-                    amneziaWireguarConfig.value(config_key::responsePacketJunkSize)
-                            .toString(protocols::awg::defaultResponsePacketJunkSize) } });
+                    amneziaWireguarConfig.value(config_key::responsePacketJunkSize).toString() } });
     vars.append({ { "$INIT_PACKET_MAGIC_HEADER",
-                    amneziaWireguarConfig.value(config_key::initPacketMagicHeader)
-                            .toString(protocols::awg::defaultInitPacketMagicHeader) } });
+                    amneziaWireguarConfig.value(config_key::initPacketMagicHeader).toString() } });
     vars.append({ { "$RESPONSE_PACKET_MAGIC_HEADER",
-                    amneziaWireguarConfig.value(config_key::responsePacketMagicHeader)
-                            .toString(protocols::awg::defaultResponsePacketMagicHeader) } });
+                    amneziaWireguarConfig.value(config_key::responsePacketMagicHeader).toString() } });
     vars.append({ { "$UNDERLOAD_PACKET_MAGIC_HEADER",
-                    amneziaWireguarConfig.value(config_key::underloadPacketMagicHeader)
-                            .toString(protocols::awg::defaultUnderloadPacketMagicHeader) } });
+                    amneziaWireguarConfig.value(config_key::underloadPacketMagicHeader).toString() } });
     vars.append({ { "$TRANSPORT_PACKET_MAGIC_HEADER",
-                    amneziaWireguarConfig.value(config_key::transportPacketMagicHeader)
-                            .toString(protocols::awg::defaultTransportPacketMagicHeader) } });
+                    amneziaWireguarConfig.value(config_key::transportPacketMagicHeader).toString() } });
 
     QString serverIp = Utils::getIPAddress(credentials.hostName);
     if (!serverIp.isEmpty()) {
diff --git a/client/translations/amneziavpn_ru.ts b/client/translations/amneziavpn_ru.ts
index a26758b7..733c374d 100644
--- a/client/translations/amneziavpn_ru.ts
+++ b/client/translations/amneziavpn_ru.ts
@@ -143,58 +143,58 @@
 <context>
     <name>InstallController</name>
     <message>
-        <location filename="../ui/controllers/installController.cpp" line="110"/>
-        <location filename="../ui/controllers/installController.cpp" line="161"/>
+        <location filename="../ui/controllers/installController.cpp" line="141"/>
+        <location filename="../ui/controllers/installController.cpp" line="192"/>
         <source>%1 installed successfully. </source>
         <translation>%1 успешно установлен. </translation>
     </message>
     <message>
-        <location filename="../ui/controllers/installController.cpp" line="112"/>
-        <location filename="../ui/controllers/installController.cpp" line="163"/>
+        <location filename="../ui/controllers/installController.cpp" line="143"/>
+        <location filename="../ui/controllers/installController.cpp" line="194"/>
         <source>%1 is already installed on the server. </source>
         <translation>%1 уже установлен на сервер. </translation>
     </message>
     <message>
-        <location filename="../ui/controllers/installController.cpp" line="115"/>
+        <location filename="../ui/controllers/installController.cpp" line="146"/>
         <source>
 Added containers that were already installed on the server</source>
         <translation>
 В приложение добавлены обнаруженные на сервере протоклы и сервисы</translation>
     </message>
     <message>
-        <location filename="../ui/controllers/installController.cpp" line="182"/>
+        <location filename="../ui/controllers/installController.cpp" line="213"/>
         <source>
 Already installed containers were found on the server. All installed containers have been added to the application</source>
         <translation>
 На сервере обнаружены установленные протоколы и сервисы, все они добавлены в приложение</translation>
     </message>
     <message>
-        <location filename="../ui/controllers/installController.cpp" line="266"/>
+        <location filename="../ui/controllers/installController.cpp" line="297"/>
         <source>Settings updated successfully</source>
         <translation>Настройки успешно обновлены</translation>
     </message>
     <message>
-        <location filename="../ui/controllers/installController.cpp" line="281"/>
+        <location filename="../ui/controllers/installController.cpp" line="312"/>
         <source>Server &apos;%1&apos; was removed</source>
         <translation>Сервер &apos;%1&apos; был удален</translation>
     </message>
     <message>
-        <location filename="../ui/controllers/installController.cpp" line="291"/>
+        <location filename="../ui/controllers/installController.cpp" line="322"/>
         <source>All containers from server &apos;%1&apos; have been removed</source>
         <translation>Все протоклы и сервисы были удалены с сервера &apos;%1&apos;</translation>
     </message>
     <message>
-        <location filename="../ui/controllers/installController.cpp" line="308"/>
+        <location filename="../ui/controllers/installController.cpp" line="339"/>
         <source>%1 has been removed from the server &apos;%2&apos;</source>
         <translation>%1 был удален с сервера &apos;%2&apos;</translation>
     </message>
     <message>
-        <location filename="../ui/controllers/installController.cpp" line="454"/>
+        <location filename="../ui/controllers/installController.cpp" line="485"/>
         <source>Please login as the user</source>
         <translation>Пожалуйста, войдите в систему от имени пользователя</translation>
     </message>
     <message>
-        <location filename="../ui/controllers/installController.cpp" line="483"/>
+        <location filename="../ui/controllers/installController.cpp" line="514"/>
         <source>Server added successfully</source>
         <translation>Сервер успешно добавлен</translation>
     </message>
@@ -2700,6 +2700,16 @@ This means that AmneziaWG keeps the fast performance of the original while addin
         <source>error 0x%1: %2</source>
         <translation>error 0x%1: %2</translation>
     </message>
+    <message>
+        <location filename="../3rd/wireguard-tools/contrib/highlighter/gui/highlight.cpp" line="39"/>
+        <source>WireGuard Configuration Highlighter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../3rd/wireguard-tools/contrib/highlighter/gui/highlight.cpp" line="82"/>
+        <source>&amp;Randomize colors</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SelectLanguageDrawer</name>
diff --git a/client/translations/amneziavpn_zh_CN.ts b/client/translations/amneziavpn_zh_CN.ts
index a10fb449..64faa6f4 100644
--- a/client/translations/amneziavpn_zh_CN.ts
+++ b/client/translations/amneziavpn_zh_CN.ts
@@ -162,47 +162,47 @@
         <translation type="obsolete"> 已安装在服务器上</translation>
     </message>
     <message>
-        <location filename="../ui/controllers/installController.cpp" line="110"/>
-        <location filename="../ui/controllers/installController.cpp" line="161"/>
+        <location filename="../ui/controllers/installController.cpp" line="141"/>
+        <location filename="../ui/controllers/installController.cpp" line="192"/>
         <source>%1 installed successfully. </source>
         <translation>%1 安装成功。</translation>
     </message>
     <message>
-        <location filename="../ui/controllers/installController.cpp" line="112"/>
-        <location filename="../ui/controllers/installController.cpp" line="163"/>
+        <location filename="../ui/controllers/installController.cpp" line="143"/>
+        <location filename="../ui/controllers/installController.cpp" line="194"/>
         <source>%1 is already installed on the server. </source>
         <translation>服务器上已经安装 %1。</translation>
     </message>
     <message>
-        <location filename="../ui/controllers/installController.cpp" line="115"/>
+        <location filename="../ui/controllers/installController.cpp" line="146"/>
         <source>
 Added containers that were already installed on the server</source>
         <translation>添加已安装在服务器上的容器</translation>
     </message>
     <message>
-        <location filename="../ui/controllers/installController.cpp" line="182"/>
+        <location filename="../ui/controllers/installController.cpp" line="213"/>
         <source>
 Already installed containers were found on the server. All installed containers have been added to the application</source>
         <translation>
 在服务上发现已经安装协议并添加至应用</translation>
     </message>
     <message>
-        <location filename="../ui/controllers/installController.cpp" line="266"/>
+        <location filename="../ui/controllers/installController.cpp" line="297"/>
         <source>Settings updated successfully</source>
         <translation>配置更新成功</translation>
     </message>
     <message>
-        <location filename="../ui/controllers/installController.cpp" line="281"/>
+        <location filename="../ui/controllers/installController.cpp" line="312"/>
         <source>Server &apos;%1&apos; was removed</source>
         <translation>已移除服务器 &apos;%1&apos;</translation>
     </message>
     <message>
-        <location filename="../ui/controllers/installController.cpp" line="291"/>
+        <location filename="../ui/controllers/installController.cpp" line="322"/>
         <source>All containers from server &apos;%1&apos; have been removed</source>
         <translation>服务器 &apos;%1&apos; 的所有容器已移除</translation>
     </message>
     <message>
-        <location filename="../ui/controllers/installController.cpp" line="308"/>
+        <location filename="../ui/controllers/installController.cpp" line="339"/>
         <source>%1 has been removed from the server &apos;%2&apos;</source>
         <translation>%1 已从服务器 &apos;%2&apos; 上移除</translation>
     </message>
@@ -223,12 +223,12 @@ Already installed containers were found on the server. All installed containers
         <translation type="obsolete"> 协议已从</translation>
     </message>
     <message>
-        <location filename="../ui/controllers/installController.cpp" line="454"/>
+        <location filename="../ui/controllers/installController.cpp" line="485"/>
         <source>Please login as the user</source>
         <translation>请以用户身份登录</translation>
     </message>
     <message>
-        <location filename="../ui/controllers/installController.cpp" line="483"/>
+        <location filename="../ui/controllers/installController.cpp" line="514"/>
         <source>Server added successfully</source>
         <translation>增加服务器成功</translation>
     </message>
@@ -2839,6 +2839,16 @@ While it offers a blend of security, stability, and speed, it&apos;s essential t
         <source>error 0x%1: %2</source>
         <translation>错误 0x%1: %2</translation>
     </message>
+    <message>
+        <location filename="../3rd/wireguard-tools/contrib/highlighter/gui/highlight.cpp" line="39"/>
+        <source>WireGuard Configuration Highlighter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../3rd/wireguard-tools/contrib/highlighter/gui/highlight.cpp" line="82"/>
+        <source>&amp;Randomize colors</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SelectLanguageDrawer</name>
diff --git a/client/ui/controllers/installController.cpp b/client/ui/controllers/installController.cpp
index db2f9409..8efe368b 100644
--- a/client/ui/controllers/installController.cpp
+++ b/client/ui/controllers/installController.cpp
@@ -5,6 +5,7 @@
 #include <QEventLoop>
 #include <QJsonObject>
 #include <QStandardPaths>
+#include <QRandomGenerator>
 
 #include "core/errorstrings.h"
 #include "core/servercontroller.h"
@@ -73,6 +74,36 @@ void InstallController::install(DockerContainer container, int port, TransportPr
             containerConfig.insert(config_key::transport_proto,
                                    ProtocolProps::transportProtoToString(transportProto, protocol));
 
+            if (container == DockerContainer::Awg) {
+                QString defaultJunkPacketCount = QString::number(QRandomGenerator::global()->bounded(3, 10));
+                QString defaultJunkPacketMinSize = QString::number(50);
+                QString defaultJunkPacketMaxSize = QString::number(1000);
+                QString defaultInitPacketJunkSize = QString::number(QRandomGenerator::global()->bounded(15, 150));
+                QString defaultResponsePacketJunkSize = QString::number(QRandomGenerator::global()->bounded(15, 150));
+
+                QSet<QString> headersValue;
+                while (headersValue.size() != 4) {
+                    headersValue.insert(QString::number(QRandomGenerator::global()->bounded(1, std::numeric_limits<qint32>::max())));
+                }
+
+                auto headersValueList = headersValue.values();
+
+                QString defaultInitPacketMagicHeader = headersValueList.at(0);
+                QString defaultResponsePacketMagicHeader = headersValueList.at(1);
+                QString defaultUnderloadPacketMagicHeader = headersValueList.at(2);
+                QString defaultTransportPacketMagicHeader = headersValueList.at(3);
+
+                containerConfig[config_key::junkPacketCount] = defaultJunkPacketCount;
+                containerConfig[config_key::junkPacketMinSize] = defaultJunkPacketMinSize;
+                containerConfig[config_key::junkPacketMaxSize] = defaultJunkPacketMaxSize;
+                containerConfig[config_key::initPacketJunkSize] = defaultInitPacketJunkSize;
+                containerConfig[config_key::responsePacketJunkSize] = defaultResponsePacketJunkSize;
+                containerConfig[config_key::initPacketMagicHeader] = defaultInitPacketMagicHeader;
+                containerConfig[config_key::responsePacketMagicHeader] = defaultResponsePacketMagicHeader;
+                containerConfig[config_key::underloadPacketMagicHeader] = defaultUnderloadPacketMagicHeader;
+                containerConfig[config_key::transportPacketMagicHeader] = defaultTransportPacketMagicHeader;
+            }
+
             if (container == DockerContainer::Sftp) {
                 containerConfig.insert(config_key::userName, protocols::sftp::defaultUserName);
                 containerConfig.insert(config_key::password, Utils::getRandomString(10));

From 338499247dd64ac81c5eb8ac55192da3aad01fc0 Mon Sep 17 00:00:00 2001
From: "vladimir.kuznetsov" <nethiuswork@gmail.com>
Date: Thu, 19 Oct 2023 01:16:36 +0500
Subject: [PATCH 258/278] changed the display order of containers

---
 client/containers/containers_defs.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/client/containers/containers_defs.h b/client/containers/containers_defs.h
index b9cb760d..92ca4f18 100644
--- a/client/containers/containers_defs.h
+++ b/client/containers/containers_defs.h
@@ -16,11 +16,11 @@ namespace amnezia
         Q_NAMESPACE
         enum DockerContainer {
             None = 0,
-            OpenVpn,
-            ShadowSocks,
-            Cloak,
-            WireGuard,
             Awg,
+            WireGuard,
+            OpenVpn,
+            Cloak,
+            ShadowSocks,
             Ipsec,
 
             // non-vpn

From 366e27a321050119df3e1c8ca912a5bd113c7497 Mon Sep 17 00:00:00 2001
From: ronoaer <ronoaer@gmail.com>
Date: Thu, 19 Oct 2023 09:27:39 +0800
Subject: [PATCH 259/278] re-adatped pagehome

---
 client/resources.qrc                          |   1 -
 .../ui/qml/Components/HomeRootMenuButton.qml  | 140 ---------
 client/ui/qml/Controls2/Drawer2Type.qml       | 279 +++++++++++++-----
 client/ui/qml/Pages2/PageHome.qml             | 121 ++++++--
 client/ui/qml/Pages2/PageStart.qml            |   2 +-
 5 files changed, 298 insertions(+), 245 deletions(-)
 delete mode 100644 client/ui/qml/Components/HomeRootMenuButton.qml

diff --git a/client/resources.qrc b/client/resources.qrc
index ac6e5a6d..d7f8ff7a 100644
--- a/client/resources.qrc
+++ b/client/resources.qrc
@@ -217,6 +217,5 @@
         <file>ui/qml/Controls2/TopCloseButtonType.qml</file>
         <file>images/controls/x-circle.svg</file>
         <file>ui/qml/Controls2/Drawer2Type.qml</file>
-        <file>ui/qml/Components/HomeRootMenuButton.qml</file>
     </qresource>
 </RCC>
diff --git a/client/ui/qml/Components/HomeRootMenuButton.qml b/client/ui/qml/Components/HomeRootMenuButton.qml
deleted file mode 100644
index b2ca98dc..00000000
--- a/client/ui/qml/Components/HomeRootMenuButton.qml
+++ /dev/null
@@ -1,140 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-import QtQuick.Layouts
-
-import "../Controls2/TextTypes"
-import "../Controls2"
-
-Item {
-    id: root
-
-    property string text
-    property int textMaximumLineCount: 2
-    property int textElide: Qt.ElideRight
-
-    property string descriptionText
-
-    property var clickedFunction
-
-    property string rightImageSource
-
-    property string textColor: "#d7d8db"
-    property string descriptionColor: "#878B91"
-    property real textOpacity: 1.0
-
-    property string rightImageColor: "#d7d8db"
-
-    property bool descriptionOnTop: false
-
-    property string defaultServerHostName
-    property string defaultContainerName
-
-    implicitWidth: content.implicitWidth + content.anchors.topMargin + content.anchors.bottomMargin
-    implicitHeight: content.implicitHeight + content.anchors.leftMargin + content.anchors.rightMargin
-
-    ColumnLayout {
-        id: content
-
-        anchors.right: parent.right
-        anchors.left: parent.left
-        anchors.bottom: parent.bottom
-
-        RowLayout {
-            Layout.topMargin: 24
-            Layout.leftMargin: 24
-            Layout.rightMargin: 24
-            Layout.alignment: Qt.AlignHCenter | Qt.AlignVCenter
-
-            Header1TextType {
-                Layout.maximumWidth: root.width - 48 - 18 - 12 // todo
-
-                maximumLineCount: 2
-                elide: Qt.ElideRight
-
-                text: root.text
-                Layout.alignment: Qt.AlignLeft
-            }
-
-
-            ImageButtonType {
-                id: rightImage
-
-                hoverEnabled: false
-                image: rightImageSource
-                imageColor: rightImageColor
-                visible: rightImageSource ? true : false
-
-//                implicitSize: 18
-//                backGroudRadius: 5
-                horizontalPadding: 0
-                padding: 0
-                spacing: 0
-
-
-                Rectangle {
-                    id: rightImageBackground
-                    anchors.fill: parent
-                    radius: 16
-                    color: "transparent"
-
-                    Behavior on color {
-                        PropertyAnimation { duration: 200 }
-                    }
-                }
-            }
-        }
-
-        LabelTextType {
-            Layout.bottomMargin: 44
-            Layout.alignment: Qt.AlignHCenter | Qt.AlignVCenter
-
-            text: {
-                var description = ""
-                if (ServersModel.isDefaultServerHasWriteAccess()) {
-                    if (SettingsController.isAmneziaDnsEnabled()
-                            && ContainersModel.isAmneziaDnsContainerInstalled(ServersModel.getDefaultServerIndex())) {
-                        description += "Amnezia DNS | "
-                    }
-                } else {
-                    if (ServersModel.isDefaultServerConfigContainsAmneziaDns()) {
-                        description += "Amnezia DNS | "
-                    }
-                }
-
-                description += root.defaultContainerName + " | " + root.defaultServerHostName
-                return description
-            }
-        }
-    }
-
-
-    MouseArea {
-        anchors.fill: parent
-        cursorShape: Qt.PointingHandCursor
-        hoverEnabled: true
-
-        onEntered: {
-            rightImageBackground.color = rightImage.hoveredColor
-
-            root.textOpacity = 0.8
-        }
-
-        onExited: {
-            rightImageBackground.color = rightImage.defaultColor
-
-            root.textOpacity = 1
-        }
-
-        onPressedChanged: {
-            rightImageBackground.color = pressed ? rightImage.pressedColor : entered ? rightImage.hoveredColor : rightImage.defaultColor
-
-            root.textOpacity = 0.7
-        }
-
-        onClicked: {
-            if (clickedFunction && typeof clickedFunction === "function") {
-                clickedFunction()
-            }
-        }
-    }
-}
diff --git a/client/ui/qml/Controls2/Drawer2Type.qml b/client/ui/qml/Controls2/Drawer2Type.qml
index b34390ac..fc486744 100644
--- a/client/ui/qml/Controls2/Drawer2Type.qml
+++ b/client/ui/qml/Controls2/Drawer2Type.qml
@@ -10,11 +10,18 @@ Item {
         target: PageController
 
         function onForceCloseDrawer() {
-            close()
+            if (root.opened()) {
+                close()
+                return
+            }
+
+            if (root.expanded()) {
+                collapse()
+            }
         }
     }
 
-    signal closed
+    signal drawerClosed
 
     visible: false
 
@@ -28,6 +35,13 @@ Item {
     property int contentHeight: 0
     property Item contentParent: contentArea
 
+    property bool dragActive: dragArea.drag.active
+
+    /** Initial height of button content */
+    property int collapsedHeight: 0
+
+    property bool fullMouseAreaVisible: true
+
     state: "closed"
 
     Rectangle {
@@ -37,7 +51,7 @@ Item {
         height: parent.height
         width: parent.width
         radius: 16
-        color:  "#90000000"
+        color: "transparent" //"#90000000"
         border.color: "transparent"
         border.width: 1
         visible: true
@@ -45,90 +59,119 @@ Item {
         MouseArea {
             id: fullMouseArea
             anchors.fill: parent
-            enabled: (root.state === "opened")
+            enabled: (root.opened() || root.expanded())
             hoverEnabled: true
+            visible: fullMouseAreaVisible
 
             onClicked: {
-                if (root.state === "opened") {
+                if (root.opened()) {
                     close()
                     return
                 }
+
+                if (root.expanded()) {
+                    collapse()
+                }
             }
+        }
+
+        Rectangle {
+            id: placeAreaHolder
+            height: (!root.opened())  ? 0 :  parent.height - contentHeight
+            anchors.right: parent.right
+            anchors.left: parent.left
+            visible: true
+            color: "transparent"
+
+            Drag.active: dragArea.drag.active
+        }
+
+
+        Rectangle {
+            id: contentArea
+
+            anchors.top: placeAreaHolder.bottom
+            height: contentHeight
+            radius: 16
+            color: root.defaultColor
+            border.width: 1
+            border.color: root.borderColor
+            width: parent.width
+            visible: true
 
             Rectangle {
-                id: placeAreaHolder
-                height: parent.height - contentHeight
+                width: parent.radius
+                height: parent.radius
+                anchors.bottom: parent.bottom
                 anchors.right: parent.right
                 anchors.left: parent.left
-                visible: true
-                color: "transparent"
-
-                Drag.active: dragArea.drag.active
+                color: parent.color
             }
 
+            MouseArea {
+                id: dragArea
 
-            Rectangle {
-                id: contentArea
+                anchors.fill: parent
 
-                anchors.top: placeAreaHolder.bottom
-                height: contentHeight
-                radius: 16
-                color: root.defaultColor
-                border.width: 1
-                border.color: root.borderColor
-                width: parent.width
-                visible: true
+                cursorShape: root.collapsed() ? Qt.PointingHandCursor : Qt.ArrowCursor // ?
+                hoverEnabled: true
 
-                Rectangle {
-                    width: parent.radius
-                    height: parent.radius
-                    anchors.bottom: parent.bottom
-                    anchors.right: parent.right
-                    anchors.left: parent.left
-                    color: parent.color
-                }
+                drag.target: placeAreaHolder
+                drag.axis: Drag.YAxis
+                drag.maximumY: (root.collapsed() || root.expanded()) ? (root.height - collapsedHeight) : root.height
+                drag.minimumY: (root.collapsed() || root.expanded()) ? (root.height - root.height * 0.9) : (root.height - root.height)
 
-                MouseArea {
-                    id: dragArea
-
-                    anchors.fill: parent
-
-                    cursorShape: (root.state === "opened") ? Qt.PointingHandCursor : Qt.ArrowCursor
-                    hoverEnabled: true
-
-                    drag.target: placeAreaHolder
-                    drag.axis: Drag.YAxis
-                    drag.maximumY: root.height
-                    drag.minimumY: root.height - root.height
-
-                    /** If drag area is released at any point other than min or max y, transition to the other state */
-                    onReleased: {
-                        if (root.state === "closed" && placeAreaHolder.y < root.height * 0.9) {
-                            root.state = "opened"
-                            return
-                        }
-
-                        if (root.state === "opened" && placeAreaHolder.y > (root.height - root.height * 0.9)) {
-                            close()
-                            return
-                        }
-
-                        placeAreaHolder.y = 0
+                /** If drag area is released at any point other than min or max y, transition to the other state */
+                onReleased: {
+                    if (root.closed() && placeAreaHolder.y < root.height * 0.9) {
+                        root.state = "opened"
+                        return
                     }
 
-                    onClicked: {
-                        if (root.state === "opened") {
-                            close()
-                            return
-                        }
+                    if (root.opened() && placeAreaHolder.y > (root.height - root.height * 0.9)) {
+                        close()
+                        return
+                    }
+
+
+                    if (root.collapsed() && placeAreaHolder.y < (root.height - collapsedHeight)) {
+                        root.state = "expanded"
+                        return
+                    }
+
+                    if (root.expanded() && placeAreaHolder.y > (root.height - root.height * 0.9)) {
+                        root.state = "collapsed"
+                        return
+                    }
+
+
+                    if (root.opened()) {
+                        placeAreaHolder.y = 0
+                    }
+                }
+
+                onClicked: {
+                    if (root.opened()) {
+                        close()
+                        return
+                    }
+
+                    if (root.expanded()) {
+                        collapse()
+                        return
+                    }
+
+                    if (root.collapsed()) {
+                        root.state = "expanded"
                     }
                 }
             }
         }
+
     }
 
     onStateChanged: {
-        if (root.state === "closed") {
+        if (root.closed() || root.collapsed()) {
             var initialPageNavigationBarColor = PageController.getInitialPageNavigationBarColor()
             if (initialPageNavigationBarColor !== 0xFF1C1D21) {
                 PageController.updateNavigationBarColor(initialPageNavigationBarColor)
@@ -138,11 +181,12 @@ Item {
                 PageController.drawerClose()
             }
 
-            closed()
+            drawerClosed()
 
             return
         }
-        if (root.state === "opened") {
+
+        if (root.opened() || root.expanded()) {
             if (PageController.getInitialPageNavigationBarColor() !== 0xFF1C1D21) {
                 PageController.updateNavigationBarColor(0xFF1C1D21)
             }
@@ -161,7 +205,7 @@ Item {
             name: "closed"
             PropertyChanges {
                 target: placeAreaHolder
-                y: parent.height
+                y: root.height
             }
         },
 
@@ -171,6 +215,22 @@ Item {
                 target: placeAreaHolder
                 y: dragArea.drag.minimumY
             }
+        },
+
+        State {
+            name: "collapsed"
+            PropertyChanges {
+                target: placeAreaHolder
+                y: root.height - collapsedHeight
+            }
+        },
+
+        State {
+            name: "expanded"
+            PropertyChanges {
+                target: placeAreaHolder
+                y: root.height - root.height * 0.9
+            }
         }
     ]
 
@@ -199,6 +259,40 @@ Item {
                 properties: "y"
                 duration: 200
             }
+        },
+
+        Transition {
+            from: "expanded"
+            to: "collapsed"
+            PropertyAnimation {
+                target: placeAreaHolder
+                properties: "y"
+                duration: 200
+            }
+
+            onRunningChanged: {
+                if (!running) {
+                    draw2Background.color = "transparent"
+                    fullMouseArea.visible = false
+                }
+            }
+        },
+
+        Transition {
+            from: "collapsed"
+            to: "expanded"
+            PropertyAnimation {
+                target: placeAreaHolder
+                properties: "y"
+                duration: 200
+            }
+
+            onRunningChanged: {
+                if (!running) {
+                    draw2Background.color = "#90000000"
+                    visibledMouseArea(true)
+                }
+            }
         }
     ]
 
@@ -212,9 +306,11 @@ Item {
     }
 
     function open() {
-        if (root.visible && root.state !== "closed") {
+        //if (root.visible && !root.closed()) {
+        if (root.opened()) {
             return
         }
+
         draw2Background.color = "#90000000"
 
         visibledMouseArea(true)
@@ -240,21 +336,52 @@ Item {
         root.state = "closed"
     }
 
-    onVisibleChanged: {
-        // e.g cancel, ......
-        if (!visible) {
-            if (root.state === "opened") {
-                if (needCloseButton) {
-                    PageController.drawerClose()
-                }
-            }
-
-            close()
-        }
+    function collapse() {
+        draw2Background.color = "transparent"
+        root.state = "collapsed"
     }
 
+
     function visibledMouseArea(visbile) {
         fullMouseArea.visible = visbile
         dragArea.visible = visbile
     }
+
+    function opened() {
+        return root.state === "opened" ? true : false
+    }
+
+    function expanded() {
+        return root.state === "expanded" ? true : false
+    }
+
+    function closed() {
+        return root.state === "closed" ? true : false
+    }
+
+    function collapsed() {
+        return root.state === "collapsed" ? true : false
+    }
+
+
+    onVisibleChanged: {
+        // e.g cancel, ......
+        if (!visible) {
+            if (root.opened()) {
+                if (needCloseButton) {
+                    PageController.drawerClose()
+                }
+
+                close()
+            }
+
+            if (root.expanded()) {
+                if (needCloseButton) {
+                    PageController.drawerClose()
+                }
+
+                collapse()
+            }
+        }
+    }
 }
diff --git a/client/ui/qml/Pages2/PageHome.qml b/client/ui/qml/Pages2/PageHome.qml
index dafa3bdc..a3a3ed9d 100644
--- a/client/ui/qml/Pages2/PageHome.qml
+++ b/client/ui/qml/Pages2/PageHome.qml
@@ -30,13 +30,13 @@ PageType {
         target: PageController
 
         function onRestorePageHomeState(isContainerInstalled) {
-            menu.close()
+            buttonContent.collapse()
             if (isContainerInstalled) {
                 containersDropDown.menuVisible = true
             }
         }
         function onForceCloseDrawer() {
-            menu.close()
+            buttonContent.collapse()
         }
     }
 
@@ -69,7 +69,7 @@ PageType {
             }
         }
 
-        // collapsedServerMenuDescription.text = description + root.defaultContainerName + " | " + root.defaultServerHostName
+        collapsedServerMenuDescription.text = description + root.defaultContainerName + " | " + root.defaultServerHostName
         expandedServersMenuDescription.text = description + root.defaultServerHostName
     }
 
@@ -79,7 +79,7 @@ PageType {
 
     Item {
         anchors.fill: parent
-        anchors.bottomMargin: defaultServerInfo.implicitHeight
+        anchors.bottomMargin: buttonContent.collapsedHeight
 
         ConnectButton {
             anchors.centerIn: parent
@@ -88,7 +88,7 @@ PageType {
 
     Rectangle {
         id: buttonBackground
-        anchors.fill: defaultServerInfo
+        anchors { left: buttonContent.left; right: buttonContent.right; top: buttonContent.top }
 
         radius: 16
         color: root.defaultColor
@@ -105,41 +105,105 @@ PageType {
         }
     }
 
-    HomeRootMenuButton {
-        id: defaultServerInfo
-        anchors.right: parent.right
-        anchors.left: parent.left
-        anchors.bottom: parent.bottom
-
-        text: root.defaultServerName
-        rightImageSource: "qrc:/images/controls/chevron-down.svg"
-
-        defaultContainerName: root.defaultContainerName
-        defaultServerHostName: root.defaultServerHostName
-
-        clickedFunction: function() {
-             menu.open()
-        }
-    }
-
     Drawer2Type {
-        id: menu
-        parent: root
+        id: buttonContent
+        visible: true
+
+        fullMouseAreaVisible: false
+
+        /** True when expanded objects should be visible */
+        property bool expandedVisibility: buttonContent.expanded() || (buttonContent.collapsed() && buttonContent.dragActive)
+        /** True when collapsed objects should be visible */
+        property bool collapsedVisibility: buttonContent.collapsed() && !buttonContent.dragActive
 
         width: parent.width
         height: parent.height
         contentHeight: parent.height * 0.9
 
 
+        ColumnLayout {
+            id: content
+
+            parent: buttonContent.contentParent
+
+            visible: buttonContent.collapsedVisibility
+
+            anchors.right: parent.right
+            anchors.left: parent.left
+            anchors.top: parent.top
+
+            onImplicitHeightChanged: {
+                if (buttonContent.collapsed() && buttonContent.collapsedHeight === 0) {
+                    buttonContent.collapsedHeight = implicitHeight
+                }
+            }
+
+            RowLayout {
+                Layout.topMargin: 24
+                Layout.leftMargin: 24
+                Layout.rightMargin: 24
+                Layout.alignment: Qt.AlignHCenter | Qt.AlignVCenter
+
+                Header1TextType {
+                    id: collapsedButtonHeader
+                    Layout.maximumWidth: root.width - 48 - 18 - 12 // todo
+
+                    maximumLineCount: 2
+                    elide: Qt.ElideRight
+
+                    text: root.defaultServerName
+
+                    Layout.alignment: Qt.AlignLeft
+                }
+
+
+                ImageButtonType {
+                    id: collapsedButtonChevron
+
+                    hoverEnabled: false
+                    image: "qrc:/images/controls/chevron-down.svg"
+                    imageColor: "#d7d8db"
+
+                    horizontalPadding: 0
+                    padding: 0
+                    spacing: 0
+
+                    Rectangle {
+                        id: rightImageBackground
+                        anchors.fill: parent
+                        radius: 16
+                        color: "transparent"
+
+                        Behavior on color {
+                            PropertyAnimation { duration: 200 }
+                        }
+                    }
+                }
+            }
+
+            LabelTextType {
+                id: collapsedServerMenuDescription
+                Layout.bottomMargin: 44
+                Layout.alignment: Qt.AlignHCenter | Qt.AlignVCenter
+                visible: buttonContent.collapsedVisibility
+            }
+        }
+
+        Component.onCompleted: {
+            buttonContent.collapse()
+        }
+
         ColumnLayout {
             id: serversMenuHeader
 
-            parent: menu.contentParent
+            parent: buttonContent.contentParent
 
             anchors.top: parent.top
             anchors.right: parent.right
             anchors.left: parent.left
 
+            visible: buttonContent.expandedVisibility
+
             Header1TextType {
                 Layout.fillWidth: true
                 Layout.topMargin: 24
@@ -222,6 +286,7 @@ PageType {
                 Layout.topMargin: 48
                 Layout.leftMargin: 16
                 Layout.rightMargin: 16
+                visible: buttonContent.expandedVisibility
 
                 headerText: qsTr("Servers")
             }
@@ -230,7 +295,7 @@ PageType {
         Flickable {
             id: serversContainer
 
-            parent: menu.contentParent
+            parent: buttonContent.contentParent
 
             anchors.top: serversMenuHeader.bottom
             anchors.right: parent.right
@@ -239,6 +304,8 @@ PageType {
             anchors.topMargin: 16
             contentHeight: col.implicitHeight
 
+            visible: buttonContent.expandedVisibility
+
             clip: true
 
             ScrollBar.vertical: ScrollBar {
@@ -342,7 +409,7 @@ PageType {
                                     onClicked: function() {
                                         ServersModel.currentlyProcessedIndex = index
                                         PageController.goToPage(PageEnum.PageSettingsServerInfo)
-                                        menu.close()
+                                        buttonContent.collapse()
                                     }
                                 }
                             }
diff --git a/client/ui/qml/Pages2/PageStart.qml b/client/ui/qml/Pages2/PageStart.qml
index 8afad392..4ccd40d8 100644
--- a/client/ui/qml/Pages2/PageStart.qml
+++ b/client/ui/qml/Pages2/PageStart.qml
@@ -247,7 +247,7 @@ PageType {
 
         z: 1
 
-        onClosed: {
+        onDrawerClosed: {
             tabBar.setCurrentIndex(tabBar.previousIndex)
         }
     }

From 6ec773079cef7fd8b39711801296f1120bdc0d06 Mon Sep 17 00:00:00 2001
From: ronoaer <ronoaer@gmail.com>
Date: Thu, 19 Oct 2023 11:22:52 +0800
Subject: [PATCH 260/278] added hovering effect of button

---
 .../qml/Components/ShareConnectionDrawer.qml  |  2 +-
 client/ui/qml/Controls2/Drawer2Type.qml       | 32 +++++++++++++------
 client/ui/qml/Pages2/PageHome.qml             | 25 ++++++++++++++-
 3 files changed, 48 insertions(+), 11 deletions(-)

diff --git a/client/ui/qml/Components/ShareConnectionDrawer.qml b/client/ui/qml/Components/ShareConnectionDrawer.qml
index ae0df0e2..03e7b500 100644
--- a/client/ui/qml/Components/ShareConnectionDrawer.qml
+++ b/client/ui/qml/Components/ShareConnectionDrawer.qml
@@ -31,7 +31,7 @@ Drawer2Type {
     height: parent.height
     contentHeight: parent.height * 0.9
 
-    onClosed: {
+    onDrawerClosed: {
         configExtension = ".vpn"
         configCaption = qsTr("Save AmneziaVPN config")
         configFileName = "amnezia_config"
diff --git a/client/ui/qml/Controls2/Drawer2Type.qml b/client/ui/qml/Controls2/Drawer2Type.qml
index fc486744..f10fac21 100644
--- a/client/ui/qml/Controls2/Drawer2Type.qml
+++ b/client/ui/qml/Controls2/Drawer2Type.qml
@@ -22,6 +22,11 @@ Item {
     }
 
     signal drawerClosed
+    signal collapsedEntered
+    signal collapsedExited
+    signal collapsedEnter
+    signal collapsedPressChanged
+
 
     visible: false
 
@@ -41,6 +46,7 @@ Item {
     property int collapsedHeight: 0
 
     property bool fullMouseAreaVisible: true
+    property MouseArea drawerDragArea: dragArea
 
     state: "closed"
 
@@ -165,6 +171,18 @@ Item {
                         root.state = "expanded"
                     }
                 }
+
+                onExited: {
+                    collapsedExited()
+                }
+
+                onEntered: {
+                    collapsedEnter()
+                }
+
+                onPressedChanged: {
+                    collapsedPressChanged()
+                }
             }
         }
 
@@ -306,7 +324,6 @@ Item {
     }
 
     function open() {
-        //if (root.visible && !root.closed()) {
         if (root.opened()) {
             return
         }
@@ -341,6 +358,11 @@ Item {
         root.state = "collapsed"
     }
 
+    function expand() {
+        draw2Background.color = "#90000000"
+        root.state = "expanded"
+    }
+
 
     function visibledMouseArea(visbile) {
         fullMouseArea.visible = visbile
@@ -374,14 +396,6 @@ Item {
 
                 close()
             }
-
-            if (root.expanded()) {
-                if (needCloseButton) {
-                    PageController.drawerClose()
-                }
-
-                collapse()
-            }
         }
     }
 }
diff --git a/client/ui/qml/Pages2/PageHome.qml b/client/ui/qml/Pages2/PageHome.qml
index a3a3ed9d..13148a80 100644
--- a/client/ui/qml/Pages2/PageHome.qml
+++ b/client/ui/qml/Pages2/PageHome.qml
@@ -122,7 +122,7 @@ PageType {
 
 
         ColumnLayout {
-            id: content
+            id: collapsedButtonContent
 
             parent: buttonContent.contentParent
 
@@ -178,6 +178,12 @@ PageType {
                             PropertyAnimation { duration: 200 }
                         }
                     }
+
+                    onClicked: {
+                        if (buttonContent.collapsed()) {
+                            buttonContent.expand()
+                        }
+                    }
                 }
             }
 
@@ -424,5 +430,22 @@ PageType {
                 }
             }
         }
+
+        onCollapsedEnter: {
+            collapsedButtonChevron.backgroundColor = collapsedButtonChevron.hoveredColor
+            collapsedButtonHeader.opacity = 0.8
+        }
+
+        onCollapsedExited: {
+            collapsedButtonChevron.backgroundColor = collapsedButtonChevron.defaultColor
+            collapsedButtonHeader.opacity = 1
+        }
+
+        onCollapsedPressChanged: {
+            collapsedButtonChevron.backgroundColor = buttonContent.drawerDragArea.pressed ?
+                        collapsedButtonChevron.pressedColor : buttonContent.drawerDragArea.entered ?
+                            collapsedButtonChevron.hoveredColor : collapsedButtonChevron.defaultColor
+            collapsedButtonHeader.opacity = 0.7
+        }
     }
 }

From f7bed04ab217baad98a72854c57578592718a812 Mon Sep 17 00:00:00 2001
From: ronoaer <ronoaer@gmail.com>
Date: Thu, 19 Oct 2023 19:32:15 +0800
Subject: [PATCH 261/278] removed invalid function code

---
 client/ui/qml/Controls2/Drawer2Type.qml | 22 ++++++++--------------
 1 file changed, 8 insertions(+), 14 deletions(-)

diff --git a/client/ui/qml/Controls2/Drawer2Type.qml b/client/ui/qml/Controls2/Drawer2Type.qml
index f10fac21..fd6406ee 100644
--- a/client/ui/qml/Controls2/Drawer2Type.qml
+++ b/client/ui/qml/Controls2/Drawer2Type.qml
@@ -34,6 +34,7 @@ Item {
 
     property string defaultColor: "#1C1D21"
     property string borderColor: "#2C2D30"
+    property string semitransparentColor: "#90000000"
 
     property bool needCollapsed: false
 
@@ -57,7 +58,7 @@ Item {
         height: parent.height
         width: parent.width
         radius: 16
-        color: "transparent" //"#90000000"
+        color: "transparent"
         border.color: "transparent"
         border.width: 1
         visible: true
@@ -264,7 +265,7 @@ Item {
 
             onRunningChanged: {
                 if (!running) {
-                    visibledMouseArea(false)
+                    fullMouseArea.visible = false
                 }
             }
         },
@@ -307,8 +308,8 @@ Item {
 
             onRunningChanged: {
                 if (!running) {
-                    draw2Background.color = "#90000000"
-                    visibledMouseArea(true)
+                    draw2Background.color = semitransparentColor
+                    fullMouseArea.visible = true
                 }
             }
         }
@@ -328,9 +329,8 @@ Item {
             return
         }
 
-        draw2Background.color = "#90000000"
-
-        visibledMouseArea(true)
+        draw2Background.color = semitransparentColor
+        fullMouseArea.visible = true
 
         root.y = 0
         root.state = "opened"
@@ -359,16 +359,10 @@ Item {
     }
 
     function expand() {
-        draw2Background.color = "#90000000"
+        draw2Background.color = semitransparentColor
         root.state = "expanded"
     }
 
-
-    function visibledMouseArea(visbile) {
-        fullMouseArea.visible = visbile
-        dragArea.visible = visbile
-    }
-
     function opened() {
         return root.state === "opened" ? true : false
     }

From a6949bd3aefeb3e90852d85be5a5028d0aff4b50 Mon Sep 17 00:00:00 2001
From: ronoaer <ronoaer@gmail.com>
Date: Thu, 19 Oct 2023 19:45:22 +0800
Subject: [PATCH 262/278] resized questiondrawer of page serverdata

---
 client/ui/qml/Pages2/PageSettingsServerData.qml | 6 ++++--
 client/ui/qml/Pages2/PageSettingsServerInfo.qml | 1 +
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/client/ui/qml/Pages2/PageSettingsServerData.qml b/client/ui/qml/Pages2/PageSettingsServerData.qml
index 2e401c67..09066ccb 100644
--- a/client/ui/qml/Pages2/PageSettingsServerData.qml
+++ b/client/ui/qml/Pages2/PageSettingsServerData.qml
@@ -14,6 +14,8 @@ import "../Components"
 PageType {
     id: root
 
+    property Item questionDrawerParent
+
     Connections {
         target: InstallController
 
@@ -193,9 +195,9 @@ PageType {
             QuestionDrawer {
                 id: questionDrawer
 
-                drawerHeight: 0.8
+                drawerHeight: 0.5
 
-                parent: root
+                parent: questionDrawerParent
             }
         }
     }
diff --git a/client/ui/qml/Pages2/PageSettingsServerInfo.qml b/client/ui/qml/Pages2/PageSettingsServerInfo.qml
index f6d569dd..e14c6ab5 100644
--- a/client/ui/qml/Pages2/PageSettingsServerInfo.qml
+++ b/client/ui/qml/Pages2/PageSettingsServerInfo.qml
@@ -169,6 +169,7 @@ PageType {
             }
             PageSettingsServerData {
                 stackView: root.stackView
+                questionDrawerParent: root
             }
         }
     }

From 6c78b4ec8f8bad64ee2f936096dd421c47192af6 Mon Sep 17 00:00:00 2001
From: ronoaer <ronoaer@gmail.com>
Date: Thu, 19 Oct 2023 23:01:03 +0800
Subject: [PATCH 263/278] enabled drag-pagehome-drawer in tabBar

---
 client/ui/qml/Pages2/PageStart.qml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/client/ui/qml/Pages2/PageStart.qml b/client/ui/qml/Pages2/PageStart.qml
index 4ccd40d8..12c83e06 100644
--- a/client/ui/qml/Pages2/PageStart.qml
+++ b/client/ui/qml/Pages2/PageStart.qml
@@ -176,6 +176,12 @@ PageType {
                 strokeColor: "#2C2D30"
                 fillColor: "#1C1D21"
             }
+
+            MouseArea {
+                id: noPropagateMouseEvent
+                anchors.fill: parent
+                enabled: true
+            }
         }
 
         TabImageButtonType {

From 2da1025f2695c8a8ba2b1f0d82bdcacd0437b473 Mon Sep 17 00:00:00 2001
From: pokamest <pokamest@gmail.com>
Date: Fri, 20 Oct 2023 02:25:40 +0100
Subject: [PATCH 264/278] Random port on install

---
 client/protocols/protocols_defs.cpp           | 25 +++++++++---
 client/protocols/protocols_defs.h             |  2 +
 client/ui/controllers/installController.cpp   | 40 ++++++++++---------
 .../PageSetupWizardProtocolSettings.qml       |  2 +-
 4 files changed, 44 insertions(+), 25 deletions(-)

diff --git a/client/protocols/protocols_defs.cpp b/client/protocols/protocols_defs.cpp
index b3823a11..a451014c 100644
--- a/client/protocols/protocols_defs.cpp
+++ b/client/protocols/protocols_defs.cpp
@@ -1,5 +1,7 @@
 #include "protocols_defs.h"
 
+#include <QRandomGenerator>
+
 using namespace amnezia;
 
 QDebug operator<<(QDebug debug, const amnezia::ProtocolEnumNS::Proto &p)
@@ -98,15 +100,28 @@ amnezia::ServiceType ProtocolProps::protocolService(Proto p)
     }
 }
 
+int ProtocolProps::getPortForInstall(Proto p)
+{
+    switch (p) {
+    case Awg:
+    case WireGuard:
+    case ShadowSocks:
+    case OpenVpn:
+        return QRandomGenerator::global()->bounded(30000, 50000);
+    default:
+        return defaultPort(p);
+    }
+}
+
 int ProtocolProps::defaultPort(Proto p)
 {
     switch (p) {
     case Proto::Any: return -1;
-    case Proto::OpenVpn: return 1194;
-    case Proto::Cloak: return 443;
-    case Proto::ShadowSocks: return 6789;
-    case Proto::WireGuard: return 51820;
-    case Proto::Awg: return 55424;
+    case Proto::OpenVpn: return QString(protocols::openvpn::defaultPort).toInt();
+    case Proto::Cloak: return QString(protocols::cloak::defaultPort).toInt();
+    case Proto::ShadowSocks: return QString(protocols::shadowsocks::defaultPort).toInt();
+    case Proto::WireGuard: return QString(protocols::wireguard::defaultPort).toInt();
+    case Proto::Awg: return QString(protocols::awg::defaultPort).toInt();
     case Proto::Ikev2: return -1;
     case Proto::L2tp: return -1;
 
diff --git a/client/protocols/protocols_defs.h b/client/protocols/protocols_defs.h
index ed2ed313..ab9cac1b 100644
--- a/client/protocols/protocols_defs.h
+++ b/client/protocols/protocols_defs.h
@@ -228,6 +228,8 @@ namespace amnezia
 
         Q_INVOKABLE static ServiceType protocolService(Proto p);
 
+        Q_INVOKABLE static int getPortForInstall(Proto p);
+
         Q_INVOKABLE static int defaultPort(Proto p);
         Q_INVOKABLE static bool defaultPortChangeable(Proto p);
 
diff --git a/client/ui/controllers/installController.cpp b/client/ui/controllers/installController.cpp
index 8efe368b..8853f108 100644
--- a/client/ui/controllers/installController.cpp
+++ b/client/ui/controllers/installController.cpp
@@ -75,33 +75,35 @@ void InstallController::install(DockerContainer container, int port, TransportPr
                                    ProtocolProps::transportProtoToString(transportProto, protocol));
 
             if (container == DockerContainer::Awg) {
-                QString defaultJunkPacketCount = QString::number(QRandomGenerator::global()->bounded(3, 10));
-                QString defaultJunkPacketMinSize = QString::number(50);
-                QString defaultJunkPacketMaxSize = QString::number(1000);
-                QString defaultInitPacketJunkSize = QString::number(QRandomGenerator::global()->bounded(15, 150));
-                QString defaultResponsePacketJunkSize = QString::number(QRandomGenerator::global()->bounded(15, 150));
+                QString junkPacketCount = QString::number(QRandomGenerator::global()->bounded(3, 10));
+                QString junkPacketMinSize = QString::number(50);
+                QString junkPacketMaxSize = QString::number(1000);
+                QString initPacketJunkSize = QString::number(QRandomGenerator::global()->bounded(15, 150));
+                QString responsePacketJunkSize = QString::number(QRandomGenerator::global()->bounded(15, 150));
 
                 QSet<QString> headersValue;
                 while (headersValue.size() != 4) {
-                    headersValue.insert(QString::number(QRandomGenerator::global()->bounded(1, std::numeric_limits<qint32>::max())));
+
+                    auto max = (std::numeric_limits<qint32>::max)();
+                    headersValue.insert(QString::number(QRandomGenerator::global()->bounded(1, max)));
                 }
 
                 auto headersValueList = headersValue.values();
 
-                QString defaultInitPacketMagicHeader = headersValueList.at(0);
-                QString defaultResponsePacketMagicHeader = headersValueList.at(1);
-                QString defaultUnderloadPacketMagicHeader = headersValueList.at(2);
-                QString defaultTransportPacketMagicHeader = headersValueList.at(3);
+                QString initPacketMagicHeader = headersValueList.at(0);
+                QString responsePacketMagicHeader = headersValueList.at(1);
+                QString underloadPacketMagicHeader = headersValueList.at(2);
+                QString transportPacketMagicHeader = headersValueList.at(3);
 
-                containerConfig[config_key::junkPacketCount] = defaultJunkPacketCount;
-                containerConfig[config_key::junkPacketMinSize] = defaultJunkPacketMinSize;
-                containerConfig[config_key::junkPacketMaxSize] = defaultJunkPacketMaxSize;
-                containerConfig[config_key::initPacketJunkSize] = defaultInitPacketJunkSize;
-                containerConfig[config_key::responsePacketJunkSize] = defaultResponsePacketJunkSize;
-                containerConfig[config_key::initPacketMagicHeader] = defaultInitPacketMagicHeader;
-                containerConfig[config_key::responsePacketMagicHeader] = defaultResponsePacketMagicHeader;
-                containerConfig[config_key::underloadPacketMagicHeader] = defaultUnderloadPacketMagicHeader;
-                containerConfig[config_key::transportPacketMagicHeader] = defaultTransportPacketMagicHeader;
+                containerConfig[config_key::junkPacketCount] = junkPacketCount;
+                containerConfig[config_key::junkPacketMinSize] = junkPacketMinSize;
+                containerConfig[config_key::junkPacketMaxSize] = junkPacketMaxSize;
+                containerConfig[config_key::initPacketJunkSize] = initPacketJunkSize;
+                containerConfig[config_key::responsePacketJunkSize] = responsePacketJunkSize;
+                containerConfig[config_key::initPacketMagicHeader] = initPacketMagicHeader;
+                containerConfig[config_key::responsePacketMagicHeader] = responsePacketMagicHeader;
+                containerConfig[config_key::underloadPacketMagicHeader] = underloadPacketMagicHeader;
+                containerConfig[config_key::transportPacketMagicHeader] = transportPacketMagicHeader;
             }
 
             if (container == DockerContainer::Sftp) {
diff --git a/client/ui/qml/Pages2/PageSetupWizardProtocolSettings.qml b/client/ui/qml/Pages2/PageSetupWizardProtocolSettings.qml
index 2b97f044..7698c755 100644
--- a/client/ui/qml/Pages2/PageSetupWizardProtocolSettings.qml
+++ b/client/ui/qml/Pages2/PageSetupWizardProtocolSettings.qml
@@ -224,7 +224,7 @@ PageType {
                             if (ProtocolProps.defaultPort(defaultContainerProto) < 0) {
                                 port.visible = false
                             } else {
-                                port.textFieldText = ProtocolProps.defaultPort(defaultContainerProto)
+                                port.textFieldText = ProtocolProps.getPortForInstall(defaultContainerProto)
                             }
                             transportProtoSelector.currentIndex = ProtocolProps.defaultTransportProto(defaultContainerProto)
 

From 0a15f44193fb7be45dd57e3a19babfb295175a95 Mon Sep 17 00:00:00 2001
From: ronoaer <ronoaer@gmail.com>
Date: Fri, 20 Oct 2023 10:38:12 +0800
Subject: [PATCH 265/278] removed states 'opened', 'closed'

---
 client/ui/qml/Controls2/Drawer2Type.qml | 131 +++++-------------------
 1 file changed, 25 insertions(+), 106 deletions(-)

diff --git a/client/ui/qml/Controls2/Drawer2Type.qml b/client/ui/qml/Controls2/Drawer2Type.qml
index fd6406ee..fa393982 100644
--- a/client/ui/qml/Controls2/Drawer2Type.qml
+++ b/client/ui/qml/Controls2/Drawer2Type.qml
@@ -10,11 +10,6 @@ Item {
         target: PageController
 
         function onForceCloseDrawer() {
-            if (root.opened()) {
-                close()
-                return
-            }
-
             if (root.expanded()) {
                 collapse()
             }
@@ -43,13 +38,12 @@ Item {
 
     property bool dragActive: dragArea.drag.active
 
-    /** Initial height of button content */
     property int collapsedHeight: 0
 
     property bool fullMouseAreaVisible: true
     property MouseArea drawerDragArea: dragArea
 
-    state: "closed"
+    state: "collapsed"
 
     Rectangle {
         id: draw2Background
@@ -66,16 +60,11 @@ Item {
         MouseArea {
             id: fullMouseArea
             anchors.fill: parent
-            enabled: (root.opened() || root.expanded())
+            enabled: root.expanded()
             hoverEnabled: true
             visible: fullMouseAreaVisible
 
             onClicked: {
-                if (root.opened()) {
-                    close()
-                    return
-                }
-
                 if (root.expanded()) {
                     collapse()
                 }
@@ -84,7 +73,10 @@ Item {
 
         Rectangle {
             id: placeAreaHolder
-            height: (!root.opened())  ? 0 :  parent.height - contentHeight
+
+            // for apdating home drawer, normal drawer will reset it
+            height: 0
+
             anchors.right: parent.right
             anchors.left: parent.left
             visible: true
@@ -120,49 +112,27 @@ Item {
 
                 anchors.fill: parent
 
-                cursorShape: root.collapsed() ? Qt.PointingHandCursor : Qt.ArrowCursor // ?
+                cursorShape: root.collapsed() ? Qt.PointingHandCursor : Qt.ArrowCursor
                 hoverEnabled: true
 
                 drag.target: placeAreaHolder
                 drag.axis: Drag.YAxis
-                drag.maximumY: (root.collapsed() || root.expanded()) ? (root.height - collapsedHeight) : root.height
-                drag.minimumY: (root.collapsed() || root.expanded()) ? (root.height - root.height * 0.9) : (root.height - root.height)
+                drag.maximumY: root.height - root.collapsedHeight
+                drag.minimumY: root.collapsedHeight > 0 ? root.height - root.height * 0.9 : 0
 
                 /** If drag area is released at any point other than min or max y, transition to the other state */
                 onReleased: {
-                    if (root.closed() && placeAreaHolder.y < root.height * 0.9) {
-                        root.state = "opened"
-                        return
-                    }
-
-                    if (root.opened() && placeAreaHolder.y > (root.height - root.height * 0.9)) {
-                        close()
-                        return
-                    }
-
-
-                    if (root.collapsed() && placeAreaHolder.y < (root.height - collapsedHeight)) {
+                    if (root.collapsed() && placeAreaHolder.y < drag.maximumY) {
                         root.state = "expanded"
                         return
                     }
-
-                    if (root.expanded() && placeAreaHolder.y > (root.height - root.height * 0.9)) {
+                    if (root.expanded() && placeAreaHolder.y > drag.minimumY) {
                         root.state = "collapsed"
                         return
                     }
-
-
-                    if (root.opened()) {
-                        placeAreaHolder.y = 0
-                    }
                 }
 
                 onClicked: {
-                    if (root.opened()) {
-                        close()
-                        return
-                    }
-
                     if (root.expanded()) {
                         collapse()
                         return
@@ -186,11 +156,10 @@ Item {
                 }
             }
         }
-
     }
 
     onStateChanged: {
-        if (root.closed() || root.collapsed()) {
+        if (root.collapsed()) {
             var initialPageNavigationBarColor = PageController.getInitialPageNavigationBarColor()
             if (initialPageNavigationBarColor !== 0xFF1C1D21) {
                 PageController.updateNavigationBarColor(initialPageNavigationBarColor)
@@ -205,7 +174,7 @@ Item {
             return
         }
 
-        if (root.opened() || root.expanded()) {
+        if (root.expanded()) {
             if (PageController.getInitialPageNavigationBarColor() !== 0xFF1C1D21) {
                 PageController.updateNavigationBarColor(0xFF1C1D21)
             }
@@ -220,27 +189,11 @@ Item {
 
     /** Two states of buttonContent, great place to add any future animations for the drawer */
     states: [
-        State {
-            name: "closed"
-            PropertyChanges {
-                target: placeAreaHolder
-                y: root.height
-            }
-        },
-
-        State {
-            name: "opened"
-            PropertyChanges {
-                target: placeAreaHolder
-                y: dragArea.drag.minimumY
-            }
-        },
-
         State {
             name: "collapsed"
             PropertyChanges {
                 target: placeAreaHolder
-                y: root.height - collapsedHeight
+                y: dragArea.drag.maximumY
             }
         },
 
@@ -248,38 +201,12 @@ Item {
             name: "expanded"
             PropertyChanges {
                 target: placeAreaHolder
-                y: root.height - root.height * 0.9
+                y: dragArea.drag.minimumY
             }
         }
     ]
 
     transitions: [
-        Transition {
-            from: "opened"
-            to: "closed"
-            PropertyAnimation {
-                target: placeAreaHolder
-                properties: "y"
-                duration: 200
-            }
-
-            onRunningChanged: {
-                if (!running) {
-                    fullMouseArea.visible = false
-                }
-            }
-        },
-
-        Transition {
-            from: "closed"
-            to: "opened"
-            PropertyAnimation {
-                target: placeAreaHolder
-                properties: "y"
-                duration: 200
-            }
-        },
-
         Transition {
             from: "expanded"
             to: "collapsed"
@@ -324,33 +251,32 @@ Item {
         duration: 200
     }
 
+    // for normal drawer
     function open() {
-        if (root.opened()) {
+        if (root.expanded()) {
             return
         }
 
         draw2Background.color = semitransparentColor
         fullMouseArea.visible = true
 
+        collapsedHeight = 0
+
         root.y = 0
-        root.state = "opened"
+        root.state = "expanded"
         root.visible = true
         root.height = parent.height
 
         contentArea.height = contentHeight
 
-        placeAreaHolder.height =  root.height - contentHeight
-        placeAreaHolder.y = root.height - root.height
-
-        dragArea.drag.maximumY =  root.height
-        dragArea.drag.minimumY =  0
+        placeAreaHolder.y = 0
+        placeAreaHolder.height = root.height - contentHeight
 
         animationVisible.running = true
     }
 
     function close() {
-        draw2Background.color = "transparent"
-        root.state = "closed"
+        collapse()
     }
 
     function collapse() {
@@ -358,23 +284,16 @@ Item {
         root.state = "collapsed"
     }
 
+    // for page home
     function expand() {
         draw2Background.color = semitransparentColor
         root.state = "expanded"
     }
 
-    function opened() {
-        return root.state === "opened" ? true : false
-    }
-
     function expanded() {
         return root.state === "expanded" ? true : false
     }
 
-    function closed() {
-        return root.state === "closed" ? true : false
-    }
-
     function collapsed() {
         return root.state === "collapsed" ? true : false
     }
@@ -383,7 +302,7 @@ Item {
     onVisibleChanged: {
         // e.g cancel, ......
         if (!visible) {
-            if (root.opened()) {
+            if (root.expanded()) {
                 if (needCloseButton) {
                     PageController.drawerClose()
                 }

From 58ad7dc16135a8cbe3fcb1ef55a1406dbdd191dc Mon Sep 17 00:00:00 2001
From: "vladimir.kuznetsov" <nethiuswork@gmail.com>
Date: Fri, 20 Oct 2023 14:10:04 +0500
Subject: [PATCH 266/278] removed the "remove protocol" buttons from where they
 shouldn't be

---
 client/ui/qml/Controls2/SwitcherType.qml             | 11 ++++-------
 client/ui/qml/Pages2/PageProtocolOpenVpnSettings.qml |  5 +++++
 client/ui/qml/Pages2/PageProtocolRaw.qml             |  2 ++
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/client/ui/qml/Controls2/SwitcherType.qml b/client/ui/qml/Controls2/SwitcherType.qml
index ee7372f5..1dbd0e84 100644
--- a/client/ui/qml/Controls2/SwitcherType.qml
+++ b/client/ui/qml/Controls2/SwitcherType.qml
@@ -30,17 +30,13 @@ Switch {
     property string hoveredIndicatorBackgroundColor: Qt.rgba(1, 1, 1, 0.08)
     property string defaultIndicatorBackgroundColor: "transparent"
 
-    implicitWidth: content.implicitWidth + switcher.implicitWidth
-    implicitHeight: content.implicitHeight
-
     hoverEnabled: enabled ? true : false
 
     indicator: Rectangle {
         id: switcher
 
-        anchors.left: content.right
+        anchors.right: parent.right
         anchors.verticalCenter: parent.verticalCenter
-        anchors.leftMargin: 4
 
         implicitWidth: 52
         implicitHeight: 32
@@ -90,11 +86,11 @@ Switch {
     contentItem: ColumnLayout {
         id: content
 
-        anchors.fill: parent
-        anchors.rightMargin: switcher.implicitWidth
+        anchors.verticalCenter: parent.verticalCenter
 
         ListItemTitleType {
             Layout.fillWidth: true
+            rightPadding: indicator.width
 
             text: root.text
             color: root.enabled ? root.textColor : root.textDisabledColor
@@ -104,6 +100,7 @@ Switch {
             id: description
 
             Layout.fillWidth: true
+            rightPadding: indicator.width
 
             color: root.enabled ? root.descriptionTextColor : root.descriptionTextDisabledColor
 
diff --git a/client/ui/qml/Pages2/PageProtocolOpenVpnSettings.qml b/client/ui/qml/Pages2/PageProtocolOpenVpnSettings.qml
index c8469dcb..cd2dd51d 100644
--- a/client/ui/qml/Pages2/PageProtocolOpenVpnSettings.qml
+++ b/client/ui/qml/Pages2/PageProtocolOpenVpnSettings.qml
@@ -5,6 +5,7 @@ import QtQuick.Layouts
 import SortFilterProxyModel 0.2
 
 import PageEnum 1.0
+import ContainerEnum 1.0
 
 import "./"
 import "../Controls2"
@@ -252,6 +253,8 @@ PageType {
 
                             ColumnLayout {
                                 id: checkboxLayout
+
+                                anchors.fill: parent
                                 CheckBoxType {
                                     Layout.fillWidth: true
 
@@ -351,6 +354,8 @@ PageType {
                             Layout.leftMargin: -8
                             implicitHeight: 32
 
+                            visible: ContainersModel.getCurrentlyProcessedContainerIndex() === ContainerEnum.OpenVpn
+
                             defaultColor: "transparent"
                             hoveredColor: Qt.rgba(1, 1, 1, 0.08)
                             pressedColor: Qt.rgba(1, 1, 1, 0.12)
diff --git a/client/ui/qml/Pages2/PageProtocolRaw.qml b/client/ui/qml/Pages2/PageProtocolRaw.qml
index f0959143..f3621d96 100644
--- a/client/ui/qml/Pages2/PageProtocolRaw.qml
+++ b/client/ui/qml/Pages2/PageProtocolRaw.qml
@@ -169,6 +169,8 @@ PageType {
 
                 width: parent.width
 
+                visible: ServersModel.isCurrentlyProcessedServerHasWriteAccess()
+
                 text: qsTr("Remove ") + ContainersModel.getCurrentlyProcessedContainerName()
                 textColor: "#EB5757"
 

From da1cdfd6faef78dfbc566c79961b00de0cebbbd2 Mon Sep 17 00:00:00 2001
From: ronoaer <ronoaer@gmail.com>
Date: Fri, 20 Oct 2023 18:01:57 +0800
Subject: [PATCH 267/278] translated new source strings to chinese

---
 client/translations/amneziavpn_zh_CN.ts | 40 ++++++++++---------------
 1 file changed, 15 insertions(+), 25 deletions(-)

diff --git a/client/translations/amneziavpn_zh_CN.ts b/client/translations/amneziavpn_zh_CN.ts
index 64faa6f4..76a4feac 100644
--- a/client/translations/amneziavpn_zh_CN.ts
+++ b/client/translations/amneziavpn_zh_CN.ts
@@ -131,7 +131,7 @@
     <message>
         <location filename="../ui/qml/Components/HomeContainersListView.qml" line="58"/>
         <source>Unable change protocol while there is an active connection</source>
-        <translation>Невозможно изменить протокол при наличии активного соединения</translation>
+        <translation type="unfinished">已建立连接时无法更改服务器配置</translation>
     </message>
     <message>
         <location filename="../ui/qml/Components/HomeContainersListView.qml" line="69"/>
@@ -162,47 +162,47 @@
         <translation type="obsolete"> 已安装在服务器上</translation>
     </message>
     <message>
-        <location filename="../ui/controllers/installController.cpp" line="141"/>
-        <location filename="../ui/controllers/installController.cpp" line="192"/>
+        <location filename="../ui/controllers/installController.cpp" line="143"/>
+        <location filename="../ui/controllers/installController.cpp" line="194"/>
         <source>%1 installed successfully. </source>
         <translation>%1 安装成功。</translation>
     </message>
     <message>
-        <location filename="../ui/controllers/installController.cpp" line="143"/>
-        <location filename="../ui/controllers/installController.cpp" line="194"/>
+        <location filename="../ui/controllers/installController.cpp" line="145"/>
+        <location filename="../ui/controllers/installController.cpp" line="196"/>
         <source>%1 is already installed on the server. </source>
         <translation>服务器上已经安装 %1。</translation>
     </message>
     <message>
-        <location filename="../ui/controllers/installController.cpp" line="146"/>
+        <location filename="../ui/controllers/installController.cpp" line="148"/>
         <source>
 Added containers that were already installed on the server</source>
         <translation>添加已安装在服务器上的容器</translation>
     </message>
     <message>
-        <location filename="../ui/controllers/installController.cpp" line="213"/>
+        <location filename="../ui/controllers/installController.cpp" line="215"/>
         <source>
 Already installed containers were found on the server. All installed containers have been added to the application</source>
         <translation>
 在服务上发现已经安装协议并添加至应用</translation>
     </message>
     <message>
-        <location filename="../ui/controllers/installController.cpp" line="297"/>
+        <location filename="../ui/controllers/installController.cpp" line="299"/>
         <source>Settings updated successfully</source>
         <translation>配置更新成功</translation>
     </message>
     <message>
-        <location filename="../ui/controllers/installController.cpp" line="312"/>
+        <location filename="../ui/controllers/installController.cpp" line="314"/>
         <source>Server &apos;%1&apos; was removed</source>
         <translation>已移除服务器 &apos;%1&apos;</translation>
     </message>
     <message>
-        <location filename="../ui/controllers/installController.cpp" line="322"/>
+        <location filename="../ui/controllers/installController.cpp" line="324"/>
         <source>All containers from server &apos;%1&apos; have been removed</source>
         <translation>服务器 &apos;%1&apos; 的所有容器已移除</translation>
     </message>
     <message>
-        <location filename="../ui/controllers/installController.cpp" line="339"/>
+        <location filename="../ui/controllers/installController.cpp" line="341"/>
         <source>%1 has been removed from the server &apos;%2&apos;</source>
         <translation>%1 已从服务器 &apos;%2&apos; 上移除</translation>
     </message>
@@ -223,12 +223,12 @@ Already installed containers were found on the server. All installed containers
         <translation type="obsolete"> 协议已从</translation>
     </message>
     <message>
-        <location filename="../ui/controllers/installController.cpp" line="485"/>
+        <location filename="../ui/controllers/installController.cpp" line="487"/>
         <source>Please login as the user</source>
         <translation>请以用户身份登录</translation>
     </message>
     <message>
-        <location filename="../ui/controllers/installController.cpp" line="514"/>
+        <location filename="../ui/controllers/installController.cpp" line="516"/>
         <source>Server added successfully</source>
         <translation>增加服务器成功</translation>
     </message>
@@ -308,7 +308,7 @@ Already installed containers were found on the server. All installed containers
     <message>
         <location filename="../ui/qml/Pages2/PageHome.qml" line="490"/>
         <source>Unable change server while there is an active connection</source>
-        <translation>Невозможно изменить сервер при наличии активного соединения</translation>
+        <translation>已建立连接时无法更改服务器配置</translation>
     </message>
 </context>
 <context>
@@ -2335,7 +2335,7 @@ and will not be shared or disclosed to the Amnezia or any third parties</source>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../protocols/protocols_defs.cpp" line="75"/>
+        <location filename="../protocols/protocols_defs.cpp" line="77"/>
         <source>Sftp service</source>
         <translation>Sftp 服务</translation>
     </message>
@@ -2839,16 +2839,6 @@ While it offers a blend of security, stability, and speed, it&apos;s essential t
         <source>error 0x%1: %2</source>
         <translation>错误 0x%1: %2</translation>
     </message>
-    <message>
-        <location filename="../3rd/wireguard-tools/contrib/highlighter/gui/highlight.cpp" line="39"/>
-        <source>WireGuard Configuration Highlighter</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../3rd/wireguard-tools/contrib/highlighter/gui/highlight.cpp" line="82"/>
-        <source>&amp;Randomize colors</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>SelectLanguageDrawer</name>

From 3d60ac751eefa101bbeb8ae5fcf3bb1cd57a969f Mon Sep 17 00:00:00 2001
From: "vladimir.kuznetsov" <nethiuswork@gmail.com>
Date: Fri, 20 Oct 2023 20:52:14 +0500
Subject: [PATCH 268/278] removed the default protocol/server change if
 connected to VPN

---
 client/translations/amneziavpn_ru.ts          | 130 +++++++++---------
 client/translations/amneziavpn_zh_CN.ts       | 130 +++++++++---------
 client/ui/controllers/importController.cpp    |   2 -
 client/ui/controllers/installController.cpp   |   5 -
 client/ui/models/containers_model.cpp         |   9 +-
 client/ui/models/containers_model.h           |   1 +
 .../qml/Pages2/PageSetupWizardInstalling.qml  |   8 ++
 .../qml/Pages2/PageSetupWizardViewConfig.qml  |   4 +
 8 files changed, 151 insertions(+), 138 deletions(-)

diff --git a/client/translations/amneziavpn_ru.ts b/client/translations/amneziavpn_ru.ts
index 733c374d..8c72f093 100644
--- a/client/translations/amneziavpn_ru.ts
+++ b/client/translations/amneziavpn_ru.ts
@@ -135,7 +135,7 @@
 <context>
     <name>ImportController</name>
     <message>
-        <location filename="../ui/controllers/importController.cpp" line="429"/>
+        <location filename="../ui/controllers/importController.cpp" line="427"/>
         <source>Scanned %1 of %2.</source>
         <translation>Отсканировано %1 из%2.</translation>
     </message>
@@ -144,13 +144,13 @@
     <name>InstallController</name>
     <message>
         <location filename="../ui/controllers/installController.cpp" line="141"/>
-        <location filename="../ui/controllers/installController.cpp" line="192"/>
+        <location filename="../ui/controllers/installController.cpp" line="191"/>
         <source>%1 installed successfully. </source>
         <translation>%1 успешно установлен. </translation>
     </message>
     <message>
         <location filename="../ui/controllers/installController.cpp" line="143"/>
-        <location filename="../ui/controllers/installController.cpp" line="194"/>
+        <location filename="../ui/controllers/installController.cpp" line="193"/>
         <source>%1 is already installed on the server. </source>
         <translation>%1 уже установлен на сервер. </translation>
     </message>
@@ -162,39 +162,39 @@ Added containers that were already installed on the server</source>
 В приложение добавлены обнаруженные на сервере протоклы и сервисы</translation>
     </message>
     <message>
-        <location filename="../ui/controllers/installController.cpp" line="213"/>
+        <location filename="../ui/controllers/installController.cpp" line="212"/>
         <source>
 Already installed containers were found on the server. All installed containers have been added to the application</source>
         <translation>
 На сервере обнаружены установленные протоколы и сервисы, все они добавлены в приложение</translation>
     </message>
     <message>
-        <location filename="../ui/controllers/installController.cpp" line="297"/>
+        <location filename="../ui/controllers/installController.cpp" line="293"/>
         <source>Settings updated successfully</source>
         <translation>Настройки успешно обновлены</translation>
     </message>
     <message>
-        <location filename="../ui/controllers/installController.cpp" line="312"/>
+        <location filename="../ui/controllers/installController.cpp" line="308"/>
         <source>Server &apos;%1&apos; was removed</source>
         <translation>Сервер &apos;%1&apos; был удален</translation>
     </message>
     <message>
-        <location filename="../ui/controllers/installController.cpp" line="322"/>
+        <location filename="../ui/controllers/installController.cpp" line="318"/>
         <source>All containers from server &apos;%1&apos; have been removed</source>
         <translation>Все протоклы и сервисы были удалены с сервера &apos;%1&apos;</translation>
     </message>
     <message>
-        <location filename="../ui/controllers/installController.cpp" line="339"/>
+        <location filename="../ui/controllers/installController.cpp" line="335"/>
         <source>%1 has been removed from the server &apos;%2&apos;</source>
         <translation>%1 был удален с сервера &apos;%2&apos;</translation>
     </message>
     <message>
-        <location filename="../ui/controllers/installController.cpp" line="485"/>
+        <location filename="../ui/controllers/installController.cpp" line="481"/>
         <source>Please login as the user</source>
         <translation>Пожалуйста, войдите в систему от имени пользователя</translation>
     </message>
     <message>
-        <location filename="../ui/controllers/installController.cpp" line="514"/>
+        <location filename="../ui/controllers/installController.cpp" line="509"/>
         <source>Server added successfully</source>
         <translation>Сервер успешно добавлен</translation>
     </message>
@@ -397,195 +397,195 @@ Already installed containers were found on the server. All installed containers
 <context>
     <name>PageProtocolOpenVpnSettings</name>
     <message>
-        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="76"/>
+        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="77"/>
         <source>OpenVPN settings</source>
         <translation>Настройки OpenVPN</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="83"/>
+        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="84"/>
         <source>VPN Addresses Subnet</source>
         <translation>VPN Адреса Подсеть</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="97"/>
+        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="98"/>
         <source>Network protocol</source>
         <translation>Сетевой протокол</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="126"/>
+        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="127"/>
         <source>Port</source>
         <translation>Порт</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="144"/>
+        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="145"/>
         <source>Auto-negotiate encryption</source>
         <translation>Шифрование с автоматическим согласованием</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="161"/>
         <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="162"/>
+        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="163"/>
         <source>Hash</source>
         <translation>Хэш</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="170"/>
+        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="171"/>
         <source>SHA512</source>
         <translation>SHA512</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="171"/>
+        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="172"/>
         <source>SHA384</source>
         <translation>SHA384</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="172"/>
+        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="173"/>
         <source>SHA256</source>
         <translation>SHA256</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="173"/>
+        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="174"/>
         <source>SHA3-512</source>
         <translation>SHA3-512</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="174"/>
+        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="175"/>
         <source>SHA3-384</source>
         <translation>SHA3-384</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="175"/>
+        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="176"/>
         <source>SHA3-256</source>
         <translation>SHA3-256</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="176"/>
+        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="177"/>
         <source>whirlpool</source>
         <translation>whirlpool</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="177"/>
+        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="178"/>
         <source>BLAKE2b512</source>
         <translation>BLAKE2b512</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="178"/>
+        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="179"/>
         <source>BLAKE2s256</source>
         <translation>BLAKE2s256</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="179"/>
+        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="180"/>
         <source>SHA1</source>
         <translation>SHA1</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="207"/>
         <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="208"/>
+        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="209"/>
         <source>Cipher</source>
         <translation>Шифрование</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="216"/>
+        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="217"/>
         <source>AES-256-GCM</source>
         <translation>AES-256-GCM</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="217"/>
+        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="218"/>
         <source>AES-192-GCM</source>
         <translation>AES-192-GCM</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="218"/>
+        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="219"/>
         <source>AES-128-GCM</source>
         <translation>AES-128-GCM</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="219"/>
+        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="220"/>
         <source>AES-256-CBC</source>
         <translation>AES-256-CBC</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="220"/>
+        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="221"/>
         <source>AES-192-CBC</source>
         <translation>AES-192-CBC</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="221"/>
+        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="222"/>
         <source>AES-128-CBC</source>
         <translation>AES-128-CBC</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="222"/>
+        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="223"/>
         <source>ChaCha20-Poly1305</source>
         <translation>ChaCha20-Poly1305</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="223"/>
+        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="224"/>
         <source>ARIA-256-CBC</source>
         <translation>ARIA-256-CBC</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="224"/>
+        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="225"/>
         <source>CAMELLIA-256-CBC</source>
         <translation>CAMELLIA-256-CBC</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="225"/>
+        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="226"/>
         <source>none</source>
         <translation>none</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="258"/>
+        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="261"/>
         <source>TLS auth</source>
         <translation>TLS авторизация</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="273"/>
+        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="276"/>
         <source>Block DNS requests outside of VPN</source>
         <translation>Блокировать DNS запросы за пределами VPN</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="292"/>
+        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="295"/>
         <source>Additional client configuration commands</source>
         <translation>Дополнительные команды конфигурации клиента</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="308"/>
-        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="340"/>
+        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="311"/>
+        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="343"/>
         <source>Commands:</source>
         <translation>Commands:</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="324"/>
+        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="327"/>
         <source>Additional server configuration commands</source>
         <translation>Дополнительные команды конфигурации сервера</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="359"/>
+        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="364"/>
         <source>Remove OpenVPN</source>
         <translation>Удалить OpenVPN</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="362"/>
+        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="367"/>
         <source>Remove OpenVpn from server?</source>
         <translation>Удалить OpenVpn с сервера?</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="363"/>
+        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="368"/>
         <source>All users who you shared a connection with will no longer be able to connect to it.</source>
         <translation>Все пользователи, с которыми вы поделились этим VPN-протоколом, больше не смогут к нему подключаться.</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="364"/>
+        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="369"/>
         <source>Continue</source>
         <translation>Продолжить</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="365"/>
+        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="370"/>
         <source>Cancel</source>
         <translation>Отменить</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="384"/>
+        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="389"/>
         <source>Save and Restart Amnezia</source>
         <translation>Сохранить и перезагрузить</translation>
     </message>
@@ -608,27 +608,27 @@ Already installed containers were found on the server. All installed containers
         <translation>Параметры подключения %1</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageProtocolRaw.qml" line="172"/>
+        <location filename="../ui/qml/Pages2/PageProtocolRaw.qml" line="174"/>
         <source>Remove </source>
         <translation>Удалить </translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageProtocolRaw.qml" line="176"/>
+        <location filename="../ui/qml/Pages2/PageProtocolRaw.qml" line="178"/>
         <source>Remove %1 from server?</source>
         <translation>Удалить %1 с сервера?</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageProtocolRaw.qml" line="177"/>
+        <location filename="../ui/qml/Pages2/PageProtocolRaw.qml" line="179"/>
         <source>All users who you shared a connection with will no longer be able to connect to it.</source>
         <translation type="unfinished">Все пользователи, с которыми вы поделились этим VPN-протоколом, больше не смогут к нему подключаться.</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageProtocolRaw.qml" line="178"/>
+        <location filename="../ui/qml/Pages2/PageProtocolRaw.qml" line="180"/>
         <source>Continue</source>
         <translation>Продолжить</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageProtocolRaw.qml" line="179"/>
+        <location filename="../ui/qml/Pages2/PageProtocolRaw.qml" line="181"/>
         <source>Cancel</source>
         <translation>Отменить</translation>
     </message>
@@ -1694,7 +1694,7 @@ and will not be shared or disclosed to the Amnezia or any third parties</source>
 <context>
     <name>PageSetupWizardInstalling</name>
     <message>
-        <location filename="../ui/qml/Pages2/PageSetupWizardInstalling.qml" line="57"/>
+        <location filename="../ui/qml/Pages2/PageSetupWizardInstalling.qml" line="65"/>
         <source>The server has already been added to the application</source>
         <translation>Сервер уже был добавлен в приложение</translation>
     </message>
@@ -1707,28 +1707,28 @@ and will not be shared or disclosed to the Amnezia or any third parties</source>
         <translation type="vanished">занят установкой других протоколов или сервисов. Установка Amnesia </translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSetupWizardInstalling.qml" line="62"/>
+        <location filename="../ui/qml/Pages2/PageSetupWizardInstalling.qml" line="70"/>
         <source>Amnezia has detected that your server is currently </source>
         <translation>Amnezia обнаружила, что ваш сервер в настоящее время </translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSetupWizardInstalling.qml" line="63"/>
+        <location filename="../ui/qml/Pages2/PageSetupWizardInstalling.qml" line="71"/>
         <source>busy installing other software. Amnezia installation </source>
         <translation>занят установкой другого программного обеспечения. Установка Amnezia </translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSetupWizardInstalling.qml" line="64"/>
+        <location filename="../ui/qml/Pages2/PageSetupWizardInstalling.qml" line="72"/>
         <source>will pause until the server finishes installing other software</source>
         <translation>будет приостановлена до тех пор, пока сервер не завершит установку</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSetupWizardInstalling.qml" line="121"/>
+        <location filename="../ui/qml/Pages2/PageSetupWizardInstalling.qml" line="129"/>
         <source>Installing</source>
         <translation>Установка</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSetupWizardInstalling.qml" line="21"/>
-        <location filename="../ui/qml/Pages2/PageSetupWizardInstalling.qml" line="67"/>
+        <location filename="../ui/qml/Pages2/PageSetupWizardInstalling.qml" line="75"/>
         <source>Usually it takes no more than 5 minutes</source>
         <translation>Обычно это занимает не более 5 минут</translation>
     </message>
@@ -1846,27 +1846,27 @@ and will not be shared or disclosed to the Amnezia or any third parties</source>
 <context>
     <name>PageSetupWizardViewConfig</name>
     <message>
-        <location filename="../ui/qml/Pages2/PageSetupWizardViewConfig.qml" line="59"/>
+        <location filename="../ui/qml/Pages2/PageSetupWizardViewConfig.qml" line="63"/>
         <source>New connection</source>
         <translation>Новое соединение</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSetupWizardViewConfig.qml" line="86"/>
+        <location filename="../ui/qml/Pages2/PageSetupWizardViewConfig.qml" line="90"/>
         <source>Do not use connection code from public sources. It could be created to intercept your data.</source>
         <translation>Не используйте код подключения из публичных источников. Его могли создать, чтобы перехватывать ваши данные.</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSetupWizardViewConfig.qml" line="101"/>
+        <location filename="../ui/qml/Pages2/PageSetupWizardViewConfig.qml" line="105"/>
         <source>Collapse content</source>
         <translation>Свернуть</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSetupWizardViewConfig.qml" line="101"/>
+        <location filename="../ui/qml/Pages2/PageSetupWizardViewConfig.qml" line="105"/>
         <source>Show content</source>
         <translation>Показать содержимое ключа</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSetupWizardViewConfig.qml" line="144"/>
+        <location filename="../ui/qml/Pages2/PageSetupWizardViewConfig.qml" line="148"/>
         <source>Connect</source>
         <translation>Подключиться</translation>
     </message>
diff --git a/client/translations/amneziavpn_zh_CN.ts b/client/translations/amneziavpn_zh_CN.ts
index 64faa6f4..10064ce2 100644
--- a/client/translations/amneziavpn_zh_CN.ts
+++ b/client/translations/amneziavpn_zh_CN.ts
@@ -146,7 +146,7 @@
 <context>
     <name>ImportController</name>
     <message>
-        <location filename="../ui/controllers/importController.cpp" line="429"/>
+        <location filename="../ui/controllers/importController.cpp" line="427"/>
         <source>Scanned %1 of %2.</source>
         <translation>扫描 %1 of %2.</translation>
     </message>
@@ -163,13 +163,13 @@
     </message>
     <message>
         <location filename="../ui/controllers/installController.cpp" line="141"/>
-        <location filename="../ui/controllers/installController.cpp" line="192"/>
+        <location filename="../ui/controllers/installController.cpp" line="191"/>
         <source>%1 installed successfully. </source>
         <translation>%1 安装成功。</translation>
     </message>
     <message>
         <location filename="../ui/controllers/installController.cpp" line="143"/>
-        <location filename="../ui/controllers/installController.cpp" line="194"/>
+        <location filename="../ui/controllers/installController.cpp" line="193"/>
         <source>%1 is already installed on the server. </source>
         <translation>服务器上已经安装 %1。</translation>
     </message>
@@ -180,29 +180,29 @@ Added containers that were already installed on the server</source>
         <translation>添加已安装在服务器上的容器</translation>
     </message>
     <message>
-        <location filename="../ui/controllers/installController.cpp" line="213"/>
+        <location filename="../ui/controllers/installController.cpp" line="212"/>
         <source>
 Already installed containers were found on the server. All installed containers have been added to the application</source>
         <translation>
 在服务上发现已经安装协议并添加至应用</translation>
     </message>
     <message>
-        <location filename="../ui/controllers/installController.cpp" line="297"/>
+        <location filename="../ui/controllers/installController.cpp" line="293"/>
         <source>Settings updated successfully</source>
         <translation>配置更新成功</translation>
     </message>
     <message>
-        <location filename="../ui/controllers/installController.cpp" line="312"/>
+        <location filename="../ui/controllers/installController.cpp" line="308"/>
         <source>Server &apos;%1&apos; was removed</source>
         <translation>已移除服务器 &apos;%1&apos;</translation>
     </message>
     <message>
-        <location filename="../ui/controllers/installController.cpp" line="322"/>
+        <location filename="../ui/controllers/installController.cpp" line="318"/>
         <source>All containers from server &apos;%1&apos; have been removed</source>
         <translation>服务器 &apos;%1&apos; 的所有容器已移除</translation>
     </message>
     <message>
-        <location filename="../ui/controllers/installController.cpp" line="339"/>
+        <location filename="../ui/controllers/installController.cpp" line="335"/>
         <source>%1 has been removed from the server &apos;%2&apos;</source>
         <translation>%1 已从服务器 &apos;%2&apos; 上移除</translation>
     </message>
@@ -223,12 +223,12 @@ Already installed containers were found on the server. All installed containers
         <translation type="obsolete"> 协议已从</translation>
     </message>
     <message>
-        <location filename="../ui/controllers/installController.cpp" line="485"/>
+        <location filename="../ui/controllers/installController.cpp" line="481"/>
         <source>Please login as the user</source>
         <translation>请以用户身份登录</translation>
     </message>
     <message>
-        <location filename="../ui/controllers/installController.cpp" line="514"/>
+        <location filename="../ui/controllers/installController.cpp" line="509"/>
         <source>Server added successfully</source>
         <translation>增加服务器成功</translation>
     </message>
@@ -431,180 +431,180 @@ Already installed containers were found on the server. All installed containers
 <context>
     <name>PageProtocolOpenVpnSettings</name>
     <message>
-        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="76"/>
+        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="77"/>
         <source>OpenVPN settings</source>
         <translation>OpenVPN 配置</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="83"/>
+        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="84"/>
         <source>VPN Addresses Subnet</source>
         <translation>VPN子网掩码</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="97"/>
+        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="98"/>
         <source>Network protocol</source>
         <translation>网络协议</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="126"/>
+        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="127"/>
         <source>Port</source>
         <translation>端口</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="144"/>
+        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="145"/>
         <source>Auto-negotiate encryption</source>
         <translation>自定义加密方式</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="161"/>
         <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="162"/>
+        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="163"/>
         <source>Hash</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="170"/>
+        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="171"/>
         <source>SHA512</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="171"/>
+        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="172"/>
         <source>SHA384</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="172"/>
+        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="173"/>
         <source>SHA256</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="173"/>
+        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="174"/>
         <source>SHA3-512</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="174"/>
+        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="175"/>
         <source>SHA3-384</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="175"/>
+        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="176"/>
         <source>SHA3-256</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="176"/>
+        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="177"/>
         <source>whirlpool</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="177"/>
+        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="178"/>
         <source>BLAKE2b512</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="178"/>
+        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="179"/>
         <source>BLAKE2s256</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="179"/>
+        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="180"/>
         <source>SHA1</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="207"/>
         <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="208"/>
+        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="209"/>
         <source>Cipher</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="216"/>
+        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="217"/>
         <source>AES-256-GCM</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="217"/>
+        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="218"/>
         <source>AES-192-GCM</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="218"/>
+        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="219"/>
         <source>AES-128-GCM</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="219"/>
+        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="220"/>
         <source>AES-256-CBC</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="220"/>
+        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="221"/>
         <source>AES-192-CBC</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="221"/>
+        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="222"/>
         <source>AES-128-CBC</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="222"/>
+        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="223"/>
         <source>ChaCha20-Poly1305</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="223"/>
+        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="224"/>
         <source>ARIA-256-CBC</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="224"/>
+        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="225"/>
         <source>CAMELLIA-256-CBC</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="225"/>
+        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="226"/>
         <source>none</source>
         <translation>无</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="258"/>
+        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="261"/>
         <source>TLS auth</source>
         <translation>TLS认证</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="273"/>
+        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="276"/>
         <source>Block DNS requests outside of VPN</source>
         <translation>阻止VPN外的DNS请求</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="292"/>
+        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="295"/>
         <source>Additional client configuration commands</source>
         <translation>附加客户端配置命令</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="308"/>
-        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="340"/>
+        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="311"/>
+        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="343"/>
         <source>Commands:</source>
         <translation>命令:</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="324"/>
+        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="327"/>
         <source>Additional server configuration commands</source>
         <translation>附加服务器端配置命令</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="359"/>
+        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="364"/>
         <source>Remove OpenVPN</source>
         <translation>移除OpenVPN</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="362"/>
+        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="367"/>
         <source>Remove OpenVpn from server?</source>
         <translation>从服务器移除OpenVPN吗?</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="363"/>
+        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="368"/>
         <source>All users who you shared a connection with will no longer be able to connect to it.</source>
         <translation>使用此共享连接的所有用户，将无法再连接它。</translation>
     </message>
@@ -613,17 +613,17 @@ Already installed containers were found on the server. All installed containers
         <translation type="obsolete">与您共享连接的所有用户将无法再连接到此链接</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="364"/>
+        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="369"/>
         <source>Continue</source>
         <translation>继续</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="365"/>
+        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="370"/>
         <source>Cancel</source>
         <translation>取消</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="384"/>
+        <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="389"/>
         <source>Save and Restart Amnezia</source>
         <translation>保存并重启Amnezia</translation>
     </message>
@@ -650,17 +650,17 @@ Already installed containers were found on the server. All installed containers
         <translation>%1 连接选项</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageProtocolRaw.qml" line="172"/>
+        <location filename="../ui/qml/Pages2/PageProtocolRaw.qml" line="174"/>
         <source>Remove </source>
         <translation>移除 </translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageProtocolRaw.qml" line="176"/>
+        <location filename="../ui/qml/Pages2/PageProtocolRaw.qml" line="178"/>
         <source>Remove %1 from server?</source>
         <translation>从服务器移除 %1 ?</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageProtocolRaw.qml" line="177"/>
+        <location filename="../ui/qml/Pages2/PageProtocolRaw.qml" line="179"/>
         <source>All users who you shared a connection with will no longer be able to connect to it.</source>
         <translation>使用此共享连接的所有用户，将无法再连接它。</translation>
     </message>
@@ -673,12 +673,12 @@ Already installed containers were found on the server. All installed containers
         <translation type="obsolete">与您共享连接的所有用户将无法再连接到此链接</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageProtocolRaw.qml" line="178"/>
+        <location filename="../ui/qml/Pages2/PageProtocolRaw.qml" line="180"/>
         <source>Continue</source>
         <translation>继续</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageProtocolRaw.qml" line="179"/>
+        <location filename="../ui/qml/Pages2/PageProtocolRaw.qml" line="181"/>
         <source>Cancel</source>
         <translation>取消</translation>
     </message>
@@ -1801,22 +1801,22 @@ and will not be shared or disclosed to the Amnezia or any third parties</source>
     <name>PageSetupWizardInstalling</name>
     <message>
         <location filename="../ui/qml/Pages2/PageSetupWizardInstalling.qml" line="21"/>
-        <location filename="../ui/qml/Pages2/PageSetupWizardInstalling.qml" line="67"/>
+        <location filename="../ui/qml/Pages2/PageSetupWizardInstalling.qml" line="75"/>
         <source>Usually it takes no more than 5 minutes</source>
         <translation>通常不超过5分钟</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSetupWizardInstalling.qml" line="57"/>
+        <location filename="../ui/qml/Pages2/PageSetupWizardInstalling.qml" line="65"/>
         <source>The server has already been added to the application</source>
         <translation>服务器已添加到应用软件中</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSetupWizardInstalling.qml" line="62"/>
+        <location filename="../ui/qml/Pages2/PageSetupWizardInstalling.qml" line="70"/>
         <source>Amnezia has detected that your server is currently </source>
         <translation>Amnezia 检测到您的服务器当前</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSetupWizardInstalling.qml" line="63"/>
+        <location filename="../ui/qml/Pages2/PageSetupWizardInstalling.qml" line="71"/>
         <source>busy installing other software. Amnezia installation </source>
         <translation>正安装其他软件。Amnezia安装</translation>
     </message>
@@ -1829,12 +1829,12 @@ and will not be shared or disclosed to the Amnezia or any third parties</source>
         <translation type="vanished">正安装其他软件。Amnezia安装</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSetupWizardInstalling.qml" line="64"/>
+        <location filename="../ui/qml/Pages2/PageSetupWizardInstalling.qml" line="72"/>
         <source>will pause until the server finishes installing other software</source>
         <translation>将暂停，直到其他软件安装完成。</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSetupWizardInstalling.qml" line="121"/>
+        <location filename="../ui/qml/Pages2/PageSetupWizardInstalling.qml" line="129"/>
         <source>Installing</source>
         <translation>安装中</translation>
     </message>
@@ -1952,27 +1952,27 @@ and will not be shared or disclosed to the Amnezia or any third parties</source>
 <context>
     <name>PageSetupWizardViewConfig</name>
     <message>
-        <location filename="../ui/qml/Pages2/PageSetupWizardViewConfig.qml" line="59"/>
+        <location filename="../ui/qml/Pages2/PageSetupWizardViewConfig.qml" line="63"/>
         <source>New connection</source>
         <translation>新连接</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSetupWizardViewConfig.qml" line="86"/>
+        <location filename="../ui/qml/Pages2/PageSetupWizardViewConfig.qml" line="90"/>
         <source>Do not use connection code from public sources. It could be created to intercept your data.</source>
         <translation>请勿使用公共来源的连接码。它可以被创建来拦截您的数据。</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSetupWizardViewConfig.qml" line="101"/>
+        <location filename="../ui/qml/Pages2/PageSetupWizardViewConfig.qml" line="105"/>
         <source>Collapse content</source>
         <translation>折叠内容</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSetupWizardViewConfig.qml" line="101"/>
+        <location filename="../ui/qml/Pages2/PageSetupWizardViewConfig.qml" line="105"/>
         <source>Show content</source>
         <translation>显示内容</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageSetupWizardViewConfig.qml" line="144"/>
+        <location filename="../ui/qml/Pages2/PageSetupWizardViewConfig.qml" line="148"/>
         <source>Connect</source>
         <translation>连接</translation>
     </message>
diff --git a/client/ui/controllers/importController.cpp b/client/ui/controllers/importController.cpp
index 08b662ec..bd924087 100644
--- a/client/ui/controllers/importController.cpp
+++ b/client/ui/controllers/importController.cpp
@@ -144,8 +144,6 @@ void ImportController::importConfig()
     if (credentials.isValid() || m_config.contains(config_key::containers)) {
         m_serversModel->addServer(m_config);
 
-        m_serversModel->setDefaultServerIndex(m_serversModel->getServersCount() - 1);
-
         emit importFinished();
     } else {
         qDebug() << "Failed to import profile";
diff --git a/client/ui/controllers/installController.cpp b/client/ui/controllers/installController.cpp
index 8efe368b..2aa4e81b 100644
--- a/client/ui/controllers/installController.cpp
+++ b/client/ui/controllers/installController.cpp
@@ -163,7 +163,6 @@ void InstallController::installServer(DockerContainer container, QJsonObject &co
         server.insert(config_key::defaultContainer, ContainerProps::containerToString(container));
 
         m_serversModel->addServer(server);
-        m_serversModel->setDefaultServerIndex(m_serversModel->getServersCount() - 1);
 
         emit installServerFinished(finishMessage);
         return;
@@ -214,9 +213,6 @@ void InstallController::installContainer(DockerContainer container, QJsonObject
                                 "All installed containers have been added to the application");
         }
 
-        if (ContainerProps::containerService(container) == ServiceType::Vpn) {
-            m_containersModel->setData(m_containersModel->index(container), true, ContainersModel::Roles::IsDefaultRole);
-        }
         emit installContainerFinished(finishMessage, ContainerProps::containerService(container) == ServiceType::Other);
         return;
     }
@@ -509,7 +505,6 @@ void InstallController::addEmptyServer()
     server.insert(config_key::defaultContainer, ContainerProps::containerToString(DockerContainer::None));
 
     m_serversModel->addServer(server);
-    m_serversModel->setDefaultServerIndex(m_serversModel->getServersCount() - 1);
 
     emit installServerFinished(tr("Server added successfully"));
 }
diff --git a/client/ui/models/containers_model.cpp b/client/ui/models/containers_model.cpp
index 0c99041e..780809c5 100644
--- a/client/ui/models/containers_model.cpp
+++ b/client/ui/models/containers_model.cpp
@@ -41,7 +41,7 @@ bool ContainersModel::setData(const QModelIndex &index, const QVariant &value, i
         //        return container;
     case IsInstalledRole:
     //        return m_settings->containers(m_currentlyProcessedServerIndex).contains(container);
-    case IsDefaultRole: {
+    case IsDefaultRole: { //todo remove
         m_settings->setDefaultContainer(m_currentlyProcessedServerIndex, container);
         m_defaultContainerIndex = container;
         emit defaultContainerChanged();
@@ -117,6 +117,13 @@ QString ContainersModel::getDefaultContainerName()
     return ContainerProps::containerHumanNames().value(m_defaultContainerIndex);
 }
 
+void ContainersModel::setDefaultContainer(DockerContainer container)
+{
+    m_settings->setDefaultContainer(m_currentlyProcessedServerIndex, container);
+    m_defaultContainerIndex = container;
+    emit defaultContainerChanged();
+}
+
 int ContainersModel::getCurrentlyProcessedContainerIndex()
 {
     return m_currentlyProcessedContainerIndex;
diff --git a/client/ui/models/containers_model.h b/client/ui/models/containers_model.h
index cc549bb3..4ba85749 100644
--- a/client/ui/models/containers_model.h
+++ b/client/ui/models/containers_model.h
@@ -46,6 +46,7 @@ public:
 public slots:
     DockerContainer getDefaultContainer();
     QString getDefaultContainerName();
+    void setDefaultContainer(DockerContainer container);
 
     void setCurrentlyProcessedServerIndex(const int index);
 
diff --git a/client/ui/qml/Pages2/PageSetupWizardInstalling.qml b/client/ui/qml/Pages2/PageSetupWizardInstalling.qml
index bd1fd7e6..50aad294 100644
--- a/client/ui/qml/Pages2/PageSetupWizardInstalling.qml
+++ b/client/ui/qml/Pages2/PageSetupWizardInstalling.qml
@@ -24,6 +24,10 @@ PageType {
         target: InstallController
 
         function onInstallContainerFinished(finishedMessage, isServiceInstall) {
+            if (!ConnectionController.isConnected && !isServiceInstall) {
+                ContainersModel.setDefaultContainer(ContainersModel.getCurrentlyProcessedContainerIndex)
+            }
+
             PageController.goToStartPage()
             if (stackView.currentItem.objectName === PageController.getPagePath(PageEnum.PageHome)) {
                 PageController.restorePageHomeState(true)
@@ -41,6 +45,10 @@ PageType {
         }
 
         function onInstallServerFinished(finishedMessage) {
+            if (!ConnectionController.isConnected) {
+                ServersModel.setDefaultServerIndex(ServersModel.getServersCount() - 1);
+            }
+
             PageController.goToStartPage()
             if (stackView.currentItem.objectName === PageController.getPagePath(PageEnum.PageSetupWizardStart)) {
                 PageController.replaceStartPage()
diff --git a/client/ui/qml/Pages2/PageSetupWizardViewConfig.qml b/client/ui/qml/Pages2/PageSetupWizardViewConfig.qml
index 83132bd9..ac35651f 100644
--- a/client/ui/qml/Pages2/PageSetupWizardViewConfig.qml
+++ b/client/ui/qml/Pages2/PageSetupWizardViewConfig.qml
@@ -24,6 +24,10 @@ PageType {
         }
 
         function onImportFinished() {
+            if (ConnectionController.isConnected) {
+                ServersModel.setDefaultServerIndex(ServersModel.getServersCount() - 1);
+            }
+
             PageController.goToStartPage()
             if (stackView.currentItem.objectName === PageController.getPagePath(PageEnum.PageSetupWizardStart)) {
                 PageController.replaceStartPage()

From 09305724fa35b3524d527b170284a2d1d367e527 Mon Sep 17 00:00:00 2001
From: Mykola Baibuz <mykola.baibuz@gmail.com>
Date: Fri, 20 Oct 2023 16:44:30 -0400
Subject: [PATCH 269/278] Fix MTU len for Win WG/AWG

---
 CMakeLists.txt              | 2 +-
 client/3rd-prebuilt         | 2 +-
 client/android/build.gradle | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 68de51fb..12fc8dce 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.25.0 FATAL_ERROR)
 
 set(PROJECT AmneziaVPN)
 
-project(${PROJECT} VERSION 4.0.8.4
+project(${PROJECT} VERSION 4.0.8.5
         DESCRIPTION "AmneziaVPN"
         HOMEPAGE_URL "https://amnezia.org/"
 )
diff --git a/client/3rd-prebuilt b/client/3rd-prebuilt
index 15b0ff39..ac32d335 160000
--- a/client/3rd-prebuilt
+++ b/client/3rd-prebuilt
@@ -1 +1 @@
-Subproject commit 15b0ff395d9d372339c5ea8ea35cb2715b975ea9
+Subproject commit ac32d33555bd62f0b0af314b1e5119d6d78a1a4e
diff --git a/client/android/build.gradle b/client/android/build.gradle
index 49e378a0..a6b3f651 100644
--- a/client/android/build.gradle
+++ b/client/android/build.gradle
@@ -138,7 +138,7 @@ android {
         resConfig "en"
         minSdkVersion = 24
         targetSdkVersion = 34
-        versionCode 36 // Change to a higher number
+        versionCode 37 // Change to a higher number
         versionName "4.0.8" // Change to a higher number
 
         javaCompileOptions.annotationProcessorOptions.arguments = [

From d98fdbdc5cd4a6b5cc2b15f33a910b300b8bc167 Mon Sep 17 00:00:00 2001
From: pokamest <pokamest@gmail.com>
Date: Sat, 21 Oct 2023 14:17:45 +0100
Subject: [PATCH 270/278] Revert "added new drawer2type for replacing
 drawertype"

---
 client/resources.qrc                          |   1 -
 .../ConnectionTypeSelectionDrawer.qml         |   7 +-
 .../qml/Components/HomeContainersListView.qml |   2 +-
 client/ui/qml/Components/QuestionDrawer.qml   |  10 +-
 .../qml/Components/SelectLanguageDrawer.qml   |   8 +-
 .../qml/Components/ShareConnectionDrawer.qml  |  27 +-
 client/ui/qml/Controls2/Drawer2Type.qml       | 314 ----------------
 client/ui/qml/Controls2/DropDownType.qml      |  21 +-
 client/ui/qml/Pages2/PageHome.qml             | 340 +++++++++++-------
 .../qml/Pages2/PageProtocolCloakSettings.qml  |   2 -
 .../Pages2/PageProtocolOpenVpnSettings.qml    |  11 +-
 client/ui/qml/Pages2/PageProtocolRaw.qml      |  15 +-
 .../PageProtocolShadowSocksSettings.qml       |   2 -
 .../ui/qml/Pages2/PageServiceDnsSettings.qml  |   7 +-
 .../ui/qml/Pages2/PageServiceSftpSettings.qml |   7 +-
 .../Pages2/PageServiceTorWebsiteSettings.qml  |   7 +-
 .../ui/qml/Pages2/PageSettingsApplication.qml |   8 +-
 client/ui/qml/Pages2/PageSettingsBackup.qml   |   7 +-
 client/ui/qml/Pages2/PageSettingsDns.qml      |   7 +-
 client/ui/qml/Pages2/PageSettingsLogging.qml  |   7 +-
 .../ui/qml/Pages2/PageSettingsServerData.qml  |  24 +-
 .../ui/qml/Pages2/PageSettingsServerInfo.qml  |  12 +-
 .../qml/Pages2/PageSettingsServerProtocol.qml |   7 +-
 .../qml/Pages2/PageSettingsSplitTunneling.qml |  29 +-
 .../PageSetupWizardProtocolSettings.qml       |  11 +-
 client/ui/qml/Pages2/PageSetupWizardStart.qml |   3 +-
 client/ui/qml/Pages2/PageShare.qml            |   7 -
 client/ui/qml/Pages2/PageStart.qml            |  12 +-
 28 files changed, 276 insertions(+), 639 deletions(-)
 delete mode 100644 client/ui/qml/Controls2/Drawer2Type.qml

diff --git a/client/resources.qrc b/client/resources.qrc
index 91578418..4c63383c 100644
--- a/client/resources.qrc
+++ b/client/resources.qrc
@@ -216,7 +216,6 @@
         <file>ui/qml/Pages2/PageServiceDnsSettings.qml</file>
         <file>ui/qml/Controls2/TopCloseButtonType.qml</file>
         <file>images/controls/x-circle.svg</file>
-        <file>ui/qml/Controls2/Drawer2Type.qml</file>
         <file>ui/qml/Pages2/PageProtocolAwgSettings.qml</file>
         <file>server_scripts/awg/template.conf</file>
         <file>server_scripts/awg/start.sh</file>
diff --git a/client/ui/qml/Components/ConnectionTypeSelectionDrawer.qml b/client/ui/qml/Components/ConnectionTypeSelectionDrawer.qml
index 71ec889f..1f7b2f29 100644
--- a/client/ui/qml/Components/ConnectionTypeSelectionDrawer.qml
+++ b/client/ui/qml/Components/ConnectionTypeSelectionDrawer.qml
@@ -8,16 +8,13 @@ import "../Controls2"
 import "../Controls2/TextTypes"
 import "../Config"
 
-Drawer2Type {
+DrawerType {
     id: root
 
     width: parent.width
-    height: parent.height
-    contentHeight: parent.height * 0.4375
+    height: parent.height * 0.4375
 
     ColumnLayout {
-        parent: root.contentParent
-
         anchors.top: parent.top
         anchors.left: parent.left
         anchors.right: parent.right
diff --git a/client/ui/qml/Components/HomeContainersListView.qml b/client/ui/qml/Components/HomeContainersListView.qml
index d410f252..f05b90d6 100644
--- a/client/ui/qml/Components/HomeContainersListView.qml
+++ b/client/ui/qml/Components/HomeContainersListView.qml
@@ -63,7 +63,7 @@ ListView {
                         isDefault = true
 
                         menuContent.currentIndex = index
-                        containersDropDown.menu.close()
+                        containersDropDown.menuVisible = false
                     } else {
                         if (!isSupported && isInstalled) {
                             PageController.showErrorMessage(qsTr("The selected protocol is not supported on the current platform"))
diff --git a/client/ui/qml/Components/QuestionDrawer.qml b/client/ui/qml/Components/QuestionDrawer.qml
index 72067f97..16cdcb39 100644
--- a/client/ui/qml/Components/QuestionDrawer.qml
+++ b/client/ui/qml/Components/QuestionDrawer.qml
@@ -5,7 +5,7 @@ import QtQuick.Layouts
 import "../Controls2"
 import "../Controls2/TextTypes"
 
-Drawer2Type {
+DrawerType {
     id: root
 
     property string headerText
@@ -15,14 +15,12 @@ Drawer2Type {
 
     property var yesButtonFunction
     property var noButtonFunction
-    property real drawerHeight: 0.5
 
     width: parent.width
-    height: parent.height
-    contentHeight: parent.height * drawerHeight
+    height: content.implicitHeight + 32
 
     ColumnLayout {
-        parent: root.contentParent
+        id: content
 
         anchors.top: parent.top
         anchors.left: parent.left
@@ -31,8 +29,6 @@ Drawer2Type {
         anchors.rightMargin: 16
         anchors.leftMargin: 16
 
-        // visible: false
-
         spacing: 8
 
         Header2TextType {
diff --git a/client/ui/qml/Components/SelectLanguageDrawer.qml b/client/ui/qml/Components/SelectLanguageDrawer.qml
index e6fdc2b5..d318aab8 100644
--- a/client/ui/qml/Components/SelectLanguageDrawer.qml
+++ b/client/ui/qml/Components/SelectLanguageDrawer.qml
@@ -5,18 +5,15 @@ import QtQuick.Layouts
 import "../Controls2"
 import "../Controls2/TextTypes"
 
-Drawer2Type {
+DrawerType {
     id: root
 
     width: parent.width
-    height: parent.height
-    contentHeight: parent.height * 0.9
+    height: parent.height * 0.9
 
     ColumnLayout {
         id: backButton
 
-        parent: root.contentParent
-
         anchors.top: parent.top
         anchors.left: parent.left
         anchors.right: parent.right
@@ -31,7 +28,6 @@ Drawer2Type {
     }
 
     FlickableType {
-        parent: root.contentParent
         anchors.top: backButton.bottom
         anchors.left: parent.left
         anchors.right: parent.right
diff --git a/client/ui/qml/Components/ShareConnectionDrawer.qml b/client/ui/qml/Components/ShareConnectionDrawer.qml
index 03e7b500..1158dadc 100644
--- a/client/ui/qml/Components/ShareConnectionDrawer.qml
+++ b/client/ui/qml/Components/ShareConnectionDrawer.qml
@@ -16,7 +16,7 @@ import "../Controls2/TextTypes"
 import "../Config"
 import "../Components"
 
-Drawer2Type {
+DrawerType {
     id: root
 
     property alias headerText: header.headerText
@@ -28,10 +28,9 @@ Drawer2Type {
     property string configFileName: "amnezia_config.vpn"
 
     width: parent.width
-    height: parent.height
-    contentHeight: parent.height * 0.9
+    height: parent.height * 0.9
 
-    onDrawerClosed: {
+    onClosed: {
         configExtension = ".vpn"
         configCaption = qsTr("Save AmneziaVPN config")
         configFileName = "amnezia_config"
@@ -42,9 +41,6 @@ Drawer2Type {
 
         Header2Type {
             id: header
-
-            parent: root.contentParent
-
             anchors.top: parent.top
             anchors.left: parent.left
             anchors.right: parent.right
@@ -54,8 +50,6 @@ Drawer2Type {
         }
 
         FlickableType {
-            parent: root.contentParent
-
             anchors.top: header.bottom
             anchors.bottom: parent.bottom
             contentHeight: content.height + 32
@@ -132,37 +126,30 @@ Drawer2Type {
                     text: qsTr("Show connection settings")
 
                     onClicked: {
-                        configContentDrawer.open()
+                        configContentDrawer.visible = true
                     }
                 }
 
-                Drawer2Type {
+                DrawerType {
                     id: configContentDrawer
 
-                    parent: root
                     width: parent.width
-                    height: parent.height
-
-                    contentHeight: parent.height * 0.9
+                    height: parent.height * 0.9
 
                     BackButtonType {
                         id: backButton
 
-                        parent: configContentDrawer.contentParent
-
                         anchors.top: parent.top
                         anchors.left: parent.left
                         anchors.right: parent.right
                         anchors.topMargin: 16
 
                         backButtonFunction: function() {
-                            configContentDrawer.close()
+                            configContentDrawer.visible = false
                         }
                     }
 
                     FlickableType {
-                        parent: configContentDrawer.contentParent
-
                         anchors.top: backButton.bottom
                         anchors.left: parent.left
                         anchors.right: parent.right
diff --git a/client/ui/qml/Controls2/Drawer2Type.qml b/client/ui/qml/Controls2/Drawer2Type.qml
deleted file mode 100644
index fa393982..00000000
--- a/client/ui/qml/Controls2/Drawer2Type.qml
+++ /dev/null
@@ -1,314 +0,0 @@
-import QtQuick
-import QtQuick.Layouts
-import QtQuick.Controls
-import QtQuick.Shapes
-
-Item {
-    id: root
-
-    Connections {
-        target: PageController
-
-        function onForceCloseDrawer() {
-            if (root.expanded()) {
-                collapse()
-            }
-        }
-    }
-
-    signal drawerClosed
-    signal collapsedEntered
-    signal collapsedExited
-    signal collapsedEnter
-    signal collapsedPressChanged
-
-
-    visible: false
-
-    property bool needCloseButton: true
-
-    property string defaultColor: "#1C1D21"
-    property string borderColor: "#2C2D30"
-    property string semitransparentColor: "#90000000"
-
-    property bool needCollapsed: false
-
-    property int contentHeight: 0
-    property Item contentParent: contentArea
-
-    property bool dragActive: dragArea.drag.active
-
-    property int collapsedHeight: 0
-
-    property bool fullMouseAreaVisible: true
-    property MouseArea drawerDragArea: dragArea
-
-    state: "collapsed"
-
-    Rectangle {
-        id: draw2Background
-
-        anchors.fill: parent
-        height: parent.height
-        width: parent.width
-        radius: 16
-        color: "transparent"
-        border.color: "transparent"
-        border.width: 1
-        visible: true
-
-        MouseArea {
-            id: fullMouseArea
-            anchors.fill: parent
-            enabled: root.expanded()
-            hoverEnabled: true
-            visible: fullMouseAreaVisible
-
-            onClicked: {
-                if (root.expanded()) {
-                    collapse()
-                }
-            }
-        }
-
-        Rectangle {
-            id: placeAreaHolder
-
-            // for apdating home drawer, normal drawer will reset it
-            height: 0
-
-            anchors.right: parent.right
-            anchors.left: parent.left
-            visible: true
-            color: "transparent"
-
-            Drag.active: dragArea.drag.active
-        }
-
-
-        Rectangle {
-            id: contentArea
-
-            anchors.top: placeAreaHolder.bottom
-            height: contentHeight
-            radius: 16
-            color: root.defaultColor
-            border.width: 1
-            border.color: root.borderColor
-            width: parent.width
-            visible: true
-
-            Rectangle {
-                width: parent.radius
-                height: parent.radius
-                anchors.bottom: parent.bottom
-                anchors.right: parent.right
-                anchors.left: parent.left
-                color: parent.color
-            }
-
-            MouseArea {
-                id: dragArea
-
-                anchors.fill: parent
-
-                cursorShape: root.collapsed() ? Qt.PointingHandCursor : Qt.ArrowCursor
-                hoverEnabled: true
-
-                drag.target: placeAreaHolder
-                drag.axis: Drag.YAxis
-                drag.maximumY: root.height - root.collapsedHeight
-                drag.minimumY: root.collapsedHeight > 0 ? root.height - root.height * 0.9 : 0
-
-                /** If drag area is released at any point other than min or max y, transition to the other state */
-                onReleased: {
-                    if (root.collapsed() && placeAreaHolder.y < drag.maximumY) {
-                        root.state = "expanded"
-                        return
-                    }
-                    if (root.expanded() && placeAreaHolder.y > drag.minimumY) {
-                        root.state = "collapsed"
-                        return
-                    }
-                }
-
-                onClicked: {
-                    if (root.expanded()) {
-                        collapse()
-                        return
-                    }
-
-                    if (root.collapsed()) {
-                        root.state = "expanded"
-                    }
-                }
-
-                onExited: {
-                    collapsedExited()
-                }
-
-                onEntered: {
-                    collapsedEnter()
-                }
-
-                onPressedChanged: {
-                    collapsedPressChanged()
-                }
-            }
-        }
-    }
-
-    onStateChanged: {
-        if (root.collapsed()) {
-            var initialPageNavigationBarColor = PageController.getInitialPageNavigationBarColor()
-            if (initialPageNavigationBarColor !== 0xFF1C1D21) {
-                PageController.updateNavigationBarColor(initialPageNavigationBarColor)
-            }
-
-            if (needCloseButton) {
-                PageController.drawerClose()
-            }
-
-            drawerClosed()
-
-            return
-        }
-
-        if (root.expanded()) {
-            if (PageController.getInitialPageNavigationBarColor() !== 0xFF1C1D21) {
-                PageController.updateNavigationBarColor(0xFF1C1D21)
-            }
-
-            if (needCloseButton) {
-                PageController.drawerOpen()
-            }
-
-            return
-        }
-    }
-
-    /** Two states of buttonContent, great place to add any future animations for the drawer */
-    states: [
-        State {
-            name: "collapsed"
-            PropertyChanges {
-                target: placeAreaHolder
-                y: dragArea.drag.maximumY
-            }
-        },
-
-        State {
-            name: "expanded"
-            PropertyChanges {
-                target: placeAreaHolder
-                y: dragArea.drag.minimumY
-            }
-        }
-    ]
-
-    transitions: [
-        Transition {
-            from: "expanded"
-            to: "collapsed"
-            PropertyAnimation {
-                target: placeAreaHolder
-                properties: "y"
-                duration: 200
-            }
-
-            onRunningChanged: {
-                if (!running) {
-                    draw2Background.color = "transparent"
-                    fullMouseArea.visible = false
-                }
-            }
-        },
-
-        Transition {
-            from: "collapsed"
-            to: "expanded"
-            PropertyAnimation {
-                target: placeAreaHolder
-                properties: "y"
-                duration: 200
-            }
-
-            onRunningChanged: {
-                if (!running) {
-                    draw2Background.color = semitransparentColor
-                    fullMouseArea.visible = true
-                }
-            }
-        }
-    ]
-
-    NumberAnimation {
-        id: animationVisible
-        target: placeAreaHolder
-        property: "y"
-        from: parent.height
-        to: 0
-        duration: 200
-    }
-
-    // for normal drawer
-    function open() {
-        if (root.expanded()) {
-            return
-        }
-
-        draw2Background.color = semitransparentColor
-        fullMouseArea.visible = true
-
-        collapsedHeight = 0
-
-        root.y = 0
-        root.state = "expanded"
-        root.visible = true
-        root.height = parent.height
-
-        contentArea.height = contentHeight
-
-        placeAreaHolder.y = 0
-        placeAreaHolder.height = root.height - contentHeight
-
-        animationVisible.running = true
-    }
-
-    function close() {
-        collapse()
-    }
-
-    function collapse() {
-        draw2Background.color = "transparent"
-        root.state = "collapsed"
-    }
-
-    // for page home
-    function expand() {
-        draw2Background.color = semitransparentColor
-        root.state = "expanded"
-    }
-
-    function expanded() {
-        return root.state === "expanded" ? true : false
-    }
-
-    function collapsed() {
-        return root.state === "collapsed" ? true : false
-    }
-
-
-    onVisibleChanged: {
-        // e.g cancel, ......
-        if (!visible) {
-            if (root.expanded()) {
-                if (needCloseButton) {
-                    PageController.drawerClose()
-                }
-
-                close()
-            }
-        }
-    }
-}
diff --git a/client/ui/qml/Controls2/DropDownType.qml b/client/ui/qml/Controls2/DropDownType.qml
index c666408a..b91f0b7a 100644
--- a/client/ui/qml/Controls2/DropDownType.qml
+++ b/client/ui/qml/Controls2/DropDownType.qml
@@ -40,10 +40,6 @@ Item {
 
     property alias menuVisible: menu.visible
 
-    property Item drawerParent: root
-
-    property Drawer2Type menu: menu
-
     implicitWidth: rootButtonContent.implicitWidth
     implicitHeight: rootButtonContent.implicitHeight
 
@@ -159,26 +155,21 @@ Item {
         onClicked: {
             if (rootButtonClickedFunction && typeof rootButtonClickedFunction === "function") {
                 rootButtonClickedFunction()
+            } else {
+                menu.visible = true
             }
-
-            menu.open()
         }
     }
 
-    Drawer2Type {
+    DrawerType {
         id: menu
 
-        parent: drawerParent
-
         width: parent.width
-        height: parent.height
-        contentHeight: parent.height * drawerHeight
+        height: parent.height * drawerHeight
 
         ColumnLayout {
             id: header
 
-            parent: menu.contentParent
-
             anchors.top: parent.top
             anchors.left: parent.left
             anchors.right: parent.right
@@ -187,14 +178,12 @@ Item {
             BackButtonType {
                 backButtonImage: root.headerBackButtonImage
                 backButtonFunction: function() {
-                    menu.close()
+                    root.menuVisible = false
                 }
             }
         }
 
         FlickableType {
-            parent: menu.contentParent
-
             anchors.top: header.bottom
             anchors.topMargin: 16
             contentHeight: col.implicitHeight
diff --git a/client/ui/qml/Pages2/PageHome.qml b/client/ui/qml/Pages2/PageHome.qml
index 414d604b..cc49e4f0 100644
--- a/client/ui/qml/Pages2/PageHome.qml
+++ b/client/ui/qml/Pages2/PageHome.qml
@@ -30,13 +30,13 @@ PageType {
         target: PageController
 
         function onRestorePageHomeState(isContainerInstalled) {
-            buttonContent.collapse()
+            buttonContent.state = "expanded"
             if (isContainerInstalled) {
                 containersDropDown.menuVisible = true
             }
         }
         function onForceCloseDrawer() {
-            buttonContent.collapse()
+            buttonContent.state = "collapsed"
         }
     }
 
@@ -73,8 +73,14 @@ PageType {
         expandedServersMenuDescription.text = description + root.defaultServerHostName
     }
 
-    Component.onCompleted: {
-        updateDescriptions()
+    Component.onCompleted: updateDescriptions()
+
+    MouseArea {
+        anchors.fill: parent
+        enabled: buttonContent.state === "expanded"
+        onClicked: {
+            buttonContent.state = "collapsed"
+        }
     }
 
     Item {
@@ -86,10 +92,56 @@ PageType {
         }
     }
 
+    MouseArea {
+        id: dragArea
+
+        anchors.fill: buttonBackground
+        cursorShape: buttonContent.state === "collapsed" ? Qt.PointingHandCursor : Qt.ArrowCursor
+        hoverEnabled: true
+
+        drag.target: buttonContent
+        drag.axis: Drag.YAxis
+        drag.maximumY: root.height - buttonContent.collapsedHeight
+        drag.minimumY: root.height - root.height * 0.9
+
+        /** If drag area is released at any point other than min or max y, transition to the other state */
+        onReleased: {
+            if (buttonContent.state === "collapsed" && buttonContent.y < dragArea.drag.maximumY) {
+                buttonContent.state = "expanded"
+                return
+            }
+            if (buttonContent.state === "expanded" && buttonContent.y > dragArea.drag.minimumY) {
+                buttonContent.state = "collapsed"
+                return
+            }
+        }
+
+        onEntered: {
+            collapsedButtonChevron.backgroundColor = collapsedButtonChevron.hoveredColor
+            collapsedButtonHeader.opacity = 0.8
+        }
+        onExited: {
+            collapsedButtonChevron.backgroundColor = collapsedButtonChevron.defaultColor
+            collapsedButtonHeader.opacity = 1
+        }
+        onPressedChanged: {
+            collapsedButtonChevron.backgroundColor = pressed ? collapsedButtonChevron.pressedColor : entered ? collapsedButtonChevron.hoveredColor : collapsedButtonChevron.defaultColor
+            collapsedButtonHeader.opacity = 0.7
+        }
+
+
+        onClicked: {
+            if (buttonContent.state === "collapsed") {
+                buttonContent.state = "expanded"
+            }
+        }
+    }
+
     Rectangle {
         id: buttonBackground
-        anchors { left: buttonContent.left; right: buttonContent.right; top: buttonContent.top }
 
+        anchors { left: buttonContent.left; right: buttonContent.right; top: buttonContent.top }
+        height: root.height
         radius: 16
         color: root.defaultColor
         border.color: root.borderColor
@@ -105,126 +157,161 @@ PageType {
         }
     }
 
-    Drawer2Type {
+    ColumnLayout {
         id: buttonContent
-        visible: true
-
-        fullMouseAreaVisible: false
 
+        /** Initial height of button content */
+        property int collapsedHeight: 0
         /** True when expanded objects should be visible */
-        property bool expandedVisibility: buttonContent.expanded() || (buttonContent.collapsed() && buttonContent.dragActive)
+        property bool expandedVisibility: buttonContent.state === "expanded" || (buttonContent.state === "collapsed" && dragArea.drag.active === true)
         /** True when collapsed objects should be visible */
-        property bool collapsedVisibility: buttonContent.collapsed() && !buttonContent.dragActive
+        property bool collapsedVisibility: buttonContent.state === "collapsed" && dragArea.drag.active === false
 
-        width: parent.width
-        height: parent.height
-        contentHeight: parent.height * 0.9
+        Drag.active: dragArea.drag.active
+        anchors.right: root.right
+        anchors.left: root.left
+        y: root.height - buttonContent.height
 
+        Component.onCompleted: {
+            buttonContent.state = "collapsed"
+        }
 
-        ColumnLayout {
-            id: collapsedButtonContent
-
-            parent: buttonContent.contentParent
-
-            visible: buttonContent.collapsedVisibility
-
-            anchors.right: parent.right
-            anchors.left: parent.left
-            anchors.top: parent.top
-
-            onImplicitHeightChanged: {
-                if (buttonContent.collapsed() && buttonContent.collapsedHeight === 0) {
-                    buttonContent.collapsedHeight = implicitHeight
-                }
-            }
-
-            DividerType {
-                Layout.topMargin: 10
-                Layout.fillWidth: false
-                Layout.preferredWidth: 20
-                Layout.preferredHeight: 2
-                Layout.alignment: Qt.AlignHCenter | Qt.AlignVCenter
-            }
-        
-            RowLayout {
-                Layout.topMargin: 14
-                Layout.leftMargin: 24
-                Layout.rightMargin: 24
-                Layout.alignment: Qt.AlignHCenter | Qt.AlignVCenter
-
-                Header1TextType {
-                    id: collapsedButtonHeader
-                    Layout.maximumWidth: root.width - 48 - 18 - 12 // todo
-
-                    maximumLineCount: 2
-                    elide: Qt.ElideRight
-
-                    text: root.defaultServerName
-
-                    Layout.alignment: Qt.AlignLeft
-                }
-
-
-                ImageButtonType {
-                    id: collapsedButtonChevron
-
-                    hoverEnabled: false
-                    image: "qrc:/images/controls/chevron-down.svg"
-                    imageColor: "#d7d8db"
-
-                    horizontalPadding: 0
-                    padding: 0
-                    spacing: 0
-
-                    Rectangle {
-                        id: rightImageBackground
-                        anchors.fill: parent
-                        radius: 16
-                        color: "transparent"
-
-                        Behavior on color {
-                            PropertyAnimation { duration: 200 }
-                        }
-                    }
-
-                    onClicked: {
-                        if (buttonContent.collapsed()) {
-                            buttonContent.expand()
-                        }
-                    }
-                }
-            }
-
-            LabelTextType {
-                id: collapsedServerMenuDescription
-                Layout.bottomMargin: 44
-                Layout.alignment: Qt.AlignHCenter | Qt.AlignVCenter
-                visible: buttonContent.collapsedVisibility
+        /** Set once based on first implicit height change once all children are layed out */
+        onImplicitHeightChanged: {
+            if (buttonContent.state === "collapsed" && collapsedHeight == 0) {
+                collapsedHeight = implicitHeight
             }
         }
 
-        Component.onCompleted: {
-            buttonContent.collapse()
+        onStateChanged: {
+            if (buttonContent.state === "collapsed") {
+                var initialPageNavigationBarColor = PageController.getInitialPageNavigationBarColor()
+                if (initialPageNavigationBarColor !== 0xFF1C1D21) {
+                    PageController.updateNavigationBarColor(initialPageNavigationBarColor)
+                }
+                PageController.drawerClose()
+                return
+            }
+            if (buttonContent.state === "expanded") {
+                if (PageController.getInitialPageNavigationBarColor() !== 0xFF1C1D21) {
+                    PageController.updateNavigationBarColor(0xFF1C1D21)
+                }
+                PageController.drawerOpen()
+                return
+            }
+        }
+
+        /** Two states of buttonContent, great place to add any future animations for the drawer */
+        states: [
+            State {
+                name: "collapsed"
+                PropertyChanges {
+                    target: buttonContent
+                    y: root.height - collapsedHeight
+                }
+            },
+            State {
+                name: "expanded"
+                PropertyChanges {
+                    target: buttonContent
+                    y: dragArea.drag.minimumY
+
+                }
+            }
+        ]
+
+        transitions: [
+            Transition {
+                from: "collapsed"
+                to: "expanded"
+                PropertyAnimation {
+                    target: buttonContent
+                    properties: "y"
+                    duration: 200
+                }
+            },
+            Transition {
+                from: "expanded"
+                to: "collapsed"
+                PropertyAnimation {
+                    target: buttonContent
+                    properties: "y"
+                    duration: 200
+                }
+            }
+        ]
+
+        DividerType {
+            Layout.topMargin: 10
+            Layout.fillWidth: false
+            Layout.preferredWidth: 20
+            Layout.preferredHeight: 2
+            Layout.alignment: Qt.AlignHCenter | Qt.AlignVCenter
+
+            visible: (buttonContent.collapsedVisibility || buttonContent.expandedVisibility)
+        }
+
+        RowLayout {
+            Layout.topMargin: 14
+            Layout.leftMargin: 24
+            Layout.rightMargin: 24
+            Layout.alignment: Qt.AlignHCenter | Qt.AlignVCenter
+            visible: buttonContent.collapsedVisibility
+
+            spacing: 0
+
+            Header1TextType {
+                id: collapsedButtonHeader
+                Layout.maximumWidth: buttonContent.width - 48 - 18 - 12 // todo
+
+                maximumLineCount: 2
+                elide: Qt.ElideRight
+
+                text: root.defaultServerName
+                horizontalAlignment: Qt.AlignHCenter
+
+                Behavior on opacity {
+                    PropertyAnimation { duration: 200 }
+                }
+            }
+
+            ImageButtonType {
+                id: collapsedButtonChevron
+
+                Layout.leftMargin: 8
+
+                hoverEnabled: false
+                image: "qrc:/images/controls/chevron-down.svg"
+                imageColor: "#d7d8db"
+
+                icon.width: 18
+                icon.height: 18
+                backgroundRadius: 16
+                horizontalPadding: 4
+                topPadding: 4
+                bottomPadding: 3
+
+                onClicked: {
+                    if (buttonContent.state === "collapsed") {
+                        buttonContent.state = "expanded"
+                    }
+                }
+            }
+        }
+
+        LabelTextType {
+            id: collapsedServerMenuDescription
+            Layout.bottomMargin: 44
+            Layout.alignment: Qt.AlignHCenter | Qt.AlignVCenter
+            visible: buttonContent.collapsedVisibility
         }
 
         ColumnLayout {
             id: serversMenuHeader
 
-            parent: buttonContent.contentParent
-
-            anchors.top: parent.top
-            anchors.right: parent.right
-            anchors.left: parent.left
-
+            Layout.alignment: Qt.AlignTop | Qt.AlignHCenter
+            Layout.fillWidth: true
             visible: buttonContent.expandedVisibility
-            
-            DividerType {
-                Layout.topMargin: 10
-                Layout.fillWidth: false
-                Layout.preferredWidth: 20
-                Layout.preferredHeight: 2
-                Layout.alignment: Qt.AlignHCenter | Qt.AlignVCenter
-            }
 
             Header1TextType {
                 Layout.fillWidth: true
@@ -253,8 +340,6 @@ PageType {
                 DropDownType {
                     id: containersDropDown
 
-                    drawerParent: root
-
                     rootButtonImageColor: "#0E0E11"
                     rootButtonBackgroundColor: "#D7D8DB"
                     rootButtonBackgroundHoveredColor: Qt.rgba(215, 216, 219, 0.8)
@@ -316,18 +401,12 @@ PageType {
 
         Flickable {
             id: serversContainer
-
-            parent: buttonContent.contentParent
-
-            anchors.top: serversMenuHeader.bottom
-            anchors.right: parent.right
-            anchors.left: parent.left
-            anchors.bottom: parent.bottom
-            anchors.topMargin: 16
+            Layout.alignment: Qt.AlignTop | Qt.AlignHCenter
+            Layout.fillWidth: true
+            Layout.topMargin: 16
             contentHeight: col.implicitHeight
-
+            implicitHeight: root.height - (root.height * 0.1) - serversMenuHeader.implicitHeight - 52 //todo 52 is tabbar height
             visible: buttonContent.expandedVisibility
-
             clip: true
 
             ScrollBar.vertical: ScrollBar {
@@ -437,7 +516,7 @@ PageType {
                                     onClicked: function() {
                                         ServersModel.currentlyProcessedIndex = index
                                         PageController.goToPage(PageEnum.PageSettingsServerInfo)
-                                        buttonContent.collapse()
+                                        buttonContent.state = "collapsed"
                                     }
                                 }
                             }
@@ -452,22 +531,5 @@ PageType {
                 }
             }
         }
-
-        onCollapsedEnter: {
-            collapsedButtonChevron.backgroundColor = collapsedButtonChevron.hoveredColor
-            collapsedButtonHeader.opacity = 0.8
-        }
-
-        onCollapsedExited: {
-            collapsedButtonChevron.backgroundColor = collapsedButtonChevron.defaultColor
-            collapsedButtonHeader.opacity = 1
-        }
-
-        onCollapsedPressChanged: {
-            collapsedButtonChevron.backgroundColor = buttonContent.drawerDragArea.pressed ?
-                        collapsedButtonChevron.pressedColor : buttonContent.drawerDragArea.entered ?
-                            collapsedButtonChevron.hoveredColor : collapsedButtonChevron.defaultColor
-            collapsedButtonHeader.opacity = 0.7
-        }
     }
 }
diff --git a/client/ui/qml/Pages2/PageProtocolCloakSettings.qml b/client/ui/qml/Pages2/PageProtocolCloakSettings.qml
index b0f36971..78e666a7 100644
--- a/client/ui/qml/Pages2/PageProtocolCloakSettings.qml
+++ b/client/ui/qml/Pages2/PageProtocolCloakSettings.qml
@@ -117,8 +117,6 @@ PageType {
                             Layout.fillWidth: true
                             Layout.topMargin: 16
 
-                            drawerParent: root
-
                             descriptionText: qsTr("Cipher")
                             headerText: qsTr("Cipher")
 
diff --git a/client/ui/qml/Pages2/PageProtocolOpenVpnSettings.qml b/client/ui/qml/Pages2/PageProtocolOpenVpnSettings.qml
index 8ce5e554..cd2dd51d 100644
--- a/client/ui/qml/Pages2/PageProtocolOpenVpnSettings.qml
+++ b/client/ui/qml/Pages2/PageProtocolOpenVpnSettings.qml
@@ -157,8 +157,6 @@ PageType {
                             Layout.fillWidth: true
                             Layout.topMargin: 20
 
-                            drawerParent: root
-
                             enabled: !autoNegotiateEncryprionSwitcher.checked
 
                             descriptionText: qsTr("Hash")
@@ -205,8 +203,6 @@ PageType {
                             Layout.fillWidth: true
                             Layout.topMargin: 16
 
-                            drawerParent: root
-
                             enabled: !autoNegotiateEncryprionSwitcher.checked
 
                             descriptionText: qsTr("Cipher")
@@ -374,14 +370,14 @@ PageType {
                                 questionDrawer.noButtonText = qsTr("Cancel")
 
                                 questionDrawer.yesButtonFunction = function() {
-                                    questionDrawer.close()
+                                    questionDrawer.visible = false
                                     PageController.goToPage(PageEnum.PageDeinstalling)
                                     InstallController.removeCurrentlyProcessedContainer()
                                 }
                                 questionDrawer.noButtonFunction = function() {
-                                    questionDrawer.close()
+                                    questionDrawer.visible = false
                                 }
-                                questionDrawer.open()
+                                questionDrawer.visible = true
                             }
                         }
 
@@ -406,7 +402,6 @@ PageType {
 
         QuestionDrawer {
             id: questionDrawer
-            parent: root
         }
     }
 }
diff --git a/client/ui/qml/Pages2/PageProtocolRaw.qml b/client/ui/qml/Pages2/PageProtocolRaw.qml
index accfd0bd..f3621d96 100644
--- a/client/ui/qml/Pages2/PageProtocolRaw.qml
+++ b/client/ui/qml/Pages2/PageProtocolRaw.qml
@@ -90,19 +90,15 @@ PageType {
 
                         DividerType {}
 
-                        Drawer2Type {
+                        DrawerType {
                             id: configContentDrawer
-                            parent: root
 
                             width: parent.width
-                            height: parent.height
-                            contentHeight: parent.height * 0.9
+                            height: parent.height * 0.9
 
                             BackButtonType {
                                 id: backButton
 
-                                parent: configContentDrawer.contentParent
-
                                 anchors.top: parent.top
                                 anchors.left: parent.left
                                 anchors.right: parent.right
@@ -185,14 +181,14 @@ PageType {
                     questionDrawer.noButtonText = qsTr("Cancel")
 
                     questionDrawer.yesButtonFunction = function() {
-                        questionDrawer.close()
+                        questionDrawer.visible = false
                         PageController.goToPage(PageEnum.PageDeinstalling)
                         InstallController.removeCurrentlyProcessedContainer()
                     }
                     questionDrawer.noButtonFunction = function() {
-                        questionDrawer.close()
+                        questionDrawer.visible = false
                     }
-                    questionDrawer.open()
+                    questionDrawer.visible = true
                 }
 
                 MouseArea {
@@ -207,7 +203,6 @@ PageType {
 
         QuestionDrawer {
             id: questionDrawer
-            parent: root
         }
     }
 }
diff --git a/client/ui/qml/Pages2/PageProtocolShadowSocksSettings.qml b/client/ui/qml/Pages2/PageProtocolShadowSocksSettings.qml
index 75853d1f..2453281f 100644
--- a/client/ui/qml/Pages2/PageProtocolShadowSocksSettings.qml
+++ b/client/ui/qml/Pages2/PageProtocolShadowSocksSettings.qml
@@ -95,8 +95,6 @@ PageType {
                             Layout.fillWidth: true
                             Layout.topMargin: 20
 
-                            drawerParent: root
-
                             descriptionText: qsTr("Cipher")
                             headerText: qsTr("Cipher")
 
diff --git a/client/ui/qml/Pages2/PageServiceDnsSettings.qml b/client/ui/qml/Pages2/PageServiceDnsSettings.qml
index 9ad3b289..10fe6f56 100644
--- a/client/ui/qml/Pages2/PageServiceDnsSettings.qml
+++ b/client/ui/qml/Pages2/PageServiceDnsSettings.qml
@@ -68,14 +68,14 @@ PageType {
                     questionDrawer.noButtonText = qsTr("Cancel")
 
                     questionDrawer.yesButtonFunction = function() {
-                        questionDrawer.close()
+                        questionDrawer.visible = false
                         PageController.goToPage(PageEnum.PageDeinstalling)
                         InstallController.removeCurrentlyProcessedContainer()
                     }
                     questionDrawer.noButtonFunction = function() {
-                        questionDrawer.close()
+                        questionDrawer.visible = false
                     }
-                    questionDrawer.open()
+                    questionDrawer.visible = true
                 }
 
                 MouseArea {
@@ -89,7 +89,6 @@ PageType {
 
             QuestionDrawer {
                 id: questionDrawer
-                parent: root
             }
         }
     }
diff --git a/client/ui/qml/Pages2/PageServiceSftpSettings.qml b/client/ui/qml/Pages2/PageServiceSftpSettings.qml
index 1a591268..b12302dd 100644
--- a/client/ui/qml/Pages2/PageServiceSftpSettings.qml
+++ b/client/ui/qml/Pages2/PageServiceSftpSettings.qml
@@ -253,14 +253,14 @@ PageType {
                                 questionDrawer.noButtonText = qsTr("Cancel")
 
                                 questionDrawer.yesButtonFunction = function() {
-                                    questionDrawer.close()
+                                    questionDrawer.visible = false
                                     PageController.goToPage(PageEnum.PageDeinstalling)
                                     InstallController.removeCurrentlyProcessedContainer()
                                 }
                                 questionDrawer.noButtonFunction = function() {
-                                    questionDrawer.close()
+                                    questionDrawer.visible = false
                                 }
-                                questionDrawer.open()
+                                questionDrawer.visible = true
                             }
                         }
                     }
@@ -270,7 +270,6 @@ PageType {
 
         QuestionDrawer {
             id: questionDrawer
-            parent: root
         }
     }
 }
diff --git a/client/ui/qml/Pages2/PageServiceTorWebsiteSettings.qml b/client/ui/qml/Pages2/PageServiceTorWebsiteSettings.qml
index 9771c4db..3bfa5bb0 100644
--- a/client/ui/qml/Pages2/PageServiceTorWebsiteSettings.qml
+++ b/client/ui/qml/Pages2/PageServiceTorWebsiteSettings.qml
@@ -131,21 +131,20 @@ PageType {
                     questionDrawer.noButtonText = qsTr("Cancel")
 
                     questionDrawer.yesButtonFunction = function() {
-                        questionDrawer.close()
+                        questionDrawer.visible = false
                         PageController.goToPage(PageEnum.PageDeinstalling)
                         InstallController.removeCurrentlyProcessedContainer()
                     }
                     questionDrawer.noButtonFunction = function() {
-                        questionDrawer.close()
+                        questionDrawer.visible = false
                     }
-                    questionDrawer.open()
+                    questionDrawer.visible = true
                 }
             }
         }
 
         QuestionDrawer {
             id: questionDrawer
-            parent: root
         }
     }
 }
diff --git a/client/ui/qml/Pages2/PageSettingsApplication.qml b/client/ui/qml/Pages2/PageSettingsApplication.qml
index 31f59438..05e468f0 100644
--- a/client/ui/qml/Pages2/PageSettingsApplication.qml
+++ b/client/ui/qml/Pages2/PageSettingsApplication.qml
@@ -119,7 +119,6 @@ PageType {
 
             SelectLanguageDrawer {
                 id: selectLanguageDrawer
-                parent: root
             }
 
 
@@ -152,14 +151,14 @@ PageType {
                     questionDrawer.noButtonText = qsTr("Cancel")
 
                     questionDrawer.yesButtonFunction = function() {
-                        questionDrawer.close()
+                        questionDrawer.visible = false
                         SettingsController.clearSettings()
                         PageController.replaceStartPage()
                     }
                     questionDrawer.noButtonFunction = function() {
-                        questionDrawer.close()
+                        questionDrawer.visible = false
                     }
-                    questionDrawer.open()
+                    questionDrawer.visible = true
                 }
             }
 
@@ -167,7 +166,6 @@ PageType {
 
             QuestionDrawer {
                 id: questionDrawer
-                parent: root
             }
         }
     }
diff --git a/client/ui/qml/Pages2/PageSettingsBackup.qml b/client/ui/qml/Pages2/PageSettingsBackup.qml
index eabf1f48..81be0465 100644
--- a/client/ui/qml/Pages2/PageSettingsBackup.qml
+++ b/client/ui/qml/Pages2/PageSettingsBackup.qml
@@ -139,19 +139,18 @@ PageType {
         questionDrawer.noButtonText = qsTr("Cancel")
 
         questionDrawer.yesButtonFunction = function() {
-            questionDrawer.close()
+            questionDrawer.visible = false
             PageController.showBusyIndicator(true)
             SettingsController.restoreAppConfig(filePath)
             PageController.showBusyIndicator(false)
         }
         questionDrawer.noButtonFunction = function() {
-            questionDrawer.close()
+            questionDrawer.visible = false
         }
-        questionDrawer.open()
+        questionDrawer.visible = true
     }
 
     QuestionDrawer {
         id: questionDrawer
-        parent: root
     }
 }
diff --git a/client/ui/qml/Pages2/PageSettingsDns.qml b/client/ui/qml/Pages2/PageSettingsDns.qml
index 8afb9bcc..5670464f 100644
--- a/client/ui/qml/Pages2/PageSettingsDns.qml
+++ b/client/ui/qml/Pages2/PageSettingsDns.qml
@@ -92,7 +92,7 @@ PageType {
                     questionDrawer.noButtonText = qsTr("Cancel")
 
                     questionDrawer.yesButtonFunction = function() {
-                        questionDrawer.close()
+                        questionDrawer.visible = false
                         SettingsController.primaryDns = "1.1.1.1"
                         primaryDns.textFieldText = SettingsController.primaryDns
                         SettingsController.secondaryDns = "1.0.0.1"
@@ -100,9 +100,9 @@ PageType {
                         PageController.showNotificationMessage(qsTr("Settings have been reset"))
                     }
                     questionDrawer.noButtonFunction = function() {
-                        questionDrawer.close()
+                        questionDrawer.visible = false
                     }
-                    questionDrawer.open()
+                    questionDrawer.visible = true
                 }
             }
 
@@ -124,7 +124,6 @@ PageType {
         }
         QuestionDrawer {
             id: questionDrawer
-            parent: root
         }
     }
 }
diff --git a/client/ui/qml/Pages2/PageSettingsLogging.qml b/client/ui/qml/Pages2/PageSettingsLogging.qml
index d282d0f0..840c41d4 100644
--- a/client/ui/qml/Pages2/PageSettingsLogging.qml
+++ b/client/ui/qml/Pages2/PageSettingsLogging.qml
@@ -147,16 +147,16 @@ PageType {
                             questionDrawer.noButtonText = qsTr("Cancel")
 
                             questionDrawer.yesButtonFunction = function() {
-                                questionDrawer.close()
+                                questionDrawer.visible = false
                                 PageController.showBusyIndicator(true)
                                 SettingsController.clearLogs()
                                 PageController.showBusyIndicator(false)
                                 PageController.showNotificationMessage(qsTr("Logs have been cleaned up"))
                             }
                             questionDrawer.noButtonFunction = function() {
-                                questionDrawer.close()
+                                questionDrawer.visible = false
                             }
-                            questionDrawer.open()
+                            questionDrawer.visible = true
                         }
                     }
 
@@ -172,7 +172,6 @@ PageType {
 
             QuestionDrawer {
                 id: questionDrawer
-                parent: root
             }
         }
     }
diff --git a/client/ui/qml/Pages2/PageSettingsServerData.qml b/client/ui/qml/Pages2/PageSettingsServerData.qml
index 09066ccb..3eb07ce9 100644
--- a/client/ui/qml/Pages2/PageSettingsServerData.qml
+++ b/client/ui/qml/Pages2/PageSettingsServerData.qml
@@ -14,8 +14,6 @@ import "../Components"
 PageType {
     id: root
 
-    property Item questionDrawerParent
-
     Connections {
         target: InstallController
 
@@ -96,15 +94,15 @@ PageType {
                     questionDrawer.noButtonText = qsTr("Cancel")
 
                     questionDrawer.yesButtonFunction = function() {
-                        questionDrawer.close()
+                        questionDrawer.visible = false
                         PageController.showBusyIndicator(true)
                         SettingsController.clearCachedProfiles()
                         PageController.showBusyIndicator(false)
                     }
                     questionDrawer.noButtonFunction = function() {
-                        questionDrawer.close()
+                        questionDrawer.visible = false
                     }
-                    questionDrawer.open()
+                    questionDrawer.visible = true
                 }
             }
 
@@ -143,7 +141,7 @@ PageType {
                     questionDrawer.noButtonText = qsTr("Cancel")
 
                     questionDrawer.yesButtonFunction = function() {
-                        questionDrawer.close()
+                        questionDrawer.visible = false
                         PageController.showBusyIndicator(true)
                         if (ServersModel.isDefaultServerCurrentlyProcessed() && ConnectionController.isConnected) {
                             ConnectionController.closeConnection()
@@ -152,9 +150,9 @@ PageType {
                         PageController.showBusyIndicator(false)
                     }
                     questionDrawer.noButtonFunction = function() {
-                        questionDrawer.close()
+                        questionDrawer.visible = false
                     }
-                    questionDrawer.open()
+                    questionDrawer.visible = true
                 }
             }
 
@@ -174,7 +172,7 @@ PageType {
                     questionDrawer.noButtonText = qsTr("Cancel")
 
                     questionDrawer.yesButtonFunction = function() {
-                        questionDrawer.close()
+                        questionDrawer.visible = false
                         PageController.goToPage(PageEnum.PageDeinstalling)
                         if (ServersModel.isDefaultServerCurrentlyProcessed() && ConnectionController.isConnected) {
                             ConnectionController.closeConnection()
@@ -182,9 +180,9 @@ PageType {
                         InstallController.removeAllContainers()
                     }
                     questionDrawer.noButtonFunction = function() {
-                        questionDrawer.close()
+                        questionDrawer.visible = false
                     }
-                    questionDrawer.open()
+                    questionDrawer.visible = true
                 }
             }
 
@@ -194,10 +192,6 @@ PageType {
 
             QuestionDrawer {
                 id: questionDrawer
-
-                drawerHeight: 0.5
-
-                parent: questionDrawerParent
             }
         }
     }
diff --git a/client/ui/qml/Pages2/PageSettingsServerInfo.qml b/client/ui/qml/Pages2/PageSettingsServerInfo.qml
index e14c6ab5..e2e7868c 100644
--- a/client/ui/qml/Pages2/PageSettingsServerInfo.qml
+++ b/client/ui/qml/Pages2/PageSettingsServerInfo.qml
@@ -71,17 +71,15 @@ PageType {
                     }
 
                     actionButtonFunction: function() {
-                        serverNameEditDrawer.open()
+                        serverNameEditDrawer.visible = true
                     }
                 }
 
-                Drawer2Type {
+                DrawerType {
                     id: serverNameEditDrawer
 
-                    parent: root
                     width: root.width
-                    height: root.height // * 0.35
-                    contentHeight: root.height * 0.35
+                    height: root.height * 0.35
 
                     onVisibleChanged: {
                         if (serverNameEditDrawer.visible) {
@@ -90,8 +88,6 @@ PageType {
                     }
 
                     ColumnLayout {
-                        parent: serverNameEditDrawer.contentParent
-
                         anchors.top: parent.top
                         anchors.left: parent.left
                         anchors.right: parent.right
@@ -99,7 +95,6 @@ PageType {
                         anchors.leftMargin: 16
                         anchors.rightMargin: 16
 
-
                         TextFieldWithHeaderType {
                             id: serverName
 
@@ -169,7 +164,6 @@ PageType {
             }
             PageSettingsServerData {
                 stackView: root.stackView
-                questionDrawerParent: root
             }
         }
     }
diff --git a/client/ui/qml/Pages2/PageSettingsServerProtocol.qml b/client/ui/qml/Pages2/PageSettingsServerProtocol.qml
index a518167c..30758da4 100644
--- a/client/ui/qml/Pages2/PageSettingsServerProtocol.qml
+++ b/client/ui/qml/Pages2/PageSettingsServerProtocol.qml
@@ -119,14 +119,14 @@ PageType {
                     questionDrawer.noButtonText = qsTr("Cancel")
 
                     questionDrawer.yesButtonFunction = function() {
-                        questionDrawer.close()
+                        questionDrawer.visible = false
                         PageController.goToPage(PageEnum.PageDeinstalling)
                         InstallController.removeCurrentlyProcessedContainer()
                     }
                     questionDrawer.noButtonFunction = function() {
-                        questionDrawer.close()
+                        questionDrawer.visible = false
                     }
-                    questionDrawer.open()
+                    questionDrawer.visible = true
                 }
 
                 MouseArea {
@@ -141,7 +141,6 @@ PageType {
 
         QuestionDrawer {
             id: questionDrawer
-            parent: root
         }
     }
 }
diff --git a/client/ui/qml/Pages2/PageSettingsSplitTunneling.qml b/client/ui/qml/Pages2/PageSettingsSplitTunneling.qml
index 7811e2bb..cc4973f1 100644
--- a/client/ui/qml/Pages2/PageSettingsSplitTunneling.qml
+++ b/client/ui/qml/Pages2/PageSettingsSplitTunneling.qml
@@ -116,8 +116,6 @@ PageType {
         DropDownType {
             id: selector
 
-            drawerParent: root
-
             Layout.fillWidth: true
             Layout.topMargin: 32
             Layout.leftMargin: 16
@@ -210,13 +208,13 @@ PageType {
                                 questionDrawer.noButtonText = qsTr("Cancel")
 
                                 questionDrawer.yesButtonFunction = function() {
-                                    questionDrawer.close()
+                                    questionDrawer.visible = false
                                     SitesController.removeSite(index)
                                 }
                                 questionDrawer.noButtonFunction = function() {
-                                    questionDrawer.close()
+                                    questionDrawer.visible = false
                                 }
-                                questionDrawer.open()
+                                questionDrawer.visible = true
                             }
                         }
 
@@ -224,7 +222,6 @@ PageType {
 
                         QuestionDrawer {
                             id: questionDrawer
-                            parent: root
                         }
                     }
                 }
@@ -279,18 +276,13 @@ PageType {
         }
     }
 
-    Drawer2Type {
+    DrawerType {
         id: moreActionsDrawer
 
         width: parent.width
-        height: parent.height
-        contentHeight: parent.height * 0.4375
-
-        parent: root
+        height: parent.height * 0.4375
 
         FlickableType {
-            parent: moreActionsDrawer.contentParent
-
             anchors.fill: parent
             contentHeight: moreActionsDrawerContent.height
             ColumnLayout {
@@ -349,20 +341,15 @@ PageType {
         }
     }
 
-    Drawer2Type {
+    DrawerType {
         id: importSitesDrawer
 
         width: parent.width
-        height: parent.height
-        contentHeight: parent.height * 0.4375
-
-        parent: root
+        height: parent.height * 0.4375
 
         BackButtonType {
             id: importSitesDrawerBackButton
 
-            parent: importSitesDrawer.contentParent
-
             anchors.top: parent.top
             anchors.left: parent.left
             anchors.right: parent.right
@@ -374,8 +361,6 @@ PageType {
         }
 
         FlickableType {
-            parent: importSitesDrawer.contentParent
-
             anchors.top: importSitesDrawerBackButton.bottom
             anchors.left: parent.left
             anchors.right: parent.right
diff --git a/client/ui/qml/Pages2/PageSetupWizardProtocolSettings.qml b/client/ui/qml/Pages2/PageSetupWizardProtocolSettings.qml
index 86d3c1fd..7698c755 100644
--- a/client/ui/qml/Pages2/PageSetupWizardProtocolSettings.qml
+++ b/client/ui/qml/Pages2/PageSetupWizardProtocolSettings.qml
@@ -97,20 +97,15 @@ PageType {
                             }
                         }
 
-                        Drawer2Type {
+                        DrawerType {
                             id: showDetailsDrawer
 
                             width: parent.width
-                            height: parent.height
-                            contentHeight: parent.height * 0.9
-
-                            parent: root
+                            height: parent.height * 0.9
 
                             BackButtonType {
                                 id: showDetailsBackButton
 
-                                parent: showDetailsDrawer.contentParent
-
                                 anchors.top: parent.top
                                 anchors.left: parent.left
                                 anchors.right: parent.right
@@ -122,8 +117,6 @@ PageType {
                             }
 
                             FlickableType {
-                                parent: showDetailsDrawer.contentParent
-
                                 anchors.top: showDetailsBackButton.bottom
                                 anchors.left: parent.left
                                 anchors.right: parent.right
diff --git a/client/ui/qml/Pages2/PageSetupWizardStart.qml b/client/ui/qml/Pages2/PageSetupWizardStart.qml
index 059aedab..ba78c985 100644
--- a/client/ui/qml/Pages2/PageSetupWizardStart.qml
+++ b/client/ui/qml/Pages2/PageSetupWizardStart.qml
@@ -115,7 +115,7 @@ PageType {
                 text: qsTr("I have the data to connect")
 
                 onClicked: {
-                    connectionTypeSelection.open()
+                    connectionTypeSelection.visible = true
                 }
             }
 
@@ -140,7 +140,6 @@ PageType {
 
         ConnectionTypeSelectionDrawer {
             id: connectionTypeSelection
-            parent: root
         }
     }
 
diff --git a/client/ui/qml/Pages2/PageShare.qml b/client/ui/qml/Pages2/PageShare.qml
index 5e97cb42..25aad3de 100644
--- a/client/ui/qml/Pages2/PageShare.qml
+++ b/client/ui/qml/Pages2/PageShare.qml
@@ -179,8 +179,6 @@ PageType {
             DropDownType {
                 id: serverSelector
 
-                drawerParent: root
-
                 signal severSelectorIndexChanged
                 property int currentIndex: 0
 
@@ -243,8 +241,6 @@ PageType {
             DropDownType {
                 id: protocolSelector
 
-                drawerParent: root
-
                 visible: accessTypeSelector.currentIndex === 0
 
                 Layout.fillWidth: true
@@ -334,8 +330,6 @@ PageType {
             DropDownType {
                 id: exportTypeSelector
 
-                drawerParent: root
-
                 property int currentIndex: 0
 
                 Layout.fillWidth: true
@@ -377,7 +371,6 @@ PageType {
 
             ShareConnectionDrawer {
                 id: shareConnectionDrawer
-                parent: root
             }
 
             BasicButtonType {
diff --git a/client/ui/qml/Pages2/PageStart.qml b/client/ui/qml/Pages2/PageStart.qml
index 65c351bf..ab02ace4 100644
--- a/client/ui/qml/Pages2/PageStart.qml
+++ b/client/ui/qml/Pages2/PageStart.qml
@@ -135,8 +135,6 @@ PageType {
             var pagePath = PageController.getPagePath(PageEnum.PageHome)
             ServersModel.currentlyProcessedIndex = ServersModel.defaultIndex
             tabBarStackView.push(pagePath, { "objectName" : pagePath })
-
-            connectionTypeSelection.parent = tabBarStackView
         }
 
 //        onWidthChanged: {
@@ -176,12 +174,6 @@ PageType {
                 strokeColor: "#2C2D30"
                 fillColor: "#1C1D21"
             }
-
-            MouseArea {
-                id: noPropagateMouseEvent
-                anchors.fill: parent
-                enabled: true
-            }
         }
 
         TabImageButtonType {
@@ -252,9 +244,7 @@ PageType {
     ConnectionTypeSelectionDrawer {
         id: connectionTypeSelection
 
-        z: 1
-
-        onDrawerClosed: {
+        onAboutToHide: {
             tabBar.setCurrentIndex(tabBar.previousIndex)
         }
     }

From 99214e22e30c630aafa3a3e59c4b5444ac7c7abb Mon Sep 17 00:00:00 2001
From: pokamest <pokamest@gmail.com>
Date: Sat, 21 Oct 2023 16:05:09 +0100
Subject: [PATCH 271/278] Fix docs url

---
 client/ui/qml/Pages2/PageSetupWizardStart.qml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/ui/qml/Pages2/PageSetupWizardStart.qml b/client/ui/qml/Pages2/PageSetupWizardStart.qml
index ba78c985..994ec200 100644
--- a/client/ui/qml/Pages2/PageSetupWizardStart.qml
+++ b/client/ui/qml/Pages2/PageSetupWizardStart.qml
@@ -134,7 +134,7 @@ PageType {
 
                 text: qsTr("I have nothing")
 
-                onClicked: Qt.openUrlExternally("https://ru-docs.amnezia.org/guides/hosting-instructions")
+                onClicked: Qt.openUrlExternally("https://amnezia.org/instructions/0_starter-guide")
             }
         }
 

From e16a1100d8bc2f762d14e24de9800e20eeeac53b Mon Sep 17 00:00:00 2001
From: pokamest <pokamest@gmail.com>
Date: Sat, 21 Oct 2023 16:20:57 +0100
Subject: [PATCH 272/278] Update amneziavpn_ru.ts

---
 client/translations/amneziavpn_ru.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/translations/amneziavpn_ru.ts b/client/translations/amneziavpn_ru.ts
index 281e4edb..eb19ad82 100644
--- a/client/translations/amneziavpn_ru.ts
+++ b/client/translations/amneziavpn_ru.ts
@@ -2571,9 +2571,9 @@ OpenVPN обеспечивает безопасное VPN-соединение 
 
 Cloak защищает OpenVPN от обнаружения и блокировок. 
 
-Cloak может изменять метаданные пакетов. Он полностью маскирует VPN-трафик под обычный веб-трафик, а также защищает VPN от обнаружения с помощью Active Probing. Это делает ее очень устойчивой к обнаружению
+Cloak может изменять метаданные пакетов. Он полностью маскирует VPN-трафик под обычный веб-трафик, а также защищает VPN от обнаружения с помощью Active Probing. Это делает его очень устойчивым к обнаружению
 
-Сразу же после получения первого пакета данных Cloak проверяет подлинность входящего соединения. Если аутентификация не проходит, плагин маскирует сервер под поддельный сайт, и ваша VPN становится невидимой для аналитических систем.
+Сразу же после получения первого пакета данных Cloak проверяет подлинность входящего соединения. Если аутентификация не проходит, плагин маскирует сервер под поддельный сайт, и ваш VPN становится невидимым для аналитических систем.
 
 Если в вашем регионе существует экстремальный уровень цензуры в Интернете, мы советуем вам при первом подключении использовать только OpenVPN через Cloak
 

From 7a54dc15da5070e744d9d9be0cc9bc72d4790e52 Mon Sep 17 00:00:00 2001
From: pokamest <pokamest@gmail.com>
Date: Sat, 21 Oct 2023 16:33:21 +0100
Subject: [PATCH 273/278] Update amneziavpn_ru.ts

---
 client/translations/amneziavpn_ru.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/client/translations/amneziavpn_ru.ts b/client/translations/amneziavpn_ru.ts
index eb19ad82..83cab7ae 100644
--- a/client/translations/amneziavpn_ru.ts
+++ b/client/translations/amneziavpn_ru.ts
@@ -404,7 +404,7 @@ Already installed containers were found on the server. All installed containers
     <message>
         <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="84"/>
         <source>VPN Addresses Subnet</source>
-        <translation>VPN Адреса Подсеть</translation>
+        <translation>Подсеть для VPN</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="98"/>
@@ -1132,7 +1132,7 @@ Already installed containers were found on the server. All installed containers
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsConnection.qml" line="41"/>
         <source>Connection</source>
-        <translation>Подключение</translation>
+        <translation>Соединение</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsConnection.qml" line="50"/>
@@ -1278,7 +1278,7 @@ Already installed containers were found on the server. All installed containers
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsLogging.qml" line="127"/>
         <source>Save logs to file</source>
-        <translation>Сохранять логи в файл</translation>
+        <translation>Сохранить логи в файл</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsLogging.qml" line="145"/>

From 0bb4dd94423bc8bc2a58e980fb0af31340e76c72 Mon Sep 17 00:00:00 2001
From: pokamest <pokamest@gmail.com>
Date: Sat, 21 Oct 2023 18:32:30 +0100
Subject: [PATCH 274/278] Text and translations fixes

---
 client/translations/amneziavpn_ru.ts          | 62 ++++++++++++-------
 client/translations/amneziavpn_zh_CN.ts       | 58 +++++++++++------
 .../ui/qml/Pages2/PageProtocolAwgSettings.qml |  2 +-
 .../Pages2/PageProtocolOpenVpnSettings.qml    |  2 +-
 client/ui/qml/Pages2/PageProtocolRaw.qml      |  2 +-
 .../qml/Pages2/PageSettingsServerProtocol.qml |  2 +-
 client/ui/qml/Pages2/PageShare.qml            |  6 +-
 7 files changed, 85 insertions(+), 49 deletions(-)

diff --git a/client/translations/amneziavpn_ru.ts b/client/translations/amneziavpn_ru.ts
index 83cab7ae..f4ef9c0f 100644
--- a/client/translations/amneziavpn_ru.ts
+++ b/client/translations/amneziavpn_ru.ts
@@ -120,7 +120,7 @@
     <message>
         <location filename="../ui/qml/Components/HomeContainersListView.qml" line="58"/>
         <source>Unable change protocol while there is an active connection</source>
-        <translation type="unfinished"></translation>
+        <translation>Невозможно изменить протокол при активном соединении</translation>
     </message>
     <message>
         <location filename="../ui/qml/Components/HomeContainersListView.qml" line="69"/>
@@ -274,7 +274,7 @@ Already installed containers were found on the server. All installed containers
     <message>
         <location filename="../ui/qml/Pages2/PageHome.qml" line="490"/>
         <source>Unable change server while there is an active connection</source>
-        <translation type="unfinished"></translation>
+        <translation>Невозможно изменить сервер при активном соединении</translation>
     </message>
 </context>
 <context>
@@ -346,9 +346,13 @@ Already installed containers were found on the server. All installed containers
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageProtocolAwgSettings.qml" line="279"/>
-        <source>All users who you shared a connection with will no longer be able to connect to it.</source>
+        <source>All users with whom you shared a connection will no longer be able to connect to it.</source>
         <translation>Все пользователи, с которыми вы поделились этим VPN-протоколом, больше не смогут к нему подключаться.</translation>
     </message>
+    <message>
+        <source>All users who you shared a connection with will no longer be able to connect to it.</source>
+        <translation type="vanished">Все пользователи, с которыми вы поделились этим VPN-протоколом, больше не смогут к нему подключаться.</translation>
+    </message>
     <message>
         <location filename="../ui/qml/Pages2/PageProtocolAwgSettings.qml" line="280"/>
         <source>Continue</source>
@@ -571,9 +575,13 @@ Already installed containers were found on the server. All installed containers
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="368"/>
-        <source>All users who you shared a connection with will no longer be able to connect to it.</source>
+        <source>All users with whom you shared a connection will no longer be able to connect to it.</source>
         <translation>Все пользователи, с которыми вы поделились этим VPN-протоколом, больше не смогут к нему подключаться.</translation>
     </message>
+    <message>
+        <source>All users who you shared a connection with will no longer be able to connect to it.</source>
+        <translation type="vanished">Все пользователи, с которыми вы поделились этим VPN-протоколом, больше не смогут к нему подключаться.</translation>
+    </message>
     <message>
         <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="369"/>
         <source>Continue</source>
@@ -619,8 +627,12 @@ Already installed containers were found on the server. All installed containers
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageProtocolRaw.qml" line="179"/>
+        <source>All users with whom you shared a connection will no longer be able to connect to it.</source>
+        <translation>Все пользователи, с которыми вы поделились этим VPN-протоколом, больше не смогут к нему подключаться.</translation>
+    </message>
+    <message>
         <source>All users who you shared a connection with will no longer be able to connect to it.</source>
-        <translation type="unfinished">Все пользователи, с которыми вы поделились этим VPN-протоколом, больше не смогут к нему подключаться.</translation>
+        <translation type="obsolete">Все пользователи, с которыми вы поделились этим VPN-протоколом, больше не смогут к нему подключаться.</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageProtocolRaw.qml" line="180"/>
@@ -1440,8 +1452,12 @@ Already installed containers were found on the server. All installed containers
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsServerProtocol.qml" line="117"/>
+        <source>All users with whom you shared a connection will no longer be able to connect to it.</source>
+        <translation>Все пользователи, с которыми вы поделились этим VPN-протоколом, больше не смогут к нему подключаться.</translation>
+    </message>
+    <message>
         <source>All users who you shared a connection with will no longer be able to connect to it.</source>
-        <translation>Все пользователи, которым вы поделились VPN, больше не смогут к нему подключаться.</translation>
+        <translation type="vanished">Все пользователи, которым вы поделились VPN, больше не смогут к нему подключаться.</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsServerProtocol.qml" line="118"/>
@@ -1884,9 +1900,8 @@ and will not be shared or disclosed to the Amnezia or any third parties</source>
         <translation>WireGuard нативный формат</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageShare.qml" line="121"/>
         <source>VPN Access</source>
-        <translation>VPN-Доступ</translation>
+        <translation type="vanished">VPN-Доступ</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageShare.qml" line="146"/>
@@ -1894,14 +1909,12 @@ and will not be shared or disclosed to the Amnezia or any third parties</source>
         <translation>Соединение</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageShare.qml" line="174"/>
         <source>VPN access without the ability to manage the server</source>
-        <translation>Доступ к VPN, без возможности управления сервером</translation>
+        <translation type="vanished">Доступ к VPN, без возможности управления сервером</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageShare.qml" line="175"/>
         <source>Access to server management. The user with whom you share full access to the connection will be able to add and remove your protocols and services to the server, as well as change settings.</source>
-        <translation>Доступ к управлению сервером. Пользователь, с которым вы делитесь полным доступом к соединению, сможет добавлять и удалять ваши протоколы и службы на сервере, а также изменять настройки.</translation>
+        <translation type="vanished">Доступ к управлению сервером. Пользователь, с которым вы делитесь полным доступом к соединению, сможет добавлять и удалять ваши протоколы и службы на сервере, а также изменять настройки.</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageShare.qml" line="190"/>
@@ -1944,11 +1957,26 @@ and will not be shared or disclosed to the Amnezia or any third parties</source>
         <source>For the AmneziaVPN app</source>
         <translation>Для AmneziaVPN</translation>
     </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageShare.qml" line="121"/>
+        <source>Share VPN Access</source>
+        <translation>Поделиться VPN</translation>
+    </message>
     <message>
         <location filename="../ui/qml/Pages2/PageShare.qml" line="158"/>
         <source>Full access</source>
         <translation>Полный доступ</translation>
     </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageShare.qml" line="174"/>
+        <source>Share VPN access without the ability to manage the server</source>
+        <translation>Поделиться доступом к VPN, без возможности управления сервером</translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageShare.qml" line="175"/>
+        <source>Share access to server management. The user with whom you share full access to the server will be able to add and remove any protocols and services to the server, as well as change settings.</source>
+        <translation>Поделиться доступом к управлению сервером. Пользователь, с которым вы делитесь полным доступом к серверу, сможет добавлять и удалять любые протоколы и службы на сервере, а также изменять настройки.</translation>
+    </message>
     <message>
         <location filename="../ui/qml/Pages2/PageShare.qml" line="251"/>
         <location filename="../ui/qml/Pages2/PageShare.qml" line="252"/>
@@ -2700,16 +2728,6 @@ This means that AmneziaWG keeps the fast performance of the original while addin
         <source>error 0x%1: %2</source>
         <translation>error 0x%1: %2</translation>
     </message>
-    <message>
-        <location filename="../3rd/wireguard-tools/contrib/highlighter/gui/highlight.cpp" line="39"/>
-        <source>WireGuard Configuration Highlighter</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../3rd/wireguard-tools/contrib/highlighter/gui/highlight.cpp" line="82"/>
-        <source>&amp;Randomize colors</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>SelectLanguageDrawer</name>
diff --git a/client/translations/amneziavpn_zh_CN.ts b/client/translations/amneziavpn_zh_CN.ts
index 8e31af68..c711b3fc 100644
--- a/client/translations/amneziavpn_zh_CN.ts
+++ b/client/translations/amneziavpn_zh_CN.ts
@@ -131,7 +131,7 @@
     <message>
         <location filename="../ui/qml/Components/HomeContainersListView.qml" line="58"/>
         <source>Unable change protocol while there is an active connection</source>
-        <translation type="unfinished">已建立连接时无法更改服务器配置</translation>
+        <translation>已建立连接时无法更改服务器配置</translation>
     </message>
     <message>
         <location filename="../ui/qml/Components/HomeContainersListView.qml" line="69"/>
@@ -380,8 +380,12 @@ Already installed containers were found on the server. All installed containers
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageProtocolAwgSettings.qml" line="279"/>
+        <source>All users with whom you shared a connection will no longer be able to connect to it.</source>
+        <translation>与您共享连接的所有用户将无法再连接到该连接。</translation>
+    </message>
+    <message>
         <source>All users who you shared a connection with will no longer be able to connect to it.</source>
-        <translation>使用此共享连接的所有用户，将无法再连接它。</translation>
+        <translation type="vanished">使用此共享连接的所有用户，将无法再连接它。</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageProtocolAwgSettings.qml" line="280"/>
@@ -605,8 +609,12 @@ Already installed containers were found on the server. All installed containers
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="368"/>
+        <source>All users with whom you shared a connection will no longer be able to connect to it.</source>
+        <translation>与您共享连接的所有用户将无法再连接到该连接。</translation>
+    </message>
+    <message>
         <source>All users who you shared a connection with will no longer be able to connect to it.</source>
-        <translation>使用此共享连接的所有用户，将无法再连接它。</translation>
+        <translation type="vanished">使用此共享连接的所有用户，将无法再连接它。</translation>
     </message>
     <message>
         <source>All users with whom you shared a connection will no longer be able to connect to it</source>
@@ -661,8 +669,12 @@ Already installed containers were found on the server. All installed containers
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageProtocolRaw.qml" line="179"/>
+        <source>All users with whom you shared a connection will no longer be able to connect to it.</source>
+        <translation>与您共享连接的所有用户将无法再连接到该连接。</translation>
+    </message>
+    <message>
         <source>All users who you shared a connection with will no longer be able to connect to it.</source>
-        <translation>使用此共享连接的所有用户，将无法再连接它。</translation>
+        <translation type="vanished">使用此共享连接的所有用户，将无法再连接它。</translation>
     </message>
     <message>
         <source> from server?</source>
@@ -1521,8 +1533,12 @@ And if you don&apos;t like the app, all the more support it - the donation will
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsServerProtocol.qml" line="117"/>
+        <source>All users with whom you shared a connection will no longer be able to connect to it.</source>
+        <translation>与您共享连接的所有用户将无法再连接到该连接。</translation>
+    </message>
+    <message>
         <source>All users who you shared a connection with will no longer be able to connect to it.</source>
-        <translation>使用此共享连接的所有用户，将无法再连接它。</translation>
+        <translation type="vanished">使用此共享连接的所有用户，将无法再连接它。</translation>
     </message>
     <message>
         <source> from server?</source>
@@ -2006,8 +2022,22 @@ and will not be shared or disclosed to the Amnezia or any third parties</source>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageShare.qml" line="121"/>
+        <source>Share VPN Access</source>
+        <translation>共享 VPN 访问</translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageShare.qml" line="174"/>
+        <source>Share VPN access without the ability to manage the server</source>
+        <translation>共享 VPN 访问，无需管理服务器</translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageShare.qml" line="175"/>
+        <source>Share access to server management. The user with whom you share full access to the server will be able to add and remove any protocols and services to the server, as well as change settings.</source>
+        <translation>共享服务器管理访问权限。与您共享服务器全部访问权限的用户将可以添加和删除服务器上的任何协议和服务，以及更改设置。</translation>
+    </message>
+    <message>
         <source>VPN Access</source>
-        <translation>访问VPN</translation>
+        <translation type="vanished">访问VPN</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageShare.qml" line="146"/>
@@ -2020,14 +2050,12 @@ and will not be shared or disclosed to the Amnezia or any third parties</source>
         <translation>完全访问</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageShare.qml" line="174"/>
         <source>VPN access without the ability to manage the server</source>
-        <translation>访问VPN，但没有权限管理服务。</translation>
+        <translation type="vanished">访问VPN，但没有权限管理服务。</translation>
     </message>
     <message>
-        <location filename="../ui/qml/Pages2/PageShare.qml" line="175"/>
         <source>Access to server management. The user with whom you share full access to the connection will be able to add and remove your protocols and services to the server, as well as change settings.</source>
-        <translation>除访问VPN外，用户还能添加和删除协议、服务以及更改配置信息</translation>
+        <translation type="vanished">除访问VPN外，用户还能添加和删除协议、服务以及更改配置信息</translation>
     </message>
     <message>
         <source>Access to server management. The user with whom you share full access to the connection will be able to add and remove your protocols and services to the servers, as well as change settings.</source>
@@ -2839,16 +2867,6 @@ While it offers a blend of security, stability, and speed, it&apos;s essential t
         <source>error 0x%1: %2</source>
         <translation>错误 0x%1: %2</translation>
     </message>
-    <message>
-        <location filename="../3rd/wireguard-tools/contrib/highlighter/gui/highlight.cpp" line="39"/>
-        <source>WireGuard Configuration Highlighter</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../3rd/wireguard-tools/contrib/highlighter/gui/highlight.cpp" line="82"/>
-        <source>&amp;Randomize colors</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>SelectLanguageDrawer</name>
diff --git a/client/ui/qml/Pages2/PageProtocolAwgSettings.qml b/client/ui/qml/Pages2/PageProtocolAwgSettings.qml
index 079c85a1..237a8b46 100644
--- a/client/ui/qml/Pages2/PageProtocolAwgSettings.qml
+++ b/client/ui/qml/Pages2/PageProtocolAwgSettings.qml
@@ -276,7 +276,7 @@ PageType {
 
                             onClicked: {
                                 questionDrawer.headerText = qsTr("Remove AmneziaWG from server?")
-                                questionDrawer.descriptionText = qsTr("All users who you shared a connection with will no longer be able to connect to it.")
+                                questionDrawer.descriptionText = qsTr("All users with whom you shared a connection will no longer be able to connect to it.")
                                 questionDrawer.yesButtonText = qsTr("Continue")
                                 questionDrawer.noButtonText = qsTr("Cancel")
 
diff --git a/client/ui/qml/Pages2/PageProtocolOpenVpnSettings.qml b/client/ui/qml/Pages2/PageProtocolOpenVpnSettings.qml
index cd2dd51d..55cdcf04 100644
--- a/client/ui/qml/Pages2/PageProtocolOpenVpnSettings.qml
+++ b/client/ui/qml/Pages2/PageProtocolOpenVpnSettings.qml
@@ -365,7 +365,7 @@ PageType {
 
                             onClicked: {
                                 questionDrawer.headerText = qsTr("Remove OpenVpn from server?")
-                                questionDrawer.descriptionText = qsTr("All users who you shared a connection with will no longer be able to connect to it.")
+                                questionDrawer.descriptionText = qsTr("All users with whom you shared a connection will no longer be able to connect to it.")
                                 questionDrawer.yesButtonText = qsTr("Continue")
                                 questionDrawer.noButtonText = qsTr("Cancel")
 
diff --git a/client/ui/qml/Pages2/PageProtocolRaw.qml b/client/ui/qml/Pages2/PageProtocolRaw.qml
index f3621d96..967b605b 100644
--- a/client/ui/qml/Pages2/PageProtocolRaw.qml
+++ b/client/ui/qml/Pages2/PageProtocolRaw.qml
@@ -176,7 +176,7 @@ PageType {
 
                 clickedFunction: function() {
                     questionDrawer.headerText = qsTr("Remove %1 from server?").arg(ContainersModel.getCurrentlyProcessedContainerName())
-                    questionDrawer.descriptionText = qsTr("All users who you shared a connection with will no longer be able to connect to it.")
+                    questionDrawer.descriptionText = qsTr("All users with whom you shared a connection will no longer be able to connect to it.")
                     questionDrawer.yesButtonText = qsTr("Continue")
                     questionDrawer.noButtonText = qsTr("Cancel")
 
diff --git a/client/ui/qml/Pages2/PageSettingsServerProtocol.qml b/client/ui/qml/Pages2/PageSettingsServerProtocol.qml
index 30758da4..a961cf56 100644
--- a/client/ui/qml/Pages2/PageSettingsServerProtocol.qml
+++ b/client/ui/qml/Pages2/PageSettingsServerProtocol.qml
@@ -114,7 +114,7 @@ PageType {
 
                 clickedFunction: function() {
                     questionDrawer.headerText = qsTr("Remove %1 from server?").arg(ContainersModel.getCurrentlyProcessedContainerName())
-                    questionDrawer.descriptionText = qsTr("All users who you shared a connection with will no longer be able to connect to it.")
+                    questionDrawer.descriptionText = qsTr("All users with whom you shared a connection will no longer be able to connect to it.")
                     questionDrawer.yesButtonText = qsTr("Continue")
                     questionDrawer.noButtonText = qsTr("Cancel")
 
diff --git a/client/ui/qml/Pages2/PageShare.qml b/client/ui/qml/Pages2/PageShare.qml
index 25aad3de..ced7a5ff 100644
--- a/client/ui/qml/Pages2/PageShare.qml
+++ b/client/ui/qml/Pages2/PageShare.qml
@@ -118,7 +118,7 @@ PageType {
                 Layout.fillWidth: true
                 Layout.topMargin: 24
 
-                headerText: qsTr("VPN Access")
+                headerText: qsTr("Share VPN Access")
             }
 
             Rectangle {
@@ -171,8 +171,8 @@ PageType {
                 Layout.topMargin: 24
                 Layout.bottomMargin: 24
 
-                text: accessTypeSelector.currentIndex === 0 ? qsTr("VPN access without the ability to manage the server") :
-                                                              qsTr("Access to server management. The user with whom you share full access to the connection will be able to add and remove your protocols and services to the server, as well as change settings.")
+                text: accessTypeSelector.currentIndex === 0 ? qsTr("Share VPN access without the ability to manage the server") :
+                                                              qsTr("Share access to server management. The user with whom you share full access to the server will be able to add and remove any protocols and services to the server, as well as change settings.")
                 color: "#878B91"
             }
 

From 994aa327455c462a1c985b625a1f8d5f60fb7f92 Mon Sep 17 00:00:00 2001
From: "vladimir.kuznetsov" <nethiuswork@gmail.com>
Date: Sun, 22 Oct 2023 17:31:13 +0500
Subject: [PATCH 275/278] added getting awg parameters when adding an already
 installed awg container

---
 client/configurators/awg_configurator.cpp     |  4 +--
 client/core/servercontroller.cpp              | 28 +++++++++++++++++++
 client/translations/amneziavpn_ru.ts          | 10 +++++++
 client/translations/amneziavpn_zh_CN.ts       | 10 +++++++
 client/ui/models/containers_model.cpp         |  3 +-
 client/ui/models/containers_model.h           |  2 +-
 .../qml/Pages2/PageSetupWizardInstalling.qml  |  2 +-
 7 files changed, 54 insertions(+), 5 deletions(-)

diff --git a/client/configurators/awg_configurator.cpp b/client/configurators/awg_configurator.cpp
index 8962067a..2bf03359 100644
--- a/client/configurators/awg_configurator.cpp
+++ b/client/configurators/awg_configurator.cpp
@@ -16,8 +16,6 @@ QString AwgConfigurator::genAwgConfig(const ServerCredentials &credentials,
 {
     QString config = WireguardConfigurator::genWireguardConfig(credentials, container, containerConfig, errorCode);
 
-    QJsonObject jsonConfig = QJsonDocument::fromJson(config.toUtf8()).object();
-
     ServerController serverController(m_settings);
     QString serverConfig = serverController.getTextFileFromContainer(container, credentials, protocols::awg::serverConfigPath, errorCode);
 
@@ -45,6 +43,8 @@ QString AwgConfigurator::genAwgConfig(const ServerCredentials &credentials,
     config.replace("$UNDERLOAD_PACKET_MAGIC_HEADER", serverConfigMap.value(config_key::underloadPacketMagicHeader));
     config.replace("$TRANSPORT_PACKET_MAGIC_HEADER", serverConfigMap.value(config_key::transportPacketMagicHeader));
 
+    QJsonObject jsonConfig = QJsonDocument::fromJson(config.toUtf8()).object();
+
     jsonConfig[config_key::junkPacketCount] = serverConfigMap.value(config_key::junkPacketCount);
     jsonConfig[config_key::junkPacketMinSize] = serverConfigMap.value(config_key::junkPacketMinSize);
     jsonConfig[config_key::junkPacketMaxSize] = serverConfigMap.value(config_key::junkPacketMaxSize);
diff --git a/client/core/servercontroller.cpp b/client/core/servercontroller.cpp
index 443cd5a3..da76e1ff 100644
--- a/client/core/servercontroller.cpp
+++ b/client/core/servercontroller.cpp
@@ -834,6 +834,34 @@ ErrorCode ServerController::getAlreadyInstalledContainers(const ServerCredential
                     containerConfig.insert(config_key::port, port);
                     containerConfig.insert(config_key::transport_proto, transportProto);
 
+                    if (protocol == Proto::Awg) {
+                        QString serverConfig = getTextFileFromContainer(container, credentials, protocols::awg::serverConfigPath, &errorCode);
+
+                        QMap<QString, QString> serverConfigMap;
+                        auto serverConfigLines = serverConfig.split("\n");
+                        for (auto &line : serverConfigLines) {
+                            auto trimmedLine = line.trimmed();
+                            if (trimmedLine.startsWith("[") && trimmedLine.endsWith("]")) {
+                                continue;
+                            } else {
+                                QStringList parts = trimmedLine.split(" = ");
+                                if (parts.count() == 2) {
+                                    serverConfigMap.insert(parts[0].trimmed(), parts[1].trimmed());
+                                }
+                            }
+                        }
+
+                        containerConfig[config_key::junkPacketCount] = serverConfigMap.value(config_key::junkPacketCount);
+                        containerConfig[config_key::junkPacketMinSize] = serverConfigMap.value(config_key::junkPacketMinSize);
+                        containerConfig[config_key::junkPacketMaxSize] = serverConfigMap.value(config_key::junkPacketMaxSize);
+                        containerConfig[config_key::initPacketJunkSize] = serverConfigMap.value(config_key::initPacketJunkSize);
+                        containerConfig[config_key::responsePacketJunkSize] = serverConfigMap.value(config_key::responsePacketJunkSize);
+                        containerConfig[config_key::initPacketMagicHeader] = serverConfigMap.value(config_key::initPacketMagicHeader);
+                        containerConfig[config_key::responsePacketMagicHeader] = serverConfigMap.value(config_key::responsePacketMagicHeader);
+                        containerConfig[config_key::underloadPacketMagicHeader] = serverConfigMap.value(config_key::underloadPacketMagicHeader);
+                        containerConfig[config_key::transportPacketMagicHeader] = serverConfigMap.value(config_key::transportPacketMagicHeader);
+                    }
+
                     config.insert(config_key::container, ContainerProps::containerToString(container));
                 }
                 config.insert(ProtocolProps::protoToString(protocol), containerConfig);
diff --git a/client/translations/amneziavpn_ru.ts b/client/translations/amneziavpn_ru.ts
index f4ef9c0f..316cd076 100644
--- a/client/translations/amneziavpn_ru.ts
+++ b/client/translations/amneziavpn_ru.ts
@@ -2728,6 +2728,16 @@ This means that AmneziaWG keeps the fast performance of the original while addin
         <source>error 0x%1: %2</source>
         <translation>error 0x%1: %2</translation>
     </message>
+    <message>
+        <location filename="../3rd/wireguard-tools/contrib/highlighter/gui/highlight.cpp" line="39"/>
+        <source>WireGuard Configuration Highlighter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../3rd/wireguard-tools/contrib/highlighter/gui/highlight.cpp" line="82"/>
+        <source>&amp;Randomize colors</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SelectLanguageDrawer</name>
diff --git a/client/translations/amneziavpn_zh_CN.ts b/client/translations/amneziavpn_zh_CN.ts
index c711b3fc..592717ab 100644
--- a/client/translations/amneziavpn_zh_CN.ts
+++ b/client/translations/amneziavpn_zh_CN.ts
@@ -2867,6 +2867,16 @@ While it offers a blend of security, stability, and speed, it&apos;s essential t
         <source>error 0x%1: %2</source>
         <translation>错误 0x%1: %2</translation>
     </message>
+    <message>
+        <location filename="../3rd/wireguard-tools/contrib/highlighter/gui/highlight.cpp" line="39"/>
+        <source>WireGuard Configuration Highlighter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../3rd/wireguard-tools/contrib/highlighter/gui/highlight.cpp" line="82"/>
+        <source>&amp;Randomize colors</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SelectLanguageDrawer</name>
diff --git a/client/ui/models/containers_model.cpp b/client/ui/models/containers_model.cpp
index 780809c5..6a4c0e63 100644
--- a/client/ui/models/containers_model.cpp
+++ b/client/ui/models/containers_model.cpp
@@ -117,8 +117,9 @@ QString ContainersModel::getDefaultContainerName()
     return ContainerProps::containerHumanNames().value(m_defaultContainerIndex);
 }
 
-void ContainersModel::setDefaultContainer(DockerContainer container)
+void ContainersModel::setDefaultContainer(int index)
 {
+    auto container = static_cast<DockerContainer>(index);
     m_settings->setDefaultContainer(m_currentlyProcessedServerIndex, container);
     m_defaultContainerIndex = container;
     emit defaultContainerChanged();
diff --git a/client/ui/models/containers_model.h b/client/ui/models/containers_model.h
index 4ba85749..997b21e3 100644
--- a/client/ui/models/containers_model.h
+++ b/client/ui/models/containers_model.h
@@ -46,7 +46,7 @@ public:
 public slots:
     DockerContainer getDefaultContainer();
     QString getDefaultContainerName();
-    void setDefaultContainer(DockerContainer container);
+    void setDefaultContainer(int index);
 
     void setCurrentlyProcessedServerIndex(const int index);
 
diff --git a/client/ui/qml/Pages2/PageSetupWizardInstalling.qml b/client/ui/qml/Pages2/PageSetupWizardInstalling.qml
index 50aad294..a223f646 100644
--- a/client/ui/qml/Pages2/PageSetupWizardInstalling.qml
+++ b/client/ui/qml/Pages2/PageSetupWizardInstalling.qml
@@ -25,7 +25,7 @@ PageType {
 
         function onInstallContainerFinished(finishedMessage, isServiceInstall) {
             if (!ConnectionController.isConnected && !isServiceInstall) {
-                ContainersModel.setDefaultContainer(ContainersModel.getCurrentlyProcessedContainerIndex)
+                ContainersModel.setDefaultContainer(ContainersModel.getCurrentlyProcessedContainerIndex())
             }
 
             PageController.goToStartPage()

From 7cfb38307e5533dbaddce6578e926a75430bc6ac Mon Sep 17 00:00:00 2001
From: "vladimir.kuznetsov" <nethiuswork@gmail.com>
Date: Sun, 22 Oct 2023 18:04:34 +0500
Subject: [PATCH 276/278] removed re-processing of server config for awg

---
 client/configurators/awg_configurator.cpp | 42 ++++++++---------------
 1 file changed, 15 insertions(+), 27 deletions(-)

diff --git a/client/configurators/awg_configurator.cpp b/client/configurators/awg_configurator.cpp
index 2bf03359..c3e42258 100644
--- a/client/configurators/awg_configurator.cpp
+++ b/client/configurators/awg_configurator.cpp
@@ -16,44 +16,32 @@ QString AwgConfigurator::genAwgConfig(const ServerCredentials &credentials,
 {
     QString config = WireguardConfigurator::genWireguardConfig(credentials, container, containerConfig, errorCode);
 
-    ServerController serverController(m_settings);
-    QString serverConfig = serverController.getTextFileFromContainer(container, credentials, protocols::awg::serverConfigPath, errorCode);
+    QJsonObject jsonConfig = QJsonDocument::fromJson(config.toUtf8()).object();
+    QString awgConfig = jsonConfig.value(config_key::config).toString();
 
-    QMap<QString, QString> serverConfigMap;
-    auto serverConfigLines = serverConfig.split("\n");
-    for (auto &line : serverConfigLines) {
+    QMap<QString, QString> configMap;
+    auto configLines = awgConfig.split("\n");
+    for (auto &line : configLines) {
         auto trimmedLine = line.trimmed();
         if (trimmedLine.startsWith("[") && trimmedLine.endsWith("]")) {
             continue;
         } else {
             QStringList parts = trimmedLine.split(" = ");
             if (parts.count() == 2) {
-                serverConfigMap.insert(parts[0].trimmed(), parts[1].trimmed());
+                configMap.insert(parts[0].trimmed(), parts[1].trimmed());
             }
         }
     }
 
-    config.replace("$JUNK_PACKET_COUNT", serverConfigMap.value(config_key::junkPacketCount));
-    config.replace("$JUNK_PACKET_MIN_SIZE", serverConfigMap.value(config_key::junkPacketMinSize));
-    config.replace("$JUNK_PACKET_MAX_SIZE", serverConfigMap.value(config_key::junkPacketMaxSize));
-    config.replace("$INIT_PACKET_JUNK_SIZE", serverConfigMap.value(config_key::initPacketJunkSize));
-    config.replace("$RESPONSE_PACKET_JUNK_SIZE", serverConfigMap.value(config_key::responsePacketJunkSize));
-    config.replace("$INIT_PACKET_MAGIC_HEADER", serverConfigMap.value(config_key::initPacketMagicHeader));
-    config.replace("$RESPONSE_PACKET_MAGIC_HEADER", serverConfigMap.value(config_key::responsePacketMagicHeader));
-    config.replace("$UNDERLOAD_PACKET_MAGIC_HEADER", serverConfigMap.value(config_key::underloadPacketMagicHeader));
-    config.replace("$TRANSPORT_PACKET_MAGIC_HEADER", serverConfigMap.value(config_key::transportPacketMagicHeader));
-
-    QJsonObject jsonConfig = QJsonDocument::fromJson(config.toUtf8()).object();
-
-    jsonConfig[config_key::junkPacketCount] = serverConfigMap.value(config_key::junkPacketCount);
-    jsonConfig[config_key::junkPacketMinSize] = serverConfigMap.value(config_key::junkPacketMinSize);
-    jsonConfig[config_key::junkPacketMaxSize] = serverConfigMap.value(config_key::junkPacketMaxSize);
-    jsonConfig[config_key::initPacketJunkSize] = serverConfigMap.value(config_key::initPacketJunkSize);
-    jsonConfig[config_key::responsePacketJunkSize] = serverConfigMap.value(config_key::responsePacketJunkSize);
-    jsonConfig[config_key::initPacketMagicHeader] = serverConfigMap.value(config_key::initPacketMagicHeader);
-    jsonConfig[config_key::responsePacketMagicHeader] = serverConfigMap.value(config_key::responsePacketMagicHeader);
-    jsonConfig[config_key::underloadPacketMagicHeader] = serverConfigMap.value(config_key::underloadPacketMagicHeader);
-    jsonConfig[config_key::transportPacketMagicHeader] = serverConfigMap.value(config_key::transportPacketMagicHeader);
+    jsonConfig[config_key::junkPacketCount] = configMap.value(config_key::junkPacketCount);
+    jsonConfig[config_key::junkPacketMinSize] = configMap.value(config_key::junkPacketMinSize);
+    jsonConfig[config_key::junkPacketMaxSize] = configMap.value(config_key::junkPacketMaxSize);
+    jsonConfig[config_key::initPacketJunkSize] = configMap.value(config_key::initPacketJunkSize);
+    jsonConfig[config_key::responsePacketJunkSize] = configMap.value(config_key::responsePacketJunkSize);
+    jsonConfig[config_key::initPacketMagicHeader] = configMap.value(config_key::initPacketMagicHeader);
+    jsonConfig[config_key::responsePacketMagicHeader] = configMap.value(config_key::responsePacketMagicHeader);
+    jsonConfig[config_key::underloadPacketMagicHeader] = configMap.value(config_key::underloadPacketMagicHeader);
+    jsonConfig[config_key::transportPacketMagicHeader] = configMap.value(config_key::transportPacketMagicHeader);
 
     return QJsonDocument(jsonConfig).toJson();
 }

From 97090888d5b2f10c900464db1120a29bee034967 Mon Sep 17 00:00:00 2001
From: pokamest <pokamest@gmail.com>
Date: Sun, 22 Oct 2023 08:11:37 -0700
Subject: [PATCH 277/278] Bump version

---
 CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 12fc8dce..2e7be435 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.25.0 FATAL_ERROR)
 
 set(PROJECT AmneziaVPN)
 
-project(${PROJECT} VERSION 4.0.8.5
+project(${PROJECT} VERSION 4.0.8.6
         DESCRIPTION "AmneziaVPN"
         HOMEPAGE_URL "https://amnezia.org/"
 )

From e749cc7578d0df83a8bc91f97b7143c36b6b40ea Mon Sep 17 00:00:00 2001
From: pokamest <pokamest@gmail.com>
Date: Mon, 23 Oct 2023 20:32:28 +0100
Subject: [PATCH 278/278] Update amneziavpn_ru.ts

Typo fix
---
 client/translations/amneziavpn_ru.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/translations/amneziavpn_ru.ts b/client/translations/amneziavpn_ru.ts
index f94e0514..cfa33040 100644
--- a/client/translations/amneziavpn_ru.ts
+++ b/client/translations/amneziavpn_ru.ts
@@ -1332,7 +1332,7 @@ Already installed containers were found on the server. All installed containers
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsServerData.qml" line="87"/>
         <source>Clear Amnezia cache</source>
-        <translation>Очистить кэш Amnezia на сервере</translation>
+        <translation>Очистить кэш Amnezia</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsServerData.qml" line="88"/>