Merge branch 'dev' of github.com:amnezia-vpn/amnezia-client into fix/…

…drawerTypePositioning
amnezia-vpn · Oct 3, 2023 · 52124b1 · 52124b1
2 parents b1e9e86 + ed1afa7
commit 52124b1
Show file tree

Hide file tree

Showing 9 changed files with 137 additions and 56 deletions.
diff --git 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
@@ -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
@@ -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/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
+    }
 }
diff --git a/client/ui/qml/Controls2/DrawerType.qml b/client/ui/qml/Controls2/DrawerType.qml
@@ -52,16 +52,12 @@ Drawer {
     }
 
     onOpened: {
-        isOpened = true
-
         if (needCloseButton) {
             PageController.drawerOpen()
         }
     }
 
     onClosed: {
-        isOpened = false
-
         if (needCloseButton) {
             PageController.drawerClose()
         }

diff --git 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/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
+
+        FlickableType {
+            id: fl
+            interactive: false
 
-        anchors.top: parent.top
-        anchors.bottom: parent.bottom
-        contentHeight: textArea.implicitHeight
-        TextArea {
-            id: textArea
+            anchors.top: parent.top
+            anchors.bottom: parent.bottom
+            contentHeight: textArea.implicitHeight
+            TextArea {
+                id: textArea
 
-            width: parent.width
+                width: parent.width
 
-            topPadding: 16
-            leftPadding: 16
-            anchors.topMargin: 16
-            anchors.bottomMargin: 16
+                topPadding: 16
+                leftPadding: 16
+                anchors.topMargin: 16
+                anchors.bottomMargin: 16
 
-            color: "#D7D8DB"
-            selectionColor:  "#633303"
-            selectedTextColor: "#D7D8DB"
-            placeholderTextColor: "#878B91"
+                color: "#D7D8DB"
+                selectionColor:  "#633303"
+                selectedTextColor: "#D7D8DB"
+                placeholderTextColor: "#878B91"
 
-            font.pixelSize: 16
-            font.weight: Font.Medium
-            font.family: "PT Root UI VF"
+                font.pixelSize: 16
+                font.weight: Font.Medium
+                font.family: "PT Root UI VF"
 
-            placeholderText: root.placeholderText
-            text: root.text
+                placeholderText: root.placeholderText
+                text: root.text
 
-            onCursorVisibleChanged:  {
-                if (textArea.cursorVisible) {
-                    fl.interactive = true
-                } else {
-                    fl.interactive = false
+                onCursorVisibleChanged:  {
+                    if (textArea.cursorVisible) {
+                        fl.interactive = true
+                    } else {
+                        fl.interactive = false
+                    }
                 }
-            }
 
-            wrapMode: Text.Wrap
+                wrapMode: Text.Wrap
 
-            MouseArea {
-                anchors.fill: parent
-                acceptedButtons: Qt.RightButton
-                onClicked: {
-                    fl.interactive = true
-                    contextMenu.open()
+                MouseArea {
+                    id: textAreaMouse
+                    anchors.fill: parent
+                    acceptedButtons: Qt.RightButton
+                    hoverEnabled: true
+                    onClicked: {
+                        fl.interactive = true
+                        contextMenu.open()
+                    }
                 }
-            }
 
-            ContextMenuType {
-                id: contextMenu
-                textObj: textArea
+                onFocusChanged: {
+                    root.border.color = getBorderColor(borderNormalColor)
+                }
+
+                ContextMenuType {
+                    id: contextMenu
+                    textObj: textArea
+                }
             }
         }
+
+        onPressed: {
+            root.border.color = getBorderColor(borderFocusedColor)
+        }
+
+        onExited: {
+            root.border.color = getBorderColor(borderNormalColor)
+        }
+
+        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
+    }
 }
diff --git 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
     }
 }
diff --git 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() {