Merge branch 'feature/new-gui' of github.com:amnezia-vpn/amnezia-client into feature/new-gui

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
             }

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()
             }

client/ui/qml/Pages2/PageSettingsServerData.qml

@@ -74,6 +74,7 @@ PageType {
                             PageController.replaceStartPage()
                         } else {
                             goToStartPage()
+                            goToPage(PageEnum.PageSettingsServersList)
                         }
                     }
                     questionDrawer.noButtonFunction = function() {

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